From: Timo Sirainen <tss@iki.fi>
Date: Tue, 3 Feb 2009 17:00:23 +0000 (-0500)
Subject: If mail_chroot is set, don't fail at startup in dump-capability.
X-Git-Tag: 2.0.alpha1~1037^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12a95def0991584f250e0ed40dba84115c70d8fa;p=thirdparty%2Fdovecot%2Fcore.git

If mail_chroot is set, don't fail at startup in dump-capability.

--HG--
branch : HEAD
---

diff --git a/src/master/mail-process.c b/src/master/mail-process.c
index 208e84b886..248621b6be 100644
--- a/src/master/mail-process.c
+++ b/src/master/mail-process.c
@@ -537,7 +537,7 @@ create_mail_process(enum process_type process_type, struct master_settings *set,
 	/* setup environment - set the most important environment first
 	   (paranoia about filling up environment without noticing) */
 	restrict_access_set_env(system_user, uid, gid, set->mail_priv_gid_t,
-				chroot_dir,
+				dump_capability ? "" : chroot_dir,
 				set->first_valid_gid, set->last_valid_gid,
 				set->mail_access_groups);
 
@@ -546,7 +546,7 @@ create_mail_process(enum process_type process_type, struct master_settings *set,
 	if (dump_capability)
 		env_put("DUMP_CAPABILITY=1");
 
-	if (*home_dir == '\0' && *chroot_dir == '\0') {
+	if ((*home_dir == '\0' && *chroot_dir == '\0') || dump_capability) {
 		full_home_dir = "";
 		ret = -1;
 	} else {