Skip to content

Commit

Permalink
Fixes #37990 - Fix DNS conflict detection to handle both IPv4 and IPv…
Browse files Browse the repository at this point in the history
…6 blanks
  • Loading branch information
nofaralfasi authored and ShimShtein committed Nov 12, 2024
1 parent 09559ad commit 54afc35
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/models/concerns/orchestration/dns.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 54afc35

Please sign in to comment.