]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
doveadm: Fix enabling all debug logging with -D parameter
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Wed, 9 Aug 2023 09:13:08 +0000 (12:13 +0300)
committerTimo Sirainen <timo.sirainen@open-xchange.com>
Wed, 9 Aug 2023 09:13:08 +0000 (12:13 +0300)
The event's debug logging was set before the -D parameter was parsed.
Also, -v parameter shouldn't enable debugging.

Broken by 03392bbff711f91b6f8c7f8582e213f76c1a009a

src/doveadm/doveadm.c

index 5acbc993383dc8b97991b2b215ead00ae81f69cd..0c351b8a4893d091ed9bbd17099dd8428bec952d 100644 (file)
@@ -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");