Changeset 995

Timestamp:

01/22/26 18:11:32 (6 days ago)

Author:

Kris Deugau

Message:

/branches/cname-collision

Add a configuration option to set how to handle several cases of overlapping
timestamp expiry/valid-after cases checking for CNAME collisions
See #72

Location:

branches/cname-collision

Files:

• DNSDB.pm (modified) (2 diffs)
• dnsdb.conf (modified) (1 diff)

branches/cname-collision/DNSDB.pm

@@ -284 +284 @@
     warn "Bad showrev_arpa setting $self->{showrev_arpa}, using default\n";
     $self->{showrev_arpa} = 'none';
+  }
+  if (!grep /$self->{coerce_cname_timestamp}/, ('none','adjust','full')) {
+    warn "Bad coerce_cname_timestamp setting $self->{coerce_cname_timestamp}, using default\n";
+    $self->{coerce_cname_timestamp} = 'none';
   }
 
@@ -2327 +2331 @@
       $cfg->{lowercase}         = $1 if /^lowercase\s*=\s*([a-z01]+)/i;
       $cfg->{showrev_arpa}      = $1 if /^showrev_arpa\s*=\s*([a-z]+)/i;
+      $cfg->{coerce_cname_timestamp}    = $1 if /^coerce_cname_timestamp\s*=\s*([a-z]+)/i;
       $cfg->{template_skip_0}   = $1 if /^template_skip_0\s*=\s*([a-z01]+)/i;
       $cfg->{template_skip_255} = $1 if /^template_skip_255\s*=\s*([a-z01]+)/i;

branches/cname-collision/dnsdb.conf

@@ -60 +60 @@
 #lowercase = 0
 
+# Variously coerce timestamp and valid-after/expiry flags onto a new/updated record if the
+# record as requested would cause a CNAME to overlap with another record.
+# adjust:  Adjust the timestamp where an expiry+valid-after would overlap
+#   - existing record expires, new record has valid-after before expiry => adjust timestamp to match existing record
+#   - existing record is valid-after, new record has expiry after valid-after => adjust timestamp to match existing record
+# none: (default) Do not make changes to timestamps to avoid overlap
+#coerce_cname_timestamp = none
+
 # Show formal .arpa zone name instead of the natural IP or CIDR for reverse zone names and records?
 # Valid values are none, zone, record, or all