From 583463c3168fb793240e15e10f0d8bc65e0b2504 Mon Sep 17 00:00:00 2001 From: nofaralfasi Date: Mon, 11 Nov 2024 17:32:10 +0200 Subject: [PATCH] Fixes #37990 - Fix DNS conflict detection to handle both IPv4 and IPv6 blanks --- app/models/concerns/orchestration/dns.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/concerns/orchestration/dns.rb b/app/models/concerns/orchestration/dns.rb index 5a1a6557c1b..9c7bdc82c90 100644 --- a/app/models/concerns/orchestration/dns.rb +++ b/app/models/concerns/orchestration/dns.rb @@ -108,7 +108,7 @@ def pending_dns_record_changes? end def dns_conflict_detected? - return false if ip.blank? || hostname.blank? + return false if (ip.blank? && ip6.blank?) || hostname.blank? # can't validate anything if dont have an ip-address yet return false unless require_ip4_validation? || require_ip6_validation? # we should only alert on conflicts if overwrite mode is off