From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 18 Aug 2016 08:22:09 +0000 (+0300)
Subject: lmtp: Support %{userdb:*} variables in mail_log_prefix
X-Git-Tag: 2.2.26~331
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65cf80a6c7484a0776791bc36a40548eec118f9d;p=thirdparty%2Fdovecot%2Fcore.git

lmtp: Support %{userdb:*} variables in mail_log_prefix
---

diff --git a/src/lmtp/commands.c b/src/lmtp/commands.c
index 56cb94b3fc..0602e45f30 100644
--- a/src/lmtp/commands.c
+++ b/src/lmtp/commands.c
@@ -836,8 +836,10 @@ client_deliver(struct client *client, const struct mail_recipient *rcpt,
 		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));
+	var_expand_with_funcs(str, client->state.dest_user->set->mail_log_prefix,
+			      mail_user_var_expand_table(client->state.dest_user),
+			      mail_user_var_expand_func_table,
+			      client->state.dest_user);
 	i_set_failure_prefix("%s", str_c(str));
 
 	sets = mail_storage_service_user_get_set(rcpt->service_user);