summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorShawn Routhier <sar@isc.org>2015-05-21 13:34:45 -0700
committerShawn Routhier <sar@isc.org>2015-05-21 13:34:45 -0700
commit4136513e59b6906e585eac0f0fd88706bdefcb5b (patch)
tree69e5d100e70ee5cfeea324138c6c5ceaf3434c0a /common
parent30dcfbf6ae18e00a5c74eb578503973695ef5ddb (diff)
downloadisc-dhcp-4136513e59b6906e585eac0f0fd88706bdefcb5b.tar.gz
[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
Diffstat (limited to 'common')
-rw-r--r--common/parse.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/common/parse.c b/common/parse.c
index 77978319..94395cb6 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);