dovecot-2.0: mail_storage_service_read_settings() avoided execin...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/7fa0cd9e3a89
changeset: 10938:7fa0cd9e3a89
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Mar 17 15:45:50 2010 +0200
description:
mail_storage_service_read_settings() avoided execing doveconf too aggressively.

diffstat:

 src/lib-storage/mail-storage-service.c |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r b7c66370b0f7 -r 7fa0cd9e3a89 src/lib-storage/mail-storage-service.c
--- a/src/lib-storage/mail-storage-service.c	Tue Mar 16 22:29:18 2010 +0200
+++ b/src/lib-storage/mail-storage-service.c	Wed Mar 17 15:45:50 2010 +0200
@@ -644,7 +644,6 @@
 	   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 @@
 			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 &&