From: Kees Monshouwer <mind04@monshouwer.org>
Date: Tue, 13 Oct 2015 20:14:15 +0000 (+0200)
Subject: don't log out-of-zone ents during AXFR in
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9cb2b2a427c1a8e6742f98b85a5cd2cb031d524f;p=pdns

don't log out-of-zone ents during AXFR in
---

diff --git a/docs/markdown/authoritative/settings.md b/docs/markdown/authoritative/settings.md
index d2c5f4596..97e312958 100644
--- a/docs/markdown/authoritative/settings.md
+++ b/docs/markdown/authoritative/settings.md
@@ -151,14 +151,14 @@ Name to insert in the SOA record if none set in the backend.
 * Default: empty
 * Available since: 3.4.7
 
-Use this soa-edit value for all zones if no [`SOA-EDIT`](metadata.md#SOA-EDIT) metadata value is set.
+Use this soa-edit value for all zones if no [`SOA-EDIT`](domainmetadata.md#SOA-EDIT) metadata value is set.
 
 ## `default-soa-edit-signed`
 * String
 * Default: empty
 * Available since: 3.4.7
 
-Use this soa-edit value for all signed zones if no [`SOA-EDIT`](metadata.md#SOA-EDIT) metadata value is set. Overrides [`default-soa-edit`](#default-soa-edit)
+Use this soa-edit value for all signed zones if no [`SOA-EDIT`](domainmetadata.md#SOA-EDIT) metadata value is set. Overrides [`default-soa-edit`](#default-soa-edit)
 
 ## `default-soa-mail`
 * String
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 68fbdd186..18fdab004 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -753,7 +753,8 @@ int TCPNameserver::doAXFR(const DNSName &target, shared_ptr<DNSPacket> q, int ou
       }
       rrs.push_back(rr);
     } else {
-      L<<Logger::Warning<<"Zone '"<<target<<"' contains out-of-zone data '"<<rr.qname<<"'|"<<rr.qtype.getName()<<"', ignoring"<<endl;
+      if (rr.qtype.getCode())
+        L<<Logger::Warning<<"Zone '"<<target<<"' contains out-of-zone data '"<<rr.qname<<"|"<<rr.qtype.getName()<<"', ignoring"<<endl;
       continue;
     }
   }