Use TALLOC_FREE() to free and reset single fr_pair_t

diff --git a/src/lib/server/password.c b/src/lib/server/password.c
index 2e95f8659e8a006c200b9a5055519934d729e8c0..bf1bc466d1ebfd622ed1553f380bb60e8da8c5a1 100644 (file)
--- a/src/lib/server/password.c
+++ b/src/lib/server/password.c
@@ -549,7 +549,7 @@ static fr_pair_t *password_process_sha2(TALLOC_CTX *ctx, request_t *request, fr_
                if (!out) return NULL;
 
                normalised = password_process_sha2(ctx, request, out);
-               talloc_list_free(&out);
+               TALLOC_FREE(out);
 
                return normalised;
        }
@@ -595,7 +595,7 @@ static fr_pair_t *password_process_sha3(TALLOC_CTX *ctx, request_t *request, fr_
                if (!out) return NULL;
 
                normalised = password_process_sha3(ctx, request, out);
-               talloc_list_free(&out);
+               TALLOC_FREE(out);
 
                return normalised;
        }
@@ -779,10 +779,10 @@ static fr_pair_t *password_process(TALLOC_CTX *ctx, request_t *request, fr_pair_
                 *      operations.
                 */
                if (!from_recurse) {
-                       if (from_func != known_good) talloc_list_free(&from_func);
+                       if (from_func != known_good) TALLOC_FREE(from_func);
                        return NULL;
                }
-               if ((from_func != known_good) && (from_recurse != from_func)) talloc_list_free(&from_func);
+               if ((from_func != known_good) && (from_recurse != from_func)) TALLOC_FREE(from_func);
 
                return from_recurse;
        }
@@ -812,7 +812,7 @@ static fr_pair_t *password_process(TALLOC_CTX *ctx, request_t *request, fr_pair_
                                 out->da->name, MIN_LEN(info), out->vp_length);
                }
        invalid:
-               if (out != known_good) talloc_list_free(&out);  /* Free attribute we won't be returning */
+               if (out != known_good) TALLOC_FREE(out);        /* Free attribute we won't be returning */
                return NULL;
        }
 
@@ -913,7 +913,7 @@ static fr_pair_t *password_normalise_and_recheck(TALLOC_CTX *ctx, request_t *req
                /*
                 *      New attribute not in our allowed list
                 */
-               talloc_list_free(&new);         /* da didn't match, treat as ephemeral */
+               TALLOC_FREE(new);               /* da didn't match, treat as ephemeral */
                return NULL;                    /* Process next input attribute */
        }
 
@@ -936,7 +936,7 @@ static fr_pair_t *password_normalise_and_recheck(TALLOC_CTX *ctx, request_t *req
  * pair *MUST* be freed, or added to one of the pair lists appropriate to the
  * ctx passed in.
  *
- * @param[out] ephemeral       If true, the caller must use talloc_list_free
+ * @param[out] ephemeral       If true, the caller must use TALLOC_FREE
  *                             to free the return value of this function.
  *                             Alternatively 'ctx' can be freed, which is
  *                             simpler and cleaner, but some people have

diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c
index 1d7e90951890a15bc066b778a793f978c1caf7cc..cd82ece3c271dbfa9a9549bbabe1535cf7dc538b 100644 (file)
--- a/src/modules/rlm_chap/rlm_chap.c
+++ b/src/modules/rlm_chap/rlm_chap.c
@@ -269,7 +269,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
         *      password and chap response.
         */
        ret = fr_digest_cmp(pass_str + 1, chap->vp_octets + 1, RADIUS_CHAP_CHALLENGE_LENGTH);
-       if (ephemeral) talloc_list_free(&known_good);
+       if (ephemeral) TALLOC_FREE(known_good);
        if (ret != 0) {
                REDEBUG("Password comparison failed: password is incorrect");
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c b/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c
index 5c9d2766f6896b2ffcb7a2fe210fe6075c078a3d..613cbc6b65ad5e62e48ef56b76c21e1a1371321c 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c
+++ b/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c
@@ -74,7 +74,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, UNUSED module_ctx_t co
         */
        packet = eap_md5_extract(eap_session->this_round);
        if (!packet) {
-               if (ephemeral) talloc_list_free(&known_good);
+               if (ephemeral) TALLOC_FREE(known_good);
                RETURN_MODULE_INVALID;
        }
 
@@ -102,7 +102,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, UNUSED module_ctx_t co
        eap_md5_compose(eap_session->this_round, reply);
        talloc_free(packet);
 
-       if (ephemeral) talloc_list_free(&known_good);
+       if (ephemeral) TALLOC_FREE(known_good);
 
        RETURN_MODULE_OK;
 }

diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
index 86e972310e6cc116fe11903df307aa9b531fee62..d5ddc60d409578657fe88ccdf2c402083ba3d4aa 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
@@ -334,7 +334,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
                                               inst->server_id, strlen(inst->server_id),
                                               session->peer_id, strlen(session->peer_id),
                                               &session->token, inst->bnctx);
-               if (ephemeral) talloc_list_free(&known_good);
+               if (ephemeral) TALLOC_FREE(known_good);
                if (ret < 0) {
                        REDEBUG("Failed to obtain password element");
                        RETURN_MODULE_FAIL;

diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index 47596e49efa396d0a183aaa93718fd568f5baf95..02f64578baadf27e38f35db817f3af3b09f6a3d7 100644 (file)
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -1550,7 +1550,7 @@ found_password:
                if (ret < 0) {
                        RERROR("Failed generating NT-Password");
                        talloc_free(nt_password);
-                       if (*ephemeral) talloc_list_free(&password);
+                       if (*ephemeral) TALLOC_FREE(password);
                        return -1;
                }
 
@@ -1561,7 +1561,7 @@ found_password:
                        RDEBUG2("Hashed &control.%s to create %s", attr_nt_password->name, password->da->name);
                }
 
-               if (*ephemeral) talloc_list_free(&password);
+               if (*ephemeral) TALLOC_FREE(password);
 
                *ephemeral = true;      /* We generated a temporary password */
                *out = nt_password;
@@ -2116,7 +2116,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
        } /* else we weren't asked to use MPPE */
 
 finish:
-       if (ephemeral) talloc_list_free(&nt_password);
+       if (ephemeral) TALLOC_FREE(nt_password);
 
        RETURN_MODULE_RCODE(rcode);
 }

diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index a6a44a737b36d52ead01778d98da68d9be29eb0b..5f3047905614dd66c5149a5dc5829544d3a4f9bf 100644 (file)
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -926,7 +926,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
         *      Authenticate, and return.
         */
        auth_func(&rcode, inst, request, known_good, password);
-       if (ephemeral) talloc_list_free(&known_good);
+       if (ephemeral) TALLOC_FREE(known_good);
        switch (rcode) {
        case RLM_MODULE_REJECT:
                REDEBUG("Password incorrect");