dovecot-2.0: login process wasn't logging all intended messages ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/f320e8e760e1
changeset: 13025:f320e8e760e1
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Jan 27 14:15:06 2012 +0200
description:
login process wasn't logging all intended messages with auth_verbose=yes
It was named verbose_auth setting accidentally.

diffstat:

 src/login-common/client-common-auth.c |  4 ++--
 src/login-common/login-settings.c     |  7 +++++--
 src/login-common/login-settings.h     |  2 +-
 src/login-common/sasl-server.c        |  2 +-
 src/login-common/ssl-proxy-openssl.c  |  2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diffs (88 lines):

diff -r cf3687721d02 -r f320e8e760e1 src/login-common/client-common-auth.c
--- a/src/login-common/client-common-auth.c	Wed Jan 25 23:45:02 2012 +0200
+++ b/src/login-common/client-common-auth.c	Fri Jan 27 14:15:06 2012 +0200
@@ -485,7 +485,7 @@
 		      const char *init_resp)
 {
 	if (!client->secured && strcmp(client->set->ssl, "required") == 0) {
-		if (client->set->verbose_auth) {
+		if (client->set->auth_verbose) {
 			client_log(client, "Login failed: "
 				   "SSL required for authentication");
 		}
@@ -519,7 +519,7 @@
 	if (client->secured || !client->set->disable_plaintext_auth)
 		return TRUE;
 
-	if (client->set->verbose_auth) {
+	if (client->set->auth_verbose) {
 		client_log(client, "Login failed: "
 			   "Plaintext authentication disabled");
 	}
diff -r cf3687721d02 -r f320e8e760e1 src/login-common/login-settings.c
--- a/src/login-common/login-settings.c	Wed Jan 25 23:45:02 2012 +0200
+++ b/src/login-common/login-settings.c	Fri Jan 27 14:15:06 2012 +0200
@@ -40,7 +40,7 @@
 	DEF(SET_BOOL, verbose_ssl),
 
 	DEF(SET_BOOL, disable_plaintext_auth),
-	DEF(SET_BOOL, verbose_auth),
+	DEF(SET_BOOL, auth_verbose),
 	DEF(SET_BOOL, auth_debug),
 	DEF(SET_BOOL, verbose_proctitle),
 
@@ -71,7 +71,7 @@
 	.verbose_ssl = FALSE,
 
 	.disable_plaintext_auth = TRUE,
-	.verbose_auth = FALSE,
+	.auth_verbose = FALSE,
 	.auth_debug = FALSE,
 	.verbose_proctitle = FALSE,
 
@@ -139,6 +139,9 @@
 		set->ssl_verify_client_cert = TRUE;
 	}
 
+	if (set->auth_debug)
+		set->auth_verbose = TRUE;
+
 	if (strcmp(set->ssl, "no") == 0) {
 		/* disabled */
 	} else if (strcmp(set->ssl, "yes") == 0) {
diff -r cf3687721d02 -r f320e8e760e1 src/login-common/login-settings.h
--- a/src/login-common/login-settings.h	Wed Jan 25 23:45:02 2012 +0200
+++ b/src/login-common/login-settings.h	Fri Jan 27 14:15:06 2012 +0200
@@ -22,7 +22,7 @@
 	bool verbose_ssl;
 
 	bool disable_plaintext_auth;
-	bool verbose_auth;
+	bool auth_verbose;
 	bool auth_debug;
 	bool verbose_proctitle;
 
diff -r cf3687721d02 -r f320e8e760e1 src/login-common/sasl-server.c
--- a/src/login-common/sasl-server.c	Wed Jan 25 23:45:02 2012 +0200
+++ b/src/login-common/sasl-server.c	Fri Jan 27 14:15:06 2012 +0200
@@ -318,7 +318,7 @@
 {
 	i_assert(client->authenticating);
 
-	if (client->set->verbose_auth && reason != NULL) {
+	if (client->set->auth_verbose && reason != NULL) {
 		const char *auth_name =
 			str_sanitize(client->auth_mech_name, MAX_MECH_NAME);
 		client_log(client, t_strdup_printf(
diff -r cf3687721d02 -r f320e8e760e1 src/login-common/ssl-proxy-openssl.c
--- a/src/login-common/ssl-proxy-openssl.c	Wed Jan 25 23:45:02 2012 +0200
+++ b/src/login-common/ssl-proxy-openssl.c	Fri Jan 27 14:15:06 2012 +0200
@@ -918,7 +918,7 @@
 	proxy->cert_received = TRUE;
 
 	if (proxy->set->verbose_ssl ||
-	    (proxy->set->verbose_auth && !preverify_ok)) {
+	    (proxy->set->auth_verbose && !preverify_ok)) {
 		char buf[1024];
 		X509_NAME *subject;