From 149668963e5a63dfaafd44231a1853dda0991341 Mon Sep 17 00:00:00 2001 From: Augustin-FL Date: Sat, 6 Oct 2018 09:10:15 +0200 Subject: Include zone name in Nas-Identifier (cherry picked from commit df99d3bf44dc0a254be305a25b8459f4cc5fe9a9) --- src/etc/inc/captiveportal.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/etc') diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc index 6098d5b..1e6333c 100644 --- a/src/etc/inc/captiveportal.inc +++ b/src/etc/inc/captiveportal.inc @@ -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); -- cgit v1.1