Changeset 1047 for branches/stable/dns-rpc.cgi

Timestamp:

02/27/26 16:40:46 (5 hours ago)

Author:

Kris Deugau

Message:

/branches/stable

Rollup merge through r909 for core dnsadmin - excludes BIND export, changes
to auxiliary scripts (compatc-recs.pl, mergerecs.pl, etc)

Location:

branches/stable

Files:

• . (modified) (1 prop)
• dns-rpc.cgi (modified) (6 diffs)

branches/stable/dns-rpc.cgi

@@ -3 +3 @@
 ##
 # $Id$
-# Copyright 2012-2016 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2012-2016,2020-2025 Kris Deugau <kdeugau@deepnet.cx>
 # 
 #    This program is free software: you can redistribute it and/or modify
@@ -22 +22 @@
 use warnings;
 
-# don't remove!  required for GNU/FHS-ish install from tarball
-use lib '.';    ##uselib##
+# push "the directory the script is in" into @INC
+use FindBin;
+use lib "$FindBin::RealBin/";
+
 use DNSDB;
 
@@ -50 +52 @@
 #sub revName {
         'dnsdb.domainID'        => \&domainID,
-#sub revID {
+        'dnsdb.revID'           => \&revID,
         'dnsdb.addRDNS'         => \&addRDNS,
 #sub getZoneCount {
@@ -372 +374 @@
 }
 
-#sub revID {}
+=head3 revID
+
+Retrieve the ID for a reverse zone
+
+=over 4
+
+=item revzone
+
+The reverse zone to find the ID for, in CIDR form.
+
+=back
+
+Returns the integer ID of the domain if found.
+
+=cut
+sub revID {
+  my %args = @_;
+
+  _commoncheck(\%args, 'y');
+
+  my $revid = $dnsdb->revID($args{revzone}, $args{location});
+  die $dnsdb->errstr."\n" if !$revid;
+  return $revid;
+}
+
 
 
@@ -1615 +1641 @@
   die "Need location\n" if !defined($args{location});
 
+  # quick sanity-check version
+  die "CIDR is either poorly formed or not an IP/netblock at all\n" if !DNSDB::_maybeip(\$args{cidr});
+  my $cidr = new NetAddr::IP $args{cidr};
+  die "CIDR is not a valid IP/netblock\n" if !$cidr;
+
   # much like addOrUpdateRevRec()
   my $zonelist = $dnsdb->getZonesByCIDR(%args);
-  my $cidr = new NetAddr::IP $args{cidr};
 
   if (scalar(@$zonelist) == 0) {
@@ -1665 +1695 @@
                      ($cidr->masklen != 32 ? "$cidr" : $cidr->addr) );
         my $reclist = $dnsdb->getRecList(rpc => 1, defrec => 'n', revrec => 'y', location => $args{location},
-          id => $zonelist->[0]->{rdns_id}, filter => $filt, sortby => 'val', sortorder => 'DESC');
+          id => $zonelist->[0]->{rdns_id}, filter => $filt, sortby => 'val', sortorder => 'DESC', offset => 'all');
         foreach my $rec (@$reclist) {
           my $reccidr = new NetAddr::IP $rec->{val};