fixed a bug that Rebind does not work for IA-NA.

2 files changed, 6 insertions, 3 deletions

diff --git a/CHANGES b/CHANGES
index 257a2b9..e688b90 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,10 @@
 2007-03-21  SUZUKI, Shinsuke <suz@kame.net>
+	fixed several bugs found in IPv6-Ready-Logo DHCPv6 Self-Test script.
 	* dhcp6s.c, config.h, if.c: implemented DHCPv6 Confirm message processing
 	on DHCPv6 server.
 	* dhcp6s.c, lease.c: implemented DHCPv6 Decline message processing on DHCPv6 server.
 	* dhcp6s.c: fixed a Solicitation message validation as stated in RFC3315 15.2.
+	* dhcp6s.c: fixed a bug that Rebind does not work for IA-NA.
 
 2007-03-20  SUZUKI, Shinsuke <suz@kame.net>
 	* common.c: fixed a bug that IA-PD/IA-NA cannot coexist in one DHCP message
diff --git a/dhcp6s.c b/dhcp6s.c
index cd0f479..273877f 100644
--- a/dhcp6s.c
+++ b/dhcp6s.c
@@ -1850,15 +1850,16 @@ react_rebind(ifp, dh6, len, optinfo, from, fromlen, relayinfohead)
 	}
 
 	/*
-	 * If the returned iapd_list is empty, we do not have an explicit
-	 * knowledge about validity nor invalidity for any IA_PD information
+	 * If the returned iana/pd_list is empty, we do not have an explicit
+	 * knowledge about validity nor invalidity for any IA_NA/PD information
 	 * in the Rebind message.  In this case, we should rather ignore the
 	 * message than to send a Reply with empty information back to the
 	 * client, which may annoy the recipient.  However, if we have at least
 	 * one useful information, either positive or negative, based on some
 	 * explicit knowledge, we should reply with the responsible part.
 	 */
-	if (TAILQ_EMPTY(&roptinfo.iapd_list)) {
+	if (TAILQ_EMPTY(&roptinfo.iapd_list) &&
+	    TAILQ_EMPTY(&roptinfo.iana_list)) {
 		dprintf(LOG_INFO, FNAME, "no useful information for a rebind");
 		goto fail;	/* discard the rebind */
 	}