aboutsummaryrefslogtreecommitdiffstats
path: root/config/snort
diff options
context:
space:
mode:
authorrobiscool <robrob2626@yahoo.com>2010-04-24 19:52:48 -0700
committerrobiscool <robrob2626@yahoo.com>2010-04-24 19:53:20 -0700
commit0cb2cf75ad9fa5ad9ddbe6f3b0773b1e13e95bbb (patch)
tree0a9656181a0a38b8f1056913d362b2ce987a7572 /config/snort
parent1f4d2cafde8b1be3860cd3d546e49091f2d617d3 (diff)
downloadpfsense-packages-0cb2cf75ad9fa5ad9ddbe6f3b0773b1e13e95bbb.tar.gz
pfsense-packages-0cb2cf75ad9fa5ad9ddbe6f3b0773b1e13e95bbb.tar.bz2
pfsense-packages-0cb2cf75ad9fa5ad9ddbe6f3b0773b1e13e95bbb.zip
snort, update loopback whitelist code
Diffstat (limited to 'config/snort')
-rw-r--r--config/snort/snort.inc10
1 files changed, 6 insertions, 4 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index a41b415c..dbad74e8 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -127,10 +127,12 @@ global $config, $g;
}
/* Add loopback to whitelist (ftphelper) */
- if($userwips == 'no') {
- $home_net .= "127.0.0.1";
- }else{
+ if($userwips > -1 && $build_netlist == 'netlist') {
+ $home_net .= "127.0.0.1 ";
+ }elseif ($userwips > -1 && $build_netlist == 'whitelist') {
$home_net .= "127.0.0.1 ";
+ }else{
+ $home_net .= "127.0.0.1";
}
/* grab a list of vpns and whitelist if user desires added by nestorfish 954 */
@@ -160,7 +162,7 @@ global $config, $g;
}
/* this foe whitelistfile, convert spaces to carriage returns */
- $whitelist_home_net = str_replace(" ", " ", $home_net);
+ $whitelist_home_net = str_replace(" ", "\n", $home_net);
$whitelist_home_net = str_replace(" ", "\n", $home_net);
/* this is for snort.conf */