Skip to content
Snippets Groups Projects
Commit 99b7d55b authored by Stephan Bosch's avatar Stephan Bosch Committed by Timo Sirainen
Browse files

lib-sieve: vacation extension: Rename settings to better match Dovecot conventions

parent 93008c83
No related branches found
No related tags found
No related merge requests found
...@@ -1504,7 +1504,7 @@ act_vacation_commit(const struct sieve_action_exec_env *aenv, ...@@ -1504,7 +1504,7 @@ act_vacation_commit(const struct sieve_action_exec_env *aenv,
/* My address not found in the headers; we got an implicit delivery */ /* My address not found in the headers; we got an implicit delivery */
if (*hdsp == NULL) { if (*hdsp == NULL) {
if (extctx->set->dont_check_recipient) { if (!extctx->set->check_recipient) {
/* Send reply from envelope recipient address */ /* Send reply from envelope recipient address */
smtp_from = (orig_recipient == NULL ? smtp_from = (orig_recipient == NULL ?
recipient : orig_recipient); recipient : orig_recipient);
......
...@@ -26,7 +26,7 @@ static const struct setting_define ext_vacation_setting_defines[] = { ...@@ -26,7 +26,7 @@ static const struct setting_define ext_vacation_setting_defines[] = {
DEF(STR, default_subject_template), DEF(STR, default_subject_template),
DEF(BOOL, use_original_recipient), DEF(BOOL, use_original_recipient),
DEF(BOOL, dont_check_recipient), DEF(BOOL, check_recipient),
DEF(BOOL, send_from_recipient), DEF(BOOL, send_from_recipient),
DEF(BOOL, to_header_ignore_envelope), DEF(BOOL, to_header_ignore_envelope),
...@@ -40,7 +40,7 @@ static const struct ext_vacation_settings ext_vacation_default_settings = { ...@@ -40,7 +40,7 @@ static const struct ext_vacation_settings ext_vacation_default_settings = {
.default_subject = "", .default_subject = "",
.default_subject_template = "", .default_subject_template = "",
.use_original_recipient = FALSE, .use_original_recipient = FALSE,
.dont_check_recipient = FALSE, .check_recipient = TRUE,
.send_from_recipient = FALSE, .send_from_recipient = FALSE,
.to_header_ignore_envelope = FALSE, .to_header_ignore_envelope = FALSE,
}; };
......
...@@ -12,7 +12,7 @@ struct ext_vacation_settings { ...@@ -12,7 +12,7 @@ struct ext_vacation_settings {
const char *default_subject_template; const char *default_subject_template;
bool use_original_recipient; bool use_original_recipient;
bool dont_check_recipient; bool check_recipient;
bool send_from_recipient; bool send_from_recipient;
bool to_header_ignore_envelope; bool to_header_ignore_envelope;
}; };
......
...@@ -516,7 +516,7 @@ Frop! ...@@ -516,7 +516,7 @@ Frop!
test_set "envelope.from" "timo@example.com"; test_set "envelope.from" "timo@example.com";
test_set "envelope.to" "stephan@example.com"; test_set "envelope.to" "stephan@example.com";
test_config_set "sieve_vacation_dont_check_recipient" "yes"; test_config_set "sieve_vacation_check_recipient" "no";
test_config_reload :extension "vacation"; test_config_reload :extension "vacation";
test "Reply for any recipient" { test "Reply for any recipient" {
......
0% Loading 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.