From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Wed, 14 Feb 2018 09:15:39 +0000 (+0100)
Subject: ids.cgi: Use tarball information from ids-functions.pl
X-Git-Tag: suricata-beta3~33^2~39^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a69b96d2002c14d3fe65dcf90f9731a9c631b624;p=people%2Fstevee%2Fipfire-2.x.git

ids.cgi: Use tarball information from ids-functions.pl

Directly use the value from the ids-functions.pl for the
location and filename of the tarball which includes the snort ruleset.

This will save to declare this information twice and prevents from any
failures if the location of filname every changes.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 2f7ea23eb1..8ae4da7749 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -47,7 +47,6 @@ my %selected=();
 # Get netsettings.
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
-my $rulestarball = "/var/tmp/snortrules.tar.gz";
 my $snortrulepath = "/etc/snort/rules";
 my $snortusedrulefilesfile = "${General::swroot}/snort/snort-used-rulefiles.conf";
 my $errormessage;
@@ -345,9 +344,9 @@ if ($errormessage) {
 my $rulesdate;
 
 # Check if a ruleset allready has been downloaded.
-if ( -f "$rulestarball"){
+if ( -f "$IDS::rulestarball"){
 	# Call stat on the filename to obtain detailed information.
-        my @Info = stat("$rulestarball");
+        my @Info = stat("$IDS::rulestarball");
 
 	# Grab details about the creation time.
         $rulesdate = localtime($Info[9]);