From 303dd48ed651fad9c9604cf58b7fde6fbddf0250 Mon Sep 17 00:00:00 2001 From: "sergey.kitov" Date: Fri, 15 Sep 2023 17:18:07 +0300 Subject: [PATCH] lmtp: change login_trusted_networks to BOOLLIST. --- src/lmtp/lmtp-client.c | 5 +---- src/lmtp/lmtp-settings.c | 4 ++-- src/lmtp/lmtp-settings.h | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/lmtp/lmtp-client.c b/src/lmtp/lmtp-client.c index 9e5e0fcd81..ffc9969ee8 100644 --- a/src/lmtp/lmtp-client.c +++ b/src/lmtp/lmtp-client.c @@ -455,10 +455,7 @@ static bool client_connection_is_trusted(void *context) struct ip_addr net_ip; unsigned int bits; - if (client->lmtp_set->login_trusted_networks == NULL) - return FALSE; - - net = t_strsplit_spaces(client->lmtp_set->login_trusted_networks, ", "); + net = settings_boollist_get(&client->lmtp_set->login_trusted_networks); for (; *net != NULL; net++) { if (net_parse_range(*net, &net_ip, &bits) < 0) { e_error(client->event, "login_trusted_networks: " diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c index 4bd7c243e6..b6e15ac014 100644 --- a/src/lmtp/lmtp-settings.c +++ b/src/lmtp/lmtp-settings.c @@ -62,7 +62,7 @@ static const struct setting_define lmtp_setting_defines[] = { DEF(BOOLLIST, lmtp_client_workarounds), DEF(STR_HIDDEN, login_greeting), - DEF(STR, login_trusted_networks), + DEF(BOOLLIST, login_trusted_networks), DEF(BOOLLIST, mail_plugins), DEF(STR, mail_plugin_dir), @@ -84,7 +84,7 @@ static const struct lmtp_settings lmtp_default_settings = { .lmtp_client_workarounds = ARRAY_INIT, .login_greeting = PACKAGE_NAME" ready.", - .login_trusted_networks = "", + .login_trusted_networks = ARRAY_INIT, .mail_plugins = ARRAY_INIT, .mail_plugin_dir = MODULEDIR, diff --git a/src/lmtp/lmtp-settings.h b/src/lmtp/lmtp-settings.h index 6d58702652..0544db5ee9 100644 --- a/src/lmtp/lmtp-settings.h +++ b/src/lmtp/lmtp-settings.h @@ -33,7 +33,7 @@ struct lmtp_settings { ARRAY_TYPE(const_string) lmtp_client_workarounds; const char *login_greeting; - const char *login_trusted_networks; + ARRAY_TYPE(const_string) login_trusted_networks; ARRAY_TYPE(const_string) mail_plugins; const char *mail_plugin_dir; -- 2.47.3