- markus@cvs.openbsd.org 2002/02/11 16:19:39

[openssh.git] / auth-passwd.c

diff --git a/auth-passwd.c b/auth-passwd.c
index d53a9ea2d7b7e770201d5c31f929017d83eb1cf0..3546636aa5f926ad632d45cc2bc0b706abb9d06c 100644 (file)
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-passwd.c,v 1.22 2001/03/20 18:57:04 markus Exp $");
+RCSID("$OpenBSD: auth-passwd.c,v 1.23 2001/06/26 16:15:23 dugsong Exp $");
 
 #if !defined(USE_PAM) && !defined(HAVE_OSF_SIA)
 
@@ -128,14 +128,14 @@ auth_password(Authctxt *authctxt, const char *password)
 #endif
        if (*password == '\0' && options.permit_empty_passwd == 0)
                return 0;
-#ifdef BSD_AUTH
-       if (auth_userokay(pw->pw_name, authctxt->style, "auth-ssh",
-           (char *)password) == 0)
-               return 0;
-       else
-               return 1;
+#ifdef KRB5
+       if (options.kerberos_authentication == 1) {
+               int ret = auth_krb5_password(authctxt, password);
+               if (ret == 1 || ret == 0)
+                       return ret;
+               /* Fall back to ordinary passwd authentication. */
+       }
 #endif
-
 #ifdef HAVE_CYGWIN
        if (is_winnt) {
                HANDLE hToken = cygwin_logon_user(pw, password);
@@ -146,21 +146,24 @@ auth_password(Authctxt *authctxt, const char *password)
                return 1;
        }
 #endif
-
 #ifdef WITH_AIXAUTHENTICATE
        return (authenticate(pw->pw_name,password,&reenter,&authmsg) == 0);
 #endif
-
 #ifdef KRB4
        if (options.kerberos_authentication == 1) {
-               int ret = auth_krb4_password(pw, password);
+               int ret = auth_krb4_password(authctxt, password);
                if (ret == 1 || ret == 0)
                        return ret;
                /* Fall back to ordinary passwd authentication. */
        }
 #endif
-
-
+#ifdef BSD_AUTH
+       if (auth_userokay(pw->pw_name, authctxt->style, "auth-ssh",
+           (char *)password) == 0)
+               return 0;
+       else
+               return 1;
+#endif
        pw_password = pw->pw_passwd;
 
        /*
@@ -209,7 +212,11 @@ auth_password(Authctxt *authctxt, const char *password)
        else
                encrypted_password = crypt(password, salt);
 # else
+#  ifdef HAVE_SCO_PROTECTED_PW
+       encrypted_password = bigcrypt(password, salt);
+#  else
        encrypted_password = crypt(password, salt);
+#  endif /* HAVE_SCO_PROTECTED_PW */
 # endif /* __hpux */
 #endif /* HAVE_MD5_PASSWORDS */