From: Shawn Routhier <sar@isc.org>
Date: Thu, 21 May 2015 20:38:11 +0000 (-0700)
Subject: [v4_1_esv] Allow the ADD token to be used as a hex string in IPv6 address
X-Git-Tag: v4_1_esv_r12b1~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dcf37207b650b258cb38260465bcc2e91881a1a1;p=thirdparty%2Fdhcp.git

[v4_1_esv] Allow the ADD token to be used as a hex string in IPv6 address

Allow the ADD token to be used as a hex string in IPv6 address
---

diff --git a/RELNOTES b/RELNOTES
index d9fe4d91c..192a5edcb 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -104,6 +104,10 @@ by Eric Young (eay@cryptsoft.com).
   the issue and suggesting the patch.
   [ISC-Bugs #38631]
 
+- While parsing IPv6 addresses treat "add" as part of the address instead
+  of as a token.
+  [ISC-Bugs #39529]
+
 			Changes since 4.1-ESV-R11rc2
 
 - None
diff --git a/common/parse.c b/common/parse.c
index 1407cdb0c..50c363b75 100644
--- a/common/parse.c
+++ b/common/parse.c
@@ -384,10 +384,11 @@ parse_ip6_addr(struct parse *cfile, struct iaddr *addr) {
 	 */
 	v6_len = 0;
 	for (;;) {
-		if ((((token == NAME) || (token == NUMBER_OR_NAME)) && 
+		if ((((token == NAME) || (token == NUMBER_OR_NAME)) &&
 		     is_hex_string(val)) ||
-		    (token == NUMBER) || 
-		    (token == DOT) || 
+		    (token == NUMBER) ||
+		    (token == TOKEN_ADD) ||
+		    (token == DOT) ||
 		    (token == COLON)) {
 
 			next_raw_token(&val, NULL, cfile);