File CVE-2018-10851-auth-4.1.4.patch of Package pdns.9910
diff -ru pdns-4.1.4.orig/pdns/dnsparser.cc pdns-4.1.4/pdns/dnsparser.cc
--- pdns-4.1.4.orig/pdns/dnsparser.cc 2018-08-29 16:07:05.000000000 +0200
+++ pdns-4.1.4/pdns/dnsparser.cc 2018-10-10 10:56:31.594535610 +0200
@@ -131,7 +131,7 @@
return std::make_shared<UnknownRecordContent>(dr, pr);
}
- return std::shared_ptr<DNSRecordContent>(i->second(dr, pr));
+ return i->second(dr, pr);
}
std::shared_ptr<DNSRecordContent> DNSRecordContent::mastermake(uint16_t qtype, uint16_t qclass,
@@ -142,21 +142,9 @@
return std::make_shared<UnknownRecordContent>(content);
}
- return std::shared_ptr<DNSRecordContent>(i->second(content));
+ return i->second(content);
}
-std::unique_ptr<DNSRecordContent> DNSRecordContent::makeunique(uint16_t qtype, uint16_t qclass,
- const string& content)
-{
- zmakermap_t::const_iterator i=getZmakermap().find(make_pair(qclass, qtype));
- if(i==getZmakermap().end()) {
- return std::unique_ptr<DNSRecordContent>(new UnknownRecordContent(content));
- }
-
- return std::unique_ptr<DNSRecordContent>(i->second(content));
-}
-
-
std::shared_ptr<DNSRecordContent> DNSRecordContent::mastermake(const DNSRecord &dr, PacketReader& pr, uint16_t oc) {
// For opcode UPDATE and where the DNSRecord is an answer record, we don't care about content, because this is
// not used within the prerequisite section of RFC2136, so - we can simply use unknownrecordcontent.
@@ -171,7 +159,7 @@
return std::make_shared<UnknownRecordContent>(dr, pr);
}
- return std::shared_ptr<DNSRecordContent>(i->second(dr, pr));
+ return i->second(dr, pr);
}
diff -ru pdns-4.1.4.orig/pdns/dnsparser.hh pdns-4.1.4/pdns/dnsparser.hh
--- pdns-4.1.4.orig/pdns/dnsparser.hh 2018-08-29 16:07:05.000000000 +0200
+++ pdns-4.1.4/pdns/dnsparser.hh 2018-10-10 10:56:31.594535610 +0200
@@ -169,7 +169,6 @@
static std::shared_ptr<DNSRecordContent> mastermake(const DNSRecord &dr, PacketReader& pr);
static std::shared_ptr<DNSRecordContent> mastermake(const DNSRecord &dr, PacketReader& pr, uint16_t opcode);
static std::shared_ptr<DNSRecordContent> mastermake(uint16_t qtype, uint16_t qclass, const string& zone);
- static std::unique_ptr<DNSRecordContent> makeunique(uint16_t qtype, uint16_t qclass, const string& content);
virtual std::string getZoneRepresentation(bool noDot=false) const = 0;
virtual ~DNSRecordContent() {}
@@ -201,8 +200,8 @@
void doRecordCheck(const struct DNSRecord&){}
- typedef DNSRecordContent* makerfunc_t(const struct DNSRecord& dr, PacketReader& pr);
- typedef DNSRecordContent* zmakerfunc_t(const string& str);
+ typedef std::shared_ptr<DNSRecordContent> makerfunc_t(const struct DNSRecord& dr, PacketReader& pr);
+ typedef std::shared_ptr<DNSRecordContent> zmakerfunc_t(const string& str);
static void regist(uint16_t cl, uint16_t ty, makerfunc_t* f, zmakerfunc_t* z, const char* name)
{
diff -ru pdns-4.1.4.orig/pdns/dnsrecords.cc pdns-4.1.4/pdns/dnsrecords.cc
--- pdns-4.1.4.orig/pdns/dnsrecords.cc 2018-08-29 16:07:05.000000000 +0200
+++ pdns-4.1.4/pdns/dnsrecords.cc 2018-10-10 10:56:31.594535610 +0200
@@ -385,19 +385,19 @@
{
regist(1, QType::EUI48, &make, &make, "EUI48");
}
-DNSRecordContent* EUI48RecordContent::make(const DNSRecord &dr, PacketReader& pr)
+std::shared_ptr<DNSRecordContent> EUI48RecordContent::make(const DNSRecord &dr, PacketReader& pr)
{
if(dr.d_clen!=6)
throw MOADNSException("Wrong size for EUI48 record");
- EUI48RecordContent* ret=new EUI48RecordContent();
+ auto ret=std::make_shared<EUI48RecordContent>();
pr.copyRecord((uint8_t*) &ret->d_eui48, 6);
return ret;
}
-DNSRecordContent* EUI48RecordContent::make(const string& zone)
+std::shared_ptr<DNSRecordContent> EUI48RecordContent::make(const string& zone)
{
// try to parse
- EUI48RecordContent *ret=new EUI48RecordContent();
+ auto ret=std::make_shared<EUI48RecordContent>();
// format is 6 hex bytes and dashes
if (sscanf(zone.c_str(), "%2hhx-%2hhx-%2hhx-%2hhx-%2hhx-%2hhx",
ret->d_eui48, ret->d_eui48+1, ret->d_eui48+2,
@@ -428,19 +428,19 @@
{
regist(1, QType::EUI64, &make, &make, "EUI64");
}
-DNSRecordContent* EUI64RecordContent::make(const DNSRecord &dr, PacketReader& pr)
+std::shared_ptr<DNSRecordContent> EUI64RecordContent::make(const DNSRecord &dr, PacketReader& pr)
{
if(dr.d_clen!=8)
throw MOADNSException("Wrong size for EUI64 record");
- EUI64RecordContent* ret=new EUI64RecordContent();
+ auto ret=std::make_shared<EUI64RecordContent>();
pr.copyRecord((uint8_t*) &ret->d_eui64, 8);
return ret;
}
-DNSRecordContent* EUI64RecordContent::make(const string& zone)
+std::shared_ptr<DNSRecordContent> EUI64RecordContent::make(const string& zone)
{
// try to parse
- EUI64RecordContent *ret=new EUI64RecordContent();
+ auto ret=std::make_shared<EUI64RecordContent>();
// format is 8 hex bytes and dashes
if (sscanf(zone.c_str(), "%2hhx-%2hhx-%2hhx-%2hhx-%2hhx-%2hhx-%2hhx-%2hhx",
ret->d_eui64, ret->d_eui64+1, ret->d_eui64+2,
diff -ru pdns-4.1.4.orig/pdns/dnsrecords.hh pdns-4.1.4/pdns/dnsrecords.hh
--- pdns-4.1.4.orig/pdns/dnsrecords.hh 2018-08-29 16:07:05.000000000 +0200
+++ pdns-4.1.4/pdns/dnsrecords.hh 2018-10-10 10:56:31.594535610 +0200
@@ -33,8 +33,8 @@
RNAME##RecordContent(const string& zoneData); \
static void report(void); \
static void unreport(void); \
- static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr); \
- static DNSRecordContent* make(const string& zonedata); \
+ static std::shared_ptr<DNSRecordContent> make(const DNSRecord &dr, PacketReader& pr); \
+ static std::shared_ptr<DNSRecordContent> make(const string& zonedata); \
string getZoneRepresentation(bool noDot=false) const override; \
void toPacket(DNSPacketWriter& pw) override; \
uint16_t getType() const override { return QType::RNAME; } \
@@ -511,8 +511,8 @@
{}
NSECRecordContent(const string& content, const string& zone=""); //FIXME400: DNSName& zone?
- static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
- static DNSRecordContent* make(const string& content);
+ static std::shared_ptr<DNSRecordContent> make(const DNSRecord &dr, PacketReader& pr);
+ static std::shared_ptr<DNSRecordContent> make(const string& content);
string getZoneRepresentation(bool noDot=false) const override;
void toPacket(DNSPacketWriter& pw) override;
uint16_t getType() const override
@@ -532,8 +532,8 @@
{}
NSEC3RecordContent(const string& content, const string& zone=""); //FIXME400: DNSName& zone?
- static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
- static DNSRecordContent* make(const string& content);
+ static std::shared_ptr<DNSRecordContent> make(const DNSRecord &dr, PacketReader& pr);
+ static std::shared_ptr<DNSRecordContent> make(const string& content);
string getZoneRepresentation(bool noDot=false) const override;
void toPacket(DNSPacketWriter& pw) override;
@@ -561,8 +561,8 @@
{}
NSEC3PARAMRecordContent(const string& content, const string& zone=""); // FIXME400: DNSName& zone?
- static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
- static DNSRecordContent* make(const string& content);
+ static std::shared_ptr<DNSRecordContent> make(const DNSRecord &dr, PacketReader& pr);
+ static std::shared_ptr<DNSRecordContent> make(const string& content);
string getZoneRepresentation(bool noDot=false) const override;
void toPacket(DNSPacketWriter& pw) override;
@@ -586,8 +586,8 @@
{}
LOCRecordContent(const string& content, const string& zone="");
- static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
- static DNSRecordContent* make(const string& content);
+ static std::shared_ptr<DNSRecordContent> make(const DNSRecord &dr, PacketReader& pr);
+ static std::shared_ptr<DNSRecordContent> make(const string& content);
string getZoneRepresentation(bool noDot=false) const override;
void toPacket(DNSPacketWriter& pw) override;
@@ -610,8 +610,8 @@
{}
WKSRecordContent(const string& content, const string& zone=""); // FIXME400: DNSName& zone?
- static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
- static DNSRecordContent* make(const string& content);
+ static std::shared_ptr<DNSRecordContent> make(const DNSRecord &dr, PacketReader& pr);
+ static std::shared_ptr<DNSRecordContent> make(const string& content);
string getZoneRepresentation(bool noDot=false) const override;
void toPacket(DNSPacketWriter& pw) override;
@@ -625,8 +625,8 @@
public:
EUI48RecordContent() {};
static void report(void);
- static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
- static DNSRecordContent* make(const string& zone); // FIXME400: DNSName& zone?
+ static std::shared_ptr<DNSRecordContent> make(const DNSRecord &dr, PacketReader& pr);
+ static std::shared_ptr<DNSRecordContent> make(const string& zone); // FIXME400: DNSName& zone?
string getZoneRepresentation(bool noDot=false) const override;
void toPacket(DNSPacketWriter& pw) override;
uint16_t getType() const override { return QType::EUI48; }
@@ -640,8 +640,8 @@
public:
EUI64RecordContent() {};
static void report(void);
- static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
- static DNSRecordContent* make(const string& zone); // FIXME400: DNSName& zone?
+ static std::shared_ptr<DNSRecordContent> make(const DNSRecord &dr, PacketReader& pr);
+ static std::shared_ptr<DNSRecordContent> make(const string& zone); // FIXME400: DNSName& zone?
string getZoneRepresentation(bool noDot=false) const override;
void toPacket(DNSPacketWriter& pw) override;
uint16_t getType() const override { return QType::EUI64; }
@@ -688,9 +688,9 @@
};
#define boilerplate(RNAME, RTYPE) \
-RNAME##RecordContent::DNSRecordContent* RNAME##RecordContent::make(const DNSRecord& dr, PacketReader& pr) \
+std::shared_ptr<RNAME##RecordContent::DNSRecordContent> RNAME##RecordContent::make(const DNSRecord& dr, PacketReader& pr) \
{ \
- return new RNAME##RecordContent(dr, pr); \
+ return std::make_shared<RNAME##RecordContent>(dr, pr); \
} \
\
RNAME##RecordContent::RNAME##RecordContent(const DNSRecord& dr, PacketReader& pr) \
@@ -699,9 +699,9 @@
xfrPacket(pr); \
} \
\
-RNAME##RecordContent::DNSRecordContent* RNAME##RecordContent::make(const string& zonedata) \
+std::shared_ptr<RNAME##RecordContent::DNSRecordContent> RNAME##RecordContent::make(const string& zonedata) \
{ \
- return new RNAME##RecordContent(zonedata); \
+ return std::make_shared<RNAME##RecordContent>(zonedata); \
} \
\
void RNAME##RecordContent::toPacket(DNSPacketWriter& pw) \
diff -ru pdns-4.1.4.orig/pdns/nsecrecords.cc pdns-4.1.4/pdns/nsecrecords.cc
--- pdns-4.1.4.orig/pdns/nsecrecords.cc 2018-08-29 16:07:05.000000000 +0200
+++ pdns-4.1.4/pdns/nsecrecords.cc 2018-10-10 10:56:31.594535610 +0200
@@ -29,9 +29,9 @@
regist(1, 47, &make, &make, "NSEC");
}
-DNSRecordContent* NSECRecordContent::make(const string& content)
+std::shared_ptr<DNSRecordContent> NSECRecordContent::make(const string& content)
{
- return new NSECRecordContent(content);
+ return std::make_shared<NSECRecordContent>(content);
}
NSECRecordContent::NSECRecordContent(const string& content, const string& zone)
@@ -81,9 +81,9 @@
pw.xfrBlob(tmp);
}
-NSECRecordContent::DNSRecordContent* NSECRecordContent::make(const DNSRecord &dr, PacketReader& pr)
+std::shared_ptr<NSECRecordContent::DNSRecordContent> NSECRecordContent::make(const DNSRecord &dr, PacketReader& pr)
{
- NSECRecordContent* ret=new NSECRecordContent();
+ auto ret=std::make_shared<NSECRecordContent>();
pr.xfrName(ret->d_next);
string bitmap;
pr.xfrBlob(bitmap);
@@ -136,9 +136,9 @@
regist(1, 50, &make, &make, "NSEC3");
}
-DNSRecordContent* NSEC3RecordContent::make(const string& content)
+std::shared_ptr<DNSRecordContent> NSEC3RecordContent::make(const string& content)
{
- return new NSEC3RecordContent(content);
+ return std::make_shared<NSEC3RecordContent>(content);
}
NSEC3RecordContent::NSEC3RecordContent(const string& content, const string& zone)
@@ -203,9 +203,9 @@
}
}
-NSEC3RecordContent::DNSRecordContent* NSEC3RecordContent::make(const DNSRecord &dr, PacketReader& pr)
+std::shared_ptr<NSEC3RecordContent::DNSRecordContent> NSEC3RecordContent::make(const DNSRecord &dr, PacketReader& pr)
{
- NSEC3RecordContent* ret=new NSEC3RecordContent();
+ auto ret=std::make_shared<NSEC3RecordContent>();
pr.xfr8BitInt(ret->d_algorithm);
pr.xfr8BitInt(ret->d_flags);
pr.xfr16BitInt(ret->d_iterations);
@@ -272,9 +272,9 @@
regist(254, 51, &make, &make, "NSEC3PARAM");
}
-DNSRecordContent* NSEC3PARAMRecordContent::make(const string& content)
+std::shared_ptr<DNSRecordContent> NSEC3PARAMRecordContent::make(const string& content)
{
- return new NSEC3PARAMRecordContent(content);
+ return std::make_shared<NSEC3PARAMRecordContent>(content);
}
NSEC3PARAMRecordContent::NSEC3PARAMRecordContent(const string& content, const string& zone)
@@ -296,9 +296,9 @@
pw.xfrBlob(d_salt);
}
-NSEC3PARAMRecordContent::DNSRecordContent* NSEC3PARAMRecordContent::make(const DNSRecord &dr, PacketReader& pr)
+std::shared_ptr<NSEC3PARAMRecordContent::DNSRecordContent> NSEC3PARAMRecordContent::make(const DNSRecord &dr, PacketReader& pr)
{
- NSEC3PARAMRecordContent* ret=new NSEC3PARAMRecordContent();
+ auto ret=std::make_shared<NSEC3PARAMRecordContent>();
pr.xfr8BitInt(ret->d_algorithm);
pr.xfr8BitInt(ret->d_flags);
pr.xfr16BitInt(ret->d_iterations);
diff -ru pdns-4.1.4.orig/pdns/sillyrecords.cc pdns-4.1.4/pdns/sillyrecords.cc
--- pdns-4.1.4.orig/pdns/sillyrecords.cc 2018-08-29 16:07:05.000000000 +0200
+++ pdns-4.1.4/pdns/sillyrecords.cc 2018-10-10 10:56:40.677767664 +0200
@@ -159,9 +159,9 @@
regist(254, QType::LOC, &make, &make, "LOC");
}
-DNSRecordContent* LOCRecordContent::make(const string& content)
+std::shared_ptr<DNSRecordContent> LOCRecordContent::make(const string& content)
{
- return new LOCRecordContent(content);
+ return std::make_shared<LOCRecordContent>(content);
}
@@ -177,9 +177,9 @@
pw.xfr32BitInt(d_altitude);
}
-LOCRecordContent::DNSRecordContent* LOCRecordContent::make(const DNSRecord &dr, PacketReader& pr)
+std::shared_ptr<LOCRecordContent::DNSRecordContent> LOCRecordContent::make(const DNSRecord &dr, PacketReader& pr)
{
- LOCRecordContent* ret=new LOCRecordContent();
+ auto ret=std::make_shared<LOCRecordContent>();
pr.xfr8BitInt(ret->d_version);
pr.xfr8BitInt(ret->d_size);
pr.xfr8BitInt(ret->d_horizpre);
diff -ru pdns-4.1.4.orig/pdns/speedtest.cc pdns-4.1.4/pdns/speedtest.cc
--- pdns-4.1.4.orig/pdns/speedtest.cc 2018-08-29 16:07:05.000000000 +0200
+++ pdns-4.1.4/pdns/speedtest.cc 2018-10-10 10:56:40.677767664 +0200
@@ -229,24 +229,24 @@
for(char c='a'; c<= 'm';++c) {
pw.startRecord(DNSName("com"), QType::NS, 3600, 1, DNSResourceRecord::AUTHORITY);
gtld[0]=c;
- auto drc = DNSRecordContent::makeunique(QType::NS, 1, gtld);
+ auto drc = DNSRecordContent::mastermake(QType::NS, 1, gtld);
drc->toPacket(pw);
}
for(char c='a'; c<= 'k';++c) {
gtld[0]=c;
pw.startRecord(DNSName(gtld), QType::A, 3600, 1, DNSResourceRecord::ADDITIONAL);
- auto drc = DNSRecordContent::makeunique(QType::A, 1, "1.2.3.4");
+ auto drc = DNSRecordContent::mastermake(QType::A, 1, "1.2.3.4");
drc->toPacket(pw);
}
pw.startRecord(DNSName("a.gtld-servers.net"), QType::AAAA, 3600, 1, DNSResourceRecord::ADDITIONAL);
- auto aaaarc = DNSRecordContent::makeunique(QType::AAAA, 1, "2001:503:a83e::2:30");
+ auto aaaarc = DNSRecordContent::mastermake(QType::AAAA, 1, "2001:503:a83e::2:30");
aaaarc->toPacket(pw);
pw.startRecord(DNSName("b.gtld-servers.net"), QType::AAAA, 3600, 1, DNSResourceRecord::ADDITIONAL);
- aaaarc = DNSRecordContent::makeunique(QType::AAAA, 1, "2001:503:231d::2:30");
+ aaaarc = DNSRecordContent::mastermake(QType::AAAA, 1, "2001:503:231d::2:30");
aaaarc->toPacket(pw);
@@ -293,7 +293,7 @@
// shuffle(records);
for(const auto& rec : records) {
pw.startRecord(rec.qname, rec.qtype.getCode(), rec.ttl, 1, DNSResourceRecord::ADDITIONAL);
- auto drc = DNSRecordContent::makeunique(rec.qtype.getCode(), 1, rec.content);
+ auto drc = DNSRecordContent::mastermake(rec.qtype.getCode(), 1, rec.content);
drc->toPacket(pw);
}
@@ -312,7 +312,7 @@
void operator()() const
{
- auto drc = DNSRecordContent::makeunique(QType::A, 1,
+ auto drc = DNSRecordContent::mastermake(QType::A, 1,
"1.2.3.4");
}
};
@@ -385,7 +385,7 @@
DNSPacketWriter pw(packet, DNSName("outpost.ds9a.nl"), d_type);
for(int records = 0; records < d_records; records++) {
pw.startRecord(DNSName("outpost.ds9a.nl"), d_type);
- auto drc = DNSRecordContent::makeunique(d_type, 1,
+ auto drc = DNSRecordContent::mastermake(d_type, 1,
d_content);
drc->toPacket(pw);
}
@@ -412,7 +412,7 @@
DNSPacketWriter pw(packet, DNSName("outpost.ds9a.nl"), QType::AAAA);
for(int records = 0; records < d_records; records++) {
pw.startRecord(DNSName("outpost.ds9a.nl"), QType::AAAA);
- auto drc = DNSRecordContent::makeunique(QType::AAAA, 1, "fe80::21d:92ff:fe6d:8441");
+ auto drc = DNSRecordContent::mastermake(QType::AAAA, 1, "fe80::21d:92ff:fe6d:8441");
drc->toPacket(pw);
}
pw.commit();
@@ -436,7 +436,7 @@
for(int records = 0; records < d_records; records++) {
pw.startRecord(DNSName("outpost.ds9a.nl"), QType::SOA);
- auto drc = DNSRecordContent::makeunique(QType::SOA, 1, "a0.org.afilias-nst.info. noc.afilias-nst.info. 2008758137 1800 900 604800 86400");
+ auto drc = DNSRecordContent::mastermake(QType::SOA, 1, "a0.org.afilias-nst.info. noc.afilias-nst.info. 2008758137 1800 900 604800 86400");
drc->toPacket(pw);
}
pw.commit();
@@ -457,20 +457,20 @@
DNSPacketWriter pw(packet, DNSName("outpost.ds9a.nl"), QType::A);
pw.startRecord(DNSName("ds9a.nl"), QType::NS, 3600, 1, DNSResourceRecord::AUTHORITY);
- auto drc = DNSRecordContent::makeunique(QType::NS, 1, "ns1.ds9a.nl");
+ auto drc = DNSRecordContent::mastermake(QType::NS, 1, "ns1.ds9a.nl");
drc->toPacket(pw);
pw.startRecord(DNSName("ds9a.nl"), QType::NS, 3600, 1, DNSResourceRecord::AUTHORITY);
- drc = DNSRecordContent::makeunique(QType::NS, 1, "ns2.ds9a.nl");
+ drc = DNSRecordContent::mastermake(QType::NS, 1, "ns2.ds9a.nl");
drc->toPacket(pw);
pw.startRecord(DNSName("ns1.ds9a.nl"), QType::A, 3600, 1, DNSResourceRecord::ADDITIONAL);
- drc = DNSRecordContent::makeunique(QType::A, 1, "1.2.3.4");
+ drc = DNSRecordContent::mastermake(QType::A, 1, "1.2.3.4");
drc->toPacket(pw);
pw.startRecord(DNSName("ns2.ds9a.nl"), QType::A, 3600, 1, DNSResourceRecord::ADDITIONAL);
- drc = DNSRecordContent::makeunique(QType::A, 1, "4.3.2.1");
+ drc = DNSRecordContent::mastermake(QType::A, 1, "4.3.2.1");
drc->toPacket(pw);
pw.commit();
diff -ru pdns-4.1.4.orig/pdns/test-dnsrecordcontent.cc pdns-4.1.4/pdns/test-dnsrecordcontent.cc
--- pdns-4.1.4.orig/pdns/test-dnsrecordcontent.cc 2018-08-29 16:07:05.000000000 +0200
+++ pdns-4.1.4/pdns/test-dnsrecordcontent.cc 2018-10-10 10:56:40.677767664 +0200
@@ -21,12 +21,12 @@
BOOST_CHECK(aaaa == aaaa1);
- auto rec1=DNSRecordContent::makeunique(QType::A, 1, "192.168.0.1");
- auto rec2=DNSRecordContent::makeunique(QType::A, 1, "192.168.222.222");
- auto rec3=DNSRecordContent::makeunique(QType::AAAA, 1, "::1");
- auto recMX=DNSRecordContent::makeunique(QType::MX, 1, "25 smtp.powerdns.com");
- auto recMX2=DNSRecordContent::makeunique(QType::MX, 1, "26 smtp.powerdns.com");
- auto recMX3=DNSRecordContent::makeunique(QType::MX, 1, "26 SMTP.powerdns.com");
+ auto rec1=DNSRecordContent::mastermake(QType::A, 1, "192.168.0.1");
+ auto rec2=DNSRecordContent::mastermake(QType::A, 1, "192.168.222.222");
+ auto rec3=DNSRecordContent::mastermake(QType::AAAA, 1, "::1");
+ auto recMX=DNSRecordContent::mastermake(QType::MX, 1, "25 smtp.powerdns.com");
+ auto recMX2=DNSRecordContent::mastermake(QType::MX, 1, "26 smtp.powerdns.com");
+ auto recMX3=DNSRecordContent::mastermake(QType::MX, 1, "26 SMTP.powerdns.com");
BOOST_CHECK(!(*rec1==*rec2));
BOOST_CHECK(*rec1==*rec1);
BOOST_CHECK(*rec3==*rec3);
diff -ru pdns-4.1.4.orig/pdns/test-signers.cc pdns-4.1.4/pdns/test-signers.cc
--- pdns-4.1.4.orig/pdns/test-signers.cc 2018-08-29 16:07:05.000000000 +0200
+++ pdns-4.1.4/pdns/test-signers.cc 2018-10-10 10:56:40.677767664 +0200
@@ -146,11 +146,11 @@
rrc.d_signer = DNSName("example.net.");
inception = 946684800;
expire = 1893456000;
- rrs.push_back(DNSRecordContent::makeunique(QType::A, QClass::IN, "192.0.2.1"));
+ rrs.push_back(DNSRecordContent::mastermake(QType::A, QClass::IN, "192.0.2.1"));
}
else {
rrc.d_signer = qname;
- rrs.push_back(DNSRecordContent::makeunique(QType::MX, QClass::IN, "10 mail.example.com."));
+ rrs.push_back(DNSRecordContent::mastermake(QType::MX, QClass::IN, "10 mail.example.com."));
}
rrc.d_originalttl = 3600;
@@ -251,7 +251,7 @@
reportBasicTypes();
- rrs.push_back(DNSRecordContent::makeunique(QType::MX, 1, "10 mail.example.com."));
+ rrs.push_back(DNSRecordContent::mastermake(QType::MX, 1, "10 mail.example.com."));
RRSIGRecordContent rrc;
rrc.d_originalttl = 3600;
diff -ru pdns-4.1.4.orig/pdns/toysdig.cc pdns-4.1.4/pdns/toysdig.cc
--- pdns-4.1.4.orig/pdns/toysdig.cc 2018-08-29 16:07:05.000000000 +0200
+++ pdns-4.1.4/pdns/toysdig.cc 2018-10-10 10:56:40.677767664 +0200
@@ -102,7 +102,7 @@
LuaConfigItems::LuaConfigItems()
{
for (const auto &dsRecord : rootDSs) {
- auto ds=unique_ptr<DSRecordContent>(dynamic_cast<DSRecordContent*>(DSRecordContent::make(dsRecord)));
+ auto ds=std::dynamic_pointer_cast<DSRecordContent>(DSRecordContent::make(dsRecord));
dsAnchors[g_rootdnsname].insert(*ds);
}
}
diff -ru pdns-4.1.4.orig/pdns/ws-auth.cc pdns-4.1.4/pdns/ws-auth.cc
--- pdns-4.1.4.orig/pdns/ws-auth.cc 2018-08-29 16:07:05.000000000 +0200
+++ pdns-4.1.4/pdns/ws-auth.cc 2018-10-10 10:56:40.677767664 +0200
@@ -287,7 +287,7 @@
/** Helper to build a record content as needed. */
static inline string makeRecordContent(const QType& qtype, const string& content, bool noDot) {
// noDot: for backend storage, pass true. for API users, pass false.
- auto drc = DNSRecordContent::makeunique(qtype.getCode(), QClass::IN, content);
+ auto drc = DNSRecordContent::mastermake(qtype.getCode(), QClass::IN, content);
return drc->getZoneRepresentation(noDot);
}
