Changeset 837

Timestamp:

04/21/22 13:16:29 (3 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit some lurking tweaks to mergerecs

• user info for log
• use location of ':ANY:' to find and match domains or reverse zones that may have default locations set

Update include path finder - see #80

File:

• trunk/mergerecs (modified) (4 diffs)

trunk/mergerecs

@@ -3 +3 @@
 ##
 # $Id$
-# Copyright 2014,2016,2018,2020 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2014-2022 Kris Deugau <kdeugau@deepnet.cx>
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -27 +27 @@
 use Data::Dumper;
 
-# 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.
+# See https://secure.deepnet.cx/trac/dnsadmin/ticket/80 for more gory details on how we got here.
+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;
@@ -67 +76 @@
 $dnsdb->{loguserid} = 0;        # not worth setting up a pseudouser the way the RPC system does
 $dnsdb->{logusername} = $dnsdb->{logusername}."/mergerecs";
-$dnsdb->{logfullname} = $dnsdb->{logusername} if !$dnsdb->{logfullname};
+$dnsdb->{logfullname} = ($dnsdb->{logfullname} ? $dnsdb->{logfullname}."/mergerecs" : $dnsdb->{logusername});
 
 # and now the meat
@@ -86 +95 @@
   }
   die "$pzone is not a valid reverse zone specification\n" if !$npzone;
-  $zid = $dnsdb->revID($npzone, '');
+  $zid = $dnsdb->revID($npzone, ':ANY:');
 } else {
   $rev = 'n';
-  $zid = $dnsdb->domainID($pzone, '');
+  $zid = $dnsdb->domainID($pzone, ':ANY:');
 }
 die "$pzone is not a zone in the database (".$dnsdb->errstr.")\n" if !$zid;