mirror of
https://github.com/pfsense/pfsense.git
synced 2025-10-26 11:38:35 +00:00
Merge pull request #3997 from Augustin-FL/patch-cp-2
This commit is contained in:
commit
4b2edd698e
@ -1606,7 +1606,7 @@ function captiveportal_authenticate_user(&$login = '', &$password = '', $clientm
|
||||
foreach ($auth_servers as $authcfg) {
|
||||
if ($authlevel < 3) {
|
||||
$radmac_error = false;
|
||||
$attributes = array("nas_identifier" => "CaptivePortal",
|
||||
$attributes = array("nas_identifier" => "CaptivePortal-{$cpzone}",
|
||||
"nas_port_type" => RADIUS_ETHERNET,
|
||||
"nas_port" => $pipeno,
|
||||
"framed_ip" => $clientip);
|
||||
@ -2683,7 +2683,7 @@ function captiveportal_send_server_accounting($type = 'on', $ruleno = null, $use
|
||||
}
|
||||
$nasmac = get_interface_mac(find_ip_interface($nasip));
|
||||
$racct->putAttribute(RADIUS_NAS_IP_ADDRESS, $nasip, "addr");
|
||||
$racct->putAttribute(RADIUS_NAS_IDENTIFIER, 'CaptivePortal');
|
||||
$racct->putAttribute(RADIUS_NAS_IDENTIFIER, "CaptivePortal-{$cpzone}");
|
||||
|
||||
if (is_int($ruleno)) {
|
||||
$racct->putAttribute(RADIUS_NAS_PORT_TYPE, RADIUS_ETHERNET);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user