summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2014-01-18 16:36:56 +0000
committermichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2014-01-18 16:36:56 +0000
commit34675aaac16e0162d640380a210761d0d52a05d9 (patch)
tree1e25a631d40d4d4343052e0c9d756d205205da13
parentb19a9cfc5bd995de28946243f1a339890bdd8a22 (diff)
- Added 'unxline' oper privilege for better fine tuning
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2854 82007160-df01-0410-b94d-b575c5fd34c7
Diffstat
-rw-r--r--doc/reference.conf1
-rw-r--r--include/client.h4
-rw-r--r--modules/m_xline.c4
-rw-r--r--src/conf.c2
-rw-r--r--src/conf_parser.c2514
-rw-r--r--src/conf_parser.y6
6 files changed, 1273 insertions, 1258 deletions
diff --git a/doc/reference.conf b/doc/reference.conf
index 9edd0a8..f2b9b42 100644
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -525,6 +525,7 @@ operator {
* unkline - allows UNKLINE | ('U' flag)
* gline - allows GLINE | ('G' flag)
* xline - allows XLINE | ('X' flag)
+ * unxline - allows UNXLINE |
* locops - allows LOCOPS |
* globops - allows GLOBOPS |
* wallops - allows WALLOPS |
diff --git a/include/client.h b/include/client.h
index 92fbddc..66274c9 100644
--- a/include/client.h
+++ b/include/client.h
@@ -187,7 +187,7 @@ struct MaskItem;
#define OPER_FLAG_UNKLINE 0x00000004 /**< Oper can use unkline */
#define OPER_FLAG_GLINE 0x00000008 /**< Oper can use gline */
#define OPER_FLAG_K 0x00000010 /**< Oper can kill/kline */
-#define OPER_FLAG_X 0x00000020 /**< Oper can xline */
+#define OPER_FLAG_XLINE 0x00000020 /**< Oper can xline */
#define OPER_FLAG_DIE 0x00000040 /**< Oper can die */
#define OPER_FLAG_REHASH 0x00000080 /**< Oper can rehash */
#define OPER_FLAG_ADMIN 0x00000100 /**< Oper can set umode +a */
@@ -205,6 +205,8 @@ struct MaskItem;
#define OPER_FLAG_CONNECT_REMOTE 0x00100000 /**< Oper can do global CONNECT */
#define OPER_FLAG_WALLOPS 0x00200000 /**< Oper can do WALLOPS */
#define OPER_FLAG_LOCOPS 0x00400000 /**< Oper can do LOCOPS */
+#define OPER_FLAG_UNXLINE 0x00800000 /**< Oper can unxline */
+
#define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
#define AddOFlag(x, y) ((x)->localClient->operflags |= (y))
diff --git a/modules/m_xline.c b/modules/m_xline.c
index 45f6a73..c10eb2a 100644
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -74,7 +74,7 @@ mo_xline(struct Client *client_p, struct Client *source_p,
char *target_server = NULL;
time_t tkline_time = 0;
- if (!HasOFlag(source_p, OPER_FLAG_X))
+ if (!HasOFlag(source_p, OPER_FLAG_XLINE))
{
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name,
source_p->name, "xline");
@@ -228,7 +228,7 @@ mo_unxline(struct Client *client_p, struct Client *source_p,
char *gecos = NULL;
char *target_server = NULL;
- if (!HasOFlag(source_p, OPER_FLAG_X))
+ if (!HasOFlag(source_p, OPER_FLAG_UNXLINE))
{
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name,
source_p->name, "xline");
diff --git a/src/conf.c b/src/conf.c
index d7986e2..1f8acce 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1364,7 +1364,7 @@ static const struct oper_privs
{ OPER_FLAG_SQUIT, 'R' },
{ OPER_FLAG_SQUIT_REMOTE, 'S' },
{ OPER_FLAG_UNKLINE, 'U' },
- { OPER_FLAG_X, 'X' },
+ { OPER_FLAG_XLINE, 'X' },
{ 0, '\0' }
};
diff --git a/src/conf_parser.c b/src/conf_parser.c
index a89cd1a..851d6c0 100644
--- a/src/conf_parser.c
+++ b/src/conf_parser.c
@@ -931,16 +931,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 2
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1236
+#define YYLAST 1233
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 233
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 291
/* YYNRULES -- Number of rules. */
-#define YYNRULES 656
+#define YYNRULES 657
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 1287
+#define YYNSTATES 1288
/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
by yylex, with out-of-bounds checking. */
@@ -1017,64 +1017,64 @@ static const yytype_uint16 yyrline[] =
458, 465, 467, 467, 468, 468, 469, 469, 470, 470,
471, 471, 472, 472, 473, 473, 474, 474, 475, 475,
476, 477, 480, 481, 483, 483, 484, 490, 498, 498,
- 499, 505, 513, 555, 614, 642, 650, 665, 680, 689,
- 703, 712, 740, 770, 795, 817, 839, 848, 850, 850,
- 851, 851, 852, 852, 854, 863, 872, 885, 884, 902,
- 902, 903, 903, 903, 905, 911, 920, 921, 921, 923,
- 923, 924, 926, 933, 933, 946, 947, 949, 949, 950,
- 950, 952, 960, 963, 969, 968, 974, 974, 975, 979,
- 983, 987, 991, 995, 999, 1003, 1007, 1018, 1017, 1097,
- 1097, 1098, 1098, 1098, 1099, 1099, 1099, 1100, 1100, 1101,
- 1102, 1102, 1104, 1110, 1116, 1122, 1133, 1139, 1145, 1156,
- 1163, 1162, 1168, 1168, 1169, 1173, 1177, 1181, 1185, 1189,
- 1193, 1197, 1201, 1205, 1209, 1213, 1217, 1221, 1225, 1229,
- 1233, 1237, 1241, 1245, 1249, 1256, 1255, 1261, 1261, 1262,
- 1266, 1270, 1274, 1278, 1282, 1286, 1290, 1294, 1298, 1302,
- 1306, 1310, 1314, 1318, 1322, 1326, 1330, 1334, 1338, 1342,
- 1346, 1350, 1361, 1360, 1421, 1421, 1422, 1423, 1423, 1424,
- 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1432, 1433,
- 1434, 1435, 1436, 1438, 1444, 1450, 1456, 1462, 1468, 1474,
- 1480, 1486, 1492, 1499, 1505, 1511, 1517, 1526, 1536, 1535,
- 1541, 1541, 1542, 1546, 1557, 1556, 1563, 1562, 1567, 1567,
- 1568, 1572, 1576, 1582, 1582, 1583, 1583, 1583, 1583, 1583,
- 1585, 1585, 1587, 1587, 1589, 1603, 1623, 1629, 1639, 1638,
- 1680, 1680, 1681, 1681, 1681, 1681, 1682, 1682, 1682, 1683,
- 1683, 1685, 1691, 1697, 1703, 1715, 1714, 1720, 1720, 1721,
- 1725, 1729, 1733, 1737, 1741, 1745, 1749, 1753, 1757, 1763,
- 1777, 1786, 1800, 1799, 1814, 1814, 1815, 1815, 1815, 1815,
- 1817, 1823, 1829, 1839, 1841, 1841, 1842, 1842, 1844, 1860,
- 1859, 1884, 1884, 1885, 1885, 1885, 1885, 1887, 1893, 1913,
- 1912, 1918, 1918, 1919, 1923, 1927, 1931, 1935, 1939, 1943,
- 1947, 1951, 1955, 1965, 1964, 1985, 1985, 1986, 1986, 1986,
- 1988, 1995, 1994, 2000, 2000, 2001, 2005, 2009, 2013, 2017,
- 2021, 2025, 2029, 2033, 2037, 2047, 2046, 2118, 2118, 2119,
- 2119, 2119, 2120, 2120, 2121, 2122, 2122, 2122, 2123, 2123,
- 2123, 2124, 2124, 2125, 2127, 2133, 2139, 2145, 2158, 2171,
- 2177, 2183, 2187, 2196, 2195, 2200, 2200, 2201, 2205, 2211,
- 2222, 2228, 2234, 2240, 2256, 2255, 2281, 2281, 2282, 2282,
- 2282, 2284, 2304, 2314, 2313, 2340, 2340, 2341, 2341, 2341,
- 2343, 2349, 2358, 2360, 2360, 2361, 2361, 2363, 2381, 2380,
- 2403, 2403, 2404, 2404, 2404, 2406, 2412, 2421, 2424, 2424,
- 2425, 2425, 2426, 2426, 2427, 2427, 2428, 2428, 2429, 2429,
- 2430, 2431, 2432, 2432, 2433, 2433, 2434, 2434, 2435, 2435,
- 2436, 2437, 2437, 2438, 2438, 2439, 2439, 2440, 2440, 2441,
- 2441, 2442, 2442, 2443, 2443, 2444, 2444, 2445, 2446, 2447,
- 2447, 2448, 2448, 2449, 2450, 2451, 2452, 2452, 2453, 2454,
- 2457, 2462, 2468, 2474, 2480, 2486, 2491, 2496, 2501, 2506,
- 2511, 2516, 2521, 2526, 2531, 2536, 2541, 2546, 2551, 2557,
- 2568, 2573, 2578, 2583, 2588, 2593, 2598, 2601, 2606, 2609,
- 2614, 2619, 2624, 2629, 2634, 2639, 2644, 2649, 2654, 2659,
- 2664, 2669, 2678, 2687, 2692, 2697, 2703, 2702, 2707, 2707,
- 2708, 2711, 2714, 2717, 2720, 2723, 2726, 2729, 2732, 2735,
+ 499, 505, 513, 555, 613, 641, 649, 664, 679, 688,
+ 702, 711, 739, 769, 794, 816, 838, 847, 849, 849,
+ 850, 850, 851, 851, 853, 862, 871, 884, 883, 901,
+ 901, 902, 902, 902, 904, 910, 919, 920, 920, 922,
+ 922, 923, 925, 932, 932, 945, 946, 948, 948, 949,
+ 949, 951, 959, 962, 968, 967, 973, 973, 974, 978,
+ 982, 986, 990, 994, 998, 1002, 1006, 1017, 1016, 1096,
+ 1096, 1097, 1097, 1097, 1098, 1098, 1098, 1099, 1099, 1100,
+ 1101, 1101, 1103, 1109, 1115, 1121, 1132, 1138, 1144, 1155,
+ 1162, 1161, 1167, 1167, 1168, 1172, 1176, 1180, 1184, 1188,
+ 1192, 1196, 1200, 1204, 1208, 1212, 1216, 1220, 1224, 1228,
+ 1232, 1236, 1240, 1244, 1248, 1255, 1254, 1260, 1260, 1261,
+ 1265, 1269, 1273, 1277, 1281, 1285, 1289, 1293, 1297, 1301,
+ 1305, 1309, 1313, 1317, 1321, 1325, 1329, 1333, 1337, 1341,
+ 1345, 1349, 1353, 1364, 1363, 1424, 1424, 1425, 1426, 1426,
+ 1427, 1428, 1429, 1430, 1431, 1432, 1433, 1434, 1435, 1435,
+ 1436, 1437, 1438, 1439, 1441, 1447, 1453, 1459, 1465, 1471,
+ 1477, 1483, 1489, 1495, 1502, 1508, 1514, 1520, 1529, 1539,
+ 1538, 1544, 1544, 1545, 1549, 1560, 1559, 1566, 1565, 1570,
+ 1570, 1571, 1575, 1579, 1585, 1585, 1586, 1586, 1586, 1586,
+ 1586, 1588, 1588, 1590, 1590, 1592, 1606, 1626, 1632, 1642,
+ 1641, 1683, 1683, 1684, 1684, 1684, 1684, 1685, 1685, 1685,
+ 1686, 1686, 1688, 1694, 1700, 1706, 1718, 1717, 1723, 1723,
+ 1724, 1728, 1732, 1736, 1740, 1744, 1748, 1752, 1756, 1760,
+ 1766, 1780, 1789, 1803, 1802, 1817, 1817, 1818, 1818, 1818,
+ 1818, 1820, 1826, 1832, 1842, 1844, 1844, 1845, 1845, 1847,
+ 1863, 1862, 1887, 1887, 1888, 1888, 1888, 1888, 1890, 1896,
+ 1916, 1915, 1921, 1921, 1922, 1926, 1930, 1934, 1938, 1942,
+ 1946, 1950, 1954, 1958, 1968, 1967, 1988, 1988, 1989, 1989,
+ 1989, 1991, 1998, 1997, 2003, 2003, 2004, 2008, 2012, 2016,
+ 2020, 2024, 2028, 2032, 2036, 2040, 2050, 2049, 2121, 2121,
+ 2122, 2122, 2122, 2123, 2123, 2124, 2125, 2125, 2125, 2126,
+ 2126, 2126, 2127, 2127, 2128, 2130, 2136, 2142, 2148, 2161,
+ 2174, 2180, 2186, 2190, 2199, 2198, 2203, 2203, 2204, 2208,
+ 2214, 2225, 2231, 2237, 2243, 2259, 2258, 2284, 2284, 2285,
+ 2285, 2285, 2287, 2307, 2317, 2316, 2343, 2343, 2344, 2344,
+ 2344, 2346, 2352, 2361, 2363, 2363, 2364, 2364, 2366, 2384,
+ 2383, 2406, 2406, 2407, 2407, 2407, 2409, 2415, 2424, 2427,
+ 2427, 2428, 2428, 2429, 2429, 2430, 2430, 2431, 2431, 2432,
+ 2432, 2433, 2434, 2435, 2435, 2436, 2436, 2437, 2437, 2438,
+ 2438, 2439, 2440, 2440, 2441, 2441, 2442, 2442, 2443, 2443,
+ 2444, 2444, 2445, 2445, 2446, 2446, 2447, 2447, 2448, 2449,
+ 2450, 2450, 2451, 2451, 2452, 2453, 2454, 2455, 2455, 2456,
+ 2457, 2460, 2465, 2471, 2477, 2483, 2489, 2494, 2499, 2504,
+ 2509, 2514, 2519, 2524, 2529, 2534, 2539, 2544, 2549, 2554,
+ 2560, 2571, 2576, 2581, 2586, 2591, 2596, 2601, 2604, 2609,
+ 2612, 2617, 2622, 2627, 2632, 2637, 2642, 2647, 2652, 2657,
+ 2662, 2667, 2672, 2681, 2690, 2695, 2700, 2706, 2705, 2710,
+ 2710, 2711, 2714, 2717, 2720, 2723, 2726, 2729, 2732, 2735,
2738, 2741, 2744, 2747, 2750, 2753, 2756, 2759, 2762, 2765,
- 2768, 2774, 2773, 2778, 2778, 2779, 2782, 2785, 2788, 2791,
+ 2768, 2771, 2777, 2776, 2781, 2781, 2782, 2785, 2788, 2791,
2794, 2797, 2800, 2803, 2806, 2809, 2812, 2815, 2818, 2821,
- 2824, 2827, 2830, 2833, 2836, 2839, 2844, 2849, 2854, 2863,
- 2866, 2866, 2867, 2868, 2868, 2869, 2869, 2870, 2871, 2872,
- 2873, 2874, 2874, 2875, 2875, 2877, 2882, 2887, 2892, 2897,
- 2902, 2907, 2912, 2917, 2922, 2927, 2932, 2940, 2943, 2943,
- 2944, 2944, 2945, 2946, 2947, 2948, 2948, 2949, 2950, 2952,
- 2958, 2964, 2970, 2976, 2985, 2999, 3005
+ 2824, 2827, 2830, 2833, 2836, 2839, 2842, 2847, 2852, 2857,
+ 2866, 2869, 2869, 2870, 2871, 2871, 2872, 2872, 2873, 2874,
+ 2875, 2876, 2877, 2877, 2878, 2878, 2880, 2885, 2890, 2895,
+ 2900, 2905, 2910, 2915, 2920, 2925, 2930, 2935, 2943, 2946,
+ 2946, 2947, 2947, 2948, 2949, 2950, 2951, 2951, 2952, 2953,
+ 2955, 2961, 2967, 2973, 2979, 2988, 3002, 3008
};
#endif
@@ -1274,17 +1274,17 @@ static const yytype_uint16 yytoknum[] =
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- -755, 716, -755, -198, -223, -208, -755, -755, -755, -186,
+ -755, 717, -755, -198, -223, -208, -755, -755, -755, -186,
-755, -184, -755, -755, -755, -179, -755, -755, -755, -168,
-154, -755, -146, -123, -755, -755, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, 282,
- 923, -84, -59, -46, 130, -45, 414, -39, -26, -19,
+ 963, -84, -59, -46, 130, -45, 414, -39, -26, -19,
79, -18, -11, 21, 503, 408, 40, 39, 53, 41,
-14, -1, 64, 66, 7, -755, -755, -755, -755, -755,
81, 82, 96, 100, 102, 104, 105, 117, 119, 121,
127, 128, 13, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, -755, -755, -755, -755, 706, 577, 61, -755,
+ -755, -755, -755, -755, -755, -755, 723, 577, 61, -755,
131, 10, -755, -755, 36, -755, 132, 133, 135, 139,
141, 142, 143, 144, 146, 148, 151, 153, 157, 158,
160, 162, 164, 165, 166, 168, 170, 180, 182, 183,
@@ -1306,61 +1306,61 @@ static const yytype_int16 yypact[] =
-755, -755, 155, -755, 313, 23, -755, -755, 62, -755,
215, 352, 365, 270, -755, 252, 436, 335, 438, 440,
440, 440, 443, 451, 454, 355, 356, 340, -755, 347,
- 346, 351, 354, -755, 357, 359, 360, 362, 366, 367,
+ 346, 351, 354, -755, 357, 358, 360, 362, 366, 367,
368, 369, 370, 372, 373, 377, 258, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, -755, -755, 358, 378, 381, 382, 383, 384,
- 385, -755, 386, 387, 388, 390, 391, 392, 393, 326,
+ -755, -755, -755, -755, 381, 382, 383, 384, 385, 386,
+ 387, -755, 388, 390, 391, 392, 393, 394, 397, 326,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, -755, -755, -755, -755, 394, 397, 69, -755,
- -755, -755, 460, 409, -755, -755, 407, 411, 48, -755,
- -755, -755, 428, 440, 440, 432, 487, 433, 537, 523,
- 437, 440, 439, 540, 543, 440, 545, 445, 446, 447,
- 440, 550, 551, 440, 552, 553, 554, 555, 455, 441,
- 456, 442, 457, 440, 440, 458, 459, 464, 58, 95,
- 466, 467, 468, 547, 440, 469, 471, 440, 440, 472,
- 473, 461, -755, 462, 463, 465, -755, 474, 476, 480,
- 481, 482, 163, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, -755, 484, 485, 50, -755, -755, -755, 475,
- 488, 493, -755, 494, -755, 25, -755, -755, -755, -755,
- -755, 561, 562, 499, -755, 502, 501, 505, 18, -755,
- -755, -755, 509, 507, 508, -755, 511, 512, 514, 515,
- 516, -755, 518, 14, -755, -755, -755, -755, -755, -755,
- -755, -755, -755, -755, -755, 522, 526, 527, 528, 11,
- -755, -755, -755, -755, 477, 529, 549, 563, 556, 557,
- 560, 440, 533, -755, -755, 567, 564, 569, 586, 595,
- 630, 638, 639, 641, 642, 648, 664, 652, -99, -42,
- 653, 654, 558, -755, 559, 566, -755, 73, -755, -755,
- -755, -755, 570, 574, -755, 568, 656, 575, -755, 576,
- 579, -755, 580, 27, -755, -755, -755, -755, 578, 584,
- 587, -755, 590, 591, 592, 593, 267, 597, 605, 607,
- 615, 617, 618, 619, 623, -755, -755, 673, 674, 440,
- 625, 676, 685, 440, 698, 699, 440, 734, 751, 755,
- 440, 762, 762, 646, -755, -755, 752, 129, 754, 668,
- 758, 764, 655, 766, 767, 784, 771, 775, 776, 777,
- 677, -755, 778, 780, 686, -755, 689, -755, 797, 798,
- 696, -755, 701, 704, 705, 708, 709, 710, 714, 715,
- 717, 722, 723, 725, 728, 729, 730, 731, 732, 733,
- 735, 737, 738, 739, 740, 741, 742, 743, 744, 660,
- 745, 703, 747, 748, 749, 750, 753, 756, 757, 759,
- 760, 769, 770, 772, 773, 781, 782, 783, 785, 788,
- 789, 790, 791, -755, -755, 807, 763, 713, 810, 853,
- 855, 856, 858, 792, -755, 859, 862, 793, -755, -755,
- 868, 875, 774, 897, 794, -755, 795, 796, -755, -755,
- 884, 888, 799, -755, -755, 891, 814, 800, 902, 906,
- 908, 909, 823, 804, 912, 809, -755, -755, 914, 915,
- 916, 813, -755, 815, 816, 817, 818, 819, 820, 821,
- 822, -755, 824, 825, 826, 827, 828, 829, 830, 831,
- 832, 833, 834, 835, 836, -755, -755, -209, -755, -755,
- -755, -189, -755, 837, 838, -755, -755, 918, 839, 840,
- -755, 841, -755, 26, 843, -755, -755, 927, 842, 943,
- 844, -755, -755, -755, -755, -755, -755, -755, -755, 440,
+ -755, -755, -755, -755, -755, -755, 406, 407, 69, -755,
+ -755, -755, 460, 411, -755, -755, 412, 413, 48, -755,
+ -755, -755, 375, 440, 440, 401, 487, 431, 537, 523,
+ 437, 440, 439, 540, 543, 440, 547, 446, 447, 448,
+ 440, 551, 552, 440, 553, 554, 555, 557, 456, 441,
+ 457, 442, 458, 440, 440, 459, 464, 466, 58, 95,
+ 467, 468, 469, 558, 440, 472, 473, 440, 440, 474,
+ 475, 461, -755, 462, 463, 465, -755, 471, 476, 477,
+ 479, 480, 163, -755, -755, -755, -755, -755, -755, -755,
+ -755, -755, -755, 481, 482, 50, -755, -755, -755, 489,
+ 484, 490, -755, 492, -755, 25, -755, -755, -755, -755,
+ -755, 563, 564, 496, -755, 498, 499, 506, 18, -755,
+ -755, -755, 510, 515, 516, -755, 518, 519, 527, 528,
+ 529, -755, 531, 14, -755, -755, -755, -755, -755, -755,
+ -755, -755, -755, -755, -755, 513, 532, 533, 534, 11,
+ -755, -755, -755, -755, 493, 494, 544, 567, 556, 559,
+ 560, 440, 526, -755, -755, 569, 561, 571, 562, 594,
+ 603, 642, 644, 649, 651, 652, 668, 654, -99, -42,
+ 655, 657, 566, -755, 568, 572, -755, 73, -755, -755,
+ -755, -755, 573, 570, -755, 565, 658, 574, -755, 581,
+ 579, -755, 582, 27, -755, -755, -755, -755, 589, 590,
+ 591, -755, 592, 593, 595, 596, 267, 597, 598, 599,
+ 600, 601, 602, 607, 608, -755, -755, 674, 677, 440,
+ 606, 680, 683, 440, 690, 691, 440, 707, 729, 732,
+ 440, 733, 733, 615, -755, -755, 720, 129, 728, 646,
+ 731, 735, 629, 745, 746, 762, 748, 750, 751, 752,
+ 653, -755, 756, 759, 656, -755, 660, -755, 761, 765,
+ 662, -755, 663, 665, 666, 669, 670, 671, 672, 675,
+ 679, 687, 692, 694, 695, 697, 698, 704, 705, 706,
+ 710, 711, 715, 716, 719, 721, 730, 738, 740, 684,
+ 741, 747, 749, 753, 754, 760, 763, 766, 767, 771,
+ 772, 773, 774, 775, 776, 777, 778, 779, 780, 781,
+ 782, 783, 784, -755, -755, 788, 685, 714, 794, 793,
+ 811, 824, 827, 785, -755, 837, 839, 786, -755, -755,
+ 854, 856, 787, 796, 789, -755, 791, 792, -755, -755,
+ 866, 873, 795, -755, -755, 891, 805, 797, 897, 898,
+ 900, 901, 815, 800, 903, 804, -755, -755, 909, 910,
+ 913, 810, -755, 812, 813, 817, 818, 819, 820, 821,
+ 822, -755, 823, 825, 826, 828, 829, 830, 831, 832,
+ 833, 834, 835, 836, 838, -755, -755, -209, -755, -755,
+ -755, -189, -755, 842, 843, -755, -755, 915, 841, 845,
+ -755, 846, -755, 26, 847, -755, -755, 928, 848, 931,
+ 849, -755, -755, -755, -755, -755, -755, -755, -755, 440,
440, 440, 440, 440, 440, 440, -755, -755, -755, -755,
- -755, -755, -755, -755, -755, -755, 846, 847, 848, -34,
- 849, 850, 851, 852, 854, 857, 860, 861, 863, 864,
- 289, 865, 866, -755, 867, 869, 870, 871, 872, 873,
- 874, 5, 876, 877, 878, 879, 880, 881, 882, -755,
- 883, 885, -755, -755, 886, 887, -755, -755, -755, -755,
+ -755, -755, -755, -755, -755, -755, 850, 852, 853, -34,
+ 855, 857, 858, 859, 860, 861, 862, 863, 864, 865,
+ 289, 867, 868, -755, 869, 870, 871, 872, 874, 875,
+ 876, 5, 877, 878, 879, 880, 881, 882, 883, -755,
+ 884, 885, -755, -755, 886, 887, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
@@ -1370,39 +1370,39 @@ static const yytype_int16 yypact[] =
-755, -755, -755, -755, -755, -755, -755, -755, -755, -172,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, 889, 890, 245, 892, 893, 894, 895, 896,
- -755, 898, 899, -755, 900, 901, -16, 907, 903, -755,
- -755, -755, -755, 904, 905, -755, 910, 911, 524, 913,
- 917, 919, 920, 921, 746, 922, -755, 924, 925, 926,
+ -755, -755, 888, 889, 245, 890, 892, 893, 894, 895,
+ -755, 896, 899, -755, 902, 904, -16, 907, 844, -755,
+ -755, -755, -755, 905, 906, -755, 908, 911, 524, 912,
+ 914, 916, 917, 918, 790, 919, -755, 920, 921, 922,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, -755, -99, -755, -42, -755, -755, 928, 632,
- -755, -755, 929, 930, 931, -755, 57, -755, -755, -755,
- -755, -755, 932, 787, 935, -755, -755, -755, -755, -755,
+ -755, -755, -755, -99, -755, -42, -755, -755, 923, 584,
+ -755, -755, 924, 851, 925, -755, 57, -755, -755, -755,
+ -755, -755, 926, 769, 927, -755, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -171, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- 762, 762, 762, -755, -755, -755, -755, -755, -755, -755,
+ 733, 733, 733, -755, -755, -755, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -155, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- 660, -755, 703, -755, -755, -755, -755, -755, -755, -755,
+ 684, -755, 747, -755, -755, -755, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -50, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -49,
- -755, 972, 897, 936, -755, -755, -755, -755, -755, 933,
- -755, -755, 934, -755, -755, -755, -755, 937, -755, -755,
- -755, -755, -755, -755, -755, -755, -755, -755, -23, -755,
+ -755, 956, 796, 929, -755, -755, -755, -755, -755, 930,
+ -755, -755, 932, -755, -755, -755, -755, 933, -755, -755,
+ -755, -755, -755, -755, -755, -755, -755, -755, -755, -23,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, -755, -755, -755, -755, -15, -755, -755, -755,
+ -755, -755, -755, -755, -755, -755, -755, -15, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, -755, -755, -755, 0, -755, -755, 959, -101,
- 938, 940, -755, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, -755, -755, 30, -755, -755, -755, -34, -755,
- -755, -755, -755, 5, -755, -755, -755, 245, -755, -16,
- -755, -755, -755, 954, 956, 957, -755, 524, -755, 746,
- -755, 632, 944, 945, 946, 297, -755, -755, 787, -755,
+ -755, -755, -755, -755, -755, -755, 0, -755, -755, 943,
+ -101, 936, 934, -755, -755, -755, -755, -755, -755, -755,
+ -755, -755, -755, -755, -755, 30, -755, -755, -755, -34,
+ -755, -755, -755, -755, 5, -755, -755, -755, 245, -755,
+ -16, -755, -755, -755, 954, 964, 971, -755, 524, -755,
+ 790, -755, 584, 940, 941, 942, 297, -755, -755, 769,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- -755, 55, -755, -755, -755, 297, -755
+ -755, -755, 55, -755, -755, -755, 297, -755
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1410,169 +1410,169 @@ static const yytype_int16 yypact[] =
means the default is an error. */
static const yytype_uint16 yydefact[] =
{
- 2, 0, 1, 0, 0, 0, 222, 385, 433, 0,
- 448, 0, 288, 424, 264, 0, 107, 147, 322, 0,
- 0, 363, 0, 0, 339, 3, 23, 11, 4, 24,
+ 2, 0, 1, 0, 0, 0, 223, 386, 434, 0,
+ 449, 0, 289, 425, 265, 0, 107, 147, 323, 0,
+ 0, 364, 0, 0, 340, 3, 23, 11, 4, 24,
5, 6, 8, 9, 10, 13, 14, 15, 16, 17,
18, 19, 20, 22, 21, 7, 12, 25, 26, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 99, 100, 102, 101, 624,
+ 0, 0, 0, 0, 0, 99, 100, 102, 101, 625,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 611, 623, 613, 614, 615, 616, 612,
- 617, 618, 619, 620, 621, 622, 0, 0, 0, 446,
- 0, 0, 444, 445, 0, 509, 0, 0, 0, 0,
+ 0, 0, 0, 612, 624, 614, 615, 616, 617, 613,
+ 618, 619, 620, 621, 622, 623, 0, 0, 0, 447,
+ 0, 0, 445, 446, 0, 510, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 581, 0, 556, 0, 0, 0, 0,
+ 0, 0, 0, 582, 0, 557, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 459, 506, 508, 500,
- 501, 502, 503, 504, 499, 470, 460, 461, 462, 463,
- 464, 465, 466, 467, 468, 469, 496, 471, 472, 505,
- 474, 479, 480, 475, 477, 476, 490, 491, 478, 481,
- 482, 483, 484, 473, 486, 487, 488, 507, 497, 498,
- 495, 489, 485, 493, 494, 492, 0, 0, 0, 0,
- 0, 0, 0, 45, 46, 47, 0, 0, 0, 648,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 639,
- 640, 641, 642, 643, 646, 644, 645, 647, 0, 0,
+ 0, 0, 0, 0, 0, 0, 460, 507, 509, 501,
+ 502, 503, 504, 505, 500, 471, 461, 462, 463, 464,
+ 465, 466, 467, 468, 469, 470, 497, 472, 473, 506,
+ 475, 480, 481, 476, 478, 477, 491, 492, 479, 482,
+ 483, 484, 485, 474, 487, 488, 489, 508, 498, 499,
+ 496, 490, 486, 494, 495, 493, 0, 0, 0, 0,
+ 0, 0, 0, 45, 46, 47, 0, 0, 0, 649,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 640,
+ 641, 642, 643, 644, 647, 645, 646, 648, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 53, 68, 69,
67, 64, 63, 70, 54, 66, 57, 58, 59, 55,
65, 60, 61, 62, 56, 0, 0, 0, 0, 118,
- 119, 120, 0, 337, 0, 0, 335, 336, 0, 103,
+ 119, 120, 0, 338, 0, 0, 336, 337, 0, 103,
0, 0, 0, 0, 98, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 610, 0,
- 0, 0, 0, 258, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 225, 226, 229,
- 231, 232, 233, 234, 235, 236, 237, 238, 227, 228,
- 230, 239, 240, 241, 0, 0, 0, 0, 0, 0,
- 0, 413, 0, 0, 0, 0, 0, 0, 0, 0,
- 388, 389, 390, 391, 392, 393, 394, 396, 395, 398,
- 402, 399, 400, 401, 397, 439, 0, 0, 0, 436,
- 437, 438, 0, 0, 443, 454, 0, 0, 0, 451,
- 452, 453, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 611, 0,
+ 0, 0, 0, 259, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 226, 227, 230,
+ 232, 233, 234, 235, 236, 237, 238, 239, 228, 229,
+ 231, 240, 241, 242, 0, 0, 0, 0, 0, 0,
+ 0, 414, 0, 0, 0, 0, 0, 0, 0, 0,
+ 389, 390, 391, 392, 393, 394, 395, 397, 396, 399,
+ 403, 400, 401, 402, 398, 440, 0, 0, 0, 437,
+ 438, 439, 0, 0, 444, 455, 0, 0, 0, 452,
+ 453, 454, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 458, 0, 0, 0, 305, 0, 0, 0,
- 0, 0, 0, 291, 292, 293, 294, 299, 295, 296,
- 297, 298, 430, 0, 0, 0, 427, 428, 429, 0,
- 0, 0, 266, 0, 276, 0, 274, 275, 277, 278,
+ 0, 0, 459, 0, 0, 0, 306, 0, 0, 0,
+ 0, 0, 0, 292, 293, 294, 295, 300, 296, 297,
+ 298, 299, 431, 0, 0, 0, 428, 429, 430, 0,
+ 0, 0, 267, 0, 277, 0, 275, 276, 278, 279,
48, 0, 0, 0, 44, 0, 0, 0, 0, 110,
111, 112, 0, 0, 0, 195, 0, 0, 0, 0,
0, 170, 0, 0, 150, 151, 152, 153, 156, 157,
158, 159, 155, 154, 160, 0, 0, 0, 0, 0,
- 325, 326, 327, 328, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 638, 71, 0, 0, 0, 0, 0,
+ 326, 327, 328, 329, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 639, 71, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 52, 0, 0, 371, 0, 366, 367,
- 368, 121, 0, 0, 117, 0, 0, 0, 334, 0,
- 0, 349, 0, 0, 342, 343, 344, 345, 0, 0,
+ 0, 0, 0, 52, 0, 0, 372, 0, 367, 368,
+ 369, 121, 0, 0, 117, 0, 0, 0, 335, 0,
+ 0, 350, 0, 0, 343, 344, 345, 346, 0, 0,
0, 97, 0, 0, 0, 0, 27, 0, 0, 0,
- 0, 0, 0, 0, 0, 609, 242, 0, 0, 0,
+ 0, 0, 0, 0, 0, 610, 243, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 224, 403, 0, 0, 0, 0,
+ 0, 0, 0, 0, 225, 404, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 387, 0, 0, 0, 435, 0, 442, 0, 0,
- 0, 450, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 388, 0, 0, 0, 436, 0, 443, 0, 0,
+ 0, 451, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 457, 300, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 290, 0, 0, 0, 426, 279,
- 0, 0, 0, 0, 0, 273, 0, 0, 43, 113,
+ 0, 0, 0, 458, 301, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 291, 0, 0, 0, 427, 280,
+ 0, 0, 0, 0, 0, 274, 0, 0, 43, 113,
0, 0, 0, 109, 161, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 149, 329, 0, 0,
- 0, 0, 324, 0, 0, 0, 0, 0, 0, 0,
- 0, 637, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 149, 330, 0, 0,
+ 0, 0, 325, 0, 0, 0, 0, 0, 0, 0,
+ 0, 638, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 76, 77, 0, 75, 80,
- 81, 0, 79, 0, 0, 51, 369, 0, 0, 0,
- 365, 0, 116, 0, 0, 333, 346, 0, 0, 0,
- 0, 341, 106, 105, 104, 632, 631, 625, 635, 27,
- 27, 27, 27, 27, 27, 27, 29, 28, 636, 626,
- 627, 630, 629, 628, 633, 634, 0, 0, 0, 0,
+ 81, 0, 79, 0, 0, 51, 370, 0, 0, 0,
+ 366, 0, 116, 0, 0, 334, 347, 0, 0, 0,
+ 0, 342, 106, 105, 104, 633, 632, 626, 636, 27,
+ 27, 27, 27, 27, 27, 27, 29, 28, 637, 627,
+ 628, 631, 630, 629, 634, 635, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 37, 0, 0, 223, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 386,
- 0, 0, 434, 447, 0, 0, 449, 522, 526, 541,
- 511, 608, 554, 548, 551, 521, 513, 512, 515, 516,
- 514, 529, 519, 520, 530, 518, 525, 524, 523, 549,
- 510, 606, 607, 545, 591, 585, 602, 586, 587, 588,
- 596, 605, 589, 599, 603, 592, 604, 597, 593, 598,
- 590, 601, 595, 594, 600, 0, 584, 547, 565, 560,
- 577, 561, 562, 563, 571, 580, 564, 574, 578, 567,
- 579, 572, 568, 573, 566, 576, 570, 569, 575, 0,
- 559, 542, 540, 543, 553, 544, 532, 538, 539, 536,
- 537, 533, 534, 535, 552, 555, 517, 546, 528, 527,
- 550, 531, 0, 0, 0, 0, 0, 0, 0, 0,
- 289, 0, 0, 425, 0, 0, 0, 284, 280, 283,
- 265, 49, 50, 0, 0, 108, 0, 0, 0, 0,
+ 37, 0, 0, 224, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 387,
+ 0, 0, 435, 448, 0, 0, 450, 523, 527, 542,
+ 512, 609, 555, 549, 552, 522, 514, 513, 516, 517,
+ 515, 530, 520, 521, 531, 519, 526, 525, 524, 550,
+ 511, 607, 608, 546, 592, 586, 603, 587, 588, 589,
+ 597, 606, 590, 600, 604, 593, 605, 598, 594, 599,
+ 591, 602, 596, 595, 601, 0, 585, 548, 566, 561,
+ 578, 562, 563, 564, 572, 581, 565, 575, 579, 568,
+ 580, 573, 569, 574, 567, 577, 571, 570, 576, 0,
+ 560, 543, 541, 544, 554, 545, 533, 539, 540, 537,
+ 538, 534, 535, 536, 553, 556, 518, 547, 529, 528,
+ 551, 532, 0, 0, 0, 0, 0, 0, 0, 0,
+ 290, 0, 0, 426, 0, 0, 0, 285, 281, 284,
+ 266, 49, 50, 0, 0, 108, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 148, 0, 0, 0,
- 323, 650, 649, 655, 653, 656, 651, 652, 654, 88,
+ 324, 651, 650, 656, 654, 657, 652, 653, 655, 88,
96, 87, 94, 95, 86, 90, 89, 83, 82, 84,
93, 85, 72, 0, 73, 0, 91, 92, 0, 0,
- 364, 122, 0, 0, 0, 134, 0, 126, 127, 129,
- 128, 338, 0, 0, 0, 340, 30, 31, 32, 33,
- 34, 35, 36, 253, 254, 246, 263, 262, 0, 261,
- 248, 250, 257, 249, 247, 256, 243, 255, 245, 244,
- 37, 37, 37, 39, 38, 251, 252, 408, 411, 412,
- 422, 419, 405, 420, 417, 418, 0, 416, 421, 404,
- 410, 407, 409, 423, 406, 440, 441, 455, 456, 582,
- 0, 557, 0, 303, 304, 313, 310, 315, 311, 312,
- 318, 314, 316, 309, 317, 0, 308, 302, 321, 320,
- 319, 301, 432, 431, 287, 286, 271, 272, 270, 0,
- 269, 0, 0, 0, 114, 115, 169, 165, 214, 202,
- 211, 210, 200, 205, 221, 213, 219, 204, 207, 216,
- 218, 215, 212, 220, 208, 217, 206, 209, 0, 198,
- 162, 164, 166, 167, 168, 179, 174, 191, 175, 176,
- 177, 185, 194, 178, 188, 192, 181, 193, 186, 182,
- 187, 180, 190, 184, 183, 189, 0, 173, 163, 332,
- 330, 331, 74, 78, 370, 375, 381, 384, 377, 383,
- 378, 382, 380, 376, 379, 0, 374, 130, 0, 0,
- 0, 0, 125, 347, 353, 359, 362, 355, 361, 356,
- 360, 358, 354, 357, 0, 352, 348, 259, 0, 40,
- 41, 42, 414, 0, 583, 558, 306, 0, 267, 0,
- 285, 282, 281, 0, 0, 0, 196, 0, 171, 0,
- 372, 0, 0, 0, 0, 0, 124, 350, 0, 260,
- 415, 307, 268, 201, 199, 203, 197, 172, 373, 131,
- 133, 132, 140, 145, 144, 139, 142, 146, 143, 138,
- 141, 0, 137, 351, 135, 0, 136
+ 365, 122, 0, 0, 0, 134, 0, 126, 127, 129,
+ 128, 339, 0, 0, 0, 341, 30, 31, 32, 33,
+ 34, 35, 36, 254, 255, 247, 264, 263, 0, 262,
+ 249, 251, 258, 250, 248, 257, 244, 256, 246, 245,
+ 37, 37, 37, 39, 38, 252, 253, 409, 412, 413,
+ 423, 420, 406, 421, 418, 419, 0, 417, 422, 405,
+ 411, 408, 410, 424, 407, 441, 442, 456, 457, 583,
+ 0, 558, 0, 304, 305, 314, 311, 316, 312, 313,
+ 319, 315, 317, 310, 318, 0, 309, 303, 322, 321,
+ 320, 302, 433, 432, 288, 287, 272, 273, 271, 0,
+ 270, 0, 0, 0, 114, 115, 169, 165, 215, 202,
+ 212, 211, 200, 205, 222, 214, 220, 204, 207, 217,
+ 219, 216, 213, 221, 208, 210, 218, 206, 209, 0,
+ 198, 162, 164, 166, 167, 168, 179, 174, 191, 175,
+ 176, 177, 185, 194, 178, 188, 192, 181, 193, 186,
+ 182, 187, 180, 190, 184, 183, 189, 0, 173, 163,
+ 333, 331, 332, 74, 78, 371, 376, 382, 385, 378,
+ 384, 379, 383, 381, 377, 380, 0, 375, 130, 0,
+ 0, 0, 0, 125, 348, 354, 360, 363, 356, 362,
+ 357, 361, 359, 355, 358, 0, 353, 349, 260, 0,
+ 40, 41, 42, 415, 0, 584, 559, 307, 0, 268,
+ 0, 286, 283, 282, 0, 0, 0, 196, 0, 171,
+ 0, 373, 0, 0, 0, 0, 0, 124, 351, 0,
+ 261, 416, 308, 269, 201, 199, 203, 197, 172, 374,
+ 131, 133, 132, 140, 145, 144, 139, 142, 146, 143,
+ 138, 141, 0, 137, 352, 135, 0, 136
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -755, -755, -755, -298, -307, -754, -621, -755, -755, 942,
- -755, -755, -755, -755, 845, -755, -755, -755, 72, -755,
- 77, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, -755, -755, -755, -755, -755, -755, 1015, -755,
- -755, -755, -755, -755, -755, 620, -755, -755, -755, -755,
- 939, -755, -755, -755, -755, 93, -755, -755, -755, -755,
- -755, -170, -755, -755, -755, 622, -755, -755, -755, -755,
- -755, -755, -755, -755, -755, -755, -755, -119, -755, -755,
- -755, -114, -755, -755, -755, 803, -755, -755, -755, -755,
+ -755, -755, -755, -298, -307, -754, -621, -755, -755, 935,
+ -755, -755, -755, -755, 619, -755, -755, -755, 107, -755,
+ 93, -755, -755, -755, -755, -755, -755, -755, -755, -755,
+ -755, -755, -755, -755, -755, -755, -755, -755, 1051, -755,
+ -755, -755, -755, -755, -755, 630, -755, -755, -755, -755,
+ 937, -755, -755, -755, -755, 91, -755, -755, -755, -755,
+ -755, -152, -755, -755, -755, 623, -755, -755, -755, -755,
+ -755, -755, -755, -755, -755, -755, -755, -113, -755, -755,
+ -755, -108, -755, -755, -755, 806, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, -755, -755, -92, -755, -755, -755, -755, -755,
- -98, -755, 657, -755, -755, -755, 38, -755, -755, -755,
- -755, -755, 681, -755, -755, -755, -755, -755, -755, -755,
- -87, -755, -755, -755, -755, -755, -755, 616, -755, -755,
- -755, -755, -755, 941, -755, -755, -755, -755, 571, -755,
- -755, -755, -755, -755, -100, -755, -755, -755, 608, -755,
- -755, -755, -755, -94, -755, -755, -755, 805, -755, -755,
- -755, -755, -755, -755, -755, -755, -755, -755, -755, -57,
- -755, -755, -755, -755, -755, -755, -755, -755, 702, -755,
- -755, -755, -755, -755, 801, -755, -755, -755, -755, 1067,
- -755, -755, -755, -755, 786, -755, -755, -755, -755, 1014,
+ -755, -755, -755, -755, -77, -755, -755, -755, -755, -755,
+ -82, -755, 678, -755, -755, -755, 28, -755, -755, -755,
+ -755, -755, 708, -755, -755, -755, -755, -755, -755, -755,
+ -79, -755, -755, -755, -755, -755, -755, 643, -755, -755,
+ -755, -755, -755, 938, -755, -755, -755, -755, 588, -755,
+ -755, -755, -755, -755, -86, -755, -755, -755, 609, -755,
+ -755, -755, -755, -78, -755, -755, -755, 808, -755, -755,
+ -755, -755, -755, -755, -755, -755, -755, -755, -755, -56,
+ -755, -755, -755, -755, -755, -755, -755, -755, 700, -755,
+ -755, -755, -755, -755, 798, -755, -755, -755, -755, 1068,
+ -755, -755, -755, -755, 799, -755, -755, -755, -755, 1015,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, -755, -755, -755, -755, -755, 78, -755, -755,
+ -755, -755, -755, -755, -755, -755, -755, 80, -755, -755,
-755, 83, -755, -755, -755, -755, -755, 1089, -755, -755,
-755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, 947, -755, -755, -755, -755, -755, -755, -755,
+ -755, -755, 946, -755, -755, -755, -755, -755, -755, -755,
-755
};
@@ -1584,18 +1584,18 @@ static const yytype_int16 yydefgoto[] =
782, 270, 271, 272, 273, 274, 275, 276, 277, 278,
279, 280, 281, 282, 283, 284, 28, 74, 75, 76,
77, 78, 29, 61, 498, 499, 500, 501, 30, 288,
- 289, 290, 291, 292, 1036, 1037, 1038, 1039, 1040, 1210,
- 1281, 1282, 31, 62, 513, 514, 515, 516, 517, 518,
- 519, 520, 521, 522, 523, 743, 1186, 1187, 524, 737,
- 1158, 1159, 32, 51, 336, 337, 338, 339, 340, 341,
+ 289, 290, 291, 292, 1036, 1037, 1038, 1039, 1040, 1211,
+ 1282, 1283, 31, 62, 513, 514, 515, 516, 517, 518,
+ 519, 520, 521, 522, 523, 743, 1187, 1188, 524, 737,
+ 1159, 1160, 32, 51, 336, 337, 338, 339, 340, 341,
342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
352, 353, 610, 1058, 1059, 33, 59, 484, 722, 1129,
1130, 485, 486, 487, 1133, 978, 979, 488, 489, 34,
57, 462, 463, 464, 465, 466, 467, 468, 707, 1115,
1116, 469, 470, 471, 35, 63, 529, 530, 531, 532,
533, 36, 295, 296, 297, 37, 69, 583, 584, 585,
- 586, 587, 798, 1224, 1225, 38, 66, 567, 568, 569,
- 570, 788, 1205, 1206, 39, 52, 369, 370, 371, 372,
+ 586, 587, 798, 1225, 1226, 38, 66, 567, 568, 569,
+ 570, 788, 1206, 1207, 39, 52, 369, 370, 371, 372,
373, 374, 375, 376, 377, 378, 379, 632, 1086, 1087,
380, 381, 382, 383, 384, 40, 58, 475, 476, 477,
478, 41, 53, 388, 389, 390, 391, 42, 111, 112,
@@ -1621,125 +1621,125 @@ static const yytype_int16 yytable[] =
286, 50, 1023, 495, 293, 219, 479, 1032, 579, 47,
48, 503, 71, 1126, 249, 80, 81, 395, 1024, 72,
286, 82, 1025, 54, 230, 56, 526, 504, 525, 395,
- 60, 472, 231, 1099, 293, 1101, 1227, 1100, 1032, 1102,
- 1228, 64, 385, 579, 232, 233, 250, 234, 235, 236,
- 385, 110, 1232, 251, 564, 65, 1233, 505, 83, 84,
+ 60, 472, 231, 1099, 293, 1101, 1228, 1100, 1032, 1102,
+ 1229, 64, 385, 579, 232, 233, 250, 234, 235, 236,
+ 385, 110, 1233, 251, 564, 65, 1234, 505, 83, 84,
219, 480, 526, 67, 85, 86, 481, 527, 482, 237,
1057, 87, 88, 89, 496, 252, 653, 654, 496, 253,
- 775, 776, 565, 1253, 661, 73, 68, 254, 665, 115,
+ 775, 776, 565, 1254, 661, 73, 68, 254, 665, 115,
255, 256, 506, 670, 116, 117, 673, 90, 91, 220,
118, 294, 386, 527, 1033, 580, 683, 684, 119, 120,
386, 109, 507, 473, 396, 121, 528, 696, 122, 123,
699, 700, 257, 221, 124, 106, 396, 483, 508, 125,
126, 294, 127, 128, 129, 1033, 130, 779, 780, 258,
580, 397, 259, 131, 453, 509, 510, 132, 133, 1127,
- 107, 565, 528, 397, 220, 473, 134, 1236, 1238, 1128,
- 454, 1237, 1239, 108, 114, 135, 387, 260, 497, -123,
+ 107, 565, 528, 397, 220, 473, 134, 1237, 1239, 1128,
+ 454, 1238, 1240, 108, 114, 135, 387, 260, 497, -123,
216, 110, 497, 136, 387, 137, 455, 138, 221, 139,
- 1085, 140, 141, 217, 1246, 261, 262, 263, 1247, -123,
- 218, 226, 1248, 299, 142, 511, 1249, 1034, 227, 143,
- 144, 145, 566, 146, 147, 148, 456, 1250, 149, 300,
- 474, 1251, 264, 265, 760, 303, 512, 562, 393, 751,
+ 1085, 140, 141, 217, 1247, 261, 262, 263, 1248, -123,
+ 218, 226, 1249, 299, 142, 511, 1250, 1034, 227, 143,
+ 144, 145, 566, 146, 147, 148, 456, 1251, 149, 300,
+ 474, 1252, 264, 265, 760, 303, 512, 562, 393, 751,
287, 317, 745, 542, 1035, 581, 732, 573, 1034, 582,
- 228, 577, 493, 724, 150, 800, 490, 1257, 1105, 319,
- 287, 1258, 151, 152, 153, 154, 155, 156, 688, 285,
+ 228, 577, 493, 724, 150, 800, 490, 1258, 1105, 319,
+ 287, 1259, 151, 152, 153, 154, 155, 156, 688, 285,
298, 689, 474, 320, 321, 1035, 650, 322, 717, 1106,
- 581, 457, 1284, 70, 582, 1211, 1285, 544, 1107, 458,
+ 581, 457, 1285, 70, 582, 1212, 1286, 544, 1107, 458,
459, 566, 571, 479, 301, 157, 302, 644, 1070, 1071,
1072, 789, 828, 845, 846, 690, 832, 71, 691, 835,
- 460, 305, 306, 839, 72, 1108, 1229, 1230, 1231, 158,
+ 460, 305, 306, 839, 72, 1108, 1230, 1231, 1232, 158,
159, 323, 160, 161, 162, 575, 307, 354, 163, 355,
- 308, 356, 309, 164, 310, 311, 451, 1272, 588, 324,
+ 308, 356, 309, 164, 310, 311, 451, 1273, 588, 324,
325, 326, 327, 357, 1109, 1110, 328, 312, 480, 313,
329, 314, 1111, 481, 453, 482, 330, 315, 316, 358,
- 592, 392, 402, 403, 1273, 404, 1274, 331, 332, 405,
+ 592, 392, 402, 403, 1274, 404, 1275, 331, 332, 405,
454, 406, 407, 408, 409, 596, 410, 1112, 411, 333,
73, 412, 359, 413, 360, 461, 455, 414, 415, 361,
416, 713, 417, 1113, 418, 419, 420, 840, 421, 362,
422, 334, 809, 810, 811, 812, 813, 814, 815, 248,
- 423, 1275, 424, 425, 483, 115, 456, 426, 427, 428,
- 116, 117, 430, 432, 363, 433, 118, 434, 1276, 435,
+ 423, 1276, 424, 425, 483, 115, 456, 426, 427, 428,
+ 116, 117, 430, 432, 363, 433, 118, 434, 1277, 435,
436, 437, 438, 249, 119, 120, 439, 440, 441, 442,
335, 121, 443, 444, 122, 123, 445, 446, 364, 447,
124, 448, 449, 450, 1114, 125, 126, 491, 127, 128,
- 129, 492, 130, 1277, 1278, 250, 534, 535, 365, 131,
+ 129, 492, 130, 1278, 1279, 250, 534, 535, 365, 131,
536, 457, 251, 132, 133, 589, 537, 366, 538, 458,
459, 539, 134, 540, 541, 545, 623, 546, 590, 547,
548, 135, 549, 550, 252, 551, 552, 591, 253, 136,
460, 137, 553, 138, 229, 139, 254, 140, 141, 255,
- 256, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 554, 1279,
- 142, 555, 367, 1280, 556, 143, 144, 145, 1138, 146,
+ 256, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 554, 1280,
+ 142, 555, 367, 1281, 556, 143, 144, 145, 1138, 146,
147, 148, 230, 557, 149, 558, 559, 560, 561, 572,
231, 257, 1139, 576, 593, 594, 595, 502, 596, 368,
1140, 600, 232, 233, 640, 234, 235, 236, 258, 601,
150, 259, 602, 503, 1141, 603, 604, 605, 151, 152,
153, 154, 155, 156, 606, 461, 607, 237, 354, 504,
- 355, 608, 356, 646, 609, 625, 260, 611, 1254, 612,
+ 355, 608, 356, 646, 609, 652, 260, 611, 612, 1255,
613, 1142, 614, 1143, 357, 656, 615, 616, 617, 618,
- 619, 157, 620, 621, 261, 262, 263, 622, 626, 505,
- 358, 627, 628, 629, 630, 631, 633, 634, 635, 1144,
- 636, 637, 638, 639, 642, 158, 159, 643, 160, 161,
- 162, 264, 265, 359, 163, 360, 647, 648, 652, 164,
- 361, 649, 655, 657, 506, 658, 659, 660, 663, 662,
- 362, 664, 1145, 666, 1146, 667, 668, 669, 671, 672,
- 674, 675, 676, 677, 507, 678, 680, 682, 685, 686,
- 695, 679, 681, 1147, 687, 363, 692, 693, 694, 697,
- 508, 698, 701, 702, 726, 727, 756, 753, 703, 704,
- 762, 1148, 764, 705, 765, 706, 1149, 509, 510, 364,
- 1150, 1195, 719, 766, 708, 1151, 709, 319, 1152, 894,
- 710, 711, 712, 1153, 715, 716, 2, 3, 720, 365,
- 4, 320, 321, 721, 723, 322, 728, 1154, 366, 729,
- 5, 730, 1155, 6, 7, 731, 734, 735, 736, 754,
- 8, 738, 739, 1156, 740, 741, 742, 511, 744, 747,
- 1157, 9, 918, 767, 10, 11, 748, 749, 750, 755,
- 761, 768, 769, 1196, 770, 771, 757, 758, 512, 323,
- 759, 772, 773, 367, 763, 774, 783, 784, 12, 794,
- 791, 826, 827, 13, 830, 785, 786, 324, 325, 326,
- 327, 14, 1197, 831, 328, 1165, 787, 793, 329, 1198,
- 368, 792, 795, 796, 330, 802, 833, 834, 1199, 797,
- 799, 803, 15, 16, 804, 331, 332, 805, 806, 807,
- 808, 895, 896, 897, 818, 898, 899, 333, 900, 901,
- 17, 902, 819, 903, 820, 1200, 904, 1201, 1202, 905,
- 906, 907, 821, 908, 822, 823, 824, 18, 909, 334,
- 825, 1203, 910, 911, 912, 829, 1214, 836, 1204, 837,
- 19, 20, 913, 838, 919, 920, 921, 914, 922, 923,
- 840, 924, 925, 843, 926, 844, 927, 847, 848, 928,
- 21, 849, 929, 930, 931, 851, 932, 850, 335, 852,
- 853, 933, 854, 22, 855, 934, 935, 936, 856, 857,
- 858, 860, 23, 861, 859, 937, 24, 1166, 1167, 1168,
- 938, 1169, 1170, 862, 1171, 1172, 863, 1173, 1215, 1174,
- 864, 865, 1175, 866, 79, 1176, 1177, 1178, 867, 1179,
- 962, 868, 869, 965, 1180, 870, 871, 872, 1181, 1182,
- 1183, 873, 874, 964, 875, 80, 81, 1216, 1184, 876,
- 877, 82, 878, 1185, 1217, 879, 880, 881, 882, 883,
- 884, 966, 885, 1218, 886, 887, 888, 889, 890, 891,
- 892, 893, 917, 963, 941, 942, 943, 944, 967, 968,
- 945, 969, 971, 946, 947, 972, 948, 949, 83, 84,
- 1219, 974, 1220, 1221, 85, 86, 950, 951, 975, 952,
- 953, 87, 88, 89, 976, 977, 1222, 983, 954, 955,
- 956, 984, 957, 1223, 986, 958, 959, 960, 961, 970,
- 973, 980, 981, 982, 987, 989, 985, 90, 91, 990,
- 988, 991, 992, 993, 994, 995, 996, 997, 998, 999,
- 1000, 1028, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008,
- 1042, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
- 1018, 1019, 1020, 1021, 1026, 1027, 1044, 1030, 1031, 1029,
- 1041, 1045, 1043, 1053, 1054, 1055, 1060, 1061, 1062, 1063,
- 1240, 1064, 1252, 1263, 1065, 1264, 1265, 1066, 1067, 304,
- 1068, 1069, 1075, 1076, 1077, 1192, 1078, 1079, 1080, 1081,
- 1082, 1083, 1193, 1088, 1089, 1090, 1091, 1092, 1093, 1094,
- 1095, 563, 1096, 1097, 1098, 1286, 1103, 1104, 733, 1117,
- 1118, 1119, 1120, 1121, 1131, 1122, 1123, 1124, 1125, 1212,
- 1267, 1134, 1135, 1266, 1132, 746, 1259, 1136, 1137, 624,
- 1160, 1262, 725, 714, 1161, 752, 1162, 1163, 1164, 1188,
- 1261, 1189, 1190, 1191, 801, 1194, 1207, 1268, 1283, 1213,
- 1208, 1209, 1226, 1242, 494, 1243, 1244, 1256, 1255, 1245,
- 1241, 1269, 1270, 1271, 641, 790, 1260, 718, 394, 452,
- 1235, 318, 0, 1234, 651, 543, 0, 0, 0, 645,
+ 619, 157, 620, 621, 261, 262, 263, 622, 625, 505,
+ 358, 655, 626, 627, 628, 629, 630, 631, 633, 1144,
+ 634, 635, 636, 637, 638, 158, 159, 639, 160, 161,
+ 162, 264, 265, 359, 163, 360, 642, 643, 647, 164,
+ 361, 657, 648, 649, 506, 658, 659, 660, 663, 662,
+ 362, 664, 1145, 1196, 1146, 666, 667, 668, 669, 671,
+ 672, 674, 675, 676, 507, 677, 678, 680, 682, 685,
+ 765, 679, 681, 1147, 686, 363, 687, 692, 693, 694,
+ 508, 695, 697, 698, 701, 702, 726, 727, 703, 704,
+ 756, 1148, 762, 705, 764, 706, 1149, 509, 510, 364,
+ 1150, 708, 766, 753, 754, 1151, 709, 710, 1152, 711,
+ 712, 715, 716, 1153, 720, 1197, 719, 2, 3, 365,
+ 721, 4, 723, 728, 319, 729, 767, 1154, 366, 730,
+ 1155, 5, 1156, 894, 6, 7, 731, 734, 320, 321,
+ 747, 8, 322, 1157, 1198, 735, 736, 511, 738, 739,
+ 1158, 1199, 9, 761, 755, 10, 11, 740, 741, 742,
+ 1200, 744, 748, 749, 750, 768, 757, 769, 512, 758,
+ 759, 763, 770, 367, 771, 772, 773, 774, 783, 12,
+ 784, 794, 826, 791, 13, 827, 323, 1201, 830, 1202,
+ 1203, 831, 14, 785, 793, 786, 918, 792, 833, 834,
+ 368, 795, 787, 1204, 324, 325, 326, 327, 796, 797,
+ 1205, 328, 799, 15, 16, 329, 802, 803, 804, 805,
+ 806, 330, 807, 808, 818, 819, 820, 821, 822, 823,
+ 836, 17, 331, 332, 824, 825, 829, 837, 1215, 1166,
+ 838, 840, 843, 844, 333, 895, 896, 897, 18, 898,
+ 899, 847, 900, 901, 849, 902, 848, 903, 850, 851,
+ 904, 19, 20, 905, 906, 907, 334, 908, 852, 853,
+ 854, 855, 909, 856, 857, 858, 910, 911, 912, 860,
+ 859, 21, 861, 862, 864, 563, 913, 863, 865, 866,
+ 867, 914, 868, 869, 22, 963, 870, 871, 872, 873,
+ 1216, 966, 874, 23, 977, 335, 875, 24, 919, 920,
+ 921, 962, 922, 923, 876, 924, 925, 965, 926, 877,
+ 927, 878, 879, 928, 880, 881, 929, 930, 931, 1217,
+ 932, 882, 883, 884, 967, 933, 1218, 885, 886, 934,
+ 935, 936, 887, 888, 964, 1219, 889, 968, 890, 937,
+ 969, 1167, 1168, 1169, 938, 1170, 1171, 891, 1172, 1173,
+ 971, 1174, 972, 1175, 79, 892, 1176, 893, 917, 1177,
+ 1178, 1179, 1220, 1180, 1221, 1222, 941, 974, 1181, 975,
+ 942, 943, 1182, 1183, 1184, 80, 81, 944, 1223, 983,
+ 945, 82, 1185, 946, 947, 1224, 984, 1186, 948, 949,
+ 950, 951, 952, 953, 954, 955, 956, 957, 958, 959,
+ 960, 961, 970, 973, 986, 987, 980, 976, 981, 982,
+ 989, 990, 985, 991, 992, 993, 995, 988, 83, 84,
+ 994, 996, 997, 998, 85, 86, 999, 1000, 1028, 1001,
+ 1002, 87, 88, 89, 1003, 1004, 1005, 1006, 1007, 1008,
+ 1009, 1042, 1010, 1011, 1044, 1012, 1013, 1014, 1015, 1016,
+ 1017, 1018, 1019, 1020, 1241, 1021, 1253, 90, 91, 1026,
+ 1027, 1029, 1030, 1031, 1041, 1132, 1045, 1053, 1043, 1054,
+ 1055, 1209, 1060, 1264, 1061, 1062, 1063, 1064, 1065, 1066,
+ 1067, 1068, 1069, 1265, 1075, 1076, 1077, 1078, 1079, 1080,
+ 1266, 1081, 1082, 1083, 1088, 1089, 1090, 1091, 1092, 1093,
+ 1094, 1095, 1096, 1097, 1098, 1103, 1104, 1117, 1194, 1118,
+ 1119, 1120, 1121, 1122, 1131, 304, 1123, 1213, 733, 1124,
+ 1193, 1125, 1134, 1135, 1287, 1136, 746, 1268, 1137, 1161,
+ 1267, 1162, 624, 1163, 1164, 1165, 1189, 1190, 1191, 1192,
+ 1195, 1208, 1260, 1214, 1227, 1210, 1243, 494, 1263, 1262,
+ 1242, 1257, 1244, 725, 1245, 1246, 1256, 1270, 1271, 1272,
+ 714, 801, 752, 1284, 1269, 718, 790, 641, 1261, 394,
+ 452, 318, 1236, 1235, 543, 0, 645, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 651, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 574, 0, 0,
- 0, 0, 0, 0, 0, 0, 578
+ 0, 0, 0, 0, 0, 574, 0, 0, 0, 0,
+ 0, 0, 0, 578
};
static const yytype_int16 yycheck[] =
@@ -1802,72 +1802,72 @@ static const yytype_int16 yycheck[] =
26, 108, 49, 50, 228, 52, 53, 54, 150, 108,
146, 153, 108, 17, 40, 210, 210, 227, 154, 155,
156, 157, 158, 159, 227, 222, 230, 74, 1, 33,
- 3, 230, 5, 123, 230, 227, 178, 230, 1209, 230,
+ 3, 230, 5, 123, 230, 210, 178, 230, 230, 1210,
230, 67, 230, 69, 17, 108, 230, 230, 230, 230,
- 230, 187, 230, 230, 196, 197, 198, 230, 230, 63,
- 33, 230, 230, 230, 230, 230, 230, 230, 230, 95,
+ 230, 187, 230, 230, 196, 197, 198, 230, 227, 63,
+ 33, 210, 230, 230, 230, 230, 230, 230, 230, 95,
230, 230, 230, 230, 230, 211, 212, 230, 214, 215,
- 216, 223, 224, 56, 220, 58, 227, 230, 210, 225,
- 63, 230, 210, 210, 98, 108, 123, 210, 108, 210,
- 73, 108, 128, 108, 130, 210, 210, 210, 108, 108,
- 108, 108, 108, 108, 118, 210, 210, 210, 210, 210,
- 123, 230, 230, 149, 210, 98, 210, 210, 210, 210,
- 134, 210, 210, 210, 123, 123, 123, 210, 227, 227,
- 123, 167, 123, 230, 108, 230, 172, 151, 152, 122,
- 176, 69, 227, 108, 230, 181, 230, 1, 184, 49,
- 230, 230, 230, 189, 230, 230, 0, 1, 230, 142,
- 4, 15, 16, 230, 230, 19, 227, 203, 151, 227,
- 14, 230, 208, 17, 18, 230, 227, 230, 230, 210,
- 24, 230, 230, 219, 230, 230, 230, 201, 230, 227,
- 226, 35, 49, 123, 38, 39, 230, 230, 230, 210,
- 227, 123, 123, 131, 123, 123, 210, 210, 222, 63,
- 210, 123, 108, 196, 210, 123, 123, 123, 62, 123,
- 210, 108, 108, 67, 108, 227, 227, 81, 82, 83,
- 84, 75, 160, 108, 88, 49, 230, 229, 92, 167,
- 223, 227, 227, 227, 98, 227, 108, 108, 176, 230,
- 230, 227, 96, 97, 227, 109, 110, 227, 227, 227,
- 227, 161, 162, 163, 227, 165, 166, 121, 168, 169,
- 114, 171, 227, 173, 227, 203, 176, 205, 206, 179,
- 180, 181, 227, 183, 227, 227, 227, 131, 188, 143,
- 227, 219, 192, 193, 194, 230, 69, 123, 226, 108,
- 144, 145, 202, 108, 161, 162, 163, 207, 165, 166,
- 108, 168, 169, 227, 171, 123, 173, 123, 210, 176,
- 164, 123, 179, 180, 181, 230, 183, 123, 182, 123,
- 123, 188, 108, 177, 123, 192, 193, 194, 123, 123,
- 123, 123, 186, 123, 227, 202, 190, 161, 162, 163,
- 207, 165, 166, 227, 168, 169, 227, 171, 131, 173,
- 123, 123, 176, 227, 1, 179, 180, 181, 227, 183,
- 123, 227, 227, 123, 188, 227, 227, 227, 192, 193,
- 194, 227, 227, 230, 227, 22, 23, 160, 202, 227,
- 227, 28, 227, 207, 167, 227, 227, 227, 227, 227,
- 227, 108, 227, 176, 227, 227, 227, 227, 227, 227,
- 227, 227, 227, 210, 227, 227, 227, 227, 123, 123,
- 227, 123, 123, 227, 227, 123, 227, 227, 65, 66,
- 203, 123, 205, 206, 71, 72, 227, 227, 123, 227,
- 227, 78, 79, 80, 230, 108, 219, 123, 227, 227,
- 227, 123, 227, 226, 123, 227, 227, 227, 227, 227,
- 227, 227, 227, 227, 210, 123, 227, 104, 105, 123,
- 230, 123, 123, 210, 230, 123, 227, 123, 123, 123,
- 227, 123, 227, 227, 227, 227, 227, 227, 227, 227,
- 123, 227, 227, 227, 227, 227, 227, 227, 227, 227,
- 227, 227, 227, 227, 227, 227, 123, 227, 227, 230,
- 227, 227, 230, 227, 227, 227, 227, 227, 227, 227,
- 108, 227, 123, 129, 227, 129, 129, 227, 227, 74,
- 227, 227, 227, 227, 227, 1023, 227, 227, 227, 227,
- 227, 227, 1025, 227, 227, 227, 227, 227, 227, 227,
- 227, 266, 227, 227, 227, 1285, 227, 227, 498, 227,
- 227, 227, 227, 227, 217, 227, 227, 227, 227, 1036,
- 1249, 227, 227, 1247, 231, 513, 1228, 227, 227, 336,
- 227, 1239, 485, 462, 227, 529, 227, 227, 227, 227,
- 1237, 227, 227, 227, 583, 227, 227, 1251, 1258, 227,
- 230, 230, 227, 227, 222, 232, 232, 227, 230, 232,
- 1132, 227, 227, 227, 369, 567, 1233, 475, 111, 165,
- 1102, 92, -1, 1100, 398, 238, -1, -1, -1, 388,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 216, 223, 224, 56, 220, 58, 230, 230, 227, 225,
+ 63, 210, 230, 230, 98, 108, 123, 210, 108, 210,
+ 73, 108, 128, 69, 130, 108, 210, 210, 210, 108,
+ 108, 108, 108, 108, 118, 108, 210, 210, 210, 210,
+ 108, 230, 230, 149, 210, 98, 210, 210, 210, 210,
+ 134, 123, 210, 210, 210, 210, 123, 123, 227, 227,
+ 123, 167, 123, 230, 123, 230, 172, 151, 152, 122,
+ 176, 230, 108, 210, 210, 181, 230, 230, 184, 230,
+ 230, 230, 230, 189, 230, 131, 227, 0, 1, 142,
+ 230, 4, 230, 227, 1, 227, 123, 203, 151, 230,
+ 206, 14, 208, 49, 17, 18, 230, 227, 15, 16,
+ 227, 24, 19, 219, 160, 230, 230, 201, 230, 230,
+ 226, 167, 35, 227, 210, 38, 39, 230, 230, 230,
+ 176, 230, 230, 230, 230, 123, 210, 123, 222, 210,
+ 210, 210, 123, 196, 123, 123, 108, 123, 123, 62,
+ 123, 123, 108, 210, 67, 108, 63, 203, 108, 205,
+ 206, 108, 75, 227, 229, 227, 49, 227, 108, 108,
+ 223, 227, 230, 219, 81, 82, 83, 84, 227, 230,
+ 226, 88, 230, 96, 97, 92, 227, 227, 227, 227,
+ 227, 98, 227, 227, 227, 227, 227, 227, 227, 227,
+ 123, 114, 109, 110, 227, 227, 230, 108, 69, 49,
+ 108, 108, 227, 123, 121, 161, 162, 163, 131, 165,
+ 166, 123, 168, 169, 123, 171, 210, 173, 123, 230,
+ 176, 144, 145, 179, 180, 181, 143, 183, 123, 123,
+ 108, 123, 188, 123, 123, 123, 192, 193, 194, 123,
+ 227, 164, 123, 227, 123, 266, 202, 227, 123, 227,
+ 227, 207, 227, 227, 177, 210, 227, 227, 227, 227,
+ 131, 108, 227, 186, 108, 182, 227, 190, 161, 162,
+ 163, 123, 165, 166, 227, 168, 169, 123, 171, 227,
+ 173, 227, 227, 176, 227, 227, 179, 180, 181, 160,
+ 183, 227, 227, 227, 123, 188, 167, 227, 227, 192,
+ 193, 194, 227, 227, 230, 176, 227, 123, 227, 202,
+ 123, 161, 162, 163, 207, 165, 166, 227, 168, 169,
+ 123, 171, 123, 173, 1, 227, 176, 227, 227, 179,
+ 180, 181, 203, 183, 205, 206, 227, 123, 188, 123,
+ 227, 227, 192, 193, 194, 22, 23, 227, 219, 123,
+ 227, 28, 202, 227, 227, 226, 123, 207, 227, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 123, 210, 227, 230, 227, 227,
+ 123, 123, 227, 123, 123, 210, 123, 230, 65, 66,
+ 230, 227, 123, 123, 71, 72, 123, 227, 123, 227,
+ 227, 78, 79, 80, 227, 227, 227, 227, 227, 227,
+ 227, 123, 227, 227, 123, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 108, 227, 123, 104, 105, 227,
+ 227, 230, 227, 227, 227, 231, 227, 227, 230, 227,
+ 227, 230, 227, 129, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 129, 227, 227, 227, 227, 227, 227,
+ 129, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 1025, 227,
+ 227, 227, 227, 227, 217, 74, 227, 1036, 498, 227,
+ 1023, 227, 227, 227, 1286, 227, 513, 1250, 227, 227,
+ 1248, 227, 336, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 1229, 227, 227, 230, 227, 222, 1240, 1238,
+ 1132, 227, 232, 485, 232, 232, 230, 227, 227, 227,
+ 462, 583, 529, 1259, 1252, 475, 567, 369, 1234, 111,
+ 165, 92, 1102, 1100, 238, -1, 388, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 398, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 288, -1, -1,
- -1, -1, -1, -1, -1, -1, 295
+ -1, -1, -1, -1, -1, 288, -1, -1, -1, -1,
+ -1, -1, -1, 295
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1989,20 +1989,20 @@ static const yytype_uint16 yystos[] =
227, 227, 227, 227, 227, 227, 49, 185, 195, 342,
343, 217, 231, 347, 227, 227, 227, 227, 4, 18,
26, 40, 67, 69, 95, 128, 130, 149, 167, 172,
- 176, 181, 184, 189, 203, 208, 219, 226, 313, 314,
- 227, 227, 227, 227, 227, 49, 161, 162, 163, 165,
- 166, 168, 169, 171, 173, 176, 179, 180, 181, 183,
- 188, 192, 193, 194, 202, 207, 309, 310, 227, 227,
- 227, 227, 251, 253, 227, 69, 131, 160, 167, 176,
- 203, 205, 206, 219, 226, 395, 396, 227, 230, 230,
- 292, 228, 288, 227, 69, 131, 160, 167, 176, 203,
- 205, 206, 219, 226, 386, 387, 227, 227, 231, 238,
- 238, 238, 227, 231, 494, 490, 227, 231, 227, 231,
- 108, 349, 227, 232, 232, 232, 227, 231, 227, 231,
- 227, 231, 123, 204, 239, 230, 227, 227, 231, 337,
- 412, 363, 343, 129, 129, 129, 314, 310, 396, 227,
- 227, 227, 40, 67, 69, 114, 131, 166, 167, 222,
- 226, 293, 294, 387, 227, 231, 294
+ 176, 181, 184, 189, 203, 206, 208, 219, 226, 313,
+ 314, 227, 227, 227, 227, 227, 49, 161, 162, 163,
+ 165, 166, 168, 169, 171, 173, 176, 179, 180, 181,
+ 183, 188, 192, 193, 194, 202, 207, 309, 310, 227,
+ 227, 227, 227, 251, 253, 227, 69, 131, 160, 167,
+ 176, 203, 205, 206, 219, 226, 395, 396, 227, 230,
+ 230, 292, 228, 288, 227, 69, 131, 160, 167, 176,
+ 203, 205, 206, 219, 226, 386, 387, 227, 227, 231,
+ 238, 238, 238, 227, 231, 494, 490, 227, 231, 227,
+ 231, 108, 349, 227, 232, 232, 232, 227, 231, 227,
+ 231, 227, 231, 123, 204, 239, 230, 227, 227, 231,
+ 337, 412, 363, 343, 129, 129, 129, 314, 310, 396,
+ 227, 227, 227, 40, 67, 69, 114, 131, 166, 167,
+ 222, 226, 293, 294, 387, 227, 231, 294
};
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
@@ -2030,50 +2030,50 @@ static const yytype_uint16 yyr1[] =
310, 310, 310, 310, 310, 312, 311, 313, 313, 314,
314, 314, 314, 314, 314, 314, 314, 314, 314, 314,
314, 314, 314, 314, 314, 314, 314, 314, 314, 314,
- 314, 314, 316, 315, 317, 317, 318, 318, 318, 318,
+ 314, 314, 314, 316, 315, 317, 317, 318, 318, 318,
318, 318, 318, 318, 318, 318, 318, 318, 318, 318,
- 318, 318, 318, 319, 320, 321, 322, 323, 324, 325,
- 326, 327, 328, 329, 330, 331, 332, 333, 335, 334,
- 336, 336, 337, 337, 339, 338, 341, 340, 342, 342,
- 343, 343, 343, 344, 344, 345, 345, 345, 345, 345,
- 347, 346, 348, 348, 349, 349, 350, 351, 353, 352,
- 354, 354, 355, 355, 355, 355, 355, 355, 355, 355,
- 355, 356, 357, 358, 359, 361, 360, 362, 362, 363,
- 363, 363, 363, 363, 363, 363, 363, 363, 363, 364,
- 365, 366, 368, 367, 369, 369, 370, 370, 370, 370,
- 371, 372, 373, 374, 375, 375, 376, 376, 377, 379,
- 378, 380, 380, 381, 381, 381, 381, 382, 383, 385,
- 384, 386, 386, 387, 387, 387, 387, 387, 387, 387,
- 387, 387, 387, 389, 388, 390, 390, 391, 391, 391,
- 392, 394, 393, 395, 395, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 398, 397, 399, 399, 400,
+ 318, 318, 318, 318, 319, 320, 321, 322, 323, 324,
+ 325, 326, 327, 328, 329, 330, 331, 332, 333, 335,
+ 334, 336, 336, 337, 337, 339, 338, 341, 340, 342,
+ 342, 343, 343, 343, 344, 344, 345, 345, 345, 345,
+ 345, 347, 346, 348, 348, 349, 349, 350, 351, 353,
+ 352, 354, 354, 355, 355, 355, 355, 355, 355, 355,
+ 355, 355, 356, 357, 358, 359, 361, 360, 362, 362,
+ 363, 363, 363, 363, 363, 363, 363, 363, 363, 363,
+ 364, 365, 366, 368, 367, 369, 369, 370, 370, 370,
+ 370, 371, 372, 373, 374, 375, 375, 376, 376, 377,
+ 379, 378, 380, 380, 381, 381, 381, 381, 382, 383,
+ 385, 384, 386, 386, 387, 387, 387, 387, 387, 387,
+ 387, 387, 387, 387, 389, 388, 390, 390, 391, 391,
+ 391, 392, 394, 393, 395, 395, 396, 396, 396, 396,
+ 396, 396, 396, 396, 396, 396, 398, 397, 399, 399,
400, 400, 400, 400, 400, 400, 400, 400, 400, 400,
- 400, 400, 400, 400, 401, 402, 403, 404, 405, 406,
- 407, 408, 408, 410, 409, 411, 411, 412, 412, 413,
- 414, 415, 416, 417, 419, 418, 420, 420, 421, 421,
- 421, 422, 423, 425, 424, 426, 426, 427, 427, 427,
- 428, 429, 430, 431, 431, 432, 432, 433, 435, 434,
- 436, 436, 437, 437, 437, 438, 439, 440, 441, 441,
- 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
+ 400, 400, 400, 400, 400, 401, 402, 403, 404, 405,
+ 406, 407, 408, 408, 410, 409, 411, 411, 412, 412,
+ 413, 414, 415, 416, 417, 419, 418, 420, 420, 421,
+ 421, 421, 422, 423, 425, 424, 426, 426, 427, 427,
+ 427, 428, 429, 430, 431, 431, 432, 432, 433, 435,
+ 434, 436, 436, 437, 437, 437, 438, 439, 440, 441,
+ 441, 442, 442, 442, 442, 442, 442, 442, 442, 442,
442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
- 443, 444, 445, 446, 447, 448, 449, 450, 451, 452,
- 453, 454, 455, 456, 457, 458, 459, 460, 461, 462,
- 463, 464, 465, 466, 467, 468, 469, 469, 470, 470,
- 471, 472, 473, 474, 475, 476, 477, 478, 479, 480,
- 481, 482, 483, 484, 485, 486, 488, 487, 489, 489,
+ 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+ 452, 453, 454, 455, 456, 457, 458, 459, 460, 461,
+ 462, 463, 464, 465, 466, 467, 468, 469, 469, 470,
+ 470, 471, 472, 473, 474, 475, 476, 477, 478, 479,
+ 480, 481, 482, 483, 484, 485, 486, 488, 487, 489,
+ 489, 490, 490, 490, 490, 490, 490, 490, 490, 490,
490, 490, 490, 490, 490, 490, 490, 490, 490, 490,
- 490, 490, 490, 490, 490, 490, 490, 490, 490, 490,
- 490, 492, 491, 493, 493, 494, 494, 494, 494, 494,
+ 490, 490, 492, 491, 493, 493, 494, 494, 494, 494,
494, 494, 494, 494, 494, 494, 494, 494, 494, 494,
- 494, 494, 494, 494, 494, 494, 495, 496, 497, 498,
- 499, 499, 500, 500, 500, 500, 500, 500, 500, 500,
- 500, 500, 500, 500, 500, 501, 502, 503, 504, 505,
- 506, 507, 508, 509, 510, 511, 512, 513, 514, 514,
- 515, 515, 515, 515, 515, 515, 515, 515, 515, 516,
- 517, 518, 519, 520, 521, 522, 523
+ 494, 494, 494, 494, 494, 494, 494, 495, 496, 497,
+ 498, 499, 499, 500, 500, 500, 500, 500, 500, 500,
+ 500, 500, 500, 500, 500, 500, 501, 502, 503, 504,
+ 505, 506, 507, 508, 509, 510, 511, 512, 513, 514,
+ 514, 515, 515, 515, 515, 515, 515, 515, 515, 515,
+ 516, 517, 518, 519, 520, 521, 522, 523
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
@@ -2101,50 +2101,50 @@ static const yytype_uint8 yyr2[] =
1, 1, 1, 1, 1, 0, 5, 3, 1, 3,
1, 3, 1, 3, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 0, 6, 2, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 2, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 0, 5,
- 3, 1, 1, 1, 0, 6, 0, 5, 3, 1,
- 1, 1, 1, 2, 1, 1, 1, 1, 1, 2,
- 0, 5, 3, 1, 1, 3, 4, 4, 0, 6,
- 2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 2, 4, 4, 4, 4, 0, 5, 3, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
- 4, 4, 0, 6, 2, 1, 1, 1, 1, 2,
- 4, 4, 4, 5, 2, 1, 1, 1, 4, 0,
- 6, 2, 1, 1, 1, 1, 2, 4, 4, 0,
- 5, 3, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 0, 6, 2, 1, 1, 1, 2,
- 4, 0, 5, 3, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 0, 6, 2, 1, 1,
+ 1, 1, 1, 0, 6, 2, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 2, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 0, 5, 3, 1, 1, 1, 4,
- 4, 4, 4, 4, 0, 6, 2, 1, 1, 1,
- 1, 4, 4, 0, 6, 2, 1, 1, 1, 1,
- 4, 4, 5, 2, 1, 1, 1, 4, 0, 6,
- 2, 1, 1, 1, 1, 4, 4, 5, 2, 1,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 0,
+ 5, 3, 1, 1, 1, 0, 6, 0, 5, 3,
+ 1, 1, 1, 1, 2, 1, 1, 1, 1, 1,
+ 2, 0, 5, 3, 1, 1, 3, 4, 4, 0,
+ 6, 2, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 2, 4, 4, 4, 4, 0, 5, 3, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 4, 4, 4, 0, 6, 2, 1, 1, 1, 1,
+ 2, 4, 4, 4, 5, 2, 1, 1, 1, 4,
+ 0, 6, 2, 1, 1, 1, 1, 2, 4, 4,
+ 0, 5, 3, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 0, 6, 2, 1, 1, 1,
+ 2, 4, 0, 5, 3, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 0, 6, 2, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 2, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 0, 5, 3, 1, 1, 1,
+ 4, 4, 4, 4, 4, 0, 6, 2, 1, 1,
+ 1, 1, 4, 4, 0, 6, 2, 1, 1, 1,
+ 1, 4, 4, 5, 2, 1, 1, 1, 4, 0,
+ 6, 2, 1, 1, 1, 1, 4, 4, 5, 2,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 0, 5, 3, 1,
+ 4, 4, 4, 4, 4, 4, 4, 0, 5, 3,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 0, 5, 3, 1, 1, 1, 1, 1, 1,
+ 1, 1, 0, 5, 3, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 4, 4, 4, 5,
- 2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 5, 2, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
- 4, 4, 4, 4, 4, 4, 4
+ 1, 1, 1, 1, 1, 1, 1, 4, 4, 4,
+ 5, 2, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 5, 2,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 4, 4, 4, 4, 4, 4, 4, 4
};
@@ -3076,21 +3076,20 @@ yyreduce:
break;
}
- /* require 2048 bit (256 byte) key */
- if (RSA_size(ServerInfo.rsa_private_key) != 256)
+ if (RSA_size(ServerInfo.rsa_private_key) < 128)
{
RSA_free(ServerInfo.rsa_private_key);
ServerInfo.rsa_private_key = NULL;
- conf_error_report("Not a 2048 bit key, ignoring");
+ conf_error_report("Ignoring serverinfo::rsa_private_key_file -- need at least a 1024 bit key size");
}
#endif
}
-#line 3090 "conf_parser.c" /* yacc.c:1646 */
+#line 3089 "conf_parser.c" /* yacc.c:1646 */
break;
case 84:
-#line 615 "conf_parser.y" /* yacc.c:1646 */
+#line 614 "conf_parser.y" /* yacc.c:1646 */
{
/* TBD - XXX: error reporting */
#ifdef HAVE_LIBCRYPTO
@@ -3117,22 +3116,22 @@ yyreduce:
}
#endif
}
-#line 3121 "conf_parser.c" /* yacc.c:1646 */
+#line 3120 "conf_parser.c" /* yacc.c:1646 */
break;
case 85:
-#line 643 "conf_parser.y" /* yacc.c:1646 */
+#line 642 "conf_parser.y" /* yacc.c:1646 */
{
#ifdef HAVE_LIBCRYPTO
if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
#endif
}
-#line 3132 "conf_parser.c" /* yacc.c:1646 */
+#line 3131 "conf_parser.c" /* yacc.c:1646 */
break;
case 86:
-#line 651 "conf_parser.y" /* yacc.c:1646 */
+#line 650 "conf_parser.y" /* yacc.c:1646 */
{
/* this isn't rehashable */
if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
@@ -3146,11 +3145,11 @@ yyreduce:
}
}
}
-#line 3150 "conf_parser.c" /* yacc.c:1646 */
+#line 3149 "conf_parser.c" /* yacc.c:1646 */
break;
case 87:
-#line 666 "conf_parser.y" /* yacc.c:1646 */
+#line 665 "conf_parser.y" /* yacc.c:1646 */
{
/* this isn't rehashable */
if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
@@ -3164,11 +3163,11 @@ yyreduce:
}
}
}
-#line 3168 "conf_parser.c" /* yacc.c:1646 */
+#line 3167 "conf_parser.c" /* yacc.c:1646 */
break;
case 88:
-#line 681 "conf_parser.y" /* yacc.c:1646 */
+#line 680 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -3176,11 +3175,11 @@ yyreduce:
ServerInfo.description = xstrdup(yylval.string);
}
}
-#line 3180 "conf_parser.c" /* yacc.c:1646 */
+#line 3179 "conf_parser.c" /* yacc.c:1646 */
break;
case 89:
-#line 690 "conf_parser.y" /* yacc.c:1646 */
+#line 689 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -3193,11 +3192,11 @@ yyreduce:
ServerInfo.network_name = xstrdup(yylval.string);
}
}
-#line 3197 "conf_parser.c" /* yacc.c:1646 */
+#line 3196 "conf_parser.c" /* yacc.c:1646 */
break;
case 90:
-#line 704 "conf_parser.y" /* yacc.c:1646 */
+#line 703 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -3205,11 +3204,11 @@ yyreduce:
MyFree(ServerInfo.network_desc);
ServerInfo.network_desc = xstrdup(yylval.string);
}
-#line 3209 "conf_parser.c" /* yacc.c:1646 */
+#line 3208 "conf_parser.c" /* yacc.c:1646 */
break;
case 91:
-#line 713 "conf_parser.y" /* yacc.c:1646 */
+#line 712 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
{
@@ -3236,11 +3235,11 @@ yyreduce:
}
}
}
-#line 3240 "conf_parser.c" /* yacc.c:1646 */
+#line 3239 "conf_parser.c" /* yacc.c:1646 */
break;
case 92:
-#line 741 "conf_parser.y" /* yacc.c:1646 */
+#line 740 "conf_parser.y" /* yacc.c:1646 */
{
#ifdef IPV6
if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
@@ -3269,11 +3268,11 @@ yyreduce:
}
#endif
}
-#line 3273 "conf_parser.c" /* yacc.c:1646 */
+#line 3272 "conf_parser.c" /* yacc.c:1646 */
break;
case 93:
-#line 771 "conf_parser.y" /* yacc.c:1646 */
+#line 770 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -3297,11 +3296,11 @@ yyreduce:
else
ServerInfo.max_clients = (yyvsp[-1].number);
}
-#line 3301 "conf_parser.c" /* yacc.c:1646 */
+#line 3300 "conf_parser.c" /* yacc.c:1646 */
break;
case 94:
-#line 796 "conf_parser.y" /* yacc.c:1646 */
+#line 795 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -3322,11 +3321,11 @@ yyreduce:
else
ServerInfo.max_nick_length = (yyvsp[-1].number);
}
-#line 3326 "conf_parser.c" /* yacc.c:1646 */
+#line 3325 "conf_parser.c" /* yacc.c:1646 */
break;
case 95:
-#line 818 "conf_parser.y" /* yacc.c:1646 */
+#line 817 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -3347,20 +3346,20 @@ yyreduce:
else
ServerInfo.max_topic_length = (yyvsp[-1].number);
}
-#line 3351 "conf_parser.c" /* yacc.c:1646 */
+#line 3350 "conf_parser.c" /* yacc.c:1646 */
break;
case 96:
-#line 840 "conf_parser.y" /* yacc.c:1646 */
+#line 839 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ServerInfo.hub = yylval.number;
}
-#line 3360 "conf_parser.c" /* yacc.c:1646 */
+#line 3359 "conf_parser.c" /* yacc.c:1646 */
break;
case 104:
-#line 855 "conf_parser.y" /* yacc.c:1646 */
+#line 854 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -3368,11 +3367,11 @@ yyreduce:
MyFree(AdminInfo.name);
AdminInfo.name = xstrdup(yylval.string);
}
-#line 3372 "conf_parser.c" /* yacc.c:1646 */
+#line 3371 "conf_parser.c" /* yacc.c:1646 */
break;
case 105:
-#line 864 "conf_parser.y" /* yacc.c:1646 */
+#line 863 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -3380,11 +3379,11 @@ yyreduce:
MyFree(AdminInfo.email);
AdminInfo.email = xstrdup(yylval.string);
}
-#line 3384 "conf_parser.c" /* yacc.c:1646 */
+#line 3383 "conf_parser.c" /* yacc.c:1646 */
break;
case 106:
-#line 873 "conf_parser.y" /* yacc.c:1646 */
+#line 872 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -3392,20 +3391,20 @@ yyreduce:
MyFree(AdminInfo.description);
AdminInfo.description = xstrdup(yylval.string);
}
-#line 3396 "conf_parser.c" /* yacc.c:1646 */
+#line 3395 "conf_parser.c" /* yacc.c:1646 */
break;
case 107:
-#line 885 "conf_parser.y" /* yacc.c:1646 */
+#line 884 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
}
-#line 3405 "conf_parser.c" /* yacc.c:1646 */
+#line 3404 "conf_parser.c" /* yacc.c:1646 */
break;
case 108:
-#line 889 "conf_parser.y" /* yacc.c:1646 */
+#line 888 "conf_parser.y" /* yacc.c:1646 */
{
dlink_node *ptr = NULL;
@@ -3418,47 +3417,47 @@ yyreduce:
DLINK_FOREACH(ptr, block_state.mask.list.head)
motd_add(ptr->data, block_state.file.buf);
}
-#line 3422 "conf_parser.c" /* yacc.c:1646 */
+#line 3421 "conf_parser.c" /* yacc.c:1646 */
break;
case 114:
-#line 906 "conf_parser.y" /* yacc.c:1646 */
+#line 905 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
}
-#line 3431 "conf_parser.c" /* yacc.c:1646 */
+#line 3430 "conf_parser.c" /* yacc.c:1646 */
break;
case 115:
-#line 912 "conf_parser.y" /* yacc.c:1646 */
+#line 911 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
}
-#line 3440 "conf_parser.c" /* yacc.c:1646 */
+#line 3439 "conf_parser.c" /* yacc.c:1646 */
break;
case 122:
-#line 927 "conf_parser.y" /* yacc.c:1646 */
+#line 926 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigLoggingEntry.use_logging = yylval.number;
}
-#line 3449 "conf_parser.c" /* yacc.c:1646 */
+#line 3448 "conf_parser.c" /* yacc.c:1646 */
break;
case 123:
-#line 933 "conf_parser.y" /* yacc.c:1646 */
+#line 932 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
}
-#line 3458 "conf_parser.c" /* yacc.c:1646 */
+#line 3457 "conf_parser.c" /* yacc.c:1646 */
break;
case 124:
-#line 937 "conf_parser.y" /* yacc.c:1646 */
+#line 936 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -3467,128 +3466,128 @@ yyreduce:
log_set_file(block_state.type.value, block_state.size.value,
block_state.file.buf);
}
-#line 3471 "conf_parser.c" /* yacc.c:1646 */
+#line 3470 "conf_parser.c" /* yacc.c:1646 */
break;
case 131:
-#line 953 "conf_parser.y" /* yacc.c:1646 */
+#line 952 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
}
-#line 3482 "conf_parser.c" /* yacc.c:1646 */
+#line 3481 "conf_parser.c" /* yacc.c:1646 */
break;
case 132:
-#line 961 "conf_parser.y" /* yacc.c:1646 */
+#line 960 "conf_parser.y" /* yacc.c:1646 */
{
block_state.size.value = (yyvsp[-1].number);
}
-#line 3490 "conf_parser.c" /* yacc.c:1646 */
+#line 3489 "conf_parser.c" /* yacc.c:1646 */
break;
case 133:
-#line 964 "conf_parser.y" /* yacc.c:1646 */
+#line 963 "conf_parser.y" /* yacc.c:1646 */
{
block_state.size.value = 0;
}
-#line 3498 "conf_parser.c" /* yacc.c:1646 */
+#line 3497 "conf_parser.c" /* yacc.c:1646 */
break;
case 134:
-#line 969 "conf_parser.y" /* yacc.c:1646 */
+#line 968 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.type.value = 0;
}
-#line 3507 "conf_parser.c" /* yacc.c:1646 */
+#line 3506 "conf_parser.c" /* yacc.c:1646 */
break;
case 138:
-#line 976 "conf_parser.y" /* yacc.c:1646 */
+#line 975 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_USER;
}
-#line 3516 "conf_parser.c" /* yacc.c:1646 */
+#line 3515 "conf_parser.c" /* yacc.c:1646 */
break;
case 139:
-#line 980 "conf_parser.y" /* yacc.c:1646 */
+#line 979 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_OPER;
}
-#line 3525 "conf_parser.c" /* yacc.c:1646 */
+#line 3524 "conf_parser.c" /* yacc.c:1646 */
break;
case 140:
-#line 984 "conf_parser.y" /* yacc.c:1646 */
+#line 983 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_GLINE;
}
-#line 3534 "conf_parser.c" /* yacc.c:1646 */
+#line 3533 "conf_parser.c" /* yacc.c:1646 */
break;
case 141:
-#line 988 "conf_parser.y" /* yacc.c:1646 */
+#line 987 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_XLINE;
}
-#line 3543 "conf_parser.c" /* yacc.c:1646 */
+#line 3542 "conf_parser.c" /* yacc.c:1646 */
break;
case 142:
-#line 992 "conf_parser.y" /* yacc.c:1646 */
+#line 991 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_RESV;
}
-#line 3552 "conf_parser.c" /* yacc.c:1646 */
+#line 3551 "conf_parser.c" /* yacc.c:1646 */
break;
case 143:
-#line 996 "conf_parser.y" /* yacc.c:1646 */
+#line 995 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_DLINE;
}
-#line 3561 "conf_parser.c" /* yacc.c:1646 */
+#line 3560 "conf_parser.c" /* yacc.c:1646 */
break;
case 144:
-#line 1000 "conf_parser.y" /* yacc.c:1646 */
+#line 999 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_KLINE;
}
-#line 3570 "conf_parser.c" /* yacc.c:1646 */
+#line 3569 "conf_parser.c" /* yacc.c:1646 */
break;
case 145:
-#line 1004 "conf_parser.y" /* yacc.c:1646 */
+#line 1003 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_KILL;
}
-#line 3579 "conf_parser.c" /* yacc.c:1646 */
+#line 3578 "conf_parser.c" /* yacc.c:1646 */
break;
case 146:
-#line 1008 "conf_parser.y" /* yacc.c:1646 */
+#line 1007 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_DEBUG;
}
-#line 3588 "conf_parser.c" /* yacc.c:1646 */
+#line 3587 "conf_parser.c" /* yacc.c:1646 */
break;
case 147:
-#line 1018 "conf_parser.y" /* yacc.c:1646 */
+#line 1017 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -3596,11 +3595,11 @@ yyreduce:
reset_block_state();
block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
}
-#line 3600 "conf_parser.c" /* yacc.c:1646 */
+#line 3599 "conf_parser.c" /* yacc.c:1646 */
break;
case 148:
-#line 1025 "conf_parser.y" /* yacc.c:1646 */
+#line 1024 "conf_parser.y" /* yacc.c:1646 */
{
dlink_node *ptr = NULL;
@@ -3672,38 +3671,38 @@ yyreduce:
#endif /* HAVE_LIBCRYPTO */
}
}
-#line 3676 "conf_parser.c" /* yacc.c:1646 */
+#line 3675 "conf_parser.c" /* yacc.c:1646 */
break;
case 162:
-#line 1105 "conf_parser.y" /* yacc.c:1646 */
+#line 1104 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
}
-#line 3685 "conf_parser.c" /* yacc.c:1646 */
+#line 3684 "conf_parser.c" /* yacc.c:1646 */
break;
case 163:
-#line 1111 "conf_parser.y" /* yacc.c:1646 */
+#line 1110 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
}
-#line 3694 "conf_parser.c" /* yacc.c:1646 */
+#line 3693 "conf_parser.c" /* yacc.c:1646 */
break;
case 164:
-#line 1117 "conf_parser.y" /* yacc.c:1646 */
+#line 1116 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
}
-#line 3703 "conf_parser.c" /* yacc.c:1646 */
+#line 3702 "conf_parser.c" /* yacc.c:1646 */
break;
case 165:
-#line 1123 "conf_parser.y" /* yacc.c:1646 */
+#line 1122 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -3713,29 +3712,29 @@ yyreduce:
else
block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
}
-#line 3717 "conf_parser.c" /* yacc.c:1646 */
+#line 3716 "conf_parser.c" /* yacc.c:1646 */
break;
case 166:
-#line 1134 "conf_parser.y" /* yacc.c:1646 */
+#line 1133 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
}
-#line 3726 "conf_parser.c" /* yacc.c:1646 */
+#line 3725 "conf_parser.c" /* yacc.c:1646 */
break;
case 167:
-#line 1140 "conf_parser.y" /* yacc.c:1646 */
+#line 1139 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
}
-#line 3735 "conf_parser.c" /* yacc.c:1646 */
+#line 3734 "conf_parser.c" /* yacc.c:1646 */
break;
case 168:
-#line 1146 "conf_parser.y" /* yacc.c:1646 */
+#line 1145 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -3745,434 +3744,443 @@ yyreduce:
else
block_state.flags.value &= ~CONF_FLAGS_SSL;
}
-#line 3749 "conf_parser.c" /* yacc.c:1646 */
+#line 3748 "conf_parser.c" /* yacc.c:1646 */
break;
case 169:
-#line 1157 "conf_parser.y" /* yacc.c:1646 */
+#line 1156 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
}
-#line 3758 "conf_parser.c" /* yacc.c:1646 */
+#line 3757 "conf_parser.c" /* yacc.c:1646 */
break;
case 170:
-#line 1163 "conf_parser.y" /* yacc.c:1646 */
+#line 1162 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value = 0;
}
-#line 3767 "conf_parser.c" /* yacc.c:1646 */
+#line 3766 "conf_parser.c" /* yacc.c:1646 */
break;
case 174:
-#line 1170 "conf_parser.y" /* yacc.c:1646 */
+#line 1169 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_BOTS;
}
-#line 3776 "conf_parser.c" /* yacc.c:1646 */
+#line 3775 "conf_parser.c" /* yacc.c:1646 */
break;
case 175:
-#line 1174 "conf_parser.y" /* yacc.c:1646 */
+#line 1173 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_CCONN;
}
-#line 3785 "conf_parser.c" /* yacc.c:1646 */
+#line 3784 "conf_parser.c" /* yacc.c:1646 */
break;
case 176:
-#line 1178 "conf_parser.y" /* yacc.c:1646 */
+#line 1177 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_DEAF;
}
-#line 3794 "conf_parser.c" /* yacc.c:1646 */
+#line 3793 "conf_parser.c" /* yacc.c:1646 */
break;
case 177:
-#line 1182 "conf_parser.y" /* yacc.c:1646 */
+#line 1181 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_DEBUG;
}
-#line 3803 "conf_parser.c" /* yacc.c:1646 */
+#line 3802 "conf_parser.c" /* yacc.c:1646 */
break;
case 178:
-#line 1186 "conf_parser.y" /* yacc.c:1646 */
+#line 1185 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_FULL;
}
-#line 3812 "conf_parser.c" /* yacc.c:1646 */
+#line 3811 "conf_parser.c" /* yacc.c:1646 */
break;
case 179:
-#line 1190 "conf_parser.y" /* yacc.c:1646 */
+#line 1189 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_HIDDEN;
}
-#line 3821 "conf_parser.c" /* yacc.c:1646 */
+#line 3820 "conf_parser.c" /* yacc.c:1646 */
break;
case 180:
-#line 1194 "conf_parser.y" /* yacc.c:1646 */
+#line 1193 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_SKILL;
}
-#line 3830 "conf_parser.c" /* yacc.c:1646 */
+#line 3829 "conf_parser.c" /* yacc.c:1646 */
break;
case 181:
-#line 1198 "conf_parser.y" /* yacc.c:1646 */
+#line 1197 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_NCHANGE;
}
-#line 3839 "conf_parser.c" /* yacc.c:1646 */
+#line 3838 "conf_parser.c" /* yacc.c:1646 */
break;
case 182:
-#line 1202 "conf_parser.y" /* yacc.c:1646 */
+#line 1201 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_REJ;
}
-#line 3848 "conf_parser.c" /* yacc.c:1646 */
+#line 3847 "conf_parser.c" /* yacc.c:1646 */
break;
case 183:
-#line 1206 "conf_parser.y" /* yacc.c:1646 */
+#line 1205 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_UNAUTH;
}
-#line 3857 "conf_parser.c" /* yacc.c:1646 */
+#line 3856 "conf_parser.c" /* yacc.c:1646 */
break;
case 184:
-#line 1210 "conf_parser.y" /* yacc.c:1646 */
+#line 1209 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_SPY;
}
-#line 3866 "conf_parser.c" /* yacc.c:1646 */
+#line 3865 "conf_parser.c" /* yacc.c:1646 */
break;
case 185:
-#line 1214 "conf_parser.y" /* yacc.c:1646 */
+#line 1213 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_EXTERNAL;
}
-#line 3875 "conf_parser.c" /* yacc.c:1646 */
+#line 3874 "conf_parser.c" /* yacc.c:1646 */
break;
case 186:
-#line 1218 "conf_parser.y" /* yacc.c:1646 */
+#line 1217 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_OPERWALL;
}
-#line 3884 "conf_parser.c" /* yacc.c:1646 */
+#line 3883 "conf_parser.c" /* yacc.c:1646 */
break;
case 187:
-#line 1222 "conf_parser.y" /* yacc.c:1646 */
+#line 1221 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_SERVNOTICE;
}
-#line 3893 "conf_parser.c" /* yacc.c:1646 */
+#line 3892 "conf_parser.c" /* yacc.c:1646 */
break;
case 188:
-#line 1226 "conf_parser.y" /* yacc.c:1646 */
+#line 1225 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_INVISIBLE;
}
-#line 3902 "conf_parser.c" /* yacc.c:1646 */
+#line 3901 "conf_parser.c" /* yacc.c:1646 */
break;
case 189:
-#line 1230 "conf_parser.y" /* yacc.c:1646 */
+#line 1229 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_WALLOP;
}
-#line 3911 "conf_parser.c" /* yacc.c:1646 */
+#line 3910 "conf_parser.c" /* yacc.c:1646 */
break;
case 190:
-#line 1234 "conf_parser.y" /* yacc.c:1646 */
+#line 1233 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_SOFTCALLERID;
}
-#line 3920 "conf_parser.c" /* yacc.c:1646 */
+#line 3919 "conf_parser.c" /* yacc.c:1646 */
break;
case 191:
-#line 1238 "conf_parser.y" /* yacc.c:1646 */
+#line 1237 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_CALLERID;
}
-#line 3929 "conf_parser.c" /* yacc.c:1646 */
+#line 3928 "conf_parser.c" /* yacc.c:1646 */
break;
case 192:
-#line 1242 "conf_parser.y" /* yacc.c:1646 */
+#line 1241 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_LOCOPS;
}
-#line 3938 "conf_parser.c" /* yacc.c:1646 */
+#line 3937 "conf_parser.c" /* yacc.c:1646 */
break;
case 193:
-#line 1246 "conf_parser.y" /* yacc.c:1646 */
+#line 1245 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_REGONLY;
}
-#line 3947 "conf_parser.c" /* yacc.c:1646 */
+#line 3946 "conf_parser.c" /* yacc.c:1646 */
break;
case 194:
-#line 1250 "conf_parser.y" /* yacc.c:1646 */
+#line 1249 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_FARCONNECT;
}
-#line 3956 "conf_parser.c" /* yacc.c:1646 */
+#line 3955 "conf_parser.c" /* yacc.c:1646 */
break;
case 195:
-#line 1256 "conf_parser.y" /* yacc.c:1646 */
+#line 1255 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value = 0;
}
-#line 3965 "conf_parser.c" /* yacc.c:1646 */
+#line 3964 "conf_parser.c" /* yacc.c:1646 */
break;
case 199:
-#line 1263 "conf_parser.y" /* yacc.c:1646 */
+#line 1262 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_KILL_REMOTE;
}
-#line 3974 "conf_parser.c" /* yacc.c:1646 */
+#line 3973 "conf_parser.c" /* yacc.c:1646 */
break;
case 200:
-#line 1267 "conf_parser.y" /* yacc.c:1646 */
+#line 1266 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_KILL;
}
-#line 3983 "conf_parser.c" /* yacc.c:1646 */
+#line 3982 "conf_parser.c" /* yacc.c:1646 */
break;
case 201:
-#line 1271 "conf_parser.y" /* yacc.c:1646 */
+#line 1270 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
}
-#line 3992 "conf_parser.c" /* yacc.c:1646 */
+#line 3991 "conf_parser.c" /* yacc.c:1646 */
break;
case 202:
-#line 1275 "conf_parser.y" /* yacc.c:1646 */
+#line 1274 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_CONNECT;
}
-#line 4001 "conf_parser.c" /* yacc.c:1646 */
+#line 4000 "conf_parser.c" /* yacc.c:1646 */
break;
case 203:
-#line 1279 "conf_parser.y" /* yacc.c:1646 */
+#line 1278 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
}
-#line 4010 "conf_parser.c" /* yacc.c:1646 */
+#line 4009 "conf_parser.c" /* yacc.c:1646 */
break;
case 204:
-#line 1283 "conf_parser.y" /* yacc.c:1646 */
+#line 1282 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_SQUIT;
}
-#line 4019 "conf_parser.c" /* yacc.c:1646 */
+#line 4018 "conf_parser.c" /* yacc.c:1646 */
break;
case 205:
-#line 1287 "conf_parser.y" /* yacc.c:1646 */
+#line 1286 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_K;
}
-#line 4028 "conf_parser.c" /* yacc.c:1646 */
+#line 4027 "conf_parser.c" /* yacc.c:1646 */
break;
case 206:
-#line 1291 "conf_parser.y" /* yacc.c:1646 */
+#line 1290 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_UNKLINE;
}
-#line 4037 "conf_parser.c" /* yacc.c:1646 */
+#line 4036 "conf_parser.c" /* yacc.c:1646 */
break;
case 207:
-#line 1295 "conf_parser.y" /* yacc.c:1646 */
+#line 1294 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_DLINE;
}
-#line 4046 "conf_parser.c" /* yacc.c:1646 */
+#line 4045 "conf_parser.c" /* yacc.c:1646 */
break;
case 208:
-#line 1299 "conf_parser.y" /* yacc.c:1646 */
+#line 1298 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_UNDLINE;
}
-#line 4055 "conf_parser.c" /* yacc.c:1646 */
+#line 4054 "conf_parser.c" /* yacc.c:1646 */
break;
case 209:
-#line 1303 "conf_parser.y" /* yacc.c:1646 */
+#line 1302 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- block_state.port.value |= OPER_FLAG_X;
+ block_state.port.value |= OPER_FLAG_XLINE;
}
-#line 4064 "conf_parser.c" /* yacc.c:1646 */
+#line 4063 "conf_parser.c" /* yacc.c:1646 */
break;
case 210:
-#line 1307 "conf_parser.y" /* yacc.c:1646 */
+#line 1306 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- block_state.port.value |= OPER_FLAG_GLINE;
+ block_state.port.value |= OPER_FLAG_UNXLINE;
}
-#line 4073 "conf_parser.c" /* yacc.c:1646 */
+#line 4072 "conf_parser.c" /* yacc.c:1646 */
break;
case 211:
-#line 1311 "conf_parser.y" /* yacc.c:1646 */
+#line 1310 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- block_state.port.value |= OPER_FLAG_DIE;
+ block_state.port.value |= OPER_FLAG_GLINE;
}
-#line 4082 "conf_parser.c" /* yacc.c:1646 */
+#line 4081 "conf_parser.c" /* yacc.c:1646 */
break;
case 212:
-#line 1315 "conf_parser.y" /* yacc.c:1646 */
+#line 1314 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- block_state.port.value |= OPER_FLAG_RESTART;
+ block_state.port.value |= OPER_FLAG_DIE;
}
-#line 4091 "conf_parser.c" /* yacc.c:1646 */
+#line 4090 "conf_parser.c" /* yacc.c:1646 */
break;
case 213:
-#line 1319 "conf_parser.y" /* yacc.c:1646 */
+#line 1318 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- block_state.port.value |= OPER_FLAG_REHASH;
+ block_state.port.value |= OPER_FLAG_RESTART;
}
-#line 4100 "conf_parser.c" /* yacc.c:1646 */
+#line 4099 "conf_parser.c" /* yacc.c:1646 */
break;
case 214:
-#line 1323 "conf_parser.y" /* yacc.c:1646 */
+#line 1322 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- block_state.port.value |= OPER_FLAG_ADMIN;
+ block_state.port.value |= OPER_FLAG_REHASH;
}
-#line 4109 "conf_parser.c" /* yacc.c:1646 */
+#line 4108 "conf_parser.c" /* yacc.c:1646 */
break;
case 215:
-#line 1327 "conf_parser.y" /* yacc.c:1646 */
+#line 1326 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- block_state.port.value |= OPER_FLAG_OPERWALL;
+ block_state.port.value |= OPER_FLAG_ADMIN;
}
-#line 4118 "conf_parser.c" /* yacc.c:1646 */
+#line 4117 "conf_parser.c" /* yacc.c:1646 */
break;
case 216:
-#line 1331 "conf_parser.y" /* yacc.c:1646 */
+#line 1330 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- block_state.port.value |= OPER_FLAG_GLOBOPS;
+ block_state.port.value |= OPER_FLAG_OPERWALL;
}
-#line 4127 "conf_parser.c" /* yacc.c:1646 */
+#line 4126 "conf_parser.c" /* yacc.c:1646 */
break;
case 217:
-#line 1335 "conf_parser.y" /* yacc.c:1646 */
+#line 1334 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- block_state.port.value |= OPER_FLAG_WALLOPS;
+ block_state.port.value |= OPER_FLAG_GLOBOPS;
}
-#line 4136 "conf_parser.c" /* yacc.c:1646 */
+#line 4135 "conf_parser.c" /* yacc.c:1646 */
break;
case 218:
-#line 1339 "conf_parser.y" /* yacc.c:1646 */
+#line 1338 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- block_state.port.value |= OPER_FLAG_LOCOPS;
+ block_state.port.value |= OPER_FLAG_WALLOPS;
}
-#line 4145 "conf_parser.c" /* yacc.c:1646 */
+#line 4144 "conf_parser.c" /* yacc.c:1646 */
break;
case 219:
-#line 1343 "conf_parser.y" /* yacc.c:1646 */
+#line 1342 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- block_state.port.value |= OPER_FLAG_REMOTEBAN;
+ block_state.port.value |= OPER_FLAG_LOCOPS;
}
-#line 4154 "conf_parser.c" /* yacc.c:1646 */
+#line 4153 "conf_parser.c" /* yacc.c:1646 */
break;
case 220:
-#line 1347 "conf_parser.y" /* yacc.c:1646 */
+#line 1346 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- block_state.port.value |= OPER_FLAG_SET;
+ block_state.port.value |= OPER_FLAG_REMOTEBAN;
}
-#line 4163 "conf_parser.c" /* yacc.c:1646 */
+#line 4162 "conf_parser.c" /* yacc.c:1646 */
break;
case 221:
-#line 1351 "conf_parser.y" /* yacc.c:1646 */
+#line 1350 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- block_state.port.value |= OPER_FLAG_MODULE;
+ block_state.port.value |= OPER_FLAG_SET;
}
-#line 4172 "conf_parser.c" /* yacc.c:1646 */
+#line 4171 "conf_parser.c" /* yacc.c:1646 */
break;
case 222:
-#line 1361 "conf_parser.y" /* yacc.c:1646 */
+#line 1354 "conf_parser.y" /* yacc.c:1646 */
+ {
+ if (conf_parser_ctx.pass == 2)
+ block_state.port.value |= OPER_FLAG_MODULE;
+}
+#line 4180 "conf_parser.c" /* yacc.c:1646 */
+ break;
+
+ case 223:
+#line 1364 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 1)
break;
@@ -4185,11 +4193,11 @@ yyreduce:
block_state.max_sendq.value = DEFAULT_SENDQ;
block_state.max_recvq.value = DEFAULT_RECVQ;
}
-#line 4189 "conf_parser.c" /* yacc.c:1646 */
+#line 4197 "conf_parser.c" /* yacc.c:1646 */
break;
- case 223:
-#line 1373 "conf_parser.y" /* yacc.c:1646 */
+ case 224:
+#line 1376 "conf_parser.y" /* yacc.c:1646 */
{
struct ClassItem *class = NULL;
@@ -4237,129 +4245,129 @@ yyreduce:
class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
class->number_per_cidr = block_state.number_per_cidr.value;
}
-#line 4241 "conf_parser.c" /* yacc.c:1646 */
+#line 4249 "conf_parser.c" /* yacc.c:1646 */
break;
- case 243:
-#line 1439 "conf_parser.y" /* yacc.c:1646 */
+ case 244:
+#line 1442 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
}
-#line 4250 "conf_parser.c" /* yacc.c:1646 */
+#line 4258 "conf_parser.c" /* yacc.c:1646 */
break;
- case 244:
-#line 1445 "conf_parser.y" /* yacc.c:1646 */
+ case 245:
+#line 1448 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.ping_freq.value = (yyvsp[-1].number);
}
-#line 4259 "conf_parser.c" /* yacc.c:1646 */
+#line 4267 "conf_parser.c" /* yacc.c:1646 */
break;
- case 245:
-#line 1451 "conf_parser.y" /* yacc.c:1646 */
+ case 246:
+#line 1454 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.max_perip.value = (yyvsp[-1].number);
}
-#line 4268 "conf_parser.c" /* yacc.c:1646 */
+#line 4276 "conf_parser.c" /* yacc.c:1646 */
break;
- case 246:
-#line 1457 "conf_parser.y" /* yacc.c:1646 */
+ case 247:
+#line 1460 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.con_freq.value = (yyvsp[-1].number);
}
-#line 4277 "conf_parser.c" /* yacc.c:1646 */
+#line 4285 "conf_parser.c" /* yacc.c:1646 */
break;
- case 247:
-#line 1463 "conf_parser.y" /* yacc.c:1646 */
+ case 248:
+#line 1466 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.max_total.value = (yyvsp[-1].number);
}
-#line 4286 "conf_parser.c" /* yacc.c:1646 */
+#line 4294 "conf_parser.c" /* yacc.c:1646 */
break;
- case 248:
-#line 1469 "conf_parser.y" /* yacc.c:1646 */
+ case 249:
+#line 1472 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.max_global.value = (yyvsp[-1].number);
}
-#line 4295 "conf_parser.c" /* yacc.c:1646 */
+#line 4303 "conf_parser.c" /* yacc.c:1646 */
break;
- case 249:
-#line 1475 "conf_parser.y" /* yacc.c:1646 */
+ case 250:
+#line 1478 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.max_local.value = (yyvsp[-1].number);
}
-#line 4304 "conf_parser.c" /* yacc.c:1646 */
+#line 4312 "conf_parser.c" /* yacc.c:1646 */
break;
- case 250:
-#line 1481 "conf_parser.y" /* yacc.c:1646 */
+ case 251:
+#line 1484 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.max_ident.value = (yyvsp[-1].number);
}
-#line 4313 "conf_parser.c" /* yacc.c:1646 */
+#line 4321 "conf_parser.c" /* yacc.c:1646 */
break;
- case 251:
-#line 1487 "conf_parser.y" /* yacc.c:1646 */
+ case 252:
+#line 1490 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.max_sendq.value = (yyvsp[-1].number);
}
-#line 4322 "conf_parser.c" /* yacc.c:1646 */
+#line 4330 "conf_parser.c" /* yacc.c:1646 */
break;
- case 252:
-#line 1493 "conf_parser.y" /* yacc.c:1646 */
+ case 253:
+#line 1496 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
if ((yyvsp[-1].number) >= CLIENT_FLOOD_MIN && (yyvsp[-1].number) <= CLIENT_FLOOD_MAX)
block_state.max_recvq.value = (yyvsp[-1].number);
}
-#line 4332 "conf_parser.c" /* yacc.c:1646 */
+#line 4340 "conf_parser.c" /* yacc.c:1646 */
break;
- case 253:
-#line 1500 "conf_parser.y" /* yacc.c:1646 */
+ case 254:
+#line 1503 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.cidr_bitlen_ipv4.value = (yyvsp[-1].number) > 32 ? 32 : (yyvsp[-1].number);
}
-#line 4341 "conf_parser.c" /* yacc.c:1646 */
+#line 4349 "conf_parser.c" /* yacc.c:1646 */
break;
- case 254:
-#line 1506 "conf_parser.y" /* yacc.c:1646 */
+ case 255:
+#line 1509 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.cidr_bitlen_ipv6.value = (yyvsp[-1].number) > 128 ? 128 : (yyvsp[-1].number);
}
-#line 4350 "conf_parser.c" /* yacc.c:1646 */
+#line 4358 "conf_parser.c" /* yacc.c:1646 */
break;
- case 255:
-#line 1512 "conf_parser.y" /* yacc.c:1646 */
+ case 256:
+#line 1515 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.number_per_cidr.value = (yyvsp[-1].number);
}
-#line 4359 "conf_parser.c" /* yacc.c:1646 */
+#line 4367 "conf_parser.c" /* yacc.c:1646 */
break;
- case 256:
-#line 1518 "conf_parser.y" /* yacc.c:1646 */
+ case 257:
+#line 1521 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 1)
break;
@@ -4367,11 +4375,11 @@ yyreduce:
block_state.min_idle.value = (yyvsp[-1].number);
block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
}
-#line 4371 "conf_parser.c" /* yacc.c:1646 */
+#line 4379 "conf_parser.c" /* yacc.c:1646 */
break;
- case 257:
-#line 1527 "conf_parser.y" /* yacc.c:1646 */
+ case 258:
+#line 1530 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 1)
break;
@@ -4379,88 +4387,88 @@ yyreduce:
block_state.max_idle.value = (yyvsp[-1].number);
block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
}
-#line 4383 "conf_parser.c" /* yacc.c:1646 */
+#line 4391 "conf_parser.c" /* yacc.c:1646 */
break;
- case 258:
-#line 1536 "conf_parser.y" /* yacc.c:1646 */
+ case 259:
+#line 1539 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
}
-#line 4392 "conf_parser.c" /* yacc.c:1646 */
+#line 4400 "conf_parser.c" /* yacc.c:1646 */
break;
- case 262:
-#line 1543 "conf_parser.y" /* yacc.c:1646 */
+ case 263:
+#line 1546 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
}
-#line 4401 "conf_parser.c" /* yacc.c:1646 */
+#line 4409 "conf_parser.c" /* yacc.c:1646 */
break;
- case 263:
-#line 1547 "conf_parser.y" /* yacc.c:1646 */
+ case 264:
+#line 1550 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
}
-#line 4410 "conf_parser.c" /* yacc.c:1646 */
+#line 4418 "conf_parser.c" /* yacc.c:1646 */
break;
- case 264:
-#line 1557 "conf_parser.y" /* yacc.c:1646 */
+ case 265:
+#line 1560 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
}
-#line 4419 "conf_parser.c" /* yacc.c:1646 */
+#line 4427 "conf_parser.c" /* yacc.c:1646 */
break;
- case 266:
-#line 1563 "conf_parser.y" /* yacc.c:1646 */
+ case 267:
+#line 1566 "conf_parser.y" /* yacc.c:1646 */
{
block_state.flags.value = 0;
}
-#line 4427 "conf_parser.c" /* yacc.c:1646 */
+#line 4435 "conf_parser.c" /* yacc.c:1646 */
break;
- case 270:
-#line 1569 "conf_parser.y" /* yacc.c:1646 */
+ case 271:
+#line 1572 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= LISTENER_SSL;
}
-#line 4436 "conf_parser.c" /* yacc.c:1646 */
+#line 4444 "conf_parser.c" /* yacc.c:1646 */
break;
- case 271:
-#line 1573 "conf_parser.y" /* yacc.c:1646 */
+ case 272:
+#line 1576 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= LISTENER_HIDDEN;
}
-#line 4445 "conf_parser.c" /* yacc.c:1646 */
+#line 4453 "conf_parser.c" /* yacc.c:1646 */
break;
- case 272:
-#line 1577 "conf_parser.y" /* yacc.c:1646 */
+ case 273:
+#line 1580 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= LISTENER_SERVER;
}
-#line 4454 "conf_parser.c" /* yacc.c:1646 */
+#line 4462 "conf_parser.c" /* yacc.c:1646 */
break;
- case 280:
-#line 1585 "conf_parser.y" /* yacc.c:1646 */
+ case 281:
+#line 1588 "conf_parser.y" /* yacc.c:1646 */
{ block_state.flags.value = 0; }
-#line 4460 "conf_parser.c" /* yacc.c:1646 */
+#line 4468 "conf_parser.c" /* yacc.c:1646 */
break;
- case 284:
-#line 1590 "conf_parser.y" /* yacc.c:1646 */
+ case 285:
+#line 1593 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -4475,11 +4483,11 @@ yyreduce:
add_listener((yyvsp[0].number), block_state.addr.buf, block_state.flags.value);
}
}
-#line 4479 "conf_parser.c" /* yacc.c:1646 */
+#line 4487 "conf_parser.c" /* yacc.c:1646 */
break;
- case 285:
-#line 1604 "conf_parser.y" /* yacc.c:1646 */
+ case 286:
+#line 1607 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -4498,38 +4506,38 @@ yyreduce:
add_listener(i, block_state.addr.buf, block_state.flags.value);
}
}
-#line 4502 "conf_parser.c" /* yacc.c:1646 */
+#line 4510 "conf_parser.c" /* yacc.c:1646 */
break;
- case 286:
-#line 1624 "conf_parser.y" /* yacc.c:1646 */
+ case 287:
+#line 1627 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
}
-#line 4511 "conf_parser.c" /* yacc.c:1646 */
+#line 4519 "conf_parser.c" /* yacc.c:1646 */
break;
- case 287:
-#line 1630 "conf_parser.y" /* yacc.c:1646 */
+ case 288:
+#line 1633 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
}
-#line 4520 "conf_parser.c" /* yacc.c:1646 */
+#line 4528 "conf_parser.c" /* yacc.c:1646 */
break;
- case 288:
-#line 1639 "conf_parser.y" /* yacc.c:1646 */
+ case 289:
+#line 1642 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
}
-#line 4529 "conf_parser.c" /* yacc.c:1646 */
+#line 4537 "conf_parser.c" /* yacc.c:1646 */
break;
- case 289:
-#line 1643 "conf_parser.y" /* yacc.c:1646 */
+ case 290:
+#line 1646 "conf_parser.y" /* yacc.c:1646 */
{
dlink_node *ptr = NULL;
@@ -4566,38 +4574,38 @@ yyreduce:
add_conf_by_address(CONF_CLIENT, conf);
}
}
-#line 4570 "conf_parser.c" /* yacc.c:1646 */
+#line 4578 "conf_parser.c" /* yacc.c:1646 */
break;
- case 301:
-#line 1686 "conf_parser.y" /* yacc.c:1646 */
+ case 302:
+#line 1689 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
}
-#line 4579 "conf_parser.c" /* yacc.c:1646 */
+#line 4587 "conf_parser.c" /* yacc.c:1646 */
break;
- case 302:
-#line 1692 "conf_parser.y" /* yacc.c:1646 */
+ case 303:
+#line 1695 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
}
-#line 4588 "conf_parser.c" /* yacc.c:1646 */
+#line 4596 "conf_parser.c" /* yacc.c:1646 */
break;
- case 303:
-#line 1698 "conf_parser.y" /* yacc.c:1646 */
+ case 304:
+#line 1701 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
}
-#line 4597 "conf_parser.c" /* yacc.c:1646 */
+#line 4605 "conf_parser.c" /* yacc.c:1646 */
break;
- case 304:
-#line 1704 "conf_parser.y" /* yacc.c:1646 */
+ case 305:
+#line 1707 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -4607,110 +4615,110 @@ yyreduce:
block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
}
}
-#line 4611 "conf_parser.c" /* yacc.c:1646 */
+#line 4619 "conf_parser.c" /* yacc.c:1646 */
break;
- case 305:
-#line 1715 "conf_parser.y" /* yacc.c:1646 */
+ case 306:
+#line 1718 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
}
-#line 4620 "conf_parser.c" /* yacc.c:1646 */
+#line 4628 "conf_parser.c" /* yacc.c:1646 */
break;
- case 309:
-#line 1722 "conf_parser.y" /* yacc.c:1646 */
+ case 310:
+#line 1725 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
}
-#line 4629 "conf_parser.c" /* yacc.c:1646 */
+#line 4637 "conf_parser.c" /* yacc.c:1646 */
break;
- case 310:
-#line 1726 "conf_parser.y" /* yacc.c:1646 */
+ case 311:
+#line 1729 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_NOLIMIT;
}
-#line 4638 "conf_parser.c" /* yacc.c:1646 */
+#line 4646 "conf_parser.c" /* yacc.c:1646 */
break;
- case 311:
-#line 1730 "conf_parser.y" /* yacc.c:1646 */
+ case 312:
+#line 1733 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
}
-#line 4647 "conf_parser.c" /* yacc.c:1646 */
+#line 4655 "conf_parser.c" /* yacc.c:1646 */
break;
- case 312:
-#line 1734 "conf_parser.y" /* yacc.c:1646 */
+ case 313:
+#line 1737 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
}
-#line 4656 "conf_parser.c" /* yacc.c:1646 */
+#line 4664 "conf_parser.c" /* yacc.c:1646 */
break;
- case 313:
-#line 1738 "conf_parser.y" /* yacc.c:1646 */
+ case 314:
+#line 1741 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
}
-#line 4665 "conf_parser.c" /* yacc.c:1646 */
+#line 4673 "conf_parser.c" /* yacc.c:1646 */
break;
- case 314:
-#line 1742 "conf_parser.y" /* yacc.c:1646 */
+ case 315:
+#line 1745 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_NO_TILDE;
}
-#line 4674 "conf_parser.c" /* yacc.c:1646 */
+#line 4682 "conf_parser.c" /* yacc.c:1646 */
break;
- case 315:
-#line 1746 "conf_parser.y" /* yacc.c:1646 */
+ case 316:
+#line 1749 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
}
-#line 4683 "conf_parser.c" /* yacc.c:1646 */
+#line 4691 "conf_parser.c" /* yacc.c:1646 */
break;
- case 316:
-#line 1750 "conf_parser.y" /* yacc.c:1646 */
+ case 317:
+#line 1753 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
}
-#line 4692 "conf_parser.c" /* yacc.c:1646 */
+#line 4700 "conf_parser.c" /* yacc.c:1646 */
break;
- case 317:
-#line 1754 "conf_parser.y" /* yacc.c:1646 */
+ case 318:
+#line 1757 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_WEBIRC;
}
-#line 4701 "conf_parser.c" /* yacc.c:1646 */
+#line 4709 "conf_parser.c" /* yacc.c:1646 */
break;
- case 318:
-#line 1758 "conf_parser.y" /* yacc.c:1646 */
+ case 319:
+#line 1761 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
}
-#line 4710 "conf_parser.c" /* yacc.c:1646 */
+#line 4718 "conf_parser.c" /* yacc.c:1646 */
break;
- case 319:
-#line 1764 "conf_parser.y" /* yacc.c:1646 */
+ case 320:
+#line 1767 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -4723,11 +4731,11 @@ yyreduce:
else
ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
}
-#line 4727 "conf_parser.c" /* yacc.c:1646 */
+#line 4735 "conf_parser.c" /* yacc.c:1646 */
break;
- case 320:
-#line 1778 "conf_parser.y" /* yacc.c:1646 */
+ case 321:
+#line 1781 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -4735,11 +4743,11 @@ yyreduce:
strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
block_state.flags.value |= CONF_FLAGS_REDIR;
}
-#line 4739 "conf_parser.c" /* yacc.c:1646 */
+#line 4747 "conf_parser.c" /* yacc.c:1646 */
break;
- case 321:
-#line 1787 "conf_parser.y" /* yacc.c:1646 */
+ case 322:
+#line 1790 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -4747,11 +4755,11 @@ yyreduce:
block_state.flags.value |= CONF_FLAGS_REDIR;
block_state.port.value = (yyvsp[-1].number);
}
-#line 4751 "conf_parser.c" /* yacc.c:1646 */
+#line 4759 "conf_parser.c" /* yacc.c:1646 */
break;
- case 322:
-#line 1800 "conf_parser.y" /* yacc.c:1646 */
+ case 323:
+#line 1803 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -4759,49 +4767,49 @@ yyreduce:
reset_block_state();
strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
}
-#line 4763 "conf_parser.c" /* yacc.c:1646 */
+#line 4771 "conf_parser.c" /* yacc.c:1646 */
break;
- case 323:
-#line 1807 "conf_parser.y" /* yacc.c:1646 */
+ case 324:
+#line 1810 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
}
-#line 4774 "conf_parser.c" /* yacc.c:1646 */
+#line 4782 "conf_parser.c" /* yacc.c:1646 */
break;
- case 330:
-#line 1818 "conf_parser.y" /* yacc.c:1646 */
+ case 331:
+#line 1821 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
}
-#line 4783 "conf_parser.c" /* yacc.c:1646 */
+#line 4791 "conf_parser.c" /* yacc.c:1646 */
break;
- case 331:
-#line 1824 "conf_parser.y" /* yacc.c:1646 */
+ case 332:
+#line 1827 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
}
-#line 4792 "conf_parser.c" /* yacc.c:1646 */
+#line 4800 "conf_parser.c" /* yacc.c:1646 */
break;
- case 332:
-#line 1830 "conf_parser.y" /* yacc.c:1646 */
+ case 333:
+#line 1833 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
}
-#line 4801 "conf_parser.c" /* yacc.c:1646 */
+#line 4809 "conf_parser.c" /* yacc.c:1646 */
break;
- case 338:
-#line 1845 "conf_parser.y" /* yacc.c:1646 */
+ case 339:
+#line 1848 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -4812,11 +4820,11 @@ yyreduce:
conf->name = xstrdup(yylval.string);
}
}
-#line 4816 "conf_parser.c" /* yacc.c:1646 */
+#line 4824 "conf_parser.c" /* yacc.c:1646 */
break;
- case 339:
-#line 1860 "conf_parser.y" /* yacc.c:1646 */
+ case 340:
+#line 1863 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -4828,11 +4836,11 @@ yyreduce:
strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
block_state.flags.value = SHARED_ALL;
}
-#line 4832 "conf_parser.c" /* yacc.c:1646 */
+#line 4840 "conf_parser.c" /* yacc.c:1646 */
break;
- case 340:
-#line 1871 "conf_parser.y" /* yacc.c:1646 */
+ case 341:
+#line 1874 "conf_parser.y" /* yacc.c:1646 */
{
struct MaskItem *conf = NULL;
@@ -4845,20 +4853,20 @@ yyreduce:
conf->user = xstrdup(block_state.user.buf);
conf->host = xstrdup(block_state.host.buf);
}
-#line 4849 "conf_parser.c" /* yacc.c:1646 */
+#line 4857 "conf_parser.c" /* yacc.c:1646 */
break;
- case 347:
-#line 1888 "conf_parser.y" /* yacc.c:1646 */
+ case 348:
+#line 1891 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
}
-#line 4858 "conf_parser.c" /* yacc.c:1646 */
+#line 4866 "conf_parser.c" /* yacc.c:1646 */
break;
- case 348:
-#line 1894 "conf_parser.y" /* yacc.c:1646 */
+ case 349:
+#line 1897 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -4876,110 +4884,110 @@ yyreduce:
split_nuh(&nuh);
}
}
-#line 4880 "conf_parser.c" /* yacc.c:1646 */
+#line 4888 "conf_parser.c" /* yacc.c:1646 */
break;
- case 349:
-#line 1913 "conf_parser.y" /* yacc.c:1646 */
+ case 350:
+#line 1916 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value = 0;
}
-#line 4889 "conf_parser.c" /* yacc.c:1646 */
+#line 4897 "conf_parser.c" /* yacc.c:1646 */
break;
- case 353:
-#line 1920 "conf_parser.y" /* yacc.c:1646 */
+ case 354:
+#line 1923 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_KLINE;
}
-#line 4898 "conf_parser.c" /* yacc.c:1646 */
+#line 4906 "conf_parser.c" /* yacc.c:1646 */
break;
- case 354:
-#line 1924 "conf_parser.y" /* yacc.c:1646 */
+ case 355:
+#line 1927 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNKLINE;
}
-#line 4907 "conf_parser.c" /* yacc.c:1646 */
+#line 4915 "conf_parser.c" /* yacc.c:1646 */
break;
- case 355:
-#line 1928 "conf_parser.y" /* yacc.c:1646 */
+ case 356:
+#line 1931 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_DLINE;
}
-#line 4916 "conf_parser.c" /* yacc.c:1646 */
+#line 4924 "conf_parser.c" /* yacc.c:1646 */
break;
- case 356:
-#line 1932 "conf_parser.y" /* yacc.c:1646 */
+ case 357:
+#line 1935 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNDLINE;
}
-#line 4925 "conf_parser.c" /* yacc.c:1646 */
+#line 4933 "conf_parser.c" /* yacc.c:1646 */
break;
- case 357:
-#line 1936 "conf_parser.y" /* yacc.c:1646 */
+ case 358:
+#line 1939 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_XLINE;
}
-#line 4934 "conf_parser.c" /* yacc.c:1646 */
+#line 4942 "conf_parser.c" /* yacc.c:1646 */
break;
- case 358:
-#line 1940 "conf_parser.y" /* yacc.c:1646 */
+ case 359:
+#line 1943 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNXLINE;
}
-#line 4943 "conf_parser.c" /* yacc.c:1646 */
+#line 4951 "conf_parser.c" /* yacc.c:1646 */
break;
- case 359:
-#line 1944 "conf_parser.y" /* yacc.c:1646 */
+ case 360:
+#line 1947 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_RESV;
}
-#line 4952 "conf_parser.c" /* yacc.c:1646 */
+#line 4960 "conf_parser.c" /* yacc.c:1646 */
break;
- case 360:
-#line 1948 "conf_parser.y" /* yacc.c:1646 */
+ case 361:
+#line 1951 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNRESV;
}
-#line 4961 "conf_parser.c" /* yacc.c:1646 */
+#line 4969 "conf_parser.c" /* yacc.c:1646 */
break;
- case 361:
-#line 1952 "conf_parser.y" /* yacc.c:1646 */
+ case 362:
+#line 1955 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_LOCOPS;
}
-#line 4970 "conf_parser.c" /* yacc.c:1646 */
+#line 4978 "conf_parser.c" /* yacc.c:1646 */
break;
- case 362:
-#line 1956 "conf_parser.y" /* yacc.c:1646 */
+ case 363:
+#line 1959 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value = SHARED_ALL;
}
-#line 4979 "conf_parser.c" /* yacc.c:1646 */
+#line 4987 "conf_parser.c" /* yacc.c:1646 */
break;
- case 363:
-#line 1965 "conf_parser.y" /* yacc.c:1646 */
+ case 364:
+#line 1968 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -4989,11 +4997,11 @@ yyreduce:
strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
block_state.flags.value = SHARED_ALL;
}
-#line 4993 "conf_parser.c" /* yacc.c:1646 */
+#line 5001 "conf_parser.c" /* yacc.c:1646 */
break;
- case 364:
-#line 1974 "conf_parser.y" /* yacc.c:1646 */
+ case 365:
+#line 1977 "conf_parser.y" /* yacc.c:1646 */
{
struct MaskItem *conf = NULL;
@@ -5004,119 +5012,119 @@ yyreduce:
conf->flags = block_state.flags.value;
conf->name = xstrdup(block_state.name.buf);
}
-#line 5008 "conf_parser.c" /* yacc.c:1646 */
+#line 5016 "conf_parser.c" /* yacc.c:1646 */
break;
- case 370:
-#line 1989 "conf_parser.y" /* yacc.c:1646 */
+ case 371:
+#line 1992 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
}
-#line 5017 "conf_parser.c" /* yacc.c:1646 */
+#line 5025 "conf_parser.c" /* yacc.c:1646 */
break;
- case 371:
-#line 1995 "conf_parser.y" /* yacc.c:1646 */
+ case 372:
+#line 1998 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value = 0;
}
-#line 5026 "conf_parser.c" /* yacc.c:1646 */
+#line 5034 "conf_parser.c" /* yacc.c:1646 */
break;
- case 375:
-#line 2002 "conf_parser.y" /* yacc.c:1646 */
+ case 376:
+#line 2005 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_KLINE;
}
-#line 5035 "conf_parser.c" /* yacc.c:1646 */
+#line 5043 "conf_parser.c" /* yacc.c:1646 */
break;
- case 376:
-#line 2006 "conf_parser.y" /* yacc.c:1646 */
+ case 377:
+#line 2009 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNKLINE;
}
-#line 5044 "conf_parser.c" /* yacc.c:1646 */
+#line 5052 "conf_parser.c" /* yacc.c:1646 */
break;
- case 377:
-#line 2010 "conf_parser.y" /* yacc.c:1646 */
+ case 378:
+#line 2013 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_DLINE;
}
-#line 5053 "conf_parser.c" /* yacc.c:1646 */
+#line 5061 "conf_parser.c" /* yacc.c:1646 */
break;
- case 378:
-#line 2014 "conf_parser.y" /* yacc.c:1646 */
+ case 379:
+#line 2017 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNDLINE;
}
-#line 5062 "conf_parser.c" /* yacc.c:1646 */
+#line 5070 "conf_parser.c" /* yacc.c:1646 */
break;
- case 379:
-#line 2018 "conf_parser.y" /* yacc.c:1646 */
+ case 380:
+#line 2021 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_XLINE;
}
-#line 5071 "conf_parser.c" /* yacc.c:1646 */
+#line 5079 "conf_parser.c" /* yacc.c:1646 */
break;
- case 380:
-#line 2022 "conf_parser.y" /* yacc.c:1646 */
+ case 381:
+#line 2025 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNXLINE;
}
-#line 5080 "conf_parser.c" /* yacc.c:1646 */
+#line 5088 "conf_parser.c" /* yacc.c:1646 */
break;
- case 381:
-#line 2026 "conf_parser.y" /* yacc.c:1646 */
+ case 382:
+#line 2029 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_RESV;
}
-#line 5089 "conf_parser.c" /* yacc.c:1646 */
+#line 5097 "conf_parser.c" /* yacc.c:1646 */
break;
- case 382:
-#line 2030 "conf_parser.y" /* yacc.c:1646 */
+ case 383:
+#line 2033 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNRESV;
}
-#line 5098 "conf_parser.c" /* yacc.c:1646 */
+#line 5106 "conf_parser.c" /* yacc.c:1646 */
break;
- case 383:
-#line 2034 "conf_parser.y" /* yacc.c:1646 */
+ case 384:
+#line 2037 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_LOCOPS;
}
-#line 5107 "conf_parser.c" /* yacc.c:1646 */
+#line 5115 "conf_parser.c" /* yacc.c:1646 */
break;
- case 384:
-#line 2038 "conf_parser.y" /* yacc.c:1646 */
+ case 385:
+#line 2041 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value = SHARED_ALL;
}
-#line 5116 "conf_parser.c" /* yacc.c:1646 */
+#line 5124 "conf_parser.c" /* yacc.c:1646 */
break;
- case 385:
-#line 2047 "conf_parser.y" /* yacc.c:1646 */
+ case 386:
+#line 2050 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
@@ -5126,11 +5134,11 @@ yyreduce:
block_state.aftype.value = AF_INET;
block_state.port.value = PORTNUM;
}
-#line 5130 "conf_parser.c" /* yacc.c:1646 */
+#line 5138 "conf_parser.c" /* yacc.c:1646 */
break;
- case 386:
-#line 2056 "conf_parser.y" /* yacc.c:1646 */
+ case 387:
+#line 2059 "conf_parser.y" /* yacc.c:1646 */
{
struct MaskItem *conf = NULL;
struct addrinfo hints, *res;
@@ -5192,38 +5200,38 @@ yyreduce:
conf_add_class_to_conf(conf, block_state.class.buf);
lookup_confhost(conf);
}
-#line 5196 "conf_parser.c" /* yacc.c:1646 */
+#line 5204 "conf_parser.c" /* yacc.c:1646 */
break;
- case 404:
-#line 2128 "conf_parser.y" /* yacc.c:1646 */
+ case 405:
+#line 2131 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
}
-#line 5205 "conf_parser.c" /* yacc.c:1646 */
+#line 5213 "conf_parser.c" /* yacc.c:1646 */
break;
- case 405:
-#line 2134 "conf_parser.y" /* yacc.c:1646 */
+ case 406:
+#line 2137 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
}
-#line 5214 "conf_parser.c" /* yacc.c:1646 */
+#line 5222 "conf_parser.c" /* yacc.c:1646 */
break;
- case 406:
-#line 2140 "conf_parser.y" /* yacc.c:1646 */
+ case 407:
+#line 2143 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
}
-#line 5223 "conf_parser.c" /* yacc.c:1646 */
+#line 5231 "conf_parser.c" /* yacc.c:1646 */
break;
- case 407:
-#line 2146 "conf_parser.y" /* yacc.c:1646 */
+ case 408:
+#line 2149 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -5235,11 +5243,11 @@ yyreduce:
else
strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
}
-#line 5239 "conf_parser.c" /* yacc.c:1646 */
+#line 5247 "conf_parser.c" /* yacc.c:1646 */
break;
- case 408:
-#line 2159 "conf_parser.y" /* yacc.c:1646 */
+ case 409:
+#line 2162 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -5251,75 +5259,75 @@ yyreduce:
else
strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
}
-#line 5255 "conf_parser.c" /* yacc.c:1646 */
+#line 5263 "conf_parser.c" /* yacc.c:1646 */
break;
- case 409:
-#line 2172 "conf_parser.y" /* yacc.c:1646 */
+ case 410:
+#line 2175 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
}
-#line 5264 "conf_parser.c" /* yacc.c:1646 */
+#line 5272 "conf_parser.c" /* yacc.c:1646 */
break;
- case 410:
-#line 2178 "conf_parser.y" /* yacc.c:1646 */
+ case 411:
+#line 2181 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value = (yyvsp[-1].number);
}
-#line 5273 "conf_parser.c" /* yacc.c:1646 */
+#line 5281 "conf_parser.c" /* yacc.c:1646 */
break;
- case 411:
-#line 2184 "conf_parser.y" /* yacc.c:1646 */
+ case 412:
+#line 2187 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.aftype.value = AF_INET;
}
-#line 5282 "conf_parser.c" /* yacc.c:1646 */
+#line 5290 "conf_parser.c" /* yacc.c:1646 */
break;
- case 412:
-#line 2188 "conf_parser.y" /* yacc.c:1646 */
+ case 413:
+#line 2191 "conf_parser.y" /* yacc.c:1646 */
{
#ifdef IPV6
if (conf_parser_ctx.pass == 2)
block_state.aftype.value = AF_INET6;
#endif
}
-#line 5293 "conf_parser.c" /* yacc.c:1646 */
+#line 5301 "conf_parser.c" /* yacc.c:1646 */
break;
- case 413:
-#line 2196 "conf_parser.y" /* yacc.c:1646 */
+ case 414:
+#line 2199 "conf_parser.y" /* yacc.c:1646 */
{
block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
}
-#line 5301 "conf_parser.c" /* yacc.c:1646 */
+#line 5309 "conf_parser.c" /* yacc.c:1646 */
break;
- case 417:
-#line 2202 "conf_parser.y" /* yacc.c:1646 */
+ case 418:
+#line 2205 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
}
-#line 5310 "conf_parser.c" /* yacc.c:1646 */
+#line 5318 "conf_parser.c" /* yacc.c:1646 */
break;
- case 418:
-#line 2206 "conf_parser.y" /* yacc.c:1646 */
+ case 419:
+#line 2209 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_SSL;
}
-#line 5319 "conf_parser.c" /* yacc.c:1646 */
+#line 5327 "conf_parser.c" /* yacc.c:1646 */
break;
- case 419:
-#line 2212 "conf_parser.y" /* yacc.c:1646 */
+ case 420:
+#line 2215 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -5329,38 +5337,38 @@ yyreduce:
block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
}
}
-#line 5333 "conf_parser.c" /* yacc.c:1646 */
+#line 5341 "conf_parser.c" /* yacc.c:1646 */
break;
- case 420:
-#line 2223 "conf_parser.y" /* yacc.c:1646 */
+ case 421:
+#line 2226 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
}
-#line 5342 "conf_parser.c" /* yacc.c:1646 */
+#line 5350 "conf_parser.c" /* yacc.c:1646 */
break;
- case 421:
-#line 2229 "conf_parser.y" /* yacc.c:1646 */
+ case 422:
+#line 2232 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
}
-#line 5351 "conf_parser.c" /* yacc.c:1646 */
+#line 5359 "conf_parser.c" /* yacc.c:1646 */
break;
- case 422:
-#line 2235 "conf_parser.y" /* yacc.c:1646 */
+ case 423:
+#line 2238 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
}
-#line 5360 "conf_parser.c" /* yacc.c:1646 */
+#line 5368 "conf_parser.c" /* yacc.c:1646 */
break;
- case 423:
-#line 2241 "conf_parser.y" /* yacc.c:1646 */
+ case 424:
+#line 2244 "conf_parser.y" /* yacc.c:1646 */
{
#ifdef HAVE_LIBCRYPTO
if (conf_parser_ctx.pass == 2)
@@ -5370,20 +5378,20 @@ yyreduce:
conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
#endif
}
-#line 5374 "conf_parser.c" /* yacc.c:1646 */
+#line 5382 "conf_parser.c" /* yacc.c:1646 */
break;
- case 424:
-#line 2256 "conf_parser.y" /* yacc.c:1646 */
+ case 425:
+#line 2259 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
}
-#line 5383 "conf_parser.c" /* yacc.c:1646 */
+#line 5391 "conf_parser.c" /* yacc.c:1646 */
break;
- case 425:
-#line 2260 "conf_parser.y" /* yacc.c:1646 */
+ case 426:
+#line 2263 "conf_parser.y" /* yacc.c:1646 */
{
struct MaskItem *conf = NULL;
@@ -5404,11 +5412,11 @@ yyreduce:
conf->reason = xstrdup(CONF_NOREASON);
add_conf_by_address(CONF_KLINE, conf);
}
-#line 5408 "conf_parser.c" /* yacc.c:1646 */
+#line 5416 "conf_parser.c" /* yacc.c:1646 */
break;
- case 431:
-#line 2285 "conf_parser.y" /* yacc.c:1646 */
+ case 432:
+#line 2288 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
@@ -5427,29 +5435,29 @@ yyreduce:
split_nuh(&nuh);
}
}
-#line 5431 "conf_parser.c" /* yacc.c:1646 */
+#line 5439 "conf_parser.c" /* yacc.c:1646 */
break;
- case 432:
-#line 2305 "conf_parser.y" /* yacc.c:1646 */
+ case 433:
+#line 2308 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
}
-#line 5440 "conf_parser.c" /* yacc.c:1646 */
+#line 5448 "conf_parser.c" /* yacc.c:1646 */
break;
- case 433:
-#line 2314 "conf_parser.y" /* yacc.c:1646 */
+ case 434:
+#line 2317 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
}
-#line 5449 "conf_parser.c" /* yacc.c:1646 */
+#line 5457 "conf_parser.c" /* yacc.c:1646 */
break;
- case 434:
-#line 2318 "conf_parser.y" /* yacc.c:1646 */
+ case 435:
+#line 2321 "conf_parser.y" /* yacc.c:1646 */
{
struct MaskItem *conf = NULL;
@@ -5471,29 +5479,29 @@ yyreduce:
add_conf_by_address(CONF_DLINE, conf);
}
}
-#line 5475 "conf_parser.c" /* yacc.c:1646 */
+#line 5483 "conf_parser.c" /* yacc.c:1646 */
break;
- case 440:
-#line 2344 "conf_parser.y" /* yacc.c:1646 */
+ case 441:
+#line 2347 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
}
-#line 5484 "conf_parser.c" /* yacc.c:1646 */
+#line 5492 "conf_parser.c" /* yacc.c:1646 */
break;
- case 441:
-#line 2350 "conf_parser.y" /* yacc.c:1646 */
+ case 442:
+#line 2353 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
}
-#line 5493 "conf_parser.c" /* yacc.c:1646 */
+#line 5501 "conf_parser.c" /* yacc.c:1646 */
break;
- case 447:
-#line 2364 "conf_parser.y" /* yacc.c:1646 */
+ case 448:
+#line 2367 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -5506,20 +5514,20 @@ yyreduce:
}
}
}
-#line 5510 "conf_parser.c" /* yacc.c:1646 */
+#line 5518 "conf_parser.c" /* yacc.c:1646 */
break;
- case 448:
-#line 2381 "conf_parser.y" /* yacc.c:1646 */
+ case 449:
+#line 2384 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
}
-#line 5519 "conf_parser.c" /* yacc.c:1646 */
+#line 5527 "conf_parser.c" /* yacc.c:1646 */
break;
- case 449:
-#line 2385 "conf_parser.y" /* yacc.c:1646 */
+ case 450:
+#line 2388 "conf_parser.y" /* yacc.c:1646 */
{
struct MaskItem *conf = NULL;
@@ -5537,186 +5545,186 @@ yyreduce:
else
conf->reason = xstrdup(CONF_NOREASON);
}
-#line 5541 "conf_parser.c" /* yacc.c:1646 */
+#line 5549 "conf_parser.c" /* yacc.c:1646 */
break;
- case 455:
-#line 2407 "conf_parser.y" /* yacc.c:1646 */
+ case 456:
+#line 2410 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
}
-#line 5550 "conf_parser.c" /* yacc.c:1646 */
+#line 5558 "conf_parser.c" /* yacc.c:1646 */
break;
- case 456:
-#line 2413 "conf_parser.y" /* yacc.c:1646 */
+ case 457:
+#line 2416 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
}
-#line 5559 "conf_parser.c" /* yacc.c:1646 */
- break;
-
- case 510:
-#line 2458 "conf_parser.y" /* yacc.c:1646 */
- {
- ConfigFileEntry.max_watch = (yyvsp[-1].number);
-}
#line 5567 "conf_parser.c" /* yacc.c:1646 */
break;
case 511:
-#line 2463 "conf_parser.y" /* yacc.c:1646 */
+#line 2461 "conf_parser.y" /* yacc.c:1646 */
{
- if (conf_parser_ctx.pass == 2)
- ConfigFileEntry.cycle_on_host_change = yylval.number;
+ ConfigFileEntry.max_watch = (yyvsp[-1].number);
}
-#line 5576 "conf_parser.c" /* yacc.c:1646 */
+#line 5575 "conf_parser.c" /* yacc.c:1646 */
break;
case 512:
-#line 2469 "conf_parser.y" /* yacc.c:1646 */
+#line 2466 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- ConfigFileEntry.glines = yylval.number;
+ ConfigFileEntry.cycle_on_host_change = yylval.number;
}
-#line 5585 "conf_parser.c" /* yacc.c:1646 */
+#line 5584 "conf_parser.c" /* yacc.c:1646 */
break;
case 513:
-#line 2475 "conf_parser.y" /* yacc.c:1646 */
+#line 2472 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- ConfigFileEntry.gline_time = (yyvsp[-1].number);
+ ConfigFileEntry.glines = yylval.number;
}
-#line 5594 "conf_parser.c" /* yacc.c:1646 */
+#line 5593 "conf_parser.c" /* yacc.c:1646 */
break;
case 514:
-#line 2481 "conf_parser.y" /* yacc.c:1646 */
+#line 2478 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
- ConfigFileEntry.gline_request_time = (yyvsp[-1].number);
+ ConfigFileEntry.gline_time = (yyvsp[-1].number);
}
-#line 5603 "conf_parser.c" /* yacc.c:1646 */
+#line 5602 "conf_parser.c" /* yacc.c:1646 */
break;
case 515:
-#line 2487 "conf_parser.y" /* yacc.c:1646 */
+#line 2484 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.gline_min_cidr = (yyvsp[-1].number);
+ if (conf_parser_ctx.pass == 2)
+ ConfigFileEntry.gline_request_time = (yyvsp[-1].number);
}
#line 5611 "conf_parser.c" /* yacc.c:1646 */
break;
case 516:
-#line 2492 "conf_parser.y" /* yacc.c:1646 */
+#line 2490 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.gline_min_cidr6 = (yyvsp[-1].number);
+ ConfigFileEntry.gline_min_cidr = (yyvsp[-1].number);
}
#line 5619 "conf_parser.c" /* yacc.c:1646 */
break;
case 517:
-#line 2497 "conf_parser.y" /* yacc.c:1646 */
+#line 2495 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.tkline_expire_notices = yylval.number;
+ ConfigFileEntry.gline_min_cidr6 = (yyvsp[-1].number);
}
#line 5627 "conf_parser.c" /* yacc.c:1646 */
break;
case 518:
-#line 2502 "conf_parser.y" /* yacc.c:1646 */
+#line 2500 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.kill_chase_time_limit = (yyvsp[-1].number);
+ ConfigFileEntry.tkline_expire_notices = yylval.number;
}
#line 5635 "conf_parser.c" /* yacc.c:1646 */
break;
case 519:
-#line 2507 "conf_parser.y" /* yacc.c:1646 */
+#line 2505 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.hide_spoof_ips = yylval.number;
+ ConfigFileEntry.kill_chase_time_limit = (yyvsp[-1].number);
}
#line 5643 "conf_parser.c" /* yacc.c:1646 */
break;
case 520:
-#line 2512 "conf_parser.y" /* yacc.c:1646 */
+#line 2510 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.ignore_bogus_ts = yylval.number;
+ ConfigFileEntry.hide_spoof_ips = yylval.number;
}
#line 5651 "conf_parser.c" /* yacc.c:1646 */
break;
case 521:
-#line 2517 "conf_parser.y" /* yacc.c:1646 */
+#line 2515 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.failed_oper_notice = yylval.number;
+ ConfigFileEntry.ignore_bogus_ts = yylval.number;
}
#line 5659 "conf_parser.c" /* yacc.c:1646 */
break;
case 522:
-#line 2522 "conf_parser.y" /* yacc.c:1646 */
+#line 2520 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.anti_nick_flood = yylval.number;
+ ConfigFileEntry.failed_oper_notice = yylval.number;
}
#line 5667 "conf_parser.c" /* yacc.c:1646 */
break;
case 523:
-#line 2527 "conf_parser.y" /* yacc.c:1646 */
+#line 2525 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.max_nick_time = (yyvsp[-1].number);
+ ConfigFileEntry.anti_nick_flood = yylval.number;
}
#line 5675 "conf_parser.c" /* yacc.c:1646 */
break;
case 524:
-#line 2532 "conf_parser.y" /* yacc.c:1646 */
+#line 2530 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.max_nick_changes = (yyvsp[-1].number);
+ ConfigFileEntry.max_nick_time = (yyvsp[-1].number);
}
#line 5683 "conf_parser.c" /* yacc.c:1646 */
break;
case 525:
-#line 2537 "conf_parser.y" /* yacc.c:1646 */
+#line 2535 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.max_accept = (yyvsp[-1].number);
+ ConfigFileEntry.max_nick_changes = (yyvsp[-1].number);
}
#line 5691 "conf_parser.c" /* yacc.c:1646 */
break;
case 526:
-#line 2542 "conf_parser.y" /* yacc.c:1646 */
+#line 2540 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[-1].number);
+ ConfigFileEntry.max_accept = (yyvsp[-1].number);
}
#line 5699 "conf_parser.c" /* yacc.c:1646 */
break;
case 527:
-#line 2547 "conf_parser.y" /* yacc.c:1646 */
+#line 2545 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.ts_warn_delta = (yyvsp[-1].number);
+ ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[-1].number);
}
#line 5707 "conf_parser.c" /* yacc.c:1646 */
break;
case 528:
-#line 2552 "conf_parser.y" /* yacc.c:1646 */
+#line 2550 "conf_parser.y" /* yacc.c:1646 */
+ {
+ ConfigFileEntry.ts_warn_delta = (yyvsp[-1].number);
+}
+#line 5715 "conf_parser.c" /* yacc.c:1646 */
+ break;
+
+ case 529:
+#line 2555 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigFileEntry.ts_max_delta = (yyvsp[-1].number);
}
-#line 5716 "conf_parser.c" /* yacc.c:1646 */
+#line 5724 "conf_parser.c" /* yacc.c:1646 */
break;
- case 529:
-#line 2558 "conf_parser.y" /* yacc.c:1646 */
+ case 530:
+#line 2561 "conf_parser.y" /* yacc.c:1646 */
{
if (((yyvsp[-1].number) > 0) && conf_parser_ctx.pass == 1)
{
@@ -5726,61 +5734,53 @@ yyreduce:
exit(0);
}
}
-#line 5730 "conf_parser.c" /* yacc.c:1646 */
- break;
-
- case 530:
-#line 2569 "conf_parser.y" /* yacc.c:1646 */
- {
- ConfigFileEntry.invisible_on_connect = yylval.number;
-}
#line 5738 "conf_parser.c" /* yacc.c:1646 */
break;
case 531:
-#line 2574 "conf_parser.y" /* yacc.c:1646 */
+#line 2572 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.warn_no_nline = yylval.number;
+ ConfigFileEntry.invisible_on_connect = yylval.number;
}
#line 5746 "conf_parser.c" /* yacc.c:1646 */
break;
case 532:
-#line 2579 "conf_parser.y" /* yacc.c:1646 */
+#line 2577 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.stats_e_disabled = yylval.number;
+ ConfigFileEntry.warn_no_nline = yylval.number;
}
#line 5754 "conf_parser.c" /* yacc.c:1646 */
break;
case 533:
-#line 2584 "conf_parser.y" /* yacc.c:1646 */
+#line 2582 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.stats_o_oper_only = yylval.number;
+ ConfigFileEntry.stats_e_disabled = yylval.number;
}
#line 5762 "conf_parser.c" /* yacc.c:1646 */
break;
case 534:
-#line 2589 "conf_parser.y" /* yacc.c:1646 */
+#line 2587 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.stats_P_oper_only = yylval.number;
+ ConfigFileEntry.stats_o_oper_only = yylval.number;
}
#line 5770 "conf_parser.c" /* yacc.c:1646 */
break;
case 535:
-#line 2594 "conf_parser.y" /* yacc.c:1646 */
+#line 2592 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.stats_u_oper_only = yylval.number;
+ ConfigFileEntry.stats_P_oper_only = yylval.number;
}
#line 5778 "conf_parser.c" /* yacc.c:1646 */
break;
case 536:
-#line 2599 "conf_parser.y" /* yacc.c:1646 */
+#line 2597 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
+ ConfigFileEntry.stats_u_oper_only = yylval.number;
}
#line 5786 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -5788,15 +5788,15 @@ yyreduce:
case 537:
#line 2602 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.stats_k_oper_only = 1;
+ ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
}
#line 5794 "conf_parser.c" /* yacc.c:1646 */
break;
case 538:
-#line 2607 "conf_parser.y" /* yacc.c:1646 */
+#line 2605 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
+ ConfigFileEntry.stats_k_oper_only = 1;
}
#line 5802 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -5804,101 +5804,109 @@ yyreduce:
case 539:
#line 2610 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.stats_i_oper_only = 1;
+ ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
}
#line 5810 "conf_parser.c" /* yacc.c:1646 */
break;
case 540:
-#line 2615 "conf_parser.y" /* yacc.c:1646 */
+#line 2613 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.pace_wait = (yyvsp[-1].number);
+ ConfigFileEntry.stats_i_oper_only = 1;
}
#line 5818 "conf_parser.c" /* yacc.c:1646 */
break;
case 541:
-#line 2620 "conf_parser.y" /* yacc.c:1646 */
+#line 2618 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.caller_id_wait = (yyvsp[-1].number);
+ ConfigFileEntry.pace_wait = (yyvsp[-1].number);
}
#line 5826 "conf_parser.c" /* yacc.c:1646 */
break;
case 542:
-#line 2625 "conf_parser.y" /* yacc.c:1646 */
+#line 2623 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.opers_bypass_callerid = yylval.number;
+ ConfigFileEntry.caller_id_wait = (yyvsp[-1].number);
}
#line 5834 "conf_parser.c" /* yacc.c:1646 */
break;
case 543:
-#line 2630 "conf_parser.y" /* yacc.c:1646 */
+#line 2628 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.pace_wait_simple = (yyvsp[-1].number);
+ ConfigFileEntry.opers_bypass_callerid = yylval.number;
}
#line 5842 "conf_parser.c" /* yacc.c:1646 */
break;
case 544:
-#line 2635 "conf_parser.y" /* yacc.c:1646 */
+#line 2633 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.short_motd = yylval.number;
+ ConfigFileEntry.pace_wait_simple = (yyvsp[-1].number);
}
#line 5850 "conf_parser.c" /* yacc.c:1646 */
break;
case 545:
-#line 2640 "conf_parser.y" /* yacc.c:1646 */
+#line 2638 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.no_oper_flood = yylval.number;
+ ConfigFileEntry.short_motd = yylval.number;
}
#line 5858 "conf_parser.c" /* yacc.c:1646 */
break;
case 546:
-#line 2645 "conf_parser.y" /* yacc.c:1646 */
+#line 2643 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.true_no_oper_flood = yylval.number;
+ ConfigFileEntry.no_oper_flood = yylval.number;
}
#line 5866 "conf_parser.c" /* yacc.c:1646 */
break;
case 547:
-#line 2650 "conf_parser.y" /* yacc.c:1646 */
+#line 2648 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_pass_resv = yylval.number;
+ ConfigFileEntry.true_no_oper_flood = yylval.number;
}
#line 5874 "conf_parser.c" /* yacc.c:1646 */
break;
case 548:
-#line 2655 "conf_parser.y" /* yacc.c:1646 */
+#line 2653 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.dots_in_ident = (yyvsp[-1].number);
+ ConfigFileEntry.oper_pass_resv = yylval.number;
}
#line 5882 "conf_parser.c" /* yacc.c:1646 */
break;
case 549:
-#line 2660 "conf_parser.y" /* yacc.c:1646 */
+#line 2658 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.max_targets = (yyvsp[-1].number);
+ ConfigFileEntry.dots_in_ident = (yyvsp[-1].number);
}
#line 5890 "conf_parser.c" /* yacc.c:1646 */
break;
case 550:
-#line 2665 "conf_parser.y" /* yacc.c:1646 */
+#line 2663 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.use_egd = yylval.number;
+ ConfigFileEntry.max_targets = (yyvsp[-1].number);
}
#line 5898 "conf_parser.c" /* yacc.c:1646 */
break;
case 551:
-#line 2670 "conf_parser.y" /* yacc.c:1646 */
+#line 2668 "conf_parser.y" /* yacc.c:1646 */
+ {
+ ConfigFileEntry.use_egd = yylval.number;
+}
+#line 5906 "conf_parser.c" /* yacc.c:1646 */
+ break;
+
+ case 552:
+#line 2673 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -5906,11 +5914,11 @@ yyreduce:
ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
}
}
-#line 5910 "conf_parser.c" /* yacc.c:1646 */
+#line 5918 "conf_parser.c" /* yacc.c:1646 */
break;
- case 552:
-#line 2679 "conf_parser.y" /* yacc.c:1646 */
+ case 553:
+#line 2682 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
{
@@ -5918,45 +5926,37 @@ yyreduce:
ConfigFileEntry.service_name = xstrdup(yylval.string);
}
}
-#line 5922 "conf_parser.c" /* yacc.c:1646 */
- break;
-
- case 553:
-#line 2688 "conf_parser.y" /* yacc.c:1646 */
- {
- ConfigFileEntry.ping_cookie = yylval.number;
-}
#line 5930 "conf_parser.c" /* yacc.c:1646 */
break;
case 554:
-#line 2693 "conf_parser.y" /* yacc.c:1646 */
+#line 2691 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.disable_auth = yylval.number;
+ ConfigFileEntry.ping_cookie = yylval.number;
}
#line 5938 "conf_parser.c" /* yacc.c:1646 */
break;
case 555:
-#line 2698 "conf_parser.y" /* yacc.c:1646 */
+#line 2696 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.throttle_time = yylval.number;
+ ConfigFileEntry.disable_auth = yylval.number;
}
#line 5946 "conf_parser.c" /* yacc.c:1646 */
break;
case 556:
-#line 2703 "conf_parser.y" /* yacc.c:1646 */
+#line 2701 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes = 0;
+ ConfigFileEntry.throttle_time = yylval.number;
}
#line 5954 "conf_parser.c" /* yacc.c:1646 */
break;
- case 560:
-#line 2709 "conf_parser.y" /* yacc.c:1646 */
+ case 557:
+#line 2706 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_BOTS;
+ ConfigFileEntry.oper_umodes = 0;
}
#line 5962 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -5964,7 +5964,7 @@ yyreduce:
case 561:
#line 2712 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_CCONN;
+ ConfigFileEntry.oper_umodes |= UMODE_BOTS;
}
#line 5970 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -5972,7 +5972,7 @@ yyreduce:
case 562:
#line 2715 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_DEAF;
+ ConfigFileEntry.oper_umodes |= UMODE_CCONN;
}
#line 5978 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -5980,7 +5980,7 @@ yyreduce:
case 563:
#line 2718 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
+ ConfigFileEntry.oper_umodes |= UMODE_DEAF;
}
#line 5986 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -5988,7 +5988,7 @@ yyreduce:
case 564:
#line 2721 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_FULL;
+ ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
}
#line 5994 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -5996,7 +5996,7 @@ yyreduce:
case 565:
#line 2724 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
+ ConfigFileEntry.oper_umodes |= UMODE_FULL;
}
#line 6002 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6004,7 +6004,7 @@ yyreduce:
case 566:
#line 2727 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_SKILL;
+ ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
}
#line 6010 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6012,7 +6012,7 @@ yyreduce:
case 567:
#line 2730 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
+ ConfigFileEntry.oper_umodes |= UMODE_SKILL;
}
#line 6018 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6020,7 +6020,7 @@ yyreduce:
case 568:
#line 2733 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_REJ;
+ ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
}
#line 6026 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6028,7 +6028,7 @@ yyreduce:
case 569:
#line 2736 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
+ ConfigFileEntry.oper_umodes |= UMODE_REJ;
}
#line 6034 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6036,7 +6036,7 @@ yyreduce:
case 570:
#line 2739 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_SPY;
+ ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
}
#line 6042 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6044,7 +6044,7 @@ yyreduce:
case 571:
#line 2742 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
+ ConfigFileEntry.oper_umodes |= UMODE_SPY;
}
#line 6050 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6052,7 +6052,7 @@ yyreduce:
case 572:
#line 2745 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
+ ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
}
#line 6058 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6060,7 +6060,7 @@ yyreduce:
case 573:
#line 2748 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
+ ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
}
#line 6066 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6068,7 +6068,7 @@ yyreduce:
case 574:
#line 2751 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
+ ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
}
#line 6074 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6076,7 +6076,7 @@ yyreduce:
case 575:
#line 2754 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
+ ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
}
#line 6082 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6084,7 +6084,7 @@ yyreduce:
case 576:
#line 2757 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
+ ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
}
#line 6090 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6092,7 +6092,7 @@ yyreduce:
case 577:
#line 2760 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
+ ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
}
#line 6098 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6100,7 +6100,7 @@ yyreduce:
case 578:
#line 2763 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
+ ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
}
#line 6106 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6108,7 +6108,7 @@ yyreduce:
case 579:
#line 2766 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_REGONLY;
+ ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
}
#line 6114 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6116,23 +6116,23 @@ yyreduce:
case 580:
#line 2769 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT;
+ ConfigFileEntry.oper_umodes |= UMODE_REGONLY;
}
#line 6122 "conf_parser.c" /* yacc.c:1646 */
break;
case 581:
-#line 2774 "conf_parser.y" /* yacc.c:1646 */
+#line 2772 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes = 0;
+ ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT;
}
#line 6130 "conf_parser.c" /* yacc.c:1646 */
break;
- case 585:
-#line 2780 "conf_parser.y" /* yacc.c:1646 */
+ case 582:
+#line 2777 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
+ ConfigFileEntry.oper_only_umodes = 0;
}
#line 6138 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6140,7 +6140,7 @@ yyreduce:
case 586:
#line 2783 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
+ ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
}
#line 6146 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6148,7 +6148,7 @@ yyreduce:
case 587:
#line 2786 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
+ ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
}
#line 6154 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6156,23 +6156,23 @@ yyreduce:
case 588:
#line 2789 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
+ ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
}
#line 6162 "conf_parser.c" /* yacc.c:1646 */
break;
case 589:
#line 2792 "conf_parser.y" /* yacc.c:1646 */
- {
- ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
+ {
+ ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
}
#line 6170 "conf_parser.c" /* yacc.c:1646 */
break;
case 590:
#line 2795 "conf_parser.y" /* yacc.c:1646 */
- {
- ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
+ {
+ ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
}
#line 6178 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6180,7 +6180,7 @@ yyreduce:
case 591:
#line 2798 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
+ ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
}
#line 6186 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6188,7 +6188,7 @@ yyreduce:
case 592:
#line 2801 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
+ ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
}
#line 6194 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6196,7 +6196,7 @@ yyreduce:
case 593:
#line 2804 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
+ ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
}
#line 6202 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6204,7 +6204,7 @@ yyreduce:
case 594:
#line 2807 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
+ ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
}
#line 6210 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6212,7 +6212,7 @@ yyreduce:
case 595:
#line 2810 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
+ ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
}
#line 6218 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6220,7 +6220,7 @@ yyreduce:
case 596:
#line 2813 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
+ ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
}
#line 6226 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6228,7 +6228,7 @@ yyreduce:
case 597:
#line 2816 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
+ ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
}
#line 6234 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6236,7 +6236,7 @@ yyreduce:
case 598:
#line 2819 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
+ ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
}
#line 6242 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6244,7 +6244,7 @@ yyreduce:
case 599:
#line 2822 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
+ ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
}
#line 6250 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6252,7 +6252,7 @@ yyreduce:
case 600:
#line 2825 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
+ ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
}
#line 6258 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6260,7 +6260,7 @@ yyreduce:
case 601:
#line 2828 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
+ ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
}
#line 6266 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6268,7 +6268,7 @@ yyreduce:
case 602:
#line 2831 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
+ ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
}
#line 6274 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6276,7 +6276,7 @@ yyreduce:
case 603:
#line 2834 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
+ ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
}
#line 6282 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6284,7 +6284,7 @@ yyreduce:
case 604:
#line 2837 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
+ ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
}
#line 6290 "conf_parser.c" /* yacc.c:1646 */
break;
@@ -6292,169 +6292,177 @@ yyreduce:
case 605:
#line 2840 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT;
+ ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
}
#line 6298 "conf_parser.c" /* yacc.c:1646 */
break;
case 606:
-#line 2845 "conf_parser.y" /* yacc.c:1646 */
+#line 2843 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.min_nonwildcard = (yyvsp[-1].number);
+ ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT;
}
#line 6306 "conf_parser.c" /* yacc.c:1646 */
break;
case 607:
-#line 2850 "conf_parser.y" /* yacc.c:1646 */
+#line 2848 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.min_nonwildcard_simple = (yyvsp[-1].number);
+ ConfigFileEntry.min_nonwildcard = (yyvsp[-1].number);
}
#line 6314 "conf_parser.c" /* yacc.c:1646 */
break;
case 608:
-#line 2855 "conf_parser.y" /* yacc.c:1646 */
+#line 2853 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.default_floodcount = (yyvsp[-1].number);
+ ConfigFileEntry.min_nonwildcard_simple = (yyvsp[-1].number);
}
#line 6322 "conf_parser.c" /* yacc.c:1646 */
break;
- case 625:
-#line 2878 "conf_parser.y" /* yacc.c:1646 */
+ case 609:
+#line 2858 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigChannel.disable_fake_channels = yylval.number;
+ ConfigFileEntry.default_floodcount = (yyvsp[-1].number);
}
#line 6330 "conf_parser.c" /* yacc.c:1646 */
break;
case 626:
-#line 2883 "conf_parser.y" /* yacc.c:1646 */
+#line 2881 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigChannel.knock_delay = (yyvsp[-1].number);
+ ConfigChannel.disable_fake_channels = yylval.number;
}
#line 6338 "conf_parser.c" /* yacc.c:1646 */
break;
case 627:
-#line 2888 "conf_parser.y" /* yacc.c:1646 */
+#line 2886 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigChannel.knock_delay_channel = (yyvsp[-1].number);
+ ConfigChannel.knock_delay = (yyvsp[-1].number);
}
#line 6346 "conf_parser.c" /* yacc.c:1646 */
break;
case 628:
-#line 2893 "conf_parser.y" /* yacc.c:1646 */
+#line 2891 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigChannel.max_chans_per_user = (yyvsp[-1].number);
+ ConfigChannel.knock_delay_channel = (yyvsp[-1].number);
}
#line 6354 "conf_parser.c" /* yacc.c:1646 */
break;
case 629:
-#line 2898 "conf_parser.y" /* yacc.c:1646 */
+#line 2896 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigChannel.max_chans_per_oper = (yyvsp[-1].number);
+ ConfigChannel.max_chans_per_user = (yyvsp[-1].number);
}
#line 6362 "conf_parser.c" /* yacc.c:1646 */
break;
case 630:
-#line 2903 "conf_parser.y" /* yacc.c:1646 */
+#line 2901 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigChannel.max_bans = (yyvsp[-1].number);
+ ConfigChannel.max_chans_per_oper = (yyvsp[-1].number);
}
#line 6370 "conf_parser.c" /* yacc.c:1646 */
break;
case 631:
-#line 2908 "conf_parser.y" /* yacc.c:1646 */
+#line 2906 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigChannel.default_split_user_count = (yyvsp[-1].number);
+ ConfigChannel.max_bans = (yyvsp[-1].number);
}
#line 6378 "conf_parser.c" /* yacc.c:1646 */
break;
case 632:
-#line 2913 "conf_parser.y" /* yacc.c:1646 */
+#line 2911 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigChannel.default_split_server_count = (yyvsp[-1].number);
+ ConfigChannel.default_split_user_count = (yyvsp[-1].number);
}
#line 6386 "conf_parser.c" /* yacc.c:1646 */
break;
case 633:
-#line 2918 "conf_parser.y" /* yacc.c:1646 */
+#line 2916 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigChannel.no_create_on_split = yylval.number;
+ ConfigChannel.default_split_server_count = (yyvsp[-1].number);
}
#line 6394 "conf_parser.c" /* yacc.c:1646 */
break;
case 634:
-#line 2923 "conf_parser.y" /* yacc.c:1646 */
+#line 2921 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigChannel.no_join_on_split = yylval.number;
+ ConfigChannel.no_create_on_split = yylval.number;
}
#line 6402 "conf_parser.c" /* yacc.c:1646 */
break;
case 635:
-#line 2928 "conf_parser.y" /* yacc.c:1646 */
+#line 2926 "conf_parser.y" /* yacc.c:1646 */
{
- GlobalSetOptions.joinfloodcount = yylval.number;
+ ConfigChannel.no_join_on_split = yylval.number;
}
#line 6410 "conf_parser.c" /* yacc.c:1646 */
break;
case 636:
-#line 2933 "conf_parser.y" /* yacc.c:1646 */
+#line 2931 "conf_parser.y" /* yacc.c:1646 */
{
- GlobalSetOptions.joinfloodtime = yylval.number;
+ GlobalSetOptions.joinfloodcount = yylval.number;
}
#line 6418 "conf_parser.c" /* yacc.c:1646 */
break;
- case 649:
-#line 2953 "conf_parser.y" /* yacc.c:1646 */
+ case 637:
+#line 2936 "conf_parser.y" /* yacc.c:1646 */
+ {
+ GlobalSetOptions.joinfloodtime = yylval.number;
+}
+#line 6426 "conf_parser.c" /* yacc.c:1646 */
+ break;
+
+ case 650:
+#line 2956 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.flatten_links = yylval.number;
}
-#line 6427 "conf_parser.c" /* yacc.c:1646 */
+#line 6435 "conf_parser.c" /* yacc.c:1646 */
break;
- case 650:
-#line 2959 "conf_parser.y" /* yacc.c:1646 */
+ case 651:
+#line 2962 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.disable_remote_commands = yylval.number;
}
-#line 6436 "conf_parser.c" /* yacc.c:1646 */
+#line 6444 "conf_parser.c" /* yacc.c:1646 */
break;
- case 651:
-#line 2965 "conf_parser.y" /* yacc.c:1646 */
+ case 652:
+#line 2968 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hide_servers = yylval.number;
}
-#line 6445 "conf_parser.c" /* yacc.c:1646 */
+#line 6453 "conf_parser.c" /* yacc.c:1646 */
break;
- case 652:
-#line 2971 "conf_parser.y" /* yacc.c:1646 */
+ case 653:
+#line 2974 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hide_services = yylval.number;
}
-#line 6454 "conf_parser.c" /* yacc.c:1646 */
+#line 6462 "conf_parser.c" /* yacc.c:1646 */
break;
- case 653:
-#line 2977 "conf_parser.y" /* yacc.c:1646 */
+ case 654:
+#line 2980 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -6462,11 +6470,11 @@ yyreduce:
ConfigServerHide.hidden_name = xstrdup(yylval.string);
}
}
-#line 6466 "conf_parser.c" /* yacc.c:1646 */
+#line 6474 "conf_parser.c" /* yacc.c:1646 */
break;
- case 654:
-#line 2986 "conf_parser.y" /* yacc.c:1646 */
+ case 655:
+#line 2989 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -6479,29 +6487,29 @@ yyreduce:
ConfigServerHide.links_delay = (yyvsp[-1].number);
}
}
-#line 6483 "conf_parser.c" /* yacc.c:1646 */
+#line 6491 "conf_parser.c" /* yacc.c:1646 */
break;
- case 655:
-#line 3000 "conf_parser.y" /* yacc.c:1646 */
+ case 656:
+#line 3003 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hidden = yylval.number;
}
-#line 6492 "conf_parser.c" /* yacc.c:1646 */
+#line 6500 "conf_parser.c" /* yacc.c:1646 */
break;
- case 656:
-#line 3006 "conf_parser.y" /* yacc.c:1646 */
+ case 657:
+#line 3009 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hide_server_ips = yylval.number;
}
-#line 6501 "conf_parser.c" /* yacc.c:1646 */
+#line 6509 "conf_parser.c" /* yacc.c:1646 */
break;
-#line 6505 "conf_parser.c" /* yacc.c:1646 */
+#line 6513 "conf_parser.c" /* yacc.c:1646 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
diff --git a/src/conf_parser.y b/src/conf_parser.y
index e9887f3..ae05fd5 100644
--- a/src/conf_parser.y
+++ b/src/conf_parser.y
@@ -1301,7 +1301,11 @@ oper_flags_item: KILL ':' REMOTE
} | XLINE
{
if (conf_parser_ctx.pass == 2)
- block_state.port.value |= OPER_FLAG_X;
+ block_state.port.value |= OPER_FLAG_XLINE;
+} | T_UNXLINE
+{
+ if (conf_parser_ctx.pass == 2)
+ block_state.port.value |= OPER_FLAG_UNXLINE;
} | GLINE
{
if (conf_parser_ctx.pass == 2)
generated by cgit (git 2.34.1) at 2025-07-15 11:33:45 +0000