From 52e14aeeebde21bdf84efe5c77e6daf407140fc6 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 10 Apr 2018 20:58:02 +0100 Subject: [PATCH] Revert "no need for quotemeta" This reverts commit 9339c1a2cead264c35eb5dd9dc078ba7b19eec26. --- lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm index 532443c2..5e15a56f 100644 --- a/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm +++ b/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm @@ -261,7 +261,7 @@ sub store_neighbors { {'=', $remote_port}, {'-ilike', long_port($remote_port)}, {'-ilike', short_port($remote_port)}, - {'-ilike', ('%'. $remote_port)}, + {'-ilike', ('%'.quotemeta($remote_port))}, ], }, { rows => 1 })->single(); if ($peer_port and ($peer_port->port ne $remote_port)) { @@ -311,7 +311,7 @@ sub store_neighbors { sub long_port { my $port = shift or return ''; - $port =~ s/^([a-z]{2})(\d.+)$/$1%$2/i; + $port =~ s/^([a-z]{2})([^a-z].+)$/$1%$2/i; return $port; }