diff --git a/Netdisco/Changes b/Netdisco/Changes index ccec85b5..c3d0d9f8 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -11,7 +11,7 @@ [BUG FIXES] - * Another fix for NetAddr::MAC tripping up on v6 addresses + * Update NetAddr::MAC dependency to fix IPv6 misidentification bug * [#191] Fix error when stopping stopped web daemon * [#174] LDAP users should not be able to change password * [#182] SSID and PoE showing in wrong Device Port columns diff --git a/Netdisco/META.yml b/Netdisco/META.yml index f6ccb784..0b4dfff9 100644 --- a/Netdisco/META.yml +++ b/Netdisco/META.yml @@ -61,7 +61,7 @@ requires: Net::Domain: 1.23 Net::LDAP: 0 NetAddr::IP: 4.068 - NetAddr::MAC: 0.92 + NetAddr::MAC: 0.93 Opcode: 1.07 Path::Class: 0.32 Plack: 1.0023 diff --git a/Netdisco/Makefile.PL b/Netdisco/Makefile.PL index aafb9ea1..1ae8c0ff 100644 --- a/Netdisco/Makefile.PL +++ b/Netdisco/Makefile.PL @@ -39,7 +39,7 @@ requires 'MCE' => 1.520; requires 'Net::Domain' => 1.23; requires 'Net::DNS' => 0.72; requires 'Net::LDAP' => 0; -requires 'NetAddr::MAC' => 0.92; +requires 'NetAddr::MAC' => 0.93; requires 'NetAddr::IP' => 4.068; requires 'Opcode' => 1.07; requires 'Path::Class' => 0.32; diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm index a2df5832..4b199603 100644 --- a/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm +++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm @@ -23,7 +23,6 @@ ajax '/ajax/content/search/node' => require_login sub { my ( $start, $end ) = param('daterange') =~ m/(\d+-\d+-\d+)/gmx; my $mac = NetAddr::MAC->new(mac => $node); - undef $mac if (defined $mac and $node =~ m/:{2}[a-f0-9]*$/i); # temp fix my @active = (param('archived') ? () : (-bool => 'active')); my @times = (); diff --git a/Netdisco/lib/App/Netdisco/Web/Search.pm b/Netdisco/lib/App/Netdisco/Web/Search.pm index 7e329ad8..316a88e5 100644 --- a/Netdisco/lib/App/Netdisco/Web/Search.pm +++ b/Netdisco/lib/App/Netdisco/Web/Search.pm @@ -80,7 +80,6 @@ get '/search' => require_login sub { my $nd = $s->resultset('Device')->search_fuzzy($q); my ($likeval, $likeclause) = sql_match($q); my $mac = NetAddr::MAC->new($q); - undef $mac if (defined $mac and $q =~ m/:{2}[a-f0-9]*$/i); # temp fix if ($nd and $nd->count) { if ($nd->count == 1) {