@@ -10,6 +10,7 @@

     if things go badly wrong *and* a really unlikely race happens.
+  * If we get a referral, don't also always complain falsely about RD==0.

diff --git a/changelog b/changelog
index aed8a56c3ffe84480d80bf958f622069def35e93..e1e36c77361cd0ec0857d4543348f5245c5e3ed7 100644 (file)
--- a/changelog
+++ b/changelog
@@ -10,6 +10,7 @@ uadns (0.8) BETA; urgency=low
     act is zero.  This might possibly cause an infinite delay (ie, lockup)
     if things go badly wrong *and* a really unlikely race happens.
   * Test suite `lines of syscall left' value is correct; !0 is failure.
     act is zero.  This might possibly cause an infinite delay (ie, lockup)
     if things go badly wrong *and* a really unlikely race happens.
   * Test suite `lines of syscall left' value is correct; !0 is failure.

+  * If we get a referral, don't also always complain falsely about RD==0.

 
   Portability fixes:
   * install-sh (from autoconf 2.12 Debian r13) included.
 
   Portability fixes:
   * install-sh (from autoconf 2.12 Debian r13) included.

diff --git a/src/reply.c b/src/reply.c
index f1dabe1e52527fa31b9a2d591096e5252e5f5e6c..ce11c9ae45d969b5675cc70f59a27d43a707bc43 100644 (file)
--- a/src/reply.c
+++ b/src/reply.c
@@ -280,14 +280,14 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
     if (cname_here) goto x_restartquery;
 
     /* Bloody hell, I thought we asked for recursion ? */
     if (cname_here) goto x_restartquery;
 
     /* Bloody hell, I thought we asked for recursion ? */

-    if (flg_rd) {
-      adns__diag(ads,serv,qu,"server thinks we didn't ask for recursive lookup");
-    }

     if (!flg_ra) {
       adns__diag(ads,serv,qu,"server is not willing to do recursive lookups for us");
       adns__query_fail(qu,adns_s_norecurse);
     } else {
     if (!flg_ra) {
       adns__diag(ads,serv,qu,"server is not willing to do recursive lookups for us");
       adns__query_fail(qu,adns_s_norecurse);
     } else {

-      adns__diag(ads,serv,qu,"server claims to do recursion, but gave us a referral");
+      if (!flg_rd)
+       adns__diag(ads,serv,qu,"server thinks we didn't ask for recursive lookup");
+      else
+       adns__diag(ads,serv,qu,"server claims to do recursion, but gave us a referral");

       adns__query_fail(qu,adns_s_invalidresponse);
     }
     return;
       adns__query_fail(qu,adns_s_invalidresponse);
     }
     return;