X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=6f0d1a16899b12a2732e13459f041ca2ca3aed3f;hb=f15b6e5a8b6e550c6df7f6ccc216d5c4cbe6a604;hp=e326b3664e7df74909ed715bf5a51cc93db240e4;hpb=0b1831c20c4d30077b6560b2b7d88bdb220d5cef;p=elogind.git

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index e326b3664..6f0d1a168 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -79,13 +79,10 @@ static int network_load_one(Manager *manager, const char *filename) {
         if (!network->filename)
                 return log_oom();
 
-        network->ipv4ll_route = true;
-
         network->dhcp = DHCP_SUPPORT_NONE;
         network->dhcp_ntp = true;
         network->dhcp_dns = true;
         network->dhcp_hostname = true;
-        network->dhcp_domainname = true;
         network->dhcp_routes = true;
         network->dhcp_sendhost = true;
 
@@ -344,6 +341,40 @@ int config_parse_netdev(const char *unit,
         return 0;
 }
 
+int config_parse_domains(const char *unit,
+                         const char *filename,
+                         unsigned line,
+                         const char *section,
+                         unsigned section_line,
+                         const char *lvalue,
+                         int ltype,
+                         const char *rvalue,
+                         void *data,
+                         void *userdata) {
+        Network *network = userdata;
+        char ***domains = data;
+        char **domain;
+        int r;
+
+        r = config_parse_strv(unit, filename, line, section, section_line,
+                              lvalue, ltype, rvalue, domains, userdata);
+        if (r < 0)
+                return r;
+
+        strv_uniq(*domains);
+        network->wildcard_domain = !!strv_find(*domains, "*");
+
+        STRV_FOREACH(domain, *domains)
+                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;
+}
+
 int config_parse_tunnel(const char *unit,
                         const char *filename,
                         unsigned line,