From: Francis Dupont <fdupont@isc.org>
Date: Mon, 23 Oct 2017 13:25:07 +0000 (+0000)
Subject: [master] Regen flex/bison
X-Git-Tag: Kea-1.3.0~2^2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c90d0d2ecffc0aa049d9be83f6781feb8e597285;p=thirdparty%2Fkea.git

[master] Regen flex/bison
---

diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc
index 3af22c061b..54334ed8ee 100644
--- a/src/bin/dhcp4/dhcp4_lexer.cc
+++ b/src/bin/dhcp4/dhcp4_lexer.cc
@@ -1591,9 +1591,9 @@ static const flex_int16_t yy_rule_linenum[158] =
      1038, 1047, 1056, 1065, 1074, 1083, 1092, 1101, 1110, 1119,
      1128, 1137, 1146, 1155, 1164, 1173, 1182, 1191, 1200, 1209,
      1219, 1229, 1239, 1249, 1259, 1269, 1279, 1289, 1299, 1308,
-     1317, 1326, 1335, 1344, 1353, 1364, 1375, 1388, 1399, 1412,
-     1511, 1516, 1521, 1526, 1527, 1528, 1529, 1530, 1531, 1533,
-     1551, 1564, 1569, 1573, 1575, 1577, 1579
+     1317, 1326, 1335, 1344, 1353, 1362, 1373, 1386, 1399, 1414,
+     1512, 1517, 1522, 1527, 1528, 1529, 1530, 1531, 1532, 1534,
+     1552, 1565, 1570, 1574, 1576, 1578, 1580
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -2506,7 +2506,7 @@ YY_RULE_SETUP
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
     case isc::dhcp::Parser4Context::SUBNET4:
-    case Parser4Context::SHARED_NETWORK:
+    case isc::dhcp::Parser4Context::SHARED_NETWORK:
         return isc::dhcp::Dhcp4Parser::make_VALID_LIFETIME(driver.loc_);
     default:
         return isc::dhcp::Dhcp4Parser::make_STRING("valid-lifetime", driver.loc_);
@@ -2520,7 +2520,7 @@ YY_RULE_SETUP
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
     case isc::dhcp::Parser4Context::SUBNET4:
-    case Parser4Context::SHARED_NETWORK:
+    case isc::dhcp::Parser4Context::SHARED_NETWORK:
         return isc::dhcp::Dhcp4Parser::make_RENEW_TIMER(driver.loc_);
     default:
         return isc::dhcp::Dhcp4Parser::make_STRING("renew-timer", driver.loc_);
@@ -2534,7 +2534,7 @@ YY_RULE_SETUP
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
     case isc::dhcp::Parser4Context::SUBNET4:
-    case Parser4Context::SHARED_NETWORK:
+    case isc::dhcp::Parser4Context::SHARED_NETWORK:
         return isc::dhcp::Dhcp4Parser::make_REBIND_TIMER(driver.loc_);
     default:
         return isc::dhcp::Dhcp4Parser::make_STRING("rebind-timer", driver.loc_);
@@ -2571,10 +2571,10 @@ YY_RULE_SETUP
 #line 494 "dhcp4_lexer.ll"
 {
     switch (driver.ctx_) {
-    case Parser4Context::DHCP4:
-        return Dhcp4Parser::make_SHARED_NETWORKS(driver.loc_);
+    case isc::dhcp::Parser4Context::DHCP4:
+        return isc::dhcp::Dhcp4Parser::make_SHARED_NETWORKS(driver.loc_);
     default:
-        return Dhcp4Parser::make_STRING("shared-networks", driver.loc_);
+        return isc::dhcp::Dhcp4Parser::make_STRING("shared-networks", driver.loc_);
     }
 }
 	YY_BREAK
@@ -2598,11 +2598,11 @@ YY_RULE_SETUP
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
     case isc::dhcp::Parser4Context::SUBNET4:
+    case isc::dhcp::Parser4Context::SHARED_NETWORK:
     case isc::dhcp::Parser4Context::POOLS:
     case isc::dhcp::Parser4Context::RESERVATIONS:
     case isc::dhcp::Parser4Context::CLIENT_CLASSES:
     case isc::dhcp::Parser4Context::CLIENT_CLASS:
-    case Parser4Context::SHARED_NETWORK:
         return isc::dhcp::Dhcp4Parser::make_OPTION_DATA(driver.loc_);
     default:
         return isc::dhcp::Dhcp4Parser::make_STRING("option-data", driver.loc_);
@@ -2620,7 +2620,7 @@ YY_RULE_SETUP
     case isc::dhcp::Parser4Context::OPTION_DATA:
     case isc::dhcp::Parser4Context::CLIENT_CLASSES:
     case isc::dhcp::Parser4Context::CLIENT_CLASS:
-    case Parser4Context::SHARED_NETWORK:
+    case isc::dhcp::Parser4Context::SHARED_NETWORK:
     case isc::dhcp::Parser4Context::LOGGERS:
         return isc::dhcp::Dhcp4Parser::make_NAME(driver.loc_);
     default:
@@ -2707,7 +2707,7 @@ YY_RULE_SETUP
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
-    case Parser4Context::SHARED_NETWORK:
+    case isc::dhcp::Parser4Context::SHARED_NETWORK:
         return isc::dhcp::Dhcp4Parser::make_INTERFACE(driver.loc_);
     default:
         return isc::dhcp::Dhcp4Parser::make_STRING("interface", driver.loc_);
@@ -2963,8 +2963,8 @@ YY_RULE_SETUP
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
+    case isc::dhcp::Parser4Context::SHARED_NETWORK:
     case isc::dhcp::Parser4Context::CLIENT_CLASSES:
-    case Parser4Context::SHARED_NETWORK:
         return isc::dhcp::Dhcp4Parser::make_CLIENT_CLASS(driver.loc_);
     default:
         return isc::dhcp::Dhcp4Parser::make_STRING("client-class", driver.loc_);
@@ -3140,7 +3140,7 @@ YY_RULE_SETUP
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
-    case Parser4Context::SHARED_NETWORK:
+    case isc::dhcp::Parser4Context::SHARED_NETWORK:
         return isc::dhcp::Dhcp4Parser::make_RELAY(driver.loc_);
     default:
         return isc::dhcp::Dhcp4Parser::make_STRING("relay", driver.loc_);
@@ -3703,8 +3703,6 @@ YY_RULE_SETUP
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
-    case isc::dhcp::Parser4Context::SUBNET4:
-    case Parser4Context::SHARED_NETWORK:
         return isc::dhcp::Dhcp4Parser::make_ECHO_CLIENT_ID(driver.loc_);
     default:
         return isc::dhcp::Dhcp4Parser::make_STRING("echo-client-id", driver.loc_);
@@ -3713,12 +3711,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 1364 "dhcp4_lexer.ll"
+#line 1362 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
     case isc::dhcp::Parser4Context::SUBNET4:
-    case Parser4Context::SHARED_NETWORK:
+    case isc::dhcp::Parser4Context::SHARED_NETWORK:
         return isc::dhcp::Dhcp4Parser::make_MATCH_CLIENT_ID(driver.loc_);
     default:
         return isc::dhcp::Dhcp4Parser::make_STRING("match-client-id", driver.loc_);
@@ -3727,14 +3725,14 @@ YY_RULE_SETUP
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 1375 "dhcp4_lexer.ll"
+#line 1373 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
     case isc::dhcp::Parser4Context::SUBNET4:
+    case isc::dhcp::Parser4Context::SHARED_NETWORK:
     case isc::dhcp::Parser4Context::RESERVATIONS:
     case isc::dhcp::Parser4Context::CLIENT_CLASSES:
-    case Parser4Context::SHARED_NETWORK:
         return isc::dhcp::Dhcp4Parser::make_NEXT_SERVER(driver.loc_);
     default:
         return isc::dhcp::Dhcp4Parser::make_STRING("next-server", driver.loc_);
@@ -3743,10 +3741,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 1388 "dhcp4_lexer.ll"
+#line 1386 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
+    case isc::dhcp::Parser4Context::DHCP4:
     case isc::dhcp::Parser4Context::SUBNET4:
+    case isc::dhcp::Parser4Context::SHARED_NETWORK:
     case isc::dhcp::Parser4Context::RESERVATIONS:
     case isc::dhcp::Parser4Context::CLIENT_CLASSES:
         return isc::dhcp::Dhcp4Parser::make_SERVER_HOSTNAME(driver.loc_);
@@ -3760,7 +3760,9 @@ YY_RULE_SETUP
 #line 1399 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
+    case isc::dhcp::Parser4Context::DHCP4:
     case isc::dhcp::Parser4Context::SUBNET4:
+    case isc::dhcp::Parser4Context::SHARED_NETWORK:
     case isc::dhcp::Parser4Context::RESERVATIONS:
     case isc::dhcp::Parser4Context::CLIENT_CLASSES:
         return isc::dhcp::Dhcp4Parser::make_BOOT_FILE_NAME(driver.loc_);
