From: mouring <mouring>
Date: Wed, 25 Sep 2002 23:14:14 +0000 (+0000)
Subject: l) Fix issue where successfull login does not clear failure counts
X-Git-Tag: V_3_5_P1~16
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/b7c4a4cc5dcb7ed4e01e269d7b14ee2ea6c907e7

l) Fix issue where successfull login does not clear failure counts
   in AIX.  Patch by dtucker@zip.com.au ok by djm
---

diff --git a/ChangeLog b/ChangeLog
index 30dae967..3a5a31a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20020925
+ - (bal) Fix issue where successfull login does not clear failure counts
+   in AIX.  Patch by dtucker@zip.com.au ok by djm
+
 20020923
  - (djm) OpenBSD CVS Sync
    - stevesk@cvs.openbsd.org 2002/09/23 20:46:27
diff --git a/auth-passwd.c b/auth-passwd.c
index 17bbd2ce..185db7d6 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -81,6 +81,9 @@ RCSID("$OpenBSD: auth-passwd.c,v 1.27 2002/05/24 16:45:16 stevesk Exp $");
 #endif /* !USE_PAM && !HAVE_OSF_SIA */
 
 extern ServerOptions options;
+#ifdef WITH_AIXAUTHENTICATE
+extern char *aixloginmsg;
+#endif
 
 /*
  * Tries to authenticate the user using password.  Returns true if
@@ -113,7 +116,7 @@ auth_password(Authctxt *authctxt, const char *password)
 #endif
 #ifdef WITH_AIXAUTHENTICATE
 	char *authmsg;
-	char *loginmsg;
+	int authsuccess;
 	int reenter = 1;
 #endif
 
@@ -145,7 +148,16 @@ auth_password(Authctxt *authctxt, const char *password)
 	}
 #endif
 #ifdef WITH_AIXAUTHENTICATE
-	return (authenticate(pw->pw_name,password,&reenter,&authmsg) == 0);
+	authsuccess = (authenticate(pw->pw_name,password,&reenter,&authmsg) == 0);
+
+	if (authsuccess)
+	        /* We don't have a pty yet, so just label the line as "ssh" */
+	        if (loginsuccess(authctxt->user,
+			get_canonical_hostname(options.verify_reverse_mapping),
+			"ssh", &aixloginmsg) < 0)
+				aixloginmsg = NULL;
+
+	return(authsuccess);
 #endif
 #ifdef KRB4
 	if (options.kerberos_authentication == 1) {
diff --git a/session.c b/session.c
index ed489214..0ccd2006 100644
--- a/session.c
+++ b/session.c
@@ -210,13 +210,6 @@ do_authenticated(Authctxt *authctxt)
 		close(startup_pipe);
 		startup_pipe = -1;
 	}
-#ifdef WITH_AIXAUTHENTICATE
-	/* We don't have a pty yet, so just label the line as "ssh" */
-	if (loginsuccess(authctxt->user,
-	    get_canonical_hostname(options.verify_reverse_mapping),
-	    "ssh", &aixloginmsg) < 0)
-		aixloginmsg = NULL;
-#endif /* WITH_AIXAUTHENTICATE */
 
 	/* setup the channel layer */
 	if (!no_port_forwarding_flag && options.allow_tcp_forwarding)