missed sshconnect.c part of:

[openssh.git] / auth1.c

diff --git a/auth1.c b/auth1.c
index 6e9808e5ec75221dfb6361f5982fbcbf3e7282e3..ee7aac4824b2743a8f61eea676f41c20c1998a7e 100644 (file)
--- a/auth1.c
+++ b/auth1.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth1.c,v 1.14 2001/01/22 23:06:39 markus Exp $");
+RCSID("$OpenBSD: auth1.c,v 1.15 2001/02/07 22:35:45 markus Exp $");
 
 #ifdef HAVE_OSF_SIA
 # include <sia.h>
@@ -265,9 +265,9 @@ do_authloop(Authctxt *authctxt)
                        authenticated = auth_pam_password(pw, password);
 #elif defined(HAVE_OSF_SIA)
                        /* Do SIA auth with password */
-                       if (sia_validate_user(NULL, saved_argc, saved_argv, 
-                               get_canonical_hostname(), pw->pw_name, NULL, 0, 
-                               NULL, password) == SIASUCCESS) {
+                       if (sia_validate_user(NULL, saved_argc, saved_argv,
+                           get_canonical_hostname(options.reverse_mapping_check),
+                           pw->pw_name, NULL, 0, NULL, password) == SIASUCCESS) {
                                authenticated = 1;
                        }
 #else /* !USE_PAM && !HAVE_OSF_SIA */
@@ -317,8 +317,8 @@ do_authloop(Authctxt *authctxt)
                        fatal("INTERNAL ERROR: authenticated invalid user %s",
                            authctxt->user);
 
-#ifdef HAVE_CYGWIN             
-               if (authenticated && 
+#ifdef HAVE_CYGWIN
+               if (authenticated &&
                    !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD,pw->pw_uid)) {
                        packet_disconnect("Authentication rejected for uid %d.",
                        (int)pw->pw_uid);
@@ -329,7 +329,7 @@ do_authloop(Authctxt *authctxt)
                if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed())
                        authenticated = 0;
 #endif
-#ifdef USE_PAM                 
+#ifdef USE_PAM
                if (authenticated && !do_pam_account(pw->pw_name, client_user))
                        authenticated = 0;
 #endif
@@ -346,8 +346,10 @@ do_authloop(Authctxt *authctxt)
                        return;
 
                if (authctxt->failures++ > AUTH_FAIL_MAX) {
-#ifdef WITH_AIXAUTHENTICATE 
-                       loginfailed(user,get_canonical_hostname(),"ssh");
+#ifdef WITH_AIXAUTHENTICATE
+                       loginfailed(authctxt->user,
+                           get_canonical_hostname(options.reverse_mapping_check),
+                           "ssh");
 #endif /* WITH_AIXAUTHENTICATE */
                        packet_disconnect(AUTH_FAIL_MSG, authctxt->user);
                }
@@ -387,14 +389,6 @@ do_authentication()
 
        setproctitle("%s", user);
 
-#ifdef AFS
-       /* If machine has AFS, set process authentication group. */
-       if (k_hasafs()) {
-               k_setpag();
-               k_unlog();
-       }
-#endif /* AFS */
-
        /* Verify that the user is a valid user. */
        pw = getpwnam(user);
        if (pw && allowed_user(pw)) {
@@ -433,7 +427,9 @@ do_authentication()
 
 #ifdef WITH_AIXAUTHENTICATE
        /* We don't have a pty yet, so just label the line as "ssh" */
-       if (loginsuccess(authctxt->user,get_canonical_hostname(),"ssh",&aixloginmsg) < 0)
+       if (loginsuccess(authctxt->user,
+           get_canonical_hostname(options.reverse_mapping_check),
+           "ssh", &aixloginmsg) < 0)
                aixloginmsg = NULL;
 #endif /* WITH_AIXAUTHENTICATE */