diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2003-02-01 04:43:34 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2003-02-01 04:43:34 +0000 |
commit | 4b0f1ad4dbf1e3c42e9043ce0b0739a89f5b4c86 (patch) | |
tree | a5f55a5839703da126625923875c20b4adb4f8e0 | |
parent | 4d9dc1aa82a8c1e5feaef74ba1ee532b02823947 (diff) |
- (bal) AIX 4.2.1 lacks nanosleep(). Patch to use nsleep() provided by
dtucker@zip.com.au
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | openbsd-compat/port-aix.h | 11 |
3 files changed, 20 insertions, 5 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20030131 | ||
2 | - (bal) AIX 4.2.1 lacks nanosleep(). Patch to use nsleep() provided by | ||
3 | dtucker@zip.com.au | ||
4 | |||
1 | 20030130 | 5 | 20030130 |
2 | - (djm) Unbreak root password auth. Spotted by dtucker@zip.com.au | 6 | - (djm) Unbreak root password auth. Spotted by dtucker@zip.com.au |
3 | 7 | ||
@@ -1086,4 +1090,4 @@ | |||
1086 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1090 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1087 | ok provos@ | 1091 | ok provos@ |
1088 | 1092 | ||
1089 | $Id: ChangeLog,v 1.2590 2003/01/29 23:20:56 djm Exp $ | 1093 | $Id: ChangeLog,v 1.2591 2003/02/01 04:43:34 mouring Exp $ |
diff --git a/configure.ac b/configure.ac index f66104e78..608127f55 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.104 2003/01/28 00:33:44 djm Exp $ | 1 | # $Id: configure.ac,v 1.105 2003/02/01 04:43:34 mouring Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -388,7 +388,7 @@ AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \ | |||
388 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ | 388 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ |
389 | strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ | 389 | strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ |
390 | sys/mman.h sys/pstat.h sys/select.h sys/stat.h \ | 390 | sys/mman.h sys/pstat.h sys/select.h sys/stat.h \ |
391 | sys/stropts.h sys/sysmacros.h sys/time.h \ | 391 | sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h \ |
392 | sys/un.h time.h tmpdir.h ttyent.h usersec.h \ | 392 | sys/un.h time.h tmpdir.h ttyent.h usersec.h \ |
393 | util.h utime.h utmp.h utmpx.h) | 393 | util.h utime.h utmp.h utmpx.h) |
394 | 394 | ||
@@ -604,8 +604,8 @@ AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \ | |||
604 | clock fchmod fchown freeaddrinfo futimes gai_strerror \ | 604 | clock fchmod fchown freeaddrinfo futimes gai_strerror \ |
605 | getaddrinfo getcwd getgrouplist getnameinfo getopt getpeereid\ | 605 | getaddrinfo getcwd getgrouplist getnameinfo getopt getpeereid\ |
606 | getrlimit getrusage getttyent glob inet_aton inet_ntoa \ | 606 | getrlimit getrusage getttyent glob inet_aton inet_ntoa \ |
607 | inet_ntop innetgr login_getcapbool md5_crypt memmove \ | 607 | inet_ntop innetgr login_getcapbool md5_crypt memmove mkdtemp \ |
608 | mkdtemp mmap ngetaddrinfo openpty ogetaddrinfo pstat readpassphrase \ | 608 | mmap ngetaddrinfo nsleep openpty ogetaddrinfo pstat readpassphrase \ |
609 | realpath recvmsg rresvport_af sendmsg setdtablesize setegid \ | 609 | realpath recvmsg rresvport_af sendmsg setdtablesize setegid \ |
610 | setenv seteuid setgroups setlogin setproctitle setresgid setreuid \ | 610 | setenv seteuid setgroups setlogin setproctitle setresgid setreuid \ |
611 | setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \ | 611 | setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \ |
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index 79570a206..4abe00316 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h | |||
@@ -25,5 +25,16 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #ifdef _AIX | 27 | #ifdef _AIX |
28 | |||
29 | /* AIX 4.2.x doesn't have nanosleep but does have nsleep which is equivalent */ | ||
30 | #if !defined(HAVE_NANOSLEEP) && defined(HAVE_NSLEEP) | ||
31 | # define nanosleep(a,b) nsleep(a,b) | ||
32 | #endif | ||
33 | |||
34 | /* For struct timespec on AIX 4.2.x */ | ||
35 | #ifdef HAVE_SYS_TIMERS_H | ||
36 | # include <sys/timers.h> | ||
37 | #endif | ||
38 | |||
28 | void aix_usrinfo(struct passwd *pw); | 39 | void aix_usrinfo(struct passwd *pw); |
29 | #endif /* _AIX */ | 40 | #endif /* _AIX */ |