From: Alan T. DeKok Date: Mon, 18 Dec 2023 14:19:09 +0000 (-0500) Subject: use cast instead of copy X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d720180723c4ee4887b0d532453d9d3b5f317c02;p=thirdparty%2Ffreeradius-server.git use cast instead of copy which allows us to copy differing src/dst types --- diff --git a/src/lib/server/pairmove.c b/src/lib/server/pairmove.c index de1d36597a2..4933b0b97da 100644 --- a/src/lib/server/pairmove.c +++ b/src/lib/server/pairmove.c @@ -372,7 +372,7 @@ int radius_legacy_map_apply(request_t *request, map_t const *map) vp = fr_pair_afrom_da_nested(ctx, list, da); if (!vp) goto fail; - if (fr_value_box_copy(vp, &vp->data, box) < 0) { + if (fr_value_box_cast(vp, &vp->data, vp->vp_type, vp->da, box) < 0) { fail_vp: talloc_free(vp); fail: @@ -387,7 +387,7 @@ int radius_legacy_map_apply(request_t *request, map_t const *map) vp = fr_pair_afrom_da(ctx, da); if (!vp) goto fail; - if (fr_value_box_copy(vp, &vp->data, box) < 0) goto fail_vp; + if (fr_value_box_cast(vp, &vp->data, vp->vp_type, vp->da, box) < 0) goto fail_vp; fr_pair_prepend(list, vp); break; @@ -423,7 +423,7 @@ int radius_legacy_map_apply(request_t *request, map_t const *map) if (rcode < 0) goto fail; if (rcode == 0) { - if (fr_value_box_copy(vp, &vp->data, box) < 0) goto fail; + if (fr_value_box_cast(vp, &vp->data, vp->vp_type, vp->da, box) < 0) goto fail; } vp = fr_pair_find_by_da_nested(list, vp, da);