dovecot-2.2-pigeonhole: lib-sieve: Added path to temporary direc...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/c3d99cdd49f1
changeset: 1826:c3d99cdd49f1
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Wed Dec 25 21:36:55 2013 +0100
description:
lib-sieve: Added path to temporary directory to Sieve instance object.

diffstat:

 src/lib-sieve-tool/sieve-tool.c          |  1 +
 src/lib-sieve/sieve-common.h             |  1 +
 src/lib-sieve/sieve-types.h              |  1 +
 src/lib-sieve/sieve.c                    |  1 +
 src/plugins/lda-sieve/lda-sieve-plugin.c |  1 +
 5 files changed, 5 insertions(+), 0 deletions(-)

diffs (55 lines):

diff -r f7967d104216 -r c3d99cdd49f1 src/lib-sieve-tool/sieve-tool.c
--- a/src/lib-sieve-tool/sieve-tool.c	Sat Dec 21 21:32:13 2013 +0100
+++ b/src/lib-sieve-tool/sieve-tool.c	Wed Dec 25 21:36:55 2013 +0100
@@ -273,6 +273,7 @@
 	(void)mail_user_get_home(tool->mail_user_dovecot, &svenv.home_dir);
 	svenv.hostname = my_hostdomain();
 	svenv.base_dir = tool->mail_user_dovecot->set->base_dir;
+	svenv.temp_dir = tool->mail_user_dovecot->set->mail_temp_dir;
 	svenv.location = SIEVE_ENV_LOCATION_MS;
 	svenv.delivery_phase = SIEVE_DELIVERY_PHASE_POST;
 
diff -r f7967d104216 -r c3d99cdd49f1 src/lib-sieve/sieve-common.h
--- a/src/lib-sieve/sieve-common.h	Sat Dec 21 21:32:13 2013 +0100
+++ b/src/lib-sieve/sieve-common.h	Wed Dec 25 21:36:55 2013 +0100
@@ -159,6 +159,7 @@
 	const char *hostname;
 	const char *domainname;
 	const char *base_dir;
+	const char *temp_dir;
 
 	/* User environment */
 	const char *username;
diff -r f7967d104216 -r c3d99cdd49f1 src/lib-sieve/sieve-types.h
--- a/src/lib-sieve/sieve-types.h	Sat Dec 21 21:32:13 2013 +0100
+++ b/src/lib-sieve/sieve-types.h	Wed Dec 25 21:36:55 2013 +0100
@@ -60,6 +60,7 @@
 	const char *base_dir;
 	const char *username;
 	const char *home_dir;
+	const char *temp_dir;
 
 	enum sieve_flag flags;
 	enum sieve_env_location location;
diff -r f7967d104216 -r c3d99cdd49f1 src/lib-sieve/sieve.c
--- a/src/lib-sieve/sieve.c	Sat Dec 21 21:32:13 2013 +0100
+++ b/src/lib-sieve/sieve.c	Wed Dec 25 21:36:55 2013 +0100
@@ -62,6 +62,7 @@
 	svinst->base_dir = p_strdup_empty(pool, env->base_dir);
 	svinst->username = p_strdup_empty(pool, env->username);
 	svinst->home_dir = p_strdup_empty(pool, env->home_dir);
+	svinst->temp_dir = p_strdup_empty(pool, env->temp_dir);
 	svinst->flags = env->flags;
 	svinst->env_location = env->location;
 	svinst->delivery_phase = env->delivery_phase;
diff -r f7967d104216 -r c3d99cdd49f1 src/plugins/lda-sieve/lda-sieve-plugin.c
--- a/src/plugins/lda-sieve/lda-sieve-plugin.c	Sat Dec 21 21:32:13 2013 +0100
+++ b/src/plugins/lda-sieve/lda-sieve-plugin.c	Wed Dec 25 21:36:55 2013 +0100
@@ -911,6 +911,7 @@
 	svenv.home_dir = srctx.home_dir;
 	svenv.hostname = mdctx->set->hostname;
 	svenv.base_dir = mdctx->dest_user->set->base_dir;
+	svenv.temp_dir = mdctx->dest_user->set->mail_temp_dir;
 	svenv.flags = SIEVE_FLAG_HOME_RELATIVE;
 	svenv.location = SIEVE_ENV_LOCATION_MDA;
 	svenv.delivery_phase = SIEVE_DELIVERY_PHASE_DURING;