From: jdegraeve <jdegraeve@e36fee2c-cc09-0410-a7cc-ebac5c6737de>
Date: Tue, 24 Jan 2006 15:36:00 +0000 (+0000)
Subject: Remove the macfilter check so that radius mac authentication on local subnet can... 
X-Git-Url: https://git.gsnw.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0ee9cac4fc72c63f9171896c3ec61468e499cc5;p=m0n0chwall.git

Remove the macfilter check so that radius mac authentication on local subnet can be used in combination with clients after routers/nat

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 805efb2..fc5efc5 100644
--- 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;