networkd: remove "*" from domains list

Also, simplify things a bit and make sure we don't forget looking at one
of the entries.

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index f3b2c68430f7792ecf4e1353a3d13a783efbfecd..6f0d1a16899b12a2732e13459f041ca2ca3aed3f 100644 (file)
--- 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);
                 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)
 
         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);
 
                         strv_remove(*domains, *domain);
 

+                        /* We removed one entry, make sure we don't skip the next one */
+                        domain--;
+                }
+

         return 0;
 }
 
         return 0;
 }