Fix for #1883

mzagrabe · Dec 14, 2015 · 30681d7 · 30681d7
1 parent a6cda3c
commit 30681d7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/bin/find_address.pl b/bin/find_address.pl
@@ -68,7 +68,7 @@
 
 print "--------------------\n";
 
-if ( $address =~ /$MAC/ ){
+if ( $address =~ /^$MAC$/ ){
     $address   = PhysAddr->format_address($address);
     if ( $self{FORCE_LIVE} ){
 	&search_live(mac=>$address, vlan=>$self{VLAN});

diff --git a/htdocs/management/device_tasks.html b/htdocs/management/device_tasks.html
@@ -55,7 +55,7 @@
 if ( $submit eq 'Find' ){
     # Get rid of spaces
     $device_search =~ s/\s+//g;
-    if ( $device_search =~ /$MAC/ ){
+    if ( $device_search =~ /^$MAC$/ ){
 	$m->comp('.show_tasks', %ARGS, user=>$user);
 	$m->comp('/management/mac.html', search=>$device_search, dowindow=>1 );
     }elsif ( Ipblock->matches_ip($device_search) ){

diff --git a/htdocs/management/host_tasks.html b/htdocs/management/host_tasks.html
@@ -191,7 +191,7 @@
     # Remove trailing and leading spaces
     $search = $ui->rem_lt_sp($search);
     $search ||= '*';
-    if ( $search =~ /$MAC/ ){
+    if ( $search =~ /^$MAC$/ ){
 	@list = PhysAddr->search(address=>$search);
     }elsif ( Ipblock->matches_ip($search) ){
 	@list = Ipblock->search(address=>$search);

diff --git a/htdocs/user_management/hostinfo_tasks.html b/htdocs/user_management/hostinfo_tasks.html
@@ -45,8 +45,6 @@
 *print_showtaskslink = $m->comp('SELF:.sub_print_showtaskslink'); 
 my $hideheader = 'style="display:none"' if ( !$showheader );
 
-my $MAC  = Netdot->get_mac_regex();
-
 </%init>
 
 <div id="sectiontools" <% $hideheader %>>