dovecot-2.2: doveadm config: If -c parameter was given, it wasn'...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/a0ff87fe1f4a
changeset: 14649:a0ff87fe1f4a
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Jun 04 21:58:00 2012 +0300
description:
doveadm config: If -c parameter was given, it wasn't passed to doveconf.

diffstat:

 src/doveadm/doveadm.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r ee5d838ebcbb -r a0ff87fe1f4a src/doveadm/doveadm.c
--- a/src/doveadm/doveadm.c	Mon Jun 04 21:21:52 2012 +0300
+++ b/src/doveadm/doveadm.c	Mon Jun 04 21:58:00 2012 +0300
@@ -5,7 +5,7 @@
 #include "str.h"
 #include "env-util.h"
 #include "execv-const.h"
-#include "master-service.h"
+#include "master-service-private.h"
 #include "master-service-settings.h"
 #include "settings-parser.h"
 #include "doveadm-print-private.h"
@@ -163,6 +163,8 @@
 
 static void cmd_config(int argc ATTR_UNUSED, char *argv[])
 {
+	env_put(t_strconcat(MASTER_CONFIG_FILE_ENV"=",
+		master_service_get_config_path(master_service), NULL));
 	argv[0] = BINDIR"/doveconf";
 	(void)execv(argv[0], argv);
 	i_fatal("execv(%s) failed: %m", argv[0]);