dovecot-1.2-sieve: Spamtest and virustest extensions: now not av...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-1.2-sieve/rev/0f5f87cad820
changeset: 1241:0f5f87cad820
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Sun Mar 14 12:34:13 2010 +0100
description:
Spamtest and virustest extensions: now not available by default.

diffstat:

 src/lib-sieve/sieve-extensions.c |  21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diffs (45 lines):

diff -r c214762b98f3 -r 0f5f87cad820 src/lib-sieve/sieve-extensions.c
--- a/src/lib-sieve/sieve-extensions.c	Sun Mar 14 12:19:51 2010 +0100
+++ b/src/lib-sieve/sieve-extensions.c	Sun Mar 14 12:34:13 2010 +0100
@@ -102,6 +102,8 @@
  * List of native extensions
  */
 
+/* Core */
+
 const struct sieve_extension_def *sieve_core_extensions[] = {	
 	/* Dummy extensions */ 
 	&comparator_i_octet_extension, &comparator_i_ascii_casemap_extension, 
@@ -123,6 +125,18 @@
 const unsigned int sieve_core_extensions_count =
 	N_ELEMENTS(sieve_core_extensions);
 
+/* Extra; 
+ *   These are not enabled by default, because explicit configuration is
+ *   necessary to make these useful.
+ */
+
+const struct sieve_extension_def *sieve_extra_extensions[] = {	
+	&spamtest_extension, &spamtestplus_extension, &virustest_extension
+};
+
+const unsigned int sieve_extra_extensions_count =
+	N_ELEMENTS(sieve_extra_extensions);
+
 /*
  * Deprecated extensions
  */
@@ -193,6 +207,13 @@
 			return FALSE;
 	}
 
+	/* Pre-load extra extensions */
+	for ( i = 0; i < sieve_extra_extensions_count; i++ ) {
+		if ( sieve_extension_register
+			(svinst, sieve_extra_extensions[i], FALSE) == NULL )
+			return FALSE;
+	}
+
 	/* Register deprecated extensions */
 	for ( i = 0; i < sieve_deprecated_extensions_count; i++ ) {
 		if ( sieve_extension_register