Project

General

Profile

« Previous | Next » 

Revision a9c352dc

Added by Lukas Zapletal about 8 years ago

Fixes #13725 - DHCP MAC conflicts are reported

(cherry picked from commit 4c9529c7bc3c081fb3d0bfdbee09b2e7d6eabc0a)

View differences:

lib/net/dhcp/record.rb
# Returns an array of record objects which are conflicting with our own
def conflicts
conflicts = [proxy.record(network, ip)].delete_if { |c| c == self }.compact
conflicts = [proxy.record(network, mac), proxy.record(network, ip)].delete_if { |c| c == self }.compact
@conflicts ||= conflicts.uniq {|c| c.attrs}
end

Also available in: Unified diff