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

diff --git a/src/lmtp/commands.c b/src/lmtp/commands.c
index 1ffe7fe85a4d866149b4e6cc46a5e7fd56d5dcbf..e98a028ba90b3ba0b37f6d4a5c757c4bb96b7da4 100644 (file)
--- a/src/lmtp/commands.c
+++ b/src/lmtp/commands.c
@@ -847,8 +847,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);