From 9a064646903bd77e39818a4aceb75cdc7b2a371a Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sat, 3 Mar 2007 19:51:05 +0000
Subject: Restore PPPoE and WPA access through captive portal that was lost in
 last m0n0 sync.

---
 etc/inc/captiveportal.inc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'etc/inc/captiveportal.inc')

diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index 9b1b94d..7493b6d 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -360,7 +360,6 @@ add 1305 set 1 pass tcp from $cpip 8001 to any out
 EOD;
 	}
 
-    if (isset($config['captiveportal']['pppoeaccess'])) {
         $cprules .= <<<EOD
 #PPPoE Discovery Stage
 add 1100 set 1 pass layer2 mac-type 0x8863
@@ -368,15 +367,13 @@ add 1100 set 1 pass layer2 mac-type 0x8863
 add 1100 set 1 pass layer2 mac-type 0x8864
 
 EOD;
-    }
 
-    if (isset($config['captiveportal']['wpaaccess'])) {
         $cprules .= <<<EOD
 # Allow WPA
 add 1100 set 1 pass layer2 mac-type 0x888e
 
 EOD;
-    }
+
 
     $cprules .= <<<EOD
 
-- 
cgit v1.1