Fix rebase conflicts failures

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index d5b614c50f768b1cf9768a293766ae56065f55ee..5fd85c03927558afe5cd1062c35292dd47246bbf 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -108,7 +108,7 @@ pdnssec_SOURCES=pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc dnsparser.hh
        aes/aescpp.h \
        aes/aescrypt.c aes/aes.h aes/aeskey.c aes/aes_modes.c aes/aesopt.h \
        aes/aestab.c aes/aestab.h aes/brg_endian.h aes/brg_types.h aes/dns_random.cc json.cc \
-       serialtweaker.cc 
+       serialtweaker.cc
 
 
 pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) 

diff --git a/pdns/dnsseckeeper.hh b/pdns/dnsseckeeper.hh
index 827993515b081c9002c229b779e8d66b7fd68eae..514b227d27fbfb8205b43d975448f193a226ab97 100644 (file)
--- a/pdns/dnsseckeeper.hh
+++ b/pdns/dnsseckeeper.hh
@@ -163,7 +163,7 @@ private:
 };
 
 class DNSPacket;
+uint32_t calculateEditSOA(SOAData sd, const string& kind);
 uint32_t localtime_format_YYYYMMDDSS(time_t t, uint32_t seq);
 bool editSOA(DNSSECKeeper& dk, const string& qname, DNSPacket* dp);
-uint32_t calculateEditSOA(SOAData sd, const string& kind);
 #endif

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 63906ec3c8a0b4a83e093bc6ec6c4b7d06374a6b..50cac9b72ad00ceee19dc5ba16ca168bcbe68577 100644 (file)
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -507,7 +507,7 @@ int increaseSerial(const string& zone, DNSSECKeeper &dk)
     }
   }
   else {
-    sd.serial = calculateEditSoa(sd, soaEditKind) + 1;
+    sd.serial = calculateEditSOA(sd, soaEditKind) + 1;
   }
   rrs[0].content = serializeSOAData(sd);
 

diff --git a/pdns/qtype.cc b/pdns/qtype.cc
index fe9402b314812d895a1257614135581bef26b77d..a3a44bb2048beb71dd5c84fbbfbeeb9b73e07dc2 100644 (file)
--- a/pdns/qtype.cc
+++ b/pdns/qtype.cc
@@ -53,12 +53,12 @@ bool QType::isMetadataType() {
   return false;
 }
 
+
 uint16_t QType::getCode() const
 {
   return code;
 }
 
-
 const string QType::getName() const
 {
   vector<namenum>::iterator pos;
@@ -99,26 +99,6 @@ QType &QType::operator=(const char *p)
   return *this;
 }
 
-bool QType::operator==(const QType &comp) const
-{
-  return(comp.code==code);
-}
-
-bool QType::operator!=(const QType &comp) const
-{
-  return(comp.code!=code);
-}
-
-bool QType::operator==(const uint16_t comp) const
-{
-  return(comp==code);
-}
-
-bool QType::operator!=(const uint16_t comp) const
-{
-  return(comp!=code);
-}
-
 QType &QType::operator=(const string &s)
 {
   code=chartocode(s.c_str());

diff --git a/pdns/qtype.hh b/pdns/qtype.hh
index a0c1d25b73324b9fd48089432b62cbaa49ef4796..d892bdfb8478a4611db13d28742d865b15c3d081 100644 (file)
--- a/pdns/qtype.hh
+++ b/pdns/qtype.hh
@@ -69,11 +69,6 @@ public:
     ar & code;
   }
 
-  bool operator!=(const QType &) const; //!< not equal operator
-  bool operator==(const QType &) const; //!< equality operator
-  bool operator==(const uint16_t) const; //!< equality operator
-  bool operator!=(const uint16_t) const; //!< equality operator
-
   const string getName() const; //!< Get a string representation of this type
   uint16_t getCode() const; //!< Get the integer representation of this type
   bool isSupportedType();
@@ -82,27 +77,34 @@ 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, PTR=12,HINFO=13,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, OPT=41, DS=43, SSHFP=44, IPSECKEY=45, RRSIG=46, NSEC=47, DNSKEY=48, DHCID=49, NSEC3=50, NSEC3PARAM=51,
-    TLSA=52, SPF=99, EUI48=108, EUI64=109, TSIG=250, AXFR=252, IXFR=251, ANY=255, URL=256, MBOXFW=257, CURL=258, ADDR=259, DLV=32769} types;
-    
+  enum typeenum {A=1,NS=2, CNAME=5, SOA=6, MR=9, PTR=12, HINFO=13, 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, OPT=41, DS=43, SSHFP=44, IPSECKEY=45, RRSIG=46, NSEC=47, DNSKEY=48, DHCID=49, NSEC3=50, NSEC3PARAM=51,
+     TLSA=52, SPF=99, EUI48=108, EUI64=109, TSIG=250, IXFR=251, AXFR=252, MAILB=253, MAILA=254, ANY=255, URL=256, MBOXFW=257, CURL=258, ADDR=259, DLV=32769} types;
   typedef pair<string,uint16_t> namenum; 
   static vector<namenum> names;
 
   inline bool operator==(const QType &comp) const {
-      return(comp.code==code);
+    return(comp.code==code);
   }
 
   inline bool operator!=(const QType &comp) const {
-      return(comp.code!=code);
+    return(comp.code!=code);
   }
 
   inline bool operator==(QType::typeenum comp) const {
-      return(comp==code);
+    return(comp==code);
   }
 
   inline bool operator!=(QType::typeenum comp) const {
-      return(comp!=code);
+    return(comp!=code);
+  }
+
+  inline bool operator==(uint16_t comp) const {
+    return(comp==code);
+  }
+
+  inline bool operator!=(uint16_t comp) const {
+    return(comp!=code);
   }
 
 private:
