From: Timo Sirainen <tss@iki.fi>
Date: Mon, 20 Oct 2008 17:00:19 +0000 (+0300)
Subject: Don't show the WhyDoesItNotWork link if auth_debug=yes already.
X-Git-Tag: 1.2.alpha3~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f7c5ba54e33394e8d8cb60d2a971fd0a75555923;p=thirdparty%2Fdovecot%2Fcore.git

Don't show the WhyDoesItNotWork link if auth_debug=yes already.

--HG--
branch : HEAD
---

diff --git a/src/master/main.c b/src/master/main.c
index aeff137315..62d93b8e17 100644
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -100,12 +100,13 @@ static void fatal_log_check(void)
 		i_error("unlink(%s) failed: %m", path);
 }
 
-static void auth_warning_print(void)
+static void auth_warning_print(const struct server_settings *set)
 {
 	struct stat st;
 
 	auth_success_written = stat(AUTH_SUCCESS_PATH, &st) == 0;
-	if (!auth_success_written) {
+	if (!auth_success_written && !set->auths->debug &&
+	    strcmp(set->defaults->protocols, "none") != 0) {
 		i_info("If you have trouble with authentication failures,\n"
 		       "enable auth_debug setting. "
 		       "See http://wiki.dovecot.org/WhyDoesItNotWork");
@@ -573,8 +574,7 @@ int main(int argc, char *argv[])
 		open_fds();
 
 	fatal_log_check();
-	if (strcmp(settings_root->defaults->protocols, "none") != 0)
-		auth_warning_print();
+	auth_warning_print(settings_root);
 	if (!foreground)
 		daemonize(settings_root->defaults);