From f15b6e5a8b6e550c6df7f6ccc216d5c4cbe6a604 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 15 Aug 2014 15:36:17 +0200 Subject: [PATCH] networkd: remove "*" from domains list Also, simplify things a bit and make sure we don't forget looking at one of the entries. --- src/network/networkd-network.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index f3b2c6843..6f0d1a168 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -362,16 +362,16 @@ int config_parse_domains(const char *unit, return r; strv_uniq(*domains); - - if (strv_isempty(*domains)) - network->wildcard_domain = false; - else if (strv_find(*domains, "*")) - network->wildcard_domain = true; + network->wildcard_domain = !!strv_find(*domains, "*"); STRV_FOREACH(domain, *domains) - if (is_localhost(*domain) || !hostname_is_valid(*domain)) + if (is_localhost(*domain) || !hostname_is_valid(*domain) || streq(*domain, "*")) { strv_remove(*domains, *domain); + /* We removed one entry, make sure we don't skip the next one */ + domain--; + } + return 0; } -- 2.30.2