From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 15 Oct 2020 06:56:25 +0000 (+0900)
Subject: network: clear DNS and domains for RA when an empty string is assigned
X-Git-Tag: v247-rc1~16^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3c1a9494710eb631c092b071b2f87aa7863b94f;p=thirdparty%2Fsystemd.git

network: clear DNS and domains for RA when an empty string is assigned
---

diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c
index 8949d91e2fc..fca6fa2c97e 100644
--- a/src/network/networkd-radv.c
+++ b/src/network/networkd-radv.c
@@ -773,6 +773,12 @@ int config_parse_radv_dns(
         assert(lvalue);
         assert(rvalue);
 
+        if (isempty(rvalue)) {
+                n->n_router_dns = 0;
+                n->router_dns = mfree(n->router_dns);
+                return 0;
+        }
+
         for (const char *p = rvalue;;) {
                 _cleanup_free_ char *w = NULL;
                 union in_addr_union a;
@@ -834,6 +840,11 @@ int config_parse_radv_search_domains(
         assert(lvalue);
         assert(rvalue);
 
+        if (isempty(rvalue)) {
+                n->router_search_domains = ordered_set_free(n->router_search_domains);
+                return 0;
+        }
+
         for (const char *p = rvalue;;) {
                 _cleanup_free_ char *w = NULL, *idna = NULL;