From 5792526758c0c26955f7e56a9b2bdfd6a31c1f1f Mon Sep 17 00:00:00 2001 From: Jorge Pereira Date: Mon, 22 Mar 2021 12:50:57 -0300 Subject: [PATCH] :wrench: rlm_yubikey: Fix parenting issues (#4012) --- doc/ChangeLog | 1 + src/modules/rlm_yubikey/decrypt.c | 8 ++++---- src/modules/rlm_yubikey/rlm_yubikey.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index c621a4dc43..3ffc1d49c6 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -110,6 +110,7 @@ FreeRADIUS 3.0.22 Tue 24 Mar 2020 12:00:00 EDT urgency=low full after writing an attribute value, and more attributes needed to be encoded. Reported by Adrian Smith. * Fix leak with unknown attributes in detail reader. Fixes #3937. + * Fix parenting issues in rlm_yubikey. FreeRADIUS 3.0.21 Tue 24 Mar 2020 12:00:00 EDT urgency=low Feature improvements diff --git a/src/modules/rlm_yubikey/decrypt.c b/src/modules/rlm_yubikey/decrypt.c index 896fa3b285..20b6df8e2e 100644 --- a/src/modules/rlm_yubikey/decrypt.c +++ b/src/modules/rlm_yubikey/decrypt.c @@ -70,7 +70,7 @@ rlm_rcode_t rlm_yubikey_decrypt(rlm_yubikey_t *inst, REQUEST *request, char cons /* * Private ID used for validation purposes */ - vp = fr_pair_make(request, &request->packet->vps, "Yubikey-Private-ID", NULL, T_OP_SET); + vp = fr_pair_make(request->packet, &request->packet->vps, "Yubikey-Private-ID", NULL, T_OP_SET); if (!vp) { REDEBUG("Failed creating Yubikey-Private-ID"); @@ -81,7 +81,7 @@ rlm_rcode_t rlm_yubikey_decrypt(rlm_yubikey_t *inst, REQUEST *request, char cons /* * Token timestamp */ - vp = fr_pair_make(request, &request->packet->vps, "Yubikey-Timestamp", NULL, T_OP_SET); + vp = fr_pair_make(request->packet, &request->packet->vps, "Yubikey-Timestamp", NULL, T_OP_SET); if (!vp) { REDEBUG("Failed creating Yubikey-Timestamp"); @@ -93,7 +93,7 @@ rlm_rcode_t rlm_yubikey_decrypt(rlm_yubikey_t *inst, REQUEST *request, char cons /* * Token random */ - vp = fr_pair_make(request, &request->packet->vps, "Yubikey-Random", NULL, T_OP_SET); + vp = fr_pair_make(request->packet, &request->packet->vps, "Yubikey-Random", NULL, T_OP_SET); if (!vp) { REDEBUG("Failed creating Yubikey-Random"); @@ -108,7 +108,7 @@ rlm_rcode_t rlm_yubikey_decrypt(rlm_yubikey_t *inst, REQUEST *request, char cons */ counter = (yubikey_counter(token.ctr) << 16) | token.use; - vp = fr_pair_make(request, &request->packet->vps, "Yubikey-Counter", NULL, T_OP_SET); + vp = fr_pair_make(request->packet, &request->packet->vps, "Yubikey-Counter", NULL, T_OP_SET); if (!vp) { REDEBUG("Failed creating Yubikey-Counter"); diff --git a/src/modules/rlm_yubikey/rlm_yubikey.c b/src/modules/rlm_yubikey/rlm_yubikey.c index b444b972fa..1908e9d28c 100644 --- a/src/modules/rlm_yubikey/rlm_yubikey.c +++ b/src/modules/rlm_yubikey/rlm_yubikey.c @@ -334,7 +334,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authorize(void *instance, REQUEST *reque * It's left up to the user if they want to decode it or not. */ if (inst->id_len) { - vp = fr_pair_make(request, &request->packet->vps, "Yubikey-Public-ID", NULL, T_OP_SET); + vp = fr_pair_make(request->packet, &request->packet->vps, "Yubikey-Public-ID", NULL, T_OP_SET); if (!vp) { REDEBUG("Failed creating Yubikey-Public-ID"); -- 2.47.2