dovecot-2.0-pigeonhole: Copy extension: previous change was inco...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.0-pigeonhole/rev/1a9955262f5c
changeset: 1463:1a9955262f5c
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Sun Jan 23 13:44:13 2011 +0100
description:
Copy extension: previous change was incomplete and broken.

diffstat:

 src/lib-sieve/cmd-redirect.c          |  2 +-
 src/lib-sieve/plugins/copy/ext-copy.c |  4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 2391ec677b35 -r 1a9955262f5c src/lib-sieve/cmd-redirect.c
--- a/src/lib-sieve/cmd-redirect.c	Sun Jan 23 13:40:33 2011 +0100
+++ b/src/lib-sieve/cmd-redirect.c	Sun Jan 23 13:44:13 2011 +0100
@@ -179,7 +179,7 @@
 	if ( sieve_action_opr_optional_dump(denv, address, NULL) != 0 )
 		return FALSE;
 
-	return sieve_opr_string_dump(denv, address, "reason");
+	return sieve_opr_string_dump(denv, address, "address");
 }
 
 /*
diff -r 2391ec677b35 -r 1a9955262f5c src/lib-sieve/plugins/copy/ext-copy.c
--- a/src/lib-sieve/plugins/copy/ext-copy.c	Sun Jan 23 13:40:33 2011 +0100
+++ b/src/lib-sieve/plugins/copy/ext-copy.c	Sun Jan 23 13:44:13 2011 +0100
@@ -22,6 +22,8 @@
 #include "sieve-interpreter.h"
 #include "sieve-result.h"
 
+#include "sieve-ext-copy.h"
+
 /*
  * Forward declarations
  */
@@ -123,7 +125,7 @@
 (struct sieve_validator *valdtr, const struct sieve_extension *copy_ext,
 	const char *command)
 {
-	if ( sieve_validator_extension_loaded(valdr, copy_ext) ) {
+	if ( sieve_validator_extension_loaded(valdtr, copy_ext) ) {
 		sieve_validator_register_external_tag
 			(valdtr, command, copy_ext, &copy_tag, SIEVE_OPT_SIDE_EFFECT);
 	}