tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fix DISABLE_SHADOW support 

- Allow MD5 passwords even if shadow passwords are disabled
This commit is contained in:
Damien Miller 1999-12-21 21:03:09 +11:00
parent f039badd72
commit cb7e5f9ae1
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -8,6 +8,8 @@
- OpenBSD CVS update: - OpenBSD CVS update:
- [sshconnect.c] - [sshconnect.c]
say "REMOTE HOST IDENTIFICATION HAS CHANGED" say "REMOTE HOST IDENTIFICATION HAS CHANGED"
- Fix DISABLE_SHADOW support
- Allow MD5 passwords even if shadow passwords are disabled
19991218 19991218
- Redhat init script patch from Chun-Chung Chen - Redhat init script patch from Chun-Chung Chen

22
auth-passwd.c
View File

@ -11,7 +11,7 @@
#ifndef HAVE_PAM #ifndef HAVE_PAM
RCSID("$Id: auth-passwd.c,v 1.9 1999/12/16 04:10:45 damien Exp $"); RCSID("$Id: auth-passwd.c,v 1.10 1999/12/21 10:03:09 damien Exp $");
#include "packet.h" #include "packet.h"
#include "ssh.h" #include "ssh.h"
@ -68,7 +68,7 @@ auth_password(struct passwd * pw, const char *password)
if (strcmp(password, "") == 0 && strcmp(pw->pw_passwd, "") == 0) if (strcmp(password, "") == 0 && strcmp(pw->pw_passwd, "") == 0)
return 1; return 1;
#ifdef HAVE_SHADOW_H #if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
spw = getspnam(pw->pw_name); spw = getspnam(pw->pw_name);
if (spw == NULL) if (spw == NULL)
return(0); return(0);
@ -94,12 +94,22 @@ auth_password(struct passwd * pw, const char *password)
#endif /* HAVE_MD5_PASSWORDS */ #endif /* HAVE_MD5_PASSWORDS */
/* Authentication is accepted if the encrypted passwords are identical. */ /* Authentication is accepted if the encrypted passwords are identical. */
return (strcmp(encrypted_password, spw->sp_pwdp) == 0); return (strcmp(encrypted_password, spw->sp_pwdp) == 0);
#else /* !HAVE_SHADOW_H */ #else /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */
encrypted_password = crypt(password,
(pw->pw_passwd[0] && pw->pw_passwd[1]) ? pw->pw_passwd : "xx"); if (strlen(pw->pw_passwd) < 3)
return(0);
#ifdef HAVE_MD5_PASSWORDS
if (is_md5_salt(pw->pw_passwd))
encrypted_password = md5_crypt(password, pw->pw_passwd);
else
encrypted_password = crypt(password, pw->pw_passwd);
#else /* HAVE_MD5_PASSWORDS */
encrypted_password = crypt(password, pw->pw_passwd);
#endif /* HAVE_MD5_PASSWORDS */
/* Authentication is accepted if the encrypted passwords are identical. */ /* Authentication is accepted if the encrypted passwords are identical. */
return (strcmp(encrypted_password, pw->pw_passwd) == 0); return (strcmp(encrypted_password, pw->pw_passwd) == 0);
#endif /* !HAVE_SHADOW_H */ #endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */
} }
#endif /* !HAVE_PAM */ #endif /* !HAVE_PAM */