diff options
| author | jim-p <jimp@pfsense.org> | 2012-07-09 12:57:00 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-07-09 12:57:00 -0400 |
| commit | 958efd439784459a5848fb05afe1560c4db285d7 (patch) | |
| tree | 1e836cb827156bba4cc12ad37fc21294f138e7f8 /config/snort/snort_interfaces_global.php | |
| parent | 4e8dd82f957006899f1babb2e521b8fd3cdcd2ce (diff) | |
| download | pfsense-packages-958efd439784459a5848fb05afe1560c4db285d7.tar.gz pfsense-packages-958efd439784459a5848fb05afe1560c4db285d7.tar.bz2 pfsense-packages-958efd439784459a5848fb05afe1560c4db285d7.zip | |
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.
Diffstat (limited to 'config/snort/snort_interfaces_global.php')
| -rw-r--r-- | config/snort/snort_interfaces_global.php | 6 |
1 files changed, 3 insertions, 3 deletions
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/*'); } |