summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--acconfig.h6
-rw-r--r--configure.ac29
-rw-r--r--openbsd-compat/port-aix.c6
4 files changed, 27 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 89adc1266..cddfe3c32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
120030714
2 - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare
3 loginfailed at all, so assume 3-arg loginfailed if not declared.
4
120030708 520030708
2 - (dtucker) [acconfig.h auth-passwd.c configure.ac session.c port-aix.[ch]] 6 - (dtucker) [acconfig.h auth-passwd.c configure.ac session.c port-aix.[ch]]
3 Include AIX headers for authentication functions and make calls match 7 Include AIX headers for authentication functions and make calls match
4 prototypes. Test for and handle 3-args and 4-arg variants of loginfailed. 8 prototypes. Test for and handle 3-arg and 4-arg variants of loginfailed.
5 - (dtucker) [session.c] Check return value of setpcred(). 9 - (dtucker) [session.c] Check return value of setpcred().
6 - (dtucker) [auth-passwd.c auth.c session.c sshd.c port-aix.c port-aix.h] 10 - (dtucker) [auth-passwd.c auth.c session.c sshd.c port-aix.c port-aix.h]
7 Convert aixloginmsg into platform-independant Buffer loginmsg. 11 Convert aixloginmsg into platform-independant Buffer loginmsg.
@@ -670,4 +674,4 @@
670 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 674 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
671 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 675 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
672 676
673$Id: ChangeLog,v 1.2849 2003/07/08 12:59:59 dtucker Exp $ 677$Id: ChangeLog,v 1.2850 2003/07/14 06:21:44 dtucker Exp $
diff --git a/acconfig.h b/acconfig.h
index 23cc9c817..0af93663c 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
1/* $Id: acconfig.h,v 1.158 2003/07/08 10:52:13 dtucker Exp $ */ 1/* $Id: acconfig.h,v 1.159 2003/07/14 06:21:44 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1999-2003 Damien Miller. All rights reserved. 4 * Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@@ -110,8 +110,8 @@
110/* Define if you want to enable AIX4's authenticate function */ 110/* Define if you want to enable AIX4's authenticate function */
111#undef WITH_AIXAUTHENTICATE 111#undef WITH_AIXAUTHENTICATE
112 112
113/* Define if your AIX loginfailed() function takes 3 arguments (AIX <= 5.1) */ 113/* Define if your AIX loginfailed() function takes 4 arguments (AIX >= 5.2) */
114#undef AIX_LOGINFAILED_3ARG 114#undef AIX_LOGINFAILED_4ARG
115 115
116/* Define if you have/want arrays (cluster-wide session managment, not C arrays) */ 116/* Define if you have/want arrays (cluster-wide session managment, not C arrays) */
117#undef WITH_IRIX_ARRAY 117#undef WITH_IRIX_ARRAY
diff --git a/configure.ac b/configure.ac
index 431c6446b..8a23469ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.132 2003/07/08 10:52:13 dtucker Exp $ 1# $Id: configure.ac,v 1.133 2003/07/14 06:21:44 dtucker Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -75,25 +75,26 @@ case "$host" in
75 AC_MSG_RESULT($blibflags) 75 AC_MSG_RESULT($blibflags)
76 fi 76 fi
77 LDFLAGS="$saved_LDFLAGS" 77 LDFLAGS="$saved_LDFLAGS"
78 # Check for authenticate. Might be in libs.a on older AIXes 78 dnl Check for authenticate. Might be in libs.a on older AIXes
79 AC_CHECK_FUNC(authenticate, [with_aixauthenticate=1], 79 AC_CHECK_FUNC(authenticate, [AC_DEFINE(WITH_AIXAUTHENTICATE)],
80 [AC_CHECK_LIB(s,authenticate, 80 [AC_CHECK_LIB(s,authenticate,
81 [ with_aixaixauthenticate=1 81 [ AC_DEFINE(WITH_AIXAUTHENTICATE)
82 LIBS="$LIBS -ls" 82 LIBS="$LIBS -ls"
83 ]) 83 ])
84 ]) 84 ])
85 # Check if loginfailed takes 3 arguments (AIX <= 5.1) 85 dnl Check if loginfailed is declared and takes 4 arguments (AIX >= 5.2)
86 if (test "x$with_aixauthenticate" = "x1" ); then 86 AC_CHECK_DECL(loginfailed,
87 AC_DEFINE(WITH_AIXAUTHENTICATE) 87 [AC_MSG_CHECKING(if loginfailed takes 4 arguments)
88 AC_MSG_CHECKING(if loginfailed takes 3 arguments) 88 AC_TRY_COMPILE(
89 AC_TRY_COMPILE(
90 [#include <usersec.h>], 89 [#include <usersec.h>],
91 [(void)loginfailed("user","host","tty");], 90 [(void)loginfailed("user","host","tty",0);],
92 [AC_MSG_RESULT(yes) 91 [AC_MSG_RESULT(yes)
93 AC_DEFINE(AIX_LOGINFAILED_3ARG)], 92 AC_DEFINE(AIX_LOGINFAILED_4ARG)],
94 [AC_MSG_RESULT(no)] 93 [AC_MSG_RESULT(no)]
95 ) 94 )],
96 fi 95 [],
96 [#include <usersec.h>]
97 )
97 AC_DEFINE(BROKEN_GETADDRINFO) 98 AC_DEFINE(BROKEN_GETADDRINFO)
98 AC_DEFINE(BROKEN_REALPATH) 99 AC_DEFINE(BROKEN_REALPATH)
99 dnl AIX handles lastlog as part of its login message 100 dnl AIX handles lastlog as part of its login message
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index cc6190cb8..562923720 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -92,10 +92,10 @@ record_failed_login(const char *user, const char *ttyname)
92{ 92{
93 char *hostname = get_canonical_hostname(options.use_dns); 93 char *hostname = get_canonical_hostname(options.use_dns);
94 94
95# ifdef AIX_LOGINFAILED_3ARG 95# ifdef AIX_LOGINFAILED_4ARG
96 loginfailed((char *)user, hostname, (char *)ttyname);
97# else
98 loginfailed((char *)user, hostname, (char *)ttyname, AUDIT_FAIL_AUTH); 96 loginfailed((char *)user, hostname, (char *)ttyname, AUDIT_FAIL_AUTH);
97# else
98 loginfailed((char *)user, hostname, (char *)ttyname);
99# endif 99# endif
100} 100}
101# endif /* CUSTOM_FAILED_LOGIN */ 101# endif /* CUSTOM_FAILED_LOGIN */