From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 15 Jun 2015 18:30:22 +0000 (-0400)
Subject: Always write the header for the first attr
X-Git-Tag: release_3_0_9~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64cf4db543ec281619d13bb5a6f7aa493e634a03;p=thirdparty%2Ffreeradius-server.git

Always write the header for the first attr
---

diff --git a/src/modules/proto_dhcp/dhcp.c b/src/modules/proto_dhcp/dhcp.c
index b4eafda319a..48fc3a28d1b 100644
--- a/src/modules/proto_dhcp/dhcp.c
+++ b/src/modules/proto_dhcp/dhcp.c
@@ -1266,7 +1266,7 @@ static ssize_t fr_dhcp_vp2data_tlv(uint8_t *out, ssize_t outlen, vp_cursor_t *cu
 	     vp && vp->da->flags.is_tlv && (SUBOPTION_PARENT(vp->da->attr) == parent);
 	     vp = fr_cursor_next(cursor)) {
 		/* Don't write out the header, were packing array options */
-		if (!vp->da->flags.array || (attr != SUBOPTION_ATTR(vp->da->attr))) {
+		if (!opt_len || !vp->da->flags.array || (attr != SUBOPTION_ATTR(vp->da->attr))) {
 			attr = SUBOPTION_ATTR(vp->da->attr);
 			*p++ = attr;
 			opt_len = p++;