Changeset 843 for trunk

Timestamp:

04/29/22 15:45:16 (3 years ago)

Author:

Kris Deugau

Message:

/trunk

Minor accumulated refinements on tiny-import.pl

• Update include path finder - see #80
• Clean up extra trailing :'s that sometimes confused the location
• Better handle "empty" TTL values
• Slightly improve SOA serial type tagging; only handles the most common case of "let tinydns handle it" UNIX-epoch serials for now

File:

• trunk/tiny-import.pl (modified) (7 diffs)

trunk/tiny-import.pl

@@ -3 +3 @@
 ##
 # $Id$
-# Copyright 2012-2014,2020 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2012-2014,2020-2022 Kris Deugau <kdeugau@deepnet.cx>
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -28 +28 @@
 use Time::TAI64 qw(:tai);
 
-# push "the directory the script is in" into @INC
-use FindBin;
-use lib "$FindBin::RealBin/";
+# Taint-safe (ish) voodoo to push "the directory the script is in" into @INC.
+use File::Spec ();
+use File::Basename ();
+my $path;
+BEGIN {
+    $path = File::Basename::dirname(File::Spec->rel2abs($0));
+    if ($path =~ /(.*)/) {
+        $path = $1;
+    }
+}
+use lib $path;
 
 use DNSDB;
@@ -200 +208 @@
     chomp;
     s/\s*$//;
+    s/:+$//;
     my $recstat = recslurp($_, $filecnt);
     $ok++ if $recstat;
@@ -405 +414 @@
       $host =~ s/\.$//;
       $host =~ s/^\\052/*/;
-      $ttl = -1 if $ttl eq '';
+      $ttl = -1 if !defined($ttl) || $ttl eq '';
       $stamp = '' if !$stamp;
       $loc = '' if !$loc;
@@ -542 +551 @@
       $host =~ s/\.$//;
       $host =~ s/^\\052/*/;
-      $ttl = -1 if $ttl eq '';
+      $ttl = -1 if !defined($ttl) || $ttl eq '';
       $stamp = '' if !$stamp;
       $loc = '' if !$loc;
@@ -605 +614 @@
       if ($zone =~ /\.arpa$/) {
         ($code,$msg) = DNSDB::_zone2cidr($zone);
-        $dbh->do("INSERT INTO revzones (revnet,group_id,status,default_location,zserial) VALUES (?,?,1,?,?)",
+        $dbh->do("INSERT INTO revzones (revnet,group_id,status,default_location,sertype,zserial) VALUES (?,?,1,?,'U',?)",
                 undef, ($msg, $importcfg{group}, $loc, $serial));
         my ($rdns) = $dbh->selectrow_array("SELECT currval('revzones_rdns_id_seq')");
@@ -614 +623 @@
                 $loc, $stamp, $expires, $stampactive);
       } else {
-        $dbh->do("INSERT INTO domains (domain,group_id,status,default_location,zserial) VALUES (?,?,1,?,?)",
+        $dbh->do("INSERT INTO domains (domain,group_id,status,default_location,sertype,zserial) VALUES (?,?,1,?,'U',?)",
                 undef, ($zone, $importcfg{group}, $loc, $serial));
         my ($domid) = $dbh->selectrow_array("SELECT currval('domains_domain_id_seq')");