From 958efd439784459a5848fb05afe1560c4db285d7 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Mon, 9 Jul 2012 12:57:00 -0400
Subject: globals for these do not work properly at bootup. Might be causing
 unintended overwrites/deletions. Revert "s//usr/local/etc/snort/snortdir/ to
 unify its reference and location. Trim some unused functions in the way"

This reverts commit 40cace16a452cd841a6b3626c44ff0d0b655956f.
---
 config/snort/snort_interfaces_global.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'config/snort/snort_interfaces_global.php')

diff --git a/config/snort/snort_interfaces_global.php b/config/snort/snort_interfaces_global.php
index acfcfde9..55249460 100644
--- a/config/snort/snort_interfaces_global.php
+++ b/config/snort/snort_interfaces_global.php
@@ -38,7 +38,7 @@ require_once("guiconfig.inc");
 require_once("/usr/local/pkg/snort/snort_gui.inc");
 require_once("/usr/local/pkg/snort/snort.inc");
 
-global $g, $snortdir;
+global $g;
 
 $d_snort_global_dirty_path = '/var/run/snort_global.dirty';
 
@@ -120,7 +120,7 @@ if (!$input_errors) {
 if ($_POST["Reset"]) {
 
 	function snort_deinstall_settings() {
-		global $config, $g, $id, $if_real, $snortdir;
+		global $config, $g, $id, $if_real;
 
 		exec("/usr/usr/bin/killall snort");
 		sleep(2);
@@ -165,7 +165,7 @@ if ($_POST["Reset"]) {
 		unset($config['installedpackages']['snortglobal']);
 
 		/* remove all snort iface dir */
-		exec("rm -r {$snortdir}/snort_*");
+		exec('rm -r /usr/local/etc/snort/snort_*');
 		exec('rm /var/log/snort/*');
 	}
 
-- 
cgit v1.2.3