- 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 541aca607a2a1f81295e2d7675b2fc2f2d020345..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.20 2001/01/21 19:05:42 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)
 
@@ -46,6 +46,9 @@ RCSID("$OpenBSD: auth-passwd.c,v 1.20 2001/01/21 19:05:42 markus Exp $");
 #include "servconf.h"
 #include "auth.h"
 
+#ifdef HAVE_CRYPT_H
+# include <crypt.h>
+#endif
 #ifdef WITH_AIXAUTHENTICATE
 # include <login.h>
 #endif
@@ -77,14 +80,17 @@ RCSID("$OpenBSD: auth-passwd.c,v 1.20 2001/01/21 19:05:42 markus Exp $");
 #define is_winnt       (GetVersion() < 0x80000000)
 #endif
 
+
+extern ServerOptions options;
+
 /*
  * Tries to authenticate the user using password.  Returns true if
  * authentication succeeds.
  */
 int
-auth_password(struct passwd * pw, const char *password)
+auth_password(Authctxt *authctxt, const char *password)
 {
-       extern ServerOptions options;
+       struct passwd * pw = authctxt->pw;
        char *encrypted_password;
        char *pw_password;
        char *salt;
@@ -110,7 +116,7 @@ auth_password(struct passwd * pw, const char *password)
        if (pw == NULL)
                return 0;
 #ifndef HAVE_CYGWIN
-       if (pw->pw_uid == 0 && options.permit_root_login == 2)
+       if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
                return 0;
 #endif
 #ifdef HAVE_CYGWIN
@@ -118,11 +124,18 @@ auth_password(struct passwd * pw, const char *password)
         * Empty password is only possible on NT if the user has _really_
         * an empty password and authentication is done, though.
         */
-        if (!is_winnt) 
+       if (!is_winnt)
 #endif
        if (*password == '\0' && options.permit_empty_passwd == 0)
                return 0;
-
+#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);
@@ -133,21 +146,24 @@ auth_password(struct passwd * pw, 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;
 
        /*
@@ -155,13 +171,13 @@ auth_password(struct passwd * pw, const char *password)
         */
 #if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
        spw = getspnam(pw->pw_name);
-       if (spw != NULL) 
+       if (spw != NULL)
                pw_password = spw->sp_pwdp;
 #endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */
 
 #ifdef HAVE_SCO_PROTECTED_PW
        spw = getprpwnam(pw->pw_name);
-       if (spw != NULL) 
+       if (spw != NULL)
                pw_password = spw->ufld.fd_encrypt;
 #endif /* HAVE_SCO_PROTECTED_PW */
 
@@ -189,16 +205,20 @@ auth_password(struct passwd * pw, const char *password)
                encrypted_password = md5_crypt(password, salt);
        else
                encrypted_password = crypt(password, salt);
-#else /* HAVE_MD5_PASSWORDS */    
+#else /* HAVE_MD5_PASSWORDS */
 # ifdef __hpux
        if (iscomsec())
                encrypted_password = bigcrypt(password, salt);
        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 */    
+#endif /* HAVE_MD5_PASSWORDS */
 
        /* Authentication is accepted if the encrypted passwords are identical. */
        return (strcmp(encrypted_password, pw_password) == 0);