- (djm) Replace ut_name with ut_user. Patch from Jim Watt

[openssh.git] / auth1.c

diff --git a/auth1.c b/auth1.c
index 0d440e5214407894133c0fce02b65e9b09f7fcd3..d8f2652e36d0db01c039379c013bdb61666db324 100644 (file)
--- a/auth1.c
+++ b/auth1.c
@@ -26,6 +26,10 @@ RCSID("$OpenBSD: auth1.c,v 1.2 2000/04/29 18:11:52 markus Exp $");
 /* import */
 extern ServerOptions options;
 extern char *forced_command;
+#ifdef HAVE_OSF_SIA
+extern int saved_argc;
+extern char **saved_argv;
+#endif /* HAVE_OSF_SIA */
 
 /*
  * convert ssh auth msg type into description
@@ -146,10 +150,6 @@ do_authloop(struct passwd * pw)
        unsigned int ulen;
        int type = 0;
        void (*authlog) (const char *fmt,...) = verbose;
-#ifdef HAVE_OSF_SIA
-       extern int saved_argc;
-       extern char **saved_argv;
-#endif /* HAVE_OSF_SIA */
 
        /* Indicate that authentication is needed. */
        packet_start(SSH_SMSG_FAILURE);
@@ -310,7 +310,6 @@ do_authloop(struct passwd * pw)
                        authenticated = auth_pam_password(pw, password);
 #elif defined(HAVE_OSF_SIA)
                        /* Do SIA auth with password */
-                       host = get_canonical_hostname();
                        if (sia_validate_user(NULL, saved_argc, saved_argv, 
                                get_canonical_hostname(), pw->pw_name, NULL, 0, 
                                NULL, password) == SIASUCCESS) {
@@ -505,7 +504,11 @@ do_authentication()
 #endif /* KRB4 */
 #ifdef USE_PAM
            auth_pam_password(pw, "")) {
-#else /* USE_PAM */
+#elif defined(HAVE_OSF_SIA)
+           (sia_validate_user(NULL, saved_argc, saved_argv, 
+           get_canonical_hostname(), pw->pw_name, NULL, 0, NULL, 
+           "") == SIASUCCESS)) {
+#else /* !HAVE_OSF_SIA && !USE_PAM */
            auth_password(pw, "")) {
 #endif /* USE_PAM */
                /* Authentication with empty password succeeded. */