Changeset 1240

Timestamp:

07/25/08 21:58:35 (2 years ago)

Author:

ahu

Message:

partial de-chompification, plus fix up bad SOA ttl usage in case of $TTL

Location:

trunk/pdns/pdns

Files:

• zoneparser-tng.cc (modified) (5 diffs)
• zoneparser-tng.hh (modified) (1 diff)

trunk/pdns/pdns/zoneparser-tng.cc

@@ -30 +30 @@
 #include <boost/lexical_cast.hpp>
 
-ZoneParserTNG::ZoneParserTNG(const string& fname, const string& zname, const string& reldir) : d_reldir(reldir), d_zonename(zname), d_defaultttl(3600)
+ZoneParserTNG::ZoneParserTNG(const string& fname, const string& zname, const string& reldir) : d_reldir(reldir), 
+                                                                                               d_zonename(zname), d_defaultttl(3600), 
+                                                                                               d_havedollarttl(false)
 {
   d_zonename = toCanonic("", d_zonename);
@@ -228 +230 @@
     return false;
 
-  chomp(d_line, " \r\n\x1a");
+  boost::trim_right_if(d_line, is_any_of(" \r\n\x1a"));
 
   parts_t parts;
@@ -241 +243 @@
   if(d_line[0]=='$') { 
     string command=makeString(d_line, parts[0]);
-    if(iequals(command,"$TTL") && parts.size() > 1)
+    if(iequals(command,"$TTL") && parts.size() > 1) {
       d_defaultttl=makeTTLFromZone(trim_right_copy_if(makeString(d_line, parts[1]), is_any_of(";")));
+      d_havedollarttl=true;
+    }
     else if(iequals(command,"$INCLUDE") && parts.size() > 1) {
       string fname=unquotify(makeString(d_line, parts[1]));
@@ -346 +350 @@
     if(!findAndElide(rr.content, ')')) {
       while(getLine()) {
-        chomp(d_line,"\t\r\n ");
+        trim_right(d_line);
         chopComment(d_line);
         trim(d_line);
@@ -385 +389 @@
         rr.content+=soaparts[n];
 
-      if(n==6)
+      if(n==6 && !d_havedollarttl)
         d_defaultttl=makeTTLFromZone(soaparts[n]);
     }

trunk/pdns/pdns/zoneparser-tng.hh

@@ -47 +47 @@
   string d_zonename;
   int d_defaultttl;
+  bool d_havedollarttl;
   uint32_t d_templatecounter, d_templatestop, d_templatestep;
   string d_templateline;