wok-6.x diff 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 diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/glibc/stuff/glibc-2.14-revert-4768ae77.patch	Sat May 02 12:05:22 2015 +0200
     1.3 @@ -0,0 +1,37 @@
     1.4 +diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
     1.5 +--- glibc-orig//resolv/res_send.c	2011-06-10 18:59:03.041436996 +1000
     1.6 ++++ glibc/resolv/res_send.c	2011-06-10 19:08:09.379309323 +1000
     1.7 +@@ -549,7 +549,7 @@
     1.8 +				    ns, ansp, ansp2, nansp2, resplen2);
     1.9 +			if (n < 0)
    1.10 +				return (-1);
    1.11 +-			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
    1.12 ++			if (n == 0)
    1.13 +				goto next_ns;
    1.14 +		} else {
    1.15 +			/* Use datagrams. */
    1.16 +@@ -559,7 +559,7 @@
    1.17 +				    ansp2, nansp2, resplen2);
    1.18 +			if (n < 0)
    1.19 +				return (-1);
    1.20 +-			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
    1.21 ++			if (n == 0)
    1.22 +				goto next_ns;
    1.23 +			if (v_circuit)
    1.24 +			  // XXX Check whether both requests failed or
    1.25 +@@ -1275,14 +1275,10 @@
    1.26 +				(*thisresplenp > *thisanssizp)
    1.27 +				? *thisanssizp : *thisresplenp);
    1.28 +
    1.29 +-			if (recvresp1 || (buf2 != NULL && recvresp2)) {
    1.30 +-			  *resplen2 = 0;
    1.31 ++			if (recvresp1 || (buf2 != NULL && recvresp2))
    1.32 +			  return resplen;
    1.33 +-			}
    1.34 +			if (buf2 != NULL)
    1.35 +			  {
    1.36 +-			    /* No data from the first reply.  */
    1.37 +-			    resplen = 0;
    1.38 +			    /* We are waiting for a possible second reply.  */
    1.39 +			    if (hp->id == anhp->id)
    1.40 +			      recvresp1 = 1;