From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 16 Oct 2024 09:59:31 +0000 (+0300)
Subject: doveconf: Reorder if-branches
X-Git-Tag: 2.4.0~240
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65d9b1bc50f5ce74216859e8a075001157d5ee43;p=thirdparty%2Fdovecot%2Fcore.git

doveconf: Reorder if-branches
---

diff --git a/src/config/doveconf.c b/src/config/doveconf.c
index 22d7b8bcde..4ada152f06 100644
--- a/src/config/doveconf.c
+++ b/src/config/doveconf.c
@@ -1165,11 +1165,7 @@ int main(int argc, char *argv[])
 	if ((ret == -1 && exec_args != NULL) || ret == 0 || ret == -2)
 		i_fatal("%s", error);
 
-	if (dump_full && exec_args == NULL) {
-		ret2 = config_dump_full(config,
-					CONFIG_DUMP_FULL_DEST_STDOUT,
-					0, &import_environment);
-	} else if (dump_full) {
+	if (dump_full && exec_args != NULL) {
 		int temp_fd = config_dump_full(config,
 					       CONFIG_DUMP_FULL_DEST_TEMPDIR,
 					       0, &import_environment);
@@ -1188,6 +1184,10 @@ int main(int argc, char *argv[])
 			i_fatal("execvp(%s) failed: %m", exec_args[0]);
 		}
 		ret2 = -1;
+	} else if (dump_full) {
+		ret2 = config_dump_full(config,
+					CONFIG_DUMP_FULL_DEST_STDOUT,
+					0, &import_environment);
 	} else if (setting_name_filters != NULL) {
 		ret2 = 0;
 		/* ignore settings-check failures in configuration. this allows