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

[adns] / src / reply.c

diff --git a/src/reply.c b/src/reply.c
index 905d037598c0e31da3f80081a20f5e94809111e2..ce11c9ae45d969b5675cc70f59a27d43a707bc43 100644 (file)
--- a/src/reply.c
+++ b/src/reply.c
@@ -119,7 +119,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
     return;
   case rcode_servfail:
     if (qu) adns__query_fail(qu,adns_s_rcodeservfail);
-    else adns__warn(ads,serv,qu,"server failure on unidentifiable query");
+    else adns__debug(ads,serv,qu,"server failure on unidentifiable query");
     return;
   case rcode_notimp:
     adns__warn(ads,serv,qu,"server claims not to implement our query");
@@ -198,7 +198,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
        qu->cname_begin= rdstart;
        qu->cname_dglen= dglen;
        st= adns__parse_domain(ads,serv,qu, &qu->vb,
-                              qu->flags & adns_qf_quoteok_cname ? pdf_quoteok : 0,
+                              qu->flags & adns_qf_quotefail_cname ? 0 : pdf_quoteok,
                               dgram,dglen, &rdstart,rdstart+rdlength);
        if (!qu->vb.used) goto x_truncated;
        if (st) { adns__query_fail(qu,st); return; }
@@ -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 (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 {
-      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;