aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorrobiscool <robrob2626@yahoo.com>2010-04-23 16:00:45 -0700
committerrobiscool <robrob2626@yahoo.com>2010-04-23 16:00:45 -0700
commit76325b2dd6d70e563b041789cc24d543f3100c58 (patch)
tree51b586378696aebebef09ad4940e27e2d6905cb9 /config
parent12f961fe43e9555ae7097ca193be8255045dd228 (diff)
downloadpfsense-packages-76325b2dd6d70e563b041789cc24d543f3100c58.tar.gz
pfsense-packages-76325b2dd6d70e563b041789cc24d543f3100c58.tar.bz2
pfsense-packages-76325b2dd6d70e563b041789cc24d543f3100c58.zip
snort, add code for empty vars snort.inc
Diffstat (limited to 'config')
-rw-r--r--config/snort/snort.inc15
1 files changed, 10 insertions, 5 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index 892370e9..a41b415c 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -117,9 +117,6 @@ global $config, $g;
$home_net .= "{$dns} ";
}
}
-
- /* Add loopback to whitelist (ftphelper) */
- $home_net .= "127.0.0.1";
if($vips == 'yes') {
/* iterate all vips and add to whitelist */
@@ -129,6 +126,13 @@ global $config, $g;
$home_net .= $vip['subnet'] . " ";
}
+ /* Add loopback to whitelist (ftphelper) */
+ if($userwips == 'no') {
+ $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 */
if($vpns == 'yes')
{
@@ -141,8 +145,9 @@ global $config, $g;
{
$vpns_list = filter_get_vpns_list();
}
-
- $home_net .= "$vpns_list ";
+ if ($vpns_list != '') {
+ $home_net .= "$vpns_list ";
+ }
}
/* never ever compair numbers to words */