diff options
author | root <root@rshg054.dnsready.net> | 2011-12-03 23:14:41 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2011-12-03 23:14:41 +0000 |
commit | 851376cd7720e1f9b35e0a7c26bfd66399f0c4d3 (patch) | |
tree | f8579d1c934aa5c28308372bedc321628555a424 /testing/glibc/glibc-2.14-revert-4768ae77.patch | |
parent | 8eed59114cbcf729b65f87d3f73530f6c8363d20 (diff) |
Sat Dec 3 23:14:41 UTC 2011
Diffstat (limited to 'testing/glibc/glibc-2.14-revert-4768ae77.patch')
-rw-r--r-- | testing/glibc/glibc-2.14-revert-4768ae77.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/testing/glibc/glibc-2.14-revert-4768ae77.patch b/testing/glibc/glibc-2.14-revert-4768ae77.patch new file mode 100644 index 000000000..11f087cb7 --- /dev/null +++ b/testing/glibc/glibc-2.14-revert-4768ae77.patch @@ -0,0 +1,37 @@ +diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c +--- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 ++++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 +@@ -549,7 +549,7 @@ + ns, ansp, ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || *resplen2 == 0)) ++ if (n == 0) + goto next_ns; + } else { + /* Use datagrams. */ +@@ -559,7 +559,7 @@ + ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || *resplen2 == 0)) ++ if (n == 0) + goto next_ns; + if (v_circuit) + // XXX Check whether both requests failed or +@@ -1275,14 +1275,10 @@ + (*thisresplenp > *thisanssizp) + ? *thisanssizp : *thisresplenp); + +- if (recvresp1 || (buf2 != NULL && recvresp2)) { +- *resplen2 = 0; ++ if (recvresp1 || (buf2 != NULL && recvresp2)) + return resplen; +- } + if (buf2 != NULL) + { +- /* No data from the first reply. */ +- resplen = 0; + /* We are waiting for a possible second reply. */ + if (hp->id == anhp->id) + recvresp1 = 1; |