From: Aki Tuomi Date: Tue, 9 Jul 2013 11:05:50 +0000 (+0300) Subject: Now copies edns subnet code in copy ctor and replyPacket() X-Git-Tag: rec-3.6.0-rc1~578^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F907%2Fhead;p=thirdparty%2Fpdns.git Now copies edns subnet code in copy ctor and replyPacket() --- diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc index 552217d045..61e68851c6 100644 --- a/pdns/dnspacket.cc +++ b/pdns/dnspacket.cc @@ -94,7 +94,7 @@ DNSPacket::DNSPacket(const DNSPacket &orig) d_eso = orig.d_eso; d_haveednssubnet = orig.d_haveednssubnet; d_haveednssection = orig.d_haveednssection; - + d_ednssubnetcode = orig.d_ednssubnetcode; d_dnssecOk = orig.d_dnssecOk; d_rrs=orig.d_rrs; @@ -393,7 +393,8 @@ DNSPacket *DNSPacket::replyPacket() const r->d_eso = d_eso; r->d_haveednssubnet = d_haveednssubnet; r->d_haveednssection = d_haveednssection; - + r->d_ednssubnetcode = d_ednssubnetcode; + if(!d_tsigkeyname.empty()) { r->d_tsigkeyname = d_tsigkeyname; r->d_tsigprevious = d_tsigprevious; @@ -497,7 +498,7 @@ try d_havetsig = mdp.getTSIGPos(); d_haveednssubnet = false; d_haveednssection = false; - + if(getEDNSOpts(mdp, &edo)) { d_haveednssection=true;