:wrench: rlm_yubikey: Fix parenting issues (#4012)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index c621a4dc4323796d28ab42a5e8829405f86cbb86..3ffc1d49c6b560e6de8632e717d385ab8df3a04b 100644 (file)
--- 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 896fa3b285fc2fb49ac407c8ee05932427ea5b2c..20b6df8e2ef945ba79014706635df0a44914c49d 100644 (file)
--- 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 b444b972fa6a6e8133b5e2c6753757237e9100c6..1908e9d28c2fc5222161c80597d2aa32c08f7dbe 100644 (file)
--- 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");