summaryrefslogtreecommitdiffstats
path: root/abs/core/glibc/glibc-2.14-revert-4462fad3.patch
diff options
context:
space:
mode:
authorCecil <knoppmyth@gmail.com>2011-07-21 06:43:24 (GMT)
committerCecil <knoppmyth@gmail.com>2011-07-21 06:43:24 (GMT)
commitb82dab737eaa8d38fa8e3ac3689a16619f9160b4 (patch)
treecd7b882b3f0ba686deb39c1b653d98fafe092100 /abs/core/glibc/glibc-2.14-revert-4462fad3.patch
parent9b099f713d930c76cdf81e27a7956ff3c74dc697 (diff)
parent09ec7e57ac7f9907122de23be187b1f05d19a18f (diff)
downloadlinhes_pkgbuild-b82dab737eaa8d38fa8e3ac3689a16619f9160b4.zip
linhes_pkgbuild-b82dab737eaa8d38fa8e3ac3689a16619f9160b4.tar.gz
linhes_pkgbuild-b82dab737eaa8d38fa8e3ac3689a16619f9160b4.tar.bz2
Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/glibc/glibc-2.14-revert-4462fad3.patch')
-rw-r--r--abs/core/glibc/glibc-2.14-revert-4462fad3.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/abs/core/glibc/glibc-2.14-revert-4462fad3.patch b/abs/core/glibc/glibc-2.14-revert-4462fad3.patch
new file mode 100644
index 0000000..d71e374
--- /dev/null
+++ b/abs/core/glibc/glibc-2.14-revert-4462fad3.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;