From: Timo Sirainen <tss@iki.fi>
Date: Fri, 23 Jul 2010 19:31:21 +0000 (+0100)
Subject: doveadm: Duplicate settings so they won't be corrupted by user settings lookup.
X-Git-Tag: 2.0.rc4~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5d7056b6ef069e228f8ad3c9467662955cab3c6;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: Duplicate settings so they won't be corrupted by user settings lookup.
---

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index e16a0bb720..d419d00b71 100644
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -7,6 +7,7 @@
 #include "execv-const.h"
 #include "master-service.h"
 #include "master-service-settings.h"
+#include "settings-parser.h"
 #include "doveadm-print-private.h"
 #include "doveadm-mail.h"
 #include "doveadm-settings.h"
@@ -235,7 +236,11 @@ static void doveadm_read_settings(void)
 	if (master_service_settings_read(master_service, &input,
 					 &output, &error) < 0)
 		i_fatal("Error reading configuration: %s", error);
+
 	doveadm_settings = master_service_settings_get_others(master_service)[0];
+	doveadm_settings = settings_dup(&doveadm_setting_parser_info,
+					doveadm_settings,
+					pool_datastack_create());
 }
 
 static struct doveadm_cmd *doveadm_commands[] = {