remove & from debug messages

perl -p -i -e 'next if !/DEBUG/;s/\"&/\"/' $(git grep '"&' src | grep DEBUG | sed 's/:.*//' | sort -u)

perl -p -i -e 'next if !/DEBUG/;s/&control/control/g' $(git grep DEBUG | grep '&' | sed 's/:.*//' | sort -u)

along with request, reply, session, and a few manual edits

diff --git a/src/bin/radclient-ng.c b/src/bin/radclient-ng.c
index 8be4f61b752a38f44c59b428a66fe8945ed65347..aa7df0c3851901fc6d98a9f92c65f5eb8b68b43a 100644 (file)
--- a/src/bin/radclient-ng.c
+++ b/src/bin/radclient-ng.c
@@ -726,7 +726,7 @@ static int radclient_init(TALLOC_CTX *ctx, rc_file_pair_t *files)
                                goto error;
 
                        default:
-                               REDEBUG("Can't determine expected &reply.Packet-Type for Packet-Type %i",
+                               REDEBUG("Can't determine expected reply.Packet-Type for Packet-Type %i",
                                        request->packet->code);
                                goto error;
                        }
@@ -756,7 +756,7 @@ static int radclient_init(TALLOC_CTX *ctx, rc_file_pair_t *files)
                                break;
 
                        default:
-                               REDEBUG("Can't determine expected Packet-Type for &reply.Packet-Type %i",
+                               REDEBUG("Can't determine expected Packet-Type for reply.Packet-Type %i",
                                        request->filter_code);
                                goto error;
                        }

diff --git a/src/bin/radclient.c b/src/bin/radclient.c
index e0dcc3339e5d6069978466329daed0bdd4ffbf1a..bb03a8c79c64b76b943d611346e263279776ef22 100644 (file)
--- a/src/bin/radclient.c
+++ b/src/bin/radclient.c
@@ -723,7 +723,7 @@ static int radclient_init(TALLOC_CTX *ctx, rc_file_pair_t *files)
                                goto error;
 
                        default:
-                               REDEBUG("Can't determine expected &reply.Packet-Type for Packet-Type %i",
+                               REDEBUG("Can't determine expected reply.Packet-Type for Packet-Type %i",
                                        request->packet->code);
                                goto error;
                        }
@@ -753,7 +753,7 @@ static int radclient_init(TALLOC_CTX *ctx, rc_file_pair_t *files)
                                break;
 
                        default:
-                               REDEBUG("Can't determine expected Packet-Type for &reply.Packet-Type %i",
+                               REDEBUG("Can't determine expected Packet-Type for reply.Packet-Type %i",
                                        request->filter_code);
                                goto error;
                        }

diff --git a/src/lib/eap/base.c b/src/lib/eap/base.c
index 55db89cc494d1ee0b3de0f628947dcd2e23021f2..c3e407a29d2d83294867aedadc9c1259f7410555 100644 (file)
--- a/src/lib/eap/base.c
+++ b/src/lib/eap/base.c
@@ -392,7 +392,7 @@ void eap_add_reply(request_t *request, fr_dict_attr_t const *da, uint8_t const *
        fr_pair_value_memdup(vp, value, len, false);
 
        RINDENT();
-       RDEBUG2("&reply.%pP", vp);
+       RDEBUG2("reply.%pP", vp);
        REXDENT();
 }
 

diff --git a/src/lib/eap/tls.c b/src/lib/eap/tls.c
index 3efd821fe092764380c2d3601f526730cae8534c..65b82553bdba5571c0921b0c857618dc2ffec825 100644 (file)
--- a/src/lib/eap/tls.c
+++ b/src/lib/eap/tls.c
@@ -299,7 +299,7 @@ int eap_tls_success(request_t *request, eap_session_t *eap_session, eap_tls_prf_
                fr_pair_value_memdup_buffer_shallow(vp, session_id, false);
 
                RINDENT();
-               RDEBUG2("&reply.%pP", vp);
+               RDEBUG2("reply.%pP", vp);
                REXDENT();
        }
 

