Remove the macfilter check so that radius mac authentication on local subnet can...

git-svn-id: https://svn.m0n0.ch/wall/trunk@44 e36fee2c-cc09-0410-a7cc-ebac5c6737de

diff --git a/captiveportal/index.php b/captiveportal/index.php
index 805efb2ce186684c04640241ca99f54635686212..fc5efc549c8d0675d39d804ff5f1f541805d64d0 100644 (file)
--- a/captiveportal/index.php
+++ b/captiveportal/index.php
@@ -73,7 +73,7 @@ $macfilter = !isset($config['captiveportal']['nomacfilter']);
 
 if (file_exists("{$g['vardb_path']}/captiveportal_radius.db")) {
        $radius_enable = TRUE;
-       if ($radius_enable && $macfilter && isset($config['captiveportal']['radmac_enable']))
+       if ($radius_enable && isset($config['captiveportal']['radmac_enable']))
                $radmac_enable = TRUE;
 }
 
@@ -103,7 +103,8 @@ setTimeout('window.close();',5000) ;
 </HTML>
 
 EOD;
-} else if ($clientmac && $macfilter && portal_mac_fixed($clientmac)) {
+/* The $macfilter can be removed safely since we first check if the $clientmac is present, if not we fail */
+} else if ($clientmac && portal_mac_fixed($clientmac)) {
        /* punch hole in ipfw for pass thru mac addresses */
        portal_allow($clientip, $clientmac, "unauthenticated");
        exit;