login-common: change login_trusted_networks to BOOLLIST.

diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c
index ef4b5d79daddaf84d4da44d1aed2d3c96ca16ae4..1682dcb447714a273eeedf7586a6319c0c823378 100644 (file)
--- a/src/login-common/client-common.c
+++ b/src/login-common/client-common.c
@@ -181,10 +181,7 @@ static bool client_is_trusted(struct client *client)
        struct ip_addr net_ip;
        unsigned int bits;
 
-       if (client->set->login_trusted_networks == NULL)
-               return FALSE;
-
-       net = t_strsplit_spaces(client->set->login_trusted_networks, ", ");
+       net = settings_boollist_get(&client->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/login-common/login-settings.c b/src/login-common/login-settings.c
index 49356bd46419105cc184f1bd1960639804d0714b..46bb210e06de708e2fb127bfa5c1e6f5d5b37cb6 100644 (file)
--- a/src/login-common/login-settings.c
+++ b/src/login-common/login-settings.c
@@ -13,7 +13,7 @@ static bool login_settings_check(void *_set, pool_t pool, const char **error_r);
        SETTING_DEFINE_STRUCT_##type(#name, name, struct login_settings)
 
 static const struct setting_define login_setting_defines[] = {
-       DEF(STR, login_trusted_networks),
+       DEF(BOOLLIST, login_trusted_networks),
        DEF(STR, login_source_ips),
        DEF(STR_HIDDEN, login_greeting),
        DEF(STR_NOVARS, login_log_format_elements),
@@ -43,7 +43,7 @@ static const struct setting_define login_setting_defines[] = {
 };
 
 static const struct login_settings login_default_settings = {
-       .login_trusted_networks = "",
+       .login_trusted_networks = ARRAY_INIT,
        .login_source_ips = "",
        .login_greeting = PACKAGE_NAME" ready.",
        .login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %c session=<%{session}>",

diff --git a/src/login-common/login-settings.h b/src/login-common/login-settings.h
index 4898d386e5973a195e578ea295f0808c1627512f..9c043a8930b2b70092f74d1b391ee2ca66625402 100644 (file)
--- a/src/login-common/login-settings.h
+++ b/src/login-common/login-settings.h
@@ -3,7 +3,7 @@
 
 struct login_settings {
        pool_t pool;
-       const char *login_trusted_networks;
+       ARRAY_TYPE(const_string) login_trusted_networks;
        const char *login_source_ips;
        const char *login_greeting;
        const char *login_log_format_elements, *login_log_format;