dovecot-1.2: Don't show the WhyDoesItNotWork link if auth_debug=...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/e4d0ce4d3420
changeset: 8305:e4d0ce4d3420
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Oct 20 20:00:19 2008 +0300
description:
Don't show the WhyDoesItNotWork link if auth_debug=yes already.

diffstat:

1 file changed, 4 insertions(+), 4 deletions(-)
src/master/main.c |    8 ++++----

diffs (29 lines):

diff -r ab22ace44190 -r e4d0ce4d3420 src/master/main.c
--- a/src/master/main.c	Sun Oct 19 14:46:13 2008 +0300
+++ b/src/master/main.c	Mon Oct 20 20:00:19 2008 +0300
@@ -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);