From f382f05269ca3a06b517eb3f53c29d1be05bc95e Mon Sep 17 00:00:00 2001 From: "sergey.kitov" Date: Wed, 20 Sep 2023 18:08:41 +0300 Subject: [PATCH] submission: change submission_backend_capabilities to BOOLLIST. --- src/submission/submission-client.c | 4 ++-- src/submission/submission-settings.c | 4 ++-- src/submission/submission-settings.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/submission/submission-client.c b/src/submission/submission-client.c index 98f41808e6..a13ffc217a 100644 --- a/src/submission/submission-client.c +++ b/src/submission/submission-client.c @@ -68,10 +68,10 @@ static void client_parse_backend_capabilities(struct client *client) const char *const *str; client->backend_capabilities = SMTP_CAPABILITY_NONE; - if (set->submission_backend_capabilities[0] == '\0') + if (array_is_empty(&set->submission_backend_capabilities)) return; - str = t_strsplit_spaces(set->submission_backend_capabilities, " ,"); + str = settings_boollist_get(&set->submission_backend_capabilities); for (; *str != NULL; str++) { if (strcmp(*str, "none") == 0) continue; diff --git a/src/submission/submission-settings.c b/src/submission/submission-settings.c index ff317fc3c9..b20872eb8b 100644 --- a/src/submission/submission-settings.c +++ b/src/submission/submission-settings.c @@ -69,7 +69,7 @@ static const struct setting_define submission_setting_defines[] = { DEF(STR_NOVARS, submission_logout_format), DEF(BOOL, submission_add_received_header), - DEF(STR, submission_backend_capabilities), + DEF(BOOLLIST, submission_backend_capabilities), DEF(STR, submission_relay_host), DEF(IN_PORT, submission_relay_port), @@ -111,7 +111,7 @@ static const struct submission_settings submission_default_settings = { .submission_logout_format = "in=%i out=%o", .submission_add_received_header = TRUE, - .submission_backend_capabilities = "", + .submission_backend_capabilities = ARRAY_INIT, .submission_relay_host = "", .submission_relay_port = 25, diff --git a/src/submission/submission-settings.h b/src/submission/submission-settings.h index 2b9b03c5e1..6c33d3ba15 100644 --- a/src/submission/submission-settings.h +++ b/src/submission/submission-settings.h @@ -30,7 +30,7 @@ struct submission_settings { bool submission_add_received_header; /* submission backend: */ - const char *submission_backend_capabilities; + ARRAY_TYPE(const_string) submission_backend_capabilities; /* submission relay: */ const char *submission_relay_host; -- 2.47.3