From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 30 Aug 2023 00:50:11 +0000 (-0400)
Subject: %{} vs %() is a dice roll
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecccaa4068c31fa2389409a0d9805463e1ab3bd2;p=thirdparty%2Ffreeradius-server.git

%{} vs %() is a dice roll
---

diff --git a/doc/antora/modules/installation/pages/upgrade.adoc b/doc/antora/modules/installation/pages/upgrade.adoc
index 491d038fd7c..15d5e68b1ce 100644
--- a/doc/antora/modules/installation/pages/upgrade.adoc
+++ b/doc/antora/modules/installation/pages/upgrade.adoc
@@ -1033,8 +1033,8 @@ result in an error.
 
 Many "virtual" or "fake" attributes have been removed or renamed.
 
-`&Module-Return-Code` should be replaced by `%{interpreter:rcode}`.
+`&Module-Return-Code` should be replaced by `%(interpreter:rcode)`.
 
 `&Response-Packet-Type` should be replaced by `&reply.Packet-Type`.
 
-`&Virtual-Server` should be replaced by `%{interpreter:server}`.
+`&Virtual-Server` should be replaced by `%(interpreter:server)`.
diff --git a/doc/antora/modules/raddb/pages/mods-available/eap.adoc b/doc/antora/modules/raddb/pages/mods-available/eap.adoc
index 69f7c135095..6ac5e1e4c26 100644
--- a/doc/antora/modules/raddb/pages/mods-available/eap.adoc
+++ b/doc/antora/modules/raddb/pages/mods-available/eap.adoc
@@ -1342,7 +1342,7 @@ eap {
 		}
 		session {
 #			mode = auto
-#			name = "%{EAP-Type}%{interpreter:server}"
+#			name = "%{EAP-Type}%(interpreter:server)"
 #			lifetime = 86400
 #			require_extended_master_secret = yes
 #			require_perfect_forward_secrecy = no
diff --git a/doc/antora/modules/reference/pages/xlat/builtin.adoc b/doc/antora/modules/reference/pages/xlat/builtin.adoc
index df74e197bb2..e10748666a3 100644
--- a/doc/antora/modules/reference/pages/xlat/builtin.adoc
+++ b/doc/antora/modules/reference/pages/xlat/builtin.adoc
@@ -249,7 +249,7 @@ It returns the raw encoded data
 == Interpreter State
 
 The state of the interpreter can be queried via the
-`%{interpeter:<name>}` expansion.  The individual expansions are
+`%(interpeter:<name>)` expansion.  The individual expansions are
 documented below.
 
 Each expansion given here can be prefixed with one or more dot (`.`)
@@ -257,21 +257,21 @@ characters.  These dots allow the expansion to refer to the current
 request via a `name`, or the parent request via `.name`.  If there is
 no parent, the expansion returns the string `<underflow>`.
 
-=== %{interpeter:module}
+=== %(interpeter:module)
 
 The current module being executed.  If the expansions is done in an
 `unlang` statement and outside of any module, it returns the name of
 the previous module which was executed.
 
-=== %{interpeter:processing_stage}
+=== %(interpeter:processing_stage)
 
 Which section of a virtual server is processing the request.
 
-=== %{interpeter:rcode}
+=== %(interpeter:rcode)
 
 The current interpreter return code, e.g. `handle`, or `ok`, etc.
 
-=== %{interpeter:server}
+=== %(interpeter:server)
 
 The name of the virtual server which is running the request.
 
diff --git a/raddb/mods-available/eap b/raddb/mods-available/eap
index ce5814877fd..ba26d9dd657 100644
--- a/raddb/mods-available/eap
+++ b/raddb/mods-available/eap
@@ -783,7 +783,7 @@ eap {
 			#  NOTE: OpenSSL only allows 32 bytes of session ctx, so
 			#  the value provided here is digested with SHA256.
 			#
-#			name = "%{EAP-Type}%{interpreter:server}"
+#			name = "%{EAP-Type}%(interpreter:server)"
 
 			#
 			#  lifetime::
diff --git a/src/lib/tls/conf.c b/src/lib/tls/conf.c
index 876632d53a9..9378923d08a 100644
--- a/src/lib/tls/conf.c
+++ b/src/lib/tls/conf.c
@@ -89,7 +89,7 @@ static CONF_PARSER tls_cache_config[] = {
 			 },
 			 .dflt = "auto" },
 	{ FR_CONF_OFFSET("name", FR_TYPE_TMPL, fr_tls_cache_conf_t, id_name),
-			 .dflt = "%{EAP-Type}%{interpreter:server}", .quote = T_DOUBLE_QUOTED_STRING },
+			 .dflt = "%{EAP-Type}%(interpreter:server)", .quote = T_DOUBLE_QUOTED_STRING },
 	{ FR_CONF_OFFSET("lifetime", FR_TYPE_TIME_DELTA, fr_tls_cache_conf_t, lifetime), .dflt = "1d" },
 
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L