- (bal) Failed password attempts don't increment counter on AIX. Bug #145

4 files changed, 11 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 1e5ce7ad..e9021d45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,7 +56,8 @@
      /etc/ssh/ssh_config and exit if HostbasedAuthentication is disabled 
      globally. based on discussions with deraadt, itojun and sommerfeld; 
      ok itojun@
-
+ - (bal) Failed password attempts don't increment counter on AIX. Bug #145
+  
 20020702
  - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & 
    friends consistently. Spotted by Solar Designer <solar@openwall.com>
@@ -1264,4 +1265,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2329 2002/07/04 00:19:40 mouring Exp $
+$Id: ChangeLog,v 1.2330 2002/07/04 00:27:21 mouring Exp $
diff --git a/auth.c b/auth.c
index 066b50d6..693826a9 100644
--- a/auth.c
+++ b/auth.c
@@ -256,6 +256,14 @@ auth_log(Authctxt *authctxt, int authenticated, char *method, char *info)
 	    get_remote_ipaddr(),
 	    get_remote_port(),
 	    info);
+
+#ifdef WITH_AIXAUTHENTICATE
+	if (authenticated == 0 && strcmp(method, "password") == 0)
+	    loginfailed(authctxt->user,
+		get_canonical_hostname(options.verify_reverse_mapping),
+		"ssh");
+#endif /* WITH_AIXAUTHENTICATE */
+
 }
 
 /*
diff --git a/auth1.c b/auth1.c
index 2ebc8d03..769fa306 100644
--- a/auth1.c
+++ b/auth1.c
@@ -323,12 +323,6 @@ do_authloop(Authctxt *authctxt)
 			return;
 
 		if (authctxt->failures++ > AUTH_FAIL_MAX) {
-#ifdef WITH_AIXAUTHENTICATE
-			/* XXX: privsep */
-			loginfailed(authctxt->user,
-			    get_canonical_hostname(options.verify_reverse_mapping),
-			    "ssh");
-#endif /* WITH_AIXAUTHENTICATE */
 			packet_disconnect(AUTH_FAIL_MSG, authctxt->user);
 		}
 
diff --git a/auth2.c b/auth2.c
index eea381d9..3b47a6d0 100644
--- a/auth2.c
+++ b/auth2.c
@@ -232,12 +232,6 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method)
 		authctxt->success = 1;
 	} else {
 		if (authctxt->failures++ > AUTH_FAIL_MAX) {
-#ifdef WITH_AIXAUTHENTICATE
-			/* XXX: privsep */
-			loginfailed(authctxt->user,
-			    get_canonical_hostname(options.verify_reverse_mapping),
-			    "ssh");
-#endif /* WITH_AIXAUTHENTICATE */
 			packet_disconnect(AUTH_FAIL_MSG, authctxt->user);
 		}
 		methods = authmethods_get();