diff options
| author | Ermal <eri@pfsense.org> | 2012-02-07 20:19:27 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2012-02-07 20:19:27 +0000 |
| commit | 843a6fe25ac303ceda46450a3f4ac24f69a54ecb (patch) | |
| tree | 053ecdc93878b05bcdfdb508f29ee24a21e56028 /etc/inc | |
| parent | 5c0d5003b32b3cd5b0e83804e150eb499bebca01 (diff) | |
| download | pfsense-843a6fe25ac303ceda46450a3f4ac24f69a54ecb.zip pfsense-843a6fe25ac303ceda46450a3f4ac24f69a54ecb.tar.gz | |
Fixes #2082. Correct checking of existing session to take into consideration when possible/needed the mac address
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 971dbac..beba487 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1742,7 +1742,7 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut if (empty($cpentry[10])) $cpentry[10] = 'first'; /* on the same ip */ - if($cpentry[2] == $clientip) { + if ($cpentry[2] == $clientip && (isset($config['captiveportal'][$cpzone]['nomacfilter']) || empty($cpentry[3]) || $cpentry[3] == $clientmac)) { captiveportal_logportalauth($cpentry[4],$cpentry[3],$cpentry[2],"CONCURRENT LOGIN - REUSING OLD SESSION"); $sessionid = $sid; break; |
