dovecot-2.0-pigeonhole: lib-sieve: vacation extension: made disc...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.0-pigeonhole/rev/936f29175330
changeset: 1539:936f29175330
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Wed Oct 05 17:43:37 2011 +0200
description:
lib-sieve: vacation extension: made discard message for implicit deliver more verbose.

diffstat:

 src/lib-sieve/plugins/vacation/cmd-vacation.c |  16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r e10d402769fb -r 936f29175330 src/lib-sieve/plugins/vacation/cmd-vacation.c
--- a/src/lib-sieve/plugins/vacation/cmd-vacation.c	Wed Sep 21 11:33:00 2011 +0200
+++ b/src/lib-sieve/plugins/vacation/cmd-vacation.c	Wed Oct 05 17:43:37 2011 +0200
@@ -1184,10 +1184,22 @@
 
 		/* My address not found in the headers; we got an implicit delivery */
 		if ( *hdsp == NULL ) {
+			const char *original_recipient = "";
+
 			/* 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) ));
+			}
+
 			sieve_result_global_log(aenv,
-				"discarding vacation response for message implicitly delivered to <%s>",
-				recipient );
+				"discarding vacation response for implicitly delivered message "
+				"(no known recipient address found in message headers: "
+				"recipient = <%s>; %sadditional :addresses are%s specified)",
+				str_sanitize(recipient, 128), original_recipient,
+				(ctx->addresses == NULL ? " not" : ""));
+
 			return TRUE;
 		}
 	}