Mercurial > dovecot > original-hg > dovecot-1.2

changeset 4446:6d0ca893eab8 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed the mail_plugins/mail_plugin_dir settings to be passed as the same environments. If MAIL_PLUGIN_DIR environment isn't given, use the built-in default.
author Timo Sirainen <tss@iki.fi>
date Wed, 28 Jun 2006 00:03:54 +0300
parents 13350093fa1b
children 0a615e0aa04d
files src/imap/Makefile.am src/imap/main.c src/master/mail-process.c src/pop3/Makefile.am src/pop3/main.c
diffstat 5 files changed, 21 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap/Makefile.am	Tue Jun 27 13:27:25 2006 +0300
+++ b/src/imap/Makefile.am	Wed Jun 28 00:03:54 2006 +0300
@@ -7,7 +7,8 @@
 	-I$(top_srcdir)/src/lib-dict \
 	-I$(top_srcdir)/src/lib-mail \
 	-I$(top_srcdir)/src/lib-imap \
-	-I$(top_srcdir)/src/lib-storage
+	-I$(top_srcdir)/src/lib-storage \
+	-DMODULEDIR=\""$(moduledir)"\"
 
 imap_LDFLAGS = -export-dynamic
 
--- a/src/imap/main.c	Tue Jun 27 13:27:25 2006 +0300
+++ b/src/imap/main.c	Wed Jun 28 00:03:54 2006 +0300
@@ -177,13 +177,15 @@
 	clients_init();
 	commands_init();
 
-	if (getenv("MODULE_LIST") == NULL)
+	if (getenv("MAIL_PLUGINS") == NULL)
 		modules = NULL;
 	else {
-		if (getenv("MODULE_DIR") == NULL)
-			i_fatal("MODULE_LIST given but MODULE_DIR was not");
-		modules = module_dir_load(getenv("MODULE_DIR"),
-					  getenv("MODULE_LIST"), TRUE);
+		const char *plugin_dir = getenv("MAIL_PLUGIN_DIR");
+
+		if (plugin_dir == NULL)
+			plugin_dir = MODULEDIR"/imap";
+		modules = module_dir_load(plugin_dir, getenv("MAIL_PLUGINS"),
+					  TRUE);
 	}
 
 	if (getenv("DUMP_CAPABILITY") != NULL) {
--- a/src/master/mail-process.c	Tue Jun 27 13:27:25 2006 +0300
+++ b/src/master/mail-process.c	Wed Jun 28 00:03:54 2006 +0300
@@ -274,8 +274,9 @@
 				set->dbox_rotate_days));
 
 	if (*set->mail_plugins != '\0') {
-		env_put(t_strconcat("MODULE_DIR=", set->mail_plugin_dir, NULL));
-		env_put(t_strconcat("MODULE_LIST=", set->mail_plugins, NULL));
+		env_put(t_strconcat("MAIL_PLUGIN_DIR=",
+				    set->mail_plugin_dir, NULL));
+		env_put(t_strconcat("MAIL_PLUGINS=", set->mail_plugins, NULL));
 	}
 
 	/* user given environment - may be malicious. virtual_user comes from
--- a/src/pop3/Makefile.am	Tue Jun 27 13:27:25 2006 +0300
+++ b/src/pop3/Makefile.am	Wed Jun 28 00:03:54 2006 +0300
@@ -6,7 +6,8 @@
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/lib-dict \
 	-I$(top_srcdir)/src/lib-mail \
-	-I$(top_srcdir)/src/lib-storage
+	-I$(top_srcdir)/src/lib-storage \
+	-DMODULEDIR=\""$(moduledir)"\"
 
 pop3_LDFLAGS = -export-dynamic
 
--- a/src/pop3/main.c	Tue Jun 27 13:27:25 2006 +0300
+++ b/src/pop3/main.c	Wed Jun 28 00:03:54 2006 +0300
@@ -187,13 +187,15 @@
 	mail_storage_register_all();
 	clients_init();
 
-	if (getenv("MODULE_LIST") == NULL)
+	if (getenv("MAIL_PLUGINS") == NULL)
 		modules = NULL;
 	else {
-		if (getenv("MODULE_DIR") == NULL)
-			i_fatal("MODULE_LIST given but MODULE_DIR was not");
-		modules = module_dir_load(getenv("MODULE_DIR"),
-					  getenv("MODULE_LIST"), TRUE);
+		const char *plugin_dir = getenv("MAIL_PLUGIN_DIR");
+
+		if (plugin_dir == NULL)
+			plugin_dir = MODULEDIR"/imap";
+		modules = module_dir_load(plugin_dir, getenv("MAIL_PLUGINS"),
+					  TRUE);
 	}
 
 	mail = getenv("MAIL");