Changeset 973 for branches/cname-collision

Timestamp:

01/09/26 12:05:07 (3 weeks ago)

Author:

Kris Deugau

Message:

/branches/cname-collision

Revise/tighten normalization for $stamp and $expires in addRec() and
updateRec() so that they can be passed to the validators, so that CNAME
collision checking can account for record expiry/valid-after.
See #72

File:

• branches/cname-collision/DNSDB.pm (modified) (6 diffs)

branches/cname-collision/DNSDB.pm

@@ -4869 +4869 @@
 
   my $expires = shift || '';
-  $expires = 1 if $expires eq 'until';  # Turn some special values into the appropriate booleans.
-  $expires = 0 if $expires eq 'after';
+  $expires = 't' if $expires eq 'until';        # Turn some special values into the appropriate booleans.
+  $expires = 'f' if $expires eq 'after';
+  $expires = 't' if $expires eq '1';
+  $expires = 'f' if $expires eq '0';
   my $stamp = shift;
   $stamp = '' if !$stamp;        # Timestamp should be a string at this point.
@@ -4880 +4882 @@
   return ('FAIL', "expires must be 1, 't', or 'until',  or 0, 'f', or 'after'")
         if ($stamp && !defined($expires))
-        || ($stamp && $expires ne '0' && $expires ne '1' && $expires ne 't' && $expires ne 'f');
+        || ($stamp && $expires ne 't' && $expires ne 'f');
 
   # Spaces are evil.
@@ -4920 +4922 @@
         host => $host, rectype => $rectype, val => $val, addr => $addr,
         dist => \$dist, port => \$port, weight => \$weight,
+        stamp => \$stamp, expires => $expires,
         fields => \$fields, vallist => \@vallist);
 
@@ -5030 +5033 @@
 
   my $expires = shift || '';
-  $expires = 1 if $expires eq 'until';  # Turn some special values into the appropriate booleans.
-  $expires = 0 if $expires eq 'after';
+  $expires = 't' if $expires eq 'until';        # Turn some special values into the appropriate booleans.
+  $expires = 'f' if $expires eq 'after';
+  $expires = 't' if $expires eq '1';
+  $expires = 'f' if $expires eq '0';
   my $stamp = shift;
   $stamp = '' if !$stamp;        # Timestamp should be a string at this point.
@@ -5040 +5045 @@
   return ('FAIL', "expires must be 1, 't', or 'until',  or 0, 'f', or 'after'")
         if ($stamp && !defined($expires))
-        || ($stamp && $expires ne '0' && $expires ne '1' && $expires ne 't' && $expires ne 'f');
+        || ($stamp && $expires ne 't' && $expires ne 'f');
 
   # Spaces are evil.
@@ -5086 +5091 @@
         host => $host, rectype => $rectype, val => $val, addr => $addr,
         dist => \$dist, port => \$port, weight => \$weight,
+        stamp => \$stamp, expires => $expires,
         fields => \$fields, vallist => \@vallist,
         update => $id);