[#805,!5-p] Updated example confs

diff --git a/doc/examples/kea4/all-keys-netconf.json b/doc/examples/kea4/all-keys-netconf.json
index 765bf77bd39c5bae313607b5d81fc1d5e3a5c4d5..6792d42d7023eb342809db7e498854fd270032ab 100644 (file)
--- a/doc/examples/kea4/all-keys-netconf.json
+++ b/doc/examples/kea4/all-keys-netconf.json
@@ -383,6 +383,10 @@
             // infinitely).
             "lfc-interval": 3600,
 
+            // Maximum number of lease file read errors allowed before
+            // loading the file is abandoned.  Defaults to 0 (no limit).
+            "max-row-errors": 100,
+
             // Name of the lease file. In case of database it specifies the
             // database name.
             "name": "/tmp/kea-dhcp4.csv",

diff --git a/doc/examples/kea4/leases-expiration.json b/doc/examples/kea4/leases-expiration.json
index cc499aaeb3723959f523b178faa9f01c736c5ce1..fe28ad7bac4890e84cbaed2e9c7e2111a8ef62d8 100644 (file)
--- a/doc/examples/kea4/leases-expiration.json
+++ b/doc/examples/kea4/leases-expiration.json
@@ -14,9 +14,12 @@
 // September 2016, four database backends are supported: MySQL,
 // PostgreSQL, Cassandra, and the in-memory database, Memfile.
 // We'll use memfile  because it doesn't require any prior set up.
+// Note, we're setting the maximum number of row read errors to 100,
+// (defaults to 0, meaning unlimited).
   "lease-database": {
       "type": "memfile",
-      "lfc-interval": 3600
+      "lfc-interval": 3600,
+      "max-row-errors": 100
   },
 
 // The following parameters control processing expired leases. Expired

diff --git a/doc/examples/kea6/all-keys-netconf.json b/doc/examples/kea6/all-keys-netconf.json
index 9162705fea7a2d4c9ab6607aa3cd4cf832d6b83f..2e3b54583c5edf3d2ad97a7fd0247fb05c36711e 100644 (file)
--- a/doc/examples/kea6/all-keys-netconf.json
+++ b/doc/examples/kea6/all-keys-netconf.json
@@ -322,6 +322,10 @@
             // infinitely).
             "lfc-interval": 3600,
 
+            // Maximum number of lease file read errors allowed before
+            // loading the file is abandoned.  Defaults to 0 (no limit).
+            "max-row-errors": 100,
+
             // Name of the lease file. In case of database it specifies the
             // database name.
             "name": "/tmp/kea-dhcp6.csv",

diff --git a/doc/examples/kea6/leases-expiration.json b/doc/examples/kea6/leases-expiration.json
index 6a1ae5869beb3e0b731755a56bfa63ef1723318f..c0b121637913e2c2ee7b1637f58db62d9b52fac5 100644 (file)
--- a/doc/examples/kea6/leases-expiration.json
+++ b/doc/examples/kea6/leases-expiration.json
@@ -14,9 +14,12 @@
 // September 2016, four database backends are supported: MySQL,
 // PostgreSQL, Cassandra, and the in-memory database, Memfile.
 // We'll use memfile  because it doesn't require any prior set up.
+// Note, we're setting the maximum number of row read errors to 100,
+// (defaults to 0, meaning unlimited).
   "lease-database": {
       "type": "memfile",
-      "lfc-interval": 3600
+      "lfc-interval": 3600,
+      "max-row-errors": 100
   },
 
 // The following parameters control processing expired leases. Expired leases

diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc
index e2ea74b57e12fa48f450a01571b44ea53fbca5f2..f377c6a5dd298fe07d1000aa3a55ca44124fd1a3 100644 (file)
--- a/src/bin/dhcp4/dhcp4_lexer.cc
+++ b/src/bin/dhcp4/dhcp4_lexer.cc
@@ -2446,6 +2446,7 @@ static const flex_int16_t yy_rule_linenum[184] =
       273,  282,  291,  300,  309,  318,  327,  336,  345,  354,
       363,  375,  384,  393,  402,  411,  422,  433,  444,  455,
       465,  475,  486,  497,  508,  519,  530,  541,  552,  563,
+<<<<<<< HEAD
       574,  585,  595,  606,  617,  628,  639,  650,  659,  668,
       678,  687,  697,  711,  727,  736,  745,  754,  763,  784,
       805,  814,  824,  833,  844,  853,  862,  871,  880,  889,
@@ -2462,6 +2463,23 @@ static const flex_int16_t yy_rule_linenum[184] =
      1832, 1833, 1834, 1835, 1836, 1838, 1856, 1869, 1874, 1878,
      1880, 1882, 1884
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+      574,  585,  594,  605,  616,  627,  638,  649,  658,  667,
+      677,  686,  696,  710,  726,  735,  744,  753,  762,  783,
+      804,  813,  823,  832,  843,  852,  861,  870,  879,  888,
+      898,  907,  918,  929,  941,  950,  960,  969,  978,  987,
+      996, 1005, 1014, 1023, 1033, 1044, 1056, 1065, 1074, 1084,
+
+     1094, 1104, 1114, 1124, 1134, 1143, 1153, 1162, 1171, 1180,
+     1189, 1199, 1209, 1218, 1228, 1237, 1246, 1255, 1264, 1273,
+     1282, 1291, 1300, 1309, 1318, 1327, 1336, 1345, 1354, 1363,
+     1372, 1381, 1390, 1399, 1408, 1417, 1426, 1435, 1444, 1453,
+     1462, 1471, 1480, 1490, 1500, 1510, 1520, 1530, 1540, 1550,
+     1560, 1570, 1580, 1590, 1599, 1608, 1617, 1626, 1635, 1644,
+     1653, 1664, 1675, 1688, 1701, 1716, 1815, 1820, 1825, 1830,
+     1831, 1832, 1833, 1834, 1835, 1837, 1855, 1868, 1873, 1877,
+     1879, 1881, 1883
+>>>>>>> [#805,!5-p] Updated example confs
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -3587,7 +3605,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 595 "dhcp4_lexer.ll"
+#line 594 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3602,10 +3620,14 @@ YY_RULE_SETUP
 case 54:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 595 "dhcp4_lexer.ll"
 =======
 #line 606 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 605 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3620,10 +3642,14 @@ YY_RULE_SETUP
 case 55:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 606 "dhcp4_lexer.ll"
 =======
 #line 617 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 616 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3638,10 +3664,14 @@ YY_RULE_SETUP
 case 56:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 617 "dhcp4_lexer.ll"
 =======
 #line 628 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 627 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3656,10 +3686,14 @@ YY_RULE_SETUP
 case 57:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 628 "dhcp4_lexer.ll"
 =======
 #line 639 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 638 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3674,10 +3708,14 @@ YY_RULE_SETUP
 case 58:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 639 "dhcp4_lexer.ll"
 =======
 #line 650 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 649 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3690,10 +3728,14 @@ YY_RULE_SETUP
 case 59:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 648 "dhcp4_lexer.ll"
 =======
 #line 659 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 658 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3706,10 +3748,14 @@ YY_RULE_SETUP
 case 60:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 657 "dhcp4_lexer.ll"
 =======
 #line 668 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 667 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3723,10 +3769,14 @@ YY_RULE_SETUP
 case 61:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 667 "dhcp4_lexer.ll"
 =======
 #line 678 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 677 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch (driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3739,10 +3789,14 @@ YY_RULE_SETUP
 case 62:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 676 "dhcp4_lexer.ll"
 =======
 #line 687 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 686 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3756,10 +3810,14 @@ YY_RULE_SETUP
 case 63:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 686 "dhcp4_lexer.ll"
 =======
 #line 697 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 696 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3777,10 +3835,14 @@ YY_RULE_SETUP
 case 64:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 700 "dhcp4_lexer.ll"
 =======
 #line 711 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 710 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::LEASE_DATABASE:
@@ -3800,10 +3862,14 @@ YY_RULE_SETUP
 case 65:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 716 "dhcp4_lexer.ll"
 =======
 #line 727 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 726 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DATA:
@@ -3816,10 +3882,14 @@ YY_RULE_SETUP
 case 66:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 725 "dhcp4_lexer.ll"
 =======
 #line 736 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 735 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DATA:
@@ -3832,10 +3902,14 @@ YY_RULE_SETUP
 case 67:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 734 "dhcp4_lexer.ll"
 =======
 #line 745 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 744 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -3848,10 +3922,14 @@ YY_RULE_SETUP
 case 68:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 743 "dhcp4_lexer.ll"
 =======
 #line 754 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 753 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::POOLS:
@@ -3864,10 +3942,14 @@ YY_RULE_SETUP
 case 69:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 752 "dhcp4_lexer.ll"
 =======
 #line 763 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 762 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3892,10 +3974,14 @@ YY_RULE_SETUP
 case 70:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 773 "dhcp4_lexer.ll"
 =======
 #line 784 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 783 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3920,10 +4006,14 @@ YY_RULE_SETUP
 case 71:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 794 "dhcp4_lexer.ll"
 =======
 #line 805 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 804 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -3936,10 +4026,14 @@ YY_RULE_SETUP
 case 72:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 803 "dhcp4_lexer.ll"
 =======
 #line 814 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 813 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -3953,10 +4047,14 @@ YY_RULE_SETUP
 case 73:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 813 "dhcp4_lexer.ll"
 =======
 #line 824 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 823 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -3969,10 +4067,14 @@ YY_RULE_SETUP
 case 74:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 822 "dhcp4_lexer.ll"
 =======
 #line 833 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 832 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3987,10 +4089,14 @@ YY_RULE_SETUP
 case 75:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 833 "dhcp4_lexer.ll"
 =======
 #line 844 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 843 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATION_MODE:
@@ -4003,10 +4109,14 @@ YY_RULE_SETUP
 case 76:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 842 "dhcp4_lexer.ll"
 =======
 #line 853 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 852 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATION_MODE:
@@ -4019,10 +4129,14 @@ YY_RULE_SETUP
 case 77:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 851 "dhcp4_lexer.ll"
 =======
 #line 862 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 861 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATION_MODE:
@@ -4035,10 +4149,14 @@ YY_RULE_SETUP
 case 78:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 860 "dhcp4_lexer.ll"
 =======
 #line 871 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 870 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATION_MODE:
@@ -4051,10 +4169,14 @@ YY_RULE_SETUP
 case 79:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 869 "dhcp4_lexer.ll"
 =======
 #line 880 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 879 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATION_MODE:
@@ -4067,10 +4189,14 @@ YY_RULE_SETUP
 case 80:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 878 "dhcp4_lexer.ll"
 =======
 #line 889 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 888 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -4084,10 +4210,14 @@ YY_RULE_SETUP
 case 81:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 888 "dhcp4_lexer.ll"
 =======
 #line 899 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 898 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4100,10 +4230,14 @@ YY_RULE_SETUP
 case 82:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 897 "dhcp4_lexer.ll"
 =======
 #line 908 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 907 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4118,10 +4252,14 @@ YY_RULE_SETUP
 case 83:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 908 "dhcp4_lexer.ll"
 =======
 #line 919 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 918 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4136,10 +4274,14 @@ YY_RULE_SETUP
 case 84:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 919 "dhcp4_lexer.ll"
 =======
 #line 930 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 929 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4154,10 +4296,14 @@ YY_RULE_SETUP
 case 85:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 931 "dhcp4_lexer.ll"
 =======
 #line 942 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 941 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -4170,10 +4316,14 @@ YY_RULE_SETUP
 case 86:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 940 "dhcp4_lexer.ll"
 =======
 #line 951 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 950 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4187,10 +4337,14 @@ YY_RULE_SETUP
 case 87:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 950 "dhcp4_lexer.ll"
 =======
 #line 961 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 960 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::LOGGERS:
@@ -4203,10 +4357,14 @@ YY_RULE_SETUP
 case 88:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 959 "dhcp4_lexer.ll"
 =======
 #line 970 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 969 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OUTPUT_OPTIONS:
@@ -4219,10 +4377,14 @@ YY_RULE_SETUP
 case 89:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 968 "dhcp4_lexer.ll"
 =======
 #line 979 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 978 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::LOGGERS:
@@ -4235,10 +4397,14 @@ YY_RULE_SETUP
 case 90:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 977 "dhcp4_lexer.ll"
 =======
 #line 988 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 987 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OUTPUT_OPTIONS:
@@ -4251,10 +4417,14 @@ YY_RULE_SETUP
 case 91:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 986 "dhcp4_lexer.ll"
 =======
 #line 997 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 996 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OUTPUT_OPTIONS:
@@ -4267,10 +4437,14 @@ YY_RULE_SETUP
 case 92:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 995 "dhcp4_lexer.ll"
 =======
 #line 1006 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1005 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OUTPUT_OPTIONS:
@@ -4283,6 +4457,7 @@ YY_RULE_SETUP
 case 93:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1004 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
@@ -4299,6 +4474,9 @@ YY_RULE_SETUP
 =======
 #line 1015 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1014 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::LOGGERS:
@@ -4311,10 +4489,14 @@ YY_RULE_SETUP
 case 94:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1022 "dhcp4_lexer.ll"
 =======
 #line 1024 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1023 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4328,10 +4510,14 @@ YY_RULE_SETUP
 case 95:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1032 "dhcp4_lexer.ll"
 =======
 #line 1034 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1033 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -4346,10 +4532,14 @@ YY_RULE_SETUP
 case 96:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1043 "dhcp4_lexer.ll"
 =======
 #line 1045 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1044 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -4365,10 +4555,14 @@ YY_RULE_SETUP
 case 97:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1055 "dhcp4_lexer.ll"
 =======
 #line 1057 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1056 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CLIENT_CLASSES:
@@ -4381,10 +4575,14 @@ YY_RULE_SETUP
 case 98:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1064 "dhcp4_lexer.ll"
 =======
 #line 1066 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1065 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CLIENT_CLASSES:
@@ -4397,10 +4595,14 @@ YY_RULE_SETUP
 case 99:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1073 "dhcp4_lexer.ll"
 =======
 #line 1075 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1074 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4414,10 +4616,14 @@ YY_RULE_SETUP
 case 100:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1083 "dhcp4_lexer.ll"
 =======
 #line 1085 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1084 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -4431,10 +4637,14 @@ YY_RULE_SETUP
 case 101:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1093 "dhcp4_lexer.ll"
 =======
 #line 1095 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1094 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -4448,10 +4658,14 @@ YY_RULE_SETUP
 case 102:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1103 "dhcp4_lexer.ll"
 =======
 #line 1105 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1104 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -4465,10 +4679,14 @@ YY_RULE_SETUP
 case 103:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1113 "dhcp4_lexer.ll"
 =======
 #line 1115 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1114 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -4482,10 +4700,14 @@ YY_RULE_SETUP
 case 104:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1123 "dhcp4_lexer.ll"
 =======
 #line 1125 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1124 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -4499,10 +4721,14 @@ YY_RULE_SETUP
 case 105:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1133 "dhcp4_lexer.ll"
 =======
 #line 1135 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1134 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATIONS:
@@ -4515,10 +4741,14 @@ YY_RULE_SETUP
 case 106:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1142 "dhcp4_lexer.ll"
 =======
 #line 1144 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1143 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -4532,10 +4762,14 @@ YY_RULE_SETUP
 case 107:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1152 "dhcp4_lexer.ll"
 =======
 #line 1154 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1153 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DATA:
@@ -4548,10 +4782,14 @@ YY_RULE_SETUP
 case 108:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1161 "dhcp4_lexer.ll"
 =======
 #line 1163 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1162 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -4564,10 +4802,14 @@ YY_RULE_SETUP
 case 109:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1170 "dhcp4_lexer.ll"
 =======
 #line 1172 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1171 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -4580,10 +4822,14 @@ YY_RULE_SETUP
 case 110:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1179 "dhcp4_lexer.ll"
 =======
 #line 1181 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1180 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -4596,10 +4842,14 @@ YY_RULE_SETUP
 case 111:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1188 "dhcp4_lexer.ll"
 =======
 #line 1190 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1189 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -4613,10 +4863,14 @@ YY_RULE_SETUP
 case 112:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1198 "dhcp4_lexer.ll"
 =======
 #line 1200 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1199 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RELAY:
@@ -4630,10 +4884,14 @@ YY_RULE_SETUP
 case 113:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1208 "dhcp4_lexer.ll"
 =======
 #line 1210 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1209 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RELAY:
@@ -4646,10 +4904,14 @@ YY_RULE_SETUP
 case 114:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1217 "dhcp4_lexer.ll"
 =======
 #line 1219 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1218 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4662,10 +4924,14 @@ YY_RULE_SETUP
 case 115:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1227 "dhcp4_lexer.ll"
 =======
 #line 1229 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1228 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOOKS_LIBRARIES:
@@ -4678,10 +4944,14 @@ YY_RULE_SETUP
 case 116:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1236 "dhcp4_lexer.ll"
 =======
 #line 1238 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1237 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOOKS_LIBRARIES:
@@ -4694,10 +4964,14 @@ YY_RULE_SETUP
 case 117:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1245 "dhcp4_lexer.ll"
 =======
 #line 1247 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1246 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4710,10 +4984,14 @@ YY_RULE_SETUP
 case 118:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1254 "dhcp4_lexer.ll"
 =======
 #line 1256 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1255 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -4726,10 +5004,14 @@ YY_RULE_SETUP
 case 119:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1263 "dhcp4_lexer.ll"
 =======
 #line 1265 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1264 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -4742,10 +5024,14 @@ YY_RULE_SETUP
 case 120:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1272 "dhcp4_lexer.ll"
 =======
 #line 1274 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1273 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -4758,10 +5044,14 @@ YY_RULE_SETUP
 case 121:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1281 "dhcp4_lexer.ll"
 =======
 #line 1283 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1282 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -4774,10 +5064,14 @@ YY_RULE_SETUP
 case 122:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1290 "dhcp4_lexer.ll"
 =======
 #line 1292 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1291 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -4790,10 +5084,14 @@ YY_RULE_SETUP
 case 123:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1299 "dhcp4_lexer.ll"
 =======
 #line 1301 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1300 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -4806,10 +5104,14 @@ YY_RULE_SETUP
 case 124:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1308 "dhcp4_lexer.ll"
 =======
 #line 1310 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1309 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4822,10 +5124,14 @@ YY_RULE_SETUP
 case 125:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1317 "dhcp4_lexer.ll"
 =======
 #line 1319 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1318 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4838,10 +5144,14 @@ YY_RULE_SETUP
 case 126:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1326 "dhcp4_lexer.ll"
 =======
 #line 1328 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1327 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONTROL_SOCKET:
@@ -4854,10 +5164,14 @@ YY_RULE_SETUP
 case 127:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1335 "dhcp4_lexer.ll"
 =======
 #line 1337 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1336 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONTROL_SOCKET:
@@ -4870,10 +5184,14 @@ YY_RULE_SETUP
 case 128:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1344 "dhcp4_lexer.ll"
 =======
 #line 1346 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1345 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4886,10 +5204,14 @@ YY_RULE_SETUP
 case 129:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1353 "dhcp4_lexer.ll"
 =======
 #line 1355 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1354 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4902,10 +5224,14 @@ YY_RULE_SETUP
 case 130:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1362 "dhcp4_lexer.ll"
 =======
 #line 1364 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1363 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -4918,10 +5244,14 @@ YY_RULE_SETUP
 case 131:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1371 "dhcp4_lexer.ll"
 =======
 #line 1373 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1372 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -4934,10 +5264,14 @@ YY_RULE_SETUP
 case 132:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1380 "dhcp4_lexer.ll"
 =======
 #line 1382 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1381 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -4950,10 +5284,14 @@ YY_RULE_SETUP
 case 133:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1389 "dhcp4_lexer.ll"
 =======
 #line 1391 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1390 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -4966,10 +5304,14 @@ YY_RULE_SETUP
 case 134:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1398 "dhcp4_lexer.ll"
 =======
 #line 1400 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1399 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -4982,10 +5324,14 @@ YY_RULE_SETUP
 case 135:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1407 "dhcp4_lexer.ll"
 =======
 #line 1409 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1408 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -4998,10 +5344,14 @@ YY_RULE_SETUP
 case 136:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1416 "dhcp4_lexer.ll"
 =======
 #line 1418 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1417 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -5014,10 +5364,14 @@ YY_RULE_SETUP
 case 137:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1425 "dhcp4_lexer.ll"
 =======
 #line 1427 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1426 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -5030,10 +5384,14 @@ YY_RULE_SETUP
 case 138:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1434 "dhcp4_lexer.ll"
 =======
 #line 1436 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1435 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -5046,10 +5404,14 @@ YY_RULE_SETUP
 case 139:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1443 "dhcp4_lexer.ll"
 =======
 #line 1445 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1444 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -5062,10 +5424,14 @@ YY_RULE_SETUP
 case 140:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1452 "dhcp4_lexer.ll"
 =======
 #line 1454 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1453 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -5078,10 +5444,14 @@ YY_RULE_SETUP
 case 141:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1461 "dhcp4_lexer.ll"
 =======
 #line 1463 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1462 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -5094,10 +5464,14 @@ YY_RULE_SETUP
 case 142:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1470 "dhcp4_lexer.ll"
 =======
 #line 1472 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1471 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -5110,10 +5484,14 @@ YY_RULE_SETUP
 case 143:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1479 "dhcp4_lexer.ll"
 =======
 #line 1481 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1480 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -5127,10 +5505,14 @@ YY_RULE_SETUP
 case 144:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1489 "dhcp4_lexer.ll"
 =======
 #line 1491 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1490 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -5144,10 +5526,14 @@ YY_RULE_SETUP
 case 145:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1499 "dhcp4_lexer.ll"
 =======
 #line 1501 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1500 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) {
@@ -5161,10 +5547,14 @@ YY_RULE_SETUP
 case 146:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1509 "dhcp4_lexer.ll"
 =======
 #line 1511 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1510 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) {
@@ -5178,10 +5568,14 @@ YY_RULE_SETUP
 case 147:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1519 "dhcp4_lexer.ll"
 =======
 #line 1521 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1520 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_FORMAT) {
@@ -5195,10 +5589,14 @@ YY_RULE_SETUP
 case 148:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1529 "dhcp4_lexer.ll"
 =======
 #line 1531 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1530 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -5212,10 +5610,14 @@ YY_RULE_SETUP
 case 149:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1539 "dhcp4_lexer.ll"
 =======
 #line 1541 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1540 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -5229,10 +5631,14 @@ YY_RULE_SETUP
 case 150:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1549 "dhcp4_lexer.ll"
 =======
 #line 1551 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1550 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -5246,10 +5652,14 @@ YY_RULE_SETUP
 case 151:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1559 "dhcp4_lexer.ll"
 =======
 #line 1561 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1560 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -5263,10 +5673,14 @@ YY_RULE_SETUP
 case 152:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1569 "dhcp4_lexer.ll"
 =======
 #line 1571 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1570 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -5280,10 +5694,14 @@ YY_RULE_SETUP
 case 153:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1579 "dhcp4_lexer.ll"
 =======
 #line 1581 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1580 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -5297,10 +5715,14 @@ YY_RULE_SETUP
 case 154:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1589 "dhcp4_lexer.ll"
 =======
 #line 1591 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1590 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -5313,10 +5735,14 @@ YY_RULE_SETUP
 case 155:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1598 "dhcp4_lexer.ll"
 =======
 #line 1600 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1599 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -5329,10 +5755,14 @@ YY_RULE_SETUP
 case 156:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1607 "dhcp4_lexer.ll"
 =======
 #line 1609 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1608 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -5345,10 +5775,14 @@ YY_RULE_SETUP
 case 157:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1616 "dhcp4_lexer.ll"
 =======
 #line 1618 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1617 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -5361,10 +5795,14 @@ YY_RULE_SETUP
 case 158:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1625 "dhcp4_lexer.ll"
 =======
 #line 1627 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1626 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -5377,10 +5815,14 @@ YY_RULE_SETUP
 case 159:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1634 "dhcp4_lexer.ll"
 =======
 #line 1636 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1635 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -5393,10 +5835,14 @@ YY_RULE_SETUP
 case 160:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1643 "dhcp4_lexer.ll"
 =======
 #line 1645 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1644 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -5409,10 +5855,14 @@ YY_RULE_SETUP
 case 161:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1652 "dhcp4_lexer.ll"
 =======
 #line 1654 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1653 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -5427,10 +5877,14 @@ YY_RULE_SETUP
 case 162:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1663 "dhcp4_lexer.ll"
 =======
 #line 1665 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1664 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -5445,10 +5899,14 @@ YY_RULE_SETUP
 case 163:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1674 "dhcp4_lexer.ll"
 =======
 #line 1676 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1675 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -5465,10 +5923,14 @@ YY_RULE_SETUP
 case 164:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1687 "dhcp4_lexer.ll"
 =======
 #line 1689 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1688 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -5485,10 +5947,14 @@ YY_RULE_SETUP
 case 165:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1700 "dhcp4_lexer.ll"
 =======
 #line 1702 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1701 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -5505,10 +5971,14 @@ YY_RULE_SETUP
 case 166:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1715 "dhcp4_lexer.ll"
 =======
 #line 1717 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1716 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* 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.
@@ -5612,10 +6082,14 @@ case 167:
 /* rule 167 can match eol */
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1814 "dhcp4_lexer.ll"
 =======
 #line 1816 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1815 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* Bad string with a forbidden control character inside */
     driver.error(driver.loc_, "Invalid control in " + std::string(parser4_text));
@@ -5625,10 +6099,14 @@ case 168:
 /* rule 168 can match eol */
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1819 "dhcp4_lexer.ll"
 =======
 #line 1821 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1820 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* Bad string with a bad escape inside */
     driver.error(driver.loc_, "Bad escape in " + std::string(parser4_text));
@@ -5637,10 +6115,14 @@ YY_RULE_SETUP
 case 169:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1824 "dhcp4_lexer.ll"
 =======
 #line 1826 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1825 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* Bad string with an open escape at the end */
     driver.error(driver.loc_, "Overflow escape in " + std::string(parser4_text));
@@ -5649,64 +6131,92 @@ YY_RULE_SETUP
 case 170:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1829 "dhcp4_lexer.ll"
 =======
 #line 1831 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1830 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 { return isc::dhcp::Dhcp4Parser::make_LSQUARE_BRACKET(driver.loc_); }
        YY_BREAK
 case 171:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1830 "dhcp4_lexer.ll"
 =======
 #line 1832 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1831 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 { return isc::dhcp::Dhcp4Parser::make_RSQUARE_BRACKET(driver.loc_); }
        YY_BREAK
 case 172:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1831 "dhcp4_lexer.ll"
 =======
 #line 1833 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1832 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 { return isc::dhcp::Dhcp4Parser::make_LCURLY_BRACKET(driver.loc_); }
        YY_BREAK
 case 173:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1832 "dhcp4_lexer.ll"
 =======
 #line 1834 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1833 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 { return isc::dhcp::Dhcp4Parser::make_RCURLY_BRACKET(driver.loc_); }
        YY_BREAK
 case 174:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1833 "dhcp4_lexer.ll"
 =======
 #line 1835 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1834 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 { return isc::dhcp::Dhcp4Parser::make_COMMA(driver.loc_); }
        YY_BREAK
 case 175:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1834 "dhcp4_lexer.ll"
 =======
 #line 1836 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1835 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 { return isc::dhcp::Dhcp4Parser::make_COLON(driver.loc_); }
        YY_BREAK
 case 176:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1836 "dhcp4_lexer.ll"
 =======
 #line 1838 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1837 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* An integer was found. */
     std::string tmp(parser4_text);
@@ -5728,10 +6238,14 @@ YY_RULE_SETUP
 case 177:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1854 "dhcp4_lexer.ll"
 =======
 #line 1856 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1855 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     /* A floating point was found. */
     std::string tmp(parser4_text);
@@ -5748,10 +6262,14 @@ YY_RULE_SETUP
 case 178:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1867 "dhcp4_lexer.ll"
 =======
 #line 1869 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1868 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     string tmp(parser4_text);
     return isc::dhcp::Dhcp4Parser::make_BOOLEAN(tmp == "true", driver.loc_);
@@ -5760,10 +6278,14 @@ YY_RULE_SETUP
 case 179:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1872 "dhcp4_lexer.ll"
 =======
 #line 1874 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1873 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
    return isc::dhcp::Dhcp4Parser::make_NULL_TYPE(driver.loc_);
 }
@@ -5771,33 +6293,46 @@ YY_RULE_SETUP
 case 180:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1876 "dhcp4_lexer.ll"
 =======
 #line 1878 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1877 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 driver.error (driver.loc_, "JSON true reserved keyword is lower case only");
        YY_BREAK
 case 181:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1878 "dhcp4_lexer.ll"
 =======
 #line 1880 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1879 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 driver.error (driver.loc_, "JSON false reserved keyword is lower case only");
        YY_BREAK
 case 182:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1880 "dhcp4_lexer.ll"
 =======
 #line 1882 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1881 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 driver.error (driver.loc_, "JSON null reserved keyword is lower case only");
        YY_BREAK
 case 183:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1882 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "Invalid character: " + std::string(parser4_text));
        YY_BREAK
