make RADIUS use flat or nested attributes

diff --git a/src/process/radius/base.c b/src/process/radius/base.c
index bed759952962b06e73ee7f76d5706ec6e631a88d..705e20b3e14ebbea830189db3f117c0e08d13e3b 100644 (file)
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -769,7 +769,7 @@ RESUME(protocol_error)
        /*
         *      https://tools.ietf.org/html/rfc7930#section-4
         */
-       vp = fr_pair_find_by_da(&request->reply_pairs, NULL, attr_original_packet_code);
+       vp = fr_pair_find_by_da_nested(&request->reply_pairs, NULL, attr_original_packet_code);
        if (!vp) {
                vp = fr_pair_afrom_da(request->reply_ctx, attr_original_packet_code);
                if (vp) {

diff --git a/src/protocols/tacacs/encode.c b/src/protocols/tacacs/encode.c
index 70106131c1607f8eb169d2823e4c7fdec6e3504a..6029060e9e0ce09918f4df4523fe2223e676413d 100644 (file)
--- a/src/protocols/tacacs/encode.c
+++ b/src/protocols/tacacs/encode.c
@@ -857,7 +857,7 @@ ssize_t fr_tacacs_encode(fr_dbuff_t *dbuff, uint8_t const *original_packet, char
                        /*
                         *      If the caller didn't set a session ID, use a random one.
                         */
-                       if (!fr_pair_find_by_da(vps, NULL, attr_tacacs_session_id)) {
+                       if (!fr_pair_find_by_da_nested(vps, NULL, attr_tacacs_session_id)) {
                                packet->hdr.session_id = fr_rand();
                        }