change client-subnet-opc to client-subnet-opcode

git-svn-id: file:///svn/unbound/branches/edns-subnet@2852 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/util/configlexer.c b/util/configlexer.c
index d3f8b614d7ce6f315c8874556eff0d987ea6490f..2e12567f487bafe102f2756ffd3b355c89366e34 100644 (file)
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -380,7 +380,7 @@ struct yy_trans_info
        flex_int32_t yy_verify;
        flex_int32_t yy_nxt;
        };
-static yyconst flex_int16_t yy_accept[1401] =
+static yyconst flex_int16_t yy_accept[1404] =
     {   0,
         1,    1,  128,  128,  132,  132,  136,  136,  140,  140,
         1,    1,  147,  144,    1,  126,  126,  145,    2,  145,
@@ -521,21 +521,22 @@ static yyconst flex_int16_t yy_accept[1401] =
       144,  144,  144,  144,   11,  144,  144,  144,  144,  144,
       144,  144,  144,   10,  144,  144,   37,  144,  125,  144,
       118,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,   91,   90,  144,   75,  120,  115,  144,  144,  144,
+      144,   91,   90,  144,  144,  120,  115,  144,  144,  144,
       144,  144,  144,  144,  144,  144,  144,   43,  144,  144,
       124,  144,  144,  144,  144,   38,  144,  144,  144,  144,
 
        85,   87,  144,  144,  144,   89,  144,  144,  144,  144,
       144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,   23,  144,  144,   74,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  112,  144,  144,  144,  144,
-      144,  144,  144,   24,  144,  144,    9,  144,  144,  110,
-       48,  144,  144,  144,   94,  144,   71,  144,  144,  144,
-       50,   54,   49,  144,   44,  144,  144,    8,  144,  144,
-       93,  144,  144,  144,   53,  144,   45,  144,  144,  144,
-      111,  144,  144,   86,   72,   52,   76,   77,   46,  144,
-      144,  144,  144,   56,  144,  144,  144,  144,  100,    0
-
+      144,  144,   23,  144,  144,   74,  144,  144,  144,  144,
+      144,  144,  144,  144,  144,  144,  144,  112,  144,  144,
+      144,  144,  144,  144,  144,   24,  144,  144,    9,  144,
+      144,  110,   48,  144,  144,  144,   94,  144,   75,   71,
+      144,  144,  144,   50,   54,   49,  144,   44,  144,  144,
+        8,  144,  144,   93,  144,  144,  144,   53,  144,   45,
+      144,  144,  144,  111,  144,  144,   86,   72,   52,   76,
+       77,   46,  144,  144,  144,  144,   56,  144,  144,  144,
+
+      144,  100,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -578,15 +579,15 @@ static yyconst flex_int32_t yy_meta[40] =
         1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int16_t yy_base[1415] =
+static yyconst flex_int16_t yy_base[1418] =
     {   0,
         0,    0,   37,   40,   44,   51,   63,   75,   56,   68,
-       87,  108, 2688, 2479,   50, 2795, 2795, 2795,  129,   94,
+       87,  108, 2619, 2604,   50, 2803, 2803, 2803,  129,   94,
        70,  104,  122,   90,   92,  124,  132,   95,   84,  111,
-      140,  142,   50,  135,  151,  152,  161,  154,  175, 2450,
-     2795, 2795, 2795,   70, 2418, 2795, 2795, 2795,   42, 2214,
-     1931, 2795, 2795, 2795,  192, 1473, 2795, 2795, 2795,  186,
-     1243, 2795,  196, 2795,  200,  193, 1117,  206,  120,    0,
+      140,  142,   50,  135,  151,  152,  161,  154,  175, 2533,
+     2803, 2803, 2803,   70, 2450, 2803, 2803, 2803,   42, 2214,
+     1931, 2803, 2803, 2803,  192, 1473, 2803, 2803, 2803,  186,
+     1243, 2803,  196, 2803,  200,  193, 1117,  206,  120,    0,
       219,    0,    0,  103,  170,  138,  145,  199,  203,  201,
       202,  204,  206,  221,  209,  220,  224,  225,  226,  227,
       231,  233,  229,  241,  244,  235,  238,  250,  249,  255,
@@ -611,9 +612,9 @@ static yyconst flex_int16_t yy_base[1415] =
       577,  593,  584,  585,  595,  598,  591,  600,  607,  618,
       608,  609,  617,  620,  619,  622,  623,  624,  627,  630,
       632,  631,  642,  645,  644,  643,  646,  652,  660,  647,
-      654,  657,  658,  661,  666,  656,  664, 2795,  672,  667,
+      654,  657,  658,  661,  666,  656,  664, 2803,  672,  667,
 
-      674,  675,  678, 2795,  676,  679,  680,  681,  683,  692,
+      674,  675,  678, 2803,  676,  679,  680,  681,  683,  692,
       695,  685,  689,  693,  700,  701,  702,  704,  724,  707,
       705,  714,  708,  712,  710,  716,  722,  726,  729,  720,
       731,  736,  733,  743,  734,  747,  757,  746,  745,  748,
@@ -626,279 +627,279 @@ static yyconst flex_int16_t yy_base[1415] =
 
       879,  886,  882,  884,  889,  895,  888,  897,  898,  899,
       902,  903,  908,  909,  905,  912,  915,  917,  920,  918,
-      922,  927,  928, 2795,  930,  938,  932,  934,  935,  939,
-     2795, 2795,  165, 2795, 2795,  941,  940,  947,  958,  959,
+      922,  927,  928, 2803,  930,  938,  932,  934,  935,  939,
+     2803, 2803,  165, 2803, 2803,  941,  940,  947,  958,  959,
       955,  944,  942,  965,  957,  969,  972,  964,  974,  980,
       970,  981,  984,  985,  982,  987,  988,  995,  991, 1003,
       999, 1001, 1004, 1006, 1008, 1010, 1009, 1018, 1011, 1025,
-     1013, 2795, 1021, 1022, 1027, 1023, 1030, 1031, 2795, 1029,
+     1013, 2803, 1021, 1022, 1027, 1023, 1030, 1031, 2803, 1029,
      1033, 1035, 1037, 1040, 1043, 1041, 1044, 1046, 1047, 1049,
      1051, 1048, 1053, 1066, 1069, 1058, 1064, 1070, 1071, 1078,
 
      1085, 1081, 1072, 1074, 1088, 1082, 1094, 1096, 1086, 1099,
      1089, 1091, 1097, 1098, 1120, 1100, 1105, 1106, 1110, 1107,
      1112, 1116, 1114, 1132, 1113, 1127, 1134, 1142, 1139, 1137,
-     1135, 1147, 1151, 1148, 2795, 1159, 1153, 1155, 1157, 1160,
-     1162, 1161, 1163, 1164, 1167, 1169, 1177, 2795, 1173, 1175,
-     1176, 1183, 1185, 1189, 1186, 1196, 1203, 2795, 1205, 1206,
+     1135, 1147, 1151, 1148, 2803, 1159, 1153, 1155, 1157, 1160,
+     1162, 1161, 1163, 1164, 1167, 1169, 1177, 2803, 1173, 1175,
+     1176, 1183, 1185, 1189, 1186, 1196, 1203, 2803, 1205, 1206,
      1179, 1199, 1192, 1208, 1201, 1213, 1215, 1216, 1217, 1219,
      1227, 1224, 1228, 1229, 1230, 1231, 1234, 1236, 1235, 1237,
      1238, 1241, 1247, 1257, 1260, 1251, 1262, 1245, 1239, 1259,
-     1267, 1265, 1268, 1269, 1270, 2795,  237, 1272, 1274, 1273,
+     1267, 1265, 1268, 1269, 1270, 2803,  237, 1272, 1274, 1273,
 
      1280, 1281, 1282, 1285, 1278, 1287, 1291, 1279, 1297, 1299,
      1300, 1302, 1303, 1304, 1305, 1306, 1309, 1307, 1314, 1315,
-     1319, 1317, 1320, 1321, 1322, 1327, 1324, 1326, 2795, 1337,
+     1319, 1317, 1320, 1321, 1322, 1327, 1324, 1326, 2803, 1337,
      1333, 1338, 1334, 1340, 1353, 1343, 1349, 1355, 1359, 1357,
      1361, 1363, 1351, 1365, 1367, 1368, 1374, 1377, 1373, 1375,
-     1376, 1380, 2795, 1383, 1382, 1384, 1389, 1388, 1393, 1395,
-     1396, 1398, 1399, 1405, 1412, 2795, 1414, 1408, 1400, 1421,
+     1376, 1380, 2803, 1383, 1382, 1384, 1389, 1388, 1393, 1395,
+     1396, 1398, 1399, 1405, 1412, 2803, 1414, 1408, 1400, 1421,
      1406, 1423, 1425, 1428, 1415, 1429, 1431, 1432, 1418, 1438,
-     1202, 2795, 1445, 1446, 1442, 1448, 1449, 1433, 1450, 1454,
+     1202, 2803, 1445, 1446, 1442, 1448, 1449, 1433, 1450, 1454,
      1451, 1455, 1462, 1456, 1459, 1460, 1463, 1464, 1466, 1467,
 
-     1469, 1468, 2795, 1485, 1470, 1472, 1477, 1475, 1483, 1494,
+     1469, 1468, 2803, 1485, 1470, 1472, 1477, 1475, 1483, 1494,
      1488, 1489, 1495, 1497, 1499, 1500, 1504, 1502, 1501, 1513,
-     1510, 1514, 1515, 1516, 1528, 1529, 1526, 2795, 1530, 1517,
+     1510, 1514, 1515, 1516, 1528, 1529, 1526, 2803, 1530, 1517,
      1532, 1538, 1540, 1534, 1541, 1547, 1543, 1544, 1554, 1545,
      1546, 1548, 1552, 1555, 1556, 1557, 1558, 1561, 1570, 1563,
-     1573, 1568, 1579, 1575, 1581, 1583, 1584, 1591, 2795, 2795,
-     1587, 1589, 1598, 2795, 1595, 2795, 1597, 2795, 1599, 1600,
+     1573, 1568, 1579, 1575, 1581, 1583, 1584, 1591, 2803, 2803,
+     1587, 1589, 1598, 2803, 1595, 2803, 1597, 2803, 1599, 1600,
      1605, 1606, 1607, 1608, 1610, 1613, 1614, 1616, 1611, 1617,
-     1618, 1619, 2795, 1625, 1626, 1627, 1629, 1630, 1634, 1632,
-     1642, 1636, 1651, 1635, 1645, 1647, 2795, 1656, 1648, 1654,
+     1618, 1619, 2803, 1625, 1626, 1627, 1629, 1630, 1634, 1632,
+     1642, 1636, 1651, 1635, 1645, 1647, 2803, 1656, 1648, 1654,
 
      1663, 1664, 1660, 1662, 1666, 1667, 1668, 1669, 1671, 1675,
      1676, 1677, 1679, 1682, 1683, 1685, 1689, 1687, 1688, 1690,
-     1700, 1702, 1692, 1703, 2795, 2795, 1706, 1710, 1693, 1714,
+     1700, 1702, 1692, 1703, 2803, 2803, 1706, 1710, 1693, 1714,
      1716, 1717, 1720, 1718, 1726, 1723, 1724, 1728, 1731, 1733,
-     1734, 1735, 1737, 1739, 1740, 2795, 1748, 1742, 1750, 1751,
-     1756, 1757, 1754, 1761, 2795, 2795, 1763, 1765, 1766, 1768,
-     1769, 1772, 2795, 1773, 1775, 1776, 1777, 1783, 1780, 1774,
+     1734, 1735, 1737, 1739, 1740, 2803, 1748, 1742, 1750, 1751,
+     1756, 1757, 1754, 1761, 2803, 2803, 1763, 1765, 1766, 1768,
+     1769, 1772, 2803, 1773, 1775, 1776, 1777, 1783, 1780, 1774,
      1786, 1792, 1794, 1795, 1798, 1796, 1804, 1800, 1802, 1803,
      1806, 1814, 1815, 1818, 1826, 1811, 1819, 1822, 1828, 1823,
-     1830, 1834, 1836, 1837, 2795, 1844, 1835, 1846, 1825, 1848,
+     1830, 1834, 1836, 1837, 2803, 1844, 1835, 1846, 1825, 1848,
 
      1851, 1854, 1845, 1855, 1856, 1858, 1860, 1862, 1863, 1865,
-     1867, 2795, 1868, 1869, 1870, 1872, 1871, 1873, 1882, 1874,
-     1886, 2795, 1888, 1896, 1884, 1894, 1898, 1903, 1905, 1892,
+     1867, 2803, 1868, 1869, 1870, 1872, 1871, 1873, 1882, 1874,
+     1886, 2803, 1888, 1896, 1884, 1894, 1898, 1903, 1905, 1892,
      1895, 1906, 1907, 1909, 1911, 1915, 1916, 1919, 1913, 1921,
      1931, 1930, 1938, 1941, 1939, 1945, 1942, 1943, 1944, 1923,
-     1955, 1946, 1957, 1949, 2795, 1959, 1964, 1966, 1958, 1967,
-     1969, 1970, 1971, 2795, 2795, 1960, 2795, 1977, 1975, 1979,
-     1981, 2795, 1983, 2795, 2795, 1984, 1991, 1985, 1994, 1997,
-     2001, 2795, 1996, 1987, 2004, 1992, 2006, 2008, 2009, 2010,
-     2011, 2795, 2012, 2014, 2015, 2019, 2022, 2023, 2027, 2029,
+     1955, 1946, 1957, 1949, 2803, 1959, 1964, 1966, 1958, 1967,
+     1969, 1970, 1971, 2803, 2803, 1960, 2803, 1977, 1975, 1979,
+     1981, 2803, 1983, 2803, 2803, 1984, 1991, 1985, 1994, 1997,
+     2001, 2803, 1996, 1987, 2004, 1992, 2006, 2008, 2009, 2010,
+     2011, 2803, 2012, 2014, 2015, 2019, 2022, 2023, 2027, 2029,
 
-     2030, 2032, 2036, 2038, 2039, 2040, 2047, 2044, 2795, 2045,
+     2030, 2032, 2036, 2038, 2039, 2040, 2047, 2044, 2803, 2045,
      2048, 2051, 2046, 2054, 2059, 2052, 2056, 2067, 2069, 2070,
-     2795, 2068, 2071, 2072, 2795, 2076, 2795, 2077, 2053, 2080,
-     2085, 2086, 2093, 2087, 2090, 2096, 2097, 2099, 2100, 2795,
-     2795, 2102, 2103, 2105, 2113, 2107, 2111, 2118, 2109, 2115,
-     2121, 2123, 2795, 2125, 2126, 2127, 2128, 2129, 2795, 2131,
+     2803, 2068, 2071, 2072, 2803, 2076, 2803, 2077, 2053, 2080,
+     2085, 2086, 2093, 2087, 2090, 2096, 2097, 2099, 2100, 2803,
+     2803, 2102, 2103, 2105, 2113, 2107, 2111, 2118, 2109, 2115,
+     2121, 2123, 2803, 2125, 2126, 2127, 2128, 2129, 2803, 2131,
      2132, 2133, 2138, 2136, 2144, 2153, 2141, 2156, 2158, 2159,
-     2161, 2163, 2165, 2164, 2795, 2134, 2167, 2168, 2170, 2171,
-     2174, 2172, 2176, 2182, 2184, 2186, 2795, 2191, 2173, 2193,
+     2161, 2163, 2165, 2164, 2803, 2134, 2167, 2168, 2170, 2171,
+     2174, 2172, 2176, 2182, 2184, 2186, 2803, 2191, 2173, 2193,
      2188, 2196, 2195, 2200, 2201, 2202, 2204, 2206, 2208, 2209,
 
-     2210, 2217, 2216, 2795, 2213, 2795, 2221, 2227, 2229, 2231,
-     2795, 2222, 2234, 2235, 2795, 2236, 2238, 2242, 2244, 2246,
-     2252, 2253, 2245, 2255, 2254, 2256, 2262, 2260, 2795, 2263,
-     2264, 2267, 2268, 2795, 2795, 2271, 2795, 2795, 2277, 2795,
-     2795, 2273, 2280, 2282, 2795, 2284, 2795, 2291, 2287, 2289,
-     2290, 2292, 2795, 2294, 2795, 2795, 2295, 2296, 2299, 2301,
+     2210, 2217, 2216, 2803, 2213, 2803, 2221, 2227, 2229, 2231,
+     2803, 2222, 2234, 2235, 2803, 2236, 2238, 2242, 2244, 2246,
+     2252, 2253, 2245, 2255, 2254, 2256, 2262, 2260, 2803, 2263,
+     2264, 2267, 2268, 2803, 2803, 2271, 2803, 2803, 2277, 2803,
+     2803, 2273, 2280, 2282, 2803, 2284, 2803, 2291, 2287, 2289,
+     2290, 2292, 2803, 2294, 2803, 2803, 2295, 2296, 2299, 2301,
      2302, 2304, 2309, 2311, 2306, 2314, 2316, 2317, 2319, 2320,
      2322, 2324, 2323, 2325, 2326, 2327, 2330, 2334, 2335, 2336,
-     2337, 2347, 2795, 2343, 2353, 2795, 2356, 2348, 2350, 2358,
-     2359, 2362, 2360, 2364, 2371, 2367, 2368, 2369, 2795, 2370,
-
-     2372, 2795, 2795, 2373, 2380, 2375, 2381, 2384, 2795, 2386,
-     2388, 2395, 2392, 2399, 2795, 2795, 2795, 2400, 2403, 2404,
-     2405, 2406, 2408, 2795, 2409, 2412, 2414, 2415, 2421, 2423,
-     2431, 2428, 2433, 2435, 2795, 2436, 2437, 2795, 2439, 2438,
-     2443, 2444, 2445, 2447, 2795, 2429, 2440, 2455, 2457, 2463,
-     2461, 2462, 2464, 2795, 2465, 2467, 2795, 2472, 2795, 2468,
-     2795, 2473, 2475, 2478, 2483, 2485, 2477, 2486, 2492, 2490,
-     2494, 2795, 2795, 2491, 2795, 2795, 2795, 2496, 2499, 2501,
-     2502, 2505, 2504, 2506, 2508, 2510, 2511, 2795, 2513, 2514,
-     2795, 2512, 2518, 2524, 2527, 2795, 2533, 2529, 2525, 2522,
-
-     2795, 2795, 2535, 2541, 2539, 2795, 2544, 2543, 2545, 2546,
-     2551, 2553, 2554, 2555, 2557, 2558, 2556, 2559, 2567, 2560,
-     2568, 2795, 2572, 2569, 2795, 2575, 2580, 2584, 2577, 2581,
-     2585, 2587, 2588, 2591, 2592, 2795, 2594, 2598, 2602, 2607,
-     2610, 2599, 2613, 2795, 2595, 2614, 2795, 2619, 2616, 2795,
-     2795, 2620, 2623, 2624, 2795, 2625, 2795, 2626, 2632, 2633,
-     2795, 2795, 2795, 2635, 2795, 2641, 2636, 2795, 2643, 2644,
-     2795, 2627, 2648, 2650, 2795, 2652, 2795, 2654, 2656, 2658,
-     2795, 2660, 2661, 2795, 2795, 2795, 2795, 2795, 2795, 2663,
-     2664, 2666, 2668, 2795, 2670, 2669, 2671, 2674, 2795, 2795,
-
-     2703, 2710, 2717, 2724, 2731,   94, 2738, 2745, 2752, 2759,
-     2766, 2773, 2780, 2787
+     2337, 2347, 2803, 2343, 2353, 2803, 2356, 2348, 2350, 2358,
+     2359, 2362, 2360, 2364, 2371, 2367, 2368, 2369, 2803, 2370,
+
+     2372, 2803, 2803, 2373, 2380, 2375, 2381, 2384, 2803, 2386,
+     2388, 2395, 2392, 2399, 2803, 2803, 2803, 2400, 2403, 2404,
+     2405, 2406, 2408, 2803, 2409, 2412, 2414, 2415, 2421, 2423,
+     2431, 2418, 2428, 2435, 2803, 2432, 2429, 2803, 2436, 2438,
+     2440, 2443, 2444, 2446, 2803, 2442, 2447, 2454, 2448, 2463,
+     2460, 2456, 2462, 2803, 2465, 2468, 2803, 2470, 2803, 2471,
+     2803, 2472, 2475, 2477, 2479, 2483, 2484, 2473, 2490, 2489,
+     2493, 2803, 2803, 2494, 2495, 2803, 2803, 2486, 2496, 2498,
+     2506, 2503, 2508, 2501, 2509, 2511, 2510, 2803, 2512, 2514,
+     2803, 2516, 2525, 2518, 2527, 2803, 2529, 2531, 2526, 2532,
+
+     2803, 2803, 2537, 2543, 2539, 2803, 2541, 2545, 2547, 2549,
+     2550, 2556, 2551, 2553, 2558, 2559, 2561, 2562, 2563, 2571,
+     2564, 2573, 2803, 2575, 2572, 2803, 2576, 2584, 2586, 2581,
+     2579, 2587, 2590, 2593, 2595, 2597, 2599, 2803, 2601, 2603,
+     2610, 2612, 2614, 2616, 2620, 2803, 2602, 2622, 2803, 2626,
+     2627, 2803, 2803, 2628, 2630, 2633, 2803, 2634, 2803, 2803,
+     2617, 2641, 2631, 2803, 2803, 2803, 2643, 2803, 2647, 2646,
+     2803, 2649, 2651, 2803, 2652, 2654, 2656, 2803, 2658, 2803,
+     2660, 2662, 2664, 2803, 2665, 2667, 2803, 2803, 2803, 2803,
+     2803, 2803, 2669, 2671, 2675, 2672, 2803, 2678, 2676, 2679,
+
+     2683, 2803, 2803, 2711, 2718, 2725, 2732, 2739,   94, 2746,
+     2753, 2760, 2767, 2774, 2781, 2788, 2795
     } ;
 
-static yyconst flex_int16_t yy_def[1415] =
+static yyconst flex_int16_t yy_def[1418] =
     {   0,
-     1400,    1, 1401, 1401, 1402, 1402, 1403, 1403, 1404, 1404,
-     1405, 1405, 1400, 1406, 1400, 1400, 1400, 1400, 1407, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1408,
-     1400, 1400, 1400, 1408, 1409, 1400, 1400, 1400, 1409, 1410,
-     1400, 1400, 1400, 1400, 1410, 1411, 1400, 1400, 1400, 1411,
-     1412, 1400, 1413, 1400, 1412, 1412, 1406, 1406, 1400, 1414,
-     1407, 1414, 1407, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1408, 1408, 1409, 1409, 1410, 1410, 1400, 1411, 1411,
-     1412, 1412, 1413, 1413, 1412, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1412, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1412, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1400, 1406, 1406,
-
-     1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1412, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1412, 1406,
-     1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406, 1406,
-     1400, 1400, 1406, 1400, 1400, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1400, 1406, 1406, 1406, 1406, 1406, 1406, 1400, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1412, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1400, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1400, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1400, 1412, 1406, 1406, 1406,
-
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1400, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1400, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-
-     1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1400, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1400, 1400,
-     1406, 1406, 1406, 1400, 1406, 1400, 1406, 1400, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1400, 1406, 1406, 1406,
-
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1400, 1400, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1400, 1400, 1406, 1406, 1406, 1406,
-     1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406,
-
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1400, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1400, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1400, 1400, 1406, 1400, 1406, 1406, 1406,
-     1406, 1400, 1406, 1400, 1400, 1406, 1406, 1406, 1406, 1406,
-     1406, 1400, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1400, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1400, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1400, 1406, 1406, 1406, 1400, 1406, 1400, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1400,
-     1400, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406, 1400, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1400, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-
-     1406, 1406, 1406, 1400, 1406, 1400, 1406, 1406, 1406, 1406,
-     1400, 1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1400, 1406,
-     1406, 1406, 1406, 1400, 1400, 1406, 1400, 1400, 1406, 1400,
-     1400, 1406, 1406, 1406, 1400, 1406, 1400, 1406, 1406, 1406,
-     1406, 1406, 1400, 1406, 1400, 1400, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1400, 1406, 1406, 1400, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1400, 1406,
-
-     1406, 1400, 1400, 1406, 1406, 1406, 1406, 1406, 1400, 1406,
-     1406, 1406, 1406, 1406, 1400, 1400, 1400, 1406, 1406, 1406,
-     1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1400, 1406, 1406, 1400, 1406, 1406,
-     1406, 1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1400, 1406, 1406, 1400, 1406, 1400, 1406,
-     1400, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1400, 1400, 1406, 1400, 1400, 1400, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1400, 1406, 1406,
-     1400, 1406, 1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406,
-
-     1400, 1400, 1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
-     1406, 1400, 1406, 1406, 1400, 1406, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406,
-     1406, 1406, 1406, 1400, 1406, 1406, 1400, 1406, 1406, 1400,
-     1400, 1406, 1406, 1406, 1400, 1406, 1400, 1406, 1406, 1406,
-     1400, 1400, 1400, 1406, 1400, 1406, 1406, 1400, 1406, 1406,
-     1400, 1406, 1406, 1406, 1400, 1406, 1400, 1406, 1406, 1406,
-     1400, 1406, 1406, 1400, 1400, 1400, 1400, 1400, 1400, 1406,
-     1406, 1406, 1406, 1400, 1406, 1406, 1406, 1406, 1400,    0,
-
-     1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400,
-     1400, 1400, 1400, 1400
+     1403,    1, 1404, 1404, 1405, 1405, 1406, 1406, 1407, 1407,
+     1408, 1408, 1403, 1409, 1403, 1403, 1403, 1403, 1410, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1411,
+     1403, 1403, 1403, 1411, 1412, 1403, 1403, 1403, 1412, 1413,
+     1403, 1403, 1403, 1403, 1413, 1414, 1403, 1403, 1403, 1414,
+     1415, 1403, 1416, 1403, 1415, 1415, 1409, 1409, 1403, 1417,
+     1410, 1417, 1410, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1411, 1411, 1412, 1412, 1413, 1413, 1403, 1414, 1414,
+     1415, 1415, 1416, 1416, 1415, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1415, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1415, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1403, 1409, 1409,
+
+     1409, 1409, 1409, 1403, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1415, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1415, 1409,
+     1409, 1409, 1409, 1403, 1409, 1409, 1409, 1409, 1409, 1409,
+     1403, 1403, 1409, 1403, 1403, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1403, 1409, 1409, 1409, 1409, 1409, 1409, 1403, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1415, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1403, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1403, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1403, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1403, 1415, 1409, 1409, 1409,
+
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1403, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1403, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1403, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1403, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+
+     1409, 1409, 1403, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1403, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1403, 1403,
+     1409, 1409, 1409, 1403, 1409, 1403, 1409, 1403, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1403, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1403, 1409, 1409, 1409,
+
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1403, 1403, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1403, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1403, 1403, 1409, 1409, 1409, 1409,
+     1409, 1409, 1403, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1403, 1409, 1409, 1409, 1409, 1409,
+
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1403, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1403, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1403, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1403, 1403, 1409, 1403, 1409, 1409, 1409,
+     1409, 1403, 1409, 1403, 1403, 1409, 1409, 1409, 1409, 1409,
+     1409, 1403, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1403, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1403, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1403, 1409, 1409, 1409, 1403, 1409, 1403, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1403,
+     1403, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1403, 1409, 1409, 1409, 1409, 1409, 1403, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1403, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1403, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+
+     1409, 1409, 1409, 1403, 1409, 1403, 1409, 1409, 1409, 1409,
+     1403, 1409, 1409, 1409, 1403, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1403, 1409,
+     1409, 1409, 1409, 1403, 1403, 1409, 1403, 1403, 1409, 1403,
+     1403, 1409, 1409, 1409, 1403, 1409, 1403, 1409, 1409, 1409,
+     1409, 1409, 1403, 1409, 1403, 1403, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1403, 1409, 1409, 1403, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1403, 1409,
+
+     1409, 1403, 1403, 1409, 1409, 1409, 1409, 1409, 1403, 1409,
+     1409, 1409, 1409, 1409, 1403, 1403, 1403, 1409, 1409, 1409,
+     1409, 1409, 1409, 1403, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1403, 1409, 1409, 1403, 1409, 1409,
+     1409, 1409, 1409, 1409, 1403, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1403, 1409, 1409, 1403, 1409, 1403, 1409,
+     1403, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1403, 1403, 1409, 1409, 1403, 1403, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1403, 1409, 1409,
+     1403, 1409, 1409, 1409, 1409, 1403, 1409, 1409, 1409, 1409,
+
+     1403, 1403, 1409, 1409, 1409, 1403, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409,
+     1409, 1409, 1403, 1409, 1409, 1403, 1409, 1409, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1409, 1409, 1403, 1409, 1409,
+     1409, 1409, 1409, 1409, 1409, 1403, 1409, 1409, 1403, 1409,
+     1409, 1403, 1403, 1409, 1409, 1409, 1403, 1409, 1403, 1403,
+     1409, 1409, 1409, 1403, 1403, 1403, 1409, 1403, 1409, 1409,
+     1403, 1409, 1409, 1403, 1409, 1409, 1409, 1403, 1409, 1403,
+     1409, 1409, 1409, 1403, 1409, 1409, 1403, 1403, 1403, 1403,
+     1403, 1403, 1409, 1409, 1409, 1409, 1403, 1409, 1409, 1409,
+
+     1409, 1403,    0, 1403, 1403, 1403, 1403, 1403, 1403, 1403,
+     1403, 1403, 1403, 1403, 1403, 1403, 1403
     } ;
 
-static yyconst flex_int16_t yy_nxt[2835] =
+static yyconst flex_int16_t yy_nxt[2843] =
     {   0,
        14,   15,   16,   17,   18,   19,   18,   14,   14,   14,
        14,   18,   20,   21,   14,   22,   23,   24,   25,   14,
@@ -1167,54 +1168,55 @@ static yyconst flex_int16_t yy_nxt[2835] =
        68, 1249, 1250, 1251,   68, 1252, 1259,   68, 1255, 1260,
      1261,   68,   68, 1262, 1256,   68,   68,   68,   68, 1258,
        68,   68, 1265, 1266,   68, 1264,   68,   68, 1267, 1269,
-      125, 1270, 1272,   68, 1273,   68, 1268, 1263, 1274, 1275,
-       68,   68, 1271,   68, 1276,   68, 1277,   68,   68,   68,
-       68,   68,   68, 1278, 1280,   68,   68,   68, 1284,   68,
-     1286, 1279,  123, 1281, 1282, 1283, 1288,   68, 1285,   68,
-     1290, 1287, 1291,   68,   68,   68,   68,   68, 1289,   68,
-       68, 1293, 1292, 1296,   68,   68, 1294,   68, 1299,   68,
-       68,   68, 1295, 1300, 1301,   68, 1302,   68,   68, 1305,
-
-     1297, 1306,   68,   68,   68, 1298,   68, 1303,   68, 1308,
-     1307,   68, 1304,   68,   68, 1312,   68,   68,   68, 1310,
-       68, 1314,   68,   68,   68,   68,   68, 1309, 1319, 1322,
-       68, 1317, 1311, 1313,   68, 1320,   68,   68, 1315,   68,
-     1323,   68, 1321, 1318, 1325,   68, 1316,   68, 1324, 1327,
-     1326,   68, 1329,   68, 1330,   68,   68,   68,   68, 1328,
-     1331, 1332, 1336,   68, 1333,   68,   68,   68,   68,   68,
-       68,   68,   68, 1335, 1337, 1341, 1334, 1340, 1344,   68,
-       68,   68, 1338, 1347,   68, 1346, 1339,   68, 1345,   68,
-     1343, 1350,   68,   68, 1342, 1351,   68,   68, 1355,   68,
-
-       68, 1348, 1357,   68,   68, 1353,   68,   68, 1352, 1349,
-       68,   68, 1356, 1361,   68, 1360, 1364, 1354, 1362,   68,
-     1359, 1363,   68, 1358, 1365,   68,   68, 1367,   68, 1366,
-     1368,   68,   68, 1369, 1371,   68,   68,   68,   68,   68,
-     1370, 1372, 1373, 1375,   68,   68, 1377,   68,   68, 1376,
-     1378, 1379, 1380,   68, 1381,   68,   68, 1383, 1374, 1384,
-       68, 1385,   68, 1386,   68, 1387,   68, 1388,   68, 1389,
-       68, 1382,   68,   68, 1391,   68,   68, 1394,   68, 1392,
-       68,   68,   68,   68, 1390, 1399,   68, 1400, 1400, 1395,
-     1400, 1400, 1400, 1400, 1400, 1397, 1393, 1396, 1400, 1400,
-
-     1400, 1400, 1398,   40,   40,   40,   40,   40,   40,   40,
-       45,   45,   45,   45,   45,   45,   45,   50,   50,   50,
-       50,   50,   50,   50,   56,   56,   56,   56,   56,   56,
-       56,   61,   61,   61,   61,   61,   61,   61,   71,   71,
-     1400,   71,   71,   71,   71,  122,  122, 1400, 1400, 1400,
-      122,  122,  124,  124, 1400, 1400,  124, 1400,  124,  126,
-     1400, 1400, 1400, 1400, 1400,  126,  129,  129, 1400, 1400,
-     1400,  129,  129,  131, 1400, 1400, 1400, 1400, 1400,  131,
-      133,  133, 1400,  133,  133,  133,  133,   72,   72, 1400,
-       72,   72,   72,   72,   13, 1400, 1400, 1400, 1400, 1400,
-
-     1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400,
-     1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400,
-     1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400,
-     1400, 1400, 1400, 1400
+       68, 1270, 1272,   68, 1273,   68, 1268, 1263, 1274, 1276,
+       68,   68, 1271,   68,   68, 1275, 1277,   68,   68, 1278,
+       68, 1280,   68, 1279,   68,   68,   68, 1284,   68,   68,
+       68, 1282,  125, 1281, 1283, 1288,   68, 1285,   68, 1289,
+     1290, 1291,   68, 1286,   68,   68, 1292,   68, 1287, 1293,
+       68, 1296,   68,   68,   68,   68, 1294,   68, 1299,   68,
+     1301,   68, 1300, 1295, 1302,   68,   68, 1305,   68, 1304,
+
+     1306,   68,   68, 1297, 1298,   68,   68,   68,   68, 1307,
+       68, 1309, 1308,   68, 1303,   68, 1311, 1310,   68, 1313,
+       68,   68,   68,   68,   68, 1315,   68, 1320,   68, 1312,
+       68, 1314, 1318, 1316, 1324, 1321, 1323,   68,   68,   68,
+     1326,   68, 1319,   68,   68,  123, 1322, 1317, 1325,   68,
+     1328,   68, 1327,   68, 1330,   68, 1331,   68, 1333,   68,
+     1332,   68,   68,   68, 1335,   68, 1334, 1338,   68, 1329,
+       68,   68, 1339,   68,   68,   68,   68, 1337, 1343, 1342,
+     1336, 1340, 1346,   68,   68,   68, 1349,   68,   68, 1341,
+     1348,   68, 1347,   68, 1345, 1352,   68, 1353,   68,   68,
+
+     1344, 1357,   68, 1355, 1350,   68, 1359,   68, 1360,   68,
+     1351,   68, 1354,   68,   68,   68,   68, 1358, 1403, 1356,
+     1363, 1364,   68, 1365,   68, 1366,   68, 1362,   68,   68,
+     1361, 1368,   68, 1367,   68, 1370, 1369, 1371,   68,   68,
+       68, 1374,   68,   68, 1372,   68,   68, 1379, 1373, 1377,
+     1375, 1376, 1378,   68, 1380,   68, 1381, 1382,   68,   68,
+     1384,   68, 1383,   68,   68, 1387,   68, 1388,   68, 1389,
+       68, 1390,   68, 1391,   68, 1392,   68,   68, 1385,   68,
+     1394,   68, 1386,   68,   68, 1395, 1397,   68,   68, 1393,
+       68,   68, 1403, 1398, 1402,   68, 1403, 1403, 1403, 1403,
+
+     1403, 1403, 1400, 1396, 1403, 1399, 1403, 1403, 1403, 1403,
+     1401,   40,   40,   40,   40,   40,   40,   40,   45,   45,
+       45,   45,   45,   45,   45,   50,   50,   50,   50,   50,
+       50,   50,   56,   56,   56,   56,   56,   56,   56,   61,
+       61,   61,   61,   61,   61,   61,   71,   71, 1403,   71,
+       71,   71,   71,  122,  122, 1403, 1403, 1403,  122,  122,
+      124,  124, 1403, 1403,  124, 1403,  124,  126, 1403, 1403,
+     1403, 1403, 1403,  126,  129,  129, 1403, 1403, 1403,  129,
+      129,  131, 1403, 1403, 1403, 1403, 1403,  131,  133,  133,
+     1403,  133,  133,  133,  133,   72,   72, 1403,   72,   72,
+
+       72,   72,   13, 1403, 1403, 1403, 1403, 1403, 1403, 1403,
+     1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403,
+     1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403,
+     1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403,
+     1403, 1403
     } ;
 
-static yyconst flex_int16_t yy_chk[2835] =
+static yyconst flex_int16_t yy_chk[2843] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -1225,7 +1227,7 @@ static yyconst flex_int16_t yy_chk[2835] =
         9,  118,   33,    6,    7,    7,    7,    7,    9,    7,
        10,   10,   10,   44,   44,    7,    8,    8,    8,    8,
        10,    8,   21,   33,  118,   21,   21,    8,   11,   11,
-       11,   11,   11,   11, 1406,   20,   29,   20,   20,   11,
+       11,   11,   11,   11, 1409,   20,   29,   20,   20,   11,
 
        20,   29,   24,   21,   25,   20,   24,   28,   11,   12,
        12,   12,   12,   12,   12,   74,   22,   22,   74,   25,
@@ -1483,51 +1485,52 @@ static yyconst flex_int16_t yy_chk[2835] =
      1211, 1198, 1200, 1201, 1213, 1204, 1212, 1212, 1207, 1213,
      1214, 1214, 1218, 1218, 1208, 1219, 1220, 1221, 1222, 1211,
      1223, 1225, 1221, 1222, 1226, 1220, 1227, 1228, 1223, 1226,
-       45, 1227, 1229, 1229, 1230, 1230, 1225, 1219, 1231, 1232,
-     1232, 1246, 1228, 1231, 1233, 1233, 1234, 1234, 1236, 1237,
-     1240, 1239, 1247, 1236, 1239, 1241, 1242, 1243, 1243, 1244,
-     1246, 1237,   40, 1240, 1241, 1242, 1248, 1248, 1244, 1249,
-     1250, 1247, 1251, 1251, 1252, 1250, 1253, 1255, 1249, 1256,
-     1260, 1253, 1252, 1258, 1258, 1262, 1255, 1263, 1263, 1267,
-     1264,   14, 1256, 1264, 1265, 1265, 1266, 1266, 1268, 1269,
-
-     1260, 1270, 1270, 1274, 1269, 1262, 1271, 1267, 1278, 1274,
-     1271, 1279, 1268, 1280, 1281, 1281, 1283, 1282, 1284, 1279,
-     1285, 1283, 1286, 1287, 1292, 1289, 1290, 1278, 1289, 1293,
-     1293, 1286, 1280, 1282, 1300, 1290, 1294, 1299, 1284, 1295,
-     1294, 1298, 1292, 1287, 1297, 1297, 1285, 1303, 1295, 1299,
-     1298, 1305, 1303, 1304, 1304, 1308, 1307, 1309, 1310, 1300,
-     1305, 1307, 1311, 1311, 1308, 1312, 1313, 1314, 1317, 1315,
-     1316, 1318, 1320, 1310, 1312, 1316, 1309, 1315, 1319, 1319,
-     1321, 1324, 1313, 1323, 1323, 1321, 1314, 1326, 1320, 1329,
-     1318, 1327, 1327, 1330, 1317, 1328, 1328, 1331, 1332, 1332,
-
-     1333, 1324, 1334, 1334, 1335, 1330, 1337, 1345, 1329, 1326,
-     1338, 1342, 1333, 1339, 1339, 1338, 1342, 1331, 1340, 1340,
-     1337, 1341, 1341, 1335, 1343, 1343, 1346, 1346, 1349, 1345,
-     1348, 1348, 1352, 1349, 1353, 1353, 1354, 1356, 1358, 1372,
-     1352, 1354, 1356, 1359, 1359, 1360, 1364, 1364, 1367, 1360,
-     1366, 1366, 1367, 1366, 1369, 1369, 1370, 1372, 1358, 1373,
-     1373, 1374, 1374, 1376, 1376, 1378, 1378, 1379, 1379, 1380,
-     1380, 1370, 1382, 1383, 1383, 1390, 1391, 1392, 1392, 1390,
-     1393, 1396, 1395, 1397, 1382, 1398, 1398,   13,    0, 1393,
-        0,    0,    0,    0,    0, 1396, 1391, 1395,    0,    0,
-
-        0,    0, 1397, 1401, 1401, 1401, 1401, 1401, 1401, 1401,
-     1402, 1402, 1402, 1402, 1402, 1402, 1402, 1403, 1403, 1403,
-     1403, 1403, 1403, 1403, 1404, 1404, 1404, 1404, 1404, 1404,
-     1404, 1405, 1405, 1405, 1405, 1405, 1405, 1405, 1407, 1407,
-        0, 1407, 1407, 1407, 1407, 1408, 1408,    0,    0,    0,
-     1408, 1408, 1409, 1409,    0,    0, 1409,    0, 1409, 1410,
-        0,    0,    0,    0,    0, 1410, 1411, 1411,    0,    0,
-        0, 1411, 1411, 1412,    0,    0,    0,    0,    0, 1412,
-     1413, 1413,    0, 1413, 1413, 1413, 1413, 1414, 1414,    0,
-     1414, 1414, 1414, 1414, 1400, 1400, 1400, 1400, 1400, 1400,
-
-     1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400,
-     1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400,
-     1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400, 1400,
-     1400, 1400, 1400, 1400
+     1232, 1227, 1229, 1229, 1230, 1230, 1225, 1219, 1231, 1233,
+     1233, 1237, 1228, 1231, 1236, 1232, 1234, 1234, 1239, 1236,
+     1240, 1239, 1241, 1237, 1246, 1242, 1243, 1243, 1244, 1247,
+     1249, 1241,   45, 1240, 1242, 1248, 1248, 1244, 1252, 1249,
+     1250, 1251, 1251, 1246, 1253, 1250, 1252, 1255, 1247, 1253,
+     1256, 1258, 1258, 1260, 1262, 1268, 1255, 1263, 1263, 1264,
+     1265, 1265, 1264, 1256, 1266, 1266, 1267, 1269, 1278, 1268,
+
+     1270, 1270, 1269, 1260, 1262, 1271, 1274, 1275, 1279, 1271,
+     1280, 1275, 1274, 1284, 1267, 1282, 1279, 1278, 1281, 1281,
+     1283, 1285, 1287, 1286, 1289, 1283, 1290, 1289, 1292, 1280,
+     1294, 1282, 1286, 1284, 1294, 1290, 1293, 1293, 1299, 1295,
+     1297, 1297, 1287, 1298, 1300,   40, 1292, 1285, 1295, 1303,
+     1299, 1305, 1298, 1307, 1303, 1304, 1304, 1308, 1307, 1309,
+     1305, 1310, 1311, 1313, 1309, 1314, 1308, 1312, 1312, 1300,
+     1315, 1316, 1313, 1317, 1318, 1319, 1321, 1311, 1317, 1316,
+     1310, 1314, 1320, 1320, 1325, 1322, 1324, 1324, 1327, 1315,
+     1322, 1331, 1321, 1330, 1319, 1328, 1328, 1329, 1329, 1332,
+
+     1318, 1333, 1333, 1331, 1325, 1334, 1335, 1335, 1336, 1336,
+     1327, 1337, 1330, 1339, 1347, 1340,   14, 1334,   13, 1332,
+     1340, 1341, 1341, 1342, 1342, 1343, 1343, 1339, 1344, 1361,
+     1337, 1345, 1345, 1344, 1348, 1348, 1347, 1350, 1350, 1351,
+     1354, 1355, 1355, 1363, 1351, 1356, 1358, 1363, 1354, 1361,
+     1356, 1358, 1362, 1362, 1367, 1367, 1369, 1369, 1370, 1369,
+     1372, 1372, 1370, 1373, 1375, 1376, 1376, 1377, 1377, 1379,
+     1379, 1381, 1381, 1382, 1382, 1383, 1383, 1385, 1373, 1386,
+     1386, 1393, 1375, 1394, 1396, 1393, 1395, 1395, 1399, 1385,
+     1398, 1400,    0, 1396, 1401, 1401,    0,    0,    0,    0,
+
+        0,    0, 1399, 1394,    0, 1398,    0,    0,    0,    0,
+     1400, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1405, 1405,
+     1405, 1405, 1405, 1405, 1405, 1406, 1406, 1406, 1406, 1406,
+     1406, 1406, 1407, 1407, 1407, 1407, 1407, 1407, 1407, 1408,
+     1408, 1408, 1408, 1408, 1408, 1408, 1410, 1410,    0, 1410,
+     1410, 1410, 1410, 1411, 1411,    0,    0,    0, 1411, 1411,
+     1412, 1412,    0,    0, 1412,    0, 1412, 1413,    0,    0,
+        0,    0,    0, 1413, 1414, 1414,    0,    0,    0, 1414,
+     1414, 1415,    0,    0,    0,    0,    0, 1415, 1416, 1416,
+        0, 1416, 1416, 1416, 1416, 1417, 1417,    0, 1417, 1417,
+
+     1417, 1417, 1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403,
+     1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403,
+     1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403,
+     1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403, 1403,
+     1403, 1403
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -1699,7 +1702,7 @@ static void config_end_include(void)
 #define YY_NO_INPUT 1
 #endif
 
-#line 1701 "<stdout>"
+#line 1704 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -1891,7 +1894,7 @@ YY_DECL
     
 #line 168 "./util/configlexer.lex"
 
-#line 1893 "<stdout>"
+#line 1896 "<stdout>"
 
        if ( !(yy_init) )
                {
@@ -1950,13 +1953,13 @@ yy_match:
                        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                                {
                                yy_current_state = (int) yy_def[yy_current_state];
-                               if ( yy_current_state >= 1401 )
+                               if ( yy_current_state >= 1404 )
                                        yy_c = yy_meta[(unsigned int) yy_c];
                                }
                        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
                        ++yy_cp;
                        }
-               while ( yy_base[yy_current_state] != 2795 );
+               while ( yy_base[yy_current_state] != 2803 );
 
 yy_find_action:
                yy_act = yy_accept[yy_current_state];
@@ -2802,7 +2805,7 @@ YY_RULE_SETUP
 #line 392 "./util/configlexer.lex"
 ECHO;
        YY_BREAK
-#line 2804 "<stdout>"
+#line 2807 "<stdout>"
 
        case YY_END_OF_BUFFER:
                {
@@ -3092,7 +3095,7 @@ static int yy_get_next_buffer (void)
                while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                        {
                        yy_current_state = (int) yy_def[yy_current_state];
-                       if ( yy_current_state >= 1401 )
+                       if ( yy_current_state >= 1404 )
                                yy_c = yy_meta[(unsigned int) yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -3120,11 +3123,11 @@ static int yy_get_next_buffer (void)
        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                {
                yy_current_state = (int) yy_def[yy_current_state];
-               if ( yy_current_state >= 1401 )
+               if ( yy_current_state >= 1404 )
                        yy_c = yy_meta[(unsigned int) yy_c];
                }
        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-       yy_is_jam = (yy_current_state == 1400);
+       yy_is_jam = (yy_current_state == 1403);
 
        return yy_is_jam ? 0 : yy_current_state;
 }

diff --git a/util/configlexer.lex b/util/configlexer.lex
index 388b0359fe1241395fa2c3e5eb13923fbc84af33..e1d65f2cdbe1c66fc78d81c531123a163f16c732 100644 (file)
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -243,7 +243,7 @@ do-not-query-address{COLON} { YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
 do-not-query-localhost{COLON}  { YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
 access-control{COLON}          { YDVAR(2, VAR_ACCESS_CONTROL) }
 send-client-subnet{COLON}      { YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
-client-subnet-opc{COLON}       { YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
+client-subnet-opcode{COLON}    { YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
 max-client-subnet-ipv4{COLON}  { YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
 max-client-subnet-ipv6{COLON}  { YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
 hide-identity{COLON}           { YDVAR(1, VAR_HIDE_IDENTITY) }