aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-08-04 18:07:35 +0000
committerErmal <eri@pfsense.org>2011-08-04 18:07:35 +0000
commit2a267d796a3e428a72926df8549f0b829041d507 (patch)
treeb1408388c3c16236a7af509bb928240799206712
parent668c466767928ce0b29cd7bcc67226f360689e49 (diff)
downloadpfsense-packages-2a267d796a3e428a72926df8549f0b829041d507.tar.gz
pfsense-packages-2a267d796a3e428a72926df8549f0b829041d507.tar.bz2
pfsense-packages-2a267d796a3e428a72926df8549f0b829041d507.zip
GC some more code
-rw-r--r--config/snort/snort.inc17
1 files changed, 2 insertions, 15 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index 0a7af0c3..9ce41be3 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -667,8 +667,6 @@ function snort_Getdirsize($node) {
function snort_snortloglimit_install_cron($should_install) {
global $config, $g;
- if ($g['booting']==true)
- return;
if (!is_array($config['cron']['item']))
$config['cron']['item'] = array();
@@ -682,9 +680,6 @@ function snort_snortloglimit_install_cron($should_install) {
$x++;
}
- $snort_snortloglimit_info_ck = $config['installedpackages']['snortglobal']['snortloglimit'];
- $snort_snortloglimitsize_info_ck = $config['installedpackages']['snortglobal']['snortloglimitsize'];
-
switch($should_install) {
case true:
if(!$is_installed) {
@@ -708,12 +703,9 @@ function snort_snortloglimit_install_cron($should_install) {
}
/* func for updating cron */
-function snort_rm_blocked_install_cron($should_install)
-{
+function snort_rm_blocked_install_cron($should_install) {
global $config, $g;
- if ($g['booting']==true)
- return;
if (!is_array($config['cron']['item']))
$config['cron']['item'] = array();
@@ -817,8 +809,6 @@ function snort_rm_blocked_install_cron($should_install)
function snort_rules_up_install_cron($should_install) {
global $config, $g;
- if ($g['booting']==true)
- return;
if(!$config['cron']['item'])
$config['cron']['item'] = array();
@@ -1579,7 +1569,7 @@ function snort_deinstall() {
function snort_deinstall_cron($crontask) {
global $config, $g;
- if(!$config['cron']['item'])
+ if(!is_array($config['cron']['item']))
return;
$x=0;
@@ -1926,9 +1916,6 @@ function generate_snort_conf($id, $if_real, $snort_uuid)
else
$def_ssl_ports_type = "$def_ssl_ports_info_chk";
- /* should we install a automatic update crontab entry? */
- $automaticrulesupdate = $config['installedpackages']['snortglobal']['automaticrulesupdate7'];
-
/* if user is on pppoe, we really want to use ng0 interface */
if ($snort_pfsense_basever == 'yes' && $snort_ext_int == "wan")
$snort_ext_int = get_real_wan_interface();