Changeset 576

Timestamp:

12/31/13 17:01:59 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix subtle bug-in-waiting where SOA records will commonly end up exported
from a forward zone last, leaving the resulting flatfile unimportable
with tiny-import.pl; do this by deliberatly exporting the SOA first, the
same as with the reverse zones.

File:

• trunk/DNSDB.pm (modified) (3 diffs)

trunk/DNSDB.pm

@@ -5054 +5054 @@
         "FROM records WHERE rdns_id=? AND type=6");
   my $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location,extract(epoch from stamp),expires,stampactive ".
-        "FROM records WHERE rdns_id=? AND not type=6 ".
+        "FROM records WHERE rdns_id=? AND NOT type=6 ".
         "ORDER BY masklen(CAST(val AS inet)) DESC, CAST(val AS inet)");
   my $revsth = $dbh->prepare("SELECT rdns_id,revnet,status,changed FROM revzones WHERE status=1 ".
@@ -5150 +5150 @@
   } # while ($revsth)
 
+  $soasth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location ".
+        "FROM records WHERE rdns_id=? AND type=6");
+  $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location,extract(epoch from stamp),expires,stampactive ".
+        "FROM records WHERE domain_id=? AND NOT type=6");       # Just exclude all types relating to rDNS
+#       "FROM records WHERE domain_id=? AND type < 65280");     # Just exclude all types relating to rDNS
   my $domsth = $dbh->prepare("SELECT domain_id,domain,status,changed FROM domains WHERE status=1 ORDER BY domain_id");
-  $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location,extract(epoch from stamp),expires,stampactive ".
-        "FROM records WHERE domain_id=?");      # Just exclude all types relating to rDNS
-#       "FROM records WHERE domain_id=? AND type < 65280");     # Just exclude all types relating to rDNS
   $zonesth = $dbh->prepare("UPDATE domains SET changed='n' WHERE domain_id=?");
   $domsth->execute();
@@ -5178 +5180 @@
           $zonefilehandle = *ZONECACHE;
         }
+
+        # need to fetch this separately so the SOA comes first in the flatfile....
+        # Just In Case we need/want to reimport from the flatfile later on.
+        $soasth->execute($domid);
+        my (@zsoa) = $soasth->fetchrow_array();
+        _printrec_tiny($zonefilehandle, $zsoa[7], 'y',\%recflags,$dom,
+          $zsoa[0],$zsoa[1],$zsoa[2],$zsoa[3],$zsoa[4],$zsoa[5],$zsoa[6],$zsoa[8],'');
 
         $recsth->execute($domid);