Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/nsd merge conflicts
details: https://anonhg.NetBSD.org/src/rev/050ac2094d68
branches: trunk
changeset: 996898:050ac2094d68
user: prlw1 <prlw1%NetBSD.org@localhost>
date: Tue Feb 12 16:11:10 2019 +0000
description:
merge conflicts
diffstat:
external/bsd/nsd/dist/configlexer.c | 1998 ++++++++++++++++++---------------
external/bsd/nsd/dist/configparser.c | 940 +++++++++------
external/bsd/nsd/dist/configparser.h | 22 +-
external/bsd/nsd/dist/server.c | 59 +-
external/bsd/nsd/dist/util.h | 10 +
external/bsd/nsd/dist/zparser.c | 1698 ++++++++++++++--------------
external/bsd/nsd/include/config.h | 30 +-
7 files changed, 2586 insertions(+), 2171 deletions(-)
diffs (truncated from 7168 to 300 lines):
diff -r 9e4a30697bd8 -r 050ac2094d68 external/bsd/nsd/dist/configlexer.c
--- a/external/bsd/nsd/dist/configlexer.c Tue Feb 12 15:49:00 2019 +0000
+++ b/external/bsd/nsd/dist/configlexer.c Tue Feb 12 16:11:10 2019 +0000
@@ -362,8 +362,8 @@
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 100
-#define YY_END_OF_BUFFER 101
+#define YY_NUM_RULES 109
+#define YY_END_OF_BUFFER 110
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -371,97 +371,109 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[808] =
+static yyconst flex_int16_t yy_accept[914] =
{ 0,
- 1, 1, 88, 88, 92, 92, 96, 96, 101, 99,
- 1, 86, 87, 2, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 100, 88, 89, 100, 90, 100, 95, 92,
- 93, 94, 100, 96, 97, 98, 100, 99, 0, 1,
- 2, 2, 2, 2, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 88, 0, 95, 0, 92, 96, 0, 99, 99,
-
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 67,
- 99, 99, 99, 99, 99, 99, 66, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 53, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 4, 99, 19, 99, 99, 99, 30, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 42, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 33, 99, 99, 99, 99, 14, 15, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 48, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 55, 99, 3, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 39, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 91, 99, 99, 99, 99, 99, 99, 99,
-
- 99, 99, 20, 99, 99, 99, 99, 99, 99, 99,
- 99, 56, 29, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 25, 99, 99, 99, 99, 99, 18, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 16, 99, 37, 99, 17, 99, 99, 99, 99,
- 99, 12, 13, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 68, 70, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 34, 99, 99, 38, 43,
-
- 99, 99, 35, 99, 54, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 6, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 31, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 22, 99, 99, 99,
- 41, 99, 99, 99, 44, 99, 99, 99, 99, 99,
- 99, 99, 9, 99, 99, 5, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 80, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 32, 99, 99, 99, 99, 99, 99,
-
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 8, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 50, 99, 47, 78, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 24, 10, 99,
- 99, 99, 99, 99, 45, 99, 99, 99, 99, 61,
- 11, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 49, 99, 99, 99, 99, 99, 99, 99,
- 99, 21, 99, 99, 99, 99, 99, 99, 36, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-
- 69, 99, 74, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 59, 99, 99, 99, 7, 27, 28, 77,
- 99, 83, 99, 84, 99, 99, 99, 99, 58, 99,
- 99, 99, 99, 99, 46, 99, 99, 99, 99, 99,
- 99, 99, 99, 57, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 62, 23, 99, 75, 76, 99,
- 99, 99, 64, 81, 82, 99, 99, 99, 26, 99,
- 99, 99, 63, 99, 99, 65, 60, 79, 99, 99,
- 99, 99, 99, 99, 99, 85, 51, 99, 99, 99,
- 99, 52, 99, 99, 99, 40, 99, 99, 99, 99,
-
- 99, 99, 71, 72, 99, 73, 0
+ 1, 1, 97, 97, 101, 101, 105, 105, 110, 108,
+ 1, 95, 96, 2, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 109, 97, 98, 109, 99, 109, 104, 101,
+ 102, 103, 109, 105, 106, 107, 109, 108, 0, 1,
+ 2, 2, 2, 2, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 97, 0, 104, 0, 101, 105, 0, 108,
+
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 67, 108, 108, 108, 108, 108, 108, 66, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 53, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 4, 108, 19, 108, 108,
+ 108, 30, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 42, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 33, 108, 108, 108, 108,
+ 108, 77, 14, 15, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 48, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 55,
+ 108, 3, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 39, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+
+ 108, 108, 108, 108, 100, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 20, 108, 108, 108, 108, 108,
+ 108, 108, 108, 56, 29, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 25, 108, 108, 108, 108, 108, 18, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 16, 108, 37, 108, 108, 108, 108,
+ 108, 108, 108, 17, 108, 108, 108, 108, 108, 12,
+ 13, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+
+ 108, 68, 70, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 34, 108, 108, 38, 43, 108, 108,
+ 35, 108, 54, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 6,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 31,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 22, 108, 108, 108, 41, 108, 108, 108, 44, 108,
+ 108, 108, 108, 108, 108, 108, 9, 108, 108, 108,
+ 108, 108, 108, 108, 108, 5, 108, 108, 108, 108,
+
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 89, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 32, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 8, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 50, 108, 47, 87, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 24, 10, 108, 108, 108, 108, 108,
+ 45, 108, 108, 108, 108, 61, 108, 108, 108, 108,
+ 108, 108, 108, 11, 108, 108, 108, 108, 108, 108,
+
+ 108, 108, 108, 108, 108, 49, 108, 108, 108, 108,
+ 108, 108, 108, 108, 21, 108, 108, 108, 108, 108,
+ 108, 36, 108, 108, 108, 108, 108, 78, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 69, 108, 74, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 59, 108, 108, 108, 108, 108, 108, 108,
+ 83, 108, 7, 27, 28, 86, 108, 92, 108, 93,
+ 108, 108, 108, 108, 58, 108, 108, 108, 108, 108,
+ 46, 108, 108, 108, 108, 108, 108, 108, 108, 82,
+
+ 108, 108, 108, 108, 57, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 62, 23, 108, 75, 76,
+ 108, 108, 108, 64, 108, 108, 108, 108, 108, 90,
+ 91, 108, 108, 108, 26, 108, 108, 108, 63, 108,
+ 108, 65, 60, 108, 108, 108, 108, 108, 88, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 79, 94, 51, 108, 108, 108, 108, 52, 108, 108,
+ 108, 81, 108, 108, 108, 40, 108, 108, 80, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 71,
+ 72, 108, 108, 108, 73, 108, 108, 108, 108, 108,
+
+ 108, 108, 108, 108, 108, 108, 108, 84, 108, 108,
+ 108, 85, 0
} ;
static yyconst YY_CHAR yy_ec[256] =
@@ -507,195 +519,219 @@
1
} ;
-static yyconst flex_uint16_t yy_base[817] =
+static yyconst flex_uint16_t yy_base[923] =
{ 0,
- 0, 0, 59, 62, 66, 70, 73, 76, 2242, 2205,
- 80, 2278, 2278, 83, 63, 79, 89, 71, 110, 96,
- 81, 117, 127, 84, 133, 152, 153, 135, 171, 151,
- 85, 160, 87, 2203, 2278, 2278, 2278, 89, 2202, 2235,
- 2278, 2278, 199, 2200, 2278, 2278, 137, 2197, 210, 143,
- 0, 214, 0, 0, 192, 164, 190, 197, 193, 185,
- 211, 188, 216, 219, 225, 250, 206, 227, 229, 246,
- 247, 249, 238, 253, 248, 263, 264, 260, 255, 286,
- 279, 254, 293, 275, 154, 289, 294, 308, 290, 297,
- 316, 2195, 227, 2194, 349, 2226, 2186, 232, 323, 324,
-
- 328, 332, 333, 330, 301, 342, 344, 355, 349, 340,
- 356, 379, 368, 370, 391, 369, 386, 376, 394, 374,
- 396, 388, 395, 400, 389, 378, 390, 410, 412, 414,
- 417, 421, 429, 433, 424, 423, 440, 427, 451, 2181,
- 459, 460, 457, 464, 456, 453, 2162, 466, 467, 472,
- 482, 485, 479, 455, 477, 487, 492, 493, 495, 499,
- 500, 510, 530, 531, 2110, 513, 520, 517, 527, 525,
- 536, 541, 542, 547, 535, 554, 543, 564, 556, 558,
- 553, 561, 578, 573, 579, 581, 584, 598, 585, 613,
- 582, 580, 604, 608, 631, 635, 612, 634, 626, 622,
-
- 648, 657, 624, 666, 647, 660, 652, 664, 672, 675,
- 683, 674, 678, 688, 692, 690, 694, 698, 702, 710,
- 715, 2109, 706, 2107, 712, 709, 716, 2074, 718, 729,
- 735, 725, 724, 748, 731, 753, 759, 741, 745, 756,
- 751, 758, 767, 760, 763, 782, 771, 786, 774, 784,
- 788, 794, 789, 2058, 802, 807, 815, 804, 825, 689,
- 824, 818, 827, 829, 801, 822, 841, 828, 851, 842,
- 853, 852, 845, 848, 864, 872, 877, 868, 882, 885,
- 886, 884, 888, 889, 896, 903, 894, 914, 926, 927,
- 913, 920, 911, 912, 917, 922, 935, 940, 941, 968,
-
- 946, 931, 943, 938, 966, 962, 959, 967, 969, 970,
- 975, 973, 986, 976, 972, 982, 1006, 1003, 992, 1000,
- 2057, 1022, 1016, 1009, 1019, 2052, 2045, 1008, 996, 1030,
- 1028, 1033, 1034, 1026, 1029, 1037, 1045, 1052, 1062, 1043,
- 1049, 1051, 1055, 1056, 1077, 1075, 1063, 2000, 1078, 1083,
- 1086, 1093, 1094, 1097, 1099, 1088, 1096, 1109, 1108, 1111,
- 1102, 1114, 1976, 1135, 1964, 1103, 1118, 1134, 1124, 1129,
- 1125, 1139, 1143, 1144, 1149, 1141, 1157, 1883, 1161, 1160,
- 1151, 1171, 1169, 1170, 1172, 1215, 1154, 1178, 1185, 1175,
- 1200, 1188, 1864, 1201, 1195, 1214, 1207, 1209, 1210, 1216,
-
- 1219, 1202, 1833, 1226, 1229, 1233, 1241, 1244, 1236, 1242,
- 1246, 1832, 1831, 1243, 1245, 1260, 1252, 1257, 1279, 1280,
- 1285, 1277, 1289, 1290, 1291, 1294, 1292, 1284, 1295, 1307,
- 1830, 1303, 1314, 1304, 1312, 1313, 1822, 1317, 1332, 1341,
- 1330, 1342, 1329, 1344, 1334, 1339, 1340, 1356, 1362, 1367,
- 1350, 1773, 1373, 1743, 1370, 1737, 1360, 1380, 1363, 1371,
- 1382, 1699, 1688, 1394, 1395, 1399, 1385, 1397, 1396, 1405,
- 1407, 1398, 1408, 1409, 1410, 1389, 1406, 1424, 1437, 1432,
- 1431, 1433, 1438, 1597, 1581, 1440, 1435, 1429, 1436, 1450,
- 1453, 1465, 1473, 1461, 1456, 1541, 1480, 1482, 1508, 1507,
-
- 1487, 1476, 1466, 1488, 1324, 1492, 1484, 1479, 1497, 1474,
- 1477, 1495, 1504, 1503, 1506, 1323, 1515, 1516, 1509, 1510,
- 1513, 1519, 1532, 1529, 1536, 1530, 1535, 1542, 1533, 1551,
- 1557, 1552, 1565, 1561, 1555, 1320, 1558, 1568, 1575, 1570,
- 1579, 1574, 1576, 1602, 1606, 1604, 1287, 1607, 1590, 1608,
- 1278, 1613, 1618, 1611, 1269, 1619, 1600, 1601, 1627, 1626,
- 1616, 1630, 1268, 1628, 1639, 1259, 1659, 1655, 1652, 1653,
- 1665, 1666, 1663, 1667, 1664, 1654, 1657, 1677, 1651, 1656,
- 1676, 1189, 1687, 1705, 1706, 1702, 1703, 1700, 1692, 1714,
- 1693, 1711, 1697, 1186, 1725, 1715, 1716, 1724, 1736, 1728,
-
- 1742, 1748, 1722, 1727, 1741, 1738, 1750, 1757, 1758, 1754,
- 1131, 1753, 1735, 1762, 1763, 1771, 1765, 1774, 1782, 1781,
- 1799, 1801, 1797, 1807, 1106, 1791, 1092, 1071, 1800, 1803,
- 1792, 1796, 1804, 1812, 1825, 1818, 1819, 1013, 1002, 1821,
- 1837, 1843, 1846, 1838, 925, 1847, 1850, 1848, 1858, 901,
- 871, 1844, 1863, 1857, 1866, 1868, 1876, 1881, 1887, 1890,
- 1878, 1897, 867, 1884, 1893, 1888, 1889, 1909, 1906, 1933,
- 1911, 862, 1917, 1912, 1921, 1927, 1937, 1922, 837, 1931,
- 1930, 1945, 1948, 1947, 1938, 1950, 1952, 1961, 1969, 1960,
- 1970, 1967, 1980, 1963, 1974, 1977, 1973, 1985, 1971, 1978,
-
- 799, 1993, 737, 2002, 2007, 1988, 1996, 2004, 2008, 2019,
- 2021, 2014, 733, 2026, 2027, 2031, 732, 682, 662, 659,
Home |
Main Index |
Thread Index |
Old Index