From e018b915b73ec90cced5d96a291175a0bd9f3966 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Tue, 5 Apr 2022 08:54:05 -0400 Subject: [PATCH] less code == better code --- src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c index 31260b514e..7b868a5721 100644 --- a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c +++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c @@ -220,11 +220,7 @@ static ssize_t eap_ttls_decode_pair(request_t *request, TALLOC_CTX *ctx, fr_dcur } MEM(da = fr_dict_unknown_afrom_fields(vp, attr_vendor_specific, vendor, attr)); - if (fr_pair_reinit_from_da(NULL, vp, da) < 0) { - talloc_free(vp); - goto error; - } - goto do_value; + goto reinit; } } else { our_parent = attr_radius; @@ -235,17 +231,18 @@ static ssize_t eap_ttls_decode_pair(request_t *request, TALLOC_CTX *ctx, fr_dcur */ da = fr_dict_attr_child_by_num(our_parent, attr); if (da) { - if (fr_pair_reinit_from_da(NULL, vp, da) < 0) { - talloc_free(vp); - goto error; - } + goto reinit; + } else { if (flags & FR_DIAMETER_AVP_FLAG_MANDATORY) { fr_strerror_printf("Mandatory bit set and no attribute %u defined for parent %s", attr, parent->name); talloc_free(vp); goto error; } + MEM(da = fr_dict_unknown_attr_afrom_num(vp, parent, attr)); + + reinit: if (fr_pair_reinit_from_da(NULL, vp, da) < 0) { talloc_free(vp); goto error; -- 2.47.2