summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-04-11 16:34:11 -0400
committerjim-p <jimp@pfsense.org>2013-04-11 16:35:56 -0400
commit4b3a2e1471981251213316b097459b74f9da220c (patch)
tree9225f5eb5d20d4e4bdf91eca3966091bd6351545 /etc
parent5dc0c7b1de8c55ed0faaca4a84e843cc01994683 (diff)
downloadpfsense-4b3a2e1471981251213316b097459b74f9da220c.zip
pfsense-4b3a2e1471981251213316b097459b74f9da220c.tar.gz
Also ignore 'none' here on the backend to avoid letting previously broken rules mess up the rest of 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 b803abe..6f93823 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -2250,9 +2250,9 @@ function filter_generate_user_rule($rule) {
$aline['tagged'] = " tagged " .$rule['tagged'] . " ";
if (!empty($rule['dscp']))
$aline['dscp'] = " dscp " . $rule['dscp'] . " ";
- if (!empty($rule['vlanprio']))
+ if (!empty($rule['vlanprio']) && ($rule['vlanprio'] != "none"))
$aline['vlanprio'] = " ieee8021q-pcp " . $rule['vlanprio'] . " ";
- if (!empty($rule['vlanprioset']))
+ if (!empty($rule['vlanprioset']) && ($rule['vlanprioset'] != "none"))
$aline['vlanprioset'] = " ieee8021q-setpcp " . $rule['vlanprioset'] . " ";
if ($type == "pass") {
if (isset($rule['allowopts']))
OpenPOWER on IntegriCloud