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 30dae967cacfcae90389ed21650aff038aa19247..3a5a31a88d140e09191d4710ab74703a6e5e67aa 100644 (file)
--- 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 17bbd2ceba0db51ed7422a2450b662a13a1a1d6e..185db7d6df95c2bce4b2f8b84337a26375b49940 100644 (file)
--- 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 ed489214db7e7a54f44c15d0ed98d7b8eab3b413..0ccd2006d92fbb6d63a06d3b6ec637d79e144e5f 100644 (file)
--- 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)