Changeset 775 for trunk

Timestamp:

07/31/19 15:44:20 (5 years ago)

Author:

Kris Deugau

Message:

/trunk

Add serial numbers on AXFR import. For now we leave non-overwritten SOA
serial entries dangling for overwrite on the next update; this may need
manual intervention later. Most cases should overwrite the SOA for
system/platform consistency. See #24.

File:

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

trunk/DNSDB.pm

@@ -5656 +5656 @@
     my $logparent;
 
+    # Snarf the zone serial.  Doing it here lets us log the serial we ultimately
+    # import with, and cleanly override or not as per the options
+    my $res = Net::DNS::Resolver->new;
+    $res->nameservers($ifrom);
+    my ($origsoa) = rr($res, $zone, 'SOA');
+    my $ser = $origsoa->{serial};
+    if ($args{rwsoa}) {
+      if (!$args{keepserial}) {
+        $ser = scalar(time);
+      }
+    }
+
     if ($rev eq 'n') {
-##fixme:  serial
-      $dbh->do("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)", undef,
-        ($zone, $group, $args{status}) ) or die $dbh->errstr;
+      $dbh->do("INSERT INTO domains (domain,group_id,status,zserial) VALUES (?,?,?,?)", undef,
+        ($zone, $group, $args{status}, $ser) ) or die $dbh->errstr;
       # get domain id so we can do the records
       ($zone_id) = $dbh->selectrow_array("SELECT currval('domains_domain_id_seq')");
       $domain_id = $zone_id;
       $logparent = $self->_log(group_id => $group, domain_id => $domain_id,
-                entry => "[Added ".($args{status} ? 'active' : 'inactive')." domain $zone via AXFR]");
+                entry => "[Added ".($args{status} ? 'active' : 'inactive')." domain $zone with serial $ser via AXFR]");
     } else {
-##fixme:  serial
-      $dbh->do("INSERT INTO revzones (revnet,group_id,status) VALUES (?,?,?)", undef,
-        ($cidr,$group,$args{status}) );
+      $dbh->do("INSERT INTO revzones (revnet,group_id,status,zserial) VALUES (?,?,?,?)", undef,
+        ($cidr,$group,$args{status}, $ser) );
       # get revzone id so we can do the records
       ($zone_id) = $dbh->selectrow_array("SELECT currval('revzones_rdns_id_seq')");
       $rdns_id = $zone_id;
       $logparent = $self->_log(group_id => $group, rdns_id => $rdns_id,
-                entry => "[Added ".($args{status} ? 'active' : 'inactive')." reverse zone $cidr via AXFR]");
+                entry => "[Added ".($args{status} ? 'active' : 'inactive')." reverse zone $cidr with serial $ser via AXFR]");
     }
 
@@ -5681 +5691 @@
 ## caused a commit instead of barfing
 
-    my $res = Net::DNS::Resolver->new;
-    $res->nameservers($ifrom);
     $res->axfr_start($zone)
         or die "Couldn't begin AXFR\n";