diff options
| author | bcyrill <cyrill@bannwart.info> | 2012-06-09 22:33:24 +0200 |
|---|---|---|
| committer | bcyrill <cyrill@bannwart.info> | 2012-06-09 22:33:24 +0200 |
| commit | 54df925b9ea447bdd10f88a886e2ef11d44c3059 (patch) | |
| tree | f844373c0c3488b6c405e342e67e16aa7c0b26a7 /etc | |
| parent | 52a43b2fa3c018b145de759af4da823fcb6260fc (diff) | |
| download | pfsense-54df925b9ea447bdd10f88a886e2ef11d44c3059.zip pfsense-54df925b9ea447bdd10f88a886e2ef11d44c3059.tar.gz | |
Make mac_format aware of multiple Captiveportal instances
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 2 | ||||
| -rw-r--r-- | etc/inc/util.inc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 4953f23..33aa135 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1660,7 +1660,7 @@ function portal_mac_radius($clientmac,$clientip) { $radmac_secret = $config['captiveportal'][$cpzone]['radmac_secret']; /* authentication against the radius server */ - $username = mac_format($clientmac); + $username = mac_format($clientmac, $cpzone); $auth_list = radius($username,$radmac_secret,$clientip,$clientmac,"MACHINE LOGIN"); if ($auth_list['auth_val'] == 2) return TRUE; diff --git a/etc/inc/util.inc b/etc/inc/util.inc index 6146d7c..88cce91 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -1205,11 +1205,12 @@ function xml_safe_fieldname($fieldname) { return strtolower(str_replace($replace, "", $fieldname)); } -function mac_format($clientmac) { +function mac_format($clientmac, $zone = false) { global $config; $mac = explode(":", $clientmac); - $mac_format = $config['captiveportal']['radmac_format'] ? $config['captiveportal']['radmac_format'] : false; + if ($zone) + $mac_format = $zone ? $config['captiveportal'][$zone]['radmac_format'] : false; switch($mac_format) { case 'singledash': |
