- (dtucker) [configure.ac openbsd-compat/port-aix.h] Prevent redefinitions

   of setauthdb on AIX 5.3, reported by anders.liljegren at its.uu.se.

diff --git a/ChangeLog b/ChangeLog
index e39f2b4201dbafc5ddb47b6bf69fd24ee77c0922..48c7be23a0d214d4d61f5e8096ec62e3a2e9cbb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
  - (dtucker) [configure.ac] Make configure error out if the user specifies
    --with-libedit but the required libs can't be found, rather than silently
    ignoring and continuing.  ok tim@
+ - (dtucker) [configure.ac openbsd-compat/port-aix.h] Prevent redefinitions
+   of setauthdb on AIX 5.3, reported by anders.liljegren at its.uu.se.
 
 20050317
  - (tim) [configure.ac] Bug 998. Make path for --with-opensc optional.

diff --git a/configure.ac b/configure.ac
index b578c28d03fb96697cce3bdfc9d196610067776a..cbb71b496ede6d033b989e329d217ad66f037f3d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,7 @@ case "$host" in
                ])
        dnl Check for various auth function declarations in headers.
        AC_CHECK_DECLS([authenticate, loginrestrictions, loginsuccess,
-           passwdexpired], , , [#include <usersec.h>])
+           passwdexpired, setauthdb], , , [#include <usersec.h>])
        dnl Check if loginfailed is declared and takes 4 arguments (AIX >= 5.2)
        AC_CHECK_DECLS(loginfailed,
                 [AC_MSG_CHECKING(if loginfailed takes 4 arguments)

diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index 5e1c96774b539949370b845693b0df09e8129f2c..8ea70ed4305612c89fd875fdebae254971d91f17 100644 (file)
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -47,7 +47,9 @@
 
 /* These should be in the system headers but are not. */
 int usrinfo(int, char *, int);
+#if (HAVE_DECL_SETAUTHDB == 0)
 int setauthdb(const char *, char *);
+#endif
 /* these may or may not be in the headers depending on the version */
 #if (HAVE_DECL_AUTHENTICATE == 0)
 int authenticate(char *, char *, int *, char **);