[master] 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 5b6dc979602074a64ca4e5a24a5a566f559ed3b0..42c6239ff7e03d1adf0684df8f989579f447f559 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -114,6 +114,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.3.2rc2
 - None
 

diff --git a/common/parse.c b/common/parse.c
index 7797831916cf0dc3975fbc58c8f103ea90b6dbf8..94395cb6647f80e6b46db865c7eaea79a53dfa3d 100644 (file)
--- 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);