From: Rob Brewer <rob.brewer@ipfire.org>
Date: Sat, 5 Mar 2022 21:18:42 +0000 (+0000)
Subject: modified regex for V3 log-prefix added space
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fipblacklist.v3;p=people%2Fhelix%2Fipfire-2.x.git

modified regex for V3 log-prefix added space
---

diff --git a/html/cgi-bin/logs.cgi/showrequestfromblacklist.dat b/html/cgi-bin/logs.cgi/showrequestfromblacklist.dat
index 0de381a2d..2f73c3ee5 100755
--- a/html/cgi-bin/logs.cgi/showrequestfromblacklist.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromblacklist.dat
@@ -161,7 +161,7 @@ my $blacklist = $cgiparams{blacklist};
 if (!$skip)
 {
 	while (<FILE>) {
-		if (/^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*BLKLST_(\w+)IN=.*/) {
+		if (/^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*BLKLST_(\w+)\s?IN=.*/) {
 			if($1 eq $blacklist){
 				$log[$lines] = $_;
 				$lines++;
@@ -186,7 +186,7 @@ if ($multifile) {
 	}
 	if (!$skip) {
 		while (<FILE>) {
-			if (/^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*BLKLST_(\w+)IN=.*/) {
+			if (/^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*BLKLST_(\w+)\s?IN=.*/) {
 				if($1 eq $blacklist){
 					$log[$lines] = $_;
 					$lines++;
@@ -308,7 +308,7 @@ $lines = 0;
 foreach $_ (@slice) {
 	$a = $_;
 	# Check whether valid ipv4 or ipv6 address
-	if (($_ =~ /BLKLST_(\w+)IN=/)) {
+	if (($_ =~ /BLKLST_(\w+)\s?IN=/)) {
 		if($1 eq $blacklist) {
 
 			my $in = '-'; my $out = '-';