From patchwork Mon Apr 8 11:18:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 32200 Received: (qmail 68491 invoked by alias); 8 Apr 2019 11:18:35 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 68472 invoked by uid 89); 8 Apr 2019 11:18:33 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mx1.redhat.com From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] nss_dns: Do not replace root domain with empty string Date: Mon, 08 Apr 2019 13:18:29 +0200 Message-ID: <87ftqspwxm.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 The purpose of the bp[0] == '.' check is unclear. Only the root domain starts with '.'. An empty string is not a valid domain name, so the subsequent res_dnok check fails. 2019-04-08 Florian Weimer * 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. Reviewed-by: Carlos O'Donell diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c index a18b8a6bf4..9c15f25f28 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 4b81b1bfdc..21688c19b2 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;