NB: big update - may break stuff. Please test!

[openssh.git] / auth2.c

diff --git a/auth2.c b/auth2.c
index cff34c602a87435b92244db3e6a4479e0c4ca643..5f8b4234012c190837bd6b3950dd36842e803deb 100644 (file)
--- a/auth2.c
+++ b/auth2.c
@@ -310,7 +310,8 @@ userauth_reply(Authctxt *authctxt, int authenticated)
 #ifdef WITH_AIXAUTHENTICATE
                /* We don't have a pty yet, so just label the line as "ssh" */
                if (loginsuccess(authctxt->user?authctxt->user:"NOUSER", 
-                       get_canonical_hostname(), "ssh", &aixloginmsg) < 0)
+                   get_canonical_hostname(options.reverse_mapping_check), 
+                   "ssh", &aixloginmsg) < 0)
                        aixloginmsg = NULL;
 #endif /* WITH_AIXAUTHENTICATE */
                /* turn off userauth */
@@ -354,8 +355,9 @@ userauth_none(Authctxt *authctxt)
        return auth_pam_password(authctxt->pw, "");
 #elif defined(HAVE_OSF_SIA)
        return (sia_validate_user(NULL, saved_argc, saved_argv, 
-               get_canonical_hostname(), authctxt->user?authctxt->user:"NOUSER", 
-                       NULL, 0, NULL, "") == SIASUCCESS);
+           get_canonical_hostname(options.reverse_mapping_check), 
+           authctxt->user?authctxt->user:"NOUSER", NULL, 0, 
+           NULL, "") == SIASUCCESS);
 #else /* !HAVE_OSF_SIA && !USE_PAM */
        return auth_password(authctxt->pw, "");
 #endif /* USE_PAM */
@@ -381,8 +383,9 @@ userauth_passwd(Authctxt *authctxt)
            auth_pam_password(authctxt->pw, password) == 1)
 #elif defined(HAVE_OSF_SIA)
            sia_validate_user(NULL, saved_argc, saved_argv, 
-                       get_canonical_hostname(), authctxt->user?authctxt->user:"NOUSER", 
-                       NULL, 0, NULL, password) == SIASUCCESS)
+           get_canonical_hostname(options.reverse_mapping_check), 
+           authctxt->user?authctxt->user:"NOUSER", NULL, 0, NULL, 
+           password) == SIASUCCESS)
 #else /* !USE_PAM && !HAVE_OSF_SIA */
            auth_password(authctxt->pw, password) == 1)
 #endif /* USE_PAM */