[dovecot-cvs] dovecot/src/deliver deliver.c,1.20.2.37,1.20.2.38

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/deliver
In directory talvi:/tmp/cvs-serv9115

Modified Files:
      Tag: branch_1_0
	deliver.c 
Log Message:
Load plugins before chrooting.



Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/deliver/deliver.c,v
retrieving revision 1.20.2.37
retrieving revision 1.20.2.38
diff -u -d -r1.20.2.37 -r1.20.2.38
--- deliver.c	26 Mar 2007 00:10:05 -0000	1.20.2.37
+++ deliver.c	3 Apr 2007 05:42:29 -0000	1.20.2.38
@@ -567,6 +567,21 @@
 	if (getenv("MAIL_DEBUG") != NULL)
 		env_put("DEBUG=1");
 
+	if (getenv("MAIL_PLUGINS") == NULL)
+		modules = NULL;
+	else {
+		const char *plugin_dir = getenv("MAIL_PLUGIN_DIR");
+		const char *version;
+
+		if (plugin_dir == NULL)
+			plugin_dir = MODULEDIR"/lda";
+
+		version = getenv("VERSION_IGNORE") != NULL ?
+			NULL : PACKAGE_VERSION;
+		modules = module_dir_load(plugin_dir, getenv("MAIL_PLUGINS"),
+					  TRUE, version);
+	}
+
 	if (destination != NULL) {
 		auth_socket = getenv("AUTH_SOCKET_PATH");
 		if (auth_socket == NULL)
@@ -629,21 +644,7 @@
 		mail_env = expand_mail_env(mail_env, table);
 	}
 
-	if (getenv("MAIL_PLUGINS") == NULL)
-		modules = NULL;
-	else {
-		const char *plugin_dir = getenv("MAIL_PLUGIN_DIR");
-		const char *version;
-
-		if (plugin_dir == NULL)
-			plugin_dir = MODULEDIR"/lda";
-
-		version = getenv("VERSION_IGNORE") != NULL ?
-			NULL : PACKAGE_VERSION;
-		modules = module_dir_load(plugin_dir, getenv("MAIL_PLUGINS"),
-					  TRUE, version);
-		module_dir_init(modules);
-	}
+	module_dir_init(modules);
 
 	/* FIXME: how should we handle namespaces? */
 	mail_storage_parse_env(&flags, &lock_method);