dovecot-2.2-pigeonhole: Merged changes from Pigeonhole v0.3 tree.

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/5323b5e65289
changeset: 1733:5323b5e65289
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Thu Mar 28 22:14:21 2013 +0100
description:
Merged changes from Pigeonhole v0.3 tree.

diffstat:

 src/lib-sievestorage/sieve-storage-save.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 42f11a1be763 -r 5323b5e65289 src/lib-sievestorage/sieve-storage-save.c
--- a/src/lib-sievestorage/sieve-storage-save.c	Thu Mar 28 21:33:31 2013 +0100
+++ b/src/lib-sievestorage/sieve-storage-save.c	Thu Mar 28 22:14:21 2013 +0100
@@ -202,7 +202,7 @@
 	ctx = p_new(pool, struct sieve_save_context, 1);
 	ctx->pool = pool;
 	ctx->storage = storage;
-	ctx->scriptname = scriptname;
+	ctx->scriptname = p_strdup(pool, scriptname);
 	ctx->scriptobject = NULL;
 
 	T_BEGIN {
@@ -305,7 +305,7 @@
 	if ( ctx->scriptobject == NULL ) {
 		if ( ctx->storage->error_code == SIEVE_ERROR_NOT_FOUND ) {
 			sieve_storage_set_critical(ctx->storage,
-				"save: Temporary script file with name '%s' got lost, "
+				"save: Temporary script file '%s' got lost, "
 				"which should not happen (possibly deleted externally).",
 				ctx->tmp_path);
 		}
@@ -324,7 +324,7 @@
 		const char *scriptname;
 		int ret;
 
-		ret = sieve_storage_get_active_scriptfile(ctx->storage, &scriptname);
+		ret = sieve_storage_get_active_scriptname(ctx->storage, &scriptname);
 		if ( ret > 0 ) {
 		 	/* Is the requested script active? */
 			result = ( strcmp(ctx->scriptname, scriptname) == 0 );