Debug all VPs in options, not just the first one

diff --git a/src/main/radattr.c b/src/main/radattr.c
index aceb2d4c0e5bc07c2975dd5c328e2ad9971b6b5f..5f017bfd90833e1bca2719abdb2634b7b8e475a3 100644 (file)
--- a/src/main/radattr.c
+++ b/src/main/radattr.c
@@ -809,7 +809,6 @@ static void process_file(const char *root_dir, char const *filename)
                                                vp->da->name, fr_strerror());
                                        exit(1);
                                }
-                               if (len > 0) debug_pair(vp);
                                attr += len;
                        };
 

diff --git a/src/modules/proto_dhcp/dhcp.c b/src/modules/proto_dhcp/dhcp.c
index 7561785c56d15f2d72e55bd3233911291eaaffd8..ba5903f6620f610d828e0c21175c6a47045d40cf 100644 (file)
--- a/src/modules/proto_dhcp/dhcp.c
+++ b/src/modules/proto_dhcp/dhcp.c
@@ -1371,6 +1371,7 @@ ssize_t fr_dhcp_encode_option(UNUSED TALLOC_CTX *ctx, uint8_t *out, size_t outle
                p += len;
                *opt_len += len;
                freespace -= len;
+               debug_pair(vp);
 
        } while ((vp = fr_cursor_current(cursor)) && previous && (previous == vp->da) && vp->da->flags.array);
 
@@ -1685,7 +1686,6 @@ int fr_dhcp_encode(RADIUS_PACKET *packet)
        while ((vp = fr_cursor_current(&cursor))) {
                len = fr_dhcp_encode_option(packet, p, packet->data_len - (p - packet->data), &cursor);
                if (len < 0) break;
-               if (len > 0) debug_pair(vp);
                p += len;
        };