Populate randle request pointer

diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c
index 2785bd771597faa8209ceecb081f61e373918d7e..ecafb30415eb1273b7745dabf0123124c7c4ee32 100644 (file)
--- a/src/modules/rlm_rest/rest.c
+++ b/src/modules/rlm_rest/rest.c
@@ -2136,6 +2136,8 @@ void rest_request_cleanup(UNUSED rlm_rest_t const *instance, fr_curl_io_request_
        TALLOC_FREE(ctx->response.buffer);
        TALLOC_FREE(ctx->request.encoder);
        TALLOC_FREE(ctx->response.decoder);
+
+       randle->request = NULL;
 }
 
 /** URL encodes a string.

diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
index 487f43b244ab8c3bde680897bcf8a58f8927cf8b..a3a7574e2f70f82e73e589981d7fdd8139dd17de 100644 (file)
--- a/src/modules/rlm_rest/rlm_rest.c
+++ b/src/modules/rlm_rest/rlm_rest.c
@@ -436,6 +436,8 @@ static xlat_action_t rest_xlat(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 
        fr_assert(in_vb->type == FR_TYPE_GROUP);
 
+       randle->request = request;      /* Populate the request pointer for escape callbacks */
+
        if (fr_uri_escape(&in_vb->vb_group, rest_uri_parts, randle) < 0) {
                RPEDEBUG("Failed escaping URI");