summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-09-18 18:26:48 +1000
committerDamien Miller <djm@mindrot.org>2003-09-18 18:26:48 +1000
commitaa9a76fe4c128cb119f21db65cbf9e82cd48c876 (patch)
treeefb80effafc970f607aa2fe2a44fbe3ab01a8fa5
parentade1cee573c0897cd08987dc14e23a555898cd12 (diff)
- (djm) Bug #652: Fix empty password auth
-rw-r--r--ChangeLog5
-rw-r--r--auth-passwd.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cfdafff4..999c26ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20030918
+ - (djm) Bug #652: Fix empty password auth
+
20030917
- (djm) OpenBSD Sync
- markus@cvs.openbsd.org 2003/09/16 21:02:40
@@ -1115,4 +1118,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2994.2.6 2003/09/16 21:35:09 djm Exp $
+$Id: ChangeLog,v 1.2994.2.7 2003/09/18 08:26:48 djm Exp $
diff --git a/auth-passwd.c b/auth-passwd.c
index 95cc134d..971c7ba1 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -143,7 +143,7 @@ auth_password(Authctxt *authctxt, const char *password)
char *pw_password = authctxt->valid ? shadow_pw(pw) : pw->pw_passwd;
/* Check for users with no password. */
- if (strcmp(pw_password, "") == 0 && strcmp(pw->pw_passwd, "") == 0)
+ if (strcmp(pw_password, "") == 0 && strcmp(password, "") == 0)
return ok;
else {
/* Encrypt the candidate password using the proper salt. */