indent, plus make 'notify' program a bit more powerful

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1321 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/notify.cc b/pdns/notify.cc
index 9095f847186046050f78b251b87d438cd6699491..09244ec6da3aff38bae2af5af02cc7fe62f0a419 100644 (file)
--- a/pdns/notify.cc
+++ b/pdns/notify.cc
@@ -27,12 +27,16 @@ try
   if(sock < 0)
     throw runtime_error("Creating socket for incoming packets: "+stringerror());
 
-  ComboAddress pdns("127.0.0.1", 53);
+  ComboAddress local("127.0.0.1", (int)0);
+  if(::bind(sock, (struct sockaddr*) &local, local.getSocklen()) < 0) 
+    throw runtime_error("Failed to bind local socket to address "+local.toString()+": "+stringerror());
+
+  ComboAddress pdns(argv[1], 53);
   if(connect(sock, (struct sockaddr*) &pdns, pdns.getSocklen()) < 0) 
     throw runtime_error("Failed to connect PowerDNS socket to address "+pdns.toString()+": "+stringerror());
   
   vector<uint8_t> outpacket;
-  DNSPacketWriter pw(outpacket, argv[1], QType::SOA, 1, Opcode::Notify);
+  DNSPacketWriter pw(outpacket, argv[2], QType::SOA, 1, Opcode::Notify);
   pw.getHeader()->id = random();
 
 

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index d9e85ff80d60a79fce251d811d3ffa9c71278a2b..509897a6857f7600585075312419ea84063b4511 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -454,7 +454,7 @@ int PacketHandler::trySuperMaster(DNSPacket *p)
   string account;
   DNSBackend *db;
   if(!B.superMasterBackend(p->getRemote(), p->qdomain, nsset, &account, &db)) {
-   L<<Logger::Error<<"Unable to find backend willing to host "<<p->qdomain<<" for potential supermaster "<<p->getRemote()<<endl;
+    L<<Logger::Error<<"Unable to find backend willing to host "<<p->qdomain<<" for potential supermaster "<<p->getRemote()<<endl;
     return RCode::Refused;
   }
   db->createSlaveDomain(p->getRemote(),p->qdomain,account);