]> granicus.if.org Git - pdns/commitdiff
make sure we AXFR from the correct master port after a notification, and not port...
authorBert Hubert <bert.hubert@netherlabs.nl>
Fri, 18 Feb 2011 22:12:48 +0000 (22:12 +0000)
committerBert Hubert <bert.hubert@netherlabs.nl>
Fri, 18 Feb 2011 22:12:48 +0000 (22:12 +0000)
git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2045 d19b8d6e-7fed-0310-83ef-9ca221ded41b

pdns/packethandler.cc

index dc7d45d4dd0eddc8b5cc88f27ffb17dc6e78daf8..9bc8f0cb2547aa0ce7652d89112cc24df6be48d5 100644 (file)
@@ -862,15 +862,13 @@ int PacketHandler::processNotify(DNSPacket *p)
       L<<Logger::Error<<"However, "<<p->qdomain<<" does not have any masters defined"<<endl;
       return RCode::Refused;
     }
-
     authServer = *di.masters.begin();
-
   }
   else if(!db->isMaster(p->qdomain, p->getRemote())) {
     L<<Logger::Error<<"Received NOTIFY for "<<p->qdomain<<" from "<<p->getRemote()<<" which is not a master"<<endl;
     return RCode::Refused;
   }
-
+  authServer = *di.masters.begin();
   uint32_t theirserial=0;
 
   /* to quote Rusty Russell - this code is so bad that you can actually hear it suck */
@@ -895,6 +893,7 @@ int PacketHandler::processNotify(DNSPacket *p)
       theirserial<<" > "<<di.serial<<endl;
 
     Communicator.addSuckRequest(p->qdomain, authServer, true); // priority
+    return 0;
   }
   return -1; 
 }