dovecot-2.0-pigeonhole: lib-sieve: vacation extension: further t...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.0-pigeonhole/rev/bf72eada1f1b
changeset: 1542:bf72eada1f1b
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Wed Oct 05 19:10:44 2011 +0200
description:
lib-sieve: vacation extension: further tinkered on log message about implicitly delivered messages.

diffstat:

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

diffs (27 lines):

diff -r 027f450bd498 -r bf72eada1f1b src/lib-sieve/plugins/vacation/cmd-vacation.c
--- a/src/lib-sieve/plugins/vacation/cmd-vacation.c	Wed Oct 05 19:03:28 2011 +0200
+++ b/src/lib-sieve/plugins/vacation/cmd-vacation.c	Wed Oct 05 19:10:44 2011 +0200
@@ -1189,16 +1189,17 @@
 			/* No, bail out */
 
 			if ( config->use_original_recipient ) {
-				original_recipient = t_strdup_printf("original recipient = <%s>; ",
-					( orig_recipient == NULL ? "UNAVAILABLE" : str_sanitize(orig_recipient, 128) ));
+				original_recipient = t_strdup_printf("original-recipient=<%s>, ",
+					( orig_recipient == NULL ? "UNAVAILABLE" :
+						str_sanitize(orig_recipient, 128) ));
 			}
 
 			sieve_result_global_log(aenv,
-				"discarding vacation response for implicitly delivered message "
-				"(no known recipient address found in message headers: "
-				"recipient = <%s>; %sadditional :addresses are%s specified)",
+				"discarding vacation response for implicitly delivered message; "
+				"no known (envelope) recipient address found in message headers "
+				"(recipient=<%s>, %sand%s additional `:addresses' are specified)",
 				str_sanitize(recipient, 128), original_recipient,
-				(ctx->addresses == NULL ? " not" : ""));
+				(ctx->addresses == NULL ? " no" : ""));
 
 			return TRUE;
 		}