diff --git a/docker/routlin-dash/app/pages/radius/action.py b/docker/routlin-dash/app/pages/radius/action.py index c67a4db..2404c88 100644 --- a/docker/routlin-dash/app/pages/radius/action.py +++ b/docker/routlin-dash/app/pages/radius/action.py @@ -88,10 +88,7 @@ def auth_mode_save(): after['inner_protocol'] = inner_protocol else: after.pop('inner_protocol', None) - if eap_protocol == 'eap_ttls': - after['include_length'] = include_length - else: - after.pop('include_length', None) + after['include_length'] = include_length else: after.pop('eap_protocol', None) after.pop('tunneled_reply', None) diff --git a/docker/routlin-dash/app/pages/radius/content.json b/docker/routlin-dash/app/pages/radius/content.json index 13181dc..10ab78e 100644 --- a/docker/routlin-dash/app/pages/radius/content.json +++ b/docker/routlin-dash/app/pages/radius/content.json @@ -268,14 +268,6 @@ "value": "%RADIUS_TUNNELED_REPLY%", "hint": "Copies VLAN and authorization attributes from the inner EAP exchange to the outer RADIUS Access-Accept. Required by some switches for VLAN assignment to work correctly." }, - { - "type": "raw_html", - "html": "" - }, - { - "type": "raw_html", - "html": "
" - }, { "type": "field", "label": "", diff --git a/routlin/mod_radius.py b/routlin/mod_radius.py index ed464a0..bf5d195 100644 --- a/routlin/mod_radius.py +++ b/routlin/mod_radius.py @@ -295,9 +295,10 @@ def set_freeradius_eap(data): inner_block = 'peap' if eap_protocol == 'eap_peap' else 'ttls' content4 = _patch_setting_in_block(content4, inner_block, 'default_eap_type', inner_protocol) - if eap_protocol == 'eap_ttls': - il_val = 'yes' if opts.get('include_length', False) else 'no' - content4 = _patch_setting_in_block(content4, 'ttls', 'include_length', il_val) + if eap_protocol in ('eap_peap', 'eap_ttls'): + il_val = 'yes' if opts.get('include_length', False) else 'no' + inner_blk = 'peap' if eap_protocol == 'eap_peap' else 'ttls' + content4 = _patch_setting_in_block(content4, inner_blk, 'include_length', il_val) if content4 == content: return False