aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorbmeeks8 <bmeeks8@bellsouth.net>2015-06-03 17:46:09 -0400
committerbmeeks8 <bmeeks8@bellsouth.net>2015-06-03 17:46:09 -0400
commitf5e3369fea74c031349921eb1ff5e25366724244 (patch)
tree5488f073a26d7986c132d92aa510afac6daad87b /config
parent836d5978458559b149e4f928a45a602085ecbc65 (diff)
downloadpfsense-packages-f5e3369fea74c031349921eb1ff5e25366724244.tar.gz
pfsense-packages-f5e3369fea74c031349921eb1ff5e25366724244.tar.bz2
pfsense-packages-f5e3369fea74c031349921eb1ff5e25366724244.zip
Fix corrupt snort.conf created when IP REP is enabled with no IP lists.
Diffstat (limited to 'config')
-rw-r--r--config/snort/snort_generate_conf.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/config/snort/snort_generate_conf.php b/config/snort/snort_generate_conf.php
index 297e833b..646697bf 100644
--- a/config/snort/snort_generate_conf.php
+++ b/config/snort/snort_generate_conf.php
@@ -876,9 +876,9 @@ if (is_array($snortcfg['wlist_files']['item'])) {
}
}
if (!empty($blist_files))
- $ip_lists = $blist_files;
+ $ip_lists = ", \\ \n\t" . $blist_files;
if (!empty($wlist_files))
- $ip_lists .= ", \\ \n" . $wlist_files;
+ $ip_lists .= ", \\ \n\t" . $wlist_files;
if ($snortcfg['iprep_scan_local'] == 'on')
$ip_lists .= ", \\ \n\tscan_local";
@@ -888,8 +888,7 @@ preprocessor reputation: \
memcap {$snortcfg['iprep_memcap']}, \
priority {$snortcfg['iprep_priority']}, \
nested_ip {$snortcfg['iprep_nested_ip']}, \
- white {$snortcfg['iprep_white']}, \
- {$ip_lists}
+ white {$snortcfg['iprep_white']}{$ip_lists}
EOD;