From: Timo Sirainen <tss@iki.fi>
Date: Fri, 7 Feb 2014 20:53:54 +0000 (-0500)
Subject: auth: Allow auth_verbose_passwords=yes as an alias for "plain".
X-Git-Tag: 2.2.11~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3190f12fb96daf61f7c880390472e18184cbb2d8;p=thirdparty%2Fdovecot%2Fcore.git

auth: Allow auth_verbose_passwords=yes as an alias for "plain".
---

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index 586ee138c4..994730c772 100644
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -330,7 +330,7 @@ auth_settings_set_self_ips(struct auth_settings *set, pool_t pool,
 }
 
 static bool
-auth_verify_verbose_password(const struct auth_settings *set,
+auth_verify_verbose_password(struct auth_settings *set,
 			     const char **error_r)
 {
 	const char *p, *value = set->verbose_passwords;
@@ -351,7 +351,11 @@ auth_verify_verbose_password(const struct auth_settings *set,
 		return TRUE;
 	else if (strcmp(value, "sha1") == 0)
 		return TRUE;
-	else {
+	else if (strcmp(value, "yes") == 0) {
+		/* just use it as alias for "plain" */
+		set->verbose_passwords = "plain";
+		return TRUE;
+	} else {
 		*error_r = "auth_verbose_passwords: Invalid value";
 		return FALSE;
 	}