[540-recommend-moving-hostname-char-set-and-hostname-char-replacement-out-of-dhcp...

diff --git a/src/bin/dhcp6/dhcp6_lexer.ll b/src/bin/dhcp6/dhcp6_lexer.ll
index a91bb5460a0760fb25bc41666ddec9979ecf4cdb..21de0ff04e8252ad955ade7c300c4e0785658685 100644 (file)
--- a/src/bin/dhcp6/dhcp6_lexer.ll
+++ b/src/bin/dhcp6/dhcp6_lexer.ll
@@ -308,6 +308,7 @@ ControlCharacterFill            [^"\\]|\\{JSONEscapeSequence}
 
 \"hostname-char-set\" {
     switch(driver.ctx_) {
+    case isc::dhcp::Parser6Context::DHCP6:
     case isc::dhcp::Parser6Context::DHCP_DDNS:
         return isc::dhcp::Dhcp6Parser::make_HOSTNAME_CHAR_SET(driver.loc_);
     default:
@@ -317,6 +318,7 @@ ControlCharacterFill            [^"\\]|\\{JSONEscapeSequence}
 
 \"hostname-char-replacement\" {
     switch(driver.ctx_) {
+    case isc::dhcp::Parser6Context::DHCP6:
     case isc::dhcp::Parser6Context::DHCP_DDNS:
         return isc::dhcp::Dhcp6Parser::make_HOSTNAME_CHAR_REPLACEMENT(driver.loc_);
     default:

diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
index 418d8989724cc5a0ffdbd67f1d705fe1fcaf6af8..5f3ed5c48110bae89f9bd960b26ee975c220aa0a 100644 (file)
--- a/src/bin/dhcp6/dhcp6_parser.yy
+++ b/src/bin/dhcp6/dhcp6_parser.yy
@@ -478,7 +478,9 @@ global_param: data_directory
             | calculate_tee_times
             | t1_percent
             | t2_percent
-            | loggers
+            | logger
+            | hostname_char_set
+            | hostname_char_replacement
             | unknown_map_entry
             ;