@@ -5810,6 +6345,13 @@ driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
 case YY_STATE_EOF(INITIAL):
 #line 1886 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1883 "dhcp4_lexer.ll"
+driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
+       YY_BREAK
+case YY_STATE_EOF(INITIAL):
+#line 1885 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 {
     if (driver.states_.empty()) {
         return isc::dhcp::Dhcp4Parser::make_END(driver.loc_);
@@ -5836,12 +6378,16 @@ case YY_STATE_EOF(INITIAL):
 case 184:
 YY_RULE_SETUP
 <<<<<<< HEAD
+<<<<<<< HEAD
 #line 1907 "dhcp4_lexer.ll"
 ECHO;
        YY_BREAK
 #line 4360 "dhcp4_lexer.cc"
 =======
 #line 1909 "dhcp4_lexer.ll"
+=======
+#line 1908 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 ECHO;
        YY_BREAK
 #line 4594 "dhcp4_lexer.cc"
@@ -6948,12 +7494,16 @@ void parser4_free (void * ptr )
 
 /* %ok-for-header */
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 #line 1907 "dhcp4_lexer.ll"
 
 =======
 #line 1909 "dhcp4_lexer.ll"
 >>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
+=======
+#line 1908 "dhcp4_lexer.ll"
+>>>>>>> [#805,!5-p] Updated example confs
 
 
 using namespace isc::dhcp;