]> andersk Git - openssh.git/blobdiff - auth-passwd.c
unbreak for PAM case
[openssh.git] / auth-passwd.c
index 18f9b3c154914c66152d63d53734e2f18418ebf3..d419fa0d2c9f2726f2a8f253a397c43efece3159 100644 (file)
  * incompatible with the protocol description in the RFC file, it must be
  * called by a name other than "ssh" or "Secure Shell".
  *
- *
  * Copyright (c) 1999 Dug Song.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-passwd.c,v 1.17 2000/09/07 20:27:49 deraadt Exp $");
-
-#if !defined(USE_PAM) && !defined(HAVE_OSF_SIA)
+RCSID("$OpenBSD: auth-passwd.c,v 1.27 2002/05/24 16:45:16 stevesk Exp $");
 
 #include "packet.h"
-#include "ssh.h"
+#include "log.h"
 #include "servconf.h"
-#include "xmalloc.h"
+#include "auth.h"
+
+#if !defined(USE_PAM) && !defined(HAVE_OSF_SIA)
+/* Don't need any of these headers for the PAM or SIA cases */
+# ifdef HAVE_CRYPT_H
+#  include <crypt.h>
+# endif
+# ifdef WITH_AIXAUTHENTICATE
+#  include <login.h>
+# endif
+# ifdef __hpux
+#  include <hpsecurity.h>
+#  include <prot.h>
+# endif
+# ifdef HAVE_SECUREWARE
+#  include <sys/security.h>
+#  include <sys/audit.h>
+#  include <prot.h>
+# endif /* HAVE_SECUREWARE */
+# if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
+#  include <shadow.h>
+# endif
+# if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW)
+#  include <sys/label.h>
+#  include <sys/audit.h>
+#  include <pwdadj.h>
+# endif
+# if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
+#  include "md5crypt.h"
+# endif /* defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) */
+
+# ifdef HAVE_CYGWIN
+#  undef ERROR
+#  include <windows.h>
+#  include <sys/cygwin.h>
+#  define is_winnt       (GetVersion() < 0x80000000)
+# endif
+#endif /* !USE_PAM && !HAVE_OSF_SIA */
 
+extern ServerOptions options;
 #ifdef WITH_AIXAUTHENTICATE
-# include <login.h>
-#endif
-#ifdef __hpux
-# include <hpsecurity.h>
-# include <prot.h>
-#endif
-#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
-# include <shadow.h>
-#endif
-#if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW)
-# include <sys/label.h>
-# include <sys/audit.h>
-# include <pwdadj.h>
-#endif
-#if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
-# include "md5crypt.h"
-#endif /* defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) */
-
-#ifdef HAVE_CYGWIN
-#undef ERROR
-#include <windows.h>
-#include <sys/cygwin.h>
-#define is_winnt       (GetVersion() < 0x80000000)
+extern char *aixloginmsg;
 #endif
 
 /*
@@ -99,45 +90,53 @@ RCSID("$OpenBSD: auth-passwd.c,v 1.17 2000/09/07 20:27:49 deraadt Exp $");
  * 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;
+#if !defined(USE_PAM) && !defined(HAVE_OSF_SIA)
        char *encrypted_password;
        char *pw_password;
        char *salt;
-#ifdef __hpux
+# if defined(__hpux) || defined(HAVE_SECUREWARE)
        struct pr_passwd *spw;
-#endif
-#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
+# endif /* __hpux || HAVE_SECUREWARE */
+# if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
        struct spwd *spw;
-#endif
-#if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW)
+# endif
+# if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW)
        struct passwd_adjunct *spw;
-#endif
-#ifdef WITH_AIXAUTHENTICATE
+# endif
+# ifdef WITH_AIXAUTHENTICATE
        char *authmsg;
-       char *loginmsg;
+       int authsuccess;
        int reenter = 1;
-#endif
+# endif
+#endif /* !defined(USE_PAM) && !defined(HAVE_OSF_SIA) */
 
        /* deny if no user. */
        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_NO_PASSWD)
                return 0;
