summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac4
-rw-r--r--openbsd-compat/port-aix.h4
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f115e5ecb..ef5602e34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
5 - (dtucker) [configure.ac] Make configure error out if the user specifies 5 - (dtucker) [configure.ac] Make configure error out if the user specifies
6 --with-libedit but the required libs can't be found, rather than silently 6 --with-libedit but the required libs can't be found, rather than silently
7 ignoring and continuing. ok tim@ 7 ignoring and continuing. ok tim@
8 - (dtucker) [configure.ac openbsd-compat/port-aix.h] Prevent redefinitions
9 of setauthdb on AIX 5.3, reported by anders.liljegren at its.uu.se.
8 10
920050317 1120050317
10 - (tim) [configure.ac] Bug 998. Make path for --with-opensc optional. 12 - (tim) [configure.ac] Bug 998. Make path for --with-opensc optional.
@@ -2380,4 +2382,4 @@
2380 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2382 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2381 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2383 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2382 2384
2383$Id: ChangeLog,v 1.3726 2005/03/20 22:58:07 dtucker Exp $ 2385$Id: ChangeLog,v 1.3727 2005/03/21 11:46:34 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index f105e20da..95ace7983 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.256 2005/03/20 22:58:08 dtucker Exp $ 1# $Id: configure.ac,v 1.257 2005/03/21 11:46:34 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -123,7 +123,7 @@ case "$host" in
123 ]) 123 ])
124 dnl Check for various auth function declarations in headers. 124 dnl Check for various auth function declarations in headers.
125 AC_CHECK_DECLS([authenticate, loginrestrictions, loginsuccess, 125 AC_CHECK_DECLS([authenticate, loginrestrictions, loginsuccess,
126 passwdexpired], , , [#include <usersec.h>]) 126 passwdexpired, setauthdb], , , [#include <usersec.h>])
127 dnl Check if loginfailed is declared and takes 4 arguments (AIX >= 5.2) 127 dnl Check if loginfailed is declared and takes 4 arguments (AIX >= 5.2)
128 AC_CHECK_DECLS(loginfailed, 128 AC_CHECK_DECLS(loginfailed,
129 [AC_MSG_CHECKING(if loginfailed takes 4 arguments) 129 [AC_MSG_CHECKING(if loginfailed takes 4 arguments)
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index a05ce9703..9e3dce4dd 100644
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -1,4 +1,4 @@
1/* $Id: port-aix.h,v 1.24 2005/02/16 11:49:31 dtucker Exp $ */ 1/* $Id: port-aix.h,v 1.25 2005/03/21 11:46:34 dtucker Exp $ */
2 2
3/* 3/*
4 * 4 *
@@ -47,7 +47,9 @@
47 47
48/* These should be in the system headers but are not. */ 48/* These should be in the system headers but are not. */
49int usrinfo(int, char *, int); 49int usrinfo(int, char *, int);
50#if (HAVE_DECL_SETAUTHDB == 0)
50int setauthdb(const char *, char *); 51int setauthdb(const char *, char *);
52#endif
51/* these may or may not be in the headers depending on the version */ 53/* these may or may not be in the headers depending on the version */
52#if (HAVE_DECL_AUTHENTICATE == 0) 54#if (HAVE_DECL_AUTHENTICATE == 0)
53int authenticate(char *, char *, int *, char **); 55int authenticate(char *, char *, int *, char **);