[dovecot-cvs] dovecot-lda/src deliver.c,1.43,1.44

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot-lda/src
In directory talvi:/tmp/cvs-serv19925

Modified Files:
	deliver.c 
Log Message:
Use mail_plugins and mail_plugin_dir settings inside protocol lda {}



Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot-lda/src/deliver.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- deliver.c	13 Apr 2006 18:16:53 -0000	1.43
+++ deliver.c	13 Apr 2006 18:28:56 -0000	1.44
@@ -620,8 +620,16 @@
 	    str != NULL && var_get_key(str + 1) == 'm')
 		flags |= MAIL_STORAGE_FLAG_KEEP_HEADER_MD5;
 
-	modules = getenv("MODULE_DIR") == NULL ? NULL :
-		module_dir_load(getenv("MODULE_DIR"), NULL, TRUE);
+	if (getenv("MAIL_PLUGIN_DIR") == NULL)
+		modules = NULL;
+	else {
+		if (getenv("MAIL_PLUGIN_DIR") == NULL) {
+			i_fatal("MAIL_PLUGINS given but "
+				"MAIL_PLUGIN_DIR was not");
+		}
+		modules = module_dir_load(getenv("MAIL_PLUGIN_DIR"),
+					  getenv("MAIL_PLUGINS"), TRUE);
+	}
 
 	/* FIXME: how should we handle namespaces? */
 	mail_storage_parse_env(&flags, &lock_method);