Project

General

Profile

« Previous | Next » 

Revision 5ce30897

Added by Lukas Zapletal about 9 years ago

Fixes #8727 - DHCP validation does not fail on discovered leases

(cherry picked from commit 37bb1b44a9753382c6858e22ac55031e9662c4e4)

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, mac), proxy.record(network, ip)].delete_if { |c| c == self }.compact
conflicts = [proxy.record(network, ip)].delete_if { |c| c == self }.compact
@conflicts ||= conflicts.uniq {|c| c.attrs}
end

Also available in: Unified diff