summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfSense.org>2010-01-03 16:09:28 -0500
committerScott Ullrich <sullrich@pfSense.org>2010-01-03 16:09:28 -0500
commit3ab81f02ab19030089116d7d4ecb1ab0c040b197 (patch)
tree170ce4d059d00216d7624167503e6479eb79626f
parent7432ce7b8d9d90a0b7ad3910c34e3b50d76c4440 (diff)
downloadpfsense-3ab81f02ab19030089116d7d4ecb1ab0c040b197.zip
pfsense-3ab81f02ab19030089116d7d4ecb1ab0c040b197.tar.gz
Merge 2bf552a41ca9fde6c71ba3aad9da794785246852 from RagnaBaby-clone
-rw-r--r--etc/inc/filter.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 03bf427..d58d259 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -2254,7 +2254,8 @@ function filter_process_carp_nat_rules() {
echo "filter_process_carp_nat_rules() being called $mt\n";
}
$lines = "";
- if(is_array($config['installedpackages']['carp']['config'])) {
+ if(isset($config['installedpackages']['carp']['config']) &&
+ is_array($config['installedpackages']['carp']['config'])) {
foreach($config['installedpackages']['carp']['config'] as $carp) {
$ip = $carp['ipaddress'];
if($ip <> "any") {
@@ -2281,8 +2282,9 @@ function filter_process_carp_rules() {
}
$lines = "";
/* return if there are no carp configured items */
- if($config['installedpackages']['carpsettings']['config'] <> "" or
- $config['virtualip']['vip'] <> "") {
+ if(isset($config['installedpackages']['carp']['config']) &&
+ $config['installedpackages']['carpsettings']['config'] <> "" or
+ $config['virtualip']['vip'] <> "") {
$lines .= "pass quick proto carp\n";
$lines .= "pass quick proto pfsync\n";
}
OpenPOWER on IntegriCloud