dovecot-2.2: lib-master: If executing doveconf, use master_servi...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/f8f0a782213b
changeset: 18673:f8f0a782213b
user:      Timo Sirainen <tss at iki.fi>
date:      Wed May 13 15:47:14 2015 +0300
description:
lib-master: If executing doveconf, use master_service_settings_input.service for filter
Instead of hardcoding to the master_service->name, which may be different.
This fixes reading protocol sieve {} settings when if managesieve was
reading settings via doveconf (= executed from command line).

diffstat:

 src/lib-master/master-service-settings.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (16 lines):

diff -r fea09ab164dc -r f8f0a782213b src/lib-master/master-service-settings.c
--- a/src/lib-master/master-service-settings.c	Wed May 13 15:33:27 2015 +0300
+++ b/src/lib-master/master-service-settings.c	Wed May 13 15:47:14 2015 +0300
@@ -119,8 +119,10 @@
 	argv_max_count = 11 + (service->argc + 1) + 1;
 	conf_argv = t_new(const char *, argv_max_count);
 	conf_argv[i++] = DOVECOT_CONFIG_BIN_PATH;
-	conf_argv[i++] = "-f";
-	conf_argv[i++] = t_strconcat("service=", service->name, NULL);
+	if (input->service != NULL) {
+		conf_argv[i++] = "-f";
+		conf_argv[i++] = t_strconcat("service=", input->service, NULL);
+	}
 	conf_argv[i++] = "-c";
 	conf_argv[i++] = service->config_path;
 	if (input->module != NULL) {