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

    Merges in rt45292a.

diff --git a/server/dhcpv6.c b/server/dhcpv6.c
index dec3c48aeb2df2b99504f9befcc0b6ec52b7067e..bb613a74c959114c5adaf81dc7844ef676c27584 100644 (file)
--- 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,