2 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 31ce3af46..94b8aa5db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    djast AT cs.toronto.edu
  - (djm) Bug #680: Remove missing inet_ntoa.h header reference
  - (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
@@ -1124,4 +1126,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.2994.2.10 2003/09/19 07:06:06 djm Exp $
+$Id: ChangeLog,v 1.2994.2.11 2003/09/19 10:46:21 dtucker Exp $
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index 09e7f9e97..94c8c5119 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.14.2.1 2003/09/19 10:46:22 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 */