diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | openbsd-compat/port-aix.h | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -6,6 +6,8 @@ | |||
6 | - (djm) Bug #641: Allow RedHat RPM building without GTK-2; Patch from | 6 | - (djm) Bug #641: Allow RedHat RPM building without GTK-2; Patch from |
7 | jason AT devrandom.org | 7 | jason AT devrandom.org |
8 | - (djm) Bug #646: Fix location of x11-ssh-askpass; Jim | 8 | - (djm) Bug #646: Fix location of x11-ssh-askpass; Jim |
9 | - (dtucker) [openbsd-compat/port-aix.h] Bug #640: Don't include audit.h | ||
10 | unless required. Reorder to reduce warnings. | ||
9 | 11 | ||
10 | 20030918 | 12 | 20030918 |
11 | - (djm) Bug #652: Fix empty password auth | 13 | - (djm) Bug #652: Fix empty password auth |
@@ -1127,4 +1129,4 @@ | |||
1127 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1129 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1128 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1130 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1129 | 1131 | ||
1130 | $Id: ChangeLog,v 1.3005 2003/09/19 07:05:24 djm Exp $ | 1132 | $Id: ChangeLog,v 1.3006 2003/09/19 10:43:38 dtucker Exp $ |
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index 09e7f9e97..b2a48cba9 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: port-aix.h,v 1.14 2003/08/29 16:59:52 mouring Exp $ */ | 1 | /* $Id: port-aix.h,v 1.15 2003/09/19 10:43:38 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * | 4 | * |
@@ -30,10 +30,10 @@ | |||
30 | #ifdef WITH_AIXAUTHENTICATE | 30 | #ifdef WITH_AIXAUTHENTICATE |
31 | # include <login.h> | 31 | # include <login.h> |
32 | # include <userpw.h> | 32 | # include <userpw.h> |
33 | # include <usersec.h> | 33 | # if defined(HAVE_SYS_AUDIT_H) && defined(AIX_LOGINFAILED_4ARG) |
34 | # ifdef HAVE_SYS_AUDIT_H | ||
35 | # include <sys/audit.h> | 34 | # include <sys/audit.h> |
36 | # endif | 35 | # endif |
36 | # include <usersec.h> | ||
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | /* Some versions define r_type in the above headers, which causes a conflict */ | 39 | /* Some versions define r_type in the above headers, which causes a conflict */ |