Somehow moving the user filter code to it's own function broke opt interfaces - fix

1 files changed, 9 insertions, 6 deletions

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 6b1899d..40645bb 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -968,7 +968,7 @@ function run_command_return_string($cmd) {
 	return $tmp;
 }
 
-function generate_user_filter_rule($rule, $optcfg) {
+function generate_user_filter_rule(& $rule,& $optcfg) {
 
 		/* don't include disabled rules */
 		if (isset($rule['disabled'])) {
@@ -986,11 +986,14 @@ function generate_user_filter_rule($rule, $optcfg) {
 			$ispptp = true;
 		} else {
 
-			if (strstr($rule['interface'], "opt")) {
-				if (!array_key_exists($rule['interface'], $optcfg)) {
-					return;
-				}
-			}
+/* XXX - billm - what is the intent of this code?  It seems to be stopping us from applying rules to opt interfaces */
+/*
+ *			if (strstr($rule['interface'], "opt")) {
+ *				if (!array_key_exists($rule['interface'], $optcfg)) {
+ *					return;
+ *				}
+ *			}
+ */
 
 			$nif = 1;
 			$ispptp = false;