diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2005-03-21 22:46:34 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2005-03-21 22:46:34 +1100 |
| commit | e66519d94207187a71d274ab70a6647318ed877d (patch) | |
| tree | d17ecc181b7a36aa8856140a903428f381b0bbc2 | |
| parent | 1df61452ea479323b22bd6f522e7d1f09fca5fe6 (diff) | |
- (dtucker) [configure.ac openbsd-compat/port-aix.h] Prevent redefinitions
of setauthdb on AIX 5.3, reported by anders.liljegren at its.uu.se.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | openbsd-compat/port-aix.h | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -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. @@ -2380,4 +2382,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3726 2005/03/20 22:58:07 dtucker Exp $ +$Id: ChangeLog,v 1.3727 2005/03/21 11:46:34 dtucker Exp $ diff --git a/configure.ac b/configure.ac index f105e20d..95ace798 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.256 2005/03/20 22:58:08 dtucker Exp $ +# $Id: configure.ac,v 1.257 2005/03/21 11:46:34 dtucker Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -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 a05ce970..9e3dce4d 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h @@ -1,4 +1,4 @@ -/* $Id: port-aix.h,v 1.24 2005/02/16 11:49:31 dtucker Exp $ */ +/* $Id: port-aix.h,v 1.25 2005/03/21 11:46:34 dtucker Exp $ */ /* * @@ -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 **); |