Skip to content
Snippets Groups Projects
Commit 02ccfa7a authored by Timo Sirainen's avatar Timo Sirainen
Browse files

global: Adjust to var_expand() API change

parent 5c106a47
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/lib-sieve/plugins/vacation/cmd-vacation.c
+ 2
− 2
View file @ 02ccfa7a
...@@ -1053,8 +1053,8 @@ act_vacation_get_default_subject(const struct sieve_action_exec_env *aenv, ...@@ -1053,8 +1053,8 @@ act_vacation_get_default_subject(const struct sieve_action_exec_env *aenv,
str = t_str_new(256); str = t_str_new(256);
tab = _get_var_expand_table(aenv, header); tab = _get_var_expand_table(aenv, header);
if (var_expand(str, config->default_subject_template, if (var_expand_with_table(str, config->default_subject_template,
tab, &error) <= 0) { tab, &error) <= 0) {
e_error(aenv->event, e_error(aenv->event,
"Failed to expand deliver_log_format=%s: %s", "Failed to expand deliver_log_format=%s: %s",
config->default_subject_template, error); config->default_subject_template, error);
......
src/plugins/lda-sieve/lda-sieve-plugin.c
+ 2
− 2
View file @ 02ccfa7a
...@@ -214,8 +214,8 @@ lda_sieve_result_amend_log_message(const struct sieve_script_env *senv, ...@@ -214,8 +214,8 @@ lda_sieve_result_amend_log_message(const struct sieve_script_env *senv,
table = mail_deliver_ctx_get_log_var_expand_table(mdctx, message); table = mail_deliver_ctx_get_log_var_expand_table(mdctx, message);
str = t_str_new(256); str = t_str_new(256);
if (var_expand(str, mdctx->set->deliver_log_format, if (var_expand_with_table(str, mdctx->set->deliver_log_format,
table, &error) <= 0) { table, &error) <= 0) {
e_error(mdctx->event, e_error(mdctx->event,
"Failed to expand deliver_log_format=%s: %s", "Failed to expand deliver_log_format=%s: %s",
mdctx->set->deliver_log_format, error); mdctx->set->deliver_log_format, error);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Consent

On this website, we use the web analytics service Matomo to analyze and review the use of our website. Through the collected statistics, we can improve our offerings and make them more appealing for you. Here, you can decide whether to allow us to process your data and set corresponding cookies for these purposes, in addition to technically necessary cookies. Further information on data protection—especially regarding "cookies" and "Matomo"—can be found in our privacy policy. You can withdraw your consent at any time.