diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | openbsd-compat/xmmap.c | 5 | ||||
-rw-r--r-- | openbsd-compat/xmmap.h | 4 |
3 files changed, 12 insertions, 1 deletions
@@ -2,6 +2,8 @@ | |||
2 | - (djm) Fix segv from bad reordering in auth-pam.c | 2 | - (djm) Fix segv from bad reordering in auth-pam.c |
3 | - (djm) Always use saved_argv in sshd.c as compat_init_setproctitle may | 3 | - (djm) Always use saved_argv in sshd.c as compat_init_setproctitle may |
4 | clobber | 4 | clobber |
5 | - (tim) openbsd-compat/xmmap.[ch] License clarifications. Add missing | ||
6 | CVS ID. | ||
5 | 7 | ||
6 | 20030530 | 8 | 20030530 |
7 | - (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at | 9 | - (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at |
@@ -1628,4 +1630,4 @@ | |||
1628 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1630 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1629 | ok provos@ | 1631 | ok provos@ |
1630 | 1632 | ||
1631 | $Id: ChangeLog,v 1.2756 2003/06/02 02:15:54 djm Exp $ | 1633 | $Id: ChangeLog,v 1.2757 2003/06/02 02:25:27 tim Exp $ |
diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c index 8f1d2022c..9dc4340a7 100644 --- a/openbsd-compat/xmmap.c +++ b/openbsd-compat/xmmap.c | |||
@@ -1,4 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2002 Tim Rice. All rights reserved. | ||
3 | * MAP_FAILED code by Solar Designer. | ||
4 | * | ||
2 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
3 | * modification, are permitted provided that the following conditions | 6 | * modification, are permitted provided that the following conditions |
4 | * are met: | 7 | * are met: |
@@ -20,6 +23,8 @@ | |||
20 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
21 | */ | 24 | */ |
22 | 25 | ||
26 | /* $Id: xmmap.c,v 1.3 2003/06/02 02:25:27 tim Exp $ */ | ||
27 | |||
23 | #include "includes.h" | 28 | #include "includes.h" |
24 | 29 | ||
25 | #ifdef HAVE_SYS_MMAN_H | 30 | #ifdef HAVE_SYS_MMAN_H |
diff --git a/openbsd-compat/xmmap.h b/openbsd-compat/xmmap.h index c0fa04aca..cae884060 100644 --- a/openbsd-compat/xmmap.h +++ b/openbsd-compat/xmmap.h | |||
@@ -1,4 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2002 Tim Rice. All rights reserved. | ||
3 | * | ||
2 | * Redistribution and use in source and binary forms, with or without | 4 | * Redistribution and use in source and binary forms, with or without |
3 | * modification, are permitted provided that the following conditions | 5 | * modification, are permitted provided that the following conditions |
4 | * are met: | 6 | * are met: |
@@ -20,4 +22,6 @@ | |||
20 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
21 | */ | 23 | */ |
22 | 24 | ||
25 | /* $Id: xmmap.h,v 1.2 2003/06/02 02:25:27 tim Exp $ */ | ||
26 | |||
23 | void *xmmap(size_t size); | 27 | void *xmmap(size_t size); |