-#endif
-#ifdef HAVE_CYGWIN
-       /*
-        * Empty password is only possible on NT if the user has _really_
-        * an empty password and authentication is done, though.
-        */
-        if (!is_winnt) 
 #endif
        if (*password == '\0' && options.permit_empty_passwd == 0)
                return 0;
 
-#ifdef HAVE_CYGWIN
+#if defined(USE_PAM)
+       return auth_pam_password(authctxt, password);
+#elif defined(HAVE_OSF_SIA)
+       return auth_sia_password(authctxt, password);
+#else
+# 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,49 +145,59 @@ auth_password(struct passwd * pw, const char *password)
                cygwin_set_impersonation_token(hToken);
                return 1;
        }
-#endif
-
-#ifdef SKEY
-       if (options.skey_authentication == 1) {
-               int ret = auth_skey_password(pw, password);
-               if (ret == 1 || ret == 0)
-                       return ret;
-               /* Fall back to ordinary passwd authentication. */
-       }
-#endif
-
-#ifdef WITH_AIXAUTHENTICATE
-       return (authenticate(pw->pw_name,password,&reenter,&authmsg) == 0);
-#endif
-
-#ifdef KRB4
+# endif
+# ifdef WITH_AIXAUTHENTICATE
+       authsuccess = (authenticate(pw->pw_name,password,&reenter,&authmsg) == 0);
+
+       if (authsuccess)
+               /* We don't have a pty yet, so just label the line as "ssh" */
+               if (loginsuccess(authctxt->user,
+                       get_canonical_hostname(options.verify_reverse_mapping),
+                       "ssh", &aixloginmsg) < 0)
+                               aixloginmsg = NULL;
+
+       return(authsuccess);
+# 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
-
-
+# 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;
 
        /*
         * Various interfaces to shadow or protected password data
         */
-#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
+# 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) */
-#if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW)
+# endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */
+
+# if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW)
        if (issecure() && (spw = getpwanam(pw->pw_name)) != NULL)
                pw_password = spw->pwa_passwd;
-#endif /* defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW) */
-#if defined(__hpux)
+# endif /* defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW) */
+
+# ifdef HAVE_SECUREWARE
+       if ((spw = getprpwnam(pw->pw_name)) != NULL)
+               pw_password = spw->ufld.fd_encrypt;
+# endif /* HAVE_SECUREWARE */
+
+# if defined(__hpux) && !defined(HAVE_SECUREWARE)
        if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL)
                pw_password = spw->ufld.fd_encrypt;
-#endif /* defined(__hpux) */
+# endif /* defined(__hpux) && !defined(HAVE_SECUREWARE) */
 
        /* Check for users with no password. */
        if ((password[0] == '\0') && (pw_password[0] == '\0'))
@@ -199,23 +208,27 @@ auth_password(struct passwd * pw, const char *password)
        else
                salt = "xx";
 
-#ifdef HAVE_MD5_PASSWORDS
+# ifdef HAVE_MD5_PASSWORDS
        if (is_md5_salt(salt))
                encrypted_password = md5_crypt(password, salt);
        else
                encrypted_password = crypt(password, salt);
-#else /* HAVE_MD5_PASSWORDS */    
-# ifdef __hpux
+# else /* HAVE_MD5_PASSWORDS */
+#  if defined(__hpux) && !defined(HAVE_SECUREWARE)
        if (iscomsec())
                encrypted_password = bigcrypt(password, salt);
        else
                encrypted_password = crypt(password, salt);
-# else
+#  else
+#   ifdef HAVE_SECUREWARE
+       encrypted_password = bigcrypt(password, salt);
+#   else
        encrypted_password = crypt(password, salt);
-# endif /* __hpux */
-#endif /* HAVE_MD5_PASSWORDS */    
+#   endif /* HAVE_SECUREWARE */
+#  endif /* __hpux && !defined(HAVE_SECUREWARE) */
+# endif /* HAVE_MD5_PASSWORDS */
 
        /* Authentication is accepted if the encrypted passwords are identical. */
        return (strcmp(encrypted_password, pw_password) == 0);
-}
 #endif /* !USE_PAM && !HAVE_OSF_SIA */
+}
This page took 0.051515 seconds and 4 git commands to generate.