[dovecot-cvs] dovecot/src/imap main.c,1.71,1.72

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/imap
In directory talvi:/tmp/cvs-serv21931/src/imap

Modified Files:
	main.c 
Log Message:
Replaced mail_use_modules and mail_modules settings with mail_plugins and
mail_plugin_dir. Now instead of loading all plugins from the directory,
you'll have to give a list of plugins to load. If the plugin couldn't be
loaded, the process exits instead of just ignoring the problem (this is
important with ACL plugin).



Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/main.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- main.c	14 Feb 2006 17:22:58 -0000	1.71
+++ main.c	26 Feb 2006 12:15:45 -0000	1.72
@@ -165,8 +165,14 @@
 	clients_init();
 	commands_init();
 
-	modules = getenv("MODULE_DIR") == NULL ? NULL :
-		module_dir_load(getenv("MODULE_DIR"), TRUE);
+	if (getenv("MODULE_LIST") == 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);
+	}
 
 	str = getenv("IMAP_MAX_LINE_LENGTH");
 	imap_max_line_length = str != NULL ?