dovecot-sieve-1.1: global_script_path -> sieve_global_path

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-sieve-1.1/rev/fae7f0d39827
changeset: 30:fae7f0d39827
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Jul 20 11:16:56 2007 +0300
description:
global_script_path -> sieve_global_path
global_script_dir -> sieve_global_dir
Also added sieve_dir setting which overrides home directory.

diffstat:

2 files changed, 6 insertions(+), 2 deletions(-)
src/cmusieve-plugin.c |    6 +++++-
src/sieve-cmu.c       |    2 +-

diffs (28 lines):

diff -r 3d36c3f1f755 -r fae7f0d39827 src/cmusieve-plugin.c
--- a/src/cmusieve-plugin.c	Fri Jul 20 11:15:39 2007 +0300
+++ b/src/cmusieve-plugin.c	Fri Jul 20 11:16:56 2007 +0300
@@ -50,7 +50,11 @@ static const char *get_sieve_path(void)
 			i_error("stat(%s) failed: %m", script_path);
 
 		/* use global script instead, if one exists */
-		script_path = getenv("GLOBAL_SCRIPT_PATH");
+		script_path = getenv("SIEVE_GLOBAL_PATH");
+		if (script_path == NULL) {
+			/* for backwards compatibility */
+			script_path = getenv("GLOBAL_SCRIPT_PATH");
+		}
 	}
 
 	return script_path;
diff -r 3d36c3f1f755 -r fae7f0d39827 src/sieve-cmu.c
--- a/src/sieve-cmu.c	Fri Jul 20 11:15:39 2007 +0300
+++ b/src/sieve-cmu.c	Fri Jul 20 11:16:56 2007 +0300
@@ -359,7 +359,7 @@ static int getinclude(void *sc, const ch
 	}
 
 	if (isglobal) {
-		script_dir = getenv("GLOBAL_SCRIPT_DIR");
+		script_dir = getenv("SIEVE_GLOBAL_DIR");
 		if (script_dir == NULL) {
 			i_info("include: global_script_dir not set "
 			       "(wanted script %s)", str_sanitize(script, 80));