aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-10-30 16:00:44 +0000
committerUlrich Drepper <drepper@redhat.com>2008-10-30 16:00:44 +0000
commit21b07d8ba586c231710a5197888e7130f996dd47 (patch)
treeab1bc9c0b43dbe984a31e90257cf8f67035fe621
parent4caa3fb7c898bc1dd7458b218d7847e218248ec1 (diff)
downloadglibc-21b07d8ba586c231710a5197888e7130f996dd47.zip
glibc-21b07d8ba586c231710a5197888e7130f996dd47.tar.gz
glibc-21b07d8ba586c231710a5197888e7130f996dd47.tar.bz2
* resolv/res_send.c (send_dg): On timeout, only return nonzero
result if any of the queries really provided an answer.
-rw-r--r--ChangeLog5
-rw-r--r--resolv/res_send.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b3f629..4decd23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-30 Ulrich Drepper <drepper@redhat.com>
+
+ * 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 <drepper@redhat.com>
* po/lt.po: Update from translation team.
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 59cdc21..7c3d620 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;