aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbmeeks8 <bmeeks8@bellsouth.net>2014-08-29 01:24:51 -0400
committerbmeeks8 <bmeeks8@bellsouth.net>2014-08-29 01:24:51 -0400
commita23e600747047c0b94e0680141562f51d1f13f1f (patch)
tree7a84fa29c13d8dca2618a2b4c19800ab3402df0b
parent31359294a2566f2717b7431d393e92b900017476 (diff)
downloadpfsense-packages-a23e600747047c0b94e0680141562f51d1f13f1f.tar.gz
pfsense-packages-a23e600747047c0b94e0680141562f51d1f13f1f.tar.bz2
pfsense-packages-a23e600747047c0b94e0680141562f51d1f13f1f.zip
Revert $EXTERNAL_NET back to !$HOME_NET for now.
-rw-r--r--config/suricata/suricata.inc2
-rw-r--r--config/suricata/suricata_generate_yaml.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/suricata/suricata.inc b/config/suricata/suricata.inc
index 5a490f01..14b9ecd4 100644
--- a/config/suricata/suricata.inc
+++ b/config/suricata/suricata.inc
@@ -271,7 +271,7 @@ function suricata_build_list($suricatacfg, $listname = "", $passlist = false, $e
$localnet = 'yes'; $wanip = 'yes'; $wangw = 'yes'; $wandns = 'yes'; $vips = 'yes'; $vpns = 'yes';
}
elseif ($externallist && $listname == 'default') {
- return array( "any" );
+ return array( "!\$HOME_NET" );
}
else {
$list = suricata_find_list($listname);
diff --git a/config/suricata/suricata_generate_yaml.php b/config/suricata/suricata_generate_yaml.php
index 05d6dea8..7c0a7bdd 100644
--- a/config/suricata/suricata_generate_yaml.php
+++ b/config/suricata/suricata_generate_yaml.php
@@ -68,7 +68,7 @@ foreach ($suricata_files as $file) {
$home_net_list = suricata_build_list($suricatacfg, $suricatacfg['homelistname']);
$home_net = implode(",", $home_net_list);
$home_net = trim($home_net);
-$external_net = 'any';
+$external_net = '!$HOME_NET';
if (!empty($suricatacfg['externallistname']) && $suricatacfg['externallistname'] != 'default') {
$external_net_list = suricata_build_list($suricatacfg, $suricatacfg['externallistname'], false, true);
$external_net = implode(",", $external_net_list);