@@ -3771,7 +3773,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 1412 "dhcp4_lexer.ll"
+#line 1414 "dhcp4_lexer.ll"
 {
     /* A string has been matched. It contains the actual string and single quotes.
        We need to get those quotes out of the way and just use its content, e.g.
@@ -3788,7 +3790,6 @@ YY_RULE_SETUP
         case '"':
             /* impossible condition */
             driver.error(driver.loc_, "Bad quote in \"" + raw + "\"");
-            break;
         case '\\':
             ++pos;
             if (pos >= len) {
@@ -3874,7 +3875,7 @@ YY_RULE_SETUP
 case 141:
 /* rule 141 can match eol */
 YY_RULE_SETUP
-#line 1511 "dhcp4_lexer.ll"
+#line 1512 "dhcp4_lexer.ll"
 {
     /* Bad string with a forbidden control character inside */
     driver.error(driver.loc_, "Invalid control in " + std::string(yytext));
@@ -3883,7 +3884,7 @@ YY_RULE_SETUP
 case 142:
 /* rule 142 can match eol */
 YY_RULE_SETUP
-#line 1516 "dhcp4_lexer.ll"
+#line 1517 "dhcp4_lexer.ll"
 {
     /* Bad string with a bad escape inside */
     driver.error(driver.loc_, "Bad escape in " + std::string(yytext));
@@ -3891,7 +3892,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 1521 "dhcp4_lexer.ll"
+#line 1522 "dhcp4_lexer.ll"
 {
     /* Bad string with an open escape at the end */
     driver.error(driver.loc_, "Overflow escape in " + std::string(yytext));
@@ -3899,37 +3900,37 @@ YY_RULE_SETUP
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 1526 "dhcp4_lexer.ll"
+#line 1527 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_LSQUARE_BRACKET(driver.loc_); }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 1527 "dhcp4_lexer.ll"
+#line 1528 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_RSQUARE_BRACKET(driver.loc_); }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 1528 "dhcp4_lexer.ll"
+#line 1529 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_LCURLY_BRACKET(driver.loc_); }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 1529 "dhcp4_lexer.ll"
+#line 1530 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_RCURLY_BRACKET(driver.loc_); }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 1530 "dhcp4_lexer.ll"
+#line 1531 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_COMMA(driver.loc_); }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 1531 "dhcp4_lexer.ll"
+#line 1532 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_COLON(driver.loc_); }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 1533 "dhcp4_lexer.ll"
+#line 1534 "dhcp4_lexer.ll"
 {
     /* An integer was found. */
     std::string tmp(yytext);
@@ -3950,7 +3951,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 1551 "dhcp4_lexer.ll"
+#line 1552 "dhcp4_lexer.ll"
 {
     /* A floating point was found. */
     std::string tmp(yytext);
@@ -3966,7 +3967,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 1564 "dhcp4_lexer.ll"
+#line 1565 "dhcp4_lexer.ll"
 {
     string tmp(yytext);
     return isc::dhcp::Dhcp4Parser::make_BOOLEAN(tmp == "true", driver.loc_);
@@ -3974,33 +3975,33 @@ YY_RULE_SETUP
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 1569 "dhcp4_lexer.ll"
+#line 1570 "dhcp4_lexer.ll"
 {
    return isc::dhcp::Dhcp4Parser::make_NULL_TYPE(driver.loc_);
 }
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 1573 "dhcp4_lexer.ll"
+#line 1574 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON true reserved keyword is lower case only");
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 1575 "dhcp4_lexer.ll"
+#line 1576 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON false reserved keyword is lower case only");
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 1577 "dhcp4_lexer.ll"
+#line 1578 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON null reserved keyword is lower case only");
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 1579 "dhcp4_lexer.ll"
+#line 1580 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 1581 "dhcp4_lexer.ll"
+#line 1582 "dhcp4_lexer.ll"
 {
     if (driver.states_.empty()) {
         return isc::dhcp::Dhcp4Parser::make_END(driver.loc_);
@@ -4026,10 +4027,10 @@ case YY_STATE_EOF(INITIAL):
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 1604 "dhcp4_lexer.ll"
+#line 1605 "dhcp4_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 4032 "dhcp4_lexer.cc"
+#line 4033 "dhcp4_lexer.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5134,7 +5135,7 @@ void yyfree (void * ptr )
 
 /* %ok-for-header */
 
-#line 1604 "dhcp4_lexer.ll"
+#line 1605 "dhcp4_lexer.ll"
 
 
 using namespace isc::dhcp;
diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc
index 1273de4bbd..e77398b20a 100644
--- a/src/bin/dhcp4/dhcp4_parser.cc
+++ b/src/bin/dhcp4/dhcp4_parser.cc
@@ -999,8 +999,8 @@ namespace isc { namespace dhcp {
 #line 1000 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 92:
-#line 436 "dhcp4_parser.yy" // lalr1.cc:859
+  case 94:
+#line 438 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("valid-lifetime", prf);
@@ -1008,8 +1008,8 @@ namespace isc { namespace dhcp {
 #line 1009 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 93:
-#line 441 "dhcp4_parser.yy" // lalr1.cc:859
+  case 95:
+#line 443 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("renew-timer", prf);
@@ -1017,8 +1017,8 @@ namespace isc { namespace dhcp {
 #line 1018 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 94:
-#line 446 "dhcp4_parser.yy" // lalr1.cc:859
+  case 96:
+#line 448 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("rebind-timer", prf);
@@ -1026,8 +1026,8 @@ namespace isc { namespace dhcp {
 #line 1027 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 95:
-#line 451 "dhcp4_parser.yy" // lalr1.cc:859
+  case 97:
+#line 453 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr dpp(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("decline-probation-period", dpp);
@@ -1035,8 +1035,8 @@ namespace isc { namespace dhcp {
 #line 1036 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 96:
-#line 456 "dhcp4_parser.yy" // lalr1.cc:859
+  case 98:
+#line 458 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr echo(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("echo-client-id", echo);
@@ -1044,8 +1044,8 @@ namespace isc { namespace dhcp {
 #line 1045 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 97:
-#line 461 "dhcp4_parser.yy" // lalr1.cc:859
+  case 99:
+#line 463 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr match(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("match-client-id", match);
@@ -1053,8 +1053,8 @@ namespace isc { namespace dhcp {
 #line 1054 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 98:
-#line 467 "dhcp4_parser.yy" // lalr1.cc:859
+  case 100:
+#line 469 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interfaces-config", i);
@@ -1064,8 +1064,8 @@ namespace isc { namespace dhcp {
 #line 1065 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 99:
-#line 472 "dhcp4_parser.yy" // lalr1.cc:859
+  case 101:
+#line 474 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // No interfaces config param is required
     ctx.stack_.pop_back();
@@ -1074,8 +1074,8 @@ namespace isc { namespace dhcp {
 #line 1075 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 106:
-#line 488 "dhcp4_parser.yy" // lalr1.cc:859
+  case 108:
+#line 490 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // Parse the interfaces-config map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1084,8 +1084,8 @@ namespace isc { namespace dhcp {
 #line 1085 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 107:
-#line 492 "dhcp4_parser.yy" // lalr1.cc:859
+  case 109:
+#line 494 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // No interfaces config param is required
     // parsing completed
@@ -1093,8 +1093,8 @@ namespace isc { namespace dhcp {
 #line 1094 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 108:
-#line 497 "dhcp4_parser.yy" // lalr1.cc:859
+  case 110:
+#line 499 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interfaces", l);
@@ -1104,8 +1104,8 @@ namespace isc { namespace dhcp {
 #line 1105 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 109:
-#line 502 "dhcp4_parser.yy" // lalr1.cc:859
+  case 111:
+#line 504 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1113,16 +1113,16 @@ namespace isc { namespace dhcp {
 #line 1114 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 110:
-#line 507 "dhcp4_parser.yy" // lalr1.cc:859
+  case 112:
+#line 509 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.DHCP_SOCKET_TYPE);
 }
 #line 1122 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 111:
-#line 509 "dhcp4_parser.yy" // lalr1.cc:859
+  case 113:
+#line 511 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("dhcp-socket-type", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -1130,28 +1130,28 @@ namespace isc { namespace dhcp {
 #line 1131 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 112:
-#line 514 "dhcp4_parser.yy" // lalr1.cc:859
+  case 114:
+#line 516 "dhcp4_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("raw", ctx.loc2pos(yystack_[0].location))); }
 #line 1137 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 113:
-#line 515 "dhcp4_parser.yy" // lalr1.cc:859
+  case 115:
+#line 517 "dhcp4_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("udp", ctx.loc2pos(yystack_[0].location))); }
 #line 1143 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 114:
-#line 518 "dhcp4_parser.yy" // lalr1.cc:859
+  case 116:
+#line 520 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.OUTBOUND_INTERFACE);
 }
 #line 1151 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 115:
-#line 520 "dhcp4_parser.yy" // lalr1.cc:859
+  case 117:
+#line 522 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("outbound-interface", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -1159,24 +1159,24 @@ namespace isc { namespace dhcp {
 #line 1160 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 116:
-#line 525 "dhcp4_parser.yy" // lalr1.cc:859
+  case 118:
+#line 527 "dhcp4_parser.yy" // lalr1.cc:859
     {
     yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("same-as-inbound", ctx.loc2pos(yystack_[0].location)));
 }
 #line 1168 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 117:
-#line 527 "dhcp4_parser.yy" // lalr1.cc:859
+  case 119:
+#line 529 "dhcp4_parser.yy" // lalr1.cc:859
     {
     yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("use-routing", ctx.loc2pos(yystack_[0].location)));
     }
 #line 1176 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 118:
-#line 531 "dhcp4_parser.yy" // lalr1.cc:859
+  case 120:
+#line 533 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("re-detect", b);
@@ -1184,8 +1184,8 @@ namespace isc { namespace dhcp {
 #line 1185 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 119:
-#line 537 "dhcp4_parser.yy" // lalr1.cc:859
+  case 121:
+#line 539 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lease-database", i);
@@ -1195,8 +1195,8 @@ namespace isc { namespace dhcp {
 #line 1196 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 120:
-#line 542 "dhcp4_parser.yy" // lalr1.cc:859
+  case 122:
+#line 544 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -1206,8 +1206,8 @@ namespace isc { namespace dhcp {
 #line 1207 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 121:
-#line 549 "dhcp4_parser.yy" // lalr1.cc:859
+  case 123:
+#line 551 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hosts-database", i);
@@ -1217,8 +1217,8 @@ namespace isc { namespace dhcp {
 #line 1218 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 122:
-#line 554 "dhcp4_parser.yy" // lalr1.cc:859
+  case 124:
+#line 556 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -1228,16 +1228,16 @@ namespace isc { namespace dhcp {
 #line 1229 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 138:
-#line 580 "dhcp4_parser.yy" // lalr1.cc:859
+  case 140:
+#line 582 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.DATABASE_TYPE);
 }
 #line 1237 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 139:
-#line 582 "dhcp4_parser.yy" // lalr1.cc:859
+  case 141:
+#line 584 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -1245,40 +1245,40 @@ namespace isc { namespace dhcp {
 #line 1246 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 140:
-#line 587 "dhcp4_parser.yy" // lalr1.cc:859
+  case 142:
+#line 589 "dhcp4_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("memfile", ctx.loc2pos(yystack_[0].location))); }
 #line 1252 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 141:
-#line 588 "dhcp4_parser.yy" // lalr1.cc:859
+  case 143:
+#line 590 "dhcp4_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("mysql", ctx.loc2pos(yystack_[0].location))); }
 #line 1258 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 142:
-#line 589 "dhcp4_parser.yy" // lalr1.cc:859
+  case 144:
+#line 591 "dhcp4_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("postgresql", ctx.loc2pos(yystack_[0].location))); }
 #line 1264 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 143:
-#line 590 "dhcp4_parser.yy" // lalr1.cc:859
+  case 145:
+#line 592 "dhcp4_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("cql", ctx.loc2pos(yystack_[0].location))); }
 #line 1270 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 144:
-#line 593 "dhcp4_parser.yy" // lalr1.cc:859
+  case 146:
+#line 595 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1278 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 145:
-#line 595 "dhcp4_parser.yy" // lalr1.cc:859
+  case 147:
+#line 597 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr user(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("user", user);
@@ -1287,16 +1287,16 @@ namespace isc { namespace dhcp {
 #line 1288 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 146:
-#line 601 "dhcp4_parser.yy" // lalr1.cc:859
+  case 148:
+#line 603 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1296 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 147:
-#line 603 "dhcp4_parser.yy" // lalr1.cc:859
+  case 149:
+#line 605 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr pwd(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("password", pwd);
@@ -1305,16 +1305,16 @@ namespace isc { namespace dhcp {
 #line 1306 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 148:
-#line 609 "dhcp4_parser.yy" // lalr1.cc:859
+  case 150:
+#line 611 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1314 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 149:
-#line 611 "dhcp4_parser.yy" // lalr1.cc:859
+  case 151:
+#line 613 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr h(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host", h);
@@ -1323,8 +1323,8 @@ namespace isc { namespace dhcp {
 #line 1324 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 150:
-#line 617 "dhcp4_parser.yy" // lalr1.cc:859
+  case 152:
+#line 619 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr p(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("port", p);
@@ -1332,16 +1332,16 @@ namespace isc { namespace dhcp {
 #line 1333 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 151:
-#line 622 "dhcp4_parser.yy" // lalr1.cc:859
+  case 153:
+#line 624 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1341 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 152:
-#line 624 "dhcp4_parser.yy" // lalr1.cc:859
+  case 154:
+#line 626 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("name", name);
@@ -1350,8 +1350,8 @@ namespace isc { namespace dhcp {
 #line 1351 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 153:
-#line 630 "dhcp4_parser.yy" // lalr1.cc:859
+  case 155:
+#line 632 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("persist", n);
@@ -1359,8 +1359,8 @@ namespace isc { namespace dhcp {
 #line 1360 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 154:
-#line 635 "dhcp4_parser.yy" // lalr1.cc:859
+  case 156:
+#line 637 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lfc-interval", n);
@@ -1368,8 +1368,8 @@ namespace isc { namespace dhcp {
 #line 1369 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 155:
-#line 640 "dhcp4_parser.yy" // lalr1.cc:859
+  case 157:
+#line 642 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("readonly", n);
@@ -1377,8 +1377,8 @@ namespace isc { namespace dhcp {
 #line 1378 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 156:
-#line 645 "dhcp4_parser.yy" // lalr1.cc:859
+  case 158:
+#line 647 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("connect-timeout", n);
@@ -1386,16 +1386,16 @@ namespace isc { namespace dhcp {
 #line 1387 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 157:
-#line 650 "dhcp4_parser.yy" // lalr1.cc:859
+  case 159:
+#line 652 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1395 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 158:
-#line 652 "dhcp4_parser.yy" // lalr1.cc:859
+  case 160:
+#line 654 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr cp(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("contact-points", cp);
@@ -1404,16 +1404,16 @@ namespace isc { namespace dhcp {
 #line 1405 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 159:
-#line 658 "dhcp4_parser.yy" // lalr1.cc:859
+  case 161:
+#line 660 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1413 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 160:
-#line 660 "dhcp4_parser.yy" // lalr1.cc:859
+  case 162:
+#line 662 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr ks(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("keyspace", ks);
@@ -1422,8 +1422,8 @@ namespace isc { namespace dhcp {
 #line 1423 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 161:
-#line 667 "dhcp4_parser.yy" // lalr1.cc:859
+  case 163:
+#line 669 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host-reservation-identifiers", l);
@@ -1433,8 +1433,8 @@ namespace isc { namespace dhcp {
 #line 1434 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 162:
-#line 672 "dhcp4_parser.yy" // lalr1.cc:859
+  case 164:
+#line 674 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1442,8 +1442,8 @@ namespace isc { namespace dhcp {
 #line 1443 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 170:
-#line 688 "dhcp4_parser.yy" // lalr1.cc:859
+  case 172:
+#line 690 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(duid);
@@ -1451,8 +1451,8 @@ namespace isc { namespace dhcp {
 #line 1452 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 171:
-#line 693 "dhcp4_parser.yy" // lalr1.cc:859
+  case 173:
+#line 695 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr hwaddr(new StringElement("hw-address", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(hwaddr);
@@ -1460,8 +1460,8 @@ namespace isc { namespace dhcp {
 #line 1461 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 172:
-#line 698 "dhcp4_parser.yy" // lalr1.cc:859
+  case 174:
+#line 700 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr circuit(new StringElement("circuit-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(circuit);
@@ -1469,8 +1469,8 @@ namespace isc { namespace dhcp {
 #line 1470 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 173:
-#line 703 "dhcp4_parser.yy" // lalr1.cc:859
+  case 175:
+#line 705 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr client(new StringElement("client-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(client);
@@ -1478,8 +1478,8 @@ namespace isc { namespace dhcp {
 #line 1479 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 174:
-#line 708 "dhcp4_parser.yy" // lalr1.cc:859
+  case 176:
+#line 710 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr flex_id(new StringElement("flex-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(flex_id);
@@ -1487,8 +1487,8 @@ namespace isc { namespace dhcp {
 #line 1488 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 175:
-#line 713 "dhcp4_parser.yy" // lalr1.cc:859
+  case 177:
+#line 715 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hooks-libraries", l);
@@ -1498,8 +1498,8 @@ namespace isc { namespace dhcp {
 #line 1499 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 176:
-#line 718 "dhcp4_parser.yy" // lalr1.cc:859
+  case 178:
+#line 720 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1507,8 +1507,8 @@ namespace isc { namespace dhcp {
 #line 1508 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 181:
-#line 731 "dhcp4_parser.yy" // lalr1.cc:859
+  case 183:
+#line 733 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1517,8 +1517,8 @@ namespace isc { namespace dhcp {
 #line 1518 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 182:
-#line 735 "dhcp4_parser.yy" // lalr1.cc:859
+  case 184:
+#line 737 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1527,8 +1527,8 @@ namespace isc { namespace dhcp {
 #line 1528 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 183:
-#line 741 "dhcp4_parser.yy" // lalr1.cc:859
+  case 185:
+#line 743 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // Parse the hooks-libraries list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1537,8 +1537,8 @@ namespace isc { namespace dhcp {
 #line 1538 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 184:
-#line 745 "dhcp4_parser.yy" // lalr1.cc:859
+  case 186:
+#line 747 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1547,16 +1547,16 @@ namespace isc { namespace dhcp {
 #line 1548 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 190:
-#line 760 "dhcp4_parser.yy" // lalr1.cc:859
+  case 192:
+#line 762 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1556 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 191:
-#line 762 "dhcp4_parser.yy" // lalr1.cc:859
+  case 193:
+#line 764 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr lib(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("library", lib);
@@ -1565,16 +1565,16 @@ namespace isc { namespace dhcp {
 #line 1566 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 192:
-#line 768 "dhcp4_parser.yy" // lalr1.cc:859
+  case 194:
+#line 770 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1574 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 193:
-#line 770 "dhcp4_parser.yy" // lalr1.cc:859
+  case 195:
+#line 772 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -1582,8 +1582,8 @@ namespace isc { namespace dhcp {
 #line 1583 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 194:
-#line 776 "dhcp4_parser.yy" // lalr1.cc:859
+  case 196:
+#line 778 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("expired-leases-processing", m);
@@ -1593,8 +1593,8 @@ namespace isc { namespace dhcp {
 #line 1594 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 195:
-#line 781 "dhcp4_parser.yy" // lalr1.cc:859
+  case 197:
+#line 783 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // No expired lease parameter is required
     ctx.stack_.pop_back();
@@ -1603,8 +1603,8 @@ namespace isc { namespace dhcp {
 #line 1604 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 204:
-#line 799 "dhcp4_parser.yy" // lalr1.cc:859
+  case 206:
+#line 801 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reclaim-timer-wait-time", value);
@@ -1612,8 +1612,8 @@ namespace isc { namespace dhcp {
 #line 1613 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 205:
-#line 804 "dhcp4_parser.yy" // lalr1.cc:859
+  case 207:
+#line 806 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush-reclaimed-timer-wait-time", value);
@@ -1621,8 +1621,8 @@ namespace isc { namespace dhcp {
 #line 1622 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 206:
-#line 809 "dhcp4_parser.yy" // lalr1.cc:859
+  case 208:
+#line 811 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hold-reclaimed-time", value);
@@ -1630,8 +1630,8 @@ namespace isc { namespace dhcp {
 #line 1631 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 207:
-#line 814 "dhcp4_parser.yy" // lalr1.cc:859
+  case 209:
+#line 816 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-leases", value);
@@ -1639,8 +1639,8 @@ namespace isc { namespace dhcp {
 #line 1640 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 208:
-#line 819 "dhcp4_parser.yy" // lalr1.cc:859
+  case 210:
+#line 821 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-time", value);
@@ -1648,8 +1648,8 @@ namespace isc { namespace dhcp {
 #line 1649 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 209:
-#line 824 "dhcp4_parser.yy" // lalr1.cc:859
+  case 211:
+#line 826 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("unwarned-reclaim-cycles", value);
@@ -1657,8 +1657,8 @@ namespace isc { namespace dhcp {
 #line 1658 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 210:
-#line 832 "dhcp4_parser.yy" // lalr1.cc:859
+  case 212:
+#line 834 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet4", l);
@@ -1668,8 +1668,8 @@ namespace isc { namespace dhcp {
 #line 1669 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 211:
-#line 837 "dhcp4_parser.yy" // lalr1.cc:859
+  case 213:
+#line 839 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1677,8 +1677,8 @@ namespace isc { namespace dhcp {
 #line 1678 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 216:
-#line 857 "dhcp4_parser.yy" // lalr1.cc:859
+  case 218:
+#line 859 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1687,8 +1687,8 @@ namespace isc { namespace dhcp {
 #line 1688 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 217:
-#line 861 "dhcp4_parser.yy" // lalr1.cc:859
+  case 219:
+#line 863 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // Once we reached this place, the subnet parsing is now complete.
     // If we want to, we can implement default values here.
@@ -1713,8 +1713,8 @@ namespace isc { namespace dhcp {
 #line 1714 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 218:
-#line 883 "dhcp4_parser.yy" // lalr1.cc:859
+  case 220:
+#line 885 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // Parse the subnet4 list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1723,8 +1723,8 @@ namespace isc { namespace dhcp {
 #line 1724 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 219:
-#line 887 "dhcp4_parser.yy" // lalr1.cc:859
+  case 221:
+#line 889 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The subnet subnet4 parameter is required
     ctx.require("subnet", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1733,16 +1733,16 @@ namespace isc { namespace dhcp {
 #line 1734 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 243:
-#line 922 "dhcp4_parser.yy" // lalr1.cc:859
+  case 247:
+#line 926 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1742 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 244:
-#line 924 "dhcp4_parser.yy" // lalr1.cc:859
+  case 248:
+#line 928 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr subnet(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet", subnet);
@@ -1751,16 +1751,16 @@ namespace isc { namespace dhcp {
 #line 1752 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 245:
-#line 930 "dhcp4_parser.yy" // lalr1.cc:859
+  case 249:
+#line 934 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1760 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 246:
-#line 932 "dhcp4_parser.yy" // lalr1.cc:859
+  case 250:
+#line 936 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("4o6-interface", iface);
@@ -1769,16 +1769,16 @@ namespace isc { namespace dhcp {
 #line 1770 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 247:
-#line 938 "dhcp4_parser.yy" // lalr1.cc:859
+  case 251:
+#line 942 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1778 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 248:
-#line 940 "dhcp4_parser.yy" // lalr1.cc:859
+  case 252:
+#line 944 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("4o6-interface-id", iface);
@@ -1787,16 +1787,16 @@ namespace isc { namespace dhcp {
 #line 1788 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 249:
-#line 946 "dhcp4_parser.yy" // lalr1.cc:859
+  case 253:
+#line 950 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1796 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 250:
-#line 948 "dhcp4_parser.yy" // lalr1.cc:859
+  case 254:
+#line 952 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("4o6-subnet", iface);
@@ -1805,16 +1805,16 @@ namespace isc { namespace dhcp {
 #line 1806 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 251:
-#line 954 "dhcp4_parser.yy" // lalr1.cc:859
+  case 255:
+#line 958 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1814 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 252:
-#line 956 "dhcp4_parser.yy" // lalr1.cc:859
+  case 256:
+#line 960 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interface", iface);
@@ -1823,16 +1823,16 @@ namespace isc { namespace dhcp {
 #line 1824 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 253:
-#line 962 "dhcp4_parser.yy" // lalr1.cc:859
+  case 257:
+#line 966 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1832 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 254:
-#line 964 "dhcp4_parser.yy" // lalr1.cc:859
+  case 258:
+#line 968 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interface-id", iface);
@@ -1841,16 +1841,16 @@ namespace isc { namespace dhcp {
 #line 1842 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 255:
-#line 970 "dhcp4_parser.yy" // lalr1.cc:859
+  case 259:
+#line 974 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.CLIENT_CLASS);
 }
 #line 1850 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 256:
-#line 972 "dhcp4_parser.yy" // lalr1.cc:859
+  case 260:
+#line 976 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr cls(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-class", cls);
@@ -1859,16 +1859,16 @@ namespace isc { namespace dhcp {
 #line 1860 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 257:
-#line 978 "dhcp4_parser.yy" // lalr1.cc:859
+  case 261:
+#line 982 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.RESERVATION_MODE);
 }
 #line 1868 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 258:
-#line 980 "dhcp4_parser.yy" // lalr1.cc:859
+  case 262:
+#line 984 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("reservation-mode", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -1876,26 +1876,26 @@ namespace isc { namespace dhcp {
 #line 1877 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 259:
-#line 985 "dhcp4_parser.yy" // lalr1.cc:859
+  case 263:
+#line 989 "dhcp4_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("disabled", ctx.loc2pos(yystack_[0].location))); }
 #line 1883 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 260:
-#line 986 "dhcp4_parser.yy" // lalr1.cc:859
+  case 264:
+#line 990 "dhcp4_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("out-of-pool", ctx.loc2pos(yystack_[0].location))); }
 #line 1889 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 261:
-#line 987 "dhcp4_parser.yy" // lalr1.cc:859
+  case 265:
+#line 991 "dhcp4_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("all", ctx.loc2pos(yystack_[0].location))); }
 #line 1895 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 262:
-#line 990 "dhcp4_parser.yy" // lalr1.cc:859
+  case 266:
+#line 994 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr id(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("id", id);
@@ -1903,8 +1903,8 @@ namespace isc { namespace dhcp {
 #line 1904 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 263:
-#line 995 "dhcp4_parser.yy" // lalr1.cc:859
+  case 267:
+#line 999 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr rc(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("rapid-commit", rc);
@@ -1912,8 +1912,8 @@ namespace isc { namespace dhcp {
 #line 1913 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 264:
-#line 1002 "dhcp4_parser.yy" // lalr1.cc:859
+  case 268:
+#line 1006 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("shared-networks", l);
@@ -1923,8 +1923,8 @@ namespace isc { namespace dhcp {
 #line 1924 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 265:
-#line 1007 "dhcp4_parser.yy" // lalr1.cc:859
+  case 269:
+#line 1011 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1932,8 +1932,8 @@ namespace isc { namespace dhcp {
 #line 1933 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 270:
-#line 1022 "dhcp4_parser.yy" // lalr1.cc:859
+  case 274:
+#line 1026 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1942,16 +1942,16 @@ namespace isc { namespace dhcp {
 #line 1943 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 271:
-#line 1026 "dhcp4_parser.yy" // lalr1.cc:859
+  case 275:
+#line 1030 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
 }
 #line 1951 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 287:
-#line 1053 "dhcp4_parser.yy" // lalr1.cc:859
+  case 293:
+#line 1059 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("option-def", l);
@@ -1961,8 +1961,8 @@ namespace isc { namespace dhcp {
 #line 1962 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 288:
-#line 1058 "dhcp4_parser.yy" // lalr1.cc:859
+  case 294:
+#line 1064 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1970,8 +1970,8 @@ namespace isc { namespace dhcp {
 #line 1971 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 289:
-#line 1066 "dhcp4_parser.yy" // lalr1.cc:859
+  case 295:
+#line 1072 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
@@ -1979,16 +1979,16 @@ namespace isc { namespace dhcp {
 #line 1980 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 290:
-#line 1069 "dhcp4_parser.yy" // lalr1.cc:859
+  case 296:
+#line 1075 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // parsing completed
 }
 #line 1988 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 295:
-#line 1085 "dhcp4_parser.yy" // lalr1.cc:859
+  case 301:
+#line 1091 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1997,8 +1997,8 @@ namespace isc { namespace dhcp {
 #line 1998 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 296:
-#line 1089 "dhcp4_parser.yy" // lalr1.cc:859
+  case 302:
+#line 1095 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2009,8 +2009,8 @@ namespace isc { namespace dhcp {
 #line 2010 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 297:
-#line 1100 "dhcp4_parser.yy" // lalr1.cc:859
+  case 303:
+#line 1106 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // Parse the option-def list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2019,8 +2019,8 @@ namespace isc { namespace dhcp {
 #line 2020 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 298:
-#line 1104 "dhcp4_parser.yy" // lalr1.cc:859
+  case 304:
+#line 1110 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2031,8 +2031,8 @@ namespace isc { namespace dhcp {
 #line 2032 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 312:
-#line 1134 "dhcp4_parser.yy" // lalr1.cc:859
+  case 318:
+#line 1140 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr code(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("code", code);
@@ -2040,16 +2040,16 @@ namespace isc { namespace dhcp {
 #line 2041 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 314:
-#line 1141 "dhcp4_parser.yy" // lalr1.cc:859
+  case 320:
+#line 1147 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2049 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 315:
-#line 1143 "dhcp4_parser.yy" // lalr1.cc:859
+  case 321:
+#line 1149 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("type", prf);
@@ -2058,16 +2058,16 @@ namespace isc { namespace dhcp {
 #line 2059 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 316:
-#line 1149 "dhcp4_parser.yy" // lalr1.cc:859
+  case 322:
+#line 1155 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2067 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 317:
-#line 1151 "dhcp4_parser.yy" // lalr1.cc:859
+  case 323:
+#line 1157 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr rtypes(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("record-types", rtypes);
@@ -2076,16 +2076,16 @@ namespace isc { namespace dhcp {
 #line 2077 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 318:
-#line 1157 "dhcp4_parser.yy" // lalr1.cc:859
+  case 324:
+#line 1163 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2085 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 319:
-#line 1159 "dhcp4_parser.yy" // lalr1.cc:859
+  case 325:
+#line 1165 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr space(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("space", space);
@@ -2094,16 +2094,16 @@ namespace isc { namespace dhcp {
 #line 2095 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 321:
-#line 1167 "dhcp4_parser.yy" // lalr1.cc:859
+  case 327:
+#line 1173 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2103 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 322:
-#line 1169 "dhcp4_parser.yy" // lalr1.cc:859
+  case 328:
+#line 1175 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr encap(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("encapsulate", encap);
@@ -2112,8 +2112,8 @@ namespace isc { namespace dhcp {
 #line 2113 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 323:
-#line 1175 "dhcp4_parser.yy" // lalr1.cc:859
+  case 329:
+#line 1181 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr array(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("array", array);
@@ -2121,8 +2121,8 @@ namespace isc { namespace dhcp {
 #line 2122 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 324:
-#line 1184 "dhcp4_parser.yy" // lalr1.cc:859
+  case 330:
+#line 1190 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("option-data", l);
@@ -2132,8 +2132,8 @@ namespace isc { namespace dhcp {
 #line 2133 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 325:
-#line 1189 "dhcp4_parser.yy" // lalr1.cc:859
+  case 331:
+#line 1195 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2141,8 +2141,8 @@ namespace isc { namespace dhcp {
 #line 2142 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 330:
-#line 1208 "dhcp4_parser.yy" // lalr1.cc:859
+  case 336:
+#line 1214 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2151,8 +2151,8 @@ namespace isc { namespace dhcp {
 #line 2152 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 331:
-#line 1212 "dhcp4_parser.yy" // lalr1.cc:859
+  case 337:
+#line 1218 "dhcp4_parser.yy" // lalr1.cc:859
     {
     /// @todo: the code or name parameters are required.
     ctx.stack_.pop_back();
@@ -2160,8 +2160,8 @@ namespace isc { namespace dhcp {
 #line 2161 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 332:
-#line 1220 "dhcp4_parser.yy" // lalr1.cc:859
+  case 338:
+#line 1226 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // Parse the option-data list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2170,8 +2170,8 @@ namespace isc { namespace dhcp {
 #line 2171 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 333:
-#line 1224 "dhcp4_parser.yy" // lalr1.cc:859
+  case 339:
+#line 1230 "dhcp4_parser.yy" // lalr1.cc:859
     {
     /// @todo: the code or name parameters are required.
     // parsing completed
@@ -2179,16 +2179,16 @@ namespace isc { namespace dhcp {
 #line 2180 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 346:
-#line 1255 "dhcp4_parser.yy" // lalr1.cc:859
+  case 352:
+#line 1261 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2188 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 347:
-#line 1257 "dhcp4_parser.yy" // lalr1.cc:859
+  case 353:
+#line 1263 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr data(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("data", data);
@@ -2197,8 +2197,8 @@ namespace isc { namespace dhcp {
 #line 2198 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 350:
-#line 1267 "dhcp4_parser.yy" // lalr1.cc:859
+  case 356:
+#line 1273 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr space(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("csv-format", space);
@@ -2206,8 +2206,8 @@ namespace isc { namespace dhcp {
 #line 2207 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 351:
-#line 1272 "dhcp4_parser.yy" // lalr1.cc:859
+  case 357:
+#line 1278 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr persist(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-send", persist);
@@ -2215,8 +2215,8 @@ namespace isc { namespace dhcp {
 #line 2216 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 352:
-#line 1280 "dhcp4_parser.yy" // lalr1.cc:859
+  case 358:
+#line 1286 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pools", l);
@@ -2226,8 +2226,8 @@ namespace isc { namespace dhcp {
 #line 2227 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 353:
-#line 1285 "dhcp4_parser.yy" // lalr1.cc:859
+  case 359:
+#line 1291 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2235,8 +2235,8 @@ namespace isc { namespace dhcp {
 #line 2236 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 358:
-#line 1300 "dhcp4_parser.yy" // lalr1.cc:859
+  case 364:
+#line 1306 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2245,8 +2245,8 @@ namespace isc { namespace dhcp {
 #line 2246 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 359:
-#line 1304 "dhcp4_parser.yy" // lalr1.cc:859
+  case 365:
+#line 1310 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2255,8 +2255,8 @@ namespace isc { namespace dhcp {
 #line 2256 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 360:
-#line 1310 "dhcp4_parser.yy" // lalr1.cc:859
+  case 366:
+#line 1316 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // Parse the pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2265,8 +2265,8 @@ namespace isc { namespace dhcp {
 #line 2266 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 361:
-#line 1314 "dhcp4_parser.yy" // lalr1.cc:859
+  case 367:
+#line 1320 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2275,16 +2275,16 @@ namespace isc { namespace dhcp {
 #line 2276 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 368:
-#line 1330 "dhcp4_parser.yy" // lalr1.cc:859
+  case 374:
+#line 1336 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2284 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 369:
-#line 1332 "dhcp4_parser.yy" // lalr1.cc:859
+  case 375:
+#line 1338 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr pool(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pool", pool);
@@ -2293,16 +2293,16 @@ namespace isc { namespace dhcp {
 #line 2294 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 370:
-#line 1338 "dhcp4_parser.yy" // lalr1.cc:859
+  case 376:
+#line 1344 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2302 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 371:
-#line 1340 "dhcp4_parser.yy" // lalr1.cc:859
+  case 377:
+#line 1346 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("user-context", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -2310,8 +2310,8 @@ namespace isc { namespace dhcp {
 #line 2311 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 372:
-#line 1348 "dhcp4_parser.yy" // lalr1.cc:859
+  case 378:
+#line 1354 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reservations", l);
@@ -2321,8 +2321,8 @@ namespace isc { namespace dhcp {
 #line 2322 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 373:
-#line 1353 "dhcp4_parser.yy" // lalr1.cc:859
+  case 379:
+#line 1359 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2330,8 +2330,8 @@ namespace isc { namespace dhcp {
 #line 2331 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 378:
-#line 1366 "dhcp4_parser.yy" // lalr1.cc:859
+  case 384:
+#line 1372 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2340,8 +2340,8 @@ namespace isc { namespace dhcp {
 #line 2341 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 379:
-#line 1370 "dhcp4_parser.yy" // lalr1.cc:859
+  case 385:
+#line 1376 "dhcp4_parser.yy" // lalr1.cc:859
     {
     /// @todo: an identifier parameter is required.
     ctx.stack_.pop_back();
@@ -2349,8 +2349,8 @@ namespace isc { namespace dhcp {
 #line 2350 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 380:
-#line 1375 "dhcp4_parser.yy" // lalr1.cc:859
+  case 386:
+#line 1381 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // Parse the reservations list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2359,8 +2359,8 @@ namespace isc { namespace dhcp {
 #line 2360 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 381:
-#line 1379 "dhcp4_parser.yy" // lalr1.cc:859
+  case 387:
+#line 1385 "dhcp4_parser.yy" // lalr1.cc:859
     {
     /// @todo: an identifier parameter is required.
     // parsing completed
@@ -2368,16 +2368,16 @@ namespace isc { namespace dhcp {
 #line 2369 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 399:
-#line 1408 "dhcp4_parser.yy" // lalr1.cc:859
+  case 405:
+#line 1414 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2377 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 400:
-#line 1410 "dhcp4_parser.yy" // lalr1.cc:859
+  case 406:
+#line 1416 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr next_server(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("next-server", next_server);
@@ -2386,16 +2386,16 @@ namespace isc { namespace dhcp {
 #line 2387 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 401:
-#line 1416 "dhcp4_parser.yy" // lalr1.cc:859
+  case 407:
+#line 1422 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2395 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 402:
-#line 1418 "dhcp4_parser.yy" // lalr1.cc:859
+  case 408:
+#line 1424 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr srv(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-hostname", srv);
@@ -2404,16 +2404,16 @@ namespace isc { namespace dhcp {
 #line 2405 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 403:
-#line 1424 "dhcp4_parser.yy" // lalr1.cc:859
+  case 409:
+#line 1430 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2413 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 404:
-#line 1426 "dhcp4_parser.yy" // lalr1.cc:859
+  case 410:
+#line 1432 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr bootfile(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("boot-file-name", bootfile);
@@ -2422,16 +2422,16 @@ namespace isc { namespace dhcp {
 #line 2423 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 405:
-#line 1432 "dhcp4_parser.yy" // lalr1.cc:859
+  case 411:
+#line 1438 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2431 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 406:
-#line 1434 "dhcp4_parser.yy" // lalr1.cc:859
+  case 412:
+#line 1440 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr addr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-address", addr);
@@ -2440,16 +2440,16 @@ namespace isc { namespace dhcp {
 #line 2441 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 407:
-#line 1440 "dhcp4_parser.yy" // lalr1.cc:859
+  case 413:
+#line 1446 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2449 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 408:
-#line 1442 "dhcp4_parser.yy" // lalr1.cc:859
+  case 414:
+#line 1448 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr d(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("duid", d);
@@ -2458,16 +2458,16 @@ namespace isc { namespace dhcp {
 #line 2459 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 409:
-#line 1448 "dhcp4_parser.yy" // lalr1.cc:859
+  case 415:
+#line 1454 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2467 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 410:
-#line 1450 "dhcp4_parser.yy" // lalr1.cc:859
+  case 416:
+#line 1456 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hw-address", hw);
@@ -2476,16 +2476,16 @@ namespace isc { namespace dhcp {
 #line 2477 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 411:
-#line 1456 "dhcp4_parser.yy" // lalr1.cc:859
+  case 417:
+#line 1462 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2485 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 412:
-#line 1458 "dhcp4_parser.yy" // lalr1.cc:859
+  case 418:
+#line 1464 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-id", hw);
@@ -2494,16 +2494,16 @@ namespace isc { namespace dhcp {
 #line 2495 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 413:
-#line 1464 "dhcp4_parser.yy" // lalr1.cc:859
+  case 419:
+#line 1470 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2503 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 414:
-#line 1466 "dhcp4_parser.yy" // lalr1.cc:859
+  case 420:
+#line 1472 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("circuit-id", hw);
@@ -2512,16 +2512,16 @@ namespace isc { namespace dhcp {
 #line 2513 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 415:
-#line 1472 "dhcp4_parser.yy" // lalr1.cc:859
+  case 421:
+#line 1478 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2521 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 416:
-#line 1474 "dhcp4_parser.yy" // lalr1.cc:859
+  case 422:
+#line 1480 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flex-id", hw);
@@ -2530,16 +2530,16 @@ namespace isc { namespace dhcp {
 #line 2531 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 417:
-#line 1480 "dhcp4_parser.yy" // lalr1.cc:859
+  case 423:
+#line 1486 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2539 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 418:
-#line 1482 "dhcp4_parser.yy" // lalr1.cc:859
+  case 424:
+#line 1488 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname", host);
@@ -2548,8 +2548,8 @@ namespace isc { namespace dhcp {
 #line 2549 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 419:
-#line 1488 "dhcp4_parser.yy" // lalr1.cc:859
+  case 425:
+#line 1494 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", c);
@@ -2559,8 +2559,8 @@ namespace isc { namespace dhcp {
 #line 2560 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 420:
-#line 1493 "dhcp4_parser.yy" // lalr1.cc:859
+  case 426:
+#line 1499 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2568,8 +2568,8 @@ namespace isc { namespace dhcp {
 #line 2569 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 421:
-#line 1501 "dhcp4_parser.yy" // lalr1.cc:859
+  case 427:
+#line 1507 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("relay", m);
@@ -2579,8 +2579,8 @@ namespace isc { namespace dhcp {
 #line 2580 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 422:
-#line 1506 "dhcp4_parser.yy" // lalr1.cc:859
+  case 428:
+#line 1512 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2588,16 +2588,16 @@ namespace isc { namespace dhcp {
 #line 2589 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 423:
-#line 1511 "dhcp4_parser.yy" // lalr1.cc:859
+  case 429:
+#line 1517 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2597 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 424:
-#line 1513 "dhcp4_parser.yy" // lalr1.cc:859
+  case 430:
+#line 1519 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr ip(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-address", ip);
@@ -2606,8 +2606,8 @@ namespace isc { namespace dhcp {
 #line 2607 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 425:
-#line 1522 "dhcp4_parser.yy" // lalr1.cc:859
+  case 431:
+#line 1528 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", l);
@@ -2617,8 +2617,8 @@ namespace isc { namespace dhcp {
 #line 2618 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 426:
-#line 1527 "dhcp4_parser.yy" // lalr1.cc:859
+  case 432:
+#line 1533 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2626,8 +2626,8 @@ namespace isc { namespace dhcp {
 #line 2627 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 429:
-#line 1536 "dhcp4_parser.yy" // lalr1.cc:859
+  case 435:
+#line 1542 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2636,8 +2636,8 @@ namespace isc { namespace dhcp {
 #line 2637 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 430:
-#line 1540 "dhcp4_parser.yy" // lalr1.cc:859
+  case 436:
+#line 1546 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The name client class parameter is required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2646,16 +2646,16 @@ namespace isc { namespace dhcp {
 #line 2647 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 444:
-#line 1566 "dhcp4_parser.yy" // lalr1.cc:859
+  case 450:
+#line 1572 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2655 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 445:
-#line 1568 "dhcp4_parser.yy" // lalr1.cc:859
+  case 451:
+#line 1574 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr test(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("test", test);
@@ -2664,8 +2664,8 @@ namespace isc { namespace dhcp {
 #line 2665 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 446:
-#line 1578 "dhcp4_parser.yy" // lalr1.cc:859
+  case 452:
+#line 1584 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp4o6-port", time);
@@ -2673,8 +2673,8 @@ namespace isc { namespace dhcp {
 #line 2674 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 447:
-#line 1585 "dhcp4_parser.yy" // lalr1.cc:859
+  case 453:
+#line 1591 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("control-socket", m);
@@ -2684,8 +2684,8 @@ namespace isc { namespace dhcp {
 #line 2685 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 448:
-#line 1590 "dhcp4_parser.yy" // lalr1.cc:859
+  case 454:
+#line 1596 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2693,16 +2693,16 @@ namespace isc { namespace dhcp {
 #line 2694 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 453:
-#line 1603 "dhcp4_parser.yy" // lalr1.cc:859
+  case 459:
+#line 1609 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2702 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 454:
-#line 1605 "dhcp4_parser.yy" // lalr1.cc:859
+  case 460:
+#line 1611 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr stype(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-type", stype);
@@ -2711,16 +2711,16 @@ namespace isc { namespace dhcp {
 #line 2712 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 455:
-#line 1611 "dhcp4_parser.yy" // lalr1.cc:859
+  case 461:
+#line 1617 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2720 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 456:
-#line 1613 "dhcp4_parser.yy" // lalr1.cc:859
+  case 462:
+#line 1619 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-name", name);
@@ -2729,8 +2729,8 @@ namespace isc { namespace dhcp {
 #line 2730 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 457:
-#line 1621 "dhcp4_parser.yy" // lalr1.cc:859
+  case 463:
+#line 1627 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp-ddns", m);
@@ -2740,8 +2740,8 @@ namespace isc { namespace dhcp {
 #line 2741 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 458:
-#line 1626 "dhcp4_parser.yy" // lalr1.cc:859
+  case 464:
+#line 1632 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -2751,8 +2751,8 @@ namespace isc { namespace dhcp {
 #line 2752 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 459:
-#line 1633 "dhcp4_parser.yy" // lalr1.cc:859
+  case 465:
+#line 1639 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // Parse the dhcp-ddns map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2761,8 +2761,8 @@ namespace isc { namespace dhcp {
 #line 2762 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 460:
-#line 1637 "dhcp4_parser.yy" // lalr1.cc:859
+  case 466:
+#line 1643 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2771,8 +2771,8 @@ namespace isc { namespace dhcp {
 #line 2772 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 478:
-#line 1664 "dhcp4_parser.yy" // lalr1.cc:859
+  case 484:
+#line 1670 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enable-updates", b);
@@ -2780,16 +2780,16 @@ namespace isc { namespace dhcp {
 #line 2781 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 479:
-#line 1669 "dhcp4_parser.yy" // lalr1.cc:859
+  case 485:
+#line 1675 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2789 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 480:
-#line 1671 "dhcp4_parser.yy" // lalr1.cc:859
+  case 486:
+#line 1677 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("qualifying-suffix", s);
@@ -2798,16 +2798,16 @@ namespace isc { namespace dhcp {
 #line 2799 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 481:
-#line 1677 "dhcp4_parser.yy" // lalr1.cc:859
+  case 487:
+#line 1683 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2807 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 482:
-#line 1679 "dhcp4_parser.yy" // lalr1.cc:859
+  case 488:
+#line 1685 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-ip", s);
@@ -2816,8 +2816,8 @@ namespace isc { namespace dhcp {
 #line 2817 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 483:
-#line 1685 "dhcp4_parser.yy" // lalr1.cc:859
+  case 489:
+#line 1691 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-port", i);
@@ -2825,16 +2825,16 @@ namespace isc { namespace dhcp {
 #line 2826 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 484:
-#line 1690 "dhcp4_parser.yy" // lalr1.cc:859
+  case 490:
+#line 1696 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2834 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 485:
-#line 1692 "dhcp4_parser.yy" // lalr1.cc:859
+  case 491:
+#line 1698 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-ip", s);
@@ -2843,8 +2843,8 @@ namespace isc { namespace dhcp {
 #line 2844 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 486:
-#line 1698 "dhcp4_parser.yy" // lalr1.cc:859
+  case 492:
+#line 1704 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-port", i);
@@ -2852,8 +2852,8 @@ namespace isc { namespace dhcp {
 #line 2853 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 487:
-#line 1703 "dhcp4_parser.yy" // lalr1.cc:859
+  case 493:
+#line 1709 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-queue-size", i);
@@ -2861,16 +2861,16 @@ namespace isc { namespace dhcp {
 #line 2862 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 488:
-#line 1708 "dhcp4_parser.yy" // lalr1.cc:859
+  case 494:
+#line 1714 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NCR_PROTOCOL);
 }
 #line 2870 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 489:
-#line 1710 "dhcp4_parser.yy" // lalr1.cc:859
+  case 495:
+#line 1716 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -2878,28 +2878,28 @@ namespace isc { namespace dhcp {
 #line 2879 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 490:
-#line 1716 "dhcp4_parser.yy" // lalr1.cc:859
+  case 496:
+#line 1722 "dhcp4_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); }
 #line 2885 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 491:
-#line 1717 "dhcp4_parser.yy" // lalr1.cc:859
+  case 497:
+#line 1723 "dhcp4_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); }
 #line 2891 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 492:
-#line 1720 "dhcp4_parser.yy" // lalr1.cc:859
+  case 498:
+#line 1726 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NCR_FORMAT);
 }
 #line 2899 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 493:
-#line 1722 "dhcp4_parser.yy" // lalr1.cc:859
+  case 499:
+#line 1728 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ncr-format", json);
@@ -2908,8 +2908,8 @@ namespace isc { namespace dhcp {
 #line 2909 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 494:
-#line 1728 "dhcp4_parser.yy" // lalr1.cc:859
+  case 500:
+#line 1734 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-include-fqdn", b);
@@ -2917,8 +2917,8 @@ namespace isc { namespace dhcp {
 #line 2918 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 495:
-#line 1733 "dhcp4_parser.yy" // lalr1.cc:859
+  case 501:
+#line 1739 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-no-update", b);
@@ -2926,8 +2926,8 @@ namespace isc { namespace dhcp {
 #line 2927 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 496:
-#line 1738 "dhcp4_parser.yy" // lalr1.cc:859
+  case 502:
+#line 1744 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-client-update", b);
@@ -2935,16 +2935,16 @@ namespace isc { namespace dhcp {
 #line 2936 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 497:
-#line 1743 "dhcp4_parser.yy" // lalr1.cc:859
+  case 503:
+#line 1749 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.REPLACE_CLIENT_NAME);
 }
 #line 2944 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 498:
-#line 1745 "dhcp4_parser.yy" // lalr1.cc:859
+  case 504:
+#line 1751 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -2952,40 +2952,40 @@ namespace isc { namespace dhcp {
 #line 2953 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 499:
-#line 1751 "dhcp4_parser.yy" // lalr1.cc:859
+  case 505:
+#line 1757 "dhcp4_parser.yy" // lalr1.cc:859
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location))); 
       }
 #line 2961 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 500:
-#line 1754 "dhcp4_parser.yy" // lalr1.cc:859
+  case 506:
+#line 1760 "dhcp4_parser.yy" // lalr1.cc:859
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location)));
       }
 #line 2969 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 501:
-#line 1757 "dhcp4_parser.yy" // lalr1.cc:859
+  case 507:
+#line 1763 "dhcp4_parser.yy" // lalr1.cc:859
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location)));
       }
 #line 2977 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 502:
-#line 1760 "dhcp4_parser.yy" // lalr1.cc:859
+  case 508:
+#line 1766 "dhcp4_parser.yy" // lalr1.cc:859
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location)));
       }
 #line 2985 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 503:
-#line 1763 "dhcp4_parser.yy" // lalr1.cc:859
+  case 509:
+#line 1769 "dhcp4_parser.yy" // lalr1.cc:859
     {
       error(yystack_[0].location, "boolean values for the replace-client-name are "
                 "no longer supported");
@@ -2993,16 +2993,16 @@ namespace isc { namespace dhcp {
 #line 2994 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 504:
-#line 1769 "dhcp4_parser.yy" // lalr1.cc:859
+  case 510:
+#line 1775 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3002 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 505:
-#line 1771 "dhcp4_parser.yy" // lalr1.cc:859
+  case 511:
+#line 1777 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("generated-prefix", s);
@@ -3011,16 +3011,16 @@ namespace isc { namespace dhcp {
 #line 3012 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 506:
-#line 1779 "dhcp4_parser.yy" // lalr1.cc:859
+  case 512:
+#line 1785 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3020 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 507:
-#line 1781 "dhcp4_parser.yy" // lalr1.cc:859
+  case 513:
+#line 1787 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3028,16 +3028,16 @@ namespace isc { namespace dhcp {
 #line 3029 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 508:
-#line 1786 "dhcp4_parser.yy" // lalr1.cc:859
+  case 514:
+#line 1792 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3037 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 509:
-#line 1788 "dhcp4_parser.yy" // lalr1.cc:859
+  case 515:
+#line 1794 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3045,16 +3045,16 @@ namespace isc { namespace dhcp {
 #line 3046 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 510:
-#line 1793 "dhcp4_parser.yy" // lalr1.cc:859
+  case 516:
+#line 1799 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3054 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 511:
-#line 1795 "dhcp4_parser.yy" // lalr1.cc:859
+  case 517:
+#line 1801 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("Control-agent", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3062,8 +3062,8 @@ namespace isc { namespace dhcp {
 #line 3063 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 512:
-#line 1805 "dhcp4_parser.yy" // lalr1.cc:859
+  case 518:
+#line 1811 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("Logging", m);
@@ -3073,8 +3073,8 @@ namespace isc { namespace dhcp {
 #line 3074 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 513:
-#line 1810 "dhcp4_parser.yy" // lalr1.cc:859
+  case 519:
+#line 1816 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3082,8 +3082,8 @@ namespace isc { namespace dhcp {
 #line 3083 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 517:
-#line 1827 "dhcp4_parser.yy" // lalr1.cc:859
+  case 523:
+#line 1833 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("loggers", l);
@@ -3093,8 +3093,8 @@ namespace isc { namespace dhcp {
 #line 3094 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 518:
-#line 1832 "dhcp4_parser.yy" // lalr1.cc:859
+  case 524:
+#line 1838 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3102,8 +3102,8 @@ namespace isc { namespace dhcp {
 #line 3103 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 521:
-#line 1844 "dhcp4_parser.yy" // lalr1.cc:859
+  case 527:
+#line 1850 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(l);
@@ -3112,16 +3112,16 @@ namespace isc { namespace dhcp {
 #line 3113 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 522:
-#line 1848 "dhcp4_parser.yy" // lalr1.cc:859
+  case 528:
+#line 1854 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
 }
 #line 3121 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 530:
-#line 1863 "dhcp4_parser.yy" // lalr1.cc:859
+  case 536:
+#line 1869 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
@@ -3129,16 +3129,16 @@ namespace isc { namespace dhcp {
 #line 3130 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 531:
-#line 1868 "dhcp4_parser.yy" // lalr1.cc:859
+  case 537:
+#line 1874 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3138 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 532:
-#line 1870 "dhcp4_parser.yy" // lalr1.cc:859
+  case 538:
+#line 1876 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
@@ -3147,8 +3147,8 @@ namespace isc { namespace dhcp {
 #line 3148 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 533:
-#line 1876 "dhcp4_parser.yy" // lalr1.cc:859
+  case 539:
+#line 1882 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output_options", l);
@@ -3158,8 +3158,8 @@ namespace isc { namespace dhcp {
 #line 3159 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 534:
-#line 1881 "dhcp4_parser.yy" // lalr1.cc:859
+  case 540:
+#line 1887 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3167,8 +3167,8 @@ namespace isc { namespace dhcp {
 #line 3168 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 537:
-#line 1890 "dhcp4_parser.yy" // lalr1.cc:859
+  case 543:
+#line 1896 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -3177,24 +3177,24 @@ namespace isc { namespace dhcp {
 #line 3178 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 538:
-#line 1894 "dhcp4_parser.yy" // lalr1.cc:859
+  case 544:
+#line 1900 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
 }
 #line 3186 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 545:
-#line 1908 "dhcp4_parser.yy" // lalr1.cc:859
+  case 551:
+#line 1914 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3194 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 546:
-#line 1910 "dhcp4_parser.yy" // lalr1.cc:859
+  case 552:
+#line 1916 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
@@ -3203,8 +3203,8 @@ namespace isc { namespace dhcp {
 #line 3204 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 547:
-#line 1916 "dhcp4_parser.yy" // lalr1.cc:859
+  case 553:
+#line 1922 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr flush(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
@@ -3212,8 +3212,8 @@ namespace isc { namespace dhcp {
 #line 3213 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 548:
-#line 1921 "dhcp4_parser.yy" // lalr1.cc:859
+  case 554:
+#line 1927 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr maxsize(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
@@ -3221,8 +3221,8 @@ namespace isc { namespace dhcp {
 #line 3222 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 549:
-#line 1926 "dhcp4_parser.yy" // lalr1.cc:859
+  case 555:
+#line 1932 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr maxver(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
@@ -3486,103 +3486,103 @@ namespace isc { namespace dhcp {
   }
 
 
-  const short int Dhcp4Parser::yypact_ninf_ = -694;
+  const short int Dhcp4Parser::yypact_ninf_ = -713;
 
   const signed char Dhcp4Parser::yytable_ninf_ = -1;
 
   const short int
   Dhcp4Parser::yypact_[] =
   {
-     211,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,    37,    18,    56,    61,    65,    73,    86,
-     125,   135,   143,   154,   156,   198,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-      18,    -2,    16,   176,   162,    22,   -11,    34,    45,    69,
-      99,   -27,   222,  -694,   187,   166,   203,   205,   239,  -694,
-    -694,  -694,  -694,  -694,   242,  -694,    33,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,   281,   285,  -694,  -694,  -694,   290,
-     291,   292,   293,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,   294,  -694,  -694,  -694,    42,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,   295,    43,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,   298,   299,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,    51,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,    52,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,   301,   307,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,   304,
-    -694,  -694,   309,  -694,  -694,  -694,   311,  -694,  -694,   312,
-     316,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,   334,   335,  -694,  -694,  -694,  -694,   333,   339,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-      71,  -694,  -694,  -694,   353,  -694,  -694,   354,  -694,   355,
-     356,  -694,  -694,   360,   361,   363,  -694,  -694,  -694,    75,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,    18,    18,  -694,   223,
-     366,   367,   368,   369,   370,  -694,    16,  -694,   371,   227,
-     228,   374,   375,   376,   234,   235,   236,   237,   381,   382,
-     383,   384,   385,   386,   387,   388,   246,   390,   391,   176,
-    -694,   392,   393,   394,   250,   162,  -694,    25,   396,   397,
-     398,   399,   400,   401,   402,   403,   263,   260,   404,   407,
-     408,   409,    22,  -694,   410,   -11,  -694,   411,   412,   413,
-     414,   415,   416,   417,   418,   419,   420,  -694,    34,  -694,
-     421,   422,   280,   424,   425,   426,   282,  -694,    69,   428,
-     284,   286,  -694,    99,   430,   432,    88,  -694,   288,   434,
-     435,   296,   436,   297,   300,   437,   438,   303,   305,   306,
-     441,   444,   222,  -694,  -694,  -694,   445,   446,   449,    18,
-      18,    18,  -694,   452,  -694,  -694,   314,   454,   455,  -694,
-    -694,  -694,  -694,   459,   460,   461,   462,   464,   465,   466,
-     467,  -694,   468,   469,  -694,   472,   210,   270,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,   470,   477,
-    -694,  -694,  -694,   327,   336,   337,   476,   478,   340,   341,
-     342,  -694,  -694,   163,   343,   486,   485,  -694,   347,  -694,
-     348,   349,   472,   351,   352,   357,   358,   359,   362,   364,
-    -694,   365,   372,  -694,   373,   377,   378,  -694,  -694,   379,
-    -694,  -694,  -694,   380,    18,  -694,  -694,   389,   395,  -694,
-     405,  -694,  -694,    17,   423,  -694,  -694,  -694,    39,   406,
-    -694,    18,   176,   427,  -694,  -694,  -694,   162,  -694,   220,
-     220,   492,   493,   494,   495,   159,    31,   499,   137,   179,
-     222,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,   503,
-    -694,    25,  -694,  -694,  -694,   502,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,   505,   429,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,   102,  -694,   128,  -694,  -694,   182,  -694,  -694,
-    -694,  -694,   509,   510,   512,   513,   516,  -694,  -694,  -694,
-     183,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,   186,  -694,   515,   519,  -694,  -694,
-     521,   525,  -694,  -694,   523,   527,  -694,  -694,   526,   528,
-    -694,  -694,  -694,  -694,  -694,  -694,    36,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,    91,  -694,   530,   531,  -694,   529,
-     533,   534,   535,   538,   539,   192,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,   196,  -694,  -694,  -694,   200,
-     431,   433,  -694,  -694,   540,   541,  -694,  -694,   542,   544,
-    -694,  -694,   537,  -694,   545,   427,  -694,  -694,   549,   550,
-     551,   552,   439,   440,   443,   442,   447,   553,   554,   220,
-    -694,  -694,    22,  -694,   492,    69,  -694,   493,    99,  -694,
-     494,    60,  -694,   495,   159,  -694,    31,  -694,   -27,  -694,
-     499,   448,   450,   451,   453,   456,   457,   137,  -694,   555,
-     556,   179,  -694,  -694,  -694,   557,   558,  -694,   -11,  -694,
-     502,    34,  -694,   505,   560,  -694,   561,  -694,   253,   463,
-     471,   473,  -694,  -694,  -694,  -694,  -694,   474,   475,  -694,
-     206,  -694,   559,  -694,   562,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,   208,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,   259,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,   479,   480,  -694,  -694,   481,   261,  -694,
-     563,  -694,   482,   565,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,    60,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,   119,  -694,  -694,
-      46,   565,  -694,  -694,   564,  -694,  -694,  -694,   262,  -694,
-    -694,  -694,  -694,  -694,   569,   458,   570,    46,  -694,   571,
-    -694,   483,  -694,   568,  -694,  -694,   140,  -694,    54,   568,
-    -694,  -694,   574,   576,   577,   268,  -694,  -694,  -694,  -694,
-    -694,  -694,   578,   484,   487,   488,    54,  -694,   490,  -694,
-    -694,  -694,  -694,  -694
+     248,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,    40,    32,    35,    43,    45,    49,    65,
+      67,    71,    78,    97,   106,   115,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+      32,   -48,     8,   140,   113,    22,     4,   180,    70,    -1,
+     141,   -27,   266,  -713,   161,   196,   202,   224,   230,  -713,
+    -713,  -713,  -713,  -713,   252,  -713,    94,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,   253,   271,  -713,  -713,  -713,  -713,
+    -713,   284,   285,   286,   287,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,   288,  -713,  -713,  -713,   102,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,   290,   109,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,   291,   293,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,   128,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,   144,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,   228,
+     240,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,   238,  -713,  -713,   296,  -713,  -713,  -713,
+     298,  -713,  -713,   246,   300,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,   301,   305,  -713,  -713,
+    -713,  -713,   261,   309,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,   145,  -713,  -713,  -713,   313,  -713,
+    -713,   327,  -713,   328,   329,  -713,  -713,   330,   332,   333,
+    -713,  -713,  -713,   184,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+      32,    32,  -713,   158,   334,   335,   336,   339,   341,  -713,
+       8,  -713,   342,   170,   208,   354,   355,   356,   357,   358,
+     216,   247,   249,   251,   391,   393,   395,   396,   397,   398,
+     399,   400,   258,   402,   403,   140,  -713,   404,   405,   406,
+     267,   113,  -713,    25,   407,   409,   410,   411,   413,   414,
+     415,   416,   274,   273,   419,   420,   421,   422,    22,  -713,
+     423,     4,  -713,   424,   425,   426,   427,   428,   429,   430,
+     431,  -713,   180,  -713,   432,   433,   292,   434,   436,   437,
+     294,  -713,    -1,   438,   295,   297,  -713,   141,   441,   443,
+      55,  -713,   299,   446,   447,   306,   448,   307,   308,   454,
+     455,   311,   316,   318,   458,   464,   266,  -713,  -713,  -713,
+     465,   463,   466,    32,    32,    32,  -713,   468,  -713,  -713,
+     325,   326,   331,   469,   472,  -713,  -713,  -713,  -713,   475,
+     477,   478,   479,   481,   482,   483,   484,  -713,   485,   486,
+    -713,   489,   155,   171,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,   487,   493,  -713,  -713,  -713,   343,
+     344,   352,   494,   496,   360,   361,   362,  -713,  -713,   207,
+     363,   495,   497,  -713,   365,  -713,   489,   366,   367,   368,
+     369,   370,   371,   372,  -713,   373,   374,  -713,   375,   376,
+     377,  -713,  -713,   378,  -713,  -713,  -713,   379,    32,  -713,
+    -713,   380,   381,  -713,   382,  -713,  -713,    17,   384,  -713,
+    -713,  -713,   -38,   383,  -713,    32,   140,   408,  -713,  -713,
+    -713,   113,  -713,  -713,  -713,   315,   315,   523,   525,   526,
+     527,   129,    26,   528,    81,   126,   266,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,   532,  -713,    25,  -713,  -713,
+    -713,   530,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,   531,   453,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,   197,  -713,   214,  -713,
+    -713,   220,  -713,  -713,  -713,  -713,   536,   537,   538,   539,
+     540,  -713,  -713,  -713,   221,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,   231,  -713,
+     541,   542,  -713,  -713,   543,   545,  -713,  -713,   544,   548,
+    -713,  -713,   546,   550,  -713,  -713,  -713,  -713,  -713,  -713,
+      57,  -713,  -713,  -713,  -713,  -713,  -713,  -713,   131,  -713,
+     549,   551,  -713,   552,   553,   554,   555,   556,   557,   232,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,   239,
+    -713,  -713,  -713,   241,   417,   418,  -713,  -713,   559,   563,
+    -713,  -713,   561,   565,  -713,  -713,   562,  -713,   558,   408,
+    -713,  -713,   567,   568,   569,   570,   435,   439,   440,   442,
+     445,   571,   572,   315,  -713,  -713,    22,  -713,   523,    -1,
+    -713,   525,   141,  -713,   526,    72,  -713,   527,   129,  -713,
+      26,  -713,   -27,  -713,   528,   449,   450,   451,   452,   456,
+     457,    81,  -713,   573,   574,   126,  -713,  -713,  -713,   575,
+     566,  -713,     4,  -713,   530,   180,  -713,   531,   576,  -713,
+     578,  -713,   254,   444,   459,   460,  -713,  -713,  -713,  -713,
+    -713,   461,   462,  -713,   242,  -713,   577,  -713,   581,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+     250,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+     262,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,   467,
+     470,  -713,  -713,   471,   264,  -713,   585,  -713,   473,   579,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,    72,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,   152,  -713,  -713,   -18,   579,  -713,  -713,
+     580,  -713,  -713,  -713,   265,  -713,  -713,  -713,  -713,  -713,
+     590,   474,   591,   -18,  -713,   595,  -713,   476,  -713,   594,
+    -713,  -713,   153,  -713,    91,   594,  -713,  -713,   598,   605,
+     606,   268,  -713,  -713,  -713,  -713,  -713,  -713,   607,   480,
+     488,   490,    91,  -713,   492,  -713,  -713,  -713,  -713,  -713
   };
 
   const unsigned short int
@@ -3592,340 +3592,342 @@ namespace isc { namespace dhcp {
       20,    22,    24,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     1,    41,    34,    30,
       29,    26,    27,    28,    33,     3,    31,    32,    54,     5,
-      66,     7,   106,     9,   218,    11,   360,    13,   380,    15,
-     289,    17,   297,    19,   332,    21,   183,    23,   459,    25,
-      43,    37,     0,     0,     0,     0,     0,   382,     0,   299,
-     334,     0,     0,    45,     0,    44,     0,     0,    38,    64,
-     512,   506,   508,   510,     0,    63,     0,    56,    58,    60,
-      61,    62,    59,    98,     0,     0,   399,   119,   121,     0,
-       0,     0,     0,   210,   287,   324,   264,   161,   425,   175,
-     194,     0,   447,   457,    91,     0,    68,    70,    71,    72,
-      73,    88,    89,    76,    77,    78,    79,    83,    84,    74,
-      75,    81,    82,    90,    80,    85,    86,    87,   108,   110,
-     114,     0,     0,   100,   102,   103,   104,   105,   429,   245,
-     247,   249,   352,   370,   243,   251,   253,     0,     0,   257,
-     255,   372,   421,   242,   222,   223,   224,   236,     0,   220,
-     227,   238,   239,   240,   228,   229,   232,   234,   230,   231,
-     225,   226,   241,   233,   237,   235,   368,   367,   365,     0,
-     362,   364,   366,   401,   403,   419,   407,   409,   413,   411,
-     417,   415,   405,   398,   394,     0,   383,   384,   395,   396,
-     397,   391,   386,   392,   388,   389,   390,   393,   387,     0,
-     314,   151,     0,   318,   316,   321,     0,   310,   311,     0,
-     300,   301,   303,   313,   304,   305,   306,   320,   307,   308,
-     309,   346,     0,     0,   344,   345,   348,   349,     0,   335,
-     336,   338,   339,   340,   341,   342,   343,   190,   192,   187,
-       0,   185,   188,   189,     0,   479,   481,     0,   484,     0,
-       0,   488,   492,     0,     0,     0,   497,   504,   477,     0,
-     461,   463,   464,   465,   466,   467,   468,   469,   470,   471,
-     472,   473,   474,   475,   476,    42,     0,     0,    35,     0,
-       0,     0,     0,     0,     0,    53,     0,    55,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      67,     0,     0,     0,     0,     0,   107,   431,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   219,     0,     0,   361,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   381,     0,   290,
-       0,     0,     0,     0,     0,     0,     0,   298,     0,     0,
-       0,     0,   333,     0,     0,     0,     0,   184,     0,     0,
+      66,     7,   108,     9,   220,    11,   366,    13,   386,    15,
+     295,    17,   303,    19,   338,    21,   185,    23,   465,    25,
+      43,    37,     0,     0,     0,     0,     0,   388,     0,   305,
+     340,     0,     0,    45,     0,    44,     0,     0,    38,    64,
+     518,   512,   514,   516,     0,    63,     0,    56,    58,    60,
+      61,    62,    59,   100,     0,     0,   405,   407,   409,   121,
+     123,     0,     0,     0,     0,   212,   293,   330,   268,   163,
+     431,   177,   196,     0,   453,   463,    93,     0,    68,    70,
+      71,    72,    73,    88,    89,    76,    77,    78,    79,    83,
+      84,    74,    75,    81,    82,    90,    91,    92,    80,    85,
+      86,    87,   110,   112,   116,     0,     0,   102,   104,   105,
+     106,   107,   435,   249,   251,   253,   358,   376,   247,   255,
+     257,     0,     0,   261,   259,   378,   427,   246,   224,   225,
+     226,   238,     0,   222,   229,   242,   243,   244,   230,   231,
+     234,   236,   232,   233,   227,   228,   245,   235,   239,   240,
+     241,   237,   374,   373,   371,     0,   368,   370,   372,   425,
+     413,   415,   419,   417,   423,   421,   411,   404,   400,     0,
+     389,   390,   401,   402,   403,   397,   392,   398,   394,   395,
+     396,   399,   393,     0,   320,   153,     0,   324,   322,   327,
+       0,   316,   317,     0,   306,   307,   309,   319,   310,   311,
+     312,   326,   313,   314,   315,   352,     0,     0,   350,   351,
+     354,   355,     0,   341,   342,   344,   345,   346,   347,   348,
+     349,   192,   194,   189,     0,   187,   190,   191,     0,   485,
+     487,     0,   490,     0,     0,   494,   498,     0,     0,     0,
+     503,   510,   483,     0,   467,   469,   470,   471,   472,   473,
+     474,   475,   476,   477,   478,   479,   480,   481,   482,    42,
+       0,     0,    35,     0,     0,     0,     0,     0,     0,    53,
+       0,    55,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   460,    46,    39,     0,     0,     0,     0,
-       0,     0,    57,     0,    96,    97,     0,     0,     0,    92,
-      93,    94,    95,     0,     0,     0,     0,     0,     0,     0,
-       0,   446,     0,     0,    69,     0,     0,     0,   118,   101,
-     444,   442,   443,   437,   438,   439,   440,   441,     0,   432,
-     433,   435,   436,     0,     0,     0,     0,     0,     0,     0,
-       0,   262,   263,     0,     0,     0,     0,   221,     0,   363,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     385,     0,     0,   312,     0,     0,     0,   323,   302,     0,
-     350,   351,   337,     0,     0,   186,   478,     0,     0,   483,
-       0,   486,   487,     0,     0,   494,   495,   496,     0,     0,
-     462,     0,     0,     0,   507,   509,   511,     0,   400,     0,
-       0,   212,   291,   326,   266,     0,     0,   177,     0,     0,
-       0,    47,   109,   112,   113,   111,   116,   117,   115,     0,
-     430,     0,   246,   248,   250,   354,    36,   371,   244,   252,
-     254,   259,   260,   261,   258,   256,   374,     0,   369,   402,
-     404,   420,   408,   410,   414,   412,   418,   416,   406,   315,
-     152,   319,   317,   322,   347,   191,   193,   480,   482,   485,
-     490,   491,   489,   493,   499,   500,   501,   502,   503,   498,
-     505,    40,     0,   517,     0,   514,   516,     0,   138,   144,
-     146,   148,     0,     0,     0,     0,     0,   157,   159,   137,
-       0,   123,   125,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,     0,   216,     0,   213,   214,   295,
-       0,   292,   293,   330,     0,   327,   328,   270,     0,   267,
-     268,   170,   171,   172,   173,   174,     0,   163,   165,   166,
-     167,   168,   169,   427,     0,   181,     0,   178,   179,     0,
-       0,     0,     0,     0,     0,     0,   196,   198,   199,   200,
-     201,   202,   203,   453,   455,     0,   449,   451,   452,     0,
-      49,     0,   434,   358,     0,   355,   356,   378,     0,   375,
-     376,   423,     0,    65,     0,     0,   513,    99,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     120,   122,     0,   211,     0,   299,   288,     0,   334,   325,
-       0,     0,   265,     0,     0,   162,     0,   426,     0,   176,
-       0,     0,     0,     0,     0,     0,     0,     0,   195,     0,
-       0,     0,   448,   458,    51,     0,    50,   445,     0,   353,
-       0,   382,   373,     0,     0,   422,     0,   515,     0,     0,
-       0,     0,   150,   153,   154,   155,   156,     0,     0,   124,
-       0,   215,     0,   294,     0,   329,   286,   285,   277,   278,
-     280,   274,   275,   276,   284,   283,     0,   272,   279,   281,
-     282,   269,   164,   428,     0,   180,   204,   205,   206,   207,
-     208,   209,   197,     0,     0,   450,    48,     0,     0,   357,
-       0,   377,     0,     0,   140,   141,   142,   143,   139,   145,
-     147,   149,   158,   160,   217,   296,   331,     0,   271,   182,
-     454,   456,    52,   359,   379,   424,   521,     0,   519,   273,
-       0,     0,   518,   533,     0,   531,   529,   525,     0,   523,
-     527,   528,   526,   520,     0,     0,     0,     0,   522,     0,
-     530,     0,   524,     0,   532,   537,     0,   535,     0,     0,
-     534,   545,     0,     0,     0,     0,   539,   541,   542,   543,
-     544,   536,     0,     0,     0,     0,     0,   538,     0,   547,
-     548,   549,   540,   546
+       0,     0,     0,     0,     0,     0,    67,     0,     0,     0,
+       0,     0,   109,   437,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   221,
+       0,     0,   367,     0,     0,     0,     0,     0,     0,     0,
+       0,   387,     0,   296,     0,     0,     0,     0,     0,     0,
+       0,   304,     0,     0,     0,     0,   339,     0,     0,     0,
+       0,   186,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   466,    46,    39,
+       0,     0,     0,     0,     0,     0,    57,     0,    98,    99,
+       0,     0,     0,     0,     0,    94,    95,    96,    97,     0,
+       0,     0,     0,     0,     0,     0,     0,   452,     0,     0,
+      69,     0,     0,     0,   120,   103,   450,   448,   449,   443,
+     444,   445,   446,   447,     0,   438,   439,   441,   442,     0,
+       0,     0,     0,     0,     0,     0,     0,   266,   267,     0,
+       0,     0,     0,   223,     0,   369,     0,     0,     0,     0,
+       0,     0,     0,     0,   391,     0,     0,   318,     0,     0,
+       0,   329,   308,     0,   356,   357,   343,     0,     0,   188,
+     484,     0,     0,   489,     0,   492,   493,     0,     0,   500,
+     501,   502,     0,     0,   468,     0,     0,     0,   513,   515,
+     517,     0,   406,   408,   410,     0,     0,   214,   297,   332,
+     270,     0,     0,   179,     0,     0,     0,    47,   111,   114,
+     115,   113,   118,   119,   117,     0,   436,     0,   250,   252,
+     254,   360,    36,   377,   248,   256,   258,   263,   264,   265,
+     262,   260,   380,     0,   375,   426,   414,   416,   420,   418,
+     424,   422,   412,   321,   154,   325,   323,   328,   353,   193,
+     195,   486,   488,   491,   496,   497,   495,   499,   505,   506,
+     507,   508,   509,   504,   511,    40,     0,   523,     0,   520,
+     522,     0,   140,   146,   148,   150,     0,     0,     0,     0,
+       0,   159,   161,   139,     0,   125,   127,   128,   129,   130,
+     131,   132,   133,   134,   135,   136,   137,   138,     0,   218,
+       0,   215,   216,   301,     0,   298,   299,   336,     0,   333,
+     334,   274,     0,   271,   272,   172,   173,   174,   175,   176,
+       0,   165,   167,   168,   169,   170,   171,   433,     0,   183,
+       0,   180,   181,     0,     0,     0,     0,     0,     0,     0,
+     198,   200,   201,   202,   203,   204,   205,   459,   461,     0,
+     455,   457,   458,     0,    49,     0,   440,   364,     0,   361,
+     362,   384,     0,   381,   382,   429,     0,    65,     0,     0,
+     519,   101,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   122,   124,     0,   213,     0,   305,
+     294,     0,   340,   331,     0,     0,   269,     0,     0,   164,
+       0,   432,     0,   178,     0,     0,     0,     0,     0,     0,
+       0,     0,   197,     0,     0,     0,   454,   464,    51,     0,
+      50,   451,     0,   359,     0,   388,   379,     0,     0,   428,
+       0,   521,     0,     0,     0,     0,   152,   155,   156,   157,
+     158,     0,     0,   126,     0,   217,     0,   300,     0,   335,
+     292,   291,   281,   282,   284,   278,   279,   280,   290,   289,
+       0,   276,   283,   285,   286,   287,   288,   273,   166,   434,
+       0,   182,   206,   207,   208,   209,   210,   211,   199,     0,
+       0,   456,    48,     0,     0,   363,     0,   383,     0,     0,
+     142,   143,   144,   145,   141,   147,   149,   151,   160,   162,
+     219,   302,   337,     0,   275,   184,   460,   462,    52,   365,
+     385,   430,   527,     0,   525,   277,     0,     0,   524,   539,
+       0,   537,   535,   531,     0,   529,   533,   534,   532,   526,
+       0,     0,     0,     0,   528,     0,   536,     0,   530,     0,
+     538,   543,     0,   541,     0,     0,   540,   551,     0,     0,
+       0,     0,   545,   547,   548,   549,   550,   542,     0,     0,
+       0,     0,     0,   544,     0,   553,   554,   555,   546,   552
   };
 
   const short int
   Dhcp4Parser::yypgoto_[] =
   {
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,   -48,  -694,   105,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,    93,  -694,  -694,  -694,   -62,
-    -694,  -694,  -694,   277,  -694,  -694,  -694,  -694,    57,   255,
-     -52,   -47,   -44,  -694,  -694,   -41,  -694,  -694,    68,   252,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,    72,  -121,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,   -69,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -131,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -134,  -694,  -694,  -694,  -129,   215,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -135,  -694,  -694,  -694,  -694,  -694,  -694,
-    -693,  -694,  -694,  -694,  -108,  -694,  -694,  -694,  -105,   256,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -688,  -694,
-    -694,  -694,  -509,  -694,  -687,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -113,  -694,  -694,  -216,   -57,  -694,  -694,
-    -694,  -694,  -694,  -104,  -694,  -694,  -694,  -103,  -694,   238,
-    -694,   -40,  -694,  -694,  -694,  -694,  -694,   -39,  -694,  -694,
-    -694,  -694,  -694,   -51,  -694,  -694,  -694,  -106,  -694,  -694,
-    -694,  -100,  -694,   232,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -128,  -694,  -694,  -694,  -125,
-     269,  -694,  -694,   -64,  -694,  -694,  -694,  -694,  -694,  -123,
-    -694,  -694,  -694,  -120,  -694,   264,   -45,  -694,  -331,  -694,
-    -318,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -686,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,    96,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -102,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,   108,   240,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,
-    -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,  -694,   -54,
-    -694,  -694,  -694,  -198,  -694,  -694,  -213,  -694,  -694,  -694,
-    -694,  -694,  -694,  -224,  -694,  -694,  -240,  -694,  -694,  -694,
-    -694,  -694
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,   -49,  -713,    83,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,   103,  -713,  -713,  -713,   -62,
+    -713,  -713,  -713,   302,  -713,  -713,  -713,  -713,    98,   280,
+     -44,   -34,   -30,  -713,  -713,   -29,  -713,  -713,    99,   277,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,   100,   -90,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,   -69,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -104,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -109,  -713,  -713,  -713,  -105,   243,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -113,  -713,  -713,  -713,  -713,  -713,  -713,
+    -712,  -713,  -713,  -713,   -88,  -713,  -713,  -713,   -85,   276,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -706,  -713,
+    -713,  -713,  -518,  -713,  -698,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,   -95,  -713,  -713,  -197,   -66,  -713,  -713,
+    -713,  -713,  -713,   -82,  -713,  -713,  -713,   -79,  -713,   259,
+    -713,   -64,  -713,  -713,  -713,  -713,  -713,   -46,  -713,  -713,
+    -713,  -713,  -713,   -50,  -713,  -713,  -713,   -81,  -713,  -713,
+    -713,   -80,  -713,   260,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -108,  -713,  -713,  -713,  -107,
+     289,  -713,  -713,   -54,  -713,  -713,  -713,  -713,  -713,  -102,
+    -713,  -713,  -713,  -106,  -713,   312,   -45,  -713,   -42,  -713,
+     -37,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -687,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,   101,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,   -93,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,   123,   255,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,
+    -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,  -713,   -35,
+    -713,  -713,  -713,  -185,  -713,  -713,  -198,  -713,  -713,  -713,
+    -713,  -713,  -713,  -208,  -713,  -713,  -224,  -713,  -713,  -713,
+    -713,  -713
   };
 
   const short int
   Dhcp4Parser::yydefgoto_[] =
   {
       -1,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    34,    35,    36,    61,   547,    77,
-      78,    37,    60,    74,    75,   532,   680,   745,   746,   114,
-      39,    62,    86,    87,    88,   300,    41,    63,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   308,   142,   143,
-      43,    64,   144,   331,   145,   332,   535,   146,   333,   538,
-     147,   124,   312,   125,   313,   610,   611,   612,   698,   818,
-     613,   699,   614,   700,   615,   701,   616,   228,   371,   618,
-     619,   620,   621,   622,   707,   623,   708,   126,   322,   646,
-     647,   648,   649,   650,   651,   652,   127,   324,   656,   657,
-     658,   728,    57,    71,   260,   261,   262,   384,   263,   385,
-     128,   325,   665,   666,   667,   668,   669,   670,   671,   672,
-     129,   318,   626,   627,   628,   712,    45,    65,   168,   169,
-     170,   343,   171,   338,   172,   339,   173,   340,   174,   344,
-     175,   345,   176,   349,   177,   348,   554,   178,   179,   130,
-     321,   638,   639,   640,   721,   786,   787,   131,   319,    51,
-      68,   630,   631,   632,   715,    53,    69,   229,   230,   231,
-     232,   233,   234,   235,   370,   236,   374,   237,   373,   238,
-     239,   375,   240,   132,   320,   634,   635,   636,   718,    55,
-      70,   248,   249,   250,   251,   252,   379,   253,   254,   255,
-     256,   181,   341,   684,   685,   686,   748,    47,    66,   189,
-     190,   191,   354,   182,   342,   183,   350,   688,   689,   690,
-     751,    49,    67,   205,   206,   207,   133,   311,   209,   357,
-     210,   358,   211,   366,   212,   360,   213,   361,   214,   363,
-     215,   362,   216,   365,   217,   364,   218,   359,   185,   351,
-     692,   754,   134,   323,   654,   337,   448,   449,   450,   451,
-     452,   539,   135,   136,   327,   675,   676,   677,   739,   678,
-     740,   137,   328,    59,    72,   279,   280,   281,   282,   389,
-     283,   390,   284,   285,   392,   286,   287,   288,   395,   582,
-     289,   396,   290,   291,   292,   293,   400,   589,   294,   401,
-      89,   302,    90,   303,    91,   304,    92,   301,   594,   595,
-     596,   694,   837,   838,   840,   848,   849,   850,   851,   856,
-     852,   854,   866,   867,   868,   875,   876,   877,   882,   878,
-     879,   880
+      22,    23,    24,    25,    34,    35,    36,    61,   553,    77,
+      78,    37,    60,    74,    75,   538,   684,   749,   750,   116,
+      39,    62,    86,    87,    88,   304,    41,    63,   117,   118,
+     119,   120,   121,   122,   123,   124,   125,   312,   146,   147,
+      43,    64,   148,   337,   149,   338,   541,   150,   339,   544,
+     151,   126,   318,   127,   319,   614,   615,   616,   702,   824,
+     617,   703,   618,   704,   619,   705,   620,   232,   375,   622,
+     623,   624,   625,   626,   711,   627,   712,   128,   328,   650,
+     651,   652,   653,   654,   655,   656,   129,   330,   660,   661,
+     662,   732,    57,    71,   264,   265,   266,   388,   267,   389,
+     130,   331,   669,   670,   671,   672,   673,   674,   675,   676,
+     131,   324,   630,   631,   632,   716,    45,    65,   172,   173,
+     174,   349,   175,   344,   176,   345,   177,   346,   178,   350,
+     179,   351,   180,   355,   181,   354,   560,   182,   183,   132,
+     327,   642,   643,   644,   725,   790,   791,   133,   325,    51,
+      68,   634,   635,   636,   719,    53,    69,   233,   234,   235,
+     236,   237,   238,   239,   374,   240,   378,   241,   377,   242,
+     243,   379,   244,   134,   326,   638,   639,   640,   722,    55,
+      70,   252,   253,   254,   255,   256,   383,   257,   258,   259,
+     260,   185,   347,   688,   689,   690,   752,    47,    66,   195,
+     196,   197,   360,   186,   348,   187,   356,   692,   693,   694,
+     755,    49,    67,   209,   210,   211,   135,   315,   136,   316,
+     137,   317,   215,   370,   216,   364,   217,   365,   218,   367,
+     219,   366,   220,   369,   221,   368,   222,   363,   191,   357,
+     696,   758,   138,   329,   658,   343,   454,   455,   456,   457,
+     458,   545,   139,   140,   333,   679,   680,   681,   743,   682,
+     744,   141,   334,    59,    72,   283,   284,   285,   286,   393,
+     287,   394,   288,   289,   396,   290,   291,   292,   399,   586,
+     293,   400,   294,   295,   296,   297,   404,   593,   298,   405,
+      89,   306,    90,   307,    91,   308,    92,   305,   598,   599,
+     600,   698,   843,   844,   846,   854,   855,   856,   857,   862,
+     858,   860,   872,   873,   874,   881,   882,   883,   888,   884,
+     885,   886
   };
 
   const unsigned short int
   Dhcp4Parser::yytable_[] =
   {
-      85,   245,   192,   163,   187,   203,   446,   227,   244,   259,
-     278,   219,    73,   164,   180,   188,   204,   653,   165,   447,
-     184,   166,   208,    27,   167,    28,    79,    29,   782,   148,
-     246,   247,   580,   783,   785,   790,   306,    26,   148,   724,
-     105,   307,   725,    95,    96,   329,   335,    96,   193,   194,
-     330,   336,   186,   153,   352,   355,    96,   193,   194,   353,
-     356,   257,   258,    38,    99,   100,   101,   148,    40,   149,
-     150,   151,    42,   105,   386,   104,   105,   221,   402,   387,
-      44,    95,    96,   403,   152,   105,   153,   154,   155,   156,
-     157,   158,   159,    46,   726,   104,   220,   727,   221,   160,
-     161,   440,    99,   100,   101,   329,   103,   162,   160,   195,
-     693,   105,   221,   196,   197,   198,   199,   200,   201,    84,
-     202,   221,   841,   222,   223,   842,   155,   224,   225,   226,
-     159,   695,    48,   581,   782,    84,   696,   160,    80,   783,
-     785,   790,    50,   869,    76,   162,   870,    81,    82,    83,
-      52,   221,   241,   222,   223,   242,   243,   584,   585,   586,
-     587,    54,    84,    56,    30,    31,    32,    33,    84,   296,
-     843,    84,   844,   845,   138,   139,   257,   258,   140,   871,
-      84,   141,   872,   873,   874,   335,   709,    93,   588,   709,
-     697,   710,    84,   295,   711,   737,    94,    95,    96,   741,
-     738,    97,    98,   402,   742,    58,    84,   297,   743,   352,
-     446,   827,   784,   298,   824,    84,   828,   793,    99,   100,
-     101,   102,   103,   447,   533,   534,   104,   105,   659,   660,
-     661,   662,   663,   664,   551,   552,   553,   106,   641,   642,
-     643,   644,   299,   645,    85,    84,   305,   598,   404,   405,
-     107,   108,   599,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   386,   109,   355,   857,   110,   829,   442,   833,
-     858,   886,   221,   111,   112,   441,   887,   113,   673,   674,
-     443,   814,   815,   816,   817,   309,   444,   536,   537,   310,
-     163,   192,   445,   187,   314,   315,   316,   317,   326,   334,
-     164,   180,   346,   347,   188,   165,   203,   184,   166,   367,
-     368,   167,   369,   372,   245,   376,   227,   204,   784,   378,
-     377,   244,    84,   208,   264,   265,   266,   267,   268,   269,
-     270,   271,   272,   273,   274,   275,   276,   277,   380,   381,
-     278,   382,   383,   246,   247,     1,     2,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,   388,   391,   393,
-     394,   514,   515,   516,   397,   398,    84,   399,    84,   406,
-     407,   408,   409,   410,   411,   413,   414,   415,   416,   417,
-     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   435,   436,   437,   438,
-     453,   454,   455,   456,   457,   458,   459,   460,   463,   462,
-     461,   464,   465,   466,   468,   470,   471,   472,   473,   474,
-     475,   476,   477,   478,   479,   481,   482,   483,   484,   485,
-     486,   487,   489,   490,   493,   491,   494,   496,   497,   498,
-     500,   503,   504,   499,   501,   508,   576,   502,   509,   511,
-     617,   617,   505,   512,   506,   507,   513,   609,   609,   517,
-     518,   519,   520,   591,   521,   522,   523,   524,   278,   525,
-     526,   527,   442,   542,   528,   529,   530,   531,   540,   441,
-     541,   545,   543,   544,   443,    28,   548,   549,   550,   555,
-     444,   556,   557,   558,   559,   560,   445,   562,   563,   625,
-     629,   633,   637,   564,   565,   566,   655,   681,   567,   683,
-     568,   569,   687,   702,   703,   691,   704,   705,   570,   571,
-     706,   713,   714,   572,   573,   574,   575,   716,   717,   719,
-     720,   723,   722,   731,   730,   577,   729,   732,   733,   734,
-     583,   578,   735,   736,   750,   755,   749,   753,   752,   756,
-     593,   579,   590,   758,   759,   760,   761,   767,   768,   803,
-     804,   807,   546,   806,   812,   561,   813,   825,   855,   592,
-     826,   834,   836,   859,   861,   865,   863,   744,   883,   747,
-     884,   885,   888,   412,   434,   597,   762,   439,   769,   763,
-     764,   765,   624,   792,   766,   796,   795,   797,   798,   794,
-     799,   495,   802,   800,   801,   860,   771,   770,   467,   819,
-     791,   839,   772,   773,   775,   492,   488,   820,   774,   821,
-     822,   823,   809,   808,   469,   830,   831,   832,   835,   864,
-     811,   810,   480,   889,   890,   891,   893,   682,   679,   805,
-     617,   757,   510,   853,   862,   881,   892,   609,     0,   245,
-     163,     0,   781,   227,     0,     0,   244,     0,     0,   776,
-     164,   180,     0,     0,     0,   165,   259,   184,   166,   777,
-     788,   167,     0,     0,   778,     0,   789,   779,   246,   247,
-     780,     0,     0,     0,   192,     0,   187,     0,     0,   203,
-       0,     0,     0,     0,     0,     0,     0,   188,     0,     0,
-     204,     0,     0,     0,     0,     0,   208,     0,     0,     0,
+      85,   249,   223,   167,   193,   207,   250,   231,   248,   263,
+     282,    73,   198,   786,   657,   184,   194,   208,    79,   787,
+     188,   168,   212,   189,   251,   213,   224,   789,   190,   152,
+     214,   169,   584,   152,   225,   170,   171,    27,   796,    28,
+      26,    29,    38,    95,    96,    97,    98,    96,    97,    98,
+      40,   225,    42,   226,   227,   107,    44,   228,   229,   230,
+     728,   261,   262,   729,   101,   102,   103,   192,   157,   153,
+     154,   155,    46,   107,    48,   106,   107,   225,    50,   152,
+     588,   589,   590,   591,   156,    52,   157,   158,   159,   160,
+     161,   162,   163,    95,    96,    97,    98,   310,    76,   164,
+     165,   446,   311,   164,    54,   335,   849,   166,   850,   851,
+     336,   592,   341,    56,   101,   102,   103,   342,   105,    84,
+     106,   786,    58,   107,   225,   142,   143,   787,    84,   144,
+      80,   358,   145,   585,   730,   789,   359,   731,   159,    81,
+      82,    83,   163,   261,   262,    84,   796,   361,   390,   164,
+      84,    93,   362,   391,    84,   847,   875,   166,   848,   876,
+      94,    95,    96,    97,    98,    99,   100,   299,    84,   539,
+     540,    84,   663,   664,   665,   666,   667,   668,    30,    31,
+      32,    33,   101,   102,   103,   104,   105,   406,   542,   543,
+     106,   107,   407,   225,   245,   226,   227,   246,   247,   300,
+     335,   108,    96,    97,    98,   697,   301,   788,   645,   646,
+     647,   648,   799,   649,   109,   110,   877,   699,    84,   878,
+     879,   880,   700,   341,   713,   677,   678,   111,   701,   714,
+     112,   107,   302,   303,   713,   741,   371,   113,   114,   715,
+     742,   115,   745,   372,   406,   358,   373,   746,    85,   747,
+     830,   408,   409,   833,   381,   199,   309,   313,   834,   200,
+     201,   202,   203,   204,   205,   390,   206,   361,   863,   386,
+     835,   892,   839,   864,   448,   314,   893,   449,   557,   558,
+     559,   447,   820,   821,   822,   823,    84,    84,   320,   321,
+     322,   323,   332,   450,   340,   352,   167,   353,   451,   193,
+     376,   452,   380,   382,   410,   384,   453,   198,   184,   385,
+     207,   194,   387,   188,   168,   788,   189,   392,   249,   418,
+     231,   190,   208,   250,   169,   248,    84,   212,   170,   171,
+     213,   395,   397,   398,   401,   214,   402,   403,   411,   412,
+     413,   251,   602,   414,   282,   415,   417,   603,   604,   605,
+     606,   607,   608,   609,   610,   611,   612,   419,   420,   421,
+     422,   423,   424,   425,   518,   519,   520,   225,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
+     280,   281,     1,     2,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,   426,   429,   427,   430,   428,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,   441,   442,
+     443,   459,    84,   460,   461,   462,   444,   463,   464,   465,
+     466,   467,   468,   469,   470,   471,   472,   474,   476,   477,
+     478,   479,   480,   481,   482,   483,   485,   486,   488,   487,
+     489,   490,   493,   491,   494,   497,   495,   498,   500,   580,
+     501,   502,   504,   503,   505,   506,   621,   621,   507,   508,
+     509,    84,   512,   613,   613,   510,   595,   511,   513,   515,
+     516,   522,   523,   517,   282,   521,   525,   524,   448,   526,
+     527,   449,   528,   529,   530,   447,   531,   532,   533,   548,
+     549,   534,   535,   536,   537,   546,   547,   450,   550,   551,
+     562,   587,   451,    28,   563,   452,   554,   555,   556,   561,
+     453,   564,   566,   567,   568,   569,   570,   571,   572,   573,
+     574,   575,   576,   577,   578,   579,   581,   582,   583,   594,
+     629,   597,   633,   637,   641,   659,   685,   687,   691,   695,
+     706,   707,   708,   709,   710,   718,   552,   717,   721,   720,
+     723,   724,   726,   727,   734,   733,   735,   736,   737,   738,
+     739,   740,   760,   748,   751,   753,   754,   756,   757,   813,
+     759,   762,   763,   764,   765,   771,   772,   809,   810,   565,
+     818,   812,   766,   819,   861,   831,   842,   768,   767,   832,
+     825,   769,   770,   840,   865,   867,   802,   803,   804,   805,
+     869,   871,   889,   806,   807,   826,   827,   828,   829,   890,
+     891,   894,   416,   836,   596,   440,   837,   838,   445,   841,
+     601,   866,   870,   773,   798,   801,   628,   800,   808,   895,
+     775,   774,   797,   499,   473,   896,   845,   897,   899,   777,
+     776,   492,   778,   779,   621,   814,   815,   496,   686,   816,
+     475,   613,   811,   249,   167,   817,   785,   231,   250,   683,
+     248,   514,   859,   780,   761,   868,   184,   887,   898,     0,
+     263,   188,   168,     0,   189,   792,   251,     0,     0,   190,
+     793,   781,   169,   794,   484,     0,   170,   171,   795,     0,
+     193,   782,     0,   207,     0,   783,   784,     0,   198,     0,
+       0,     0,   194,     0,     0,   208,     0,     0,     0,     0,
+     212,     0,     0,   213,     0,     0,     0,     0,   214,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   781,     0,
-       0,     0,     0,     0,     0,   776,     0,     0,     0,     0,
-       0,   847,     0,     0,     0,   777,   788,     0,   846,     0,
-     778,     0,   789,   779,     0,     0,   780,     0,   847,     0,
-       0,     0,     0,     0,     0,   846
+       0,     0,     0,     0,   785,     0,     0,     0,     0,     0,
+       0,   780,     0,     0,     0,     0,     0,   853,     0,     0,
+       0,     0,     0,   792,   852,     0,     0,     0,   793,   781,
+       0,   794,     0,     0,   853,     0,   795,     0,     0,   782,
+       0,   852,     0,   783,   784
   };
 
   const short int
   Dhcp4Parser::yycheck_[] =
   {
-      62,    70,    66,    65,    66,    67,   337,    69,    70,    71,
-      72,    68,    60,    65,    65,    66,    67,   526,    65,   337,
-      65,    65,    67,     5,    65,     7,    10,     9,   721,     7,
-      70,    70,    15,   721,   721,   721,     3,     0,     7,     3,
-      51,     8,     6,    21,    22,     3,     3,    22,    23,    24,
-       8,     8,    63,    64,     3,     3,    22,    23,    24,     8,
-       8,    88,    89,     7,    42,    43,    44,     7,     7,    47,
-      48,    49,     7,    51,     3,    50,    51,    52,     3,     8,
-       7,    21,    22,     8,    62,    51,    64,    65,    66,    67,
-      68,    69,    70,     7,     3,    50,    27,     6,    52,    77,
-      78,    76,    42,    43,    44,     3,    46,    85,    77,    75,
-       8,    51,    52,    79,    80,    81,    82,    83,    84,   146,
-      86,    52,     3,    54,    55,     6,    66,    58,    59,    60,
-      70,     3,     7,   116,   827,   146,     8,    77,   122,   827,
-     827,   827,     7,     3,   146,    85,     6,   131,   132,   133,
-       7,    52,    53,    54,    55,    56,    57,   118,   119,   120,
-     121,     7,   146,     7,   146,   147,   148,   149,   146,     3,
-     124,   146,   126,   127,    12,    13,    88,    89,    16,   125,
-     146,    19,   128,   129,   130,     3,     3,    11,   149,     3,
-       8,     8,   146,     6,     8,     3,    20,    21,    22,     3,
-       8,    25,    26,     3,     8,     7,   146,     4,     8,     3,
-     541,     3,   721,     8,     8,   146,     8,   726,    42,    43,
-      44,    45,    46,   541,    14,    15,    50,    51,    91,    92,
-      93,    94,    95,    96,    71,    72,    73,    61,    79,    80,
-      81,    82,     3,    84,   306,   146,     4,    27,   296,   297,
-      74,    75,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    41,     3,    87,     3,     3,    90,     8,   337,     8,
-       8,     3,    52,    97,    98,   337,     8,   101,    99,   100,
-     337,    28,    29,    30,    31,     4,   337,    17,    18,     4,
-     352,   355,   337,   355,     4,     4,     4,     4,     4,     4,
-     352,   352,     4,     4,   355,   352,   368,   352,   352,     8,
-       3,   352,     8,     4,   383,     4,   378,   368,   827,     3,
-       8,   383,   146,   368,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,     4,     4,
-     402,     8,     3,   383,   383,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,     4,     4,     4,
-       4,   409,   410,   411,     4,     4,   146,     4,   146,   146,
-       4,     4,     4,     4,     4,     4,   149,   149,     4,     4,
-       4,   147,   147,   147,   147,     4,     4,     4,     4,     4,
-       4,     4,     4,   147,     4,     4,     4,     4,     4,   149,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,   149,
-     147,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,   147,     4,     4,
-       4,   149,     4,   149,     4,   149,     4,   149,     4,     4,
-       4,     4,     4,   147,   147,     4,   494,   147,     4,     4,
-     519,   520,   149,     7,   149,   149,     7,   519,   520,     7,
-     146,     7,     7,   511,     5,     5,     5,     5,   530,     5,
-       5,     5,   541,   146,     7,     7,     7,     5,     8,   541,
-       3,     5,   146,   146,   541,     7,   146,   146,   146,   146,
-     541,     5,     7,   146,   146,   146,   541,   146,   146,     7,
-       7,     7,     7,   146,   146,   146,     7,     4,   146,     7,
-     146,   146,     7,     4,     4,    86,     4,     4,   146,   146,
-       4,     6,     3,   146,   146,   146,   146,     6,     3,     6,
-       3,     3,     6,     4,     3,   146,     6,     4,     4,     4,
-     117,   146,     4,     4,     3,     8,     6,     3,     6,     4,
-     123,   146,   146,     4,     4,     4,     4,     4,     4,     4,
-       4,     3,   457,     6,     4,   472,     5,     8,     4,   512,
-       8,     8,     7,     4,     4,     7,     5,   146,     4,   146,
-       4,     4,     4,   306,   329,   517,   147,   335,   709,   149,
-     147,   149,   520,   724,   147,   147,   730,   147,   147,   728,
-     147,   386,   737,   147,   147,   147,   714,   712,   352,   146,
-     723,   827,   715,   717,   720,   383,   378,   146,   718,   146,
-     146,   146,   750,   748,   355,   146,   146,   146,   146,   146,
-     753,   751,   368,   149,   147,   147,   146,   541,   530,   741,
-     709,   695,   402,   841,   857,   869,   886,   709,    -1,   718,
-     712,    -1,   721,   715,    -1,    -1,   718,    -1,    -1,   721,
-     712,   712,    -1,    -1,    -1,   712,   728,   712,   712,   721,
-     721,   712,    -1,    -1,   721,    -1,   721,   721,   718,   718,
-     721,    -1,    -1,    -1,   748,    -1,   748,    -1,    -1,   751,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   748,    -1,    -1,
-     751,    -1,    -1,    -1,    -1,    -1,   751,    -1,    -1,    -1,
+      62,    70,    68,    65,    66,    67,    70,    69,    70,    71,
+      72,    60,    66,   725,   532,    65,    66,    67,    10,   725,
+      65,    65,    67,    65,    70,    67,    27,   725,    65,     7,
+      67,    65,    15,     7,    52,    65,    65,     5,   725,     7,
+       0,     9,     7,    21,    22,    23,    24,    22,    23,    24,
+       7,    52,     7,    54,    55,    51,     7,    58,    59,    60,
+       3,    88,    89,     6,    42,    43,    44,    63,    64,    47,
+      48,    49,     7,    51,     7,    50,    51,    52,     7,     7,
+     118,   119,   120,   121,    62,     7,    64,    65,    66,    67,
+      68,    69,    70,    21,    22,    23,    24,     3,   146,    77,
+      78,    76,     8,    77,     7,     3,   124,    85,   126,   127,
+       8,   149,     3,     7,    42,    43,    44,     8,    46,   146,
+      50,   833,     7,    51,    52,    12,    13,   833,   146,    16,
+     122,     3,    19,   116,     3,   833,     8,     6,    66,   131,
+     132,   133,    70,    88,    89,   146,   833,     3,     3,    77,
+     146,    11,     8,     8,   146,     3,     3,    85,     6,     6,
+      20,    21,    22,    23,    24,    25,    26,     6,   146,    14,
+      15,   146,    91,    92,    93,    94,    95,    96,   146,   147,
+     148,   149,    42,    43,    44,    45,    46,     3,    17,    18,
+      50,    51,     8,    52,    53,    54,    55,    56,    57,     3,
+       3,    61,    22,    23,    24,     8,     4,   725,    79,    80,
+      81,    82,   730,    84,    74,    75,   125,     3,   146,   128,
+     129,   130,     8,     3,     3,    99,   100,    87,     8,     8,
+      90,    51,     8,     3,     3,     3,     8,    97,    98,     8,
+       8,   101,     3,     3,     3,     3,     8,     8,   310,     8,
+       8,   300,   301,     3,     8,    75,     4,     4,     8,    79,
+      80,    81,    82,    83,    84,     3,    86,     3,     3,     8,
+       8,     3,     8,     8,   343,     4,     8,   343,    71,    72,
+      73,   343,    28,    29,    30,    31,   146,   146,     4,     4,
+       4,     4,     4,   343,     4,     4,   358,     4,   343,   361,
+       4,   343,     4,     3,   146,     4,   343,   361,   358,     4,
+     372,   361,     3,   358,   358,   833,   358,     4,   387,   149,
+     382,   358,   372,   387,   358,   387,   146,   372,   358,   358,
+     372,     4,     4,     4,     4,   372,     4,     4,     4,     4,
+       4,   387,    27,     4,   406,     4,     4,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,   149,     4,     4,
+       4,     4,     4,   147,   413,   414,   415,    52,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   134,   135,   136,   137,   138,   139,   140,   141,
+     142,   143,   144,   145,   147,     4,   147,     4,   147,     4,
+       4,     4,     4,     4,     4,   147,     4,     4,     4,     4,
+       4,     4,   146,     4,     4,     4,   149,     4,     4,     4,
+       4,   147,   149,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,   147,
+       4,     4,     4,   149,   149,     4,   149,     4,   149,   498,
+       4,     4,     4,   147,   147,   147,   525,   526,     4,     4,
+     149,   146,     4,   525,   526,   149,   515,   149,     4,     4,
+       7,   146,   146,     7,   536,     7,     7,   146,   547,     7,
+       5,   547,     5,     5,     5,   547,     5,     5,     5,   146,
+     146,     7,     7,     7,     5,     8,     3,   547,   146,     5,
+       5,   117,   547,     7,     7,   547,   146,   146,   146,   146,
+     547,   146,   146,   146,   146,   146,   146,   146,   146,   146,
+     146,   146,   146,   146,   146,   146,   146,   146,   146,   146,
+       7,   123,     7,     7,     7,     7,     4,     7,     7,    86,
+       4,     4,     4,     4,     4,     3,   463,     6,     3,     6,
+       6,     3,     6,     3,     3,     6,     4,     4,     4,     4,
+       4,     4,     4,   146,   146,     6,     3,     6,     3,     3,
+       8,     4,     4,     4,     4,     4,     4,     4,     4,   476,
+       4,     6,   147,     5,     4,     8,     7,   147,   149,     8,
+     146,   149,   147,     8,     4,     4,   147,   147,   147,   147,
+       5,     7,     4,   147,   147,   146,   146,   146,   146,     4,
+       4,     4,   310,   146,   516,   335,   146,   146,   341,   146,
+     521,   147,   146,   713,   728,   734,   526,   732,   741,   149,
+     718,   716,   727,   390,   358,   147,   833,   147,   146,   721,
+     719,   382,   722,   724,   713,   752,   754,   387,   547,   755,
+     361,   713,   745,   722,   716,   757,   725,   719,   722,   536,
+     722,   406,   847,   725,   699,   863,   716,   875,   892,    -1,
+     732,   716,   716,    -1,   716,   725,   722,    -1,    -1,   716,
+     725,   725,   716,   725,   372,    -1,   716,   716,   725,    -1,
+     752,   725,    -1,   755,    -1,   725,   725,    -1,   752,    -1,
+      -1,    -1,   752,    -1,    -1,   755,    -1,    -1,    -1,    -1,
+     755,    -1,    -1,   755,    -1,    -1,    -1,    -1,   755,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   827,    -1,
-      -1,    -1,    -1,    -1,    -1,   827,    -1,    -1,    -1,    -1,
-      -1,   840,    -1,    -1,    -1,   827,   827,    -1,   840,    -1,
-     827,    -1,   827,   827,    -1,    -1,   827,    -1,   857,    -1,
-      -1,    -1,    -1,    -1,    -1,   857
+      -1,    -1,    -1,    -1,   833,    -1,    -1,    -1,    -1,    -1,
+      -1,   833,    -1,    -1,    -1,    -1,    -1,   846,    -1,    -1,
+      -1,    -1,    -1,   833,   846,    -1,    -1,    -1,   833,   833,
+      -1,   833,    -1,    -1,   863,    -1,   833,    -1,    -1,   833,
+      -1,   863,    -1,   833,   833
   };
 
   const unsigned short int
@@ -3940,87 +3942,87 @@ namespace isc { namespace dhcp {
      172,   167,   181,   187,   201,   277,   358,   372,   310,   316,
      340,   253,   424,   164,   173,   174,   146,   169,   170,    10,
      122,   131,   132,   133,   146,   179,   182,   183,   184,   450,
-     452,   454,   456,    11,    20,    21,    22,    25,    26,    42,
-      43,    44,    45,    46,    50,    51,    61,    74,    75,    87,
-      90,    97,    98,   101,   179,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,   211,   213,   237,   246,   260,   270,
-     299,   307,   333,   376,   402,   412,   413,   421,    12,    13,
-      16,    19,   198,   199,   202,   204,   207,   210,     7,    47,
-      48,    49,    62,    64,    65,    66,    67,    68,    69,    70,
-      77,    78,    85,   179,   190,   191,   192,   195,   278,   279,
-     280,   282,   284,   286,   288,   290,   292,   294,   297,   298,
-     333,   351,   363,   365,   376,   398,    63,   179,   333,   359,
-     360,   361,   363,    23,    24,    75,    79,    80,    81,    82,
-      83,    84,    86,   179,   333,   373,   374,   375,   376,   378,
-     380,   382,   384,   386,   388,   390,   392,   394,   396,   307,
-      27,    52,    54,    55,    58,    59,    60,   179,   227,   317,
-     318,   319,   320,   321,   322,   323,   325,   327,   329,   330,
-     332,    53,    56,    57,   179,   227,   321,   327,   341,   342,
-     343,   344,   345,   347,   348,   349,   350,    88,    89,   179,
-     254,   255,   256,   258,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   179,   425,
-     426,   427,   428,   430,   432,   433,   435,   436,   437,   440,
-     442,   443,   444,   445,   448,     6,     3,     4,     8,     3,
-     185,   457,   451,   453,   455,     4,     3,     8,   197,     4,
-       4,   377,   212,   214,     4,     4,     4,     4,   271,   308,
-     334,   300,   238,   403,   247,   261,     4,   414,   422,     3,
-       8,   203,   205,   208,     4,     3,     8,   405,   283,   285,
-     287,   352,   364,   281,   289,   291,     4,     4,   295,   293,
-     366,   399,     3,     8,   362,     3,     8,   379,   381,   397,
-     385,   387,   391,   389,   395,   393,   383,     8,     3,     8,
-     324,   228,     4,   328,   326,   331,     4,     8,     3,   346,
-       4,     4,     8,     3,   257,   259,     3,     8,     4,   429,
-     431,     4,   434,     4,     4,   438,   441,     4,     4,     4,
-     446,   449,     3,     8,   164,   164,   146,     4,     4,     4,
-       4,     4,   183,     4,   149,   149,     4,     4,     4,   147,
-     147,   147,   147,     4,     4,     4,     4,     4,     4,     4,
-       4,   147,     4,     4,   189,     4,     4,     4,   149,   199,
-      76,   179,   227,   307,   333,   376,   378,   380,   406,   407,
-     408,   409,   410,     4,     4,     4,     4,     4,     4,     4,
-       4,   147,   149,     4,     4,     4,     4,   279,     4,   360,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-     375,     4,     4,   147,     4,     4,     4,   149,   319,     4,
-     149,   149,   343,     4,     4,   255,   149,     4,     4,   147,
-       4,   147,   147,     4,     4,   149,   149,   149,     4,     4,
-     426,     4,     7,     7,   164,   164,   164,     7,   146,     7,
-       7,     5,     5,     5,     5,     5,     5,     5,     7,     7,
-       7,     5,   175,    14,    15,   206,    17,    18,   209,   411,
-       8,     3,   146,   146,   146,     5,   166,   168,   146,   146,
-     146,    71,    72,    73,   296,   146,     5,     7,   146,   146,
-     146,   175,   146,   146,   146,   146,   146,   146,   146,   146,
-     146,   146,   146,   146,   146,   146,   164,   146,   146,   146,
-      15,   116,   439,   117,   118,   119,   120,   121,   149,   447,
-     146,   164,   188,   123,   458,   459,   460,   198,    27,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,   179,
-     215,   216,   217,   220,   222,   224,   226,   227,   229,   230,
-     231,   232,   233,   235,   215,     7,   272,   273,   274,     7,
-     311,   312,   313,     7,   335,   336,   337,     7,   301,   302,
-     303,    79,    80,    81,    82,    84,   239,   240,   241,   242,
-     243,   244,   245,   292,   404,     7,   248,   249,   250,    91,
-      92,    93,    94,    95,    96,   262,   263,   264,   265,   266,
-     267,   268,   269,    99,   100,   415,   416,   417,   419,   425,
-     176,     4,   408,     7,   353,   354,   355,     7,   367,   368,
-     369,    86,   400,     8,   461,     3,     8,     8,   218,   221,
-     223,   225,     4,     4,     4,     4,     4,   234,   236,     3,
-       8,     8,   275,     6,     3,   314,     6,     3,   338,     6,
-       3,   304,     6,     3,     3,     6,     3,     6,   251,     6,
-       3,     4,     4,     4,     4,     4,     4,     3,     8,   418,
-     420,     3,     8,     8,   146,   177,   178,   146,   356,     6,
-       3,   370,     6,     3,   401,     8,     4,   459,     4,     4,
-       4,     4,   147,   149,   147,   149,   147,     4,     4,   216,
-     278,   274,   317,   313,   341,   337,   179,   190,   191,   192,
-     195,   227,   270,   288,   292,   294,   305,   306,   333,   376,
-     398,   303,   240,   292,   254,   250,   147,   147,   147,   147,
-     147,   147,   263,     4,     4,   416,     6,     3,   359,   355,
-     373,   369,     4,     5,    28,    29,    30,    31,   219,   146,
-     146,   146,   146,   146,     8,     8,     8,     3,     8,     8,
-     146,   146,   146,     8,     8,   146,     7,   462,   463,   306,
-     464,     3,     6,   124,   126,   127,   179,   227,   465,   466,
-     467,   468,   470,   463,   471,     4,   469,     3,     8,     4,
-     147,     4,   466,     5,   146,     7,   472,   473,   474,     3,
-       6,   125,   128,   129,   130,   475,   476,   477,   479,   480,
-     481,   473,   478,     4,     4,     4,     3,     8,     4,   149,
-     147,   147,   476,   146
+     452,   454,   456,    11,    20,    21,    22,    23,    24,    25,
+      26,    42,    43,    44,    45,    46,    50,    51,    61,    74,
+      75,    87,    90,    97,    98,   101,   179,   188,   189,   190,
+     191,   192,   193,   194,   195,   196,   211,   213,   237,   246,
+     260,   270,   299,   307,   333,   376,   378,   380,   402,   412,
+     413,   421,    12,    13,    16,    19,   198,   199,   202,   204,
+     207,   210,     7,    47,    48,    49,    62,    64,    65,    66,
+      67,    68,    69,    70,    77,    78,    85,   179,   190,   191,
+     192,   195,   278,   279,   280,   282,   284,   286,   288,   290,
+     292,   294,   297,   298,   333,   351,   363,   365,   376,   378,
+     380,   398,    63,   179,   333,   359,   360,   361,   363,    75,
+      79,    80,    81,    82,    83,    84,    86,   179,   333,   373,
+     374,   375,   376,   378,   380,   382,   384,   386,   388,   390,
+     392,   394,   396,   307,    27,    52,    54,    55,    58,    59,
+      60,   179,   227,   317,   318,   319,   320,   321,   322,   323,
+     325,   327,   329,   330,   332,    53,    56,    57,   179,   227,
+     321,   327,   341,   342,   343,   344,   345,   347,   348,   349,
+     350,    88,    89,   179,   254,   255,   256,   258,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   179,   425,   426,   427,   428,   430,   432,   433,
+     435,   436,   437,   440,   442,   443,   444,   445,   448,     6,
+       3,     4,     8,     3,   185,   457,   451,   453,   455,     4,
+       3,     8,   197,     4,     4,   377,   379,   381,   212,   214,
+       4,     4,     4,     4,   271,   308,   334,   300,   238,   403,
+     247,   261,     4,   414,   422,     3,     8,   203,   205,   208,
+       4,     3,     8,   405,   283,   285,   287,   352,   364,   281,
+     289,   291,     4,     4,   295,   293,   366,   399,     3,     8,
+     362,     3,     8,   397,   385,   387,   391,   389,   395,   393,
+     383,     8,     3,     8,   324,   228,     4,   328,   326,   331,
+       4,     8,     3,   346,     4,     4,     8,     3,   257,   259,
+       3,     8,     4,   429,   431,     4,   434,     4,     4,   438,
+     441,     4,     4,     4,   446,   449,     3,     8,   164,   164,
+     146,     4,     4,     4,     4,     4,   183,     4,   149,   149,
+       4,     4,     4,     4,     4,   147,   147,   147,   147,     4,
+       4,     4,     4,     4,     4,     4,     4,   147,     4,     4,
+     189,     4,     4,     4,   149,   199,    76,   179,   227,   307,
+     333,   376,   378,   380,   406,   407,   408,   409,   410,     4,
+       4,     4,     4,     4,     4,     4,     4,   147,   149,     4,
+       4,     4,     4,   279,     4,   360,     4,     4,     4,     4,
+       4,     4,     4,     4,   375,     4,     4,   147,     4,     4,
+       4,   149,   319,     4,   149,   149,   343,     4,     4,   255,
+     149,     4,     4,   147,     4,   147,   147,     4,     4,   149,
+     149,   149,     4,     4,   426,     4,     7,     7,   164,   164,
+     164,     7,   146,   146,   146,     7,     7,     5,     5,     5,
+       5,     5,     5,     5,     7,     7,     7,     5,   175,    14,
+      15,   206,    17,    18,   209,   411,     8,     3,   146,   146,
+     146,     5,   166,   168,   146,   146,   146,    71,    72,    73,
+     296,   146,     5,     7,   146,   175,   146,   146,   146,   146,
+     146,   146,   146,   146,   146,   146,   146,   146,   146,   146,
+     164,   146,   146,   146,    15,   116,   439,   117,   118,   119,
+     120,   121,   149,   447,   146,   164,   188,   123,   458,   459,
+     460,   198,    27,    32,    33,    34,    35,    36,    37,    38,
+      39,    40,    41,   179,   215,   216,   217,   220,   222,   224,
+     226,   227,   229,   230,   231,   232,   233,   235,   215,     7,
+     272,   273,   274,     7,   311,   312,   313,     7,   335,   336,
+     337,     7,   301,   302,   303,    79,    80,    81,    82,    84,
+     239,   240,   241,   242,   243,   244,   245,   292,   404,     7,
+     248,   249,   250,    91,    92,    93,    94,    95,    96,   262,
+     263,   264,   265,   266,   267,   268,   269,    99,   100,   415,
+     416,   417,   419,   425,   176,     4,   408,     7,   353,   354,
+     355,     7,   367,   368,   369,    86,   400,     8,   461,     3,
+       8,     8,   218,   221,   223,   225,     4,     4,     4,     4,
+       4,   234,   236,     3,     8,     8,   275,     6,     3,   314,
+       6,     3,   338,     6,     3,   304,     6,     3,     3,     6,
+       3,     6,   251,     6,     3,     4,     4,     4,     4,     4,
+       4,     3,     8,   418,   420,     3,     8,     8,   146,   177,
+     178,   146,   356,     6,     3,   370,     6,     3,   401,     8,
+       4,   459,     4,     4,     4,     4,   147,   149,   147,   149,
+     147,     4,     4,   216,   278,   274,   317,   313,   341,   337,
+     179,   190,   191,   192,   195,   227,   270,   288,   292,   294,
+     305,   306,   333,   376,   378,   380,   398,   303,   240,   292,
+     254,   250,   147,   147,   147,   147,   147,   147,   263,     4,
+       4,   416,     6,     3,   359,   355,   373,   369,     4,     5,
+      28,    29,    30,    31,   219,   146,   146,   146,   146,   146,
+       8,     8,     8,     3,     8,     8,   146,   146,   146,     8,
+       8,   146,     7,   462,   463,   306,   464,     3,     6,   124,
+     126,   127,   179,   227,   465,   466,   467,   468,   470,   463,
+     471,     4,   469,     3,     8,     4,   147,     4,   466,     5,
+     146,     7,   472,   473,   474,     3,     6,   125,   128,   129,
+     130,   475,   476,   477,   479,   480,   481,   473,   478,     4,
+       4,     4,     3,     8,     4,   149,   147,   147,   476,   146
   };
 
   const unsigned short int
@@ -4035,52 +4037,53 @@ namespace isc { namespace dhcp {
      183,   183,   183,   183,   185,   184,   187,   186,   188,   188,
      189,   189,   189,   189,   189,   189,   189,   189,   189,   189,
      189,   189,   189,   189,   189,   189,   189,   189,   189,   189,
-     189,   189,   190,   191,   192,   193,   194,   195,   197,   196,
-     198,   198,   199,   199,   199,   199,   201,   200,   203,   202,
-     205,   204,   206,   206,   208,   207,   209,   209,   210,   212,
-     211,   214,   213,   215,   215,   216,   216,   216,   216,   216,
-     216,   216,   216,   216,   216,   216,   216,   216,   218,   217,
-     219,   219,   219,   219,   221,   220,   223,   222,   225,   224,
-     226,   228,   227,   229,   230,   231,   232,   234,   233,   236,
-     235,   238,   237,   239,   239,   240,   240,   240,   240,   240,
-     241,   242,   243,   244,   245,   247,   246,   248,   248,   249,
-     249,   251,   250,   253,   252,   254,   254,   254,   255,   255,
-     257,   256,   259,   258,   261,   260,   262,   262,   263,   263,
-     263,   263,   263,   263,   264,   265,   266,   267,   268,   269,
-     271,   270,   272,   272,   273,   273,   275,   274,   277,   276,
-     278,   278,   279,   279,   279,   279,   279,   279,   279,   279,
+     189,   189,   189,   189,   190,   191,   192,   193,   194,   195,
+     197,   196,   198,   198,   199,   199,   199,   199,   201,   200,
+     203,   202,   205,   204,   206,   206,   208,   207,   209,   209,
+     210,   212,   211,   214,   213,   215,   215,   216,   216,   216,
+     216,   216,   216,   216,   216,   216,   216,   216,   216,   216,
+     218,   217,   219,   219,   219,   219,   221,   220,   223,   222,
+     225,   224,   226,   228,   227,   229,   230,   231,   232,   234,
+     233,   236,   235,   238,   237,   239,   239,   240,   240,   240,
+     240,   240,   241,   242,   243,   244,   245,   247,   246,   248,
+     248,   249,   249,   251,   250,   253,   252,   254,   254,   254,
+     255,   255,   257,   256,   259,   258,   261,   260,   262,   262,
+     263,   263,   263,   263,   263,   263,   264,   265,   266,   267,
+     268,   269,   271,   270,   272,   272,   273,   273,   275,   274,
+     277,   276,   278,   278,   279,   279,   279,   279,   279,   279,
      279,   279,   279,   279,   279,   279,   279,   279,   279,   279,
-     279,   279,   279,   281,   280,   283,   282,   285,   284,   287,
-     286,   289,   288,   291,   290,   293,   292,   295,   294,   296,
-     296,   296,   297,   298,   300,   299,   301,   301,   302,   302,
-     304,   303,   305,   305,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   308,   307,   310,
-     309,   311,   311,   312,   312,   314,   313,   316,   315,   317,
-     317,   318,   318,   319,   319,   319,   319,   319,   319,   319,
-     319,   320,   321,   322,   324,   323,   326,   325,   328,   327,
-     329,   331,   330,   332,   334,   333,   335,   335,   336,   336,
-     338,   337,   340,   339,   341,   341,   342,   342,   343,   343,
-     343,   343,   343,   343,   343,   344,   346,   345,   347,   348,
-     349,   350,   352,   351,   353,   353,   354,   354,   356,   355,
-     358,   357,   359,   359,   360,   360,   360,   360,   362,   361,
-     364,   363,   366,   365,   367,   367,   368,   368,   370,   369,
-     372,   371,   373,   373,   374,   374,   375,   375,   375,   375,
-     375,   375,   375,   375,   375,   375,   375,   375,   375,   377,
-     376,   379,   378,   381,   380,   383,   382,   385,   384,   387,
-     386,   389,   388,   391,   390,   393,   392,   395,   394,   397,
-     396,   399,   398,   401,   400,   403,   402,   404,   404,   405,
-     292,   406,   406,   407,   407,   408,   408,   408,   408,   408,
-     408,   408,   408,   409,   411,   410,   412,   414,   413,   415,
-     415,   416,   416,   418,   417,   420,   419,   422,   421,   424,
-     423,   425,   425,   426,   426,   426,   426,   426,   426,   426,
-     426,   426,   426,   426,   426,   426,   426,   426,   427,   429,
-     428,   431,   430,   432,   434,   433,   435,   436,   438,   437,
-     439,   439,   441,   440,   442,   443,   444,   446,   445,   447,
-     447,   447,   447,   447,   449,   448,   451,   450,   453,   452,
-     455,   454,   457,   456,   458,   458,   459,   461,   460,   462,
-     462,   464,   463,   465,   465,   466,   466,   466,   466,   466,
-     467,   469,   468,   471,   470,   472,   472,   474,   473,   475,
-     475,   476,   476,   476,   476,   478,   477,   479,   480,   481
+     279,   279,   279,   279,   279,   279,   279,   281,   280,   283,
+     282,   285,   284,   287,   286,   289,   288,   291,   290,   293,
+     292,   295,   294,   296,   296,   296,   297,   298,   300,   299,
+     301,   301,   302,   302,   304,   303,   305,   305,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   308,   307,   310,   309,   311,   311,   312,
+     312,   314,   313,   316,   315,   317,   317,   318,   318,   319,
+     319,   319,   319,   319,   319,   319,   319,   320,   321,   322,
+     324,   323,   326,   325,   328,   327,   329,   331,   330,   332,
+     334,   333,   335,   335,   336,   336,   338,   337,   340,   339,
+     341,   341,   342,   342,   343,   343,   343,   343,   343,   343,
+     343,   344,   346,   345,   347,   348,   349,   350,   352,   351,
+     353,   353,   354,   354,   356,   355,   358,   357,   359,   359,
+     360,   360,   360,   360,   362,   361,   364,   363,   366,   365,
+     367,   367,   368,   368,   370,   369,   372,   371,   373,   373,
+     374,   374,   375,   375,   375,   375,   375,   375,   375,   375,
+     375,   375,   375,   375,   375,   377,   376,   379,   378,   381,
+     380,   383,   382,   385,   384,   387,   386,   389,   388,   391,
+     390,   393,   392,   395,   394,   397,   396,   399,   398,   401,
+     400,   403,   402,   404,   404,   405,   292,   406,   406,   407,
+     407,   408,   408,   408,   408,   408,   408,   408,   408,   409,
+     411,   410,   412,   414,   413,   415,   415,   416,   416,   418,
+     417,   420,   419,   422,   421,   424,   423,   425,   425,   426,
+     426,   426,   426,   426,   426,   426,   426,   426,   426,   426,
+     426,   426,   426,   426,   427,   429,   428,   431,   430,   432,
+     434,   433,   435,   436,   438,   437,   439,   439,   441,   440,
+     442,   443,   444,   446,   445,   447,   447,   447,   447,   447,
+     449,   448,   451,   450,   453,   452,   455,   454,   457,   456,
+     458,   458,   459,   461,   460,   462,   462,   464,   463,   465,
+     465,   466,   466,   466,   466,   466,   467,   469,   468,   471,
+     470,   472,   472,   474,   473,   475,   475,   476,   476,   476,
+     476,   478,   477,   479,   480,   481
   };
 
   const unsigned char
@@ -4095,52 +4098,53 @@ namespace isc { namespace dhcp {
        1,     1,     1,     1,     0,     6,     0,     4,     1,     3,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     3,     3,     3,     3,     3,     3,     0,     6,
-       1,     3,     1,     1,     1,     1,     0,     4,     0,     4,
-       0,     4,     1,     1,     0,     4,     1,     1,     3,     0,
-       6,     0,     6,     1,     3,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     0,     4,
-       1,     1,     1,     1,     0,     4,     0,     4,     0,     4,
-       3,     0,     4,     3,     3,     3,     3,     0,     4,     0,
-       4,     0,     6,     1,     3,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     6,     0,     1,     1,
-       3,     0,     4,     0,     4,     1,     3,     1,     1,     1,
-       0,     4,     0,     4,     0,     6,     1,     3,     1,     1,
        1,     1,     1,     1,     3,     3,     3,     3,     3,     3,
-       0,     6,     0,     1,     1,     3,     0,     4,     0,     4,
-       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
+       0,     6,     1,     3,     1,     1,     1,     1,     0,     4,
+       0,     4,     0,     4,     1,     1,     0,     4,     1,     1,
+       3,     0,     6,     0,     6,     1,     3,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     0,     4,     0,     4,     0,     4,     0,
-       4,     0,     4,     0,     4,     0,     4,     0,     4,     1,
-       1,     1,     3,     3,     0,     6,     0,     1,     1,     3,
-       0,     4,     1,     3,     1,     1,     1,     1,     1,     1,
+       0,     4,     1,     1,     1,     1,     0,     4,     0,     4,
+       0,     4,     3,     0,     4,     3,     3,     3,     3,     0,
+       4,     0,     4,     0,     6,     1,     3,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     0,     6,     0,
-       4,     0,     1,     1,     3,     0,     4,     0,     4,     0,
-       1,     1,     3,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     3,     1,     0,     4,     0,     4,     0,     4,
-       1,     0,     4,     3,     0,     6,     0,     1,     1,     3,
-       0,     4,     0,     4,     0,     1,     1,     3,     1,     1,
-       1,     1,     1,     1,     1,     1,     0,     4,     1,     1,
+       1,     1,     3,     0,     4,     0,     4,     1,     3,     1,
+       1,     1,     0,     4,     0,     4,     0,     6,     1,     3,
+       1,     1,     1,     1,     1,     1,     3,     3,     3,     3,
        3,     3,     0,     6,     0,     1,     1,     3,     0,     4,
-       0,     4,     1,     3,     1,     1,     1,     1,     0,     4,
-       0,     4,     0,     6,     0,     1,     1,     3,     0,     4,
-       0,     4,     0,     1,     1,     3,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
+       0,     4,     1,     3,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     0,     4,     0,
        4,     0,     4,     0,     4,     0,     4,     0,     4,     0,
+       4,     0,     4,     1,     1,     1,     3,     3,     0,     6,
+       0,     1,     1,     3,     0,     4,     1,     3,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     0,     6,     0,     4,     0,     1,     1,
+       3,     0,     4,     0,     4,     0,     1,     1,     3,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     3,     1,
+       0,     4,     0,     4,     0,     4,     1,     0,     4,     3,
+       0,     6,     0,     1,     1,     3,     0,     4,     0,     4,
+       0,     1,     1,     3,     1,     1,     1,     1,     1,     1,
+       1,     1,     0,     4,     1,     1,     3,     3,     0,     6,
+       0,     1,     1,     3,     0,     4,     0,     4,     1,     3,
+       1,     1,     1,     1,     0,     4,     0,     4,     0,     6,
+       0,     1,     1,     3,     0,     4,     0,     4,     0,     1,
+       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     0,     4,     0,     4,     0,
        4,     0,     4,     0,     4,     0,     4,     0,     4,     0,
-       4,     0,     6,     0,     4,     0,     6,     1,     3,     0,
-       4,     0,     1,     1,     3,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     0,     4,     3,     0,     6,     1,
-       3,     1,     1,     0,     4,     0,     4,     0,     6,     0,
-       4,     1,     3,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     3,     0,
-       4,     0,     4,     3,     0,     4,     3,     3,     0,     4,
-       1,     1,     0,     4,     3,     3,     3,     0,     4,     1,
-       1,     1,     1,     1,     0,     4,     0,     4,     0,     4,
-       0,     4,     0,     6,     1,     3,     1,     0,     6,     1,
-       3,     0,     4,     1,     3,     1,     1,     1,     1,     1,
-       3,     0,     4,     0,     6,     1,     3,     0,     4,     1,
-       3,     1,     1,     1,     1,     0,     4,     3,     3,     3
+       4,     0,     4,     0,     4,     0,     4,     0,     6,     0,
+       4,     0,     6,     1,     3,     0,     4,     0,     1,     1,
+       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       0,     4,     3,     0,     6,     1,     3,     1,     1,     0,
+       4,     0,     4,     0,     6,     0,     4,     1,     3,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     3,     0,     4,     0,     4,     3,
+       0,     4,     3,     3,     0,     4,     1,     1,     0,     4,
+       3,     3,     3,     0,     4,     1,     1,     1,     1,     1,
+       0,     4,     0,     4,     0,     4,     0,     4,     0,     6,
+       1,     3,     1,     0,     6,     1,     3,     0,     4,     1,
+       3,     1,     1,     1,     1,     1,     3,     0,     4,     0,
+       6,     1,     3,     0,     4,     1,     3,     1,     1,     1,
+       1,     0,     4,     3,     3,     3
   };
 
 
@@ -4288,52 +4292,53 @@ namespace isc { namespace dhcp {
      376,   377,   378,   379,   382,   382,   397,   397,   406,   407,
      412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
      422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,   436,   441,   446,   451,   456,   461,   467,   467,
-     478,   479,   482,   483,   484,   485,   488,   488,   497,   497,
-     507,   507,   514,   515,   518,   518,   525,   527,   531,   537,
-     537,   549,   549,   561,   562,   565,   566,   567,   568,   569,
-     570,   571,   572,   573,   574,   575,   576,   577,   580,   580,
-     587,   588,   589,   590,   593,   593,   601,   601,   609,   609,
-     617,   622,   622,   630,   635,   640,   645,   650,   650,   658,
-     658,   667,   667,   677,   678,   681,   682,   683,   684,   685,
-     688,   693,   698,   703,   708,   713,   713,   723,   724,   727,
-     728,   731,   731,   741,   741,   751,   752,   753,   756,   757,
-     760,   760,   768,   768,   776,   776,   787,   788,   791,   792,
-     793,   794,   795,   796,   799,   804,   809,   814,   819,   824,
-     832,   832,   845,   846,   849,   850,   857,   857,   883,   883,
-     894,   895,   899,   900,   901,   902,   903,   904,   905,   906,
+     432,   433,   434,   435,   438,   443,   448,   453,   458,   463,
+     469,   469,   480,   481,   484,   485,   486,   487,   490,   490,
+     499,   499,   509,   509,   516,   517,   520,   520,   527,   529,
+     533,   539,   539,   551,   551,   563,   564,   567,   568,   569,
+     570,   571,   572,   573,   574,   575,   576,   577,   578,   579,
+     582,   582,   589,   590,   591,   592,   595,   595,   603,   603,
+     611,   611,   619,   624,   624,   632,   637,   642,   647,   652,
+     652,   660,   660,   669,   669,   679,   680,   683,   684,   685,
+     686,   687,   690,   695,   700,   705,   710,   715,   715,   725,
+     726,   729,   730,   733,   733,   743,   743,   753,   754,   755,
+     758,   759,   762,   762,   770,   770,   778,   778,   789,   790,
+     793,   794,   795,   796,   797,   798,   801,   806,   811,   816,
+     821,   826,   834,   834,   847,   848,   851,   852,   859,   859,
+     885,   885,   896,   897,   901,   902,   903,   904,   905,   906,
      907,   908,   909,   910,   911,   912,   913,   914,   915,   916,
-     917,   918,   919,   922,   922,   930,   930,   938,   938,   946,
-     946,   954,   954,   962,   962,   970,   970,   978,   978,   985,
-     986,   987,   990,   995,  1002,  1002,  1013,  1014,  1018,  1019,
-    1022,  1022,  1030,  1031,  1034,  1035,  1036,  1037,  1038,  1039,
-    1040,  1041,  1042,  1043,  1044,  1045,  1046,  1053,  1053,  1066,
-    1066,  1075,  1076,  1079,  1080,  1085,  1085,  1100,  1100,  1114,
-    1115,  1118,  1119,  1122,  1123,  1124,  1125,  1126,  1127,  1128,
-    1129,  1132,  1134,  1139,  1141,  1141,  1149,  1149,  1157,  1157,
-    1165,  1167,  1167,  1175,  1184,  1184,  1196,  1197,  1202,  1203,
-    1208,  1208,  1220,  1220,  1232,  1233,  1238,  1239,  1244,  1245,
-    1246,  1247,  1248,  1249,  1250,  1253,  1255,  1255,  1263,  1265,
-    1267,  1272,  1280,  1280,  1292,  1293,  1296,  1297,  1300,  1300,
-    1310,  1310,  1320,  1321,  1324,  1325,  1326,  1327,  1330,  1330,
-    1338,  1338,  1348,  1348,  1358,  1359,  1362,  1363,  1366,  1366,
-    1375,  1375,  1384,  1385,  1388,  1389,  1393,  1394,  1395,  1396,
-    1397,  1398,  1399,  1400,  1401,  1402,  1403,  1404,  1405,  1408,
-    1408,  1416,  1416,  1424,  1424,  1432,  1432,  1440,  1440,  1448,
-    1448,  1456,  1456,  1464,  1464,  1472,  1472,  1480,  1480,  1488,
-    1488,  1501,  1501,  1511,  1511,  1522,  1522,  1532,  1533,  1536,
-    1536,  1546,  1547,  1550,  1551,  1554,  1555,  1556,  1557,  1558,
-    1559,  1560,  1561,  1564,  1566,  1566,  1578,  1585,  1585,  1595,
-    1596,  1599,  1600,  1603,  1603,  1611,  1611,  1621,  1621,  1633,
-    1633,  1643,  1644,  1647,  1648,  1649,  1650,  1651,  1652,  1653,
-    1654,  1655,  1656,  1657,  1658,  1659,  1660,  1661,  1664,  1669,
-    1669,  1677,  1677,  1685,  1690,  1690,  1698,  1703,  1708,  1708,
-    1716,  1717,  1720,  1720,  1728,  1733,  1738,  1743,  1743,  1751,
-    1754,  1757,  1760,  1763,  1769,  1769,  1779,  1779,  1786,  1786,
-    1793,  1793,  1805,  1805,  1818,  1819,  1823,  1827,  1827,  1839,
-    1840,  1844,  1844,  1852,  1853,  1856,  1857,  1858,  1859,  1860,
-    1863,  1868,  1868,  1876,  1876,  1886,  1887,  1890,  1890,  1898,
-    1899,  1902,  1903,  1904,  1905,  1908,  1908,  1916,  1921,  1926
+     917,   918,   919,   920,   921,   922,   923,   926,   926,   934,
+     934,   942,   942,   950,   950,   958,   958,   966,   966,   974,
+     974,   982,   982,   989,   990,   991,   994,   999,  1006,  1006,
+    1017,  1018,  1022,  1023,  1026,  1026,  1034,  1035,  1038,  1039,
+    1040,  1041,  1042,  1043,  1044,  1045,  1046,  1047,  1048,  1049,
+    1050,  1051,  1052,  1059,  1059,  1072,  1072,  1081,  1082,  1085,
+    1086,  1091,  1091,  1106,  1106,  1120,  1121,  1124,  1125,  1128,
+    1129,  1130,  1131,  1132,  1133,  1134,  1135,  1138,  1140,  1145,
+    1147,  1147,  1155,  1155,  1163,  1163,  1171,  1173,  1173,  1181,
+    1190,  1190,  1202,  1203,  1208,  1209,  1214,  1214,  1226,  1226,
+    1238,  1239,  1244,  1245,  1250,  1251,  1252,  1253,  1254,  1255,
+    1256,  1259,  1261,  1261,  1269,  1271,  1273,  1278,  1286,  1286,
+    1298,  1299,  1302,  1303,  1306,  1306,  1316,  1316,  1326,  1327,
+    1330,  1331,  1332,  1333,  1336,  1336,  1344,  1344,  1354,  1354,
+    1364,  1365,  1368,  1369,  1372,  1372,  1381,  1381,  1390,  1391,
+    1394,  1395,  1399,  1400,  1401,  1402,  1403,  1404,  1405,  1406,
+    1407,  1408,  1409,  1410,  1411,  1414,  1414,  1422,  1422,  1430,
+    1430,  1438,  1438,  1446,  1446,  1454,  1454,  1462,  1462,  1470,
+    1470,  1478,  1478,  1486,  1486,  1494,  1494,  1507,  1507,  1517,
+    1517,  1528,  1528,  1538,  1539,  1542,  1542,  1552,  1553,  1556,
+    1557,  1560,  1561,  1562,  1563,  1564,  1565,  1566,  1567,  1570,
+    1572,  1572,  1584,  1591,  1591,  1601,  1602,  1605,  1606,  1609,
+    1609,  1617,  1617,  1627,  1627,  1639,  1639,  1649,  1650,  1653,
+    1654,  1655,  1656,  1657,  1658,  1659,  1660,  1661,  1662,  1663,
+    1664,  1665,  1666,  1667,  1670,  1675,  1675,  1683,  1683,  1691,
+    1696,  1696,  1704,  1709,  1714,  1714,  1722,  1723,  1726,  1726,
+    1734,  1739,  1744,  1749,  1749,  1757,  1760,  1763,  1766,  1769,
+    1775,  1775,  1785,  1785,  1792,  1792,  1799,  1799,  1811,  1811,
+    1824,  1825,  1829,  1833,  1833,  1845,  1846,  1850,  1850,  1858,
+    1859,  1862,  1863,  1864,  1865,  1866,  1869,  1874,  1874,  1882,
+    1882,  1892,  1893,  1896,  1896,  1904,  1905,  1908,  1909,  1910,
+    1911,  1914,  1914,  1922,  1927,  1932
   };
 
   // Print the state stack on the debug stream.
@@ -4368,8 +4373,8 @@ namespace isc { namespace dhcp {
 
 #line 14 "dhcp4_parser.yy" // lalr1.cc:1167
 } } // isc::dhcp
-#line 4372 "dhcp4_parser.cc" // lalr1.cc:1167
-#line 1931 "dhcp4_parser.yy" // lalr1.cc:1168
+#line 4377 "dhcp4_parser.cc" // lalr1.cc:1167
+#line 1937 "dhcp4_parser.yy" // lalr1.cc:1168
 
 
 void
diff --git a/src/bin/dhcp4/dhcp4_parser.h b/src/bin/dhcp4/dhcp4_parser.h
index ce57410ac2..dc4a31dbb6 100644
--- a/src/bin/dhcp4/dhcp4_parser.h
+++ b/src/bin/dhcp4/dhcp4_parser.h
@@ -1406,7 +1406,7 @@ namespace isc { namespace dhcp {
     enum
     {
       yyeof_ = 0,
-      yylast_ = 795,     ///< Last index in yytable_.
+      yylast_ = 804,     ///< Last index in yytable_.
       yynnts_ = 332,  ///< Number of nonterminal symbols.
       yyfinal_ = 26, ///< Termination state number.
       yyterror_ = 1,
diff --git a/src/bin/dhcp4/location.hh b/src/bin/dhcp4/location.hh
index 4de776f80d..cc40e6f07a 100644
--- a/src/bin/dhcp4/location.hh
+++ b/src/bin/dhcp4/location.hh
@@ -1,4 +1,4 @@
-// Generated 201710011747
+// Generated 201710231324
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++
diff --git a/src/bin/dhcp4/position.hh b/src/bin/dhcp4/position.hh
index b2b5236747..45d4f94cf6 100644
--- a/src/bin/dhcp4/position.hh
+++ b/src/bin/dhcp4/position.hh
@@ -1,4 +1,4 @@
-// Generated 201710011747
+// Generated 201710231324
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++
diff --git a/src/bin/dhcp4/stack.hh b/src/bin/dhcp4/stack.hh
index 2f53e59f19..e0ef0e6b25 100644
--- a/src/bin/dhcp4/stack.hh
+++ b/src/bin/dhcp4/stack.hh
@@ -1,4 +1,4 @@
-// Generated 201710011747
+// Generated 201710231324
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++