add more record types to the enum, plus fix up the ns_t_kx/ns_t_mx confusion

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1148 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc
index 6919f9f87443007b8304ab8b7691cc894dd74072..44238d9172e000e9e22d167116d6fb36e2a458bb 100644 (file)
--- a/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@ -215,7 +215,7 @@ boilerplate_conv(MX, ns_t_mx,
                 conv.xfrLabel(d_mxname, true);
                 )
 
-boilerplate_conv(KX, ns_t_mx, 
+boilerplate_conv(KX, ns_t_kx, 
                 conv.xfr16BitInt(d_preference);
                 conv.xfrLabel(d_exchanger, false);
                 )

diff --git a/pdns/qtype.hh b/pdns/qtype.hh
index 4951db5b1ba1c7e02efaed694fc0b228a1969fcc..7daed2674a39f5bd8d5f600a7d8672515e88fe8a 100644 (file)
--- a/pdns/qtype.hh
+++ b/pdns/qtype.hh
@@ -72,7 +72,8 @@ public:
 
   static int chartocode(const char *p); //!< convert a character string to a code
   
-  enum typeenum {A=1,NS=2,CNAME=5,SOA=6, MR=9, PTR=12,HINFO=13,MX=15,TXT=16,RP=17,AFSDB=18,KEY=25,AAAA=28,LOC=29,SRV=33,NAPTR=35, OPT=41,
+  enum typeenum {A=1,NS=2,CNAME=5,SOA=6, MR=9, PTR=12,HINFO=13,MX=15,TXT=16,RP=17,AFSDB=18,KEY=25,AAAA=28,LOC=29,SRV=33,NAPTR=35, KX=36, 
+                CERT=37,OPT=41, DS=43, SSHDP=44, IPSECKEY=45, RRSIG=46, NSEC=47, DNSKEY=48, DHCID=49, 
                 SPF=99, AXFR=252, IXFR=251, ANY=255, URL=256, MBOXFW=257, CURL=258, ADDR=259} types;
 private:
   short int code;