- (dtucker) [acconfig.h auth-passwd.c configure.ac session.c port-aix.[ch]]

   Include AIX headers for authentication functions and make calls match
   prototypes.  Test for and handle 3-args and 4-arg variants of loginfailed.

2 files changed, 14 insertions, 1 deletions

diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index b4c9454a1..c8d9517b6 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -70,7 +70,11 @@ record_failed_login(const char *user, const char *ttyname)
 {
         char *hostname = get_canonical_hostname(options.use_dns);
 
-        loginfailed(user, hostname, ttyname);
+#  ifdef AIX_LOGINFAILED_3ARG
+        loginfailed((char *)user, hostname, (char *)ttyname);
+#  else
+        loginfailed((char *)user, hostname, (char *)ttyname, AUDIT_FAIL_AUTH);
+#  endif
 }
 # endif /* CUSTOM_FAILED_LOGIN */
 #endif /* _AIX */
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index 2254e7462..2787d919d 100644
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -26,6 +26,15 @@
 
 #ifdef _AIX
 
+#ifdef WITH_AIXAUTHENTICATE
+# include <login.h>
+# include <userpw.h>
+# include <usersec.h>
+# ifdef HAVE_SYS_AUDIT_H
+#  include <sys/audit.h>
+# endif
+#endif
+
 /* AIX 4.2.x doesn't have nanosleep but does have nsleep which is equivalent */
 #if !defined(HAVE_NANOSLEEP) && defined(HAVE_NSLEEP)
 # define nanosleep(a,b) nsleep(a,b)