Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #37990 - Fix DNS conflict detection to handle both IPv4 and IPv6 blanks #10374

Merged
merged 1 commit into from
Nov 12, 2024
Merged

Fixes #37990 - Fix DNS conflict detection to handle both IPv4 and IPv6 blanks #10374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/concerns/orchestration/dns.rb
View file
Open in desktop
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
Loading