From: Kees Monshouwer <mind04@monshouwer.org>
Date: Fri, 27 Dec 2013 11:12:18 +0000 (+0100)
Subject: Revert "Check that the domain isn't already served by the new master"
X-Git-Tag: rec-3.6.0-rc1~268^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=924825d6a1c68ddb0d6bd8164d1f55ec56994fa0;p=pdns

Revert "Check that the domain isn't already served by the new master"

This reverts commit 3b797caab6583a6a7452a0eaf45fd7a670b4242c.
---

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index fb7926b56..c345a1442 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -765,7 +765,6 @@ int PacketHandler::trySuperMaster(DNSPacket *p)
 
 int PacketHandler::trySuperMasterSynchronous(DNSPacket *p)
 {
-  DomainInfo di;
   Resolver::res_t nsset;
   try {
     Resolver resolver;
@@ -778,14 +777,6 @@ int PacketHandler::trySuperMasterSynchronous(DNSPacket *p)
     return RCode::ServFail;
   }
 
-  if (B.getDomainInfo(p->qdomain, di)) {
-    // maybe it is listed as master already
-    BOOST_FOREACH(string& master, di.masters) {
-      if (master == p->getRemote())
-        return RCode::NoError; // is already a master for this zone
-    }
-  }
-
   string nameserver, account;
   DNSBackend *db;
   if(!B.superMasterBackend(p->getRemote(), p->qdomain, nsset, &nameserver, &account, &db)) {