- (djm) Swapped tests for no_libsocket and no_libnsl in configure.in.

[openssh.git] / auth1.c

diff --git a/auth1.c b/auth1.c
index ee7aac4824b2743a8f61eea676f41c20c1998a7e..11c56a51983e2a569442776dae8f2059d2356937 100644 (file)
--- a/auth1.c
+++ b/auth1.c
@@ -10,12 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth1.c,v 1.15 2001/02/07 22:35:45 markus Exp $");
-
-#ifdef HAVE_OSF_SIA
-# include <sia.h>
-# include <siad.h>
-#endif
+RCSID("$OpenBSD: auth1.c,v 1.17 2001/02/13 22:49:40 markus Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -36,10 +31,6 @@ extern char *forced_command;
 #ifdef WITH_AIXAUTHENTICATE
 extern char *aixloginmsg;
 #endif /* WITH_AIXAUTHENTICATE */
-#ifdef HAVE_OSF_SIA
-extern int saved_argc;
-extern char **saved_argv;
-#endif /* HAVE_OSF_SIA */
 
 /*
  * convert ssh auth msg type into description
@@ -97,7 +88,9 @@ do_authloop(Authctxt *authctxt)
            (!options.kerberos_authentication || options.kerberos_or_local_passwd) &&
 #endif
 #ifdef USE_PAM
-           auth_pam_password(pw, password)) {
+           auth_pam_password(pw, "")) {
+#elif defined(HAVE_OSF_SIA)
+           0) {
 #else
            auth_password(pw, "")) {
 #endif
@@ -265,11 +258,8 @@ 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(options.reverse_mapping_check),
-                           pw->pw_name, NULL, 0, NULL, password) == SIASUCCESS) {
-                               authenticated = 1;
-                       }
+                       authenticated = auth_sia_password(authctxt->user, 
+                           password);
 #else /* !USE_PAM && !HAVE_OSF_SIA */
                        /* Try authentication with the password. */
                        authenticated = auth_password(pw, password);
@@ -326,7 +316,8 @@ do_authloop(Authctxt *authctxt)
                }
 #else
                /* Special handling for root */
-               if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed())
+               if (authenticated && authctxt->pw->pw_uid == 0 &&
+                   !auth_root_allowed(get_authname(type)))
                        authenticated = 0;
 #endif
 #ifdef USE_PAM
@@ -387,8 +378,6 @@ do_authentication()
        authctxt->user = user;
        authctxt->style = style;
 
-       setproctitle("%s", user);
-
        /* Verify that the user is a valid user. */
        pw = getpwnam(user);
        if (pw && allowed_user(pw)) {
@@ -400,6 +389,8 @@ do_authentication()
        }
        authctxt->pw = pw;
 
+       setproctitle("%s", pw ? user : "unknown");
+
 #ifdef USE_PAM
        if (pw)
                start_pam(user);