135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove implicit op:and from device_identity lhs check

Browse Source
This commit is contained in:
Oliver Gorwits
2017-05-27 12:28:34 +01:00
parent 60a00efea5
commit c4598df24b
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/App/Netdisco/Core/Discover.pm
View File

@@ -66,12 +66,10 @@ sub set_canonical_ip {
ALIAS: while (my $alias = $devips->next) { ALIAS: while (my $alias = $devips->next) {
next if $alias->alias eq $old_ip; next if $alias->alias eq $old_ip;
foreach my $this (keys %$idmap) { foreach my $key (keys %$idmap) {
my $anded_this = [(ref $this ? @$this : $this), 'op:and'];
# lhs of device_identity matches device, rhs matches device_ip # lhs of device_identity matches device, rhs matches device_ip
if (check_acl($device, $anded_this) if (check_acl($device, $key)
and check_acl($alias, $idmap->{$this})) { and check_acl($alias, $idmap->{$key})) {
$new_ip = $alias->alias; $new_ip = $alias->alias;
last ALIAS; last ALIAS;
} }