summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-05-27 11:56:54 -0400
committerjim-p <jimp@pfsense.org>2011-05-27 12:02:21 -0400
commit685c977602be47c6b80204953d398171ca7cb0b9 (patch)
tree6e1edd67bd72e391c701dc9bf4c1bbdedf485ba3 /etc
parenta1b86994a0b2895d0d81fb12f680639bfc1d9b42 (diff)
downloadpfsense-685c977602be47c6b80204953d398171ca7cb0b9.zip
pfsense-685c977602be47c6b80204953d398171ca7cb0b9.tar.gz
Some extra protection against putting empty values into the ruleset.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/filter.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 3ce44a3..47a3bad 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -429,7 +429,7 @@ function filter_generate_scrubing() {
}
/* disable scrub option */
foreach ($FilterIflist as $scrubif => $scrubcfg) {
- if(isset($scrubcfg['virtual']))
+ if(isset($scrubcfg['virtual']) || empty($scrubcfg['descr']))
continue;
/* set up MSS clamping */
if($scrubcfg['mss'] <> "" && is_numeric($scrubcfg['mss']) && $scrubcfg['if'] != "pppoe" && $scrubcfg['if'] != "pptp" &&
@@ -518,7 +518,7 @@ function filter_generate_aliases() {
$aliases .= "{$ifcfg[0]['descr']} = \"{ {$ifcfg[0]['if']}";
$aliases .= " }\"\n";
}
- } else {
+ } elseif (!empty($ifcfg['descr']) && !empty($ifcfg['if'])) {
$aliases .= "{$ifcfg['descr']} = \"{ {$ifcfg['if']}";
$aliases .= " }\"\n";
}
OpenPOWER on IntegriCloud