diff options
| author | Ermal <eri@pfsense.org> | 2012-02-07 20:26:19 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2012-02-07 20:26:19 +0000 |
| commit | 2890cae51a424519662922e558bc939077b66c7c (patch) | |
| tree | 1477c804bec4a52292c6c096513ad4073b5952ac /etc/inc | |
| parent | 843a6fe25ac303ceda46450a3f4ac24f69a54ecb (diff) | |
| download | pfsense-2890cae51a424519662922e558bc939077b66c7c.zip pfsense-2890cae51a424519662922e558bc939077b66c7c.tar.gz | |
Fixes #2082. Actually just correct the log to display the correct information
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index beba487..8301fb2 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1742,8 +1742,11 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut if (empty($cpentry[10])) $cpentry[10] = 'first'; /* on the same ip */ - 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"); + if ($cpentry[2] == $clientip) { + if (isset($config['captiveportal']['nomacfilter']) || $cpentry[3] == $clientmac) + captiveportal_logportalauth($cpentry[4],$cpentry[3],$cpentry[2],"CONCURRENT LOGIN - REUSING OLD SESSION"); + else + captiveportal_logportalauth($cpentry[4],$cpentry[3],$cpentry[2],"CONCURRENT LOGIN - REUSING IP {$cpentry[2]} WITH DIFFERENT MAC ADDRESS {$cpentry[3]}"); $sessionid = $sid; break; } |
