dovecot-2.2: lmtp: Use mail_log_prefix while mails are being del...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/e861c21875cc
changeset: 18014:e861c21875cc
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Oct 25 06:40:03 2014 +0300
description:
lmtp: Use mail_log_prefix while mails are being delivered.

diffstat:

 src/lmtp/commands.c |  7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diffs (31 lines):

diff -r 380b723f37ef -r e861c21875cc src/lmtp/commands.c
--- a/src/lmtp/commands.c	Sat Oct 25 06:37:35 2014 +0300
+++ b/src/lmtp/commands.c	Sat Oct 25 06:40:03 2014 +0300
@@ -11,6 +11,7 @@
 #include "ostream.h"
 #include "istream-dot.h"
 #include "safe-mkstemp.h"
+#include "var-expand.h"
 #include "restrict-access.h"
 #include "settings-parser.h"
 #include "master-service.h"
@@ -626,6 +627,7 @@
 	struct setting_parser_context *set_parser;
 	void **sets;
 	const char *line, *error, *username;
+	string_t *str;
 	enum mail_error mail_error;
 	int ret;
 
@@ -655,6 +657,11 @@
 				 rcpt->address);
 		return -1;
 	}
+	str = t_str_new(256);
+	var_expand(str, client->state.dest_user->set->mail_log_prefix,
+		   mail_user_var_expand_table(client->state.dest_user));
+	i_set_failure_prefix("%s", str_c(str));
+
 	sets = mail_storage_service_user_get_set(rcpt->service_user);
 	lda_set = sets[1];
 	settings_var_expand(&lda_setting_parser_info, lda_set, client->pool,