From: Alan T. DeKok Date: Thu, 7 Apr 2022 21:59:51 +0000 (-0400) Subject: always print '=' for vp->op X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6603e53e70bf9008eae520b16e31d14afb96a697;p=thirdparty%2Ffreeradius-server.git always print '=' for vp->op nothing here should need it or use it. --- diff --git a/src/lib/unlang/xlat_builtin.c b/src/lib/unlang/xlat_builtin.c index 1c3cda16cd..cbe2e682f7 100644 --- a/src/lib/unlang/xlat_builtin.c +++ b/src/lib/unlang/xlat_builtin.c @@ -1029,23 +1029,20 @@ static xlat_action_t xlat_func_debug_attr(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcur switch (vp->da->type) { case FR_TYPE_STRUCTURAL: if (fr_pair_list_empty(&vp->vp_group)) { - RIDEBUG2("&%s.%s %s {}", + RIDEBUG2("&%s.%s = {}", fr_table_str_by_value(pair_list_table, tmpl_list(vpt), ""), - vp->da->name, - fr_table_str_by_value(fr_tokens_table, vp->op, "")); + vp->da->name); } else { - RIDEBUG2("&%s.%s %s {...}", /* @todo */ + RIDEBUG2("&%s.%s = {...}", /* @todo */ fr_table_str_by_value(pair_list_table, tmpl_list(vpt), ""), - vp->da->name, - fr_table_str_by_value(fr_tokens_table, vp->op, "")); + vp->da->name); } break; default: - RIDEBUG2("&%s.%s %s %pV", + RIDEBUG2("&%s.%s = %pV", fr_table_str_by_value(pair_list_table, tmpl_list(vpt), ""), vp->da->name, - fr_table_str_by_value(fr_tokens_table, vp->op, ""), &vp->data); } @@ -2376,17 +2373,14 @@ static xlat_action_t xlat_func_pairs(TALLOC_CTX *ctx, fr_dcursor_t *out, for (vp = tmpl_dcursor_init(NULL, NULL, &cc, &cursor, request, vpt); vp; vp = fr_dcursor_next(&cursor)) { - fr_token_t op = vp->op; char *buff; MEM(vb = fr_value_box_alloc_null(ctx)); - vp->op = T_OP_EQ; if (unlikely(fr_pair_aprint(vb, &buff, NULL, vp) < 0)) { RPEDEBUG("Failed printing pair"); talloc_free(vb); return XLAT_ACTION_FAIL; } - vp->op = op; fr_value_box_bstrdup_buffer_shallow(NULL, vb, NULL, buff, false); fr_dcursor_append(out, vb);