From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 28 Sep 2021 02:44:27 +0000 (+0900)
Subject: network: radv: set non-zero lifetime for DNS servers and domains by default
X-Git-Tag: v250-rc1~519^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fa25e0791cb9a48987ba7f483db20041d1cdf75;p=thirdparty%2Fsystemd.git

network: radv: set non-zero lifetime for DNS servers and domains by default

Closes #20850.
---

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 77ed77918cf..abd0abbf9bb 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -2676,9 +2676,9 @@ Token=prefixstable:2002:da8:1::</programlisting></para>
       <varlistentry>
         <term><varname>DNSLifetimeSec=</varname></term>
 
-        <listitem><para>Lifetime in seconds for the DNS server addresses listed
-        in <varname>DNS=</varname> and search domains listed in
-        <varname>Domains=</varname>.</para></listitem>
+        <listitem><para>Lifetime in seconds for the DNS server addresses listed in
+        <varname>DNS=</varname> and search domains listed in <varname>Domains=</varname>. Defaults to
+        604800 seconds (one week).</para></listitem>
       </varlistentry>
 
     </variablelist>
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index afbb9d61db4..c3b408c4e97 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -420,6 +420,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
                 .dhcp_server_emit_timezone = true,
 
                 .router_lifetime_usec = 30 * USEC_PER_MINUTE,
+                .router_dns_lifetime_usec = 7 * USEC_PER_DAY,
                 .router_emit_dns = true,
                 .router_emit_domains = true,