From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 31 Aug 2015 14:23:23 +0000 (-0400)
Subject: Debug all VPs in options, not just the first one
X-Git-Tag: release_3_0_10~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7065a7708bb6a3055579889f46e30ba4b0493ad;p=thirdparty%2Ffreeradius-server.git

Debug all VPs in options, not just the first one
---

diff --git a/src/main/radattr.c b/src/main/radattr.c
index aceb2d4c0e5..5f017bfd908 100644
--- 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 7561785c56d..ba5903f6620 100644
--- 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;
 	};