From: Francis Dupont <fdupont@isc.org>
Date: Fri, 28 Dec 2007 11:14:26 +0000 (+0000)
Subject: Don't be fooled by rapid-commit in the NoAddrsAvail case
X-Git-Tag: v4_1_0a1~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=900405e957ce5481cfd7cfb2dde156e0e71deb79;p=thirdparty%2Fdhcp.git

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

diff --git a/RELNOTES b/RELNOTES
index bda62bb1b..1a0ea8da0 100644
--- 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 18301e4c2..a04abdbf1 100644
--- 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) -