From aaf7799ac97262936053e947075b52bbef6454a0 Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Fri, 7 Oct 2016 02:42:05 +0200 Subject: [PATCH] packethandler: fix easy cases of var shadowing --- pdns/packethandler.cc | 2 +- pdns/slavecommunicator.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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(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(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 "<