wok-6.x view glibc/stuff/glibc-2.14-revert-4768ae77.patch @ rev 18015

dropbear: pppssh may use ssh keys
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat May 02 12:05:22 2015 +0200 (2015-05-02)
parents
children
line source
1 diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
2 --- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000
3 +++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000
4 @@ -549,7 +549,7 @@
5 ns, ansp, ansp2, nansp2, resplen2);
6 if (n < 0)
7 return (-1);
8 - if (n == 0 && (buf2 == NULL || *resplen2 == 0))
9 + if (n == 0)
10 goto next_ns;
11 } else {
12 /* Use datagrams. */
13 @@ -559,7 +559,7 @@
14 ansp2, nansp2, resplen2);
15 if (n < 0)
16 return (-1);
17 - if (n == 0 && (buf2 == NULL || *resplen2 == 0))
18 + if (n == 0)
19 goto next_ns;
20 if (v_circuit)
21 // XXX Check whether both requests failed or
22 @@ -1275,14 +1275,10 @@
23 (*thisresplenp > *thisanssizp)
24 ? *thisanssizp : *thisresplenp);
25
26 - if (recvresp1 || (buf2 != NULL && recvresp2)) {
27 - *resplen2 = 0;
28 + if (recvresp1 || (buf2 != NULL && recvresp2))
29 return resplen;
30 - }
31 if (buf2 != NULL)
32 {
33 - /* No data from the first reply. */
34 - resplen = 0;
35 /* We are waiting for a possible second reply. */
36 if (hp->id == anhp->id)
37 recvresp1 = 1;