From db06d68b8e5534b62fddf3205f3835dfbe058024 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Wed, 5 Oct 2011 19:10:44 +0200
Subject: [PATCH] lib-sieve: vacation extension: further tinkered on log
message about implicitly delivered messages.
---
src/lib-sieve/plugins/vacation/cmd-vacation.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/lib-sieve/plugins/vacation/cmd-vacation.c b/src/lib-sieve/plugins/vacation/cmd-vacation.c
index bb105db77..1e7560227 100644
--- a/src/lib-sieve/plugins/vacation/cmd-vacation.c
+++ b/src/lib-sieve/plugins/vacation/cmd-vacation.c
@@ -1189,16 +1189,17 @@ static bool act_vacation_commit
/* 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;
}
--
GitLab