Don't be fooled by rapid-commit in the NoAddrsAvail case

diff --git a/RELNOTES b/RELNOTES
index bda62bb1bb77bf00ffbd7f191ecd590503f73f68..1a0ea8da07d07383faecdf22108d40a4f452e705 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -83,6 +83,9 @@ suggested fixes to <dhcp-users@isc.org>.
 
 - Unicast options are taken into account only for RENEWs.
 
+- NoAddrsAvail answers to SOLICITs are always ADVERTISEs even when a SOLICIT
+  carries a rapid-commit option.
+
                        Changes since 4.0.0b3
 
 - The reverse dns name for PTR updates on IPv6 addresses has been fixed to

diff --git a/server/dhcpv6.c b/server/dhcpv6.c
index 18301e4c27e58332d4f22ae3fecf0c9c6d2131e9..a04abdbf1e9328741237adc3775874cdb94e26b6 100644 (file)
--- a/server/dhcpv6.c
+++ b/server/dhcpv6.c
@@ -1176,12 +1176,13 @@ lease_to_client(struct data_string *reply_ret,
                reply.cursor = REPLY_OPTIONS_INDEX;
 
                /*
-                * Produce a reply that includes;
+                * Produce an advertise that includes;
                 *
                 * Status code.
                 * Server DUID.
                 * Client DUID.
                 */
+               reply.msg_type = DHCPV6_ADVERTISE;
                reply.cursor += store_options6((char *)reply.buf.data +
                                                        reply.cursor,
                                               sizeof(reply.buf) -