From: Timo Sirainen <tss@iki.fi>
Date: Fri, 2 Dec 2011 21:47:01 +0000 (+0200)
Subject: auth: Fixed vpopmail to work again after recent change.
X-Git-Tag: 2.1.rc2~104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33c0df448080d10c8d4a1fa66f106204985c3af8;p=thirdparty%2Fdovecot%2Fcore.git

auth: Fixed vpopmail to work again after recent change.
---

diff --git a/src/auth/passdb-vpopmail.c b/src/auth/passdb-vpopmail.c
index 3ef17637ad..c334efc473 100644
--- a/src/auth/passdb-vpopmail.c
+++ b/src/auth/passdb-vpopmail.c
@@ -75,7 +75,8 @@ vpopmail_password_lookup(struct auth_request *auth_request, bool *cleartext,
 		password = NULL;
 		*result_r = PASSDB_RESULT_USER_DISABLED;
 	} else {
-		if (vpw->pw_clear_passwd != NULL) {
+		if (vpw->pw_clear_passwd != NULL &&
+		    *vpw->pw_clear_passwd != '\0') {
 			password = t_strdup_noconst(vpw->pw_clear_passwd);
 			*cleartext = TRUE;
 		} else if (!*cleartext)
@@ -120,7 +121,7 @@ vpopmail_verify_plain(struct auth_request *request, const char *password,
 	enum passdb_result result;
 	const char *scheme, *tmp_pass;
 	char *crypted_pass;
-	bool cleartext;
+	bool cleartext = FALSE;
 	int ret;
 
 	crypted_pass = vpopmail_password_lookup(request, &cleartext, &result);