- (dtucker) [openbsd-compat/port-aix.h] Bug #640: Don't include audit.h

   unless required.  Reorder to reduce warnings.

diff --git a/ChangeLog b/ChangeLog
index bb8a743454a1f4d4823ac098296e9a6e6fca51bd..178bda1baed2463eab60d0f2881ff80021558c4f 100644 (file)
--- 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

diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index 4f1bda1e5e926e76246a1d9a95e44e66eac4048c..8a95816db123411c555c6637f50379d5d297a1c5 100644 (file)
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -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 */