From c112d40b0eae9d509c3cadf4aa949cdfe750a14b Mon Sep 17 00:00:00 2001 From: Nick Porter Date: Thu, 24 Jul 2025 12:15:24 +0100 Subject: [PATCH] Allow redis xlat to emit FR_TYPE_NULL again Now that this can be handled by `map list` --- src/modules/rlm_redis/rlm_redis.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/modules/rlm_redis/rlm_redis.c b/src/modules/rlm_redis/rlm_redis.c index 067d9f0184..6521d08d88 100644 --- a/src/modules/rlm_redis/rlm_redis.c +++ b/src/modules/rlm_redis/rlm_redis.c @@ -555,12 +555,10 @@ static xlat_action_t redis_lua_func_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out, if (vb_out->type == FR_TYPE_GROUP) { fr_value_box_t *child_vb = NULL; - while ((child_vb = fr_value_box_list_pop_head(&vb_out->vb_group))) { - if (child_vb->type != FR_TYPE_NULL) fr_dcursor_append(out, child_vb); - } + while ((child_vb = fr_value_box_list_pop_head(&vb_out->vb_group))) fr_dcursor_append(out, child_vb); talloc_free(vb_out); } else { - if (vb_out->type != FR_TYPE_NULL) fr_dcursor_append(out, vb_out); + fr_dcursor_append(out, vb_out); } finish: @@ -776,12 +774,10 @@ reply_parse: if (vb_out->type == FR_TYPE_GROUP) { fr_value_box_t *child_vb = NULL; - while ((child_vb = fr_value_box_list_pop_head(&vb_out->vb_group))) { - if (child_vb->type != FR_TYPE_NULL) fr_dcursor_append(out, child_vb); - } + while ((child_vb = fr_value_box_list_pop_head(&vb_out->vb_group))) fr_dcursor_append(out, child_vb); talloc_free(vb_out); } else { - if (vb_out->type != FR_TYPE_NULL) fr_dcursor_append(out, vb_out); + fr_dcursor_append(out, vb_out); } finish: -- 2.47.2