From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 11 Apr 2019 09:37:47 +0000 (+0200)
Subject: nss_dns: Do not replace root domain with empty string
X-Git-Tag: glibc-2.30~220
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3f454bac0f968216699ca405c127c858f0657c7;p=thirdparty%2Fglibc.git

nss_dns: Do not replace root domain with empty string

The purpose of the bp[0] == '.' check is unclear.  Only the root domain
starts with '.'.  The empty string is accepted as a domain name in many
places, denoting the root, but using it implicitly is confusing.
---

diff --git a/ChangeLog b/ChangeLog
index 1d0ba7165c9..1cb1255ab94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-11  Florian Weimer  <fweimer@redhat.com>
+
+	* resolv/nss_dns/dns-network.c (getanswer_r): Do not replace root
+	domain with empty string.
+	* resolv/nss_dns/dns-host.c (getanswer_r): Likewise.
+
 2019-04-11  Florian Weimer  <fweimer@redhat.com>
 
 	* include/alloc_buffer.h (alloc_buffer_alloc_bytes): Update
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index a18b8a6bf4a..9c15f25f283 100644
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -706,9 +706,6 @@ getanswer_r (struct resolv_context *ctx,
       n = -1;
     }
 
-  if (n > 0 && bp[0] == '.')
-    bp[0] = '\0';
-
   if (__glibc_unlikely (n < 0))
     {
       *errnop = errno;
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
index 4b81b1bfdc1..21688c19b2f 100644
--- a/resolv/nss_dns/dns-network.c
+++ b/resolv/nss_dns/dns-network.c
@@ -345,9 +345,6 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
 	  n = -1;
 	}
 
-      if (n > 0 && bp[0] == '.')
-	bp[0] = '\0';
-
       if (n < 0 || res_dnok (bp) == 0)
 	break;
       cp += n;