From: Timo Sirainen <tss@iki.fi>
Date: Wed, 17 Mar 2010 13:45:50 +0000 (+0200)
Subject: mail_storage_service_read_settings() avoided execing doveconf too aggressively.
X-Git-Tag: 2.0.beta4~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=faca2afa3576c50caf28e0f009555325d2a49e0b;p=thirdparty%2Fdovecot%2Fcore.git

mail_storage_service_read_settings() avoided execing doveconf too aggressively.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 41b84d5d06..1c43bc0f4d 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -644,7 +644,6 @@ int mail_storage_service_read_settings(struct mail_storage_service_ctx *ctx,
 	   use $HOME */
 	set_input.preserve_home = 
 		(ctx->flags & MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP) == 0;
-	set_input.never_exec = TRUE;
 
 	if (input != NULL) {
 		set_input.module = input->module;
@@ -665,6 +664,10 @@ int mail_storage_service_read_settings(struct mail_storage_service_ctx *ctx,
 			dyn_parsers_update_parent(ctx->pool,
 						  &ctx->set_cache_roots,
 						  &ctx->set_cache_dyn_parsers);
+	} else {
+		/* already looked up settings at least once.
+		   we really shouldn't be execing anymore. */
+		set_input.never_exec = TRUE;
 	}
 
 	if (null_strcmp(set_input.module, ctx->set_cache_module) == 0 &&