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

- (djm) Unbreak auth-passwd.c for PAM and SIA

This commit is contained in:
Damien Miller 2002-05-08 12:18:26 +10:00
parent 532bbdb99b
commit 52910ddc66
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,6 @@
20020506
- (djm) Unbreak auth-passwd.c for PAM and SIA
20020506 20020506
- (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue - (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue
@ -528,4 +531,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.2092 2002/05/06 23:06:08 mouring Exp $ $Id: ChangeLog,v 1.2093 2002/05/08 02:18:26 djm Exp $

2
auth-passwd.c
View File

@ -89,6 +89,7 @@ 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 (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0)
return 0; return 0;
@ -98,7 +99,6 @@ auth_password(Authctxt *authctxt, const char *password)
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;