Changeset 573

Timestamp:

12/31/13 15:14:55 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Squash the missing-SOA-on-AXFR bug; SOA and NS records would not be
copied correctly when the "Rewrite SOA" or "Rewrite NS" options were
checked.

Pass the record ID into _printrec_tiny(), mainly as a debugging aid.

File:

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

trunk/DNSDB.pm

@@ -4701 +4701 @@
       } elsif ($type eq 'NS') {
 # hmm.  should we warn here if subdomain NS'es are left alone?
-        next if ($args{rwns} && ($rr->name eq $zone));
         if ($rev eq 'y') {
           # revzones have records more or less reversed from forward zones.
           my ($tmpcode,$tmpmsg) = _zone2cidr($host);
           die "Error converting NS record: $tmpmsg\n" if $tmpcode eq 'FAIL';    # hmm.  may not make sense...
+          next if ($args{rwns} && ($tmpmsg eq "$cidr"));
           $val = "$tmpmsg";
           $host = $rr->nsdname;
@@ -4715 +4715 @@
 #}
         } else {
+          next if ($args{rwns} && ($rr->name eq $zone));
           $val = $rr->nsdname;
         }
@@ -4868 +4869 @@
     if ($args{rwsoa}) {
       $soaflag = 1;
-      my $sthgetsoa = $dbh->prepare("SELECT host,val,ttl FROM default_records WHERE group_id=? AND type=?");
-      my $sthputsoa = $dbh->prepare("INSERT INTO records (domain_id,host,type,val,ttl) VALUES (?,?,?,?,?)");
+      my $sthgetsoa = $dbh->prepare("SELECT host,val,ttl FROM "._rectable('y', $rev)." WHERE group_id=? AND type=?");
+      my $sthputsoa = $dbh->prepare("INSERT INTO records (".
+        ($rev eq 'n' ? 'domain_id' : 'rdns_id').",host,type,val,ttl) VALUES (?,?,?,?,?)");
       $sthgetsoa->execute($group,$reverse_typemap{SOA});
       while (my ($host,$val,$ttl) = $sthgetsoa->fetchrow_array()) {
-        $host =~ s/DOMAIN/$zone/g;
-        $val =~ s/DOMAIN/$zone/g;
+        if ($rev eq 'n') {
+          $host =~ s/DOMAIN/$zone/g;
+          $val =~ s/DOMAIN/$zone/g;     # arguably useless
+        } else {
+          $host =~ s/ADMINDOMAIN/$self->{domain}/g;
+        }
         $sthputsoa->execute($zone_id,$host,$reverse_typemap{SOA},$val,$ttl);
       }
     }
 
-    # Overwrite NS records
+    # Add standard NS records.  The old one(s) should have been skipped by this point.
     if ($args{rwns}) {
       $nsflag = 1;
-      my $sthgetns = $dbh->prepare("SELECT host,val,ttl FROM default_records WHERE group_id=? AND type=?");
-      my $sthputns = $dbh->prepare("INSERT INTO records (domain_id,host,type,val,ttl) VALUES (?,?,?,?,?)");
+      my $sthgetns = $dbh->prepare("SELECT host,val,ttl FROM "._rectable('y',$rev)." WHERE group_id=? AND type=?");
+      my $sthputns = $dbh->prepare("INSERT INTO records (".
+        ($rev eq 'n' ? 'domain_id' : 'rdns_id').",host,type,val,ttl) VALUES (?,?,?,?,?)");
       $sthgetns->execute($group,$reverse_typemap{NS});
       while (my ($host,$val,$ttl) = $sthgetns->fetchrow_array()) {
-        $host =~ s/DOMAIN/$zone/g;
-        $val =~ s/DOMAIN/$zone/g;
+        if ($rev eq 'n') {
+          $host =~ s/DOMAIN/$zone/g;
+          $val =~ s/DOMAIN/$zone/g;     #hmm.
+        } else {
+          $host =~ s/ADMINDOMAIN/$self->{domain}/g;     #hmm.
+          $val =~ s/ZONE/$cidr/g;
+        }
         $sthputns->execute($zone_id,$host,$reverse_typemap{NS},$val,$ttl);
       }
@@ -5078 +5090 @@
         $soasth->execute($revid);
         my (@zsoa) = $soasth->fetchrow_array();
-        _printrec_tiny($zonefilehandle,'y',\%recflags,$revzone,
+        _printrec_tiny($zonefilehandle, $zsoa[7], 'y',\%recflags,$revzone,
           $zsoa[0],$zsoa[1],$zsoa[2],$zsoa[3],$zsoa[4],$zsoa[5],$zsoa[6],$zsoa[8],'');
 
         $recsth->execute($revid);
-        while (my ($host,$type,$val,$dist,$weight,$port,$ttl,$recid,$loc,$stamp,$expires,$stampactive) = $recsth->fetchrow_array) {
+        while (my ($host, $type, $val, $dist, $weight, $port, $ttl, $recid, $loc, $stamp, $expires, $stampactive)
+                = $recsth->fetchrow_array) {
           next if $recflags{$recid};
 
@@ -5095 +5108 @@
 #         }
 
-          _printrec_tiny($zonefilehandle, 'y', \%recflags, $revzone,
+          _printrec_tiny($zonefilehandle, $recid, 'y', \%recflags, $revzone,
             $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp, $expires, $stampactive);
 
@@ -5179 +5192 @@
           }
 
-          _printrec_tiny($zonefilehandle, 'n', \%recflags,
+          _printrec_tiny($zonefilehandle, $recid, 'n', \%recflags,
                 $dom, $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp, $expires, $stampactive);
 
@@ -5228 +5241 @@
 # Utility sub for __export_tiny above
 sub _printrec_tiny {
-  my ($datafile,$revrec,$recflags,$zone,$host,$type,$val,$dist,$weight,$port,$ttl,$loc,$stamp,$expires,$stampactive) = @_;
+  my ($datafile, $recid, $revrec, $recflags, $zone, $host, $type, $val, $dist, $weight, $port, $ttl,
+        $loc, $stamp, $expires, $stampactive) = @_;
 
   $loc = '' if !$loc;   # de-nullify - just in case