Changeset 1056 for branches

Timestamp:

03/19/26 12:40:50 (5 hours ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge forward a few more commits from /trunk fixing nuisance issues found
deploying earlier changes

Location:

branches/stable

Files:

• . (modified) (1 prop)
• dns-rpc.cgi (modified) (3 diffs)
• dns-upd-1.4.2.sql (copied) (copied from trunk/dns-upd-1.4.2.sql )

branches/stable/dns-rpc.cgi

@@ -22 +22 @@
 use warnings;
 
-# 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;
@@ -374 +383 @@
 }
 
+
 =head3 revID
 
@@ -398 +408 @@
   return $revid;
 }
-