diff --git a/src/lib/eap_aka_sim/state_machine.c b/src/lib/eap_aka_sim/state_machine.c
index 4b7fbb5d31fbdca0659b3aaab8c27d15f0507630..03ed23df575d220887eb0b5475fd0ab1dbef6c9f 100644 (file)
--- a/src/lib/eap_aka_sim/state_machine.c
+++ b/src/lib/eap_aka_sim/state_machine.c
@@ -240,7 +240,7 @@ static bool identity_req_set_by_user(request_t *request, eap_aka_sim_session_t *
                        eap_aka_sim_session->id_req = AKA_SIM_PERMANENT_ID_REQ;
                found:
                        set_by_user = true;
-                       RDEBUG2("Previous section added &reply.%pP, will request additional identity", vp);
+                       RDEBUG2("Previous section added reply.%pP, will request additional identity", vp);
                        fr_pair_delete(&request->reply_pairs, vp);
                }
                else if (vp->da == attr_eap_aka_sim_fullauth_id_req) {
@@ -496,7 +496,7 @@ static int identity_to_permanent_identity(request_t *request, fr_pair_t *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 {
                /*
@@ -511,7 +511,7 @@ static int identity_to_permanent_identity(request_t *request, fr_pair_t *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();
        }
 
@@ -583,7 +583,7 @@ static int mac_validate(request_t *request)
         */
        our_mac = fr_pair_find_by_da(&request->control_pairs, NULL, attr_eap_aka_sim_mac);
        if (!our_mac) {
-               REDEBUG("Missing &control.%s", attr_eap_aka_sim_mac->name);
+               REDEBUG("Missing control.%s", attr_eap_aka_sim_mac->name);
                return -1;
 
        }
@@ -960,7 +960,7 @@ static void common_reply(request_t *request, eap_aka_sim_session_t *eap_aka_sim_
        if (!eap_aka_sim_session->allow_encrypted) {
                fr_pair_list_foreach(&request->reply_pairs, vp) {
                        if (fr_dict_attr_common_parent(attr_eap_aka_sim_encr_data, vp->da, true)) {
-                               RWDEBUG("Silently discarding &reply.%pP: Encrypted attributes not "
+                               RWDEBUG("Silently discarding reply.%pP: Encrypted attributes not "
                                        "allowed in this round", vp);
                                fr_pair_delete(&request->reply_pairs, vp);
                        }
@@ -2142,7 +2142,7 @@ RESUME(recv_aka_synchronization_failure)
         */
        vp = fr_pair_find_by_da(&request->control_pairs, NULL, attr_sim_sqn);
        if (!vp) {
-               REDEBUG("No &control.SQN value provided after resynchronisation, cannot continue");
+               REDEBUG("No control.SQN value provided after resynchronisation, cannot continue");
                goto failure;
        }
 
@@ -3462,7 +3462,7 @@ RESUME(recv_common_identity_response)
         *      the submodule.
         */
        eap_type = fr_pair_find_by_da(&request->control_pairs, NULL, attr_eap_type);
-       if (eap_type) RWDEBUG("Ignoring &control.EAP-Type, this must be set *before* the EAP module is called");
+       if (eap_type) RWDEBUG("Ignoring control.EAP-Type, this must be set *before* the EAP module is called");
 
        method = fr_pair_find_by_da(&request->request_pairs, NULL, attr_eap_aka_sim_method_hint);
 

diff --git a/src/lib/eap_aka_sim/vector.c b/src/lib/eap_aka_sim/vector.c
index 889596d0f4c7572f4ffc55229a1b577401ae134d..bb77d129b26f06950c1ca3138f280a4ef377ec53 100644 (file)
--- a/src/lib/eap_aka_sim/vector.c
+++ b/src/lib/eap_aka_sim/vector.c
@@ -49,7 +49,7 @@ static int vector_opc_from_op(request_t *request, uint8_t const **out, uint8_t o
        opc_vp = fr_pair_find_by_da(list, NULL, attr_sim_opc);
        if (opc_vp) {
                if (opc_vp->vp_length != MILENAGE_OPC_SIZE) {
-                       REDEBUG("&control.%s has incorrect length, expected %d bytes got %zu bytes",
+                       REDEBUG("control.%s has incorrect length, expected %d bytes got %zu bytes",
                                attr_sim_opc->name, MILENAGE_OPC_SIZE, opc_vp->vp_length);
                        return -1;
                }
@@ -60,7 +60,7 @@ static int vector_opc_from_op(request_t *request, uint8_t const **out, uint8_t o
        op_vp = fr_pair_find_by_da(list, NULL, attr_sim_op);
        if (op_vp) {
                if (op_vp->vp_length != MILENAGE_OP_SIZE) {
-                       REDEBUG("&control.%s has incorrect length, expected %d bytes got %zu bytes",
+                       REDEBUG("control.%s has incorrect length, expected %d bytes got %zu bytes",
                                attr_sim_op->name, MILENAGE_OP_SIZE, op_vp->vp_length);
                        return -1;
                }
@@ -89,10 +89,10 @@ static int vector_gsm_from_ki(request_t *request, fr_pair_list_t *vps, int idx,
         */
        ki_vp = fr_pair_find_by_da(vps, NULL, attr_sim_ki);
        if (!ki_vp) {
-               RDEBUG3("No &control.%sfound, not generating triplets locally", attr_sim_ki->name);
+               RDEBUG3("No control.%sfound, not generating triplets locally", attr_sim_ki->name);
                return 1;
        } else if (ki_vp->vp_length != MILENAGE_KI_SIZE) {
-               REDEBUG("&control.%s has incorrect length, expected 16 bytes got %zu bytes",
+               REDEBUG("control.%s has incorrect length, expected 16 bytes got %zu bytes",
                        attr_sim_ki->name, ki_vp->vp_length);
                return -1;
        }
@@ -114,7 +114,7 @@ static int vector_gsm_from_ki(request_t *request, fr_pair_list_t *vps, int idx,
                if (version == FR_SIM_ALGO_VERSION_VALUE_COMP128_4) {
                        if (vector_opc_from_op(request, &opc_p, opc_buff, vps, ki_vp->vp_octets) < 0) return -1;
                        if (!opc_p) {
-                               RPEDEBUG2("No &control.%s or &control.%s found, "
+                               RPEDEBUG2("No control.%s or control.%s found, "
                                          "can't run Milenage (COMP128-4)", attr_sim_op->name, attr_sim_opc->name);
                                return -1;
                        }
@@ -185,12 +185,12 @@ static int vector_gsm_from_triplets(request_t *request, fr_pair_list_t *vps,
             (i < idx) && (kc = fr_dcursor_next(&cursor));
             i++);
        if (!kc) {
-               RDEBUG3("No &control.%s[%i] attribute found, not using GSM triplets",
+               RDEBUG3("No control.%s[%i] attribute found, not using GSM triplets",
                        attr_eap_aka_sim_kc->name, idx);
                return 1;
        }
        if (kc->vp_length != AKA_SIM_VECTOR_GSM_KC_SIZE) {
-               REDEBUG("&control.%s[%i] is not " STRINGIFY(AKA_SIM_VECTOR_GSM_KC_SIZE) " bytes, got %zu bytes",
+               REDEBUG("control.%s[%i] is not " STRINGIFY(AKA_SIM_VECTOR_GSM_KC_SIZE) " bytes, got %zu bytes",
                        attr_eap_aka_sim_kc->name, idx, kc->vp_length);
                return -1;
        }
@@ -199,12 +199,12 @@ static int vector_gsm_from_triplets(request_t *request, fr_pair_list_t *vps,
             (i < idx) && (rand = fr_dcursor_next(&cursor));
             i++);
        if (!rand) {
-               RDEBUG3("No &control.%s[%i] attribute found, not using GSM triplets",
+               RDEBUG3("No control.%s[%i] attribute found, not using GSM triplets",
                        attr_eap_aka_sim_rand->name, idx);
                return 1;
        }
        if (rand->vp_length != AKA_SIM_VECTOR_GSM_RAND_SIZE) {
-               REDEBUG("&control.RAND[%i] is not " STRINGIFY(SIM_RAND_SIZE) " bytes, got %zu bytes",
+               REDEBUG("control.RAND[%i] is not " STRINGIFY(SIM_RAND_SIZE) " bytes, got %zu bytes",
                        idx, rand->vp_length);
                return -1;
        }
@@ -213,12 +213,12 @@ static int vector_gsm_from_triplets(request_t *request, fr_pair_list_t *vps,
             (i < idx) && (sres = fr_dcursor_next(&cursor));
             i++);
        if (!sres) {
-               RDEBUG3("No &control.%s[%i] attribute found, not using GSM triplets",
+               RDEBUG3("No control.%s[%i] attribute found, not using GSM triplets",
                        attr_eap_aka_sim_sres->name, idx);
                return 1;
        }
        if (sres->vp_length != AKA_SIM_VECTOR_GSM_SRES_SIZE) {
-               REDEBUG("&control.%s[%i] is not " STRINGIFY(AKA_SIM_VECTOR_GSM_SRES_SIZE) " bytes, got %zu bytes",
+               REDEBUG("control.%s[%i] is not " STRINGIFY(AKA_SIM_VECTOR_GSM_SRES_SIZE) " bytes, got %zu bytes",
                        attr_eap_aka_sim_sres->name, idx, sres->vp_length);
                return -1;
        }
@@ -250,7 +250,7 @@ static int vector_gsm_from_quintuplets(request_t *request, fr_pair_list_t *vps,
             (i < idx) && (ck = fr_dcursor_next(&cursor));
             i++);
        if (!ck) {
-               RDEBUG3("No &control.%s[%i] attribute found, not using quintuplet derivation",
+               RDEBUG3("No control.%s[%i] attribute found, not using quintuplet derivation",
                        attr_eap_aka_sim_ck->name, idx);
                return 1;
        }
@@ -262,7 +262,7 @@ static int vector_gsm_from_quintuplets(request_t *request, fr_pair_list_t *vps,
             (i < idx) && (ik = fr_dcursor_next(&cursor));
             i++);
        if (!ik) {
-               RDEBUG3("No &control.%s[%i] attribute found, not using quintuplet derivation",
+               RDEBUG3("No control.%s[%i] attribute found, not using quintuplet derivation",
                        attr_eap_aka_sim_ik->name, idx);
                return 1;
        }
@@ -274,13 +274,13 @@ static int vector_gsm_from_quintuplets(request_t *request, fr_pair_list_t *vps,
             (i < idx) && (rand = fr_dcursor_next(&cursor));
             i++);
        if (!rand) {
-               RDEBUG3("No &control.%s[%i] attribute found, not using quintuplet derivation",
+               RDEBUG3("No control.%s[%i] attribute found, not using quintuplet derivation",
                        attr_eap_aka_sim_rand->name, idx);
                return 1;
        }
 
        if (rand->vp_length != AKA_SIM_VECTOR_UMTS_RAND_SIZE) {
-               REDEBUG("&control.%s[%i] incorrect length.  Expected "
+               REDEBUG("control.%s[%i] incorrect length.  Expected "
                        STRINGIFY(AKA_SIM_VECTOR_UMTS_RAND_SIZE) " bytes, "
                        "got %zu bytes", attr_eap_aka_sim_rand->name, idx, rand->vp_length);
                return -1;
@@ -293,7 +293,7 @@ static int vector_gsm_from_quintuplets(request_t *request, fr_pair_list_t *vps,
             (i < idx) && (xres = fr_dcursor_next(&cursor));
             i++);
        if (!xres) {
-               RDEBUG3("No &control.%s[%i] attribute found, not using quintuplet derivation",
+               RDEBUG3("No control.%s[%i] attribute found, not using quintuplet derivation",
                        attr_eap_aka_sim_xres->name, idx);
                return 1;
        }
@@ -441,10 +441,10 @@ static int vector_umts_from_ki(request_t *request, fr_pair_list_t *vps, fr_aka_s
         */
        ki_vp = fr_pair_find_by_da(vps, NULL, attr_sim_ki);
        if (!ki_vp) {
-               RDEBUG3("No &control.%s found, not generating quintuplets locally", attr_sim_ki->name);
+               RDEBUG3("No control.%s found, not generating quintuplets locally", attr_sim_ki->name);
                return 1;
        } else if (ki_vp->vp_length != ki_size) {
-               REDEBUG("&control.%s has incorrect length, expected %zu bytes got %zu bytes",
+               REDEBUG("control.%s has incorrect length, expected %zu bytes got %zu bytes",
                        attr_sim_ki->name, ki_size, ki_vp->vp_length);
                return -1;
        }
@@ -461,7 +461,7 @@ static int vector_umts_from_ki(request_t *request, fr_pair_list_t *vps, fr_aka_s
        amf_vp = fr_pair_find_by_da(vps, NULL, attr_sim_amf);
        if (amf_vp) {
                if (amf_vp->vp_length != amf_size) {
-                       REDEBUG("&control.%s has incorrect length, expected %zu bytes got %zu bytes",
+                       REDEBUG("control.%s has incorrect length, expected %zu bytes got %zu bytes",
                                attr_sim_amf->name, amf_size, amf_vp->vp_length);
                        return -1;
                }
@@ -600,12 +600,12 @@ static int vector_umts_from_quintuplets(request_t *request, fr_pair_list_t *vps,
         */
        autn_vp = fr_pair_find_by_da(vps, NULL, attr_eap_aka_sim_autn);
        if (!autn_vp) {
-               RDEBUG3("No &control.%s attribute found, not using UMTS quintuplets", attr_eap_aka_sim_autn->name);
+               RDEBUG3("No control.%s attribute found, not using UMTS quintuplets", attr_eap_aka_sim_autn->name);
                return 1;
        }
 
        if (autn_vp->vp_length > AKA_SIM_VECTOR_UMTS_AUTN_SIZE) {
-               REDEBUG("&control.%s incorrect length.  Expected "
+               REDEBUG("control.%s incorrect length.  Expected "
                        STRINGIFY(AKA_SIM_VECTOR_UMTS_AUTN_SIZE) " bytes, got %zu bytes",
                        attr_eap_aka_sim_autn->name, autn_vp->vp_length);
                return -1;
@@ -616,12 +616,12 @@ static int vector_umts_from_quintuplets(request_t *request, fr_pair_list_t *vps,
         */
        ck_vp = fr_pair_find_by_da(vps, NULL, attr_eap_aka_sim_ck);
        if (!ck_vp) {
-               RDEBUG3("No &control.%s attribute found, not using UMTS quintuplets", attr_eap_aka_sim_ck->name);
+               RDEBUG3("No control.%s attribute found, not using UMTS quintuplets", attr_eap_aka_sim_ck->name);
                return 1;
        }
 
        if (ck_vp->vp_length > AKA_SIM_VECTOR_UMTS_CK_SIZE) {
-               REDEBUG("&control.%s incorrect length.  Expected "
+               REDEBUG("control.%s incorrect length.  Expected "
                        STRINGIFY(EAP_AKA_XRES_MAX_SIZE) " bytes, got %zu bytes",
                        attr_eap_aka_sim_ck->name, ck_vp->vp_length);
                return -1;
@@ -632,12 +632,12 @@ static int vector_umts_from_quintuplets(request_t *request, fr_pair_list_t *vps,
         */
        ik_vp = fr_pair_find_by_da(vps, NULL, attr_eap_aka_sim_ik);
        if (!ik_vp) {
-               RDEBUG3("No &control.%s attribute found, not using UMTS quintuplets", attr_eap_aka_sim_ik->name);
+               RDEBUG3("No control.%s attribute found, not using UMTS quintuplets", attr_eap_aka_sim_ik->name);
                return 1;
        }
 
        if (ik_vp->vp_length > AKA_SIM_VECTOR_UMTS_IK_SIZE) {
-               REDEBUG("&control.%s incorrect length.  Expected "
+               REDEBUG("control.%s incorrect length.  Expected "
                        STRINGIFY(AKA_SIM_VECTOR_UMTS_IK_SIZE) " bytes, got %zu bytes",
                        attr_eap_aka_sim_ik->name, ik_vp->vp_length);
                return -1;
@@ -648,12 +648,12 @@ static int vector_umts_from_quintuplets(request_t *request, fr_pair_list_t *vps,
         */
        rand_vp = fr_pair_find_by_da(vps, NULL, attr_eap_aka_sim_rand);
        if (!rand_vp) {
-               RDEBUG3("No &control.%s attribute found, not using quintuplet derivation", attr_eap_aka_sim_rand->name);
+               RDEBUG3("No control.%s attribute found, not using quintuplet derivation", attr_eap_aka_sim_rand->name);
                return 1;
        }
 
        if (rand_vp->vp_length != AKA_SIM_VECTOR_UMTS_RAND_SIZE) {
-               REDEBUG("&control.%s incorrect length.  Expected " STRINGIFY(AKA_SIM_VECTOR_UMTS_RAND_SIZE) " bytes, "
+               REDEBUG("control.%s incorrect length.  Expected " STRINGIFY(AKA_SIM_VECTOR_UMTS_RAND_SIZE) " bytes, "
                        "got %zu bytes", attr_eap_aka_sim_rand->name, rand_vp->vp_length);
                return -1;
        }
@@ -663,12 +663,12 @@ static int vector_umts_from_quintuplets(request_t *request, fr_pair_list_t *vps,
         */
        xres_vp = fr_pair_find_by_da(vps, NULL, attr_eap_aka_sim_xres);
        if (!xres_vp) {
-               RDEBUG3("No &control.%s attribute found, not using UMTS quintuplets", attr_eap_aka_sim_xres->name);
+               RDEBUG3("No control.%s attribute found, not using UMTS quintuplets", attr_eap_aka_sim_xres->name);
                return 1;
        }
 
        if (xres_vp->vp_length > AKA_SIM_VECTOR_UMTS_XRES_MAX_SIZE) {
-               REDEBUG("&control.%s incorrect length.  Expected < "
+               REDEBUG("control.%s incorrect length.  Expected < "
                        STRINGIFY(EAP_AKA_XRES_MAX_SIZE) " bytes, got %zu bytes",
                        attr_eap_aka_sim_xres->name, xres_vp->vp_length);
                return -1;
@@ -679,7 +679,7 @@ static int vector_umts_from_quintuplets(request_t *request, fr_pair_list_t *vps,
         */
        ak_vp = fr_pair_find_by_da(vps, NULL, attr_eap_aka_sim_ak);
        if (ak_vp && (ak_vp->vp_length != MILENAGE_AK_SIZE)) {
-               REDEBUG("&control.%s incorrect length.  Expected "
+               REDEBUG("control.%s incorrect length.  Expected "
                        STRINGIFY(MILENAGE_AK_SIZE) " bytes, got %zu bytes",
                        attr_eap_aka_sim_ak->name, ak_vp->vp_length);
                return -1;
@@ -690,7 +690,7 @@ static int vector_umts_from_quintuplets(request_t *request, fr_pair_list_t *vps,
         */
        sqn_vp = fr_pair_find_by_da(vps, NULL, attr_sim_sqn);
        if (sqn_vp && (sqn_vp->vp_length != MILENAGE_SQN_SIZE)) {
-               REDEBUG("&control.%s incorrect length.  Expected "
+               REDEBUG("control.%s incorrect length.  Expected "
                        STRINGIFY(MILENAGE_AK_SIZE) " bytes, got %zu bytes",
                        attr_sim_sqn->name, sqn_vp->vp_length);
                return -1;
@@ -832,7 +832,7 @@ int fr_aka_sim_vector_gsm_umts_kdf_0_reauth_from_attrs(request_t *request, fr_pa
         */
        counter_vp = fr_pair_find_by_da_nested(vps, NULL, 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;
        }
@@ -841,13 +841,13 @@ int fr_aka_sim_vector_gsm_umts_kdf_0_reauth_from_attrs(request_t *request, fr_pa
        mk_vp = fr_pair_find_by_da(vps, NULL, attr_session_data);
        if (!mk_vp) mk_vp = fr_pair_find_by_da(vps, NULL, 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 %u bytes, got %zu bytes",
+               REDEBUG("session-state.%s incorrect length.  Expected %u bytes, got %zu bytes",
                        attr_eap_aka_sim_mk->name, AKA_SIM_MK_SIZE, mk_vp->vp_length);
                return -1;
        }
@@ -881,7 +881,7 @@ int fr_aka_sim_vector_umts_kdf_1_reauth_from_attrs(request_t *request, fr_pair_l
         */
        counter_vp = fr_pair_find_by_da_nested(vps, NULL, 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_t *request, fr_pair_l
        mk_vp = fr_pair_find_by_da(vps, NULL, attr_session_data);
        if (!mk_vp) mk_vp = fr_pair_find_by_da(vps, NULL, attr_eap_aka_sim_mk);
        if (!mk_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_mk->name);
                return 1;
        }
 
        if (mk_vp->vp_length != AKA_PRIME_MK_REAUTH_SIZE) {
-               REDEBUG("&session-state.%s incorrect length.  Expected "
+               REDEBUG("session-state.%s incorrect length.  Expected "
                        "%u bytes, got %zu bytes",
                        attr_eap_aka_sim_mk->name, AKA_PRIME_MK_REAUTH_SIZE, mk_vp->vp_length);
                return -1;
@@ -941,7 +941,7 @@ int fr_aka_sim_umts_resync_from_attrs(uint64_t *new_sqn,
        }
 
        if (auts_vp->vp_length != MILENAGE_AUTS_SIZE) {
-               REDEBUG("&control.%s incorrect length.  Expected "
+               REDEBUG("control.%s incorrect length.  Expected "
                        STRINGIFY(MILENAGE_AUTS_SIZE) " bytes, got %zu bytes",
                        attr_eap_aka_sim_auts->name, auts_vp->vp_length);
                return -1;

diff --git a/src/lib/eap_aka_sim/xlat.c b/src/lib/eap_aka_sim/xlat.c
index e0acdf33236fcfe41f9ab4836fcd03abc058fc3e..82eb8741138cc39ff27764bb6b2e1e9d3c331b2a 100644 (file)
--- a/src/lib/eap_aka_sim/xlat.c
+++ b/src/lib/eap_aka_sim/xlat.c
@@ -453,7 +453,7 @@ static xlat_action_t aka_sim_3gpp_temporary_id_encrypt_xlat(TALLOC_CTX *ctx, fr_
 
                eap_type = fr_pair_find_by_da(&request->request_pairs, NULL, attr_eap_type);
                if (!eap_type) {
-                       REDEBUG("ID does not contain method hint, and no &request.EAP-Type found.  "
+                       REDEBUG("ID does not contain method hint, and no request.EAP-Type found.  "
                                "Don't know what tag to prepend to encrypted identity");
                        goto error;
                }
@@ -465,7 +465,7 @@ static xlat_action_t aka_sim_3gpp_temporary_id_encrypt_xlat(TALLOC_CTX *ctx, fr_
                } else if (eap_type->vp_uint32 == enum_eap_type_aka_prime->vb_uint32) {
                        tag = !fastauth ? ID_TAG_AKA_PRIME_PSEUDONYM_B64 : ID_TAG_AKA_PRIME_FASTAUTH_B64;
                } else {
-                       REDEBUG("&request.EAP-Type does not match a SIM based EAP-Type (SIM, AKA, AKA-Prime)");
+                       REDEBUG("request.EAP-Type does not match a SIM based EAP-Type (SIM, AKA, AKA-Prime)");
                }
 
                id_p = id;

diff --git a/src/lib/server/client.c b/src/lib/server/client.c
index ccd26b4fdbac22e8df7645ecc680f80d5ff20bba..7bd71b8e1f77a0cd4f5a07508223647ab1e1ec6e 100644 (file)
--- a/src/lib/server/client.c
+++ b/src/lib/server/client.c
@@ -948,7 +948,7 @@ fr_client_t *client_afrom_request(TALLOC_CTX *ctx, request_t *request)
 
        cs = cf_section_alloc(ctx, NULL, "client", fr_sbuff_current(tmp));
 
-       RDEBUG2("Converting &control.FreeRADIUS-Client-* to client {...} section");
+       RDEBUG2("Converting control.FreeRADIUS-Client-* to client {...} section");
        RINDENT();
 
        fr_pair_list_foreach(&request->control_pairs, vp) {

diff --git a/src/lib/server/module_rlm.c b/src/lib/server/module_rlm.c
index 259093b1c729fbc355ca7edc2a7bdca27c4f250e..c0355e8865a2ff2822e2425c563b57aebf28af10 100644 (file)
--- a/src/lib/server/module_rlm.c
+++ b/src/lib/server/module_rlm.c
@@ -432,11 +432,11 @@ bool module_rlm_section_type_set(request_t *request, fr_dict_attr_t const *type_
        case 0:
                fr_value_box_copy(vp, &vp->data, enumv->value);
                vp->data.enumv = vp->da;        /* So we get the correct string alias */
-               RDEBUG2("Setting &control.%pP", vp);
+               RDEBUG2("Setting control.%pP", vp);
                return true;
 
        case 1:
-               RDEBUG2("&control.%s already set.  Not setting to %s", vp->da->name, enumv->name);
+               RDEBUG2("control.%s already set.  Not setting to %s", vp->da->name, enumv->name);
                return false;
 
        default:

diff --git a/src/lib/server/pairmove.c b/src/lib/server/pairmove.c
index 1bced2b10bfa00119e9ca1ab89fa5ad843efbd84..b8f224179deb4306387d37f6850f8570096747f5 100644 (file)
--- a/src/lib/server/pairmove.c
+++ b/src/lib/server/pairmove.c
@@ -775,7 +775,7 @@ int radius_legacy_map_list_apply(request_t *request, map_list_t const *list, fr_
        for (map = map_list_head(list);
             map != NULL;
             map = map_list_next(list, map)) {
-               RDEBUG2("&%s %s %s", map->lhs->name, fr_tokens[map->op],
+               RDEBUG2("%s %s %s", map->lhs->name, fr_tokens[map->op],
                        map->rhs ? map->rhs->name : "{ ... }");
 
                if (radius_legacy_map_apply(request, map, el) < 0) {

diff --git a/src/lib/server/password.c b/src/lib/server/password.c
index be2e3c363037e3c9ecd522e9d219ddd2accf09b7..7981dc1b251006ad27d333730dd1bb47c994dd17 100644 (file)
--- a/src/lib/server/password.c
+++ b/src/lib/server/password.c
@@ -737,9 +737,9 @@ do_header:
         *      header to indicate hash type.
         */
        if (RDEBUG_ENABLED3) {
-               RDEBUG3("No {...} in &control.%pP, re-writing to %s", known_good, def->name);
+               RDEBUG3("No {...} in control.%pP, re-writing to %s", known_good, def->name);
        } else {
-               RDEBUG2("No {...} in &control.%s, re-writing to %s", known_good->da->name, def->name);
+               RDEBUG2("No {...} in control.%s, re-writing to %s", known_good->da->name, def->name);
        }
 
 bad_header:
@@ -806,10 +806,10 @@ static fr_pair_t *password_process(TALLOC_CTX *ctx, request_t *request, fr_pair_
         */
        if (info->min_hash_len && (out->vp_length < MIN_LEN(info))) {
                if (RDEBUG_ENABLED3) {
-                       RWDEBUG3("&control.%pP too short, expected %zu bytes, got %zu bytes",
+                       RWDEBUG3("control.%pP too short, expected %zu bytes, got %zu bytes",
                                 out, MIN_LEN(info), out->vp_length);
                } else {
-                       RWDEBUG2("&control.%s too short, expected %zu bytes, got %zu bytes",
+                       RWDEBUG2("control.%s too short, expected %zu bytes, got %zu bytes",
                                 out->da->name, MIN_LEN(info), out->vp_length);
                }
        invalid:
@@ -822,10 +822,10 @@ static fr_pair_t *password_process(TALLOC_CTX *ctx, request_t *request, fr_pair_
         */
        if (info->max_hash_len && (out->vp_length > info->max_hash_len)) {
                if (RDEBUG_ENABLED3) {
-                       RWDEBUG3("&control.%pP too long, expected %zu bytes, got %zu bytes",
+                       RWDEBUG3("control.%pP too long, expected %zu bytes, got %zu bytes",
                                 out, info->max_hash_len, out->vp_length);
                } else {
-                       RWDEBUG2("&control.%s too long, expected %zu bytes, got %zu bytes",
+                       RWDEBUG2("control.%s too long, expected %zu bytes, got %zu bytes",
                                 out->da->name, info->max_hash_len, out->vp_length);
                }
                goto invalid;
@@ -837,10 +837,10 @@ static fr_pair_t *password_process(TALLOC_CTX *ctx, request_t *request, fr_pair_
        if ((info->type == PASSWORD_HASH) && (out->vp_length != info->min_hash_len)) {
 
                if (RDEBUG_ENABLED3) {
-                       RWDEBUG3("&control.%pP incorrect length, expected %zu bytes, got %zu bytes",
+                       RWDEBUG3("control.%pP incorrect length, expected %zu bytes, got %zu bytes",
                                 out, info->min_hash_len, out->vp_length);
                } else {
-                       RWDEBUG2("&control.%s incorrect length, expected %zu bytes, got %zu bytes",
+                       RWDEBUG2("control.%s incorrect length, expected %zu bytes, got %zu bytes",
                                 out->da->name, info->min_hash_len, out->vp_length);
                }
                goto invalid;
@@ -873,11 +873,11 @@ int password_normalise_and_replace(request_t *request, bool normify)
                if (!new) break;                /* Process next input attribute */
 
                if (RDEBUG_ENABLED3) {
-                       RDEBUG3("Replacing &control.%pP with &control.%pP",
+                       RDEBUG3("Replacing control.%pP with control.%pP",
                                known_good, new);
 
                } else {
-                       RDEBUG2("Replacing &control.%s with &control.%s",
+                       RDEBUG2("Replacing control.%s with control.%s",
                                known_good->da->name, new->da->name);
                }
                fr_dcursor_free_item(&cursor);

diff --git a/src/lib/server/process.h b/src/lib/server/process.h
index 7b347a5accf3893e4de2155f678dcfc82ba04a68..7ccb0e81e7322e2d07fcc957e5f9a674e968b6f5 100644 (file)
--- a/src/lib/server/process.h
+++ b/src/lib/server/process.h
@@ -310,7 +310,7 @@ SEND(generic)
                        break;
                }
 
-               RWDEBUG("Ignoring invalid packet-type &reply.%pP", vp);
+               RWDEBUG("Ignoring invalid packet-type reply.%pP", vp);
                goto update_packet_type;
 
        default:

diff --git a/src/lib/server/state.c b/src/lib/server/state.c
index 4c58c4d3decae617b083f35e8b5722a8bd4d81e1..7bccfe9e60426e76ce0b291dc9712becd6a048ff 100644 (file)
--- a/src/lib/server/state.c
+++ b/src/lib/server/state.c
@@ -667,7 +667,7 @@ int fr_state_to_request(fr_state_tree_t *state, request_t *request)
         */
        vp = fr_pair_find_by_da(&request->request_pairs, NULL, state->da);
        if (!vp) {
-               RDEBUG3("No &request.%s attribute, can't restore &session-state", state->da->name);
+               RDEBUG3("No request.%s attribute, can't restore session-state", state->da->name);
                if (request->seq_start == 0) request->seq_start = request->number;      /* Need check for fake requests */
                return 1;
        }
@@ -676,7 +676,7 @@ int fr_state_to_request(fr_state_tree_t *state, request_t *request)
        entry = state_entry_find_and_unlink(state, &vp->data);
        if (!entry) {
                PTHREAD_MUTEX_UNLOCK(&state->mutex);
-               RDEBUG2("No state entry matching &request.%pP found", vp);
+               RDEBUG2("No state entry matching request.%pP found", vp);
                return 2;
        }
        PTHREAD_MUTEX_UNLOCK(&state->mutex);
@@ -712,7 +712,7 @@ int fr_state_to_request(fr_state_tree_t *state, request_t *request)
        entry->thawed = request;
 
        if (!fr_pair_list_empty(&request->session_state_pairs)) {
-               RDEBUG2("Restored &session-state");
+               RDEBUG2("Restored session-state");
                log_request_pair_list(L_DBG_LVL_2, request, NULL, &request->session_state_pairs, "&session-state.");
        }
 
@@ -747,7 +747,7 @@ int fr_request_to_state(fr_state_tree_t *state, request_t *request)
        if (fr_pair_list_empty(&request->session_state_pairs) && fr_dlist_empty(&data)) return 0;
 
        if (!fr_pair_list_empty(&request->session_state_pairs)) {
-               RDEBUG2("Saving &session-state");
+               RDEBUG2("Saving session-state");
                log_request_pair_list(L_DBG_LVL_2, request, NULL, &request->session_state_pairs, "&session-state.");
 
 #ifdef WITH_VERIFY_PTR

diff --git a/src/lib/tls/cache.c b/src/lib/tls/cache.c
index 9e7b0b5399fe87920b998275a0796cae75edaf37..565532041f121500b51df88fa3a3393fb1da5b34 100644 (file)
--- a/src/lib/tls/cache.c
+++ b/src/lib/tls/cache.c
@@ -181,7 +181,7 @@ static int tls_cache_app_data_set(request_t *request, SSL_SESSION *sess, uint32_
        if (RDEBUG_ENABLED2) {
                SESSION_ID(sess_id, sess);
 
-               RDEBUG2("Session ID %pV - Adding &session-state[*] to data", &sess_id);
+               RDEBUG2("Session ID %pV - Adding session-state[*] to data", &sess_id);
                RINDENT();
                log_request_pair_list(L_DBG_LVL_2, request, NULL, &request->session_state_pairs, NULL);
                REXDENT();
@@ -273,7 +273,7 @@ static int tls_cache_app_data_get(request_t *request, SSL_SESSION *sess)
        if (RDEBUG_ENABLED2) {
                SESSION_ID(sess_id, sess);
 
-               RDEBUG2("Session-ID %pV - Restoring &session-state[*]", &sess_id);
+               RDEBUG2("Session-ID %pV - Restoring session-state[*]", &sess_id);
                RINDENT();
                log_request_pair_list(L_DBG_LVL_2, request, NULL, &tmp, "&session-state.");
                REXDENT();
@@ -1040,7 +1040,7 @@ int fr_tls_cache_disable_cb(SSL *ssl, int is_forward_secure)
 
        vp = fr_pair_find_by_da(&request->control_pairs, NULL, attr_allow_session_resumption);
        if (vp && (vp->vp_uint32 == 0)) {
-               RDEBUG2("&control.Allow-Session-Resumption == no, denying session resumption");
+               RDEBUG2("control.Allow-Session-Resumption == no, denying session resumption");
        disable:
                SSL_CTX_remove_session(tls_session->ctx, tls_session->session);
                tls_session->allow_session_resumption = false;

diff --git a/src/lib/tls/session.c b/src/lib/tls/session.c
index 46cbb29e338993480a73a9594200e12b5d9bd471..dbef8a1be6f9ed28785c7ee4f6443bdfbfbda45c 100644 (file)
--- a/src/lib/tls/session.c
+++ b/src/lib/tls/session.c
@@ -553,7 +553,7 @@ void fr_tls_session_info_cb(SSL const *ssl, int where, int ret)
 
                        MEM(pair_update_request(&vp, attr_tls_client_error_code) >= 0);
                        vp->vp_uint8 = ret & 0xff;
-                       ROPTIONAL(RDEBUG2, DEBUG2, "&TLS-Client-Error-Code := %pV", &vp->data);
+                       ROPTIONAL(RDEBUG2, DEBUG2, "TLS-Client-Error-Code := %pV", &vp->data);
                /*
                 *      We're sending the client an alert.
                 */
@@ -1230,7 +1230,7 @@ static unlang_action_t tls_session_async_handshake_done_round(UNUSED rlm_rcode_t
                RINDENT();
                MEM(pair_update_session_state(&vp, attr_tls_session_cipher_suite) >= 0);
                fr_pair_value_strdup(vp,  SSL_CIPHER_get_name(cipher), false);
-               RDEBUG2("&session-state.%pP", vp);
+               RDEBUG2("session-state.%pP", vp);
 
                if (((size_t)tls_session->info.version >= NUM_ELEMENTS(tls_version_str)) ||
                    !tls_version_str[tls_session->info.version]) {
@@ -1241,7 +1241,7 @@ static unlang_action_t tls_session_async_handshake_done_round(UNUSED rlm_rcode_t
 
                MEM(pair_update_session_state(&vp, attr_tls_session_version) >= 0);
                fr_pair_value_strdup(vp, version, false);
-               RDEBUG2("&session-state.%pP", vp);
+               RDEBUG2("session-state.%pP", vp);
                REXDENT();
 
                /*

diff --git a/src/lib/unlang/xlat_builtin.c b/src/lib/unlang/xlat_builtin.c
index 33d5c04cc6e515cbca81602340d15a08204ce461..ffa97d608820772518b80b53ba0eee8e697118e0 100644 (file)
--- a/src/lib/unlang/xlat_builtin.c
+++ b/src/lib/unlang/xlat_builtin.c
@@ -129,7 +129,7 @@ void xlat_debug_attr_vp(request_t *request, fr_pair_t *vp, tmpl_t const *vpt)
        switch (vp->vp_type) {
        case FR_TYPE_STRUCTURAL:
                if (vpt) {
-                       RIDEBUG2("&%s.%s = {",
+                       RIDEBUG2("%s.%s = {",
                                 tmpl_list_name(tmpl_list(vpt), "<INVALID>"),
                                 vp->da->name);
                } else {
@@ -143,7 +143,7 @@ void xlat_debug_attr_vp(request_t *request, fr_pair_t *vp, tmpl_t const *vpt)
 
        default:
                if (vpt) {
-                       RIDEBUG2("&%s.%s = %pV",
+                       RIDEBUG2("%s.%s = %pV",
                                 tmpl_list_name(tmpl_list(vpt), "<INVALID>"),
                                 vp->da->name,
                                 &vp->data);

diff --git a/src/lib/unlang/xlat_pair.c b/src/lib/unlang/xlat_pair.c
index da3a48948135cca202e585d5cffad878447c8b2e..35ef2f520c49d976519f4234374088a6adfc6816 100644 (file)
--- a/src/lib/unlang/xlat_pair.c
+++ b/src/lib/unlang/xlat_pair.c
@@ -122,7 +122,7 @@ int xlat_decode_value_box_list(TALLOC_CTX *ctx, fr_pair_list_t *out,
                char const *name = parent->name;
 
                while ((vp = fr_pair_list_next(&head, vp))) {
-                       RDEBUG2("decode %s: &%pP", name, vp);
+                       RDEBUG2("decode %s: %pP", name, vp);
                }
        }
 

diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index bddb466012355efd65b87ad783c546339d8d0943..b244f69a9d128f1e8846bc1ac9b8baa10abb0a81 100644 (file)
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -863,7 +863,7 @@ finish:
                case FR_CACHE_ALLOW_MERGE:
                case FR_CACHE_ALLOW_INSERT:
                case FR_CACHE_MERGE_NEW:
-                       RDEBUG2("Removing &control.%s", vp->da->name);
+                       RDEBUG2("Removing control.%s", vp->da->name);
                        vp = fr_dcursor_remove(&cursor);
                        talloc_free(vp);
                        vp = fr_dcursor_current(&cursor);
@@ -1024,7 +1024,7 @@ static void cache_unref(request_t *request, rlm_cache_t const *inst, rlm_cache_e
                case FR_CACHE_ALLOW_MERGE:
                case FR_CACHE_ALLOW_INSERT:
                case FR_CACHE_MERGE_NEW:
-                       RDEBUG2("Removing &control:%s", vp->da->name);
+                       RDEBUG2("Removing control:%s", vp->da->name);
                        vp = fr_dcursor_remove(&cursor);
                        TALLOC_FREE(vp);
                        vp = fr_dcursor_current(&cursor);

diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c
index 770156e5666917114753a2976460ecd582b8837c..25311ea556623ce65937896e8286c8a05c9aa08c 100644 (file)
--- a/src/modules/rlm_chap/rlm_chap.c
+++ b/src/modules/rlm_chap/rlm_chap.c
@@ -159,7 +159,7 @@ static xlat_action_t xlat_func_chap_password(TALLOC_CTX *ctx, fr_dcursor_t *out,
                challenge_len = env_data->chap_challenge.vb_length;
        } else {
                if (env_data->chap_challenge.type == FR_TYPE_OCTETS)
-                       RWDEBUG("&request.CHAP-Challenge shorter than minimum length (%ld)", inst->min_challenge_len);
+                       RWDEBUG("request.CHAP-Challenge shorter than minimum length (%ld)", inst->min_challenge_len);
                challenge = request->packet->vector;
                challenge_len = RADIUS_AUTH_VECTOR_LENGTH;
        }
@@ -241,23 +241,23 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
        size_t                  challenge_len;
 
        if (env_data->username.type != FR_TYPE_STRING) {
-               REDEBUG("&User-Name attribute is required for authentication");
+               REDEBUG("User-Name attribute is required for authentication");
                RETURN_MODULE_INVALID;
        }
 
        if (env_data->chap_password.type != FR_TYPE_OCTETS) {
-               REDEBUG("You set '&control.Auth-Type = CHAP' for a request that "
+               REDEBUG("You set 'control.Auth-Type = CHAP' for a request that "
                        "does not contain a CHAP-Password attribute!");
                RETURN_MODULE_INVALID;
        }
 
        if (env_data->chap_password.vb_length == 0) {
-               REDEBUG("&request.CHAP-Password is empty");
+               REDEBUG("request.CHAP-Password is empty");
                RETURN_MODULE_INVALID;
        }
 
        if (env_data->chap_password.vb_length != FR_CHAP_CHALLENGE_LENGTH + 1) {
-               REDEBUG("&request.CHAP-Password has invalid length");
+               REDEBUG("request.CHAP-Password has invalid length");
                RETURN_MODULE_INVALID;
        }
 
@@ -289,7 +289,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
                challenge_len = env_data->chap_challenge.vb_length;
        } else {
                if (env_data->chap_challenge.type == FR_TYPE_OCTETS)
-                       RWDEBUG("&request.CHAP-Challenge shorter than minimum length (%ld)", inst->min_challenge_len);
+                       RWDEBUG("request.CHAP-Challenge shorter than minimum length (%ld)", inst->min_challenge_len);
                challenge = request->packet->vector;
                challenge_len = RADIUS_AUTH_VECTOR_LENGTH;
        }
@@ -306,7 +306,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
                size_t          length;
 
                if (env_data->chap_challenge.type == FR_TYPE_OCTETS) {
-                       RDEBUG2("Using challenge from &request.CHAP-Challenge");
+                       RDEBUG2("Using challenge from request.CHAP-Challenge");
                        p = env_data->chap_challenge.vb_octets;
                        length = env_data->chap_challenge.vb_length;
                } else {

diff --git a/src/modules/rlm_dhcpv4/rlm_dhcpv4.c b/src/modules/rlm_dhcpv4/rlm_dhcpv4.c
index 87c14390c62c87bc45580335ac3bcdb85566515a..211eabc8a0816cb0fb4eb884b89b3509f94e7c99 100644 (file)
--- a/src/modules/rlm_dhcpv4/rlm_dhcpv4.c
+++ b/src/modules/rlm_dhcpv4/rlm_dhcpv4.c
@@ -195,7 +195,7 @@ static unlang_action_t CC_HINT(nonnull) mod_process(rlm_rcode_t *p_result, modul
         */
        vp = fr_pair_find_by_da_nested(&request->control_pairs, NULL, attr_net_dst_ip);
        if (!vp || (vp->vp_ip.af != AF_INET)) {
-               RDEBUG("No &control.Net.Dst.IP, cannot relay packet");
+               RDEBUG("No control.Net.Dst.IP, cannot relay packet");
                RETURN_MODULE_NOOP;
        }
 

diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
index cb9d98f7a1b273363dbd926cac1e4522c879bbeb..63b6482ce5c5f79fa5119992e575ad863473ed6f 100644 (file)
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -673,7 +673,7 @@ static unlang_action_t eap_method_select(rlm_rcode_t *p_result, module_ctx_t con
                 */
                vp = fr_pair_find_by_da(&eap_session->request->control_pairs, NULL, attr_eap_type);
                if (vp) {
-                       RDEBUG2("Using method from &control.EAP-Type");
+                       RDEBUG2("Using method from control.EAP-Type");
                        next = vp->vp_uint32;
                /*
                 *      We have an array of the submodules which
@@ -756,7 +756,7 @@ static unlang_action_t eap_method_select(rlm_rcode_t *p_result, module_ctx_t con
                        RDEBUG2("Peer started EAP type %s (%d) without sending an Identity", eap_type2name(type->num), type->num);
                        vp = fr_pair_find_by_da(&eap_session->request->control_pairs, NULL, attr_eap_type);
                        if (vp) {
-                               RDEBUG2("Using method from &control.EAP-Type");
+                               RDEBUG2("Using method from control.EAP-Type");
                                next = vp->vp_uint32;
                        }
                        goto do_init;

diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
index 04f67c76fb0466a128f2866a210f76a59871b683..df329a4d3e4e4c8f8cdd1e80692c22b6ade0983b 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
+++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
@@ -649,13 +649,13 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons
         */
        auth_challenge = fr_pair_find_by_da_nested(&parent->control_pairs, NULL, attr_ms_chap_challenge);
        if (auth_challenge && (auth_challenge->vp_length != MSCHAPV2_CHALLENGE_LEN)) {
-               RWDEBUG("&parent.control.MS-CHAP-Challenge is incorrect length.  Ignoring it");
+               RWDEBUG("parent.control.MS-CHAP-Challenge is incorrect length.  Ignoring it");
                auth_challenge = NULL;
        }
 
        peer_challenge = fr_pair_find_by_da_nested(&parent->control_pairs, NULL, attr_ms_chap_peer_challenge);
        if (peer_challenge && (peer_challenge->vp_length != MSCHAPV2_CHALLENGE_LEN)) {
-               RWDEBUG("&parent.control.MS-CHAP-Peer-Challenge is incorrect length.  Ignoring it");
+               RWDEBUG("parent.control.MS-CHAP-Peer-Challenge is incorrect length.  Ignoring it");
                peer_challenge = NULL;
        }
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
index e5f6ed03242fd2239a4e62d98e7226757f98b3c3..e91e6639336f24058cbd2afc578ea47f4a495c74 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -573,7 +573,7 @@ unlang_action_t eap_peap_process(rlm_rcode_t *p_result, request_t *request,
        if (t->username) {
                vp = fr_pair_copy(child->request_ctx, t->username);
                fr_pair_append(&child->request_pairs, vp);
-               RDEBUG2("Setting &request.User-Name from tunneled (inner) identity \"%s\"",
+               RDEBUG2("Setting request.User-Name from tunneled (inner) identity \"%s\"",
                        vp->vp_strvalue);
        } else {
                RDEBUG2("No tunnel username (SSL resumption?)");

diff --git a/src/modules/rlm_ldap/groups.c b/src/modules/rlm_ldap/groups.c
index 6f7f593885736337a88c497ade7998c9da10fc47..5d84fa476ab52cc75705ac8ccd6aebda8f1f5f22 100644 (file)
--- a/src/modules/rlm_ldap/groups.c
+++ b/src/modules/rlm_ldap/groups.c
@@ -358,7 +358,7 @@ static unlang_action_t ldap_cacheable_userobj_store(rlm_rcode_t *p_result, reque
                for (vp = fr_pair_list_head(&group_ctx->groups);
                     vp;
                     vp = fr_pair_list_next(&group_ctx->groups, vp)) {
-                       RDEBUG2("&control.%s += \"%pV\"", group_ctx->inst->group.cache_da->name, &vp->data);
+                       RDEBUG2("control.%s += \"%pV\"", group_ctx->inst->group.cache_da->name, &vp->data);
                }
        }
 
@@ -662,7 +662,7 @@ static unlang_action_t ldap_cacheable_groupobj_resume(rlm_rcode_t *p_result, UNU
                        fr_pair_value_strdup(vp, dn, false);
 
                        RINDENT();
-                       RDEBUG2("&control.%pP", vp);
+                       RDEBUG2("control.%pP", vp);
                        REXDENT();
                        ldap_memfree(dn);
                }
@@ -677,7 +677,7 @@ static unlang_action_t ldap_cacheable_groupobj_resume(rlm_rcode_t *p_result, UNU
                        fr_pair_value_bstrndup(vp, values[0]->bv_val, values[0]->bv_len, true);
 
                        RINDENT();
-                       RDEBUG2("&control.%pP", vp);
+                       RDEBUG2("control.%pP", vp);
                        REXDENT();
 
                        ldap_value_free_len(values);

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index b7d48c3575ac3dde38b4f8c53ba84cd66a8d78a2..16a59397aa739a351e30459bca94982a5d136d52 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -1667,7 +1667,7 @@ static unlang_action_t mod_authorize_resume(rlm_rcode_t *p_result, UNUSED int *p
                                                                         fr_ldap_thread_t);
 
                        if (!password) {
-                               REDEBUG("Failed to find &control.Password.Cleartext");
+                               REDEBUG("Failed to find control.Password.Cleartext");
                                rcode = RLM_MODULE_FAIL;
                                goto finish;
                        }

diff --git a/src/modules/rlm_ldap/user.c b/src/modules/rlm_ldap/user.c
index bbdd989b0f96f0da8f23e9179f16ebd92f85e796..283b6cafdbf6e61203215505e1844866d3d9286b 100644 (file)
--- a/src/modules/rlm_ldap/user.c
+++ b/src/modules/rlm_ldap/user.c
@@ -279,7 +279,7 @@ void rlm_ldap_check_reply(request_t *request, rlm_ldap_t const *inst, char const
                        RWDEBUG2("!!!  - Configure authentication via wbclient (mschapv2 only)");
                        RWDEBUG2("!!!  - Bind as the user by listing %s in an 'authenticate %s' section, and",
                                 inst_name, inst_name);
-                       RWDEBUG2("!!!   setting attribute &control.Auth-Type := '%s' in the 'recv Access-Request' section",
+                       RWDEBUG2("!!!   setting attribute control.Auth-Type := '%s' in the 'recv Access-Request' section",
                                 inst_name);
                        RWDEBUG2("!!!    (pap only)");
 
@@ -293,7 +293,7 @@ void rlm_ldap_check_reply(request_t *request, rlm_ldap_t const *inst, char const
                        RWDEBUG2("!!!    eDir server (recommended)");
                        RWDEBUG2("!!!  - Bind as the user by listing %s in an 'authenticate %s' section, and",
                                 inst_name, inst_name);
-                       RWDEBUG2("!!!   setting attribute &control.Auth-Type := '%s' in the 'recv Access-Request' section",
+                       RWDEBUG2("!!!   setting attribute control.Auth-Type := '%s' in the 'recv Access-Request' section",
                                 inst_name);
                        RWDEBUG("!!!    (pap only)");
                        break;
@@ -309,7 +309,7 @@ void rlm_ldap_check_reply(request_t *request, rlm_ldap_t const *inst, char const
                                 ttrunk->config.admin_identity ? '"' : '\0');
                        RWDEBUG2("!!!  - Bind as the user by listing %s in an 'authenticate %s' section, and",
                                 inst_name, inst_name);
-                       RWDEBUG2("!!!    setting attribute &control.Auth-Type := '%s' in the 'recv Access-Request' section",
+                       RWDEBUG2("!!!    setting attribute control.Auth-Type := '%s' in the 'recv Access-Request' section",
                                 inst_name);
                        RWDEBUG2("!!!    (pap only)");
                        break;

diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index d42c76e687a898252f0b834fb4c0da1d57f80a57..94a24b1e2329409106d4048f19edc4a838ba9bc5 100644 (file)
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -804,7 +804,7 @@ static void mppe_add_reply(UNUSED rlm_mschap_t const *inst,
        MEM(pair_update_reply(&vp, da) >= 0);
        fr_pair_value_memdup(vp, value, len, false);
        RINDENT();
-       RDEBUG2("&reply.%pP", vp);
+       RDEBUG2("reply.%pP", vp);
        REXDENT();
 }
 
@@ -1516,7 +1516,7 @@ static int CC_HINT(nonnull(1, 2, 3)) nt_password_find(TALLOC_CTX *ctx, fr_pair_t
                        /*
                         *      If we're doing internal auth, then this is an issue
                         */
-                       RWDEBUG2("No &control.%s or &control.%s found.  Cannot create Password.NT",
+                       RWDEBUG2("No control.%s or control.%s found.  Cannot create Password.NT",
                                 attr_cleartext_password->name, attr_nt_password->name);
                        return -1;
 
@@ -1546,10 +1546,10 @@ found_password:
                }
 
                if (RDEBUG_ENABLED3) {
-                       RDEBUG3("Hashed &control.%pP to create %s = %pV",
+                       RDEBUG3("Hashed control.%pP to create %s = %pV",
                                password, attr_nt_password->name, fr_box_octets(p, NT_DIGEST_LENGTH));
                } else {
-                       RDEBUG2("Hashed &control.%s to create %s", attr_nt_password->name, password->da->name);
+                       RDEBUG2("Hashed control.%s to create %s", attr_nt_password->name, password->da->name);
                }
 
                if (ephemeral) TALLOC_FREE(password);
@@ -1562,9 +1562,9 @@ found_password:
        fr_assert(password->da == attr_nt_password);
 
        if (RDEBUG_ENABLED3) {
-               RDEBUG3("Found &control.%pP", password);
+               RDEBUG3("Found control.%pP", password);
        } else {
-               RDEBUG2("Found &control.%s", attr_nt_password->name);
+               RDEBUG2("Found control.%s", attr_nt_password->name);
        }
        *out = password;
 
@@ -1967,7 +1967,7 @@ static unlang_action_t mod_authenticate_resume(rlm_rcode_t *p_result, UNUSED int
 
        challenge = fr_pair_find_by_da_nested(&request->request_pairs, NULL, tmpl_attr_tail_da(env_data->chap_challenge));
        if (!challenge) {
-               REDEBUG("&control.Auth-Type = %s set for a request that does not contain &%s",
+               REDEBUG("control.Auth-Type = %s set for a request that does not contain %s",
                        auth_ctx->name, env_data->chap_challenge->name);
                rcode = RLM_MODULE_INVALID;
                goto finish;
@@ -1997,7 +1997,7 @@ static unlang_action_t mod_authenticate_resume(rlm_rcode_t *p_result, UNUSED int
                                           challenge, response);
                if (rcode != RLM_MODULE_OK) goto finish;
        } else {                /* Neither CHAPv1 or CHAPv2 response: die */
-               REDEBUG("&control.Auth-Type = %s set for a request that does not contain &%s or &%s attributes",
+               REDEBUG("control.Auth-Type = %s set for a request that does not contain %s or %s attributes",
                        auth_ctx->name, env_data->chap_response->name, env_data->chap2_response->name);
                rcode = RLM_MODULE_INVALID;
                goto finish;

diff --git a/src/modules/rlm_ocsp/ocsp.c b/src/modules/rlm_ocsp/ocsp.c
index 3c1836796f7d276064ab2024b9eaa9570e9b5be2..9ac235e2ae0eb8c3ef37d3c8ecde712651696c59 100644 (file)
--- a/src/modules/rlm_ocsp/ocsp.c
+++ b/src/modules/rlm_ocsp/ocsp.c
@@ -167,7 +167,7 @@ static int ocsp_staple_to_pair(fr_pair_t **out, request_t *request, OCSP_RESPONS
 
        RDEBUG2("Serializing OCSP response");
        RINDENT();
-       RDEBUG2("&%pP", vp);
+       RDEBUG2("%pP", vp);
        REXDENT();
 
        *out = vp;
@@ -394,11 +394,11 @@ int fr_tls_ocsp_check(request_t *request, SSL *ssl,
        vp = fr_pair_find_by_da(&request->control_pairs, NULL, attr_tls_ocsp_cert_valid);
        if (vp) switch (vp->vp_uint32) {
        case 0: /* no */
-               RDEBUG2("Found &control.TLS-OCSP-Cert-Valid = no, forcing OCSP failure");
+               RDEBUG2("Found control.TLS-OCSP-Cert-Valid = no, forcing OCSP failure");
                return OCSP_STATUS_FAILED;
 
        case 1: /* yes */
-               RDEBUG2("Found &control.TLS-OCSP-Cert-Valid = yes, forcing OCSP success");
+               RDEBUG2("Found control.TLS-OCSP-Cert-Valid = yes, forcing OCSP success");
 
                /*
                 *      If this fails, and an OCSP stapled response is required,
@@ -407,7 +407,7 @@ int fr_tls_ocsp_check(request_t *request, SSL *ssl,
                if (staple_response) {
                        vp = fr_pair_find_by_da(&request->control_pairs, NULL, attr_tls_ocsp_response);
                        if (!vp) {
-                               RDEBUG2("No &control.TLS-OCSP-Response attribute found, performing full OCSP check");
+                               RDEBUG2("No control.TLS-OCSP-Response attribute found, performing full OCSP check");
                                break;
                        }
                        if (ocsp_staple_from_pair(request, ssl, vp) < 0) {
@@ -419,7 +419,7 @@ int fr_tls_ocsp_check(request_t *request, SSL *ssl,
                return OCSP_STATUS_OK;
 
        case 2: /* skipped */
-               RDEBUG2("Found &control.TLS-OCSP-Cert-Valid = skipped, skipping OCSP check");
+               RDEBUG2("Found control.TLS-OCSP-Cert-Valid = skipped, skipping OCSP check");
                return conf->softfail ? OCSP_STATUS_OK : OCSP_STATUS_FAILED;
 
        case 3: /* unknown */
@@ -644,13 +644,13 @@ int fr_tls_ocsp_check(request_t *request, SSL *ssl,
                        MEM(pair_update_request(&vp, attr_tls_ocsp_next_update) >= 0);
                        vp->vp_uint32 = next - fr_time_to_sec(now);
                        RINDENT();
-                       RDEBUG2("&%pP", vp);
+                       RDEBUG2("%pP", vp);
                        REXDENT();
                } else {
-                       RDEBUG2("Update time is in the past.  Not adding &TLS-OCSP-Next-Update");
+                       RDEBUG2("Update time is in the past.  Not adding TLS-OCSP-Next-Update");
                }
        } else {
-               RDEBUG2("Update time not provided.  Not adding &TLS-OCSP-Next-Update");
+               RDEBUG2("Update time not provided.  Not adding TLS-OCSP-Next-Update");
        }
 
        switch (status) {

diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c
index db2192a30ae0e18ba5fb1fa71bed6f6298782a6c..b8e5f52f99f5c03c0c1f9ff8c217ff1287803d8f 100644 (file)
--- a/src/modules/rlm_rest/rest.c
+++ b/src/modules/rlm_rest/rest.c
@@ -662,7 +662,7 @@ static int rest_decode_plain(UNUSED rlm_rest_t const *inst, UNUSED rlm_rest_sect
        MEM(pair_update_request(&vp, attr_rest_http_body) >= 0);
        fr_pair_value_bstrndup(vp, raw, rawlen, true);
 
-       RDEBUG2("&%pP", vp);
+       RDEBUG2("%pP", vp);
 
        return 1;
 }
@@ -1155,7 +1155,7 @@ static int json_pair_alloc(rlm_rest_t const *instance, rlm_rest_section_t const
                                        if (!vp) continue;
                                }
                                RINDENT();
-                               RDEBUG2("&%s:%pP", tmpl_list_name(tmpl_list(dst), ""), vp);
+                               RDEBUG2("%s:%pP", tmpl_list_name(tmpl_list(dst), ""), vp);
                                REXDENT();
 
                                fr_pair_list_init(&tmp_list);

diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
index 2babe01b088187acb3458170bc328856cd777858..cb61216dd80a754d73dc3dc40ff27a33287918b2 100644 (file)
--- a/src/modules/rlm_rest/rlm_rest.c
+++ b/src/modules/rlm_rest/rlm_rest.c
@@ -319,12 +319,12 @@ static int rlm_rest_status_update(request_t *request, void *handle)
        code = rest_get_handle_code(handle);
        if (!code) {
                pair_delete_request(attr_rest_http_status_code);
-               RDEBUG2("&request.REST-HTTP-Status-Code !* ANY");
+               RDEBUG2("request.REST-HTTP-Status-Code !* ANY");
                REXDENT();
                return -1;
        }
 
-       RDEBUG2("&request.REST-HTTP-Status-Code := %i", code);
+       RDEBUG2("request.REST-HTTP-Status-Code := %i", code);
 
        MEM(pair_update_request(&vp, attr_rest_http_status_code) >= 0);
        vp->vp_uint32 = code;

diff --git a/src/modules/rlm_sigtran/client.c b/src/modules/rlm_sigtran/client.c
index a3b2e80bb4b1a6d92238adc714d04fa8b89bc3e0..88f05717a3748a8493bd13f6935fdbadec5f8707 100644 (file)
--- a/src/modules/rlm_sigtran/client.c
+++ b/src/modules/rlm_sigtran/client.c
@@ -307,19 +307,19 @@ static unlang_action_t sigtran_client_map_resume(rlm_rcode_t *p_result, module_c
                                MEM(vp = fr_pair_afrom_da(request->control_ctx, attr_eap_aka_sim_rand));
                                MEM(fr_pair_value_memdup_buffer(vp, vec->sim.rand, true) == 0);
                                TALLOC_FREE(vec->sim.rand);
-                               RDEBUG2("&control.%pP", vp);
+                               RDEBUG2("control.%pP", vp);
                                fr_pair_append(&request->control_pairs, vp);
 
                                MEM(vp = fr_pair_afrom_da(request->control_ctx, attr_eap_aka_sim_sres));
                                MEM(fr_pair_value_memdup_buffer(vp, vec->sim.sres, true) == 0);
                                TALLOC_FREE(vec->sim.sres);
-                               RDEBUG2("&control.%pP", vp);
+                               RDEBUG2("control.%pP", vp);
                                fr_pair_append(&request->control_pairs, vp);
 
                                MEM(vp = fr_pair_afrom_da(request->control_ctx, attr_eap_aka_sim_kc));
                                MEM(fr_pair_value_memdup_buffer(vp, vec->sim.kc, true) == 0);
                                TALLOC_FREE(vec->sim.kc);
-                               RDEBUG2("&control.%pP", vp);
+                               RDEBUG2("control.%pP", vp);
                                fr_pair_append(&request->control_pairs, vp);
                                REXDENT();
 
@@ -338,31 +338,31 @@ static unlang_action_t sigtran_client_map_resume(rlm_rcode_t *p_result, module_c
                                MEM(vp = fr_pair_afrom_da(request->control_ctx, attr_eap_aka_sim_rand));
                                MEM(fr_pair_value_memdup_buffer(vp, vec->umts.rand, true) == 0);
                                TALLOC_FREE(vec->umts.rand);
-                               RDEBUG2("&control.%pP", vp);
+                               RDEBUG2("control.%pP", vp);
                                fr_pair_append(&request->control_pairs, vp);
 
                                MEM(vp = fr_pair_afrom_da(request->control_ctx, attr_eap_aka_sim_xres));
                                MEM(fr_pair_value_memdup_buffer(vp, vec->umts.xres, true) == 0);
                                TALLOC_FREE(vec->umts.xres);
-                               RDEBUG2("&control.%pP", vp);
+                               RDEBUG2("control.%pP", vp);
                                fr_pair_append(&request->control_pairs, vp);
 
                                MEM(vp = fr_pair_afrom_da(request->control_ctx, attr_eap_aka_sim_ck));
                                MEM(fr_pair_value_memdup_buffer(vp, vec->umts.ck, true) == 0);
                                TALLOC_FREE(vec->umts.ck);
-                               RDEBUG2("&control.%pP", vp);
+                               RDEBUG2("control.%pP", vp);
                                fr_pair_append(&request->control_pairs, vp);
 
                                MEM(vp = fr_pair_afrom_da(request->control_ctx, attr_eap_aka_sim_ik));
                                MEM(fr_pair_value_memdup_buffer(vp, vec->umts.ik, true) == 0);
                                TALLOC_FREE(vec->umts.ik);
-                               RDEBUG2("&control.%pP", vp);
+                               RDEBUG2("control.%pP", vp);
                                fr_pair_append(&request->control_pairs, vp);
 
                                MEM(vp = fr_pair_afrom_da(request->control_ctx, attr_eap_aka_sim_autn));
                                MEM(fr_pair_value_memdup_buffer(vp, vec->umts.authn, true) == 0);
                                TALLOC_FREE(vec->umts.authn);
-                               RDEBUG2("&control.%pP", vp);
+                               RDEBUG2("control.%pP", vp);
                                fr_pair_append(&request->control_pairs, vp);
                                REXDENT();
 

diff --git a/src/modules/rlm_smtp/rlm_smtp.c b/src/modules/rlm_smtp/rlm_smtp.c
index c29d039f246b55c2f29abd5e6220f2b7f02c3d6f..6564adaa02a6bc063d9fb955f034bec39e5b7ca8 100644 (file)
--- a/src/modules/rlm_smtp/rlm_smtp.c
+++ b/src/modules/rlm_smtp/rlm_smtp.c
@@ -346,10 +346,10 @@ static int recipients_source(fr_mail_ctx_t *uctx, rlm_smtp_env_t const *call_env
         *      If any recipients were found, ignore to cc and bcc, return the amount added.
         **/
        if (recipients_set) {
-               RDEBUG2("Recipients were generated from \"&SMTP-Recipients\" and/or recipients in the config");
+               RDEBUG2("Recipients were generated from \"SMTP-Recipients\" and/or recipients in the config");
                return recipients_set;
        }
-       RDEBUG2("No addresses were found in \"&SMTP-Recipients\"");
+       RDEBUG2("No addresses were found in \"SMTP-Recipients\"");
 
        /*
         *      Try to load the to: addresses into the envelope recipients if they are set

diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
index c0f1a6590cd92cd855d5d20af8818d2377042da0..e4e75b347d9fe195b8e689f1205986d82395d9d0 100644 (file)
--- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
+++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
@@ -368,7 +368,7 @@ static unlang_action_t mod_authorize_resume(rlm_rcode_t *p_result, UNUSED int *p
 
                fr_value_box_cast(vp, &vp->data, vp->data.type, NULL, &vb);
 
-               RDEBUG2("&%pP", vp);
+               RDEBUG2("%pP", vp);
 
                RETURN_MODULE_UPDATED;
        }

diff --git a/src/modules/rlm_yubikey/rlm_yubikey.c b/src/modules/rlm_yubikey/rlm_yubikey.c
index 5806b080de1f9d079885f4c026342b0eb945fb8e..dcdcf76cb937a84b26e79312e881f97a4ca0f7cf 100644 (file)
--- a/src/modules/rlm_yubikey/rlm_yubikey.c
+++ b/src/modules/rlm_yubikey/rlm_yubikey.c
@@ -344,8 +344,8 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
                 */
                MEM(fr_pair_value_bstr_realloc(password, NULL, password_len) == 0);
 
-               RDEBUG2("&request.%pP", vp);
-               RDEBUG2("&request.%pP", password);
+               RDEBUG2("request.%pP", vp);
+               RDEBUG2("request.%pP", password);
 
                /*
                 *      So the ID split code works on the non password portion.
@@ -362,7 +362,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
        if (inst->id_len) {
                MEM(pair_update_request(&vp, attr_yubikey_public_id) >= 0);
                fr_pair_value_bstrndup(vp, passcode, inst->id_len, true);
-               RDEBUG2("&request.%pP", vp);
+               RDEBUG2("request.%pP", vp);
        }
 
        if (!inst->auth_type) {

diff --git a/src/process/dhcpv6/base.c b/src/process/dhcpv6/base.c
index fd2117bb6f0e1b583bcfb8001e454a82ef1cd4af..f937cc678ed87d14da4e3aaf1cc5bd0d33c525b0 100644 (file)
--- a/src/process/dhcpv6/base.c
+++ b/src/process/dhcpv6/base.c
@@ -466,7 +466,7 @@ int restore_field(request_t *request, fr_pair_t **to_restore)
        vp = fr_pair_find_by_da(&request->reply_pairs, NULL, (*to_restore)->da);
        if (vp) {
                if (fr_pair_cmp(vp, *to_restore) != 0) {
-                       RWDEBUG("&reply.%pP does not match &request.%pP", vp, *to_restore);
+                       RWDEBUG("reply.%pP does not match request.%pP", vp, *to_restore);
                free:
                        talloc_free(*to_restore);
                        *to_restore = NULL;

diff --git a/src/process/radius/base.c b/src/process/radius/base.c
index 62f561c12cac67b51ec98695789b7f46a9367675..2538e173849f674735460c36ccdf7e939913d5ff 100644 (file)
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -294,7 +294,7 @@ void radius_request_pairs_to_reply(request_t *request, process_radius_request_pa
                MEM(vp = fr_pair_afrom_da(request->reply_ctx, attr_proxy_state));
                fr_value_box_copy(vp, &vp->data, proxy_state_value);
                fr_pair_append(&request->reply_pairs, vp);
-               RDEBUG3("&reply.%pP", vp);
+               RDEBUG3("reply.%pP", vp);
        }
        REXDENT();
 }