s/session-state:/session-state./

diff --git a/doc/antora/modules/installation/pages/upgrade.adoc b/doc/antora/modules/installation/pages/upgrade.adoc
index ba29cd647ccc9d2d21a1dbfb6f65e33768c7b9ea..3feabb9bfaae2cc06e48efc10bc66d4b1f0872b8 100644 (file)
--- a/doc/antora/modules/installation/pages/upgrade.adoc
+++ b/doc/antora/modules/installation/pages/upgrade.adoc
@@ -515,7 +515,7 @@ call to a cache module instance. Both default to `yes`.
 
 === rlm_eap
 
-All certificate attributes are available in the `&session-state:`
+All certificate attributes are available in the `&session-state.`
 list, immediately after they are parsed from their ASN1 form.
 
 The certificates are no longer added to the `&request.` list. Instead,
@@ -523,7 +523,7 @@ they are added to the `session-state` list.  You are advised to update
 any references during the upgrade to 4.0:
 
 ```
-s/TLS-Cert-/session-state:TLS-Cert-/
+s/TLS-Cert-/session-state.TLS-Cert-/
 ```
 
 The `rlm_eap_ikev2` module was removed. It does not follow RFC 5106,

diff --git a/doc/antora/modules/raddb/pages/mods-available/cache_tls.adoc b/doc/antora/modules/raddb/pages/mods-available/cache_tls.adoc
index 87600ef846271110aa5ec29590979616f61ac2fb..20c2786e02257b79f9b74717bff3262989ee131e 100644 (file)
--- a/doc/antora/modules/raddb/pages/mods-available/cache_tls.adoc
+++ b/doc/antora/modules/raddb/pages/mods-available/cache_tls.adoc
@@ -84,13 +84,13 @@ cache cache_tls_session {
        key = &Session-Id
        ttl = 3600      # 60 mins
        update {
-               &session-state:Session-Data := &session-state:Session-Data
+               &session-state.Session-Data := &session-state.Session-Data
 #              &session-state: += &session-state:
        }
 }
 cache cache_ocsp {
        driver = "rlm_cache_rbtree"
-       key = &session-state:TLS-Client-Cert-Serial
+       key = &session-state.TLS-Client-Cert-Serial
        update {
                &control.TLS-OCSP-Cert-Valid := &TLS-OCSP-Cert-Valid
                &control.TLS-OCSP-Response := &TLS-OCSP-Response

diff --git a/doc/antora/modules/raddb/pages/mods-available/eap.adoc b/doc/antora/modules/raddb/pages/mods-available/eap.adoc
index 882e476acbed16f78694198fecb6db25dcf27f08..313e42660efbfefc7247324d963083222ed2e6f7 100644 (file)
--- a/doc/antora/modules/raddb/pages/mods-available/eap.adoc
+++ b/doc/antora/modules/raddb/pages/mods-available/eap.adoc
@@ -508,7 +508,7 @@ how TLS cache now works.
 
 If using the default `tls-cache` virtual server and
 cache module config, policy attributes may be stored in the
-`&session-state:` list.
+`&session-state.` list.
 
 
 virtual_server::

diff --git a/doc/antora/modules/raddb/pages/sites-available/challenge.adoc b/doc/antora/modules/raddb/pages/sites-available/challenge.adoc
index 41b39c1e528c3b7fabecbb516c545698de809c8a..8880bd998b2b7d9a3ec30123dc22c8de69bd7886 100644 (file)
--- a/doc/antora/modules/raddb/pages/sites-available/challenge.adoc
+++ b/doc/antora/modules/raddb/pages/sites-available/challenge.adoc
@@ -57,7 +57,7 @@ recv Access-Request {
        else {
                update control {
                        Auth-Type := Step2
-                       Cleartext-Password := &session-state:Tmp-Integer-0
+                       Cleartext-Password := &session-state.Tmp-Integer-0
                }
        }
 }
@@ -67,7 +67,7 @@ authenticate step1 {
                Tmp-Integer-0 := "%{randstr:n}"
        }
        update reply {
-               Reply-Message := &session-state:Tmp-Integer-0
+               Reply-Message := &session-state.Tmp-Integer-0
        }
        challenge
 }

diff --git a/doc/antora/modules/raddb/pages/sites-available/eap-aka-sim.adoc b/doc/antora/modules/raddb/pages/sites-available/eap-aka-sim.adoc
index d7c4ebc90cbdb7e26ce9e0bb6b254d71797e82d0..0d2a81d4f1129cf616ea046eab2a4a9c0b516688 100644 (file)
--- a/doc/antora/modules/raddb/pages/sites-available/eap-aka-sim.adoc
+++ b/doc/antora/modules/raddb/pages/sites-available/eap-aka-sim.adoc
@@ -98,7 +98,7 @@ required.
 The following actions are associated with the various
 `Identity-Type` values:
 - `Permanent`::        The current `&Identity` value will be copied to
-       `&session-state:Permanent-Identity`.  The hint byte
+       `&session-state.Permanent-Identity`.  The hint byte
        will be stripped if the hint matches the current
        EAP-Method.  If the hint byte does not match
        the current EAP-Method the complete value of
@@ -555,7 +555,7 @@ You should restore the contents of the following attributes using
 
 NOTE: If you're using 3GPP style encrypted pseudonyms, you should
 decrypt the pseudonym here, and store the decrypted value in
-`&session-state:Permanent-Identity`.
+`&session-state.Permanent-Identity`.
 
 
 
@@ -574,11 +574,11 @@ If when sending a Reauthentication-Request a `&reply.Next-Reauth-Id`
 attribute is found, this section will be called.
 
 You should restore the contents of the following attributes using
-`&session-state:Session-ID` or `&reply.Next-Reauth-Id` as a key:
+`&session-state.Session-ID` or `&reply.Next-Reauth-Id` as a key:
 
-- `&session-state:Counter`::           How many times this session has
+- `&session-state.Counter`::           How many times this session has
                        been resumed.
-- `&session-state:Session-Data`::      The master session key.
+- `&session-state.Session-Data`::      The master session key.
 - `&session-State:Permanent-Identity`::(optionally) the permanent
                        identity of the user.
 
@@ -597,11 +597,11 @@ provide a unified session store.
 This section will be called prior to attempting re-authentication.
 
 You should restore the contents of the following attributes using
-`&session-state:Session-ID` or `&reply.Next-Reauth-Id` as a key:
+`&session-state.Session-ID` or `&reply.Next-Reauth-Id` as a key:
 
-- `&session-state:Counter`::           How many times this session has
+- `&session-state.Counter`::           How many times this session has
                        been resumed.
-- `&session-state:Session-Data`::      The master session key.
+- `&session-state.Session-Data`::      The master session key.
 - `&session-State:Permanent-Identity`::(optionally) the permanent
                        identity of the user.
 

diff --git a/doc/antora/modules/raddb/pages/sites-available/tacacs.adoc b/doc/antora/modules/raddb/pages/sites-available/tacacs.adoc
index d00764274a124b2f3d907c36a0fc768108073659..4dd33afa9747ea99a0c75220fa1d5b371bb6abbb 100644 (file)
--- a/doc/antora/modules/raddb/pages/sites-available/tacacs.adoc
+++ b/doc/antora/modules/raddb/pages/sites-available/tacacs.adoc
@@ -86,7 +86,7 @@ server tacacs {
        recv Authentication {
                if (&TACACS-Sequence-Number > 1) {
                        update request {
-                               TACACS-Authentication-Type = &session-state:TACACS-Authentication-Type
+                               TACACS-Authentication-Type = &session-state.TACACS-Authentication-Type
                        }
                }
                switch &TACACS-Authentication-Type {
@@ -97,8 +97,8 @@ server tacacs {
                                        }
                                } else {
                                        update request {
-                                               User-Name = &session-state:User-Name
-                                               User-Password = &session-state:User-Password
+                                               User-Name = &session-state.User-Name
+                                               User-Password = &session-state.User-Password
                                        }
                                }
                                if (!&User-Name) {
@@ -144,7 +144,7 @@ server tacacs {
                                        }
                                } else {
                                        update request {
-                                               User-Name = &session-state:User-Name
+                                               User-Name = &session-state.User-Name
                                        }
                                }
                                if (!&User-Password) {

diff --git a/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc b/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc
index a31cd69d5d88d6536ab2b08a5f663888150f6790..ea7a7873b07ba296b0ff819ce7c80ed6c33e2429 100644 (file)
--- a/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc
+++ b/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc
@@ -17,7 +17,7 @@ the following attributes are also created in the session-state list:
 This section is run whenever the server needs to read an
 entry from the TLS session cache.
 
-It should read the attribute &session-state:TLS-Session-Data
+It should read the attribute &session-state.TLS-Session-Data
 from the cache, along with any other attributes which
 were in the cache
 
@@ -31,7 +31,7 @@ and will just cause the server to emit a warning.
 This section is run whenever the server needs to write an
 entry to the TLS session cache.
 
-It should write the attribute &session-state:Session-Data
+It should write the attribute &session-state.Session-Data
 to the cache, along with any other attributes which
 need to be cached.
 

diff --git a/doc/antora/modules/unlang/pages/list.adoc b/doc/antora/modules/unlang/pages/list.adoc
index 3ece4ac90047173e064ca98a683135906220d5af..ef713bb175a9c1764b21a53a371c86def5435b5a 100644 (file)
--- a/doc/antora/modules/unlang/pages/list.adoc
+++ b/doc/antora/modules/unlang/pages/list.adoc
@@ -52,4 +52,4 @@ finishes, it is deleted, and is no longer accessible to the parent.
 .Examples
 `&parent.request.User-Name` +
 `&parent.reply.Reply-Message` +
-`&parent.parent.session-state:Filter-Id`
+`&parent.parent.session-state.Filter-Id`

diff --git a/raddb/mods-available/cache_tls b/raddb/mods-available/cache_tls
index c106809349400c0faa1b1d24472944e41c194d96..2d31ffe07912c655a57cc4644997511374f8ee68 100644 (file)
--- a/raddb/mods-available/cache_tls
+++ b/raddb/mods-available/cache_tls
@@ -54,7 +54,7 @@ cache cache_tls_session {
        #  update <section> { ... }::
        #
        update {
-               &session-state:Session-Data := &session-state:Session-Data
+               &session-state.Session-Data := &session-state.Session-Data
 
                #
                #  NOTE: If you want to store authorization attributes too, consider
@@ -85,7 +85,7 @@ cache cache_ocsp {
        #
        #  key:: `cache` key.
        #
-       key = &session-state:TLS-Client-Cert-Serial
+       key = &session-state.TLS-Client-Cert-Serial
 
        #
        #  update <section> { ... }::

diff --git a/raddb/mods-available/eap b/raddb/mods-available/eap
index f05ca7e020eb625add2667433803f088af7e804c..ed45a98d4afa0b699fb5254987d0dc4216897902 100644 (file)
--- a/raddb/mods-available/eap
+++ b/raddb/mods-available/eap
@@ -569,7 +569,7 @@ eap {
                #
                #  If using the default `tls-cache` virtual server and
                #  cache module config, policy attributes may be stored in the
-               #  `&session-state:` list.
+               #  `&session-state.` list.
                #
                cache {
                        #

diff --git a/raddb/policy.d/debug b/raddb/policy.d/debug
index eba6350945de450f8400278fc677eaad3b02f241..56fd964a44f2628d54326fa451cf42f2dceb285b 100644 (file)
--- a/raddb/policy.d/debug
+++ b/raddb/policy.d/debug
@@ -38,7 +38,7 @@ debug_reply {
 #  Outputs the contents of the session state list in debugging (-X) mode
 #
 debug_session_state {
-       if ("%{debug_attr:session-state:[*]}" == '') {
+       if ("%{debug_attr:session-state.[*]}" == '') {
                noop
        }
 }

diff --git a/raddb/policy.d/filter b/raddb/policy.d/filter
index 39327dc9d664d7f9b717ead8a2980de3b5253adb..f8443a4171c07a91ea4df13273bad460a0dea39d 100644 (file)
--- a/raddb/policy.d/filter
+++ b/raddb/policy.d/filter
@@ -18,16 +18,16 @@ deny_realms {
 filter_username {
        if (&State) {
                if (&User-Name) {
-                       if (!&session-state:Session-State-User-Name) {
+                       if (!&session-state.Session-State-User-Name) {
                                update request {
-                                       &Module-Failure-Message += 'No cached session-state:Session-State-User-Name'
+                                       &Module-Failure-Message += 'No cached session-state.Session-State-User-Name'
                                }
                                reject
                        }
 
-                       if (&User-Name != &session-state:Session-State-User-Name) {
+                       if (&User-Name != &session-state.Session-State-User-Name) {
                                update request {
-                                       &Module-Failure-Message += 'User-Name does not match cached session-state:Session-State-User-Name'
+                                       &Module-Failure-Message += 'User-Name does not match cached session-state.Session-State-User-Name'
                                }
                                reject
                        }

diff --git a/raddb/sites-available/challenge b/raddb/sites-available/challenge
index 67a8a18358a2a7eac2451d4a6f5e40d7eaa35f6e..37e2a5f4d2f1637e22c1e73e786039a9890f69f9 100644 (file)
--- a/raddb/sites-available/challenge
+++ b/raddb/sites-available/challenge
@@ -37,7 +37,7 @@ recv Access-Request {
                #
                update control {
                        Auth-Type := Step2
-                       Cleartext-Password := &session-state:Tmp-Integer-0
+                       Cleartext-Password := &session-state.Tmp-Integer-0
                }
        }
 }
@@ -55,7 +55,7 @@ authenticate step1 {
                Tmp-Integer-0 := "%{randstr:n}"
        }
        update reply {
-               Reply-Message := &session-state:Tmp-Integer-0
+               Reply-Message := &session-state.Tmp-Integer-0
        }
 
        #

diff --git a/raddb/sites-available/eap-aka-sim b/raddb/sites-available/eap-aka-sim
index 8b23a0f8f1550a348db1dd95466da4abfe7f147e..0a6d1ef48c8f80aca928f98719a5b26db21f3d24 100644 (file)
--- a/raddb/sites-available/eap-aka-sim
+++ b/raddb/sites-available/eap-aka-sim
@@ -109,7 +109,7 @@ server eap-aka-sim {
        #  The following actions are associated with the various
        #  `Identity-Type` values:
        #  - `Permanent`::      The current `&Identity` value will be copied to
-       #                       `&session-state:Permanent-Identity`.  The hint byte
+       #                       `&session-state.Permanent-Identity`.  The hint byte
        #                       will be stripped if the hint matches the current
        #                       EAP-Method.  If the hint byte does not match
        #                       the current EAP-Method the complete value of
@@ -623,7 +623,7 @@ server eap-aka-sim {
        #
        #  NOTE: If you're using 3GPP style encrypted pseudonyms, you should
        #  decrypt the pseudonym here, and store the decrypted value in
-       #  `&session-state:Permanent-Identity`.
+       #  `&session-state.Permanent-Identity`.
        #
        load pseudonym {
                ok
@@ -648,11 +648,11 @@ server eap-aka-sim {
        #  attribute is found, this section will be called.
        #
        #  You should restore the contents of the following attributes using
-       #  `&session-state:Session-ID` or `&reply.Next-Reauth-Id` as a key:
+       #  `&session-state.Session-ID` or `&reply.Next-Reauth-Id` as a key:
        #
-       #  - `&session-state:Counter`::         How many times this session has
+       #  - `&session-state.Counter`::         How many times this session has
        #                                       been resumed.
-       #  - `&session-state:Session-Data`::    The master session key.
+       #  - `&session-state.Session-Data`::    The master session key.
        #  - `&session-State:Permanent-Identity`::(optionally) the permanent
        #                                       identity of the user.
        #
@@ -674,11 +674,11 @@ server eap-aka-sim {
        #  This section will be called prior to attempting re-authentication.
        #
        #  You should restore the contents of the following attributes using
-       #  `&session-state:Session-ID` or `&reply.Next-Reauth-Id` as a key:
+       #  `&session-state.Session-ID` or `&reply.Next-Reauth-Id` as a key:
        #
-       #  - `&session-state:Counter`::         How many times this session has
+       #  - `&session-state.Counter`::         How many times this session has
        #                                       been resumed.
-       #  - `&session-state:Session-Data`::    The master session key.
+       #  - `&session-state.Session-Data`::    The master session key.
        #  - `&session-State:Permanent-Identity`::(optionally) the permanent
        #                                       identity of the user.
        #

diff --git a/raddb/sites-available/tls-cache b/raddb/sites-available/tls-cache
index 6dbc70ceb19e1561c842da0feceb6b079d236f8c..b76cd5ff4164756bda5571c645d847f50e7ae7af 100644 (file)
--- a/raddb/sites-available/tls-cache
+++ b/raddb/sites-available/tls-cache
@@ -34,7 +34,7 @@ server tls-cache {
        #  This section is run whenever the server needs to read an
        #  entry from the TLS session cache.
        #
-       #  It should read the attribute &session-state:TLS-Session-Data
+       #  It should read the attribute &session-state.TLS-Session-Data
        #  from the cache, along with any other attributes which
        #  were in the cache
        #
@@ -54,7 +54,7 @@ server tls-cache {
        #  This section is run whenever the server needs to write an
        #  entry to the TLS session cache.
        #
-       #  It should write the attribute &session-state:Session-Data
+       #  It should write the attribute &session-state.Session-Data
        #  to the cache, along with any other attributes which
        #  need to be cached.
        #

diff --git a/src/lib/eap_aka_sim/state_machine.c b/src/lib/eap_aka_sim/state_machine.c
index c6cba546318e332241ef84a3efb6e65485ad7e13..ee35885bcda5b913afd0bab8dd265bed233c10eb 100644 (file)
--- a/src/lib/eap_aka_sim/state_machine.c
+++ b/src/lib/eap_aka_sim/state_machine.c
@@ -350,7 +350,7 @@ static int identity_req_pairs_add(REQUEST *request, eap_aka_sim_session_t *eap_a
  * to form the real permanent ID.
  *
  * Otherwise copy the entire incoming Identity to the
- * &session-state:Permanent-Identity attribute.
+ * &session-state.Permanent-Identity attribute.
  *
  * @param[in] request          The current request.
  * @param[in] in               current identity.
@@ -419,7 +419,7 @@ static int identity_to_permanent_identity(REQUEST *request, VALUE_PAIR *in, eap_
                        fr_aka_sim_hint_byte(AKA_SIM_ID_TYPE_PERMANENT, expected_method),
                        fr_aka_sim_hint_byte(our_type, our_method));
                RINDENT();
-               RDEBUG2("&session-state:%pP", vp);
+               RDEBUG2("&session-state.%pP", vp);
                REXDENT();
        } else {
                /*
@@ -435,7 +435,7 @@ static int identity_to_permanent_identity(REQUEST *request, VALUE_PAIR *in, eap_
 
                RDEBUG2("Stripping 'hint' byte from %s", attr_eap_aka_sim_permanent_identity->name);
                RINDENT();
-               RDEBUG2("&session-state:%pP", vp);
+               RDEBUG2("&session-state.%pP", vp);
                REXDENT();
        }
 

diff --git a/src/lib/eap_aka_sim/vector.c b/src/lib/eap_aka_sim/vector.c
index 4c2bd5fba5b901d410322a8b3d5869546d742044..e439b40026140b58fcb679be0ba6457e09973087 100644 (file)
--- a/src/lib/eap_aka_sim/vector.c
+++ b/src/lib/eap_aka_sim/vector.c
@@ -831,7 +831,7 @@ int fr_aka_sim_vector_gsm_umts_kdf_0_reauth_from_attrs(REQUEST *request, VALUE_P
         */
        counter_vp = fr_pair_find_by_da(vps, attr_eap_aka_sim_counter);
        if (!counter_vp) {
-               RDEBUG2("No &session-state:%s attribute found, can't calculate re-auth keys",
+               RDEBUG2("No &session-state.%s attribute found, can't calculate re-auth keys",
                        attr_eap_aka_sim_counter->name);
                return 1;
        }
@@ -840,13 +840,13 @@ int fr_aka_sim_vector_gsm_umts_kdf_0_reauth_from_attrs(REQUEST *request, VALUE_P
        mk_vp = fr_pair_find_by_da(vps, attr_session_data);
        if (!mk_vp) mk_vp = fr_pair_find_by_da(vps, attr_eap_aka_sim_mk);
        if (!mk_vp) {
-               RDEBUG2("Neither &session-state:%s or &session-state:%s attributes found, "
+               RDEBUG2("Neither &session-state.%s or &session-state.%s attributes found, "
                        "can't calculate re-auth keys", attr_session_data->name, attr_eap_aka_sim_mk->name);
                return 1;
        }
 
        if (mk_vp->vp_length != AKA_SIM_MK_SIZE) {
-               REDEBUG("&session-state:%s incorrect length.  Expected "
+               REDEBUG("&session-state.%s incorrect length.  Expected "
                        STRINGIFY(AKA_SIM_MK_SIZE) " bytes, got %zu bytes",
                        attr_eap_aka_sim_mk->name, mk_vp->vp_length);
                return -1;
@@ -881,7 +881,7 @@ int fr_aka_sim_vector_umts_kdf_1_reauth_from_attrs(REQUEST *request, VALUE_PAIR
         */
        counter_vp = fr_pair_find_by_da(vps, attr_eap_aka_sim_counter);
        if (!counter_vp) {
-               RDEBUG2("No &session-state:%s attribute found, can't calculate re-auth keys",
+               RDEBUG2("No &session-state.%s attribute found, can't calculate re-auth keys",
                        attr_eap_aka_sim_counter->name);
                return 1;
        }
@@ -890,13 +890,13 @@ int fr_aka_sim_vector_umts_kdf_1_reauth_from_attrs(REQUEST *request, VALUE_PAIR
        k_re_vp = fr_pair_find_by_da(vps, attr_session_data);
        if (!k_re_vp) k_re_vp = fr_pair_find_by_da(vps, attr_eap_aka_sim_k_re);
        if (!k_re_vp) {
-               RDEBUG2("Neither &session-state:%s or &session-sate:%s attributes found, "
+               RDEBUG2("Neither &session-state.%s or &session-sate:%s attributes found, "
                        "can't calculate re-auth keys", attr_session_data->name, attr_eap_aka_sim_k_re->name);
                return 1;
        }
 
        if (k_re_vp->vp_length != AKA_SIM_K_RE_SIZE) {
-               REDEBUG("&session-state:%s incorrect length.  Expected "
+               REDEBUG("&session-state.%s incorrect length.  Expected "
                        STRINGIFY(AKA_SIM_K_RE_SIZE) " bytes, got %zu bytes",
                        attr_eap_aka_sim_mk->name, k_re_vp->vp_length);
                return -1;

diff --git a/src/lib/server/state.c b/src/lib/server/state.c
index 2b942dcd287022cc78180bd3be058c1eb50b2dad..9889439110b0e0d7baf4dfeb2b17f845569bead1 100644 (file)
--- a/src/lib/server/state.c
+++ b/src/lib/server/state.c
@@ -647,7 +647,7 @@ void fr_state_to_request(fr_state_tree_t *state, REQUEST *request)
 
        if (request->state) {
                RDEBUG2("Restored &session-state");
-               log_request_pair_list(L_DBG_LVL_2, request, request->state, "&session-state:");
+               log_request_pair_list(L_DBG_LVL_2, request, request->state, "&session-state.");
        }
 
        /*
@@ -682,7 +682,7 @@ int fr_request_to_state(fr_state_tree_t *state, REQUEST *request)
 
        if (request->state) {
                RDEBUG2("Saving &session-state");
-               log_request_pair_list(L_DBG_LVL_2, request, request->state, "&session-state:");
+               log_request_pair_list(L_DBG_LVL_2, request, request->state, "&session-state.");
        }
 
        vp = fr_pair_find_by_da(request->packet->vps, state->da);

diff --git a/src/lib/tls/cache.c b/src/lib/tls/cache.c
index 733e1656649297b69c134fda55ec989789f90d9e..89bb1dd0f4b0977292e5ff1a859fa9bb5241ee88 100644 (file)
--- a/src/lib/tls/cache.c
+++ b/src/lib/tls/cache.c
@@ -285,7 +285,7 @@ int fr_tls_cache_write(REQUEST *request, fr_tls_session_t *tls_session)
        MEM(vp = fr_pair_afrom_da(request->state_ctx, attr_tls_session_data));
        fr_pair_value_memdup(vp, tls_session->session_blob, talloc_array_length(tls_session->session_blob), false);
        RINDENT();
-       RDEBUG2("&session-state:%pP", vp);
+       RDEBUG2("&session-state.%pP", vp);
        REXDENT();
        fr_pair_add(&request->state, vp);
 

diff --git a/src/lib/tls/session.c b/src/lib/tls/session.c
index cd00fa7cc0513ba44a59574e38ac38328d6957a8..f0e32b49611855b11f287730d6dd9797d2d3efc6 100644 (file)
--- a/src/lib/tls/session.c
+++ b/src/lib/tls/session.c
@@ -1442,7 +1442,7 @@ int fr_tls_session_handshake(REQUEST *request, fr_tls_session_t *session)
                        fr_pair_value_strdup(vp,  SSL_CIPHER_get_name(cipher));
                        fr_pair_add(&request->state, vp);
                        RINDENT();
-                       RDEBUG2("&session-state:%pP", vp);
+                       RDEBUG2("&session-state.%pP", vp);
                        REXDENT();
                }
 
@@ -1458,7 +1458,7 @@ int fr_tls_session_handshake(REQUEST *request, fr_tls_session_t *session)
                        fr_pair_value_strdup(vp, version);
                        fr_pair_add(&request->state, vp);
                        RINDENT();
-                       RDEBUG2("&session-state:TLS-Session-Version := \"%s\"", version);
+                       RDEBUG2("&session-state.TLS-Session-Version := \"%s\"", version);
                        REXDENT();
                }
 

diff --git a/src/lib/tls/validate.c b/src/lib/tls/validate.c
index 23c689548b9d5fb205b821070565f1fa0697e9c9..94aa4defee2a040d3a0341f06a0e4e3dd4268227 100644 (file)
--- a/src/lib/tls/validate.c
+++ b/src/lib/tls/validate.c
@@ -159,7 +159,7 @@ int fr_tls_validate_cert_cb(int ok, X509_STORE_CTX *x509_ctx)
                        /*
                         *      Print out all the pairs we have so far
                         */
-                       log_request_pair_list(L_DBG_LVL_2, request, cert_vps, "&session-state:");
+                       log_request_pair_list(L_DBG_LVL_2, request, cert_vps, "&session-state.");
 
                        /*
                         *      cert_vps have a different talloc parent, so we

diff --git a/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime b/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime
index fb2d81913529152d9914e799efc2b89d85d6c87f..e03df85ebb5824fc93108fdf907d7962cc78ffff 100644 (file)
--- a/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime
+++ b/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime
@@ -13,7 +13,7 @@ cache eap_aka_prime_cache {
        #  update <section> { ... }::
        #
        update {
-               &session-state:Session-Data     := &session-state:Session-Data
-               &session-state:Counter          := &session-state:Counter
+               &session-state.Session-Data     := &session-state.Session-Data
+               &session-state.Counter          := &session-state.Counter
        }
 }
\ No newline at end of file

diff --git a/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime b/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime
index 14bc5e9f2d6ed3a2658c03ab5d9f14fb4a1efc7b..d735dc57b1cbdfca134f972d055bcd20962d9a5c 100644 (file)
--- a/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime
+++ b/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime
@@ -2,8 +2,8 @@ server eap-aka-prime {
        namespace = eap-aka-prime
 
        recv Identity-Response {
-               "%{debug_attr:&session-state:}"
-               if (!&session-state:Tmp-String-0) {
+               "%{debug_attr:&session-state.}"
+               if (!&session-state.Tmp-String-0) {
                        update reply {
                                &Any-ID-Req := yes
                        }

diff --git a/src/tests/eapol_test/config/aka/mods-enabled/aka b/src/tests/eapol_test/config/aka/mods-enabled/aka
index 6dfde3c2f9f696f2ac5b805960ad414ba7e7a002..84d1d82fcfb9f2f18e8afa00cb7c4a30fd959a38 100644 (file)
--- a/src/tests/eapol_test/config/aka/mods-enabled/aka
+++ b/src/tests/eapol_test/config/aka/mods-enabled/aka
@@ -13,7 +13,7 @@ cache eap_aka_cache {
        #  update <section> { ... }::
        #
        update {
-               &session-state:Session-Data     := &session-state:Session-Data
-               &session-state:Counter          := &session-state:Counter
+               &session-state.Session-Data     := &session-state.Session-Data
+               &session-state.Counter          := &session-state.Counter
        }
 }
\ No newline at end of file

diff --git a/src/tests/eapol_test/config/aka/sites-enabled/aka b/src/tests/eapol_test/config/aka/sites-enabled/aka
index f0771d6e6d341e4d50998a4f7a6cbcabf029918e..e316dc969d0b2fc31d71deeac12cdce56dfc174e 100644 (file)
--- a/src/tests/eapol_test/config/aka/sites-enabled/aka
+++ b/src/tests/eapol_test/config/aka/sites-enabled/aka
@@ -3,8 +3,8 @@ server eap-aka {
        namespace = eap-aka
 
        recv Identity-Response {
-               "%{debug_attr:&session-state:}"
-               if (!&session-state:Tmp-String-0) {
+               "%{debug_attr:&session-state.}"
+               if (!&session-state.Tmp-String-0) {
                        update reply {
                                &Any-ID-Req := yes
                        }

diff --git a/src/tests/eapol_test/config/sim/mods-enabled/sim b/src/tests/eapol_test/config/sim/mods-enabled/sim
index 673ee720021f5ea49e4ca5b7b6bbca3bbf0c5628..dcd6203e0a746b17d6370b215480621f44d357ec 100644 (file)
--- a/src/tests/eapol_test/config/sim/mods-enabled/sim
+++ b/src/tests/eapol_test/config/sim/mods-enabled/sim
@@ -13,7 +13,7 @@ cache eap_sim_cache {
        #  update <section> { ... }::
        #
        update {
-               &session-state:Session-Data     := &session-state:Session-Data
-               &session-state:Counter          := &session-state:Counter
+               &session-state.Session-Data     := &session-state.Session-Data
+               &session-state.Counter          := &session-state.Counter
        }
 }
\ No newline at end of file

diff --git a/src/tests/eapol_test/config/sim/sites-enabled/sim b/src/tests/eapol_test/config/sim/sites-enabled/sim
index 9e5ae5b4277eab3b26616b3409398a059b024473..321e278810706041e9ccf5c3dccd75edaf271dbe 100644 (file)
--- a/src/tests/eapol_test/config/sim/sites-enabled/sim
+++ b/src/tests/eapol_test/config/sim/sites-enabled/sim
@@ -2,8 +2,8 @@ server eap-sim {
        namespace = eap-sim
 
        recv Identity-Response {
-               "%{debug_attr:&session-state:}"
-               if (!&session-state:Tmp-String-0) {
+               "%{debug_attr:&session-state.}"
+               if (!&session-state.Tmp-String-0) {
                        update reply {
                                &Any-ID-Req := yes
                        }

diff --git a/src/tests/keywords/list-existence b/src/tests/keywords/list-existence
index 92ff385dd45d216d0770f4f4ad8fe59c1e320f34..56b3cde722a5ae5fbfac65e1ac58d8c4fc00a536 100644 (file)
--- a/src/tests/keywords/list-existence
+++ b/src/tests/keywords/list-existence
@@ -1,15 +1,15 @@
 #
 #  List existence checks are "is the list empty" checks.
 #
-if (&session-state:) {
+if (&session-state.) {
        test_fail
 }
 
-if (&session-state:[*]) {
+if (&session-state.[*]) {
        test_fail
 }
 
-if (&session-state:) {
+if (&session-state.) {
        test_fail
 }
 
@@ -17,11 +17,11 @@ update session-state {
        &User-Name := 'foo'
 }
 
-if (!&session-state:) {
+if (!&session-state.) {
        test_fail
 }
 
-if (!&session-state:[*]) {
+if (!&session-state.[*]) {
        test_fail
 }
 

diff --git a/src/tests/modules/cache_rbtree/cache-update.unlang b/src/tests/modules/cache_rbtree/cache-update.unlang
index d2c73203d3b173d8d8cbbf7efb53de4d2129f297..5ff4637936fad1b525fb6cc6819b0e3e55499b7a 100644 (file)
--- a/src/tests/modules/cache_rbtree/cache-update.unlang
+++ b/src/tests/modules/cache_rbtree/cache-update.unlang
@@ -46,14 +46,14 @@ else {
        test_fail
 }
 
-if (&session-state:Reply-Message[0] == 'hello') {
+if (&session-state.Reply-Message[0] == 'hello') {
        test_pass
 }
 else {
        test_fail
 }
 
-if (&session-state:Reply-Message[1] == 'goodbye') {
+if (&session-state.Reply-Message[1] == 'goodbye') {
        test_pass
 }
 else {

diff --git a/src/tests/modules/unit_test_module.conf b/src/tests/modules/unit_test_module.conf
index e20392f1249e678a8e1a134e08ff32990d797e7c..fdca8b42271360f084780af0a39262d00207c174 100644 (file)
--- a/src/tests/modules/unit_test_module.conf
+++ b/src/tests/modules/unit_test_module.conf
@@ -91,7 +91,7 @@ policy {
        #  Outputs the contents of the session state list in debugging (-X) mode
        #
        debug_session_state {
-               if("%{debug_attr:session-state:[*]}" == '') {
+               if("%{debug_attr:session-state.[*]}" == '') {
                        noop
                }
        }