Merge branch 'master' into dnsrr

diff --cc modules/geoipbackend/geoipbackend.cc
Simple merge

diff --cc pdns/backends/gsql/gsqlbackend.cc
Simple merge

diff --cc pdns/communicator.hh
Simple merge

diff --cc pdns/dnsparser.cc
index ef6e13e3b2db59d3d3239f3f3b29b9844a17f96f,16d1b8aae973cf0eb76b08d44a7cb153e2e179b4..8f6baa7cbed2d0e715d8dacd3800c95bdd4996e7
--- 1/pdns/dnsparser.cc
--- 2/pdns/dnsparser.cc
+++ b/pdns/dnsparser.cc
@@@ -210,19 -211,7 +210,19 @@@ DNSRecord::DNSRecord(const DNSResourceR
    d_content = std::shared_ptr<DNSRecordContent>(DNSRecordContent::mastermake(d_type, rr.qclass, rr.content));
  }
  
- void MOADNSParser::init(const char *packet, unsigned int len)
 +// If you call this and you are not parsing a packet coming from a socket, you are doing it wrong.
 +DNSResourceRecord DNSResourceRecord::fromWire(const DNSRecord& d) {
 +  DNSResourceRecord rr;
 +  rr.qname = d.d_name;
 +  rr.qtype = QType(d.d_type);
 +  rr.ttl = d.d_ttl;
 +  rr.content = d.d_content->getZoneRepresentation(true);
 +  rr.auth = false;
 +  rr.qclass = d.d_class;
 +  return rr;
 +}
 +
+ void MOADNSParser::init(bool query, const char *packet, unsigned int len)
  {
    if(len < sizeof(dnsheader))
      throw MOADNSException("Packet shorter than minimal header");

diff --cc pdns/mastercommunicator.cc
index 930304149d9f324dcf4f31f36a9a061b7abeae3d,f4c343c123de5ea12293641e2f4f74197945a487..d50928000a89e8b8891c32971146ccd11fe7f455
--- 1/pdns/mastercommunicator.cc
--- 2/pdns/mastercommunicator.cc
+++ b/pdns/mastercommunicator.cc
@@@ -49,30 -49,32 +49,33 @@@ void CommunicatorClass::queueNotifyDoma
    DNSResourceRecord rr;
    FindNS fns;
  
-   di.backend->lookup(QType(QType::NS), di.zone);
-   while(di.backend->get(rr))
-     nsset.insert(rr.content);
- 
-   for(set<string>::const_iterator j=nsset.begin();j!=nsset.end();++j) {
-     vector<string> nsips=fns.lookup(DNSName(*j), di.backend);
-     if(nsips.empty())
-       L<<Logger::Warning<<"Unable to queue notification of domain '"<<di.zone<<"': nameservers do not resolve!"<<endl;
-     else
-       for(vector<string>::const_iterator k=nsips.begin();k!=nsips.end();++k) {
-         const ComboAddress caIp(*k, 53);
-         if(!d_preventSelfNotification || !AddressIsUs(caIp)) {
-           if(!d_onlyNotify.match(&caIp))
-             L<<Logger::Info<<"Skipped notification of domain '"<<di.zone<<"' to "<<*j<<" because it does not match only-notify."<<endl;
-           else
-             ips.insert(caIp.toStringWithPort());
++
+   if (d_onlyNotify.size()) {
+     B->lookup(QType(QType::NS),domain);
+     while(B->get(rr))
+       nsset.insert(rr.content);
+ 
+     for(set<string>::const_iterator j=nsset.begin();j!=nsset.end();++j) {
+       vector<string> nsips=fns.lookup(DNSName(*j), B);
+       if(nsips.empty())
+         L<<Logger::Warning<<"Unable to queue notification of domain '"<<domain<<"': nameservers do not resolve!"<<endl;
+       else
+         for(vector<string>::const_iterator k=nsips.begin();k!=nsips.end();++k) {
+           const ComboAddress caIp(*k, 53);
+           if(!d_preventSelfNotification || !AddressIsUs(caIp)) {
+             if(!d_onlyNotify.match(&caIp))
+               L<<Logger::Info<<"Skipped notification of domain '"<<domain<<"' to "<<*j<<" because it does not match only-notify."<<endl;
+             else
+               ips.insert(caIp.toStringWithPort());
+           }
          }
-       }
-   }
+     }
  
-   for(set<string>::const_iterator j=ips.begin();j!=ips.end();++j) {
-     L<<Logger::Warning<<"Queued notification of domain '"<<di.zone<<"' to "<<*j<<endl;
-     d_nq.add(di.zone,*j);
-     hasQueuedItem=true;
+     for(set<string>::const_iterator j=ips.begin();j!=ips.end();++j) {
+       L<<Logger::Warning<<"Queued notification of domain '"<<domain<<"' to "<<*j<<endl;
+       d_nq.add(domain,*j);
+       hasQueuedItem=true;
+     }
    }
  
    set<string> alsoNotify(d_alsoNotify);

diff --cc pdns/misc.hh
Simple merge

diff --cc pdns/pdnsutil.cc
Simple merge

diff --cc pdns/qtype.hh
Simple merge

diff --cc pdns/rfc2136handler.cc
Simple merge

diff --cc pdns/slavecommunicator.cc
Simple merge

diff --cc pdns/tcpreceiver.cc
Simple merge

diff --cc pdns/ueberbackend.cc
Simple merge

diff --cc pdns/ueberbackend.hh
Simple merge

diff --cc pdns/zoneparser-tng.cc
Simple merge