From 21b07d8ba586c231710a5197888e7130f996dd47 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 30 Oct 2008 16:00:44 +0000 Subject: * resolv/res_send.c (send_dg): On timeout, only return nonzero result if any of the queries really provided an answer. --- ChangeLog | 5 +++++ resolv/res_send.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0b3f629e92..4decd23559 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-10-30 Ulrich Drepper + + * resolv/res_send.c (send_dg): On timeout, only return nonzero + result if any of the queries really provided an answer. + 2008-10-28 Ulrich Drepper * po/lt.po: Update from translation team. diff --git a/resolv/res_send.c b/resolv/res_send.c index 59cdc214e2..7c3d620fb6 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -1008,7 +1008,7 @@ send_dg(res_state statp, } if (n == 0) { Dprint(statp->options & RES_DEBUG, (stdout, ";; timeout\n")); - if (recvresp1 || (buf2 != NULL && recvresp2)) + if (recvresp1 > 1 || (buf2 != NULL && recvresp2 > 1)) { *resplen2 = 1; return resplen; -- cgit 1.4.1