diff options
Diffstat (limited to 'auth2.c')
-rw-r--r-- | auth2.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -218,6 +218,12 @@ input_userauth_request(int type, int plen, void *ctxt) | |||
218 | /* reset state */ | 218 | /* reset state */ |
219 | dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, &protocol_error); | 219 | dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, &protocol_error); |
220 | authctxt->postponed = 0; | 220 | authctxt->postponed = 0; |
221 | #ifdef BSD_AUTH | ||
222 | if (authctxt->as) { | ||
223 | auth_close(authctxt->as); | ||
224 | authctxt->as = NULL; | ||
225 | } | ||
226 | #endif | ||
221 | 227 | ||
222 | /* try to authenticate user */ | 228 | /* try to authenticate user */ |
223 | m = authmethod_lookup(method); | 229 | m = authmethod_lookup(method); |
@@ -341,7 +347,7 @@ userauth_none(Authctxt *authctxt) | |||
341 | #elif defined(HAVE_OSF_SIA) | 347 | #elif defined(HAVE_OSF_SIA) |
342 | return 0; | 348 | return 0; |
343 | #else /* !HAVE_OSF_SIA && !USE_PAM */ | 349 | #else /* !HAVE_OSF_SIA && !USE_PAM */ |
344 | return auth_password(authctxt->pw, ""); | 350 | return auth_password(authctxt, ""); |
345 | #endif /* USE_PAM */ | 351 | #endif /* USE_PAM */ |
346 | } | 352 | } |
347 | 353 | ||
@@ -366,7 +372,7 @@ userauth_passwd(Authctxt *authctxt) | |||
366 | #elif defined(HAVE_OSF_SIA) | 372 | #elif defined(HAVE_OSF_SIA) |
367 | auth_sia_password(authctxt->user, password) == 1) | 373 | auth_sia_password(authctxt->user, password) == 1) |
368 | #else /* !USE_PAM && !HAVE_OSF_SIA */ | 374 | #else /* !USE_PAM && !HAVE_OSF_SIA */ |
369 | auth_password(authctxt->pw, password) == 1) | 375 | auth_password(authctxt, password) == 1) |
370 | #endif /* USE_PAM */ | 376 | #endif /* USE_PAM */ |
371 | authenticated = 1; | 377 | authenticated = 1; |
372 | memset(password, 0, len); | 378 | memset(password, 0, len); |