lmtp: change login_trusted_networks to BOOLLIST.

diff --git a/src/lmtp/lmtp-client.c b/src/lmtp/lmtp-client.c
index 9e5e0fcd8118fe288f4d772e170a27bb827c5258..ffc9969ee8c36626489b7f9f3e31d94486056f38 100644 (file)
--- 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 4bd7c243e6cbf50624bd099bd85de7b0943db50f..b6e15ac014ff9a3458a4c52e4db45b987af6350f 100644 (file)
--- 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 6d5870265286e37c857b5f7023c8255d7ef4ba3e..0544db5ee9f6a7973b0f9da740de9d663f475f5c 100644 (file)
--- 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;