dovecot-2.0-pigeonhole: Moved parsing of sieve_extensions settin...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.0-pigeonhole/rev/2ab267d4c8b5
changeset: 1314:2ab267d4c8b5
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Sat Jul 03 23:32:28 2010 +0200
description:
Moved parsing of sieve_extensions setting to sieve engine initialization.

diffstat:

 src/lib-sieve/sieve-extensions.c           |  9 ++++++++-
 src/managesieve/managesieve-capabilities.c |  5 -----
 src/managesieve/managesieve-client.c       |  7 +------
 src/plugins/lda-sieve/lda-sieve-plugin.c   |  7 -------
 4 files changed, 9 insertions(+), 19 deletions(-)

diffs (97 lines):

diff -r e59182cb2798 -r 2ab267d4c8b5 src/lib-sieve/sieve-extensions.c
--- a/src/lib-sieve/sieve-extensions.c	Sat Jul 03 22:49:21 2010 +0200
+++ b/src/lib-sieve/sieve-extensions.c	Sat Jul 03 23:32:28 2010 +0200
@@ -9,6 +9,7 @@
 
 #include "sieve-common.h"
 #include "sieve-error.h"
+#include "sieve-settings.h"
 #include "sieve-extensions.h"
 
 /*
@@ -178,6 +179,7 @@
 	unsigned int i;	
 	struct sieve_extension_registry *ext_reg = 
 		p_new(svinst->pool, struct sieve_extension_registry, 1);
+	const char *extensions;
 
 	svinst->ext_reg = ext_reg;
 
@@ -230,8 +232,13 @@
 	}
 #endif
 
+	/* Use sieve_extensions if set */
+
+	if ( (extensions=sieve_setting_get(svinst, "sieve_extensions")) != NULL )
+		sieve_extensions_set_string(svinst, extensions);
+
 	/* More extensions can be added through plugins */
-	
+
 	return TRUE;
 }
 
diff -r e59182cb2798 -r 2ab267d4c8b5 src/managesieve/managesieve-capabilities.c
--- a/src/managesieve/managesieve-capabilities.c	Sat Jul 03 22:49:21 2010 +0200
+++ b/src/managesieve/managesieve-capabilities.c	Sat Jul 03 23:32:28 2010 +0200
@@ -132,11 +132,6 @@
 
 	svinst = sieve_init(&sieve_env, (void *) global_plugin_settings, FALSE);
 
-	extensions = plugin_settings_get(global_plugin_settings, "sieve_extensions");
-	if ( extensions != NULL ) {
-		sieve_set_extensions(svinst, extensions);
-	}
-
 	/* Dump capabilities */
 
 	notify_cap = sieve_get_capabilities(svinst, "notify");
diff -r e59182cb2798 -r 2ab267d4c8b5 src/managesieve/managesieve-client.c
--- a/src/managesieve/managesieve-client.c	Sat Jul 03 22:49:21 2010 +0200
+++ b/src/managesieve/managesieve-client.c	Sat Jul 03 23:32:28 2010 +0200
@@ -111,7 +111,7 @@
 	const struct managesieve_settings *set)
 {
 	struct client *client;
-	const char *ident, *extensions;
+	const char *ident;
 	struct sieve_instance *svinst;
 	struct sieve_storage *storage;
 
@@ -124,11 +124,6 @@
 
 	svinst = sieve_init(&managesieve_sieve_env, (void *) user, set->mail_debug);
 
-	extensions = mail_user_plugin_getenv(user, "sieve_extensions");
-	if ( extensions != NULL ) {
-		sieve_set_extensions(svinst, extensions);
-	}
-
 	/* Get Sieve storage */
 
 	storage = client_get_storage(svinst, user, set);	
diff -r e59182cb2798 -r 2ab267d4c8b5 src/plugins/lda-sieve/lda-sieve-plugin.c
--- a/src/plugins/lda-sieve/lda-sieve-plugin.c	Sat Jul 03 22:49:21 2010 +0200
+++ b/src/plugins/lda-sieve/lda-sieve-plugin.c	Sat Jul 03 23:32:28 2010 +0200
@@ -519,7 +519,6 @@
 	struct sieve_message_data msgdata;
 	struct sieve_script_env scriptenv;
 	struct sieve_exec_status estatus;
-	const char *extensions = NULL;
 	bool debug = mdctx->dest_user->mail_debug;
 	int ret = 0;
 
@@ -528,12 +527,6 @@
 	/* Initialize Sieve engine */
 	svinst = sieve_init(&lda_sieve_env, mdctx->dest_user, debug);
 	
-	extensions = mail_user_plugin_getenv
-		(mdctx->dest_user, "sieve_extensions");
-	if ( extensions != NULL ) {
-		sieve_set_extensions(svinst, extensions);
-	}
-
 	/* Initialize */
 
 	memset(&srctx, 0, sizeof(srctx));