RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (bal) Back all the way out of auth-passwd.c changes. Breaks too many 

things that don't set pw->pw_passwd.
This commit is contained in:
Ben Lindstrom 2002-05-10 02:40:15 +00:00
parent 87aea25f1a
commit 0b47814b43
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -4,6 +4,8 @@
Pekka Savola <pekkas@netcore.fi> Pekka Savola <pekkas@netcore.fi>
- (djm) Try to drop supplemental groups at daemon startup. Patch from - (djm) Try to drop supplemental groups at daemon startup. Patch from
RedHat RedHat
- (bal) Back all the way out of auth-passwd.c changes. Breaks too many
things that don't set pw->pw_passwd.
20020509 20020509
- (tim) [Makefile.in] Unbreak make -f Makefile.in distprep - (tim) [Makefile.in] Unbreak make -f Makefile.in distprep
@ -555,4 +557,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2102 2002/05/10 02:20:24 djm Exp $ $Id: ChangeLog,v 1.2103 2002/05/10 02:40:15 mouring Exp $

10
auth-passwd.c
View File

@ -36,7 +36,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: auth-passwd.c,v 1.25 2002/05/06 23:00:59 mouring Exp $"); RCSID("$OpenBSD: auth-passwd.c,v 1.24 2002/03/04 12:43:06 markus Exp $");
#include "packet.h" #include "packet.h"
#include "log.h" #include "log.h"
@ -89,16 +89,16 @@ extern ServerOptions options;
int int
auth_password(Authctxt *authctxt, const char *password) auth_password(Authctxt *authctxt, const char *password)
{ {
struct passwd * pw = authctxt->pw;
#if defined(USE_PAM) #if defined(USE_PAM)
if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0) if (*password == '\0' && options.permit_empty_passwd == 0)
return 0; return 0;
return auth_pam_password(authctxt, password); return auth_pam_password(authctxt, password);
#elif defined(HAVE_OSF_SIA) #elif defined(HAVE_OSF_SIA)
if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0) if (*password == '\0' && options.permit_empty_passwd == 0)
return 0; return 0;
return auth_sia_password(authctxt, password); return auth_sia_password(authctxt, password);
#else #else
struct passwd * pw = authctxt->pw;
char *encrypted_password; char *encrypted_password;
char *pw_password; char *pw_password;
char *salt; char *salt;
@ -131,7 +131,7 @@ auth_password(Authctxt *authctxt, const char *password)
*/ */
if (!is_winnt) if (!is_winnt)
#endif #endif
if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0) if (*password == '\0' && options.permit_empty_passwd == 0)
return 0; return 0;
#ifdef KRB5 #ifdef KRB5
if (options.kerberos_authentication == 1) { if (options.kerberos_authentication == 1) {