From: Timo Sirainen <tss@iki.fi>
Date: Tue, 13 Apr 2010 10:24:31 +0000 (+0300)
Subject: lib-storage: Check for mail_plugin_dir existence only in config binary.
X-Git-Tag: 2.0.beta5~139
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e4e40cb3b75a9effc113829aaaa3b8e3b024d17;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Check for mail_plugin_dir existence only in config binary.
Other binaries may already have chrooted when the check is done.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index 05d91c95c0..98b1683812 100644
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -382,14 +382,13 @@ static bool namespace_settings_check(void *_set, pool_t pool ATTR_UNUSED,
 }
 
 static bool mail_user_settings_check(void *_set, pool_t pool ATTR_UNUSED,
-				     const char **error_r)
+				     const char **error_r ATTR_UNUSED)
 {
 	struct mail_user_settings *set = _set;
 
 #ifndef CONFIG_BINARY
 	fix_base_path(set, pool, &set->auth_socket_path);
-#endif
-
+#else
 	if (*set->mail_plugins != '\0' &&
 	    access(set->mail_plugin_dir, R_OK | X_OK) < 0) {
 		*error_r = t_strdup_printf(
@@ -397,6 +396,7 @@ static bool mail_user_settings_check(void *_set, pool_t pool ATTR_UNUSED,
 			set->mail_plugin_dir);
 		return FALSE;
 	}
+#endif
 	return TRUE;
 }
 /* </settings checks> */