diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth.c | 8 | ||||
-rw-r--r-- | auth1.c | 6 | ||||
-rw-r--r-- | auth2.c | 6 |
4 files changed, 11 insertions, 14 deletions
@@ -56,7 +56,8 @@ | |||
56 | /etc/ssh/ssh_config and exit if HostbasedAuthentication is disabled | 56 | /etc/ssh/ssh_config and exit if HostbasedAuthentication is disabled |
57 | globally. based on discussions with deraadt, itojun and sommerfeld; | 57 | globally. based on discussions with deraadt, itojun and sommerfeld; |
58 | ok itojun@ | 58 | ok itojun@ |
59 | 59 | - (bal) Failed password attempts don't increment counter on AIX. Bug #145 | |
60 | |||
60 | 20020702 | 61 | 20020702 |
61 | - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & | 62 | - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & |
62 | friends consistently. Spotted by Solar Designer <solar@openwall.com> | 63 | friends consistently. Spotted by Solar Designer <solar@openwall.com> |
@@ -1264,4 +1265,4 @@ | |||
1264 | - (stevesk) entropy.c: typo in debug message | 1265 | - (stevesk) entropy.c: typo in debug message |
1265 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1266 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1266 | 1267 | ||
1267 | $Id: ChangeLog,v 1.2329 2002/07/04 00:19:40 mouring Exp $ | 1268 | $Id: ChangeLog,v 1.2330 2002/07/04 00:27:21 mouring Exp $ |
@@ -256,6 +256,14 @@ auth_log(Authctxt *authctxt, int authenticated, char *method, char *info) | |||
256 | get_remote_ipaddr(), | 256 | get_remote_ipaddr(), |
257 | get_remote_port(), | 257 | get_remote_port(), |
258 | info); | 258 | info); |
259 | |||
260 | #ifdef WITH_AIXAUTHENTICATE | ||
261 | if (authenticated == 0 && strcmp(method, "password") == 0) | ||
262 | loginfailed(authctxt->user, | ||
263 | get_canonical_hostname(options.verify_reverse_mapping), | ||
264 | "ssh"); | ||
265 | #endif /* WITH_AIXAUTHENTICATE */ | ||
266 | |||
259 | } | 267 | } |
260 | 268 | ||
261 | /* | 269 | /* |
@@ -323,12 +323,6 @@ do_authloop(Authctxt *authctxt) | |||
323 | return; | 323 | return; |
324 | 324 | ||
325 | if (authctxt->failures++ > AUTH_FAIL_MAX) { | 325 | if (authctxt->failures++ > AUTH_FAIL_MAX) { |
326 | #ifdef WITH_AIXAUTHENTICATE | ||
327 | /* XXX: privsep */ | ||
328 | loginfailed(authctxt->user, | ||
329 | get_canonical_hostname(options.verify_reverse_mapping), | ||
330 | "ssh"); | ||
331 | #endif /* WITH_AIXAUTHENTICATE */ | ||
332 | packet_disconnect(AUTH_FAIL_MSG, authctxt->user); | 326 | packet_disconnect(AUTH_FAIL_MSG, authctxt->user); |
333 | } | 327 | } |
334 | 328 | ||
@@ -232,12 +232,6 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method) | |||
232 | authctxt->success = 1; | 232 | authctxt->success = 1; |
233 | } else { | 233 | } else { |
234 | if (authctxt->failures++ > AUTH_FAIL_MAX) { | 234 | if (authctxt->failures++ > AUTH_FAIL_MAX) { |
235 | #ifdef WITH_AIXAUTHENTICATE | ||
236 | /* XXX: privsep */ | ||
237 | loginfailed(authctxt->user, | ||
238 | get_canonical_hostname(options.verify_reverse_mapping), | ||
239 | "ssh"); | ||
240 | #endif /* WITH_AIXAUTHENTICATE */ | ||
241 | packet_disconnect(AUTH_FAIL_MSG, authctxt->user); | 235 | packet_disconnect(AUTH_FAIL_MSG, authctxt->user); |
242 | } | 236 | } |
243 | methods = authmethods_get(); | 237 | methods = authmethods_get(); |