- (dtucker) [configure.ac openbsd-compat/port-aix.{c,h}] Silence some more

   compiler warnings on AIX.

diff --git a/ChangeLog b/ChangeLog
index 55493b290d2c9e5b46305863b7b955746b4fa327..2542682bfe0669d8ea656ec8e6fe700081231fc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
    authentication early enough to be available to PAM session modules when
    privsep=yes.  Patch from deengert at anl.gov, ok'ed in principle by Sam
    Hartman and similar to Debian's ssh-krb5 package.
+ - (dtucker) [configure.ac openbsd-compat/port-aix.{c,h}] Silence some more
+   compiler warnings on AIX.
 
 20050215
  - (dtucker) [config.sh.in] Collect oslevel -r too.

diff --git a/configure.ac b/configure.ac
index 016006153e08b1f03a63a6179c655b4fb3431f6c..752b8055601c30fa5ec76a51a1443cbafdb05811 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -121,8 +121,11 @@ case "$host" in
                                LIBS="$LIBS -ls"
                        ])
                ])
+       dnl Check for various auth function declarations in headers.
+       AC_CHECK_DECLS([authenticate, loginrestrictions, loginsuccess, passwdexpired],,
+           [#include <usersec.h>])
        dnl Check if loginfailed is declared and takes 4 arguments (AIX >= 5.2)
-       AC_CHECK_DECL(loginfailed,
+       AC_CHECK_DECLS(loginfailed,
                 [AC_MSG_CHECKING(if loginfailed takes 4 arguments)
                  AC_TRY_COMPILE(
                        [#include <usersec.h>],

diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index 8ab862f9851761f8b00bdf57962e36bf6b8dff7d..fa6a4ff7b45ef2aa2be7ffd8008e2c0190324dd4 100644 (file)
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -37,10 +37,6 @@
 #include <sys/socket.h>
 #include "port-aix.h"
 
-/* These should be in the system headers but are not. */
-int usrinfo(int, char *, int);
-int setauthdb(const char *, char *);
-
 # ifdef HAVE_SETAUTHDB
 static char old_registry[REGISTRY_SIZE] = "";
 # endif

diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index 97602087bbc4df7567e88bfcce4fb7164bfa1a35..5e1c96774b539949370b845693b0df09e8129f2c 100644 (file)
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -30,6 +30,9 @@
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>   /* for seteuid() */
+#endif
 
 #ifdef WITH_AIXAUTHENTICATE
 # include <login.h>
@@ -42,6 +45,26 @@
 
 #include "buffer.h"
 
+/* These should be in the system headers but are not. */
+int usrinfo(int, char *, int);
+int setauthdb(const char *, char *);
+/* these may or may not be in the headers depending on the version */
+#if (HAVE_DECL_AUTHENTICATE == 0)
+int authenticate(char *, char *, int *, char **);
+#endif
+#if (HAVE_DECL_LOGINFAILED == 0)
+int loginfailed(char *, char *, char *);
+#endif
+#if (HAVE_DECL_LOGINRESTRICTIONS == 0)
+int loginrestrictions(char *, int, char *, char **);
+#endif
+#if (HAVE_DECL_LOGINSUCCESS == 0)
+int loginsuccess(char *, char *, char *, char **);
+#endif
+#if (HAVE_DECL_PASSWDEXPIRED == 0)
+int passwdexpired(char *, char **);
+#endif
+
 /* Some versions define r_type in the above headers, which causes a conflict */
 #ifdef r_type
 # undef r_type