From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject:
 [PATCH] ids.cgi: Only read-in ignored hosts, if the ignore file exists.
Date: Mon, 07 Mar 2022 17:52:36 +0100
Message-ID: <20220307165236.2944-1-stefan.schantl@ipfire.org>
In-Reply-To: <db3fd3c7d884c8572ee9c15876644bbc5afd9023.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9209285035175221724=="
List-Id: <development.lists.ipfire.org>

--===============9209285035175221724==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Otherwise the CGI will crash.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 html/cgi-bin/ids.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 27e61e9bb..722715667 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -103,7 +103,7 @@ if (($cgiparams{'WHITELIST'} eq $Lang::tr{'add'}) || ($cg=
iparams{'WHITELIST'} eq
 		my $new_entry_remark =3D $cgiparams{'IGNORE_ENTRY_REMARK'};
=20
 		# Read-in ignoredfile.
-		&General::readhasharray($IDS::ignored_file, \%ignored);
+		&General::readhasharray($IDS::ignored_file, \%ignored) if (-e $IDS::ignore=
d_file);
=20
 		# Check if we should edit an existing entry and got an ID.
 		if (($cgiparams{'WHITELIST'} eq $Lang::tr{'update'}) && ($cgiparams{'ID'})=
) {
@@ -165,7 +165,7 @@ if (($cgiparams{'WHITELIST'} eq $Lang::tr{'add'}) || ($cg=
iparams{'WHITELIST'} eq
 		undef($cgiparams{'ID'});
=20
 		# Read-in ignoredfile.
-		&General::readhasharray($IDS::ignored_file, \%ignored);
+		&General::readhasharray($IDS::ignored_file, \%ignored) if (-e $IDS::ignore=
d_file);
=20
 		# Grab the configured status of the corresponding entry.
 		my $status =3D $ignored{$id}[2];
@@ -199,7 +199,7 @@ if (($cgiparams{'WHITELIST'} eq $Lang::tr{'add'}) || ($cg=
iparams{'WHITELIST'} eq
 	my %ignored =3D ();
=20
 	# Read-in ignoredfile.
-	&General::readhasharray($IDS::ignored_file, \%ignored);
+	&General::readhasharray($IDS::ignored_file, \%ignored) if (-e $IDS::ignored=
_file);
=20
 	# Drop entry from the hash.
 	delete($ignored{$cgiparams{'ID'}});
@@ -1071,7 +1071,7 @@ sub show_mainpage() {
 	}
=20
 	# Read-in ignored hosts.
-	&General::readhasharray("$IDS::settingsdir/ignored", \%ignored);
+	&General::readhasharray("$IDS::ignored_file", \%ignored) if (-e $IDS::ignor=
ed_file);
=20
 	$checked{'ENABLE_IDS'}{'off'} =3D '';
 	$checked{'ENABLE_IDS'}{'on'} =3D '';
--=20
2.30.2


--===============9209285035175221724==--