summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-06-06 10:36:45 -0400
committerjim-p <jimp@pfsense.org>2011-06-06 10:37:08 -0400
commita9c489c7ab68e9c853b37a3f132fbc2c53363bbb (patch)
treee5a07a38974326380b1bae751bc9e9039aafe17a
parent7d6be855ce80a6dcf0cd984f14386aae1b876edb (diff)
downloadpfsense-a9c489c7ab68e9c853b37a3f132fbc2c53363bbb.zip
pfsense-a9c489c7ab68e9c853b37a3f132fbc2c53363bbb.tar.gz
Fix pppoe server user rule generation. Fixes #1577
-rw-r--r--etc/inc/filter.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 0988093..9b0c0be 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -1751,6 +1751,11 @@ function filter_generate_user_rule($rule) {
} else if(!array_key_exists($rule['interface'], $FilterIflist)) {
foreach($FilterIflist as $oc) $item .= $oc['descr'];
return "# {$item} {$rule['interface']} array key does not exist for " . $rule['descr'];
+ } else if((array_key_exists($rule['interface'], $FilterIflist))
+ && (is_array($FilterIflist[$rule['interface']]))
+ && (is_array($FilterIflist[$rule['interface']][0]))) {
+ /* Currently this only case for this is the pppoe server. There should be an existing macro with this name. */
+ $aline['interface'] = " on \$" . $rule['interface'] . " ";
} else
$aline['interface'] = " on \$" . $FilterIflist[$rule['interface']]['descr'] . " ";
$ifcfg = $FilterIflist[$rule['interface']];
OpenPOWER on IntegriCloud