summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-09-13 10:41:56 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-09-13 10:41:56 +1000
commit2270c7e8aa380a95628ec4faaf5544c0cbb70da5 (patch)
treef88dd328e85e76ed4aecc009d13e246700f3ae1d
parentdc7e65646fc2811b58d67dc6c3bfb0740047c552 (diff)
- (dtucker) [auth-passwd.c] On AIX, call setauthdb() before loginsuccess(),
required to correctly reset failed login count when using a password registry other than "files" (eg LDAP, see bug #543).
-rw-r--r--ChangeLog5
-rw-r--r--auth-passwd.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f4b1848f3..cc21f0abc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
120030913 120030913
2 - (dtucker) [regress/agent-timeout.sh] Timeout of 5 sec is borderline for 2 - (dtucker) [regress/agent-timeout.sh] Timeout of 5 sec is borderline for
3 slower hosts, increase to 10 sec. 3 slower hosts, increase to 10 sec.
4 - (dtucker) [auth-passwd.c] On AIX, call setauthdb() before loginsuccess(),
5 required to correctly reset failed login count when using a password
6 registry other than "files" (eg LDAP, see bug #543).
4 7
520030912 820030912
6 - (tim) [regress/agent-ptrace.sh] sh doesn't like "if ! shell_function; then". 9 - (tim) [regress/agent-ptrace.sh] sh doesn't like "if ! shell_function; then".
@@ -1079,4 +1082,4 @@
1079 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1082 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1080 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1083 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1081 1084
1082$Id: ChangeLog,v 1.2986 2003/09/12 23:46:03 dtucker Exp $ 1085$Id: ChangeLog,v 1.2987 2003/09/13 00:41:56 dtucker Exp $
diff --git a/auth-passwd.c b/auth-passwd.c
index 57a2d3620..95cc134de 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -110,6 +110,7 @@ auth_password(Authctxt *authctxt, const char *password)
110 pw->pw_name, authmsg); 110 pw->pw_name, authmsg);
111 111
112 /* No pty yet, so just label the line as "ssh" */ 112 /* No pty yet, so just label the line as "ssh" */
113 aix_setauthdb(authctxt->user);
113 if (loginsuccess(authctxt->user, host, "ssh", 114 if (loginsuccess(authctxt->user, host, "ssh",
114 &msg) == 0) { 115 &msg) == 0) {
115 if (msg != NULL) { 116 if (msg != NULL) {