From: Tom Gundersen <teg@jklm.no>
Date: Thu, 14 Aug 2014 23:08:46 +0000 (+0200)
Subject: networkd: don't respect domainname from DHCP by default
X-Git-Tag: v216~107
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1bd27a45d04639190fc91ad2552b72ea759c0c27;p=elogind.git

networkd: don't respect domainname from DHCP by default

Most routers will send garbage, so make this opt-in only.
---

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 9ef69fa1b..f4ca72164 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -446,6 +446,13 @@
                                                 will be used as the transient hostname.</para>
                                         </listitem>
                                 </varlistentry>
+                                <varlistentry>
+                                        <term><varname>UseDomainName=</varname></term>
+                                        <listitem>
+                                                <para>When true (not the default), the domain name received from the DHCP server
+                                                will be used for DNS resolution over this link.</para>
+                                        </listitem>
+                                </varlistentry>
                                 <varlistentry>
                                         <term><varname>UseRoutes=</varname></term>
                                         <listitem>
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 11affb967..e13e4a0f6 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -83,7 +83,6 @@ static int network_load_one(Manager *manager, const char *filename) {
         network->dhcp_ntp = true;
         network->dhcp_dns = true;
         network->dhcp_hostname = true;
-        network->dhcp_domainname = true;
         network->dhcp_routes = true;
         network->dhcp_sendhost = true;