Changeset 1037 for branches/stable

Timestamp:

02/12/26 18:03:01 (32 hours ago)

Author:

Kris Deugau

Message:

/branches/stable

Roll up most remaining patches applied in production

Location:

branches/stable

Files:

• . (modified) (1 prop)
• DNSDB.pm (modified) (4 diffs)
• dns-rpc.cgi (modified) (1 diff)

branches/stable/DNSDB.pm

@@ -698 +698 @@
         unless ${$args{val}} =~ /^(?:\.|\*\.|rpz-passthru\.|rpz-drop\.|rpz-tcp-only\.)$/;
       # Append the RPZ name
-      my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : $self->domainName($args{id}));
+      my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : $zname);
       ${$args{host}} =~ s/\.*$/\.$pname/ if ${$args{host}} !~ /$pname$/i;
     } else {
@@ -2805 +2805 @@
   }
 
-  my ($domid) = $dbh->selectrow_array(
-        "SELECT domain_id FROM domains WHERE lower(domain) = lower(?) AND default_location = ?",
-        undef, ($domain, $location) );
+  my $sql = "SELECT domain_id FROM domains WHERE lower(domain) = lower(?)";
+  my @zargs = ($domain);
+  # yay magic strings!
+  if ($location eq ':ANY:') {
+    # no-op
+  } else {
+    $sql .= " AND default_location = ?";
+    push @zargs, $location;
+  }
+
+  my ($domid) = $dbh->selectrow_array($sql, undef, @zargs);
+
   if (!$domid) {
     if ($dbh->err) {
@@ -2836 +2845 @@
   }
 
-  my ($revid) = $dbh->selectrow_array(
-        "SELECT rdns_id FROM revzones WHERE revnet = ? AND default_location = ?",
-        undef, ($revzone, $location) );
+  my $sql = "SELECT rdns_id FROM revzones WHERE revnet = ?";
+  my @zargs = ($revzone);
+  # yay magic strings!
+  if ($location eq ':ANY:') {
+    # no-op
+  } else {
+    $sql .= " AND default_location = ?";
+    push @zargs, $location;
+  }
+
+  my ($revid) = $dbh->selectrow_array($sql, undef, @zargs);
+
   if (!$revid) {
     if ($dbh->err) {
@@ -6688 +6706 @@
       $$recflags{$ip}++;
       next if $hpat eq '%blank%';       # Allows blanking a subnet so no records are published.
+      next if $hpat =~ /^\%blank\%/;    # Safety net in case of oopses elsewhere
       my $rec = $hpat;  # start fresh with the template for each IP
 ##fixme:  there really isn't a good way to handle sub-/24 zones here.  This way at least

branches/stable/dns-rpc.cgi

@@ -907 +907 @@
   my $ret = $dnsdb->getRecList(defrec => $args{defrec}, revrec => $args{revrec}, id => $args{id},
         offset => $args{offset}, nrecs => $args{nrecs}, sortby => $args{sortby},
-        sortorder => $args{sortorder}, filter => $args{filter});
+        sortorder => $args{sortorder}, filter => $args{filter}, location => $args{location});
   die $dnsdb->errstr."\n" if !$ret;
 
   return $ret;
-}
+} # getRecList()