diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | openbsd-compat/port-aix.c | 10 | ||||
-rw-r--r-- | openbsd-compat/port-aix.h | 14 |
3 files changed, 14 insertions, 14 deletions
@@ -3,6 +3,8 @@ | |||
3 | macro redefinitions, and if not, remove "-qlanglvl=ansi" from the flags. | 3 | macro redefinitions, and if not, remove "-qlanglvl=ansi" from the flags. |
4 | Allows build out of the box with older VAC and XLC compilers. Found by | 4 | Allows build out of the box with older VAC and XLC compilers. Found by |
5 | David Bronder and Bernhard Simon. | 5 | David Bronder and Bernhard Simon. |
6 | - (dtucker) [openbsd-compat/port-aix.{c,h}] Reduce scope of includes. | ||
7 | Prevents macro redefinition warnings of "RDONLY". | ||
6 | 8 | ||
7 | 20060916 | 9 | 20060916 |
8 | - OpenBSD CVS Sync | 10 | - OpenBSD CVS Sync |
@@ -5455,4 +5457,4 @@ | |||
5455 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 5457 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
5456 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 5458 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
5457 | 5459 | ||
5458 | $Id: ChangeLog,v 1.4551 2006/09/18 13:17:40 dtucker Exp $ | 5460 | $Id: ChangeLog,v 1.4552 2006/09/18 13:54:32 dtucker Exp $ |
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c index d0a423005..b9fabf61f 100644 --- a/openbsd-compat/port-aix.c +++ b/openbsd-compat/port-aix.c | |||
@@ -45,6 +45,16 @@ | |||
45 | #include <string.h> | 45 | #include <string.h> |
46 | #include <unistd.h> | 46 | #include <unistd.h> |
47 | #include <sys/socket.h> | 47 | #include <sys/socket.h> |
48 | |||
49 | #ifdef WITH_AIXAUTHENTICATE | ||
50 | # include <login.h> | ||
51 | # include <userpw.h> | ||
52 | # if defined(HAVE_SYS_AUDIT_H) && defined(AIX_LOGINFAILED_4ARG) | ||
53 | # include <sys/audit.h> | ||
54 | # endif | ||
55 | # include <usersec.h> | ||
56 | #endif | ||
57 | |||
48 | #include "port-aix.h" | 58 | #include "port-aix.h" |
49 | 59 | ||
50 | # ifdef HAVE_SETAUTHDB | 60 | # ifdef HAVE_SETAUTHDB |
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index 37b2c12b0..5a04bedad 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: port-aix.h,v 1.26 2005/05/28 10:28:40 dtucker Exp $ */ | 1 | /* $Id: port-aix.h,v 1.27 2006/09/18 13:54:33 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * | 4 | * |
@@ -31,18 +31,6 @@ | |||
31 | #ifdef HAVE_SYS_SOCKET_H | 31 | #ifdef HAVE_SYS_SOCKET_H |
32 | # include <sys/socket.h> | 32 | # include <sys/socket.h> |
33 | #endif | 33 | #endif |
34 | #ifdef HAVE_UNISTD_H | ||
35 | # include <unistd.h> /* for seteuid() */ | ||
36 | #endif | ||
37 | |||
38 | #ifdef WITH_AIXAUTHENTICATE | ||
39 | # include <login.h> | ||
40 | # include <userpw.h> | ||
41 | # if defined(HAVE_SYS_AUDIT_H) && defined(AIX_LOGINFAILED_4ARG) | ||
42 | # include <sys/audit.h> | ||
43 | # endif | ||
44 | # include <usersec.h> | ||
45 | #endif | ||
46 | 34 | ||
47 | #include "buffer.h" | 35 | #include "buffer.h" |
48 | 36 | ||