summaryrefslogtreecommitdiff
path: root/auth1.c
diff options
context:
space:
mode:
Diffstat (limited to 'auth1.c')
-rw-r--r--auth1.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/auth1.c b/auth1.c
index 750fa5b53..1feedc9ac 100644
--- a/auth1.c
+++ b/auth1.c
@@ -265,8 +265,8 @@ do_authloop(Authctxt *authctxt)
265 authenticated = auth_pam_password(pw, password); 265 authenticated = auth_pam_password(pw, password);
266#elif defined(HAVE_OSF_SIA) 266#elif defined(HAVE_OSF_SIA)
267 /* Do SIA auth with password */ 267 /* Do SIA auth with password */
268 if (sia_validate_user(NULL, saved_argc, saved_argv, 268 if (sia_validate_user(NULL, saved_argc, saved_argv,
269 get_canonical_hostname(options.reverse_mapping_check), 269 get_canonical_hostname(options.reverse_mapping_check),
270 pw->pw_name, NULL, 0, NULL, password) == SIASUCCESS) { 270 pw->pw_name, NULL, 0, NULL, password) == SIASUCCESS) {
271 authenticated = 1; 271 authenticated = 1;
272 } 272 }
@@ -317,8 +317,8 @@ do_authloop(Authctxt *authctxt)
317 fatal("INTERNAL ERROR: authenticated invalid user %s", 317 fatal("INTERNAL ERROR: authenticated invalid user %s",
318 authctxt->user); 318 authctxt->user);
319 319
320#ifdef HAVE_CYGWIN 320#ifdef HAVE_CYGWIN
321 if (authenticated && 321 if (authenticated &&
322 !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD,pw->pw_uid)) { 322 !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD,pw->pw_uid)) {
323 packet_disconnect("Authentication rejected for uid %d.", 323 packet_disconnect("Authentication rejected for uid %d.",
324 (int)pw->pw_uid); 324 (int)pw->pw_uid);
@@ -329,7 +329,7 @@ do_authloop(Authctxt *authctxt)
329 if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed()) 329 if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed())
330 authenticated = 0; 330 authenticated = 0;
331#endif 331#endif
332#ifdef USE_PAM 332#ifdef USE_PAM
333 if (authenticated && !do_pam_account(pw->pw_name, client_user)) 333 if (authenticated && !do_pam_account(pw->pw_name, client_user))
334 authenticated = 0; 334 authenticated = 0;
335#endif 335#endif
@@ -346,9 +346,9 @@ do_authloop(Authctxt *authctxt)
346 return; 346 return;
347 347
348 if (authctxt->failures++ > AUTH_FAIL_MAX) { 348 if (authctxt->failures++ > AUTH_FAIL_MAX) {
349#ifdef WITH_AIXAUTHENTICATE 349#ifdef WITH_AIXAUTHENTICATE
350 loginfailed(authctxt->user, 350 loginfailed(authctxt->user,
351 get_canonical_hostname(options.reverse_mapping_check), 351 get_canonical_hostname(options.reverse_mapping_check),
352 "ssh"); 352 "ssh");
353#endif /* WITH_AIXAUTHENTICATE */ 353#endif /* WITH_AIXAUTHENTICATE */
354 packet_disconnect(AUTH_FAIL_MSG, authctxt->user); 354 packet_disconnect(AUTH_FAIL_MSG, authctxt->user);
@@ -435,7 +435,7 @@ do_authentication()
435 435
436#ifdef WITH_AIXAUTHENTICATE 436#ifdef WITH_AIXAUTHENTICATE
437 /* We don't have a pty yet, so just label the line as "ssh" */ 437 /* We don't have a pty yet, so just label the line as "ssh" */
438 if (loginsuccess(authctxt->user, 438 if (loginsuccess(authctxt->user,
439 get_canonical_hostname(options.reverse_mapping_check), 439 get_canonical_hostname(options.reverse_mapping_check),
440 "ssh", &aixloginmsg) < 0) 440 "ssh", &aixloginmsg) < 0)
441 aixloginmsg = NULL; 441 aixloginmsg = NULL;