From: sergey.kitov Date: Wed, 4 Oct 2023 12:01:44 +0000 (+0300) Subject: lmtp: change lmtp_client_workarounds to BOOLLIST. X-Git-Tag: 2.4.0~595 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72bfb0c960aaad483072dfcfab4619b9f2bfb220;p=thirdparty%2Fdovecot%2Fcore.git lmtp: change lmtp_client_workarounds to BOOLLIST. --- diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c index 98b17ffc02..4bd7c243e6 100644 --- a/src/lmtp/lmtp-settings.c +++ b/src/lmtp/lmtp-settings.c @@ -59,7 +59,7 @@ static const struct setting_define lmtp_setting_defines[] = { DEF(STR, lmtp_rawlog_dir), DEF(STR, lmtp_proxy_rawlog_dir), - DEF(STR, lmtp_client_workarounds), + DEF(BOOLLIST, lmtp_client_workarounds), DEF(STR_HIDDEN, login_greeting), DEF(STR, login_trusted_networks), @@ -81,7 +81,7 @@ static const struct lmtp_settings lmtp_default_settings = { .lmtp_rawlog_dir = "", .lmtp_proxy_rawlog_dir = "", - .lmtp_client_workarounds = "", + .lmtp_client_workarounds = ARRAY_INIT, .login_greeting = PACKAGE_NAME" ready.", .login_trusted_networks = "", @@ -122,7 +122,7 @@ lmtp_settings_parse_workarounds(struct lmtp_settings *set, const struct lmtp_client_workaround_list *list; const char *const *str; - str = t_strsplit_spaces(set->lmtp_client_workarounds, " ,"); + str = settings_boollist_get(&set->lmtp_client_workarounds); for (; *str != NULL; str++) { list = lmtp_client_workaround_list; for (; list->name != NULL; list++) { diff --git a/src/lmtp/lmtp-settings.h b/src/lmtp/lmtp-settings.h index 6ff96dd2b4..6d58702652 100644 --- a/src/lmtp/lmtp-settings.h +++ b/src/lmtp/lmtp-settings.h @@ -30,7 +30,7 @@ struct lmtp_settings { const char *lmtp_rawlog_dir; const char *lmtp_proxy_rawlog_dir; - const char *lmtp_client_workarounds; + ARRAY_TYPE(const_string) lmtp_client_workarounds; const char *login_greeting; const char *login_trusted_networks;