Fix tests for existence of second reply.

diff --git a/ChangeLog b/ChangeLog
index ad37c3b17fbc5aff36d535d4c0384701b5c6df50..92b19ff6c607c1c97e337575e66e0914a5e1157a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2008-10-24  Ulrich Drepper  <drepper@redhat.com>
 
        * resolv/res_query.c (__libc_res_nquery): Add a few casts.
+       Fix tests for existence of second reply.
 
 2008-10-23  Ulrich Drepper  <drepper@redhat.com>
 

diff --git a/resolv/res_query.c b/resolv/res_query.c
index b6c70f0462b71aa11701a01bd4971b5c1e2afc12..6ac33ce64cc00072610d25b9ea86c91e0aaece15 100644 (file)
--- a/resolv/res_query.c
+++ b/resolv/res_query.c
@@ -244,14 +244,14 @@ __libc_res_nquery(res_state statp,
           tests of HP2.  */
        HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
 
-       if (n < (int) sizeof (HEADER) && nanswerp2 != NULL
-           && *nanswerp2 > (int) sizeof (HEADER))
+       if (n < (int) sizeof (HEADER) && answerp2 != NULL
+           && *resplen2 > (int) sizeof (HEADER))
          {
            /* Special case of partial answer.  */
            assert (hp != hp2);
            hp = hp2;
          }
-       else if (nanswerp2 != NULL && *nanswerp2 < (int) sizeof (HEADER)
+       else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
                 && n > (int) sizeof (HEADER))
          {
            /* Special case of partial answer.  */