#include "includes.h"
-#ifndef HAVE_PAM
+#ifndef USE_PAM
RCSID("$Id$");
#include "xmalloc.h"
#ifdef HAVE_SHADOW_H
-#include <shadow.h>
-#endif
-
-#ifdef HAVE_MD5_PASSWORDS
-#include "md5crypt.h"
+# include <shadow.h>
#endif
+#if defined(HAVE_CRYPT_H) && !defined(CRYPT_H_BREAKS_BUILD)
+# include <crypt.h>
+#endif /* defined(HAVE_CRYPT_H) && !defined(CRYPT_H_BREAKS_BUILD) */
+#if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
+# include "md5crypt.h"
+#endif /* defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) */
/*
* Tries to authenticate the user using password. Returns true if
{
extern ServerOptions options;
char *encrypted_password;
+ char *pw_password;
+ char *salt;
#ifdef HAVE_SHADOW_H
struct spwd *spw;
#endif
+ /* deny if no user. */
+ if (pw == NULL)
+ return 0;
if (pw->pw_uid == 0 && options.permit_root_login == 2)
return 0;
if (*password == '\0' && options.permit_empty_passwd == 0)
return 0;
- /* deny if no user. */
- if (pw == NULL)
- return 0;
#ifdef SKEY
if (options.skey_authentication == 1) {
if (strcmp(password, "") == 0 && strcmp(pw->pw_passwd, "") == 0)
return 1;
-#ifdef HAVE_SHADOW_H
+ pw_password = pw->pw_passwd;
+
+#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
spw = getspnam(pw->pw_name);
- if (spw == NULL)
- return(0);
+ if (spw != NULL)
+ {
+ /* Check for users with no password. */
+ if (strcmp(password, "") == 0 && strcmp(spw->sp_pwdp, "") == 0)
+ return 1;
- if ((spw->sp_namp == NULL) || (strcmp(pw->pw_name, spw->sp_namp) != 0))
- fatal("Shadow lookup returned garbage.");
+ pw_password = spw->sp_pwdp;
+ }
+#endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */
- if (strlen(spw->sp_pwdp) < 3)
- return(0);
+ if (pw_password[0] != '\0')
+ salt = pw_password;
+ else
+ salt = "xx";
- /* Encrypt the candidate password using the proper salt. */
#ifdef HAVE_MD5_PASSWORDS
- if (is_md5_salt(spw->sp_pwdp))
- encrypted_password = md5_crypt(password, spw->sp_pwdp);
+ if (is_md5_salt(salt))
+ encrypted_password = md5_crypt(password, salt);
else
- encrypted_password = crypt(password, spw->sp_pwdp);
+ encrypted_password = crypt(password, salt);
#else /* HAVE_MD5_PASSWORDS */
- encrypted_password = crypt(password, spw->sp_pwdp);
+ encrypted_password = crypt(password, salt);
#endif /* HAVE_MD5_PASSWORDS */
- /* Authentication is accepted if the encrypted passwords are identical. */
- return (strcmp(encrypted_password, spw->sp_pwdp) == 0);
-#else /* !HAVE_SHADOW_H */
- encrypted_password = crypt(password,
- (pw->pw_passwd[0] && pw->pw_passwd[1]) ? pw->pw_passwd : "xx");
/* Authentication is accepted if the encrypted passwords are identical. */
- return (strcmp(encrypted_password, pw->pw_passwd) == 0);
-#endif /* !HAVE_SHADOW_H */
+ return (strcmp(encrypted_password, pw_password) == 0);
}
-#endif /* !HAVE_PAM */
+#endif /* !USE_PAM */