summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac7
-rw-r--r--openbsd-compat/port-aix.c4
-rw-r--r--openbsd-compat/port-aix.h25
4 files changed, 32 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d132f981..836cc0dfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
12 authentication early enough to be available to PAM session modules when 12 authentication early enough to be available to PAM session modules when
13 privsep=yes. Patch from deengert at anl.gov, ok'ed in principle by Sam 13 privsep=yes. Patch from deengert at anl.gov, ok'ed in principle by Sam
14 Hartman and similar to Debian's ssh-krb5 package. 14 Hartman and similar to Debian's ssh-krb5 package.
15 - (dtucker) [configure.ac openbsd-compat/port-aix.{c,h}] Silence some more
16 compiler warnings on AIX.
15 17
1620050215 1820050215
17 - (dtucker) [config.sh.in] Collect oslevel -r too. 19 - (dtucker) [config.sh.in] Collect oslevel -r too.
@@ -2146,4 +2148,4 @@
2146 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2148 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2147 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2149 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2148 2150
2149$Id: ChangeLog,v 1.3658 2005/02/16 05:47:37 dtucker Exp $ 2151$Id: ChangeLog,v 1.3659 2005/02/16 11:49:31 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index aa6aed6b0..fe6b002d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.243 2005/02/16 05:19:17 dtucker Exp $ 1# $Id: configure.ac,v 1.244 2005/02/16 11:49:31 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -121,8 +121,11 @@ case "$host" in
121 LIBS="$LIBS -ls" 121 LIBS="$LIBS -ls"
122 ]) 122 ])
123 ]) 123 ])
124 dnl Check for various auth function declarations in headers.
125 AC_CHECK_DECLS([authenticate, loginrestrictions, loginsuccess, passwdexpired],,
126 [#include <usersec.h>])
124 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)
125 AC_CHECK_DECL(loginfailed, 128 AC_CHECK_DECLS(loginfailed,
126 [AC_MSG_CHECKING(if loginfailed takes 4 arguments) 129 [AC_MSG_CHECKING(if loginfailed takes 4 arguments)
127 AC_TRY_COMPILE( 130 AC_TRY_COMPILE(
128 [#include <usersec.h>], 131 [#include <usersec.h>],
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index 8ab862f98..fa6a4ff7b 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -37,10 +37,6 @@
37#include <sys/socket.h> 37#include <sys/socket.h>
38#include "port-aix.h" 38#include "port-aix.h"
39 39
40/* These should be in the system headers but are not. */
41int usrinfo(int, char *, int);
42int setauthdb(const char *, char *);
43
44# ifdef HAVE_SETAUTHDB 40# ifdef HAVE_SETAUTHDB
45static char old_registry[REGISTRY_SIZE] = ""; 41static char old_registry[REGISTRY_SIZE] = "";
46# endif 42# endif
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index cc7c43cda..a05ce9703 100644
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -1,4 +1,4 @@
1/* $Id: port-aix.h,v 1.23 2005/02/15 10:45:58 dtucker Exp $ */ 1/* $Id: port-aix.h,v 1.24 2005/02/16 11:49:31 dtucker Exp $ */
2 2
3/* 3/*
4 * 4 *
@@ -30,6 +30,9 @@
30#ifdef HAVE_SYS_SOCKET_H 30#ifdef HAVE_SYS_SOCKET_H
31# include <sys/socket.h> 31# include <sys/socket.h>
32#endif 32#endif
33#ifdef HAVE_UNISTD_H
34# include <unistd.h> /* for seteuid() */
35#endif
33 36
34#ifdef WITH_AIXAUTHENTICATE 37#ifdef WITH_AIXAUTHENTICATE
35# include <login.h> 38# include <login.h>
@@ -42,6 +45,26 @@
42 45
43#include "buffer.h" 46#include "buffer.h"
44 47
48/* These should be in the system headers but are not. */
49int usrinfo(int, char *, int);
50int setauthdb(const char *, char *);
51/* these may or may not be in the headers depending on the version */
52#if (HAVE_DECL_AUTHENTICATE == 0)
53int authenticate(char *, char *, int *, char **);
54#endif
55#if (HAVE_DECL_LOGINFAILED == 0)
56int loginfailed(char *, char *, char *);
57#endif
58#if (HAVE_DECL_LOGINRESTRICTIONS == 0)
59int loginrestrictions(char *, int, char *, char **);
60#endif
61#if (HAVE_DECL_LOGINSUCCESS == 0)
62int loginsuccess(char *, char *, char *, char **);
63#endif
64#if (HAVE_DECL_PASSWDEXPIRED == 0)
65int passwdexpired(char *, char **);
66#endif
67
45/* Some versions define r_type in the above headers, which causes a conflict */ 68/* Some versions define r_type in the above headers, which causes a conflict */
46#ifdef r_type 69#ifdef r_type
47# undef r_type 70# undef r_type