@@ -110,7 +112,7 @@ private:
     public:
     void qtype_insert(const char* a, uint16_t num) 
     {
-       names.push_back(make_pair(string(a), num));
+      names.push_back(make_pair(string(a), num));
     }
 
     init()
@@ -127,16 +129,16 @@ private:
       qtype_insert("TXT",16);
       qtype_insert("RP",17);
       qtype_insert("AFSDB", 18);
-      qtype_insert("SIG",24);
-      qtype_insert("KEY",25);
-      qtype_insert("AAAA",28);
-      qtype_insert("LOC",29);
-      qtype_insert("SRV",33);
-      qtype_insert("NAPTR",35);
-      qtype_insert("KX",36);
+      qtype_insert("SIG", 24);
+      qtype_insert("KEY", 25);
+      qtype_insert("AAAA", 28);
+      qtype_insert("LOC", 29);
+      qtype_insert("SRV", 33);
+      qtype_insert("NAPTR", 35);
+      qtype_insert("KX", 36);
       qtype_insert("CERT", 37);
-      qtype_insert("A6",38);
-      qtype_insert("OPT",41);
+      qtype_insert("A6", 38);
+      qtype_insert("OPT", 41);
       qtype_insert("DS", 43);
       qtype_insert("SSHFP", 44);
       qtype_insert("IPSECKEY", 45);
@@ -146,19 +148,21 @@ private:
       qtype_insert("DHCID", 49);
       qtype_insert("NSEC3", 50);
       qtype_insert("NSEC3PARAM", 51);
-      qtype_insert("TLSA",52);
-      qtype_insert("SPF",99);
-      qtype_insert("EUI48",108);
-      qtype_insert("EUI64",109);
-//      qtype_insert("TSIG", 250);
-      qtype_insert("IXFR",251);
-      qtype_insert("AXFR",252);
-      qtype_insert("ANY",255);
-      qtype_insert("URL",256);
-      qtype_insert("MBOXFW",257);
-      qtype_insert("CURL",258);
-      qtype_insert("ADDR",259);
-      qtype_insert("DLV",32769);
+      qtype_insert("TLSA", 52);
+      qtype_insert("SPF", 99);
+      qtype_insert("EUI48", 108);
+      qtype_insert("EUI64", 109);
+      qtype_insert("TSIG", 250);
+      qtype_insert("IXFR", 251);
+      qtype_insert("AXFR", 252);
+      qtype_insert("MAILB", 253);
+      qtype_insert("MAILA", 254);
+      qtype_insert("ANY", 255);
+      qtype_insert("URL", 256);
+      qtype_insert("MBOXFW", 257);
+      qtype_insert("CURL", 258);
+      qtype_insert("ADDR", 259);
+      qtype_insert("DLV", 32769);
     }
   } initializer;
 
@@ -167,6 +171,6 @@ private:
 
 struct QClass
 {
-       enum QClassEnum {IN=1, CHAOS=3, NONE=254, ANY=255};
+  enum QClassEnum {IN=1, CHAOS=3, NONE=254, ANY=255};
 };
 #endif

diff --git a/pdns/serialtweaker.cc b/pdns/serialtweaker.cc
index 32ec01cc226ff929f7c38b6633fa68fb8f963f36..b810a55f8cb59a7f7621600ab90fdd8241f82b84 100644 (file)
--- a/pdns/serialtweaker.cc
+++ b/pdns/serialtweaker.cc
@@ -43,7 +43,7 @@ bool editSOA(DNSSECKeeper& dk, const string& qname, DNSPacket* dp)
         return false;
       SOAData sd;
       fillSOAData(rr.content, sd);
-      sd.serial = calculateEditSoa(sd, kind);
+      sd.serial = calculateEditSOA(sd, kind);
       rr.content = serializeSOAData(sd);      
       return true;
     }
@@ -52,7 +52,7 @@ bool editSOA(DNSSECKeeper& dk, const string& qname, DNSPacket* dp)
 }
 
 
-uint32_t calculateEditSoa(SOAData sd, const string& kind) {
+uint32_t calculateEditSOA(SOAData sd, const string& kind) {
   if(pdns_iequals(kind,"INCEPTION")) {
     time_t inception = getStartOfWeek();
     return localtime_format_YYYYMMDDSS(inception, 1);