From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 9 Aug 2023 09:13:08 +0000 (+0300)
Subject: doveadm: Fix enabling all debug logging with -D parameter
X-Git-Tag: 2.4.0~2622
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f96ff1ae853d499d904a3539976cf1ab078ea24a;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: Fix enabling all debug logging with -D parameter

The event's debug logging was set before the -D parameter was parsed.
Also, -v parameter shouldn't enable debugging.

Broken by 03392bbff711f91b6f8c7f8582e213f76c1a009a
---

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index 5acbc99338..0c351b8a48 100644
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -282,8 +282,6 @@ int main(int argc, char *argv[])
 		{NULL, 0, NULL, 0},
 	};
 	master_service_register_long_options(master_service, longopts);
-	struct doveadm_cmd_context *cctx = doveadm_cmd_context_create(
-		DOVEADM_CONNECTION_TYPE_CLI, doveadm_verbose || doveadm_debug);
 
 	i_set_failure_exit_callback(failure_exit_callback);
 
@@ -381,6 +379,8 @@ int main(int argc, char *argv[])
 		i_set_debug_file("/dev/null");
 	}
 
+	struct doveadm_cmd_context *cctx = doveadm_cmd_context_create(
+		DOVEADM_CONNECTION_TYPE_CLI, doveadm_debug);
 	/* this has to be done here because proctitle hack can break
 	   the env pointer */
 	cctx->username = getenv("USER");