From 8b0ade0512903404c61bb3880c6d0168fe955440 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sat, 1 Apr 2023 01:46:00 +0300
Subject: [PATCH] managesieve: dump-capability - Hide duplicate warnings about
obsolete settings
---
src/managesieve/main.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/managesieve/main.c b/src/managesieve/main.c
index 57fbca947..928fe66a3 100644
--- a/src/managesieve/main.c
+++ b/src/managesieve/main.c
@@ -349,11 +349,16 @@ int main(int argc, char *argv[])
/* plugins may want to add commands, so this needs to be called early */
commands_init();
- if (master_service_settings_read_simple(master_service, &error) < 0)
- i_fatal("%s", error);
-
/* Dump capabilities if requested */
if (getenv("DUMP_CAPABILITY") != NULL) {
+ struct master_service_settings_input set_input = {
+ .hide_obsolete_warnings = TRUE,
+ };
+ struct master_service_settings_output set_output;
+ if (master_service_settings_read(master_service, &set_input,
+ &set_output, &error) < 0)
+ i_fatal("%s", error);
+
i_set_debug_file("/dev/null");
managesieve_capabilities_dump();
commands_deinit();
@@ -361,6 +366,9 @@ int main(int argc, char *argv[])
exit(0);
}
+ if (master_service_settings_read_simple(master_service, &error) < 0)
+ i_fatal("%s", error);
+
if (t_abspath("auth-master", &login_set.auth_socket_path, &error) < 0)
i_fatal("t_abspath(%s) failed: %s", "auth-master", error);
--
GitLab