diff options
-rw-r--r-- | auth1.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -271,7 +271,7 @@ do_authloop(Authctxt *authctxt) | |||
271 | authenticated = 1; | 271 | authenticated = 1; |
272 | } | 272 | } |
273 | #else /* !USE_PAM && !HAVE_OSF_SIA */ | 273 | #else /* !USE_PAM && !HAVE_OSF_SIA */ |
274 | /* Try authentication with the password. */ | 274 | /* Try authentication with the password. */ |
275 | authenticated = auth_password(pw, password); | 275 | authenticated = auth_password(pw, password); |
276 | #endif /* USE_PAM */ | 276 | #endif /* USE_PAM */ |
277 | 277 | ||
@@ -293,7 +293,6 @@ do_authloop(Authctxt *authctxt) | |||
293 | } | 293 | } |
294 | } | 294 | } |
295 | break; | 295 | break; |
296 | |||
297 | case SSH_CMSG_AUTH_TIS_RESPONSE: | 296 | case SSH_CMSG_AUTH_TIS_RESPONSE: |
298 | debug("rcvd SSH_CMSG_AUTH_TIS_RESPONSE"); | 297 | debug("rcvd SSH_CMSG_AUTH_TIS_RESPONSE"); |
299 | if (options.challenge_reponse_authentication == 1) { | 298 | if (options.challenge_reponse_authentication == 1) { |
@@ -346,7 +345,7 @@ do_authloop(Authctxt *authctxt) | |||
346 | if (authenticated) | 345 | if (authenticated) |
347 | return; | 346 | return; |
348 | 347 | ||
349 | if (authctxt->failures++ > AUTH_FAIL_MAX) { | 348 | if (authctxt->failures++ > AUTH_FAIL_MAX) { |
350 | #ifdef WITH_AIXAUTHENTICATE | 349 | #ifdef WITH_AIXAUTHENTICATE |
351 | loginfailed(user,get_canonical_hostname(),"ssh"); | 350 | loginfailed(user,get_canonical_hostname(),"ssh"); |
352 | #endif /* WITH_AIXAUTHENTICATE */ | 351 | #endif /* WITH_AIXAUTHENTICATE */ |
@@ -422,9 +421,9 @@ do_authentication() | |||
422 | #endif | 421 | #endif |
423 | 422 | ||
424 | /* | 423 | /* |
425 | * Loop until the user has been authenticated or the connection is | 424 | * Loop until the user has been authenticated or the connection is |
426 | * closed, do_authloop() returns only if authentication is successful | 425 | * closed, do_authloop() returns only if authentication is successful |
427 | */ | 426 | */ |
428 | do_authloop(authctxt); | 427 | do_authloop(authctxt); |
429 | 428 | ||
430 | /* The user has been authenticated and accepted. */ | 429 | /* The user has been authenticated and accepted. */ |