dovecot-2.0-pigeonhole: ManageSieve: fixed dump-capability probl...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.0-pigeonhole/rev/91117b838f30
changeset: 1415:91117b838f30
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Wed Sep 08 20:04:56 2010 +0200
description:
ManageSieve: fixed dump-capability problem occuring when using a custom config file (patch by Timo Sirainen).

diffstat:

 src/managesieve-login/managesieve-login-settings-plugin.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 1a7060ef63ce -r 91117b838f30 src/managesieve-login/managesieve-login-settings-plugin.c
--- a/src/managesieve-login/managesieve-login-settings-plugin.c	Mon Sep 06 18:36:25 2010 +0200
+++ b/src/managesieve-login/managesieve-login-settings-plugin.c	Wed Sep 08 20:04:56 2010 +0200
@@ -7,6 +7,7 @@
 #include "env-util.h"
 #include "fd-close-on-exec.h"
 #include "execv-const.h"
+#include "master-service.h"
 #include "settings-parser.h"
 #include "config-parser-private.h"
 #include "managesieve-login-settings-plugin.h"
@@ -124,7 +125,7 @@
 	}
 
 	if ( pid == 0 ) {
-		const char *argv[3];
+		const char *argv[5];
 
 		/* Child */
 		(void)close(fd[0]);		
@@ -136,7 +137,9 @@
 
 		argv[0] = PKG_LIBEXECDIR"/managesieve";
 		argv[1] = "-k";
-		argv[2] = NULL;
+		argv[2] = "-c";
+		argv[3] = master_service_get_config_path(master_service);
+		argv[4] = NULL;
 		execv_const(argv[0], argv);
 
 		i_fatal("managesieve-login: dump-capability execv(%s) failed: %m", argv[0]);