Merge remote-tracking branch 'origin/pr/2354'

diff --cc docs/markdown/types.md
Simple merge

diff --cc pdns/dnsrecords.cc
index 625641e277ac312417bda6911fe9c0262091039d,43135f3629583cefdf6d53d4edccb9e32c52f770..13046ce49fe06ed8e47e1de99ade1620e8866014
--- 1/pdns/dnsrecords.cc
--- 2/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@@ -548,9 -496,9 +552,10 @@@ void reportOtherTypes(
     NSEC3RecordContent::report();
     NSEC3PARAMRecordContent::report();
     TLSARecordContent::report();
+    OPENPGPKEYRecordContent::report();
     DLVRecordContent::report();
     DNSRecordContent::regist(QClass::ANY, QType::TSIG, &TSIGRecordContent::make, &TSIGRecordContent::make, "TSIG");
 +   DNSRecordContent::regist(QClass::ANY, QType::TKEY, &TKEYRecordContent::make, &TKEYRecordContent::make, "TKEY");
     //TSIGRecordContent::report();
     OPTRecordContent::report();
     EUI48RecordContent::report();

diff --cc pdns/dnsrecords.hh
Simple merge

diff --cc pdns/qtype.hh
index 699a2d4b57ab20539608d36c598fa2c9ed5e82d2,291e01b467863120a001d12065f1b6d4472be4bb..6c420cb25ebd4843b8fd47bf3c349c6c8bc32f97
--- 1/pdns/qtype.hh
--- 2/pdns/qtype.hh
+++ b/pdns/qtype.hh
@@@ -79,10 -80,9 +79,10 @@@ public
    static int chartocode(const char *p); //!< convert a character string to a code
  // more solaris fun
  #undef DS
 -  enum typeenum {A=1, NS=2, CNAME=5, SOA=6, MR=9, WKS=11, PTR=12, HINFO=13, MINFO=14, MX=15, TXT=16, RP=17, AFSDB=18, SIG=24, KEY=25, AAAA=28, LOC=29, SRV=33, NAPTR=35, KX=36,
 +  enum typeenum : uint16_t {A=1, NS=2, CNAME=5, SOA=6, MR=9, WKS=11, PTR=12, HINFO=13, MINFO=14, MX=15, TXT=16, RP=17, AFSDB=18, SIG=24, KEY=25, AAAA=28, LOC=29, SRV=33, NAPTR=35, KX=36,
                 CERT=37, A6=38, DNAME=39, OPT=41, DS=43, SSHFP=44, IPSECKEY=45, RRSIG=46, NSEC=47, DNSKEY=48, DHCID=49, NSEC3=50, NSEC3PARAM=51,
-                TLSA=52, CDS=59, CDNSKEY=60, SPF=99, EUI48=108, EUI64=109, TKEY=249, TSIG=250, IXFR=251, AXFR=252, MAILB=253, MAILA=254, ANY=255, ADDR=259,
 -               TLSA=52, OPENPGPKEY=61, SPF=99, EUI48=108, EUI64=109, TSIG=250, IXFR=251, AXFR=252, MAILB=253, MAILA=254, ANY=255, ADDR=259, ALIAS=260, DLV=32769} types;
++               TLSA=52, CDS=59, CDNSKEY=60, OPENPGPKEY=61, SPF=99, EUI48=108, EUI64=109, TKEY=249, TSIG=250, IXFR=251, AXFR=252, MAILB=253, MAILA=254, ANY=255, ADDR=259,
 +               ALIAS=260, DLV=32769};
    typedef pair<string,uint16_t> namenum;
    static vector<namenum> names;
  
@@@ -153,8 -153,7 +153,9 @@@ private
        qtype_insert("NSEC3", 50);
        qtype_insert("NSEC3PARAM", 51);
        qtype_insert("TLSA", 52);
 +      qtype_insert("CDS", 59);
 +      qtype_insert("CDNSKEY", 60);
+       qtype_insert("OPENPGPKEY", 61);
        qtype_insert("SPF", 99);
        qtype_insert("EUI48", 108);
        qtype_insert("EUI64", 109);

diff --cc pdns/test-dnsrecords_cc.cc
Simple merge