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

This commit is contained in:
Ben Lindstrom 2002-07-04 00:27:21 +00:00
parent 5d35a2f582
commit e06eb68226
4 changed files with 11 additions and 14 deletions

View File

@ -56,7 +56,8 @@
/etc/ssh/ssh_config and exit if HostbasedAuthentication is disabled /etc/ssh/ssh_config and exit if HostbasedAuthentication is disabled
globally. based on discussions with deraadt, itojun and sommerfeld; globally. based on discussions with deraadt, itojun and sommerfeld;
ok itojun@ ok itojun@
- (bal) Failed password attempts don't increment counter on AIX. Bug #145
20020702 20020702
- (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc &
friends consistently. Spotted by Solar Designer <solar@openwall.com> friends consistently. Spotted by Solar Designer <solar@openwall.com>
@ -1264,4 +1265,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (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 $

8
auth.c
View File

@ -256,6 +256,14 @@ auth_log(Authctxt *authctxt, int authenticated, char *method, char *info)
get_remote_ipaddr(), get_remote_ipaddr(),
get_remote_port(), get_remote_port(),
info); 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 */
} }
/* /*

View File

@ -323,12 +323,6 @@ do_authloop(Authctxt *authctxt)
return; return;
if (authctxt->failures++ > AUTH_FAIL_MAX) { 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); packet_disconnect(AUTH_FAIL_MSG, authctxt->user);
} }

View File

@ -232,12 +232,6 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method)
authctxt->success = 1; authctxt->success = 1;
} else { } else {
if (authctxt->failures++ > AUTH_FAIL_MAX) { 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); packet_disconnect(AUTH_FAIL_MSG, authctxt->user);
} }
methods = authmethods_get(); methods = authmethods_get();