From: Thomas Markwalder <tmark@isc.org>
Date: Mon, 11 Dec 2017 21:32:03 +0000 (-0500)
Subject: [master] Fixed static v6 leases not getting written to packet
X-Git-Tag: v4_4_0b1_f1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b348d7d482603250769f4ddfb46ea77b9976131;p=thirdparty%2Fdhcp.git

[master] Fixed static v6 leases not getting written to packet

    Merges in rt45292a.
---

diff --git a/server/dhcpv6.c b/server/dhcpv6.c
index dec3c48ae..bb613a74c 100644
--- a/server/dhcpv6.c
+++ b/server/dhcpv6.c
@@ -2225,6 +2225,9 @@ reply_process_ia_na(struct reply_state *reply, struct option_cache *ia) {
 				     reply->client_id.data, 60),
 			 iaid);
 
+		/* Write the lease out in wire-format to the outbound buffer */
+		write_to_packet(reply, ia_cursor);
+
 		if ((reply->buf.reply.msg_type == DHCPV6_REPLY) &&
 		    (reply->on_star.on_commit != NULL)) {
 			execute_statements(NULL, reply->packet, NULL, NULL,
@@ -4247,6 +4250,10 @@ reply_process_ia_pd(struct reply_state *reply, struct option_cache *ia) {
 			 print_hex_1(reply->client_id.len,
 				     reply->client_id.data, 60),
 			 iaid);
+
+		/* Write the lease out in wire-format to the outbound buffer */
+		write_to_packet(reply, ia_cursor);
+
 		if ((reply->buf.reply.msg_type == DHCPV6_REPLY) &&
 		    (reply->on_star.on_commit != NULL)) {
 			execute_statements(NULL, reply->packet, NULL, NULL,