changeset 20670:f683b474bc29

lmtp: Support %{userdb:*} variables in mail_log_prefix
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Thu, 18 Aug 2016 11:22:09 +0300
parents 7225abbbc344
children 25351b751714
files src/lmtp/commands.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/lmtp/commands.c	Mon Aug 15 23:43:33 2016 +0300
+++ b/src/lmtp/commands.c	Thu Aug 18 11:22:09 2016 +0300
@@ -836,8 +836,10 @@
 		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);