diff options
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | auth2.c | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -1,6 +1,7 @@ | |||
1 | 20001028 | 1 | 20001028 |
2 | - (djm) fix select hack in serverloop.c from Philippe WILLEM | 2 | - (djm) fix select hack in serverloop.c from Philippe WILLEM |
3 | <Philippe.WILLEM@urssaf.fr> | 3 | <Philippe.WILLEM@urssaf.fr> |
4 | - (djm) Fix mangled AIXAUTHENTICATE code | ||
4 | 5 | ||
5 | 20001027 | 6 | 20001027 |
6 | - (djm) Increase REKEY_BYTES to 2^24 for arc4random | 7 | - (djm) Increase REKEY_BYTES to 2^24 for arc4random |
@@ -193,7 +193,7 @@ input_userauth_request(int type, int plen, void *ctxt) | |||
193 | fatal("input_userauth_request: no authctxt"); | 193 | fatal("input_userauth_request: no authctxt"); |
194 | if (authctxt->attempt++ >= AUTH_FAIL_MAX) { | 194 | if (authctxt->attempt++ >= AUTH_FAIL_MAX) { |
195 | #ifdef WITH_AIXAUTHENTICATE | 195 | #ifdef WITH_AIXAUTHENTICATE |
196 | loginfailed(user,get_canonical_hostname(),"ssh"); | 196 | loginfailed(authctxt->pw->pw_name, get_canonical_hostname(), "ssh"); |
197 | #endif /* WITH_AIXAUTHENTICATE */ | 197 | #endif /* WITH_AIXAUTHENTICATE */ |
198 | packet_disconnect("too many failed userauth_requests"); | 198 | packet_disconnect("too many failed userauth_requests"); |
199 | } | 199 | } |
@@ -306,8 +306,8 @@ userauth_reply(Authctxt *authctxt, int authenticated) | |||
306 | if (authenticated == 1) { | 306 | if (authenticated == 1) { |
307 | #ifdef WITH_AIXAUTHENTICATE | 307 | #ifdef WITH_AIXAUTHENTICATE |
308 | /* We don't have a pty yet, so just label the line as "ssh" */ | 308 | /* We don't have a pty yet, so just label the line as "ssh" */ |
309 | if (loginsuccess(user, get_canonical_hostname(), "ssh", | 309 | if (loginsuccess(authctxt->pw->pw_name, get_canonical_hostname(), |
310 | &aixloginmsg) < 0) | 310 | "ssh", &aixloginmsg) < 0) |
311 | aixloginmsg = NULL; | 311 | aixloginmsg = NULL; |
312 | #endif /* WITH_AIXAUTHENTICATE */ | 312 | #endif /* WITH_AIXAUTHENTICATE */ |
313 | /* turn off userauth */ | 313 | /* turn off userauth */ |