From: Christian Hofstaedtler <christian.hofstaedtler@deduktiva.com>
Date: Fri, 7 Oct 2016 00:42:05 +0000 (+0200)
Subject: packethandler: fix easy cases of var shadowing
X-Git-Tag: dnsdist-1.1.0-beta2~88^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aaf7799ac97262936053e947075b52bbef6454a0;p=pdns

packethandler: fix easy cases of var shadowing
---

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 043a5884a..920530ed1 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -949,7 +949,7 @@ DNSPacket *PacketHandler::question(DNSPacket *p)
     DP->sendPacket(p);
   }
   if(LPE) {
-    int policyres=LPE->police(p, ret);
+    policyres = LPE->police(p, ret);
     if(policyres == PolicyDecision::DROP) {
       delete ret;
       return NULL;
diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index 2b8c9845d..56724320b 100644
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -101,9 +101,9 @@ void CommunicatorClass::ixfrSuck(const DNSName &domain, const TSIGTriplet& tt, c
     memset(&st, 0, sizeof(st));
     st.serial=di.serial;
 
-    DNSRecord dr;
-    dr.d_content = std::make_shared<SOARecordContent>(g_rootdnsname, g_rootdnsname, st);
-    auto deltas = getIXFRDeltas(remote, domain, dr, tt, laddr.sin4.sin_family ? &laddr : 0, ((size_t) ::arg().asNum("xfr-max-received-mbytes")) * 1024 * 1024);
+    DNSRecord drsoa;
+    drsoa.d_content = std::make_shared<SOARecordContent>(g_rootdnsname, g_rootdnsname, st);
+    auto deltas = getIXFRDeltas(remote, domain, drsoa, tt, laddr.sin4.sin_family ? &laddr : 0, ((size_t) ::arg().asNum("xfr-max-received-mbytes")) * 1024 * 1024);
     zs.numDeltas=deltas.size();
     //    cout<<"Got "<<deltas.size()<<" deltas from serial "<<di.serial<<", applying.."<<endl;