summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-09-19 20:43:38 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-09-19 20:43:38 +1000
commit91acbf211c2d7508155daf75461435333254093a (patch)
treea40572831ff1214b6aadb81693710011b78447f8
parent8040939f7269fa2adfe3deb264c2c2c6d1d93407 (diff)
- (dtucker) [openbsd-compat/port-aix.h] Bug #640: Don't include audit.h
unless required. Reorder to reduce warnings.
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/port-aix.h6
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0293a411..dd2609ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
- (djm) Bug #641: Allow RedHat RPM building without GTK-2; Patch from
jason AT devrandom.org
- (djm) Bug #646: Fix location of x11-ssh-askpass; Jim
+ - (dtucker) [openbsd-compat/port-aix.h] Bug #640: Don't include audit.h
+ unless required. Reorder to reduce warnings.
20030918
- (djm) Bug #652: Fix empty password auth
@@ -1127,4 +1129,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3005 2003/09/19 07:05:24 djm Exp $
+$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 09e7f9e9..b2a48cba 100644
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -1,4 +1,4 @@
-/* $Id: port-aix.h,v 1.14 2003/08/29 16:59:52 mouring Exp $ */
+/* $Id: port-aix.h,v 1.15 2003/09/19 10:43:38 dtucker Exp $ */
/*
*
@@ -30,10 +30,10 @@
#ifdef WITH_AIXAUTHENTICATE
# include <login.h>
# include <userpw.h>
-# include <usersec.h>
-# ifdef HAVE_SYS_AUDIT_H
+# if defined(HAVE_SYS_AUDIT_H) && defined(AIX_LOGINFAILED_4ARG)
# include <sys/audit.h>
# endif
+# include <usersec.h>
#endif
/* Some versions define r_type in the above headers, which causes a conflict */