diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-01-13 19:53:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-13 19:53:37 +0100 |
| commit | 99d0c7a804ea3cf7f843f0d4810e6772cf7ceeb8 (patch) | |
| tree | 65b452e14327a50178d79db67519d3cde96a03c5 /data | |
| parent | e8581721313143c44bd0b19ac5c64b6499f1f605 (diff) | |
| parent | 21b2541d98b02602dc2301e57c2ca7efddbc6cff (diff) | |
| download | vyos-1x-99d0c7a804ea3cf7f843f0d4810e6772cf7ceeb8.tar.gz vyos-1x-99d0c7a804ea3cf7f843f0d4810e6772cf7ceeb8.zip | |
Merge pull request #4299 from c-po/radius-smoketest
T7038: T7039: fix broken RADIUS IPv6 source address and add smoketests
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/login/pam_radius_auth.conf.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/login/pam_radius_auth.conf.j2 b/data/templates/login/pam_radius_auth.conf.j2 index 75437ca71..f9b8d5e87 100644 --- a/data/templates/login/pam_radius_auth.conf.j2 +++ b/data/templates/login/pam_radius_auth.conf.j2 @@ -9,7 +9,7 @@ {% if address | is_ipv4 %} {% set source_address.ipv4 = address %} {% elif address | is_ipv6 %} -{% set source_address.ipv6 = "[" + address + "]" %} +{% set source_address.ipv6 = address %} {% endif %} {% endfor %} {% endif %} @@ -21,7 +21,7 @@ {% 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 }} {% else %} -[{{ server }}]:{{ options.port }} {{ "%-25s" | format(options.key) }} {{ "%-10s" | format(options.timeout) }} {{ source_address.ipv6 if source_address.ipv6 is vyos_defined }} +{{ server | bracketize_ipv6 }}:{{ options.port }} {{ "%-25s" | format(options.key) }} {{ "%-10s" | format(options.timeout) }} {{ source_address.ipv6 if source_address.ipv6 is vyos_defined }} {% endif %} {% endfor %} {% endif %} |