dovecot-2.1-pigeonhole: lib-sieve: vacation: made vacation actio...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.1-pigeonhole/rev/77a20a67153d
changeset: 1566:77a20a67153d
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Tue Nov 29 01:09:27 2011 +0100
description:
lib-sieve: vacation: made vacation action header checks use the modified message (editheader).

diffstat:

 src/lib-sieve/plugins/vacation/cmd-vacation.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r 3fc2c1bfb4ca -r 77a20a67153d src/lib-sieve/plugins/vacation/cmd-vacation.c
--- a/src/lib-sieve/plugins/vacation/cmd-vacation.c	Tue Nov 29 00:57:27 2011 +0100
+++ b/src/lib-sieve/plugins/vacation/cmd-vacation.c	Tue Nov 29 01:09:27 2011 +0100
@@ -1026,6 +1026,7 @@
 	struct act_vacation_context *ctx = 
 		(struct act_vacation_context *) action->context;
 	unsigned char dupl_hash[MD5_RESULTLEN];
+	struct mail *mail = sieve_message_get_mail(aenv->msgctx);
 	const char *sender = sieve_message_get_sender(aenv->msgctx);
 	const char *recipient = sieve_message_get_final_recipient(aenv->msgctx);
 	const char *const *hdsp;
@@ -1090,7 +1091,7 @@
 	hdsp = _list_headers;
 	while ( *hdsp != NULL ) {
 		if ( mail_get_headers
-			(msgdata->mail, *hdsp, &headers) >= 0 && headers[0] != NULL ) {	
+			(mail, *hdsp, &headers) >= 0 && headers[0] != NULL ) {	
 			/* Yes, bail out */
 			sieve_result_global_log(aenv, 
 				"discarding vacation response to mailinglist recipient <%s>", 
@@ -1118,7 +1119,7 @@
 	
 	/* Check for the (non-standard) precedence header */
 	if ( mail_get_headers
-		(msgdata->mail, "precedence", &headers) >= 0 ) {
+		(mail, "precedence", &headers) >= 0 ) {
 		/* Theoretically multiple headers could exist, so lets make sure */
 		hdsp = headers;
 		while ( *hdsp != NULL ) {
@@ -1153,7 +1154,7 @@
 		hdsp = _my_address_headers;
 		while ( *hdsp != NULL ) {
 			if ( mail_get_headers
-				(msgdata->mail, *hdsp, &headers) >= 0 && headers[0] != NULL ) {	
+				(mail, *hdsp, &headers) >= 0 && headers[0] != NULL ) {	
 
 				if ( _contains_my_address(headers, recipient) ) {
 					reply_from = recipient;