From 7584cb1ac4daafbfb3dec592dd7ef48b81d20eea Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 26 Apr 2012 09:51:26 +1000 Subject: - (djm) [auth-passwd.c] Handle crypt() returning NULL; from Paul Wouters via Niels --- ChangeLog | 4 ++++ auth-passwd.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dedf2f33..908dcd49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +20120426 + - (djm) [auth-passwd.c] Handle crypt() returning NULL; from Paul Wouters + via Niels + 20120423 - OpenBSD CVS Sync - djm@cvs.openbsd.org 2012/04/23 08:18:17 diff --git a/auth-passwd.c b/auth-passwd.c index b1c6ce09..68bbd18d 100644 --- a/auth-passwd.c +++ b/auth-passwd.c @@ -209,6 +209,7 @@ sys_auth_passwd(Authctxt *authctxt, const char *password) * Authentication is accepted if the encrypted passwords * are identical. */ - return (strcmp(encrypted_password, pw_password) == 0); + return encrypted_password != NULL && + strcmp(encrypted_password, pw_password) == 0; } #endif -- cgit v1.2.3