glibc/glibc-rh168253-builtin_expect-fixup.patch
Florian Weimer 8597553f96 Rebase DNS stub resolver to the glibc 2.26 version
- Support an arbitrary number of search domains (#168253)
- Detect and apply /etc/resolv.conf changes in libresolv (#1374239)
- CVE-2015-5180: DNS stub resolver crash with crafted record type (#1251403)
2017-10-11 14:41:27 +02:00

22 lines
783 B
Diff

commit a0704b1ac7e8dc26f0e0feac58468958305ae844
Author: Florian Weimer <fweimer@redhat.com>
Date: Wed Apr 19 19:34:42 2017 +0200
nss_dns: Correct parentheses for the __glibc_unlikely argument
This fixes commit bee05c9d58a34ec5886faf3b56ecaa56355d94bf.
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index 7099d093f357e16c..f121aa3de73704ea 100644
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -633,7 +633,7 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
packtmp, sizeof packtmp);
if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
{
- if (__glibc_unlikely (errno) == EMSGSIZE)
+ if (__glibc_unlikely (errno == EMSGSIZE))
goto too_small;
n = -1;