diff options
| author | Ermal <eri@pfsense.org> | 2011-08-03 18:21:20 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-08-03 18:21:20 +0000 |
| commit | 0f4ea6c032de0d287d9a1620abbe32c59d557ab4 (patch) | |
| tree | 2db36f9bb3d984efd488430e02a519d09d9f4602 /config/snort/snort.inc | |
| parent | 85b7eb644dec64190b67207e09b52dcedc1344b6 (diff) | |
| download | pfsense-packages-0f4ea6c032de0d287d9a1620abbe32c59d557ab4.tar.gz pfsense-packages-0f4ea6c032de0d287d9a1620abbe32c59d557ab4.tar.bz2 pfsense-packages-0f4ea6c032de0d287d9a1620abbe32c59d557ab4.zip | |
Fixes for whitelists and suppress generation.
Diffstat (limited to 'config/snort/snort.inc')
| -rw-r--r-- | config/snort/snort.inc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc index 7a5a4ffb..79d4cde8 100644 --- a/config/snort/snort.inc +++ b/config/snort/snort.inc @@ -520,7 +520,7 @@ function snort_postinstall() if (!is_dir('/usr/local/etc/snort')) exec('/bin/mkdir -p /usr/local/etc/snort/custom_rules'); - if (!file_exists('/usr/local/etc/snort/whitelist')) + if (!is_dir('/usr/local/etc/snort/whitelist')) exec('/bin/mkdir -p /usr/local/etc/snort/whitelist/'); if (!is_dir('/var/log/snort/run')) @@ -1151,8 +1151,6 @@ function create_snort_suppress($id, $if_real) { if ($config['installedpackages']['snortglobal']['rule'][$id]['suppresslistname'] != 'default') { $whitelist_key_s = find_suppress_key($config['installedpackages']['snortglobal']['rule'][$id]['suppresslistname']); - if (empty($whitelist_key_s)) - return ""; /* file name */ $suppress_file_name = $config['installedpackages']['snortglobal']['suppress']['item'][$whitelist_key_s]['name']; |