dovecot-2.2: auth: Don't crash if passwd-file is used for authen...

dovecot at dovecot.org dovecot at dovecot.org
Sat Nov 16 17:46:22 EET 2013


details:   http://hg.dovecot.org/dovecot-2.2/rev/7e813ff117a3
changeset: 16954:7e813ff117a3
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Nov 16 17:46:10 2013 +0200
description:
auth: Don't crash if passwd-file is used for authentication but it has no passwords.

diffstat:

 src/auth/passdb-passwd-file.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (23 lines):

diff -r a913f29068a7 -r 7e813ff117a3 src/auth/passdb-passwd-file.c
--- a/src/auth/passdb-passwd-file.c	Sat Nov 16 14:06:32 2013 +0000
+++ b/src/auth/passdb-passwd-file.c	Sat Nov 16 17:46:10 2013 +0200
@@ -28,16 +28,14 @@
 	string_t *str;
 	char **p;
 
-	*crypted_pass_r = pu->password;
+	*crypted_pass_r = pu->password != NULL ? pu->password : "";
 	*scheme_r = password_get_scheme(crypted_pass_r);
 	if (*scheme_r == NULL)
 		*scheme_r = request->passdb->passdb->default_pass_scheme;
 
 	/* save the password so cache can use it */
-	if (*crypted_pass_r != NULL) {
-		auth_request_set_field(request, "password",
-				       *crypted_pass_r, *scheme_r);
-        }
+	auth_request_set_field(request, "password",
+			       *crypted_pass_r, *scheme_r);
 
 	if (pu->extra_fields != NULL) {
 		str = t_str_new(512);


More information about the dovecot-cvs mailing list