summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-09-07 09:04:54 +0200
committerGitHub <noreply@github.com>2022-09-07 09:04:54 +0200
commitf947cf1f15d2986a64b4b75fcc2a1637613e9f7f (patch)
tree6e46ef54c7e65c5f0283f82bd6463a853c9fe672
parent038ae3c95e060ab3c698e1a2c178762c429eb21d (diff)
parent4f2dcc9362ee8fae8e57a168a987a5db36b77a68 (diff)
downloadvyos-1x-f947cf1f15d2986a64b4b75fcc2a1637613e9f7f.tar.gz
vyos-1x-f947cf1f15d2986a64b4b75fcc2a1637613e9f7f.zip
Merge pull request #1523 from bmhughes/fix-radius-disable
radius: T4672: Fix RADIUS server disable template logic
-rw-r--r--data/templates/login/pam_radius_auth.conf.j23
1 files changed, 1 insertions, 2 deletions
diff --git a/data/templates/login/pam_radius_auth.conf.j2 b/data/templates/login/pam_radius_auth.conf.j2
index 1105b60e5..c61154753 100644
--- a/data/templates/login/pam_radius_auth.conf.j2
+++ b/data/templates/login/pam_radius_auth.conf.j2
@@ -16,7 +16,7 @@
{% if radius.server is vyos_defined %}
# server[:port] shared_secret timeout source_ip
{# .items() returns a tuple of two elements: key and value. 1 relates to the 2nd element i.e. the value and .priority relates to the key from the internal dict #}
-{% for server, options in radius.server.items() | sort(attribute='1.priority') if not options.disabled %}
+{% for server, options in radius.server.items() | sort(attribute='1.priority') if not 'disable' in options %}
{# RADIUS IPv6 servers must be specified in [] notation #}
{% if server | is_ipv4 %}
{{ server }}:{{ options.port }} {{ "%-25s" | format(options.key) }} {{ "%-10s" | format(options.timeout) }} {{ source_address.ipv4 if source_address.ipv4 is vyos_defined }}
@@ -33,4 +33,3 @@ mapped_priv_user radius_priv_user
vrf-name {{ radius.vrf }}
{% endif %}
{% endif %}
-