X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Freply.c;h=2691f679d31cce4ac4b77be2ec8a05bea1e75f95;hb=0f15dd7b03058cb07e55d36ab36029081d556ffc;hp=905d037598c0e31da3f80081a20f5e94809111e2;hpb=16d7d2b5e4301cb1951568c863ad8dfdbbf48ef3;p=adns.git

diff --git a/src/reply.c b/src/reply.c
index 905d037..2691f67 100644
--- a/src/reply.c
+++ b/src/reply.c
@@ -4,11 +4,11 @@
  */
 /*
  *  This file is
- *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
  *
  *  It is part of adns, which is
- *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
- *    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+ *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -119,14 +119,14 @@ 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");
     if (qu) adns__query_fail(qu,adns_s_rcodenotimplemented);
     return;
   case rcode_refused:
-    adns__warn(ads,serv,qu,"server refused our query");
+    adns__debug(ads,serv,qu,"server refused our query");
     if (qu) adns__query_fail(qu,adns_s_rcoderefused);
     return;
   default:
@@ -198,7 +198,8 @@ 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; }
@@ -257,7 +258,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
       /* We still wanted to look for the SOA so we could find the TTL. */
       adns__update_expires(qu,soattl,now);
 
-      if (qu->flags & adns_qf_search) {
+      if (qu->flags & adns_qf_search && !qu->cname_dgram) {
 	adns__search_next(ads,qu,now);
       } else {
 	adns__query_fail(qu,adns_s_nxdomain);
@@ -280,14 +281,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__debug(ads,serv,qu,"server claims to do recursion, but gave us a referral");
       adns__query_fail(qu,adns_s_invalidresponse);
     }
     return;