fixed an IA allocation failure from pool when it doubly requested by the same client. (patch submitted by Hajimu UMEMOTO)

2 files changed, 5 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index b5a576a..a487295 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2006-11-15  SUZUKI, Shinsuke <suz@kame.net>
+	* dhcp6s.c: fixed an IA allocation failure from pool when it doubly
+	requested by the same client.  (patch submitted by Hajimu UMEMOTO)
+
 2006-11-05  SUZUKI, Shinsuke <suz@kame.net>
 	* dhcp6s.c: dhcp6s recognizes "-P" option.
 	(patch submitted by Masahide NAKAMURA)
diff --git a/dhcp6s.c b/dhcp6s.c
index e586039..0016438 100644
--- a/dhcp6s.c
+++ b/dhcp6s.c
@@ -2501,13 +2501,12 @@ make_ia(spec, conflist, retlist, client_conf, do_binding)
 		    bia = TAILQ_NEXT(bia, link)) {
 			if ((v = dhcp6_find_listval(conflist,
 			    bia->type, &bia->uv, 0)) != NULL) {
-				found++;
 				TAILQ_REMOVE(conflist, v, link);
 				dhcp6_clear_listval(v);
 			}
 		}
 
-		return (found);
+		return (1);
 	}
 
 	/*