dovecot-2.0: lib-storage: Check for mail_plugin_dir existence on...

dovecot at dovecot.org dovecot at dovecot.org
Tue Apr 13 13:28:10 EEST 2010


details:   http://hg.dovecot.org/dovecot-2.0/rev/7d541fcfcb5e
changeset: 11135:7d541fcfcb5e
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Apr 13 13:24:31 2010 +0300
description:
lib-storage: Check for mail_plugin_dir existence only in config binary.
Other binaries may already have chrooted when the check is done.

diffstat:

 src/lib-storage/mail-storage-settings.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 88959ce9c8e4 -r 7d541fcfcb5e src/lib-storage/mail-storage-settings.c
--- a/src/lib-storage/mail-storage-settings.c	Tue Apr 13 13:23:31 2010 +0300
+++ b/src/lib-storage/mail-storage-settings.c	Tue Apr 13 13:24:31 2010 +0300
@@ -382,14 +382,13 @@
 }
 
 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 @@
 			set->mail_plugin_dir);
 		return FALSE;
 	}
+#endif
 	return TRUE;
 }
 /* </settings checks> */


More information about the dovecot-cvs mailing list