summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2014-07-18 20:41:28 +0000
committermichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2014-07-18 20:41:28 +0000
commit7a0a7f9635ad77eaa0a0300bc64ebadee3830962 (patch)
tree00af6268ff97a00f31c8ca9e41c6cd36c93310b1
parentd2b88476ce99f305b14dc2f02caf2f66a67b02e3 (diff)
- Cleaned up and sanitized /challenge relatedcode
- rsa.c:get_randomness(): removed EGD support; also don't fall back to RAND_pseudo_bytes() if RAND_bytes() fails. If RAND_bytes() fails, just reject the /challenge request. git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@4257 82007160-df01-0410-b94d-b575c5fd34c7
Diffstat
-rw-r--r--doc/reference.conf13
-rw-r--r--include/conf.h2
-rw-r--r--modules/m_challenge.c6
-rw-r--r--src/conf.c4
-rw-r--r--src/conf_parser.c2861
-rw-r--r--src/conf_parser.y27
-rw-r--r--src/rsa.c38
7 files changed, 1449 insertions, 1502 deletions
diff --git a/doc/reference.conf b/doc/reference.conf
index c0c53ec..9a8f07c 100644
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -1208,19 +1208,6 @@ general {
oper_umodes = bots, locops, servnotice, operwall, wallop;
/*
- * use_egd: if your system does not have *random devices yet you
- * want to use OpenSSL and encrypted links, enable this. Beware -
- * EGD is *very* CPU intensive when gathering data for its pool.
- */
-# use_egd = yes;
-
- /*
- * egdpool_path: path to EGD pool. Not necessary for OpenSSL >= 0.9.7
- * which automatically finds the path.
- */
-# egdpool_path = "/var/run/egd-pool";
-
- /*
* throttle_time: the minimum amount of time required between
* connections from the same IP address. exempt {} blocks are excluded
* from this throttling.
diff --git a/include/conf.h b/include/conf.h
index b8c8ee9..85ca5e6 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -217,7 +217,6 @@ struct config_file_entry
char *mpath;
char *rpath;
- char *egdpool_path;
char *service_name;
int gline_min_cidr;
@@ -263,7 +262,6 @@ struct config_file_entry
int default_floodcount;
/* 0 == don't use throttle... */
int throttle_time;
- int use_egd;
int ping_cookie;
int disable_auth;
int cycle_on_host_change;
diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index 7e673cd..f080b84 100644
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -164,12 +164,14 @@ m_challenge(struct Client *client_p, struct Client *source_p,
}
}
- if (!generate_challenge(&challenge, &(source_p->localClient->response),
+ if (!generate_challenge(&challenge, &source_p->localClient->response,
conf->rsa_public_key))
+ {
sendto_one(source_p, form_str(RPL_RSACHALLENGE),
me.name, source_p->name, challenge);
+ source_p->localClient->auth_oper = xstrdup(conf->name);
+ }
- source_p->localClient->auth_oper = xstrdup(conf->name);
MyFree(challenge);
return 0;
}
diff --git a/src/conf.c b/src/conf.c
index 6b4b40f..2749ec8 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1174,8 +1174,6 @@ set_default_conf(void)
ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
UMODE_OPERWALL | UMODE_WALLOP;
- ConfigFileEntry.use_egd = 0;
- ConfigFileEntry.egdpool_path = NULL;
ConfigFileEntry.throttle_time = 1;
}
@@ -1572,8 +1570,6 @@ clear_out_old_conf(void)
ServerInfo.network_name = NULL;
MyFree(ServerInfo.network_desc);
ServerInfo.network_desc = NULL;
- MyFree(ConfigFileEntry.egdpool_path);
- ConfigFileEntry.egdpool_path = NULL;
#ifdef HAVE_LIBCRYPTO
if (ServerInfo.rsa_private_key != NULL)
{
diff --git a/src/conf_parser.c b/src/conf_parser.c
index 23512bc..6185b57 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 1233
+#define YYLAST 1227
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 233
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 291
+#define YYNNTS 289
/* YYNRULES -- Number of rules. */
-#define YYNRULES 657
+#define YYNRULES 653
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 1288
+#define YYNSTATES 1278
/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
by yylex, with out-of-bounds checking. */
@@ -1023,58 +1023,58 @@ static const yytype_uint16 yyrline[] =
904, 905, 905, 905, 907, 913, 922, 923, 923, 925,
925, 926, 928, 935, 935, 948, 949, 951, 951, 952,
952, 954, 962, 965, 971, 970, 976, 976, 977, 981,
- 985, 989, 993, 997, 1001, 1005, 1009, 1020, 1019, 1099,
- 1099, 1100, 1100, 1100, 1101, 1101, 1101, 1102, 1102, 1103,
- 1104, 1104, 1106, 1112, 1118, 1124, 1135, 1141, 1147, 1158,
- 1165, 1164, 1170, 1170, 1171, 1175, 1179, 1183, 1187, 1191,
- 1195, 1199, 1203, 1207, 1211, 1215, 1219, 1223, 1227, 1231,
- 1235, 1239, 1243, 1247, 1251, 1258, 1257, 1263, 1263, 1264,
- 1268, 1272, 1276, 1280, 1284, 1288, 1292, 1296, 1300, 1304,
- 1308, 1312, 1316, 1320, 1324, 1328, 1332, 1336, 1340, 1344,
- 1348, 1352, 1356, 1367, 1366, 1427, 1427, 1428, 1429, 1429,
- 1430, 1431, 1432, 1433, 1434, 1435, 1436, 1437, 1438, 1438,
- 1439, 1440, 1441, 1442, 1444, 1450, 1456, 1462, 1468, 1474,
- 1480, 1486, 1492, 1498, 1505, 1511, 1517, 1523, 1532, 1542,
- 1541, 1547, 1547, 1548, 1552, 1563, 1562, 1569, 1568, 1573,
- 1573, 1574, 1578, 1582, 1588, 1588, 1589, 1589, 1589, 1589,
- 1589, 1591, 1591, 1593, 1593, 1595, 1609, 1629, 1635, 1645,
- 1644, 1686, 1686, 1687, 1687, 1687, 1687, 1688, 1688, 1688,
- 1689, 1689, 1691, 1697, 1703, 1709, 1721, 1720, 1726, 1726,
- 1727, 1731, 1735, 1739, 1743, 1747, 1751, 1755, 1759, 1763,
- 1769, 1783, 1792, 1806, 1805, 1820, 1820, 1821, 1821, 1821,
- 1821, 1823, 1829, 1835, 1845, 1847, 1847, 1848, 1848, 1850,
- 1866, 1865, 1890, 1890, 1891, 1891, 1891, 1891, 1893, 1899,
- 1919, 1918, 1924, 1924, 1925, 1929, 1933, 1937, 1941, 1945,
- 1949, 1953, 1957, 1961, 1971, 1970, 1991, 1991, 1992, 1992,
- 1992, 1994, 2001, 2000, 2006, 2006, 2007, 2011, 2015, 2019,
- 2023, 2027, 2031, 2035, 2039, 2043, 2053, 2052, 2124, 2124,
- 2125, 2125, 2125, 2126, 2126, 2127, 2128, 2128, 2128, 2129,
- 2129, 2129, 2130, 2130, 2131, 2133, 2139, 2145, 2151, 2164,
- 2177, 2183, 2189, 2193, 2202, 2201, 2206, 2206, 2207, 2211,
- 2217, 2228, 2234, 2240, 2246, 2262, 2261, 2287, 2287, 2288,
- 2288, 2288, 2290, 2310, 2320, 2319, 2346, 2346, 2347, 2347,
- 2347, 2349, 2355, 2364, 2366, 2366, 2367, 2367, 2369, 2387,
- 2386, 2409, 2409, 2410, 2410, 2410, 2412, 2418, 2427, 2430,
- 2430, 2431, 2431, 2432, 2432, 2433, 2433, 2434, 2434, 2435,
- 2435, 2436, 2437, 2438, 2438, 2439, 2439, 2440, 2440, 2441,
- 2441, 2442, 2443, 2443, 2444, 2444, 2445, 2445, 2446, 2446,
- 2447, 2447, 2448, 2448, 2449, 2449, 2450, 2450, 2451, 2452,
- 2453, 2453, 2454, 2454, 2455, 2456, 2457, 2458, 2458, 2459,
- 2460, 2463, 2468, 2474, 2480, 2486, 2492, 2497, 2502, 2507,
- 2512, 2517, 2522, 2527, 2532, 2537, 2542, 2547, 2552, 2557,
- 2563, 2574, 2579, 2584, 2589, 2594, 2599, 2604, 2607, 2612,
- 2615, 2620, 2625, 2630, 2635, 2640, 2645, 2650, 2655, 2660,
- 2665, 2670, 2675, 2684, 2693, 2698, 2703, 2709, 2708, 2713,
- 2713, 2714, 2717, 2720, 2723, 2726, 2729, 2732, 2735, 2738,
- 2741, 2744, 2747, 2750, 2753, 2756, 2759, 2762, 2765, 2768,
- 2771, 2774, 2780, 2779, 2784, 2784, 2785, 2788, 2791, 2794,
- 2797, 2800, 2803, 2806, 2809, 2812, 2815, 2818, 2821, 2824,
- 2827, 2830, 2833, 2836, 2839, 2842, 2845, 2850, 2855, 2860,
- 2869, 2872, 2872, 2873, 2874, 2874, 2875, 2875, 2876, 2877,
- 2878, 2879, 2880, 2880, 2881, 2881, 2883, 2888, 2893, 2898,
- 2903, 2908, 2913, 2918, 2923, 2928, 2933, 2938, 2946, 2949,
- 2949, 2950, 2950, 2951, 2952, 2953, 2954, 2954, 2955, 2956,
- 2958, 2964, 2970, 2976, 2982, 2991, 3005, 3011
+ 985, 989, 993, 997, 1001, 1005, 1009, 1020, 1019, 1105,
+ 1105, 1106, 1106, 1106, 1107, 1107, 1107, 1108, 1108, 1109,
+ 1110, 1110, 1112, 1118, 1124, 1130, 1141, 1147, 1153, 1164,
+ 1171, 1170, 1176, 1176, 1177, 1181, 1185, 1189, 1193, 1197,
+ 1201, 1205, 1209, 1213, 1217, 1221, 1225, 1229, 1233, 1237,
+ 1241, 1245, 1249, 1253, 1257, 1264, 1263, 1269, 1269, 1270,
+ 1274, 1278, 1282, 1286, 1290, 1294, 1298, 1302, 1306, 1310,
+ 1314, 1318, 1322, 1326, 1330, 1334, 1338, 1342, 1346, 1350,
+ 1354, 1358, 1362, 1373, 1372, 1433, 1433, 1434, 1435, 1435,
+ 1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1444, 1444,
+ 1445, 1446, 1447, 1448, 1450, 1456, 1462, 1468, 1474, 1480,
+ 1486, 1492, 1498, 1504, 1511, 1517, 1523, 1529, 1538, 1548,
+ 1547, 1553, 1553, 1554, 1558, 1569, 1568, 1575, 1574, 1579,
+ 1579, 1580, 1584, 1588, 1594, 1594, 1595, 1595, 1595, 1595,
+ 1595, 1597, 1597, 1599, 1599, 1601, 1615, 1635, 1641, 1651,
+ 1650, 1692, 1692, 1693, 1693, 1693, 1693, 1694, 1694, 1694,
+ 1695, 1695, 1697, 1703, 1709, 1715, 1727, 1726, 1732, 1732,
+ 1733, 1737, 1741, 1745, 1749, 1753, 1757, 1761, 1765, 1769,
+ 1775, 1789, 1798, 1812, 1811, 1826, 1826, 1827, 1827, 1827,
+ 1827, 1829, 1835, 1841, 1851, 1853, 1853, 1854, 1854, 1856,
+ 1872, 1871, 1896, 1896, 1897, 1897, 1897, 1897, 1899, 1905,
+ 1925, 1924, 1930, 1930, 1931, 1935, 1939, 1943, 1947, 1951,
+ 1955, 1959, 1963, 1967, 1977, 1976, 1997, 1997, 1998, 1998,
+ 1998, 2000, 2007, 2006, 2012, 2012, 2013, 2017, 2021, 2025,
+ 2029, 2033, 2037, 2041, 2045, 2049, 2059, 2058, 2130, 2130,
+ 2131, 2131, 2131, 2132, 2132, 2133, 2134, 2134, 2134, 2135,
+ 2135, 2135, 2136, 2136, 2137, 2139, 2145, 2151, 2157, 2170,
+ 2183, 2189, 2195, 2199, 2208, 2207, 2212, 2212, 2213, 2217,
+ 2223, 2234, 2240, 2246, 2252, 2268, 2267, 2293, 2293, 2294,
+ 2294, 2294, 2296, 2316, 2326, 2325, 2352, 2352, 2353, 2353,
+ 2353, 2355, 2361, 2370, 2372, 2372, 2373, 2373, 2375, 2393,
+ 2392, 2415, 2415, 2416, 2416, 2416, 2418, 2424, 2433, 2436,
+ 2436, 2437, 2437, 2438, 2438, 2439, 2439, 2440, 2440, 2441,
+ 2441, 2442, 2443, 2444, 2444, 2445, 2445, 2446, 2446, 2447,
+ 2447, 2448, 2449, 2449, 2450, 2450, 2451, 2451, 2452, 2452,
+ 2453, 2453, 2454, 2454, 2455, 2455, 2456, 2457, 2458, 2458,
+ 2459, 2459, 2460, 2461, 2462, 2463, 2463, 2464, 2465, 2468,
+ 2473, 2479, 2485, 2491, 2497, 2502, 2507, 2512, 2517, 2522,
+ 2527, 2532, 2537, 2542, 2547, 2552, 2557, 2562, 2568, 2579,
+ 2584, 2589, 2594, 2599, 2604, 2609, 2612, 2617, 2620, 2625,
+ 2630, 2635, 2640, 2645, 2650, 2655, 2660, 2665, 2670, 2675,
+ 2684, 2689, 2694, 2700, 2699, 2704, 2704, 2705, 2708, 2711,
+ 2714, 2717, 2720, 2723, 2726, 2729, 2732, 2735, 2738, 2741,
+ 2744, 2747, 2750, 2753, 2756, 2759, 2762, 2765, 2771, 2770,
+ 2775, 2775, 2776, 2779, 2782, 2785, 2788, 2791, 2794, 2797,
+ 2800, 2803, 2806, 2809, 2812, 2815, 2818, 2821, 2824, 2827,
+ 2830, 2833, 2836, 2841, 2846, 2851, 2860, 2863, 2863, 2864,
+ 2865, 2865, 2866, 2866, 2867, 2868, 2869, 2870, 2871, 2871,
+ 2872, 2872, 2874, 2879, 2884, 2889, 2894, 2899, 2904, 2909,
+ 2914, 2919, 2924, 2929, 2937, 2940, 2940, 2941, 2941, 2942,
+ 2943, 2944, 2945, 2945, 2946, 2947, 2949, 2955, 2961, 2967,
+ 2973, 2982, 2996, 3002
};
#endif
@@ -1208,13 +1208,13 @@ static const char *const yytname[] =
"general_pace_wait_simple", "general_short_motd",
"general_no_oper_flood", "general_true_no_oper_flood",
"general_oper_pass_resv", "general_dots_in_ident", "general_max_targets",
- "general_use_egd", "general_egdpool_path", "general_services_name",
- "general_ping_cookie", "general_disable_auth", "general_throttle_time",
- "general_oper_umodes", "$@24", "umode_oitems", "umode_oitem",
- "general_oper_only_umodes", "$@25", "umode_items", "umode_item",
- "general_min_nonwildcard", "general_min_nonwildcard_simple",
- "general_default_floodcount", "channel_entry", "channel_items",
- "channel_item", "channel_disable_fake_channels", "channel_knock_delay",
+ "general_services_name", "general_ping_cookie", "general_disable_auth",
+ "general_throttle_time", "general_oper_umodes", "$@24", "umode_oitems",
+ "umode_oitem", "general_oper_only_umodes", "$@25", "umode_items",
+ "umode_item", "general_min_nonwildcard",
+ "general_min_nonwildcard_simple", "general_default_floodcount",
+ "channel_entry", "channel_items", "channel_item",
+ "channel_disable_fake_channels", "channel_knock_delay",
"channel_knock_delay_channel", "channel_max_chans_per_user",
"channel_max_chans_per_oper", "channel_max_bans",
"channel_default_split_user_count", "channel_default_split_server_count",
@@ -1260,10 +1260,10 @@ static const yytype_uint16 yytoknum[] =
};
# endif
-#define YYPACT_NINF -755
+#define YYPACT_NINF -792
#define yypact_value_is_default(Yystate) \
- (!!((Yystate) == (-755)))
+ (!!((Yystate) == (-792)))
#define YYTABLE_NINF -124
@@ -1274,135 +1274,134 @@ static const yytype_uint16 yytoknum[] =
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- -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,
- 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, 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,
- 187, 188, 189, -755, 192, -755, 193, 195, 197, 199,
- 200, 201, 202, 206, 207, 208, 209, 212, 213, 216,
- 217, 219, 221, 222, 223, 108, -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, -755, -755, -755, 353, 8, 292, 29,
- 227, 231, 24, -755, -755, -755, 22, 546, 47, -755,
- 236, 237, 240, 246, 248, 251, 253, 254, 15, -755,
- -755, -755, -755, -755, -755, -755, -755, -755, 60, 255,
- 257, 259, 260, 262, 263, 265, 266, 272, 288, 291,
- 294, 303, 305, 306, 307, 308, 9, -755, -755, -755,
- -755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, -755, -755, -755, 4, 65, 309, 19, -755,
- -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, 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, 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, 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, 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,
- -755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- -755, -755, -755, -755, -755, -174, -755, -755, -755, -755,
- -755, -755, -755, -755, -755, -755, -755, -755, -755, -755,
- -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, 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, 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,
- 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,
- 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, 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, -755, -15, -755, -755,
- -755, -755, -755, -755, -755, -755, -755, -755, -755, -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, -755, 55, -755, -755, -755, 297, -755
+ -792, 697, -792, -191, -224, -207, -792, -792, -792, -199,
+ -792, -185, -792, -792, -792, -178, -792, -792, -792, -147,
+ -145, -792, -140, -134, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, 180,
+ 968, -119, -68, -60, 14, -53, 393, -46, -39, -13,
+ 52, -8, -1, 20, 336, 443, 43, 39, 34, 69,
+ -127, 16, 63, 71, 6, -792, -792, -792, -792, -792,
+ 75, 84, 86, 94, 97, 98, 99, 100, 104, 106,
+ 112, 114, 274, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, 664, 521, 19, -792,
+ 117, 12, -792, -792, 47, -792, 118, 126, 136, 137,
+ 138, 139, 140, 141, 142, 144, 150, 152, 154, 162,
+ 165, 166, 167, 168, 173, 174, 176, 177, 181, 182,
+ 185, 186, -792, 187, -792, 188, 189, 191, 194, 195,
+ 196, 197, 198, 200, 201, 202, 203, 206, 210, 213,
+ 215, 216, 217, 107, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, 324, 25, 38, 90, 219, 224, 22, -792,
+ -792, -792, 15, 557, 55, -792, 225, 226, 227, 229,
+ 230, 233, 234, 235, 5, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, 116, 236, 237, 239, 242, 243,
+ 244, 245, 246, 247, 251, 253, 258, 260, 262, 263,
+ 264, 265, 153, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, 61, 156, 266, 9, -792, -792, -792, 74, -792,
+ 268, 40, -792, -792, 59, -792, 159, 388, 389, 287,
+ -792, 408, 409, 308, 411, 412, 412, 412, 413, 417,
+ 419, 318, 320, 304, -792, 305, 310, 313, 325, -792,
+ 326, 327, 329, 330, 331, 332, 335, 337, 338, 339,
+ 340, 341, 105, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ 307, 343, 345, 348, 351, 352, 356, -792, 357, 361,
+ 365, 367, 368, 370, 371, 60, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, 372, 373, 17, -792, -792, -792, 483, 390,
+ -792, -792, 392, 394, 31, -792, -792, -792, 416, 412,
+ 412, 420, 427, 421, 515, 424, 412, 425, 524, 530,
+ 412, 534, 435, 437, 439, 412, 542, 543, 412, 544,
+ 545, 546, 548, 447, 407, 448, 429, 450, 412, 412,
+ 452, 458, 460, -186, -161, 461, 464, 466, 559, 412,
+ 474, 477, 412, 412, 478, 462, -792, 463, 455, 469,
+ -792, 472, 476, 480, 482, 488, 275, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, 489, 490, 45,
+ -792, -792, -792, 465, 492, 495, -792, 496, -792, 8,
+ -792, -792, -792, -792, -792, 571, 573, 486, -792, 501,
+ 499, 500, 87, -792, -792, -792, 506, 504, 507, -792,
+ 509, 511, 512, 513, 519, -792, 520, 257, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, 526,
+ 527, 531, 533, 10, -792, -792, -792, -792, 494, 541,
+ 550, 584, 555, 556, 558, 412, 551, -792, -792, 631,
+ 561, 652, 669, 672, 658, 659, 663, 665, 666, 673,
+ 679, 674, 110, 113, 675, 676, 565, -792, 568, 572,
+ -792, 24, -792, -792, -792, -792, 591, 576, -792, 575,
+ 682, 579, -792, 581, 580, -792, 582, 7, -792, -792,
+ -792, -792, 586, 587, 588, -792, 589, 590, 593, 594,
+ 475, 595, 596, 597, 598, 599, 604, 605, 606, -792,
+ -792, 701, 710, 412, 607, 726, 728, 412, 730, 731,
+ 412, 712, 732, 736, 412, 737, 737, 620, -792, -792,
+ 725, 33, 729, 639, 733, 734, 621, 735, 739, 745,
+ 740, 741, 742, 743, 628, -792, 744, 746, 632, -792,
+ 633, -792, 747, 748, 641, -792, 645, 646, 648, 649,
+ 650, 651, 653, 654, 655, 657, 667, 670, 677, 678,
+ 684, 685, 686, 687, 689, 690, 691, 695, 696, 698,
+ 699, 700, 727, 703, 770, 713, 715, 717, 718, 720,
+ 721, 738, 752, 753, 755, 756, 760, 762, 765, 767,
+ 768, 773, 774, 775, 776, -792, -792, 763, 681, 671,
+ 779, 771, 786, 801, 814, 777, -792, 829, 831, 778,
+ -792, -792, 832, 833, 780, 791, 781, -792, 782, 784,
+ -792, -792, 834, 836, 787, -792, -792, 837, 751, 783,
+ 852, 883, 892, 893, 807, 788, 896, 793, -792, -792,
+ 898, 899, 900, 797, -792, 798, 799, 800, 802, 803,
+ 804, 808, 809, -792, 810, 811, 815, 816, 817, 818,
+ 822, 823, 824, 825, 826, 827, 828, -792, -792, -210,
+ -792, -792, -792, -198, -792, 830, 835, -792, -792, 905,
+ 838, 839, -792, 840, -792, 108, 842, -792, -792, 909,
+ 841, 918, 843, -792, -792, -792, -792, -792, -792, -792,
+ -792, 412, 412, 412, 412, 412, 412, 412, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, 847, 848,
+ 849, -32, 850, 851, 853, 854, 855, 856, 857, 858,
+ 859, 860, 57, 861, 862, -792, 863, 864, 865, 866,
+ 867, 868, 869, 4, 870, 871, 872, 873, 874, 875,
+ 876, -792, 877, 878, -792, -792, 879, 880, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -184, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -157, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, 881, 882, 529, 884, 885, 886, 887, 888,
+ -792, 889, 890, -792, 891, 894, -21, 668, 895, -792,
+ -792, -792, -792, 897, 901, -792, 902, 903, 497, 904,
+ 906, 907, 908, 910, 805, 911, -792, 912, 913, 914,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, 110, -792, 113, -792, -792, 915, 564,
+ -792, -792, 916, 917, 919, -792, 13, -792, -792, -792,
+ -792, -792, 921, 624, 923, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -155, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ 737, 737, 737, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -146, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ 727, -792, 770, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -144, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -129,
+ -792, 820, 791, 924, -792, -792, -792, -792, -792, 920,
+ -792, -792, 922, -792, -792, -792, -792, 925, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -54,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -36, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, 53, -792, -792, 933,
+ -58, 926, 928, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, 58, -792, -792, -792, -32,
+ -792, -792, -792, -792, 4, -792, -792, -792, 529, -792,
+ -21, -792, -792, -792, 929, 930, 931, -792, 497, -792,
+ 805, -792, 564, 932, 934, 935, 422, -792, -792, 624,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, 64, -792, -792, -792, 422, -792
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1417,100 +1416,99 @@ static const yytype_uint16 yydefact[] =
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, 625,
+ 0, 0, 0, 0, 0, 99, 100, 102, 101, 621,
0, 0, 0, 0, 0, 0, 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, 608, 620, 610, 611, 612, 613, 609,
+ 614, 615, 616, 617, 618, 619, 0, 0, 0, 447,
+ 0, 0, 445, 446, 0, 508, 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, 582, 0, 557, 0, 0, 0, 0,
+ 0, 0, 578, 0, 553, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 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, 460, 505, 507, 499, 500, 501,
+ 502, 503, 498, 471, 461, 462, 463, 464, 465, 466,
+ 467, 468, 469, 470, 495, 472, 473, 504, 475, 480,
+ 481, 476, 478, 477, 489, 490, 479, 482, 483, 484,
+ 485, 474, 487, 506, 496, 497, 494, 488, 486, 492,
+ 493, 491, 0, 0, 0, 0, 0, 0, 0, 45,
+ 46, 47, 0, 0, 0, 645, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 636, 637, 638, 639, 640,
+ 643, 641, 642, 644, 0, 0, 0, 0, 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, 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, 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, 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, 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, 607, 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, 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,
- 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, 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, 610, 243, 0, 0, 0,
+ 0, 0, 0, 0, 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, 326, 327, 328, 329, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 635, 71, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 225, 404, 0, 0, 0, 0,
+ 0, 0, 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, 606,
+ 243, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 225, 404,
0, 0, 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, 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, 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, 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, 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, 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, 330,
+ 0, 0, 0, 0, 325, 0, 0, 0, 0, 0,
+ 0, 0, 0, 634, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 76, 77, 0,
+ 75, 80, 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, 629, 628, 622,
+ 632, 27, 27, 27, 27, 27, 27, 27, 29, 28,
+ 633, 623, 624, 627, 626, 625, 630, 631, 0, 0,
0, 0, 0, 0, 0, 0, 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,
+ 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, 521,
+ 525, 540, 510, 605, 551, 547, 520, 512, 511, 514,
+ 515, 513, 528, 518, 519, 529, 517, 524, 523, 522,
+ 548, 509, 603, 604, 544, 588, 582, 599, 583, 584,
+ 585, 593, 602, 586, 596, 600, 589, 601, 594, 590,
+ 595, 587, 598, 592, 591, 597, 0, 581, 546, 562,
+ 557, 574, 558, 559, 560, 568, 577, 561, 571, 575,
+ 564, 576, 569, 565, 570, 563, 573, 567, 566, 572,
+ 0, 556, 541, 539, 542, 550, 543, 531, 537, 538,
+ 535, 536, 532, 533, 534, 549, 552, 516, 545, 527,
+ 526, 530, 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,
- 324, 651, 650, 656, 654, 657, 652, 653, 655, 88,
+ 324, 647, 646, 652, 650, 653, 648, 649, 651, 88,
96, 87, 94, 95, 86, 90, 89, 83, 82, 84,
93, 85, 72, 0, 73, 0, 91, 92, 0, 0,
365, 122, 0, 0, 0, 134, 0, 126, 127, 129,
@@ -1519,8 +1517,8 @@ static const yytype_uint16 yydefact[] =
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,
+ 411, 408, 410, 424, 407, 441, 442, 456, 457, 579,
+ 0, 554, 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,
@@ -1533,7 +1531,7 @@ static const yytype_uint16 yydefact[] =
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,
+ 40, 41, 42, 415, 0, 580, 555, 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,
@@ -1544,71 +1542,69 @@ static const yytype_uint16 yydefact[] =
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -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, -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, 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, 946, -755, -755, -755, -755, -755, -755, -755,
- -755
+ -792, -792, -792, -443, -303, -791, -615, -792, -792, 845,
+ -792, -792, -792, -792, 927, -792, -792, -792, 48, -792,
+ 49, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, 991, -792,
+ -792, -792, -792, -792, -792, 618, -792, -792, -792, -792,
+ 795, -792, -792, -792, -792, 93, -792, -792, -792, -792,
+ -792, -156, -792, -792, -792, 615, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -117, -792, -792,
+ -792, -113, -792, -792, -792, 812, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -92, -792, -792, -792, -792, -792,
+ -98, -792, 688, -792, -792, -792, 23, -792, -792, -792,
+ -792, -792, 680, -792, -792, -792, -792, -792, -792, -792,
+ -82, -792, -792, -792, -792, -792, -792, 630, -792, -792,
+ -792, -792, -792, 936, -792, -792, -792, -792, 583, -792,
+ -792, -792, -792, -792, -91, -792, -792, -792, 602, -792,
+ -792, -792, -792, -78, -792, -792, -792, 806, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -59,
+ -792, -792, -792, -792, -792, -792, -792, -792, 704, -792,
+ -792, -792, -792, -792, 785, -792, -792, -792, -792, 1055,
+ -792, -792, -792, -792, 789, -792, -792, -792, -792, 1005,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, 78, -792, -792, -792, 82,
+ -792, -792, -792, -792, -792, 1082, -792, -792, -792, -792,
+ -792, -792, -792, -792, -792, -792, -792, -792, -792, -792,
+ 941, -792, -792, -792, -792, -792, -792, -792, -792
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 1, 25, 816, 817, 1073, 1074, 26, 222, 223,
- 224, 225, 27, 266, 267, 268, 269, 777, 778, 781,
- 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, 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, 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,
- 113, 43, 55, 398, 399, 400, 401, 44, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 431, 939, 940, 212, 429,
- 915, 916, 213, 214, 215, 45, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
- 46, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247
+ -1, 1, 25, 808, 809, 1063, 1064, 26, 218, 219,
+ 220, 221, 27, 262, 263, 264, 265, 769, 770, 773,
+ 774, 266, 267, 268, 269, 270, 271, 272, 273, 274,
+ 275, 276, 277, 278, 279, 280, 28, 74, 75, 76,
+ 77, 78, 29, 61, 492, 493, 494, 495, 30, 284,
+ 285, 286, 287, 288, 1026, 1027, 1028, 1029, 1030, 1201,
+ 1272, 1273, 31, 62, 507, 508, 509, 510, 511, 512,
+ 513, 514, 515, 516, 517, 735, 1177, 1178, 518, 729,
+ 1149, 1150, 32, 51, 332, 333, 334, 335, 336, 337,
+ 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
+ 348, 349, 604, 1048, 1049, 33, 59, 478, 714, 1119,
+ 1120, 479, 480, 481, 1123, 968, 969, 482, 483, 34,
+ 57, 456, 457, 458, 459, 460, 461, 462, 699, 1105,
+ 1106, 463, 464, 465, 35, 63, 523, 524, 525, 526,
+ 527, 36, 291, 292, 293, 37, 69, 577, 578, 579,
+ 580, 581, 790, 1215, 1216, 38, 66, 561, 562, 563,
+ 564, 780, 1196, 1197, 39, 52, 365, 366, 367, 368,
+ 369, 370, 371, 372, 373, 374, 375, 626, 1076, 1077,
+ 376, 377, 378, 379, 380, 40, 58, 469, 470, 471,
+ 472, 41, 53, 384, 385, 386, 387, 42, 111, 112,
+ 113, 43, 55, 394, 395, 396, 397, 44, 163, 164,
+ 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
+ 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+ 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
+ 205, 206, 207, 426, 930, 931, 208, 424, 906, 907,
+ 209, 210, 211, 45, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 46, 234,
+ 235, 236, 237, 238, 239, 240, 241, 242, 243
};
/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
@@ -1616,258 +1612,256 @@ static const yytype_int16 yydefgoto[] =
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
- 841, 842, 597, 598, 599, 564, 49, 840, 70, 472,
- 248, 109, 525, 1084, 79, 502, 229, 1056, 1022, 495,
- 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, 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, 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, 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, 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, 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, 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, 1230, 1231, 1232, 158,
- 159, 323, 160, 161, 162, 575, 307, 354, 163, 355,
- 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, 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, 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, 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, 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, 652, 260, 611, 612, 1255,
- 613, 1142, 614, 1143, 357, 656, 615, 616, 617, 618,
- 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,
+ 833, 834, 591, 592, 593, 49, 225, 70, 573, 473,
+ 282, 519, 1074, 109, 1022, 109, 489, 1012, 381, 1046,
+ 381, 1013, 50, 215, 681, 558, 466, 682, 1116, 1014,
+ 54, 71, 391, 1015, 226, 289, 47, 48, 72, 473,
+ 282, 289, 227, 1089, 56, 520, 466, 1090, 391, 683,
+ 832, 60, 684, 215, 228, 229, 519, 230, 231, 232,
+ 573, 350, 558, 351, 474, 352, 1060, 1061, 1062, 475,
+ 1091, 476, 1218, 110, 1092, 110, 1219, 353, 382, 233,
+ 382, 1223, 64, 1227, 65, 1224, 521, 1228, 489, 67,
+ 520, 490, 1047, 354, 474, 68, 647, 648, 1229, 475,
+ 295, 476, 1230, 654, 73, 574, 315, 658, 115, 1022,
+ 106, 1023, 663, 116, 117, 666, 355, 216, 356, 118,
+ 316, 317, 559, 357, 318, 676, 677, 119, 120, 392,
+ 477, 521, 290, 358, 121, 522, 689, 122, 290, 692,
+ 693, 217, 383, 123, 383, 392, 1244, 216, 124, 125,
+ 467, 126, 127, 128, 244, 129, 393, 574, 359, 559,
+ 477, 107, 130, 490, 1117, 832, 131, 132, 319, 108,
+ 467, 217, 393, 1237, 1118, 133, 114, 1238, 245, -123,
+ 522, 70, 360, 212, 134, 491, 320, 321, 322, 323,
+ 213, 1239, 135, 324, 136, 1240, 137, 325, 138, 1075,
+ 139, 140, 361, 326, 1024, 71, 1023, 837, 838, -123,
+ 246, 362, 72, 141, 327, 328, 214, 247, 142, 143,
+ 144, 222, 145, 146, 147, 575, 329, 148, 223, 576,
+ 283, 1025, 752, 536, 299, 792, 716, 567, 743, 248,
+ 389, 1202, 560, 249, 569, 638, 296, 468, 330, 224,
+ 487, 250, 781, 149, 251, 252, 363, 491, 496, 644,
+ 283, 150, 151, 152, 153, 154, 155, 468, 571, 1220,
+ 1221, 1222, 281, 709, 497, 79, 447, 575, 73, 560,
+ 1241, 576, 582, 364, 1242, 1248, 253, 331, 634, 1249,
+ 498, 1275, 448, 297, 156, 1276, 80, 81, 294, 1024,
+ 820, 298, 82, 254, 824, 301, 255, 827, 449, 767,
+ 768, 831, 771, 772, 302, 724, 303, 484, 157, 158,
+ 499, 159, 160, 161, 304, 447, 1025, 305, 306, 307,
+ 308, 256, 162, 617, 309, 445, 310, 225, 450, 83,
+ 84, 448, 311, 538, 312, 85, 86, 388, 398, 257,
+ 258, 259, 87, 88, 89, 500, 399, 449, 1036, 1037,
+ 1038, 1039, 1040, 1041, 1042, 226, 400, 401, 402, 403,
+ 404, 405, 406, 227, 407, 501, 260, 261, 90, 91,
+ 408, 556, 409, 565, 410, 228, 229, 450, 230, 231,
+ 232, 502, 411, 451, 115, 412, 413, 414, 415, 116,
+ 117, 452, 453, 416, 417, 118, 418, 419, 503, 504,
+ 233, 420, 421, 119, 120, 422, 423, 425, 427, 428,
+ 121, 429, 454, 122, 430, 431, 432, 433, 434, 123,
+ 435, 436, 437, 438, 124, 125, 439, 126, 127, 128,
+ 440, 129, 451, 441, 244, 442, 443, 444, 130, 485,
+ 452, 453, 131, 132, 486, 528, 529, 530, 505, 531,
+ 532, 133, 1263, 533, 534, 535, 539, 540, 245, 541,
+ 134, 454, 542, 543, 544, 545, 546, 547, 135, 506,
+ 136, 548, 137, 549, 138, 737, 139, 140, 550, 1264,
+ 551, 1265, 552, 553, 554, 555, 566, 455, 570, 141,
+ 246, 1128, 313, 705, 142, 143, 144, 247, 145, 146,
+ 147, 583, 584, 148, 585, 1129, 586, 587, 588, 589,
+ 590, 594, 350, 1130, 351, 595, 352, 596, 597, 248,
+ 598, 599, 600, 249, 619, 650, 1266, 1131, 353, 149,
+ 601, 250, 1095, 602, 251, 252, 455, 150, 151, 152,
+ 153, 154, 155, 1267, 354, 603, 605, 606, 496, 607,
+ 608, 609, 610, 1096, 1132, 611, 1133, 612, 613, 614,
+ 615, 616, 1097, 620, 497, 621, 253, 355, 622, 356,
+ 156, 623, 624, 590, 357, 1245, 625, 627, 1268, 1269,
+ 498, 628, 1134, 254, 358, 629, 255, 630, 631, 1098,
+ 632, 633, 636, 637, 157, 158, 640, 159, 160, 161,
+ 801, 802, 803, 804, 805, 806, 807, 641, 162, 359,
+ 499, 256, 642, 652, 643, 1135, 646, 1136, 1099, 1100,
+ 649, 651, 656, 1186, 653, 655, 1101, 672, 657, 257,
+ 258, 259, 659, 360, 1270, 660, 1137, 661, 1271, 662,
+ 664, 665, 667, 668, 669, 500, 670, 671, 673, 674,
+ 675, 1102, 678, 361, 1138, 315, 260, 261, 679, 1139,
+ 680, 685, 362, 1140, 686, 501, 687, 1103, 1141, 316,
+ 317, 1142, 688, 318, 690, 697, 1143, 691, 694, 695,
+ 696, 502, 711, 1205, 718, 1187, 719, 2, 3, 698,
+ 1144, 4, 700, 1145, 745, 1146, 701, 748, 503, 504,
+ 702, 5, 703, 720, 6, 7, 1147, 363, 704, 707,
+ 708, 8, 712, 1148, 1188, 713, 715, 319, 721, 722,
+ 723, 1189, 9, 726, 727, 10, 11, 728, 1104, 730,
+ 1190, 731, 732, 733, 364, 320, 321, 322, 323, 734,
+ 736, 746, 324, 739, 754, 1206, 325, 740, 505, 12,
+ 747, 741, 326, 742, 13, 749, 750, 1191, 751, 1192,
+ 1193, 755, 14, 327, 328, 756, 885, 757, 753, 506,
+ 758, 759, 760, 1194, 1207, 329, 761, 765, 762, 763,
+ 1195, 1208, 777, 15, 16, 778, 764, 766, 775, 776,
+ 1209, 783, 779, 784, 785, 786, 787, 330, 788, 818,
+ 789, 17, 791, 794, 795, 796, 797, 798, 819, 909,
+ 799, 800, 810, 811, 812, 813, 814, 1210, 18, 1211,
+ 1212, 815, 816, 817, 822, 828, 823, 821, 825, 826,
+ 829, 19, 20, 1213, 830, 832, 331, 835, 836, 840,
+ 1214, 843, 839, 846, 1156, 851, 841, 842, 844, 854,
+ 855, 21, 845, 847, 848, 849, 850, 852, 858, 853,
+ 856, 857, 859, 860, 22, 861, 862, 863, 864, 956,
+ 865, 866, 867, 23, 868, 1121, 952, 24, 886, 887,
+ 888, 953, 889, 890, 869, 891, 892, 870, 893, 967,
+ 894, 954, 955, 895, 871, 872, 896, 897, 898, 957,
+ 899, 873, 874, 875, 876, 900, 877, 878, 879, 901,
+ 902, 903, 880, 881, 958, 882, 883, 884, 1231, 904,
+ 908, 910, 911, 912, 905, 913, 914, 959, 915, 916,
+ 932, 917, 933, 918, 934, 935, 919, 936, 937, 920,
+ 921, 922, 961, 923, 962, 964, 965, 973, 924, 974,
+ 976, 977, 925, 926, 927, 938, 1157, 1158, 1159, 79,
+ 1160, 1161, 928, 1162, 1163, 979, 1164, 929, 1165, 939,
+ 940, 1166, 941, 942, 1167, 1168, 1169, 943, 1170, 944,
+ 80, 81, 945, 1171, 946, 947, 82, 1172, 1173, 1174,
+ 948, 949, 950, 951, 960, 963, 980, 1175, 970, 971,
+ 966, 972, 1176, 978, 975, 981, 982, 983, 984, 985,
+ 986, 987, 988, 989, 990, 991, 992, 993, 1018, 994,
+ 995, 996, 1032, 83, 84, 997, 998, 999, 1000, 85,
+ 86, 1034, 1001, 1002, 1003, 1004, 87, 88, 89, 1005,
+ 1006, 1007, 1008, 1009, 1010, 1011, 1243, 1016, 1254, 1255,
+ 1256, 1183, 1017, 488, 1184, 300, 1020, 1021, 1019, 1031,
+ 1035, 1033, 90, 91, 1043, 1044, 1045, 1050, 1051, 568,
+ 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1065, 1066,
+ 1067, 1068, 1069, 1070, 1071, 1072, 1073, 1078, 1079, 1080,
+ 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, 1093, 1094,
+ 725, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1203,
+ 1277, 1115, 738, 1258, 1124, 1257, 1122, 1250, 1125, 1126,
+ 1127, 1151, 1253, 1152, 1153, 1154, 706, 1155, 1179, 1180,
+ 1181, 1182, 1185, 1198, 618, 1232, 1252, 1199, 1204, 1200,
+ 1217, 1233, 1234, 744, 1235, 1247, 1246, 1236, 1274, 1260,
+ 793, 1261, 1262, 782, 1259, 1251, 390, 717, 446, 639,
+ 1226, 635, 1225, 710, 314, 537, 0, 0, 0, 0,
+ 0, 0, 0, 645, 0, 0, 0, 0, 0, 557,
+ 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, 578
+ 0, 0, 0, 0, 0, 0, 0, 572
};
static const yytype_int16 yycheck[] =
{
- 621, 622, 309, 310, 311, 1, 229, 108, 1, 1,
- 1, 1, 1, 8, 1, 1, 1, 51, 227, 1,
- 1, 229, 231, 1, 1, 1, 1, 1, 1, 227,
- 228, 17, 25, 49, 25, 22, 23, 1, 227, 32,
- 1, 28, 231, 229, 29, 229, 35, 33, 1, 1,
- 229, 1, 37, 227, 1, 227, 227, 231, 1, 231,
- 231, 229, 1, 1, 49, 50, 57, 52, 53, 54,
- 1, 61, 227, 64, 1, 229, 231, 63, 65, 66,
- 1, 56, 35, 229, 71, 72, 61, 76, 63, 74,
- 124, 78, 79, 80, 76, 86, 403, 404, 76, 90,
- 199, 200, 98, 204, 411, 98, 229, 98, 415, 1,
- 101, 102, 98, 420, 6, 7, 423, 104, 105, 95,
- 12, 98, 61, 76, 98, 98, 433, 434, 20, 21,
- 61, 1, 118, 125, 98, 27, 125, 444, 30, 31,
- 447, 448, 133, 119, 36, 229, 98, 122, 134, 41,
- 42, 98, 44, 45, 46, 98, 48, 199, 200, 150,
- 98, 125, 153, 55, 1, 151, 152, 59, 60, 185,
- 229, 98, 125, 125, 95, 125, 68, 227, 227, 195,
- 17, 231, 231, 229, 229, 77, 125, 178, 170, 170,
- 229, 61, 170, 85, 125, 87, 33, 89, 119, 91,
- 195, 93, 94, 229, 227, 196, 197, 198, 231, 170,
- 229, 229, 227, 227, 106, 201, 231, 191, 229, 111,
- 112, 113, 218, 115, 116, 117, 63, 227, 120, 230,
- 222, 231, 223, 224, 541, 228, 222, 228, 228, 228,
- 221, 228, 228, 228, 218, 218, 228, 228, 191, 222,
- 229, 228, 228, 228, 146, 228, 227, 227, 13, 1,
- 221, 231, 154, 155, 156, 157, 158, 159, 210, 229,
- 229, 213, 222, 15, 16, 218, 228, 19, 228, 34,
- 218, 118, 227, 1, 222, 228, 231, 227, 43, 126,
- 127, 218, 227, 1, 230, 187, 230, 228, 9, 10,
- 11, 228, 609, 174, 175, 210, 613, 25, 213, 616,
- 147, 230, 230, 620, 32, 70, 1070, 1071, 1072, 211,
- 212, 63, 214, 215, 216, 170, 230, 1, 220, 3,
- 230, 5, 230, 225, 230, 230, 228, 40, 123, 81,
- 82, 83, 84, 17, 99, 100, 88, 230, 56, 230,
- 92, 230, 107, 61, 1, 63, 98, 230, 230, 33,
- 108, 230, 230, 230, 67, 230, 69, 109, 110, 230,
- 17, 230, 230, 230, 230, 108, 230, 132, 230, 121,
- 98, 230, 56, 230, 58, 222, 33, 230, 230, 63,
- 230, 228, 230, 148, 230, 230, 230, 108, 230, 73,
- 230, 143, 135, 136, 137, 138, 139, 140, 141, 1,
- 230, 114, 230, 230, 122, 1, 63, 230, 230, 230,
- 6, 7, 230, 230, 98, 230, 12, 230, 131, 230,
- 230, 230, 230, 25, 20, 21, 230, 230, 230, 230,
- 182, 27, 230, 230, 30, 31, 230, 230, 122, 230,
- 36, 230, 230, 230, 209, 41, 42, 230, 44, 45,
- 46, 230, 48, 166, 167, 57, 230, 230, 142, 55,
- 230, 118, 64, 59, 60, 123, 230, 151, 230, 126,
- 127, 230, 68, 230, 230, 230, 228, 230, 123, 230,
- 230, 77, 230, 230, 86, 230, 230, 227, 90, 85,
- 147, 87, 230, 89, 1, 91, 98, 93, 94, 101,
- 102, 809, 810, 811, 812, 813, 814, 815, 230, 222,
- 106, 230, 196, 226, 230, 111, 112, 113, 4, 115,
- 116, 117, 29, 230, 120, 230, 230, 230, 230, 230,
- 37, 133, 18, 230, 108, 210, 108, 1, 108, 223,
- 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, 210, 178, 230, 230, 1210,
- 230, 67, 230, 69, 17, 108, 230, 230, 230, 230,
- 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, 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,
+ 615, 616, 305, 306, 307, 229, 1, 1, 1, 1,
+ 1, 1, 8, 1, 1, 1, 1, 227, 1, 51,
+ 1, 231, 229, 1, 210, 1, 1, 213, 49, 227,
+ 229, 25, 1, 231, 29, 1, 227, 228, 32, 1,
+ 1, 1, 37, 227, 229, 35, 1, 231, 1, 210,
+ 108, 229, 213, 1, 49, 50, 1, 52, 53, 54,
+ 1, 1, 1, 3, 56, 5, 9, 10, 11, 61,
+ 227, 63, 227, 61, 231, 61, 231, 17, 61, 74,
+ 61, 227, 229, 227, 229, 231, 76, 231, 1, 229,
+ 35, 76, 124, 33, 56, 229, 399, 400, 227, 61,
+ 227, 63, 231, 406, 98, 98, 1, 410, 1, 1,
+ 229, 98, 415, 6, 7, 418, 56, 95, 58, 12,
+ 15, 16, 98, 63, 19, 428, 429, 20, 21, 98,
+ 122, 76, 98, 73, 27, 125, 439, 30, 98, 442,
+ 443, 119, 125, 36, 125, 98, 204, 95, 41, 42,
+ 125, 44, 45, 46, 1, 48, 125, 98, 98, 98,
+ 122, 229, 55, 76, 185, 108, 59, 60, 63, 229,
+ 125, 119, 125, 227, 195, 68, 229, 231, 25, 170,
+ 125, 1, 122, 229, 77, 170, 81, 82, 83, 84,
+ 229, 227, 85, 88, 87, 231, 89, 92, 91, 195,
+ 93, 94, 142, 98, 191, 25, 98, 174, 175, 170,
+ 57, 151, 32, 106, 109, 110, 229, 64, 111, 112,
+ 113, 229, 115, 116, 117, 218, 121, 120, 229, 222,
+ 221, 218, 535, 228, 228, 228, 228, 228, 228, 86,
+ 228, 228, 218, 90, 170, 228, 230, 222, 143, 229,
+ 228, 98, 228, 146, 101, 102, 196, 170, 1, 228,
+ 221, 154, 155, 156, 157, 158, 159, 222, 228, 1060,
+ 1061, 1062, 229, 228, 17, 1, 1, 218, 98, 218,
+ 227, 222, 123, 223, 231, 227, 133, 182, 228, 231,
+ 33, 227, 17, 230, 187, 231, 22, 23, 229, 191,
+ 603, 230, 28, 150, 607, 230, 153, 610, 33, 199,
+ 200, 614, 199, 200, 230, 228, 230, 227, 211, 212,
+ 63, 214, 215, 216, 230, 1, 218, 230, 230, 230,
+ 230, 178, 225, 228, 230, 228, 230, 1, 63, 65,
+ 66, 17, 230, 227, 230, 71, 72, 230, 230, 196,
+ 197, 198, 78, 79, 80, 98, 230, 33, 801, 802,
+ 803, 804, 805, 806, 807, 29, 230, 230, 230, 230,
+ 230, 230, 230, 37, 230, 118, 223, 224, 104, 105,
+ 230, 228, 230, 227, 230, 49, 50, 63, 52, 53,
+ 54, 134, 230, 118, 1, 230, 230, 230, 230, 6,
+ 7, 126, 127, 230, 230, 12, 230, 230, 151, 152,
+ 74, 230, 230, 20, 21, 230, 230, 230, 230, 230,
+ 27, 230, 147, 30, 230, 230, 230, 230, 230, 36,
+ 230, 230, 230, 230, 41, 42, 230, 44, 45, 46,
+ 230, 48, 118, 230, 1, 230, 230, 230, 55, 230,
+ 126, 127, 59, 60, 230, 230, 230, 230, 201, 230,
+ 230, 68, 40, 230, 230, 230, 230, 230, 25, 230,
+ 77, 147, 230, 230, 230, 230, 230, 230, 85, 222,
+ 87, 230, 89, 230, 91, 228, 93, 94, 230, 67,
+ 230, 69, 230, 230, 230, 230, 230, 222, 230, 106,
+ 57, 4, 228, 228, 111, 112, 113, 64, 115, 116,
+ 117, 123, 123, 120, 227, 18, 108, 108, 210, 108,
+ 108, 108, 1, 26, 3, 108, 5, 108, 210, 86,
+ 210, 227, 227, 90, 227, 108, 114, 40, 17, 146,
+ 230, 98, 13, 230, 101, 102, 222, 154, 155, 156,
+ 157, 158, 159, 131, 33, 230, 230, 230, 1, 230,
+ 230, 230, 230, 34, 67, 230, 69, 230, 230, 230,
+ 230, 230, 43, 230, 17, 230, 133, 56, 230, 58,
+ 187, 230, 230, 108, 63, 1200, 230, 230, 166, 167,
+ 33, 230, 95, 150, 73, 230, 153, 230, 230, 70,
+ 230, 230, 230, 230, 211, 212, 123, 214, 215, 216,
+ 135, 136, 137, 138, 139, 140, 141, 227, 225, 98,
+ 63, 178, 230, 108, 230, 128, 210, 130, 99, 100,
+ 210, 210, 108, 69, 210, 210, 107, 230, 108, 196,
+ 197, 198, 108, 122, 222, 210, 149, 210, 226, 210,
+ 108, 108, 108, 108, 108, 98, 108, 210, 210, 230,
+ 210, 132, 210, 142, 167, 1, 223, 224, 210, 172,
+ 210, 210, 151, 176, 210, 118, 210, 148, 181, 15,
+ 16, 184, 123, 19, 210, 230, 189, 210, 210, 227,
+ 227, 134, 227, 69, 123, 131, 123, 0, 1, 230,
+ 203, 4, 230, 206, 210, 208, 230, 123, 151, 152,
+ 230, 14, 230, 227, 17, 18, 219, 196, 230, 230,
+ 230, 24, 230, 226, 160, 230, 230, 63, 227, 230,
+ 230, 167, 35, 227, 230, 38, 39, 230, 209, 230,
+ 176, 230, 230, 230, 223, 81, 82, 83, 84, 230,
+ 230, 210, 88, 227, 123, 131, 92, 230, 201, 62,
+ 210, 230, 98, 230, 67, 210, 210, 203, 210, 205,
+ 206, 210, 75, 109, 110, 123, 49, 108, 227, 222,
+ 108, 123, 123, 219, 160, 121, 123, 108, 123, 123,
+ 226, 167, 227, 96, 97, 227, 123, 123, 123, 123,
+ 176, 210, 230, 227, 229, 123, 227, 143, 227, 108,
+ 230, 114, 230, 227, 227, 227, 227, 227, 108, 49,
+ 227, 227, 227, 227, 227, 227, 227, 203, 131, 205,
+ 206, 227, 227, 227, 108, 123, 108, 230, 108, 108,
+ 108, 144, 145, 219, 108, 108, 182, 227, 123, 210,
+ 226, 230, 123, 108, 49, 227, 123, 123, 123, 227,
+ 227, 164, 123, 123, 123, 123, 123, 123, 227, 123,
+ 123, 123, 227, 227, 177, 227, 227, 227, 227, 108,
+ 227, 227, 227, 186, 227, 217, 123, 190, 161, 162,
+ 163, 210, 165, 166, 227, 168, 169, 227, 171, 108,
+ 173, 230, 123, 176, 227, 227, 179, 180, 181, 123,
+ 183, 227, 227, 227, 227, 188, 227, 227, 227, 192,
+ 193, 194, 227, 227, 123, 227, 227, 227, 108, 202,
+ 227, 161, 162, 163, 207, 165, 166, 123, 168, 169,
+ 227, 171, 227, 173, 227, 227, 176, 227, 227, 179,
+ 180, 181, 123, 183, 123, 123, 123, 123, 188, 123,
+ 123, 210, 192, 193, 194, 227, 161, 162, 163, 1,
+ 165, 166, 202, 168, 169, 123, 171, 207, 173, 227,
+ 227, 176, 227, 227, 179, 180, 181, 227, 183, 227,
+ 22, 23, 227, 188, 227, 227, 28, 192, 193, 194,
+ 227, 227, 227, 227, 227, 227, 123, 202, 227, 227,
+ 230, 227, 207, 230, 227, 123, 123, 210, 230, 123,
+ 227, 123, 123, 123, 227, 227, 227, 227, 123, 227,
+ 227, 227, 123, 65, 66, 227, 227, 227, 227, 71,
+ 72, 123, 227, 227, 227, 227, 78, 79, 80, 227,
+ 227, 227, 227, 227, 227, 227, 123, 227, 129, 129,
+ 129, 1013, 227, 218, 1015, 74, 227, 227, 230, 227,
+ 227, 230, 104, 105, 227, 227, 227, 227, 227, 284,
+ 227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 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,
+ 492, 227, 227, 227, 227, 227, 227, 227, 227, 1026,
+ 1276, 227, 507, 1240, 227, 1238, 231, 1219, 227, 227,
+ 227, 227, 1230, 227, 227, 227, 456, 227, 227, 227,
+ 227, 227, 227, 227, 332, 1122, 1228, 230, 227, 230,
+ 227, 227, 232, 523, 232, 227, 230, 232, 1249, 227,
+ 577, 227, 227, 561, 1242, 1224, 111, 479, 163, 384,
+ 1092, 365, 1090, 469, 92, 234, -1, -1, -1, -1,
+ -1, -1, -1, 394, -1, -1, -1, -1, -1, 262,
-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, 295
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 291
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1878,97 +1872,96 @@ static const yytype_uint16 yystos[] =
38, 39, 62, 67, 75, 96, 97, 114, 131, 144,
145, 164, 177, 186, 190, 235, 240, 245, 269, 275,
281, 295, 315, 338, 352, 367, 374, 378, 388, 397,
- 418, 424, 430, 434, 440, 498, 513, 227, 228, 229,
+ 418, 424, 430, 434, 440, 496, 511, 227, 228, 229,
229, 316, 398, 425, 229, 435, 229, 353, 419, 339,
229, 276, 296, 368, 229, 229, 389, 229, 229, 379,
1, 25, 32, 98, 270, 271, 272, 273, 274, 1,
22, 23, 28, 65, 66, 71, 72, 78, 79, 80,
- 104, 105, 499, 500, 501, 502, 503, 504, 505, 506,
- 507, 508, 509, 510, 511, 512, 229, 229, 229, 1,
+ 104, 105, 497, 498, 499, 500, 501, 502, 503, 504,
+ 505, 506, 507, 508, 509, 510, 229, 229, 229, 1,
61, 431, 432, 433, 229, 1, 6, 7, 12, 20,
- 21, 27, 30, 31, 36, 41, 42, 44, 45, 46,
- 48, 55, 59, 60, 68, 77, 85, 87, 89, 91,
- 93, 94, 106, 111, 112, 113, 115, 116, 117, 120,
- 146, 154, 155, 156, 157, 158, 159, 187, 211, 212,
- 214, 215, 216, 220, 225, 441, 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, 470, 471, 472, 473, 474, 475,
- 476, 477, 478, 479, 480, 481, 482, 483, 484, 485,
- 486, 487, 491, 495, 496, 497, 229, 229, 229, 1,
- 95, 119, 241, 242, 243, 244, 229, 229, 229, 1,
- 29, 37, 49, 50, 52, 53, 54, 74, 514, 515,
- 516, 517, 518, 519, 520, 521, 522, 523, 1, 25,
- 57, 64, 86, 90, 98, 101, 102, 133, 150, 153,
- 178, 196, 197, 198, 223, 224, 246, 247, 248, 249,
- 254, 255, 256, 257, 258, 259, 260, 261, 262, 263,
- 264, 265, 266, 267, 268, 229, 1, 221, 282, 283,
- 284, 285, 286, 1, 98, 375, 376, 377, 229, 227,
- 230, 230, 230, 228, 271, 230, 230, 230, 230, 230,
- 230, 230, 230, 230, 230, 230, 230, 228, 500, 1,
- 15, 16, 19, 63, 81, 82, 83, 84, 88, 92,
- 98, 109, 110, 121, 143, 182, 317, 318, 319, 320,
- 321, 322, 323, 324, 325, 326, 327, 328, 329, 330,
- 331, 332, 333, 334, 1, 3, 5, 17, 33, 56,
- 58, 63, 73, 98, 122, 142, 151, 196, 223, 399,
- 400, 401, 402, 403, 404, 405, 406, 407, 408, 409,
- 413, 414, 415, 416, 417, 1, 61, 125, 426, 427,
- 428, 429, 230, 228, 432, 1, 98, 125, 436, 437,
- 438, 439, 230, 230, 230, 230, 230, 230, 230, 230,
+ 21, 27, 30, 36, 41, 42, 44, 45, 46, 48,
+ 55, 59, 60, 68, 77, 85, 87, 89, 91, 93,
+ 94, 106, 111, 112, 113, 115, 116, 117, 120, 146,
+ 154, 155, 156, 157, 158, 159, 187, 211, 212, 214,
+ 215, 216, 225, 441, 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, 470, 471, 472, 473, 474, 475, 476, 477,
+ 478, 479, 480, 481, 482, 483, 484, 485, 489, 493,
+ 494, 495, 229, 229, 229, 1, 95, 119, 241, 242,
+ 243, 244, 229, 229, 229, 1, 29, 37, 49, 50,
+ 52, 53, 54, 74, 512, 513, 514, 515, 516, 517,
+ 518, 519, 520, 521, 1, 25, 57, 64, 86, 90,
+ 98, 101, 102, 133, 150, 153, 178, 196, 197, 198,
+ 223, 224, 246, 247, 248, 249, 254, 255, 256, 257,
+ 258, 259, 260, 261, 262, 263, 264, 265, 266, 267,
+ 268, 229, 1, 221, 282, 283, 284, 285, 286, 1,
+ 98, 375, 376, 377, 229, 227, 230, 230, 230, 228,
+ 271, 230, 230, 230, 230, 230, 230, 230, 230, 230,
+ 230, 230, 230, 228, 498, 1, 15, 16, 19, 63,
+ 81, 82, 83, 84, 88, 92, 98, 109, 110, 121,
+ 143, 182, 317, 318, 319, 320, 321, 322, 323, 324,
+ 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
+ 1, 3, 5, 17, 33, 56, 58, 63, 73, 98,
+ 122, 142, 151, 196, 223, 399, 400, 401, 402, 403,
+ 404, 405, 406, 407, 408, 409, 413, 414, 415, 416,
+ 417, 1, 61, 125, 426, 427, 428, 429, 230, 228,
+ 432, 1, 98, 125, 436, 437, 438, 439, 230, 230,
230, 230, 230, 230, 230, 230, 230, 230, 230, 230,
- 230, 230, 230, 230, 230, 230, 230, 230, 230, 492,
- 230, 488, 230, 230, 230, 230, 230, 230, 230, 230,
230, 230, 230, 230, 230, 230, 230, 230, 230, 230,
- 230, 228, 442, 1, 17, 33, 63, 118, 126, 127,
- 147, 222, 354, 355, 356, 357, 358, 359, 360, 364,
- 365, 366, 1, 125, 222, 420, 421, 422, 423, 1,
- 56, 61, 63, 122, 340, 344, 345, 346, 350, 351,
- 227, 230, 230, 228, 242, 1, 76, 170, 277, 278,
- 279, 280, 1, 17, 33, 63, 98, 118, 134, 151,
- 152, 201, 222, 297, 298, 299, 300, 301, 302, 303,
- 304, 305, 306, 307, 311, 1, 35, 76, 125, 369,
- 370, 371, 372, 373, 230, 230, 230, 230, 230, 230,
- 230, 230, 228, 515, 227, 230, 230, 230, 230, 230,
+ 230, 230, 230, 230, 490, 230, 486, 230, 230, 230,
230, 230, 230, 230, 230, 230, 230, 230, 230, 230,
- 230, 230, 228, 247, 1, 98, 218, 390, 391, 392,
- 393, 227, 230, 228, 283, 170, 230, 228, 376, 1,
- 98, 218, 222, 380, 381, 382, 383, 384, 123, 123,
- 123, 227, 108, 108, 210, 108, 108, 237, 237, 237,
- 108, 108, 108, 210, 210, 227, 227, 230, 230, 230,
- 335, 230, 230, 230, 230, 230, 230, 230, 230, 230,
- 230, 230, 230, 228, 318, 227, 230, 230, 230, 230,
- 230, 230, 410, 230, 230, 230, 230, 230, 230, 230,
- 228, 400, 230, 230, 228, 427, 123, 227, 230, 230,
- 228, 437, 210, 237, 237, 210, 108, 210, 108, 123,
- 210, 237, 210, 108, 108, 237, 108, 210, 210, 210,
- 237, 108, 108, 237, 108, 108, 108, 108, 210, 230,
- 210, 230, 210, 237, 237, 210, 210, 210, 210, 213,
- 210, 213, 210, 210, 210, 123, 237, 210, 210, 237,
- 237, 210, 210, 227, 227, 230, 230, 361, 230, 230,
- 230, 230, 230, 228, 355, 230, 230, 228, 421, 227,
- 230, 230, 341, 230, 228, 345, 123, 123, 227, 227,
- 230, 230, 228, 278, 227, 230, 230, 312, 230, 230,
- 230, 230, 230, 308, 230, 228, 298, 227, 230, 230,
- 230, 228, 370, 210, 210, 210, 123, 210, 210, 210,
- 237, 227, 123, 210, 123, 108, 108, 123, 123, 123,
- 123, 123, 123, 108, 123, 199, 200, 250, 251, 199,
- 200, 252, 253, 123, 123, 227, 227, 230, 394, 228,
- 391, 210, 227, 229, 123, 227, 227, 230, 385, 230,
- 228, 381, 227, 227, 227, 227, 227, 227, 227, 135,
- 136, 137, 138, 139, 140, 141, 236, 237, 227, 227,
- 227, 227, 227, 227, 227, 227, 108, 108, 237, 230,
- 108, 108, 237, 108, 108, 237, 123, 108, 108, 237,
- 108, 239, 239, 227, 123, 174, 175, 123, 210, 123,
- 123, 230, 123, 123, 108, 123, 123, 123, 123, 227,
- 123, 123, 227, 227, 123, 123, 227, 227, 227, 227,
+ 230, 230, 230, 230, 230, 228, 442, 1, 17, 33,
+ 63, 118, 126, 127, 147, 222, 354, 355, 356, 357,
+ 358, 359, 360, 364, 365, 366, 1, 125, 222, 420,
+ 421, 422, 423, 1, 56, 61, 63, 122, 340, 344,
+ 345, 346, 350, 351, 227, 230, 230, 228, 242, 1,
+ 76, 170, 277, 278, 279, 280, 1, 17, 33, 63,
+ 98, 118, 134, 151, 152, 201, 222, 297, 298, 299,
+ 300, 301, 302, 303, 304, 305, 306, 307, 311, 1,
+ 35, 76, 125, 369, 370, 371, 372, 373, 230, 230,
+ 230, 230, 230, 230, 230, 230, 228, 513, 227, 230,
+ 230, 230, 230, 230, 230, 230, 230, 230, 230, 230,
+ 230, 230, 230, 230, 230, 230, 228, 247, 1, 98,
+ 218, 390, 391, 392, 393, 227, 230, 228, 283, 170,
+ 230, 228, 376, 1, 98, 218, 222, 380, 381, 382,
+ 383, 384, 123, 123, 123, 227, 108, 108, 210, 108,
+ 108, 237, 237, 237, 108, 108, 108, 210, 210, 227,
+ 227, 230, 230, 230, 335, 230, 230, 230, 230, 230,
+ 230, 230, 230, 230, 230, 230, 230, 228, 318, 227,
+ 230, 230, 230, 230, 230, 230, 410, 230, 230, 230,
+ 230, 230, 230, 230, 228, 400, 230, 230, 228, 427,
+ 123, 227, 230, 230, 228, 437, 210, 237, 237, 210,
+ 108, 210, 108, 210, 237, 210, 108, 108, 237, 108,
+ 210, 210, 210, 237, 108, 108, 237, 108, 108, 108,
+ 108, 210, 230, 210, 230, 210, 237, 237, 210, 210,
+ 210, 210, 213, 210, 213, 210, 210, 210, 123, 237,
+ 210, 210, 237, 237, 210, 227, 227, 230, 230, 361,
+ 230, 230, 230, 230, 230, 228, 355, 230, 230, 228,
+ 421, 227, 230, 230, 341, 230, 228, 345, 123, 123,
+ 227, 227, 230, 230, 228, 278, 227, 230, 230, 312,
+ 230, 230, 230, 230, 230, 308, 230, 228, 298, 227,
+ 230, 230, 230, 228, 370, 210, 210, 210, 123, 210,
+ 210, 210, 237, 227, 123, 210, 123, 108, 108, 123,
+ 123, 123, 123, 123, 123, 108, 123, 199, 200, 250,
+ 251, 199, 200, 252, 253, 123, 123, 227, 227, 230,
+ 394, 228, 391, 210, 227, 229, 123, 227, 227, 230,
+ 385, 230, 228, 381, 227, 227, 227, 227, 227, 227,
+ 227, 135, 136, 137, 138, 139, 140, 141, 236, 237,
+ 227, 227, 227, 227, 227, 227, 227, 227, 108, 108,
+ 237, 230, 108, 108, 237, 108, 108, 237, 123, 108,
+ 108, 237, 108, 239, 239, 227, 123, 174, 175, 123,
+ 210, 123, 123, 230, 123, 123, 108, 123, 123, 123,
+ 123, 227, 123, 123, 227, 227, 123, 123, 227, 227,
227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
227, 227, 227, 227, 227, 227, 227, 227, 227, 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, 493, 494, 227, 49, 161,
- 162, 163, 165, 166, 168, 169, 171, 173, 176, 179,
- 180, 181, 183, 188, 192, 193, 194, 202, 207, 489,
- 490, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 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, 491, 492, 227, 49,
+ 161, 162, 163, 165, 166, 168, 169, 171, 173, 176,
+ 179, 180, 181, 183, 188, 192, 193, 194, 202, 207,
+ 487, 488, 227, 227, 227, 227, 227, 227, 227, 227,
227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
227, 227, 123, 210, 230, 123, 108, 123, 123, 123,
227, 123, 123, 227, 123, 123, 230, 108, 348, 349,
@@ -1997,7 +1990,7 @@ static const yytype_uint16 yystos[] =
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,
+ 238, 238, 238, 227, 231, 492, 488, 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,
@@ -2058,22 +2051,22 @@ static const yytype_uint16 yyr1[] =
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, 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, 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
+ 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, 486, 485, 487, 487, 488, 488, 488,
+ 488, 488, 488, 488, 488, 488, 488, 488, 488, 488,
+ 488, 488, 488, 488, 488, 488, 488, 488, 490, 489,
+ 491, 491, 492, 492, 492, 492, 492, 492, 492, 492,
+ 492, 492, 492, 492, 492, 492, 492, 492, 492, 492,
+ 492, 492, 492, 493, 494, 495, 496, 497, 497, 498,
+ 498, 498, 498, 498, 498, 498, 498, 498, 498, 498,
+ 498, 498, 499, 500, 501, 502, 503, 504, 505, 506,
+ 507, 508, 509, 510, 511, 512, 512, 513, 513, 513,
+ 513, 513, 513, 513, 513, 513, 514, 515, 516, 517,
+ 518, 519, 520, 521
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
@@ -2129,22 +2122,22 @@ static const yytype_uint8 yyr2[] =
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,
+ 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, 0, 5, 3,
+ 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, 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, 0, 5, 3, 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, 1, 1, 1, 1, 1, 4, 4, 4,
- 5, 2, 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, 4, 4, 4, 4, 5, 2,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 4, 4, 4, 4, 4, 4, 4, 4
+ 4, 4, 4, 4
};
@@ -2823,7 +2816,7 @@ yyreduce:
case 27:
#line 403 "conf_parser.y" /* yacc.c:1646 */
{ (yyval.number) = 0; }
-#line 2827 "conf_parser.c" /* yacc.c:1646 */
+#line 2820 "conf_parser.c" /* yacc.c:1646 */
break;
case 29:
@@ -2831,7 +2824,7 @@ yyreduce:
{
(yyval.number) = (yyvsp[-1].number) + (yyvsp[0].number);
}
-#line 2835 "conf_parser.c" /* yacc.c:1646 */
+#line 2828 "conf_parser.c" /* yacc.c:1646 */
break;
case 30:
@@ -2839,7 +2832,7 @@ yyreduce:
{
(yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number);
}
-#line 2843 "conf_parser.c" /* yacc.c:1646 */
+#line 2836 "conf_parser.c" /* yacc.c:1646 */
break;
case 31:
@@ -2847,7 +2840,7 @@ yyreduce:
{
(yyval.number) = (yyvsp[-2].number) * 60 + (yyvsp[0].number);
}
-#line 2851 "conf_parser.c" /* yacc.c:1646 */
+#line 2844 "conf_parser.c" /* yacc.c:1646 */
break;
case 32:
@@ -2855,7 +2848,7 @@ yyreduce:
{
(yyval.number) = (yyvsp[-2].number) * 60 * 60 + (yyvsp[0].number);
}
-#line 2859 "conf_parser.c" /* yacc.c:1646 */
+#line 2852 "conf_parser.c" /* yacc.c:1646 */
break;
case 33:
@@ -2863,7 +2856,7 @@ yyreduce:
{
(yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 + (yyvsp[0].number);
}
-#line 2867 "conf_parser.c" /* yacc.c:1646 */
+#line 2860 "conf_parser.c" /* yacc.c:1646 */
break;
case 34:
@@ -2871,7 +2864,7 @@ yyreduce:
{
(yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 7 + (yyvsp[0].number);
}
-#line 2875 "conf_parser.c" /* yacc.c:1646 */
+#line 2868 "conf_parser.c" /* yacc.c:1646 */
break;
case 35:
@@ -2879,7 +2872,7 @@ yyreduce:
{
(yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 7 * 4 + (yyvsp[0].number);
}
-#line 2883 "conf_parser.c" /* yacc.c:1646 */
+#line 2876 "conf_parser.c" /* yacc.c:1646 */
break;
case 36:
@@ -2887,37 +2880,37 @@ yyreduce:
{
(yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 365 + (yyvsp[0].number);
}
-#line 2891 "conf_parser.c" /* yacc.c:1646 */
+#line 2884 "conf_parser.c" /* yacc.c:1646 */
break;
case 37:
#line 438 "conf_parser.y" /* yacc.c:1646 */
{ (yyval.number) = 0; }
-#line 2897 "conf_parser.c" /* yacc.c:1646 */
+#line 2890 "conf_parser.c" /* yacc.c:1646 */
break;
case 39:
#line 439 "conf_parser.y" /* yacc.c:1646 */
{ (yyval.number) = (yyvsp[-1].number) + (yyvsp[0].number); }
-#line 2903 "conf_parser.c" /* yacc.c:1646 */
+#line 2896 "conf_parser.c" /* yacc.c:1646 */
break;
case 40:
#line 440 "conf_parser.y" /* yacc.c:1646 */
{ (yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number); }
-#line 2909 "conf_parser.c" /* yacc.c:1646 */
+#line 2902 "conf_parser.c" /* yacc.c:1646 */
break;
case 41:
#line 441 "conf_parser.y" /* yacc.c:1646 */
{ (yyval.number) = (yyvsp[-2].number) * 1024 + (yyvsp[0].number); }
-#line 2915 "conf_parser.c" /* yacc.c:1646 */
+#line 2908 "conf_parser.c" /* yacc.c:1646 */
break;
case 42:
#line 442 "conf_parser.y" /* yacc.c:1646 */
{ (yyval.number) = (yyvsp[-2].number) * 1024 * 1024 + (yyvsp[0].number); }
-#line 2921 "conf_parser.c" /* yacc.c:1646 */
+#line 2914 "conf_parser.c" /* yacc.c:1646 */
break;
case 49:
@@ -2926,7 +2919,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
add_conf_module(libio_basename(yylval.string));
}
-#line 2930 "conf_parser.c" /* yacc.c:1646 */
+#line 2923 "conf_parser.c" /* yacc.c:1646 */
break;
case 50:
@@ -2935,7 +2928,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
mod_add_path(yylval.string);
}
-#line 2939 "conf_parser.c" /* yacc.c:1646 */
+#line 2932 "conf_parser.c" /* yacc.c:1646 */
break;
case 76:
@@ -2946,7 +2939,7 @@ yyreduce:
SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv3);
#endif
}
-#line 2950 "conf_parser.c" /* yacc.c:1646 */
+#line 2943 "conf_parser.c" /* yacc.c:1646 */
break;
case 77:
@@ -2957,7 +2950,7 @@ yyreduce:
SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_TLSv1);
#endif
}
-#line 2961 "conf_parser.c" /* yacc.c:1646 */
+#line 2954 "conf_parser.c" /* yacc.c:1646 */
break;
case 80:
@@ -2968,7 +2961,7 @@ yyreduce:
SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
#endif
}
-#line 2972 "conf_parser.c" /* yacc.c:1646 */
+#line 2965 "conf_parser.c" /* yacc.c:1646 */
break;
case 81:
@@ -2979,7 +2972,7 @@ yyreduce:
SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
#endif
}
-#line 2983 "conf_parser.c" /* yacc.c:1646 */
+#line 2976 "conf_parser.c" /* yacc.c:1646 */
break;
case 82:
@@ -3024,7 +3017,7 @@ yyreduce:
}
#endif
}
-#line 3028 "conf_parser.c" /* yacc.c:1646 */
+#line 3021 "conf_parser.c" /* yacc.c:1646 */
break;
case 83:
@@ -3085,7 +3078,7 @@ yyreduce:
}
#endif
}
-#line 3089 "conf_parser.c" /* yacc.c:1646 */
+#line 3082 "conf_parser.c" /* yacc.c:1646 */
break;
case 84:
@@ -3116,7 +3109,7 @@ yyreduce:
}
#endif
}
-#line 3120 "conf_parser.c" /* yacc.c:1646 */
+#line 3113 "conf_parser.c" /* yacc.c:1646 */
break;
case 85:
@@ -3127,7 +3120,7 @@ yyreduce:
SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
#endif
}
-#line 3131 "conf_parser.c" /* yacc.c:1646 */
+#line 3124 "conf_parser.c" /* yacc.c:1646 */
break;
case 86:
@@ -3145,7 +3138,7 @@ yyreduce:
}
}
}
-#line 3149 "conf_parser.c" /* yacc.c:1646 */
+#line 3142 "conf_parser.c" /* yacc.c:1646 */
break;
case 87:
@@ -3163,7 +3156,7 @@ yyreduce:
}
}
}
-#line 3167 "conf_parser.c" /* yacc.c:1646 */
+#line 3160 "conf_parser.c" /* yacc.c:1646 */
break;
case 88:
@@ -3175,7 +3168,7 @@ yyreduce:
ServerInfo.description = xstrdup(yylval.string);
}
}
-#line 3179 "conf_parser.c" /* yacc.c:1646 */
+#line 3172 "conf_parser.c" /* yacc.c:1646 */
break;
case 89:
@@ -3192,7 +3185,7 @@ yyreduce:
ServerInfo.network_name = xstrdup(yylval.string);
}
}
-#line 3196 "conf_parser.c" /* yacc.c:1646 */
+#line 3189 "conf_parser.c" /* yacc.c:1646 */
break;
case 90:
@@ -3204,7 +3197,7 @@ yyreduce:
MyFree(ServerInfo.network_desc);
ServerInfo.network_desc = xstrdup(yylval.string);
}
-#line 3208 "conf_parser.c" /* yacc.c:1646 */
+#line 3201 "conf_parser.c" /* yacc.c:1646 */
break;
case 91:
@@ -3235,7 +3228,7 @@ yyreduce:
}
}
}
-#line 3239 "conf_parser.c" /* yacc.c:1646 */
+#line 3232 "conf_parser.c" /* yacc.c:1646 */
break;
case 92:
@@ -3268,7 +3261,7 @@ yyreduce:
}
#endif
}
-#line 3272 "conf_parser.c" /* yacc.c:1646 */
+#line 3265 "conf_parser.c" /* yacc.c:1646 */
break;
case 93:
@@ -3296,7 +3289,7 @@ yyreduce:
else
ServerInfo.max_clients = (yyvsp[-1].number);
}
-#line 3300 "conf_parser.c" /* yacc.c:1646 */
+#line 3293 "conf_parser.c" /* yacc.c:1646 */
break;
case 94:
@@ -3321,7 +3314,7 @@ yyreduce:
else
ServerInfo.max_nick_length = (yyvsp[-1].number);
}
-#line 3325 "conf_parser.c" /* yacc.c:1646 */
+#line 3318 "conf_parser.c" /* yacc.c:1646 */
break;
case 95:
@@ -3346,7 +3339,7 @@ yyreduce:
else
ServerInfo.max_topic_length = (yyvsp[-1].number);
}
-#line 3350 "conf_parser.c" /* yacc.c:1646 */
+#line 3343 "conf_parser.c" /* yacc.c:1646 */
break;
case 96:
@@ -3355,7 +3348,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
ServerInfo.hub = yylval.number;
}
-#line 3359 "conf_parser.c" /* yacc.c:1646 */
+#line 3352 "conf_parser.c" /* yacc.c:1646 */
break;
case 104:
@@ -3367,7 +3360,7 @@ yyreduce:
MyFree(AdminInfo.name);
AdminInfo.name = xstrdup(yylval.string);
}
-#line 3371 "conf_parser.c" /* yacc.c:1646 */
+#line 3364 "conf_parser.c" /* yacc.c:1646 */
break;
case 105:
@@ -3379,7 +3372,7 @@ yyreduce:
MyFree(AdminInfo.email);
AdminInfo.email = xstrdup(yylval.string);
}
-#line 3383 "conf_parser.c" /* yacc.c:1646 */
+#line 3376 "conf_parser.c" /* yacc.c:1646 */
break;
case 106:
@@ -3391,7 +3384,7 @@ yyreduce:
MyFree(AdminInfo.description);
AdminInfo.description = xstrdup(yylval.string);
}
-#line 3395 "conf_parser.c" /* yacc.c:1646 */
+#line 3388 "conf_parser.c" /* yacc.c:1646 */
break;
case 107:
@@ -3400,7 +3393,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
reset_block_state();
}
-#line 3404 "conf_parser.c" /* yacc.c:1646 */
+#line 3397 "conf_parser.c" /* yacc.c:1646 */
break;
case 108:
@@ -3417,7 +3410,7 @@ yyreduce:
DLINK_FOREACH(ptr, block_state.mask.list.head)
motd_add(ptr->data, block_state.file.buf);
}
-#line 3421 "conf_parser.c" /* yacc.c:1646 */
+#line 3414 "conf_parser.c" /* yacc.c:1646 */
break;
case 114:
@@ -3426,7 +3419,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
}
-#line 3430 "conf_parser.c" /* yacc.c:1646 */
+#line 3423 "conf_parser.c" /* yacc.c:1646 */
break;
case 115:
@@ -3435,7 +3428,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
}
-#line 3439 "conf_parser.c" /* yacc.c:1646 */
+#line 3432 "conf_parser.c" /* yacc.c:1646 */
break;
case 122:
@@ -3444,7 +3437,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
ConfigLoggingEntry.use_logging = yylval.number;
}
-#line 3448 "conf_parser.c" /* yacc.c:1646 */
+#line 3441 "conf_parser.c" /* yacc.c:1646 */
break;
case 123:
@@ -3453,7 +3446,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
reset_block_state();
}
-#line 3457 "conf_parser.c" /* yacc.c:1646 */
+#line 3450 "conf_parser.c" /* yacc.c:1646 */
break;
case 124:
@@ -3466,7 +3459,7 @@ yyreduce:
log_set_file(block_state.type.value, block_state.size.value,
block_state.file.buf);
}
-#line 3470 "conf_parser.c" /* yacc.c:1646 */
+#line 3463 "conf_parser.c" /* yacc.c:1646 */
break;
case 131:
@@ -3477,7 +3470,7 @@ yyreduce:
strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
}
-#line 3481 "conf_parser.c" /* yacc.c:1646 */
+#line 3474 "conf_parser.c" /* yacc.c:1646 */
break;
case 132:
@@ -3485,7 +3478,7 @@ yyreduce:
{
block_state.size.value = (yyvsp[-1].number);
}
-#line 3489 "conf_parser.c" /* yacc.c:1646 */
+#line 3482 "conf_parser.c" /* yacc.c:1646 */
break;
case 133:
@@ -3493,7 +3486,7 @@ yyreduce:
{
block_state.size.value = 0;
}
-#line 3497 "conf_parser.c" /* yacc.c:1646 */
+#line 3490 "conf_parser.c" /* yacc.c:1646 */
break;
case 134:
@@ -3502,7 +3495,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
block_state.type.value = 0;
}
-#line 3506 "conf_parser.c" /* yacc.c:1646 */
+#line 3499 "conf_parser.c" /* yacc.c:1646 */
break;
case 138:
@@ -3511,7 +3504,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_USER;
}
-#line 3515 "conf_parser.c" /* yacc.c:1646 */
+#line 3508 "conf_parser.c" /* yacc.c:1646 */
break;
case 139:
@@ -3520,7 +3513,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_OPER;
}
-#line 3524 "conf_parser.c" /* yacc.c:1646 */
+#line 3517 "conf_parser.c" /* yacc.c:1646 */
break;
case 140:
@@ -3529,7 +3522,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_GLINE;
}
-#line 3533 "conf_parser.c" /* yacc.c:1646 */
+#line 3526 "conf_parser.c" /* yacc.c:1646 */
break;
case 141:
@@ -3538,7 +3531,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_XLINE;
}
-#line 3542 "conf_parser.c" /* yacc.c:1646 */
+#line 3535 "conf_parser.c" /* yacc.c:1646 */
break;
case 142:
@@ -3547,7 +3540,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_RESV;
}
-#line 3551 "conf_parser.c" /* yacc.c:1646 */
+#line 3544 "conf_parser.c" /* yacc.c:1646 */
break;
case 143:
@@ -3556,7 +3549,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_DLINE;
}
-#line 3560 "conf_parser.c" /* yacc.c:1646 */
+#line 3553 "conf_parser.c" /* yacc.c:1646 */
break;
case 144:
@@ -3565,7 +3558,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_KLINE;
}
-#line 3569 "conf_parser.c" /* yacc.c:1646 */
+#line 3562 "conf_parser.c" /* yacc.c:1646 */
break;
case 145:
@@ -3574,7 +3567,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_KILL;
}
-#line 3578 "conf_parser.c" /* yacc.c:1646 */
+#line 3571 "conf_parser.c" /* yacc.c:1646 */
break;
case 146:
@@ -3583,7 +3576,7 @@ yyreduce:
if (conf_parser_ctx.pass == 2)
block_state.type.value = LOG_TYPE_DEBUG;
}
-#line 3587 "conf_parser.c" /* yacc.c:1646 */
+#line 3580 "conf_parser.c" /* yacc.c:1646 */
break;
case 147:
@@ -3595,7 +3588,7 @@ yyreduce:
reset_block_state();
block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
}
-#line 3599 "conf_parser.c" /* yacc.c:1646 */
+#line 3592 "conf_parser.c" /* yacc.c:1646 */
break;
case 148:
@@ -3657,52 +3650,58 @@ yyreduce:
if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
{
- conf_error_report("Ignoring rsa_public_key_file -- file doesn't exist");
+ ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- file doesn't exist");
break;
}
if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
- conf_error_report("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
+ ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- Key invalid; check key syntax");
+ else
+ {
+ if (RSA_size(pkey) > 128)
+ ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key size must be 1024 or below");
+ else
+ conf->rsa_public_key = pkey;
+ }
- conf->rsa_public_key = pkey;
BIO_set_close(file, BIO_CLOSE);
BIO_free(file);
}
#endif /* HAVE_LIBCRYPTO */
}
}
-#line 3675 "conf_parser.c" /* yacc.c:1646 */
+#line 3674 "conf_parser.c" /* yacc.c:1646 */
break;
case 162:
-#line 1107 "conf_parser.y" /* yacc.c:1646 */
+#line 1113 "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 3684 "conf_parser.c" /* yacc.c:1646 */
+#line 3683 "conf_parser.c" /* yacc.c:1646 */
break;
case 163:
-#line 1113 "conf_parser.y" /* yacc.c:1646 */
+#line 1119 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
}
-#line 3693 "conf_parser.c" /* yacc.c:1646 */
+#line 3692 "conf_parser.c" /* yacc.c:1646 */
break;
case 164:
-#line 1119 "conf_parser.y" /* yacc.c:1646 */
+#line 1125 "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 3702 "conf_parser.c" /* yacc.c:1646 */
+#line 3701 "conf_parser.c" /* yacc.c:1646 */
break;
case 165:
-#line 1125 "conf_parser.y" /* yacc.c:1646 */
+#line 1131 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -3712,29 +3711,29 @@ yyreduce:
else
block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
}
-#line 3716 "conf_parser.c" /* yacc.c:1646 */
+#line 3715 "conf_parser.c" /* yacc.c:1646 */
break;
case 166:
-#line 1136 "conf_parser.y" /* yacc.c:1646 */
+#line 1142 "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 3725 "conf_parser.c" /* yacc.c:1646 */
+#line 3724 "conf_parser.c" /* yacc.c:1646 */
break;
case 167:
-#line 1142 "conf_parser.y" /* yacc.c:1646 */
+#line 1148 "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 3734 "conf_parser.c" /* yacc.c:1646 */
+#line 3733 "conf_parser.c" /* yacc.c:1646 */
break;
case 168:
-#line 1148 "conf_parser.y" /* yacc.c:1646 */
+#line 1154 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -3744,443 +3743,443 @@ yyreduce:
else
block_state.flags.value &= ~CONF_FLAGS_SSL;
}
-#line 3748 "conf_parser.c" /* yacc.c:1646 */
+#line 3747 "conf_parser.c" /* yacc.c:1646 */
break;
case 169:
-#line 1159 "conf_parser.y" /* yacc.c:1646 */
+#line 1165 "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 3757 "conf_parser.c" /* yacc.c:1646 */
+#line 3756 "conf_parser.c" /* yacc.c:1646 */
break;
case 170:
-#line 1165 "conf_parser.y" /* yacc.c:1646 */
+#line 1171 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value = 0;
}
-#line 3766 "conf_parser.c" /* yacc.c:1646 */
+#line 3765 "conf_parser.c" /* yacc.c:1646 */
break;
case 174:
-#line 1172 "conf_parser.y" /* yacc.c:1646 */
+#line 1178 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_BOTS;
}
-#line 3775 "conf_parser.c" /* yacc.c:1646 */
+#line 3774 "conf_parser.c" /* yacc.c:1646 */
break;
case 175:
-#line 1176 "conf_parser.y" /* yacc.c:1646 */
+#line 1182 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_CCONN;
}
-#line 3784 "conf_parser.c" /* yacc.c:1646 */
+#line 3783 "conf_parser.c" /* yacc.c:1646 */
break;
case 176:
-#line 1180 "conf_parser.y" /* yacc.c:1646 */
+#line 1186 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_DEAF;
}
-#line 3793 "conf_parser.c" /* yacc.c:1646 */
+#line 3792 "conf_parser.c" /* yacc.c:1646 */
break;
case 177:
-#line 1184 "conf_parser.y" /* yacc.c:1646 */
+#line 1190 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_DEBUG;
}
-#line 3802 "conf_parser.c" /* yacc.c:1646 */
+#line 3801 "conf_parser.c" /* yacc.c:1646 */
break;
case 178:
-#line 1188 "conf_parser.y" /* yacc.c:1646 */
+#line 1194 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_FULL;
}
-#line 3811 "conf_parser.c" /* yacc.c:1646 */
+#line 3810 "conf_parser.c" /* yacc.c:1646 */
break;
case 179:
-#line 1192 "conf_parser.y" /* yacc.c:1646 */
+#line 1198 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_HIDDEN;
}
-#line 3820 "conf_parser.c" /* yacc.c:1646 */
+#line 3819 "conf_parser.c" /* yacc.c:1646 */
break;
case 180:
-#line 1196 "conf_parser.y" /* yacc.c:1646 */
+#line 1202 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_SKILL;
}
-#line 3829 "conf_parser.c" /* yacc.c:1646 */
+#line 3828 "conf_parser.c" /* yacc.c:1646 */
break;
case 181:
-#line 1200 "conf_parser.y" /* yacc.c:1646 */
+#line 1206 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_NCHANGE;
}
-#line 3838 "conf_parser.c" /* yacc.c:1646 */
+#line 3837 "conf_parser.c" /* yacc.c:1646 */
break;
case 182:
-#line 1204 "conf_parser.y" /* yacc.c:1646 */
+#line 1210 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_REJ;
}
-#line 3847 "conf_parser.c" /* yacc.c:1646 */
+#line 3846 "conf_parser.c" /* yacc.c:1646 */
break;
case 183:
-#line 1208 "conf_parser.y" /* yacc.c:1646 */
+#line 1214 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_UNAUTH;
}
-#line 3856 "conf_parser.c" /* yacc.c:1646 */
+#line 3855 "conf_parser.c" /* yacc.c:1646 */
break;
case 184:
-#line 1212 "conf_parser.y" /* yacc.c:1646 */
+#line 1218 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_SPY;
}
-#line 3865 "conf_parser.c" /* yacc.c:1646 */
+#line 3864 "conf_parser.c" /* yacc.c:1646 */
break;
case 185:
-#line 1216 "conf_parser.y" /* yacc.c:1646 */
+#line 1222 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_EXTERNAL;
}
-#line 3874 "conf_parser.c" /* yacc.c:1646 */
+#line 3873 "conf_parser.c" /* yacc.c:1646 */
break;
case 186:
-#line 1220 "conf_parser.y" /* yacc.c:1646 */
+#line 1226 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_OPERWALL;
}
-#line 3883 "conf_parser.c" /* yacc.c:1646 */
+#line 3882 "conf_parser.c" /* yacc.c:1646 */
break;
case 187:
-#line 1224 "conf_parser.y" /* yacc.c:1646 */
+#line 1230 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_SERVNOTICE;
}
-#line 3892 "conf_parser.c" /* yacc.c:1646 */
+#line 3891 "conf_parser.c" /* yacc.c:1646 */
break;
case 188:
-#line 1228 "conf_parser.y" /* yacc.c:1646 */
+#line 1234 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_INVISIBLE;
}
-#line 3901 "conf_parser.c" /* yacc.c:1646 */
+#line 3900 "conf_parser.c" /* yacc.c:1646 */
break;
case 189:
-#line 1232 "conf_parser.y" /* yacc.c:1646 */
+#line 1238 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_WALLOP;
}
-#line 3910 "conf_parser.c" /* yacc.c:1646 */
+#line 3909 "conf_parser.c" /* yacc.c:1646 */
break;
case 190:
-#line 1236 "conf_parser.y" /* yacc.c:1646 */
+#line 1242 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_SOFTCALLERID;
}
-#line 3919 "conf_parser.c" /* yacc.c:1646 */
+#line 3918 "conf_parser.c" /* yacc.c:1646 */
break;
case 191:
-#line 1240 "conf_parser.y" /* yacc.c:1646 */
+#line 1246 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_CALLERID;
}
-#line 3928 "conf_parser.c" /* yacc.c:1646 */
+#line 3927 "conf_parser.c" /* yacc.c:1646 */
break;
case 192:
-#line 1244 "conf_parser.y" /* yacc.c:1646 */
+#line 1250 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_LOCOPS;
}
-#line 3937 "conf_parser.c" /* yacc.c:1646 */
+#line 3936 "conf_parser.c" /* yacc.c:1646 */
break;
case 193:
-#line 1248 "conf_parser.y" /* yacc.c:1646 */
+#line 1254 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_REGONLY;
}
-#line 3946 "conf_parser.c" /* yacc.c:1646 */
+#line 3945 "conf_parser.c" /* yacc.c:1646 */
break;
case 194:
-#line 1252 "conf_parser.y" /* yacc.c:1646 */
+#line 1258 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.modes.value |= UMODE_FARCONNECT;
}
-#line 3955 "conf_parser.c" /* yacc.c:1646 */
+#line 3954 "conf_parser.c" /* yacc.c:1646 */
break;
case 195:
-#line 1258 "conf_parser.y" /* yacc.c:1646 */
+#line 1264 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value = 0;
}
-#line 3964 "conf_parser.c" /* yacc.c:1646 */
+#line 3963 "conf_parser.c" /* yacc.c:1646 */
break;
case 199:
-#line 1265 "conf_parser.y" /* yacc.c:1646 */
+#line 1271 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_KILL_REMOTE;
}
-#line 3973 "conf_parser.c" /* yacc.c:1646 */
+#line 3972 "conf_parser.c" /* yacc.c:1646 */
break;
case 200:
-#line 1269 "conf_parser.y" /* yacc.c:1646 */
+#line 1275 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_KILL;
}
-#line 3982 "conf_parser.c" /* yacc.c:1646 */
+#line 3981 "conf_parser.c" /* yacc.c:1646 */
break;
case 201:
-#line 1273 "conf_parser.y" /* yacc.c:1646 */
+#line 1279 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
}
-#line 3991 "conf_parser.c" /* yacc.c:1646 */
+#line 3990 "conf_parser.c" /* yacc.c:1646 */
break;
case 202:
-#line 1277 "conf_parser.y" /* yacc.c:1646 */
+#line 1283 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_CONNECT;
}
-#line 4000 "conf_parser.c" /* yacc.c:1646 */
+#line 3999 "conf_parser.c" /* yacc.c:1646 */
break;
case 203:
-#line 1281 "conf_parser.y" /* yacc.c:1646 */
+#line 1287 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
}
-#line 4009 "conf_parser.c" /* yacc.c:1646 */
+#line 4008 "conf_parser.c" /* yacc.c:1646 */
break;
case 204:
-#line 1285 "conf_parser.y" /* yacc.c:1646 */
+#line 1291 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_SQUIT;
}
-#line 4018 "conf_parser.c" /* yacc.c:1646 */
+#line 4017 "conf_parser.c" /* yacc.c:1646 */
break;
case 205:
-#line 1289 "conf_parser.y" /* yacc.c:1646 */
+#line 1295 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_K;
}
-#line 4027 "conf_parser.c" /* yacc.c:1646 */
+#line 4026 "conf_parser.c" /* yacc.c:1646 */
break;
case 206:
-#line 1293 "conf_parser.y" /* yacc.c:1646 */
+#line 1299 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_UNKLINE;
}
-#line 4036 "conf_parser.c" /* yacc.c:1646 */
+#line 4035 "conf_parser.c" /* yacc.c:1646 */
break;
case 207:
-#line 1297 "conf_parser.y" /* yacc.c:1646 */
+#line 1303 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_DLINE;
}
-#line 4045 "conf_parser.c" /* yacc.c:1646 */
+#line 4044 "conf_parser.c" /* yacc.c:1646 */
break;
case 208:
-#line 1301 "conf_parser.y" /* yacc.c:1646 */
+#line 1307 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_UNDLINE;
}
-#line 4054 "conf_parser.c" /* yacc.c:1646 */
+#line 4053 "conf_parser.c" /* yacc.c:1646 */
break;
case 209:
-#line 1305 "conf_parser.y" /* yacc.c:1646 */
+#line 1311 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_XLINE;
}
-#line 4063 "conf_parser.c" /* yacc.c:1646 */
+#line 4062 "conf_parser.c" /* yacc.c:1646 */
break;
case 210:
-#line 1309 "conf_parser.y" /* yacc.c:1646 */
+#line 1315 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_UNXLINE;
}
-#line 4072 "conf_parser.c" /* yacc.c:1646 */
+#line 4071 "conf_parser.c" /* yacc.c:1646 */
break;
case 211:
-#line 1313 "conf_parser.y" /* yacc.c:1646 */
+#line 1319 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_GLINE;
}
-#line 4081 "conf_parser.c" /* yacc.c:1646 */
+#line 4080 "conf_parser.c" /* yacc.c:1646 */
break;
case 212:
-#line 1317 "conf_parser.y" /* yacc.c:1646 */
+#line 1323 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_DIE;
}
-#line 4090 "conf_parser.c" /* yacc.c:1646 */
+#line 4089 "conf_parser.c" /* yacc.c:1646 */
break;
case 213:
-#line 1321 "conf_parser.y" /* yacc.c:1646 */
+#line 1327 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_RESTART;
}
-#line 4099 "conf_parser.c" /* yacc.c:1646 */
+#line 4098 "conf_parser.c" /* yacc.c:1646 */
break;
case 214:
-#line 1325 "conf_parser.y" /* yacc.c:1646 */
+#line 1331 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_REHASH;
}
-#line 4108 "conf_parser.c" /* yacc.c:1646 */
+#line 4107 "conf_parser.c" /* yacc.c:1646 */
break;
case 215:
-#line 1329 "conf_parser.y" /* yacc.c:1646 */
+#line 1335 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_ADMIN;
}
-#line 4117 "conf_parser.c" /* yacc.c:1646 */
+#line 4116 "conf_parser.c" /* yacc.c:1646 */
break;
case 216:
-#line 1333 "conf_parser.y" /* yacc.c:1646 */
+#line 1339 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_OPERWALL;
}
-#line 4126 "conf_parser.c" /* yacc.c:1646 */
+#line 4125 "conf_parser.c" /* yacc.c:1646 */
break;
case 217:
-#line 1337 "conf_parser.y" /* yacc.c:1646 */
+#line 1343 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_GLOBOPS;
}
-#line 4135 "conf_parser.c" /* yacc.c:1646 */
+#line 4134 "conf_parser.c" /* yacc.c:1646 */
break;
case 218:
-#line 1341 "conf_parser.y" /* yacc.c:1646 */
+#line 1347 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_WALLOPS;
}
-#line 4144 "conf_parser.c" /* yacc.c:1646 */
+#line 4143 "conf_parser.c" /* yacc.c:1646 */
break;
case 219:
-#line 1345 "conf_parser.y" /* yacc.c:1646 */
+#line 1351 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_LOCOPS;
}
-#line 4153 "conf_parser.c" /* yacc.c:1646 */
+#line 4152 "conf_parser.c" /* yacc.c:1646 */
break;
case 220:
-#line 1349 "conf_parser.y" /* yacc.c:1646 */
+#line 1355 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_REMOTEBAN;
}
-#line 4162 "conf_parser.c" /* yacc.c:1646 */
+#line 4161 "conf_parser.c" /* yacc.c:1646 */
break;
case 221:
-#line 1353 "conf_parser.y" /* yacc.c:1646 */
+#line 1359 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value |= OPER_FLAG_SET;
}
-#line 4171 "conf_parser.c" /* yacc.c:1646 */
+#line 4170 "conf_parser.c" /* yacc.c:1646 */
break;
case 222:
-#line 1357 "conf_parser.y" /* yacc.c:1646 */
+#line 1363 "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 */
+#line 4179 "conf_parser.c" /* yacc.c:1646 */
break;
case 223:
-#line 1367 "conf_parser.y" /* yacc.c:1646 */
+#line 1373 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 1)
break;
@@ -4193,11 +4192,11 @@ yyreduce:
block_state.max_sendq.value = DEFAULT_SENDQ;
block_state.max_recvq.value = DEFAULT_RECVQ;
}
-#line 4197 "conf_parser.c" /* yacc.c:1646 */
+#line 4196 "conf_parser.c" /* yacc.c:1646 */
break;
case 224:
-#line 1379 "conf_parser.y" /* yacc.c:1646 */
+#line 1385 "conf_parser.y" /* yacc.c:1646 */
{
struct ClassItem *class = NULL;
@@ -4245,129 +4244,129 @@ yyreduce:
class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
class->number_per_cidr = block_state.number_per_cidr.value;
}
-#line 4249 "conf_parser.c" /* yacc.c:1646 */
+#line 4248 "conf_parser.c" /* yacc.c:1646 */
break;
case 244:
-#line 1445 "conf_parser.y" /* yacc.c:1646 */
+#line 1451 "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 4258 "conf_parser.c" /* yacc.c:1646 */
+#line 4257 "conf_parser.c" /* yacc.c:1646 */
break;
case 245:
-#line 1451 "conf_parser.y" /* yacc.c:1646 */
+#line 1457 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.ping_freq.value = (yyvsp[-1].number);
}
-#line 4267 "conf_parser.c" /* yacc.c:1646 */
+#line 4266 "conf_parser.c" /* yacc.c:1646 */
break;
case 246:
-#line 1457 "conf_parser.y" /* yacc.c:1646 */
+#line 1463 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.max_perip.value = (yyvsp[-1].number);
}
-#line 4276 "conf_parser.c" /* yacc.c:1646 */
+#line 4275 "conf_parser.c" /* yacc.c:1646 */
break;
case 247:
-#line 1463 "conf_parser.y" /* yacc.c:1646 */
+#line 1469 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.con_freq.value = (yyvsp[-1].number);
}
-#line 4285 "conf_parser.c" /* yacc.c:1646 */
+#line 4284 "conf_parser.c" /* yacc.c:1646 */
break;
case 248:
-#line 1469 "conf_parser.y" /* yacc.c:1646 */
+#line 1475 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.max_total.value = (yyvsp[-1].number);
}
-#line 4294 "conf_parser.c" /* yacc.c:1646 */
+#line 4293 "conf_parser.c" /* yacc.c:1646 */
break;
case 249:
-#line 1475 "conf_parser.y" /* yacc.c:1646 */
+#line 1481 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.max_global.value = (yyvsp[-1].number);
}
-#line 4303 "conf_parser.c" /* yacc.c:1646 */
+#line 4302 "conf_parser.c" /* yacc.c:1646 */
break;
case 250:
-#line 1481 "conf_parser.y" /* yacc.c:1646 */
+#line 1487 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.max_local.value = (yyvsp[-1].number);
}
-#line 4312 "conf_parser.c" /* yacc.c:1646 */
+#line 4311 "conf_parser.c" /* yacc.c:1646 */
break;
case 251:
-#line 1487 "conf_parser.y" /* yacc.c:1646 */
+#line 1493 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.max_ident.value = (yyvsp[-1].number);
}
-#line 4321 "conf_parser.c" /* yacc.c:1646 */
+#line 4320 "conf_parser.c" /* yacc.c:1646 */
break;
case 252:
-#line 1493 "conf_parser.y" /* yacc.c:1646 */
+#line 1499 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.max_sendq.value = (yyvsp[-1].number);
}
-#line 4330 "conf_parser.c" /* yacc.c:1646 */
+#line 4329 "conf_parser.c" /* yacc.c:1646 */
break;
case 253:
-#line 1499 "conf_parser.y" /* yacc.c:1646 */
+#line 1505 "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 4340 "conf_parser.c" /* yacc.c:1646 */
+#line 4339 "conf_parser.c" /* yacc.c:1646 */
break;
case 254:
-#line 1506 "conf_parser.y" /* yacc.c:1646 */
+#line 1512 "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 4349 "conf_parser.c" /* yacc.c:1646 */
+#line 4348 "conf_parser.c" /* yacc.c:1646 */
break;
case 255:
-#line 1512 "conf_parser.y" /* yacc.c:1646 */
+#line 1518 "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 4358 "conf_parser.c" /* yacc.c:1646 */
+#line 4357 "conf_parser.c" /* yacc.c:1646 */
break;
case 256:
-#line 1518 "conf_parser.y" /* yacc.c:1646 */
+#line 1524 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.number_per_cidr.value = (yyvsp[-1].number);
}
-#line 4367 "conf_parser.c" /* yacc.c:1646 */
+#line 4366 "conf_parser.c" /* yacc.c:1646 */
break;
case 257:
-#line 1524 "conf_parser.y" /* yacc.c:1646 */
+#line 1530 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 1)
break;
@@ -4375,11 +4374,11 @@ yyreduce:
block_state.min_idle.value = (yyvsp[-1].number);
block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
}
-#line 4379 "conf_parser.c" /* yacc.c:1646 */
+#line 4378 "conf_parser.c" /* yacc.c:1646 */
break;
case 258:
-#line 1533 "conf_parser.y" /* yacc.c:1646 */
+#line 1539 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 1)
break;
@@ -4387,88 +4386,88 @@ yyreduce:
block_state.max_idle.value = (yyvsp[-1].number);
block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
}
-#line 4391 "conf_parser.c" /* yacc.c:1646 */
+#line 4390 "conf_parser.c" /* yacc.c:1646 */
break;
case 259:
-#line 1542 "conf_parser.y" /* yacc.c:1646 */
+#line 1548 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
}
-#line 4400 "conf_parser.c" /* yacc.c:1646 */
+#line 4399 "conf_parser.c" /* yacc.c:1646 */
break;
case 263:
-#line 1549 "conf_parser.y" /* yacc.c:1646 */
+#line 1555 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
}
-#line 4409 "conf_parser.c" /* yacc.c:1646 */
+#line 4408 "conf_parser.c" /* yacc.c:1646 */
break;
case 264:
-#line 1553 "conf_parser.y" /* yacc.c:1646 */
+#line 1559 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 1)
block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
}
-#line 4418 "conf_parser.c" /* yacc.c:1646 */
+#line 4417 "conf_parser.c" /* yacc.c:1646 */
break;
case 265:
-#line 1563 "conf_parser.y" /* yacc.c:1646 */
+#line 1569 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
}
-#line 4427 "conf_parser.c" /* yacc.c:1646 */
+#line 4426 "conf_parser.c" /* yacc.c:1646 */
break;
case 267:
-#line 1569 "conf_parser.y" /* yacc.c:1646 */
+#line 1575 "conf_parser.y" /* yacc.c:1646 */
{
block_state.flags.value = 0;
}
-#line 4435 "conf_parser.c" /* yacc.c:1646 */
+#line 4434 "conf_parser.c" /* yacc.c:1646 */
break;
case 271:
-#line 1575 "conf_parser.y" /* yacc.c:1646 */
+#line 1581 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= LISTENER_SSL;
}
-#line 4444 "conf_parser.c" /* yacc.c:1646 */
+#line 4443 "conf_parser.c" /* yacc.c:1646 */
break;
case 272:
-#line 1579 "conf_parser.y" /* yacc.c:1646 */
+#line 1585 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= LISTENER_HIDDEN;
}
-#line 4453 "conf_parser.c" /* yacc.c:1646 */
+#line 4452 "conf_parser.c" /* yacc.c:1646 */
break;
case 273:
-#line 1583 "conf_parser.y" /* yacc.c:1646 */
+#line 1589 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= LISTENER_SERVER;
}
-#line 4462 "conf_parser.c" /* yacc.c:1646 */
+#line 4461 "conf_parser.c" /* yacc.c:1646 */
break;
case 281:
-#line 1591 "conf_parser.y" /* yacc.c:1646 */
+#line 1597 "conf_parser.y" /* yacc.c:1646 */
{ block_state.flags.value = 0; }
-#line 4468 "conf_parser.c" /* yacc.c:1646 */
+#line 4467 "conf_parser.c" /* yacc.c:1646 */
break;
case 285:
-#line 1596 "conf_parser.y" /* yacc.c:1646 */
+#line 1602 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -4483,11 +4482,11 @@ yyreduce:
add_listener((yyvsp[0].number), block_state.addr.buf, block_state.flags.value);
}
}
-#line 4487 "conf_parser.c" /* yacc.c:1646 */
+#line 4486 "conf_parser.c" /* yacc.c:1646 */
break;
case 286:
-#line 1610 "conf_parser.y" /* yacc.c:1646 */
+#line 1616 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -4506,38 +4505,38 @@ yyreduce:
add_listener(i, block_state.addr.buf, block_state.flags.value);
}
}
-#line 4510 "conf_parser.c" /* yacc.c:1646 */
+#line 4509 "conf_parser.c" /* yacc.c:1646 */
break;
case 287:
-#line 1630 "conf_parser.y" /* yacc.c:1646 */
+#line 1636 "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 4519 "conf_parser.c" /* yacc.c:1646 */
+#line 4518 "conf_parser.c" /* yacc.c:1646 */
break;
case 288:
-#line 1636 "conf_parser.y" /* yacc.c:1646 */
+#line 1642 "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 4528 "conf_parser.c" /* yacc.c:1646 */
+#line 4527 "conf_parser.c" /* yacc.c:1646 */
break;
case 289:
-#line 1645 "conf_parser.y" /* yacc.c:1646 */
+#line 1651 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
}
-#line 4537 "conf_parser.c" /* yacc.c:1646 */
+#line 4536 "conf_parser.c" /* yacc.c:1646 */
break;
case 290:
-#line 1649 "conf_parser.y" /* yacc.c:1646 */
+#line 1655 "conf_parser.y" /* yacc.c:1646 */
{
dlink_node *ptr = NULL;
@@ -4574,38 +4573,38 @@ yyreduce:
add_conf_by_address(CONF_CLIENT, conf);
}
}
-#line 4578 "conf_parser.c" /* yacc.c:1646 */
+#line 4577 "conf_parser.c" /* yacc.c:1646 */
break;
case 302:
-#line 1692 "conf_parser.y" /* yacc.c:1646 */
+#line 1698 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
}
-#line 4587 "conf_parser.c" /* yacc.c:1646 */
+#line 4586 "conf_parser.c" /* yacc.c:1646 */
break;
case 303:
-#line 1698 "conf_parser.y" /* yacc.c:1646 */
+#line 1704 "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 4596 "conf_parser.c" /* yacc.c:1646 */
+#line 4595 "conf_parser.c" /* yacc.c:1646 */
break;
case 304:
-#line 1704 "conf_parser.y" /* yacc.c:1646 */
+#line 1710 "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 4605 "conf_parser.c" /* yacc.c:1646 */
+#line 4604 "conf_parser.c" /* yacc.c:1646 */
break;
case 305:
-#line 1710 "conf_parser.y" /* yacc.c:1646 */
+#line 1716 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -4615,110 +4614,110 @@ yyreduce:
block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
}
}
-#line 4619 "conf_parser.c" /* yacc.c:1646 */
+#line 4618 "conf_parser.c" /* yacc.c:1646 */
break;
case 306:
-#line 1721 "conf_parser.y" /* yacc.c:1646 */
+#line 1727 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
}
-#line 4628 "conf_parser.c" /* yacc.c:1646 */
+#line 4627 "conf_parser.c" /* yacc.c:1646 */
break;
case 310:
-#line 1728 "conf_parser.y" /* yacc.c:1646 */
+#line 1734 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
}
-#line 4637 "conf_parser.c" /* yacc.c:1646 */
+#line 4636 "conf_parser.c" /* yacc.c:1646 */
break;
case 311:
-#line 1732 "conf_parser.y" /* yacc.c:1646 */
+#line 1738 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_NOLIMIT;
}
-#line 4646 "conf_parser.c" /* yacc.c:1646 */
+#line 4645 "conf_parser.c" /* yacc.c:1646 */
break;
case 312:
-#line 1736 "conf_parser.y" /* yacc.c:1646 */
+#line 1742 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
}
-#line 4655 "conf_parser.c" /* yacc.c:1646 */
+#line 4654 "conf_parser.c" /* yacc.c:1646 */
break;
case 313:
-#line 1740 "conf_parser.y" /* yacc.c:1646 */
+#line 1746 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
}
-#line 4664 "conf_parser.c" /* yacc.c:1646 */
+#line 4663 "conf_parser.c" /* yacc.c:1646 */
break;
case 314:
-#line 1744 "conf_parser.y" /* yacc.c:1646 */
+#line 1750 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
}
-#line 4673 "conf_parser.c" /* yacc.c:1646 */
+#line 4672 "conf_parser.c" /* yacc.c:1646 */
break;
case 315:
-#line 1748 "conf_parser.y" /* yacc.c:1646 */
+#line 1754 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_NO_TILDE;
}
-#line 4682 "conf_parser.c" /* yacc.c:1646 */
+#line 4681 "conf_parser.c" /* yacc.c:1646 */
break;
case 316:
-#line 1752 "conf_parser.y" /* yacc.c:1646 */
+#line 1758 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
}
-#line 4691 "conf_parser.c" /* yacc.c:1646 */
+#line 4690 "conf_parser.c" /* yacc.c:1646 */
break;
case 317:
-#line 1756 "conf_parser.y" /* yacc.c:1646 */
+#line 1762 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
}
-#line 4700 "conf_parser.c" /* yacc.c:1646 */
+#line 4699 "conf_parser.c" /* yacc.c:1646 */
break;
case 318:
-#line 1760 "conf_parser.y" /* yacc.c:1646 */
+#line 1766 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_WEBIRC;
}
-#line 4709 "conf_parser.c" /* yacc.c:1646 */
+#line 4708 "conf_parser.c" /* yacc.c:1646 */
break;
case 319:
-#line 1764 "conf_parser.y" /* yacc.c:1646 */
+#line 1770 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
}
-#line 4718 "conf_parser.c" /* yacc.c:1646 */
+#line 4717 "conf_parser.c" /* yacc.c:1646 */
break;
case 320:
-#line 1770 "conf_parser.y" /* yacc.c:1646 */
+#line 1776 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -4731,11 +4730,11 @@ yyreduce:
else
ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
}
-#line 4735 "conf_parser.c" /* yacc.c:1646 */
+#line 4734 "conf_parser.c" /* yacc.c:1646 */
break;
case 321:
-#line 1784 "conf_parser.y" /* yacc.c:1646 */
+#line 1790 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -4743,11 +4742,11 @@ yyreduce:
strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
block_state.flags.value |= CONF_FLAGS_REDIR;
}
-#line 4747 "conf_parser.c" /* yacc.c:1646 */
+#line 4746 "conf_parser.c" /* yacc.c:1646 */
break;
case 322:
-#line 1793 "conf_parser.y" /* yacc.c:1646 */
+#line 1799 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -4755,11 +4754,11 @@ yyreduce:
block_state.flags.value |= CONF_FLAGS_REDIR;
block_state.port.value = (yyvsp[-1].number);
}
-#line 4759 "conf_parser.c" /* yacc.c:1646 */
+#line 4758 "conf_parser.c" /* yacc.c:1646 */
break;
case 323:
-#line 1806 "conf_parser.y" /* yacc.c:1646 */
+#line 1812 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -4767,49 +4766,49 @@ yyreduce:
reset_block_state();
strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
}
-#line 4771 "conf_parser.c" /* yacc.c:1646 */
+#line 4770 "conf_parser.c" /* yacc.c:1646 */
break;
case 324:
-#line 1813 "conf_parser.y" /* yacc.c:1646 */
+#line 1819 "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 4782 "conf_parser.c" /* yacc.c:1646 */
+#line 4781 "conf_parser.c" /* yacc.c:1646 */
break;
case 331:
-#line 1824 "conf_parser.y" /* yacc.c:1646 */
+#line 1830 "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 4791 "conf_parser.c" /* yacc.c:1646 */
+#line 4790 "conf_parser.c" /* yacc.c:1646 */
break;
case 332:
-#line 1830 "conf_parser.y" /* yacc.c:1646 */
+#line 1836 "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 4800 "conf_parser.c" /* yacc.c:1646 */
+#line 4799 "conf_parser.c" /* yacc.c:1646 */
break;
case 333:
-#line 1836 "conf_parser.y" /* yacc.c:1646 */
+#line 1842 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
}
-#line 4809 "conf_parser.c" /* yacc.c:1646 */
+#line 4808 "conf_parser.c" /* yacc.c:1646 */
break;
case 339:
-#line 1851 "conf_parser.y" /* yacc.c:1646 */
+#line 1857 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -4820,11 +4819,11 @@ yyreduce:
conf->name = xstrdup(yylval.string);
}
}
-#line 4824 "conf_parser.c" /* yacc.c:1646 */
+#line 4823 "conf_parser.c" /* yacc.c:1646 */
break;
case 340:
-#line 1866 "conf_parser.y" /* yacc.c:1646 */
+#line 1872 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -4836,11 +4835,11 @@ yyreduce:
strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
block_state.flags.value = SHARED_ALL;
}
-#line 4840 "conf_parser.c" /* yacc.c:1646 */
+#line 4839 "conf_parser.c" /* yacc.c:1646 */
break;
case 341:
-#line 1877 "conf_parser.y" /* yacc.c:1646 */
+#line 1883 "conf_parser.y" /* yacc.c:1646 */
{
struct MaskItem *conf = NULL;
@@ -4853,20 +4852,20 @@ yyreduce:
conf->user = xstrdup(block_state.user.buf);
conf->host = xstrdup(block_state.host.buf);
}
-#line 4857 "conf_parser.c" /* yacc.c:1646 */
+#line 4856 "conf_parser.c" /* yacc.c:1646 */
break;
case 348:
-#line 1894 "conf_parser.y" /* yacc.c:1646 */
+#line 1900 "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 4866 "conf_parser.c" /* yacc.c:1646 */
+#line 4865 "conf_parser.c" /* yacc.c:1646 */
break;
case 349:
-#line 1900 "conf_parser.y" /* yacc.c:1646 */
+#line 1906 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -4884,110 +4883,110 @@ yyreduce:
split_nuh(&nuh);
}
}
-#line 4888 "conf_parser.c" /* yacc.c:1646 */
+#line 4887 "conf_parser.c" /* yacc.c:1646 */
break;
case 350:
-#line 1919 "conf_parser.y" /* yacc.c:1646 */
+#line 1925 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value = 0;
}
-#line 4897 "conf_parser.c" /* yacc.c:1646 */
+#line 4896 "conf_parser.c" /* yacc.c:1646 */
break;
case 354:
-#line 1926 "conf_parser.y" /* yacc.c:1646 */
+#line 1932 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_KLINE;
}
-#line 4906 "conf_parser.c" /* yacc.c:1646 */
+#line 4905 "conf_parser.c" /* yacc.c:1646 */
break;
case 355:
-#line 1930 "conf_parser.y" /* yacc.c:1646 */
+#line 1936 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNKLINE;
}
-#line 4915 "conf_parser.c" /* yacc.c:1646 */
+#line 4914 "conf_parser.c" /* yacc.c:1646 */
break;
case 356:
-#line 1934 "conf_parser.y" /* yacc.c:1646 */
+#line 1940 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_DLINE;
}
-#line 4924 "conf_parser.c" /* yacc.c:1646 */
+#line 4923 "conf_parser.c" /* yacc.c:1646 */
break;
case 357:
-#line 1938 "conf_parser.y" /* yacc.c:1646 */
+#line 1944 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNDLINE;
}
-#line 4933 "conf_parser.c" /* yacc.c:1646 */
+#line 4932 "conf_parser.c" /* yacc.c:1646 */
break;
case 358:
-#line 1942 "conf_parser.y" /* yacc.c:1646 */
+#line 1948 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_XLINE;
}
-#line 4942 "conf_parser.c" /* yacc.c:1646 */
+#line 4941 "conf_parser.c" /* yacc.c:1646 */
break;
case 359:
-#line 1946 "conf_parser.y" /* yacc.c:1646 */
+#line 1952 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNXLINE;
}
-#line 4951 "conf_parser.c" /* yacc.c:1646 */
+#line 4950 "conf_parser.c" /* yacc.c:1646 */
break;
case 360:
-#line 1950 "conf_parser.y" /* yacc.c:1646 */
+#line 1956 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_RESV;
}
-#line 4960 "conf_parser.c" /* yacc.c:1646 */
+#line 4959 "conf_parser.c" /* yacc.c:1646 */
break;
case 361:
-#line 1954 "conf_parser.y" /* yacc.c:1646 */
+#line 1960 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNRESV;
}
-#line 4969 "conf_parser.c" /* yacc.c:1646 */
+#line 4968 "conf_parser.c" /* yacc.c:1646 */
break;
case 362:
-#line 1958 "conf_parser.y" /* yacc.c:1646 */
+#line 1964 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_LOCOPS;
}
-#line 4978 "conf_parser.c" /* yacc.c:1646 */
+#line 4977 "conf_parser.c" /* yacc.c:1646 */
break;
case 363:
-#line 1962 "conf_parser.y" /* yacc.c:1646 */
+#line 1968 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value = SHARED_ALL;
}
-#line 4987 "conf_parser.c" /* yacc.c:1646 */
+#line 4986 "conf_parser.c" /* yacc.c:1646 */
break;
case 364:
-#line 1971 "conf_parser.y" /* yacc.c:1646 */
+#line 1977 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -4997,11 +4996,11 @@ yyreduce:
strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
block_state.flags.value = SHARED_ALL;
}
-#line 5001 "conf_parser.c" /* yacc.c:1646 */
+#line 5000 "conf_parser.c" /* yacc.c:1646 */
break;
case 365:
-#line 1980 "conf_parser.y" /* yacc.c:1646 */
+#line 1986 "conf_parser.y" /* yacc.c:1646 */
{
struct MaskItem *conf = NULL;
@@ -5012,119 +5011,119 @@ yyreduce:
conf->flags = block_state.flags.value;
conf->name = xstrdup(block_state.name.buf);
}
-#line 5016 "conf_parser.c" /* yacc.c:1646 */
+#line 5015 "conf_parser.c" /* yacc.c:1646 */
break;
case 371:
-#line 1995 "conf_parser.y" /* yacc.c:1646 */
+#line 2001 "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 5025 "conf_parser.c" /* yacc.c:1646 */
+#line 5024 "conf_parser.c" /* yacc.c:1646 */
break;
case 372:
-#line 2001 "conf_parser.y" /* yacc.c:1646 */
+#line 2007 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value = 0;
}
-#line 5034 "conf_parser.c" /* yacc.c:1646 */
+#line 5033 "conf_parser.c" /* yacc.c:1646 */
break;
case 376:
-#line 2008 "conf_parser.y" /* yacc.c:1646 */
+#line 2014 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_KLINE;
}
-#line 5043 "conf_parser.c" /* yacc.c:1646 */
+#line 5042 "conf_parser.c" /* yacc.c:1646 */
break;
case 377:
-#line 2012 "conf_parser.y" /* yacc.c:1646 */
+#line 2018 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNKLINE;
}
-#line 5052 "conf_parser.c" /* yacc.c:1646 */
+#line 5051 "conf_parser.c" /* yacc.c:1646 */
break;
case 378:
-#line 2016 "conf_parser.y" /* yacc.c:1646 */
+#line 2022 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_DLINE;
}
-#line 5061 "conf_parser.c" /* yacc.c:1646 */
+#line 5060 "conf_parser.c" /* yacc.c:1646 */
break;
case 379:
-#line 2020 "conf_parser.y" /* yacc.c:1646 */
+#line 2026 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNDLINE;
}
-#line 5070 "conf_parser.c" /* yacc.c:1646 */
+#line 5069 "conf_parser.c" /* yacc.c:1646 */
break;
case 380:
-#line 2024 "conf_parser.y" /* yacc.c:1646 */
+#line 2030 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_XLINE;
}
-#line 5079 "conf_parser.c" /* yacc.c:1646 */
+#line 5078 "conf_parser.c" /* yacc.c:1646 */
break;
case 381:
-#line 2028 "conf_parser.y" /* yacc.c:1646 */
+#line 2034 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNXLINE;
}
-#line 5088 "conf_parser.c" /* yacc.c:1646 */
+#line 5087 "conf_parser.c" /* yacc.c:1646 */
break;
case 382:
-#line 2032 "conf_parser.y" /* yacc.c:1646 */
+#line 2038 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_RESV;
}
-#line 5097 "conf_parser.c" /* yacc.c:1646 */
+#line 5096 "conf_parser.c" /* yacc.c:1646 */
break;
case 383:
-#line 2036 "conf_parser.y" /* yacc.c:1646 */
+#line 2042 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNRESV;
}
-#line 5106 "conf_parser.c" /* yacc.c:1646 */
+#line 5105 "conf_parser.c" /* yacc.c:1646 */
break;
case 384:
-#line 2040 "conf_parser.y" /* yacc.c:1646 */
+#line 2046 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_LOCOPS;
}
-#line 5115 "conf_parser.c" /* yacc.c:1646 */
+#line 5114 "conf_parser.c" /* yacc.c:1646 */
break;
case 385:
-#line 2044 "conf_parser.y" /* yacc.c:1646 */
+#line 2050 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value = SHARED_ALL;
}
-#line 5124 "conf_parser.c" /* yacc.c:1646 */
+#line 5123 "conf_parser.c" /* yacc.c:1646 */
break;
case 386:
-#line 2053 "conf_parser.y" /* yacc.c:1646 */
+#line 2059 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
@@ -5134,11 +5133,11 @@ yyreduce:
block_state.aftype.value = AF_INET;
block_state.port.value = PORTNUM;
}
-#line 5138 "conf_parser.c" /* yacc.c:1646 */
+#line 5137 "conf_parser.c" /* yacc.c:1646 */
break;
case 387:
-#line 2062 "conf_parser.y" /* yacc.c:1646 */
+#line 2068 "conf_parser.y" /* yacc.c:1646 */
{
struct MaskItem *conf = NULL;
struct addrinfo hints, *res;
@@ -5200,38 +5199,38 @@ yyreduce:
conf_add_class_to_conf(conf, block_state.class.buf);
lookup_confhost(conf);
}
-#line 5204 "conf_parser.c" /* yacc.c:1646 */
+#line 5203 "conf_parser.c" /* yacc.c:1646 */
break;
case 405:
-#line 2134 "conf_parser.y" /* yacc.c:1646 */
+#line 2140 "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 5213 "conf_parser.c" /* yacc.c:1646 */
+#line 5212 "conf_parser.c" /* yacc.c:1646 */
break;
case 406:
-#line 2140 "conf_parser.y" /* yacc.c:1646 */
+#line 2146 "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 5222 "conf_parser.c" /* yacc.c:1646 */
+#line 5221 "conf_parser.c" /* yacc.c:1646 */
break;
case 407:
-#line 2146 "conf_parser.y" /* yacc.c:1646 */
+#line 2152 "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 5231 "conf_parser.c" /* yacc.c:1646 */
+#line 5230 "conf_parser.c" /* yacc.c:1646 */
break;
case 408:
-#line 2152 "conf_parser.y" /* yacc.c:1646 */
+#line 2158 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -5243,11 +5242,11 @@ yyreduce:
else
strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
}
-#line 5247 "conf_parser.c" /* yacc.c:1646 */
+#line 5246 "conf_parser.c" /* yacc.c:1646 */
break;
case 409:
-#line 2165 "conf_parser.y" /* yacc.c:1646 */
+#line 2171 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass != 2)
break;
@@ -5259,75 +5258,75 @@ yyreduce:
else
strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
}
-#line 5263 "conf_parser.c" /* yacc.c:1646 */
+#line 5262 "conf_parser.c" /* yacc.c:1646 */
break;
case 410:
-#line 2178 "conf_parser.y" /* yacc.c:1646 */
+#line 2184 "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 5272 "conf_parser.c" /* yacc.c:1646 */
+#line 5271 "conf_parser.c" /* yacc.c:1646 */
break;
case 411:
-#line 2184 "conf_parser.y" /* yacc.c:1646 */
+#line 2190 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.port.value = (yyvsp[-1].number);
}
-#line 5281 "conf_parser.c" /* yacc.c:1646 */
+#line 5280 "conf_parser.c" /* yacc.c:1646 */
break;
case 412:
-#line 2190 "conf_parser.y" /* yacc.c:1646 */
+#line 2196 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.aftype.value = AF_INET;
}
-#line 5290 "conf_parser.c" /* yacc.c:1646 */
+#line 5289 "conf_parser.c" /* yacc.c:1646 */
break;
case 413:
-#line 2194 "conf_parser.y" /* yacc.c:1646 */
+#line 2200 "conf_parser.y" /* yacc.c:1646 */
{
#ifdef IPV6
if (conf_parser_ctx.pass == 2)
block_state.aftype.value = AF_INET6;
#endif
}
-#line 5301 "conf_parser.c" /* yacc.c:1646 */
+#line 5300 "conf_parser.c" /* yacc.c:1646 */
break;
case 414:
-#line 2202 "conf_parser.y" /* yacc.c:1646 */
+#line 2208 "conf_parser.y" /* yacc.c:1646 */
{
block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
}
-#line 5309 "conf_parser.c" /* yacc.c:1646 */
+#line 5308 "conf_parser.c" /* yacc.c:1646 */
break;
case 418:
-#line 2208 "conf_parser.y" /* yacc.c:1646 */
+#line 2214 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
}
-#line 5318 "conf_parser.c" /* yacc.c:1646 */
+#line 5317 "conf_parser.c" /* yacc.c:1646 */
break;
case 419:
-#line 2212 "conf_parser.y" /* yacc.c:1646 */
+#line 2218 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_SSL;
}
-#line 5327 "conf_parser.c" /* yacc.c:1646 */
+#line 5326 "conf_parser.c" /* yacc.c:1646 */
break;
case 420:
-#line 2218 "conf_parser.y" /* yacc.c:1646 */
+#line 2224 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -5337,38 +5336,38 @@ yyreduce:
block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
}
}
-#line 5341 "conf_parser.c" /* yacc.c:1646 */
+#line 5340 "conf_parser.c" /* yacc.c:1646 */
break;
case 421:
-#line 2229 "conf_parser.y" /* yacc.c:1646 */
+#line 2235 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
}
-#line 5350 "conf_parser.c" /* yacc.c:1646 */
+#line 5349 "conf_parser.c" /* yacc.c:1646 */
break;
case 422:
-#line 2235 "conf_parser.y" /* yacc.c:1646 */
+#line 2241 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
}
-#line 5359 "conf_parser.c" /* yacc.c:1646 */
+#line 5358 "conf_parser.c" /* yacc.c:1646 */
break;
case 423:
-#line 2241 "conf_parser.y" /* yacc.c:1646 */
+#line 2247 "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 5368 "conf_parser.c" /* yacc.c:1646 */
+#line 5367 "conf_parser.c" /* yacc.c:1646 */
break;
case 424:
-#line 2247 "conf_parser.y" /* yacc.c:1646 */
+#line 2253 "conf_parser.y" /* yacc.c:1646 */
{
#ifdef HAVE_LIBCRYPTO
if (conf_parser_ctx.pass == 2)
@@ -5378,20 +5377,20 @@ yyreduce:
conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
#endif
}
-#line 5382 "conf_parser.c" /* yacc.c:1646 */
+#line 5381 "conf_parser.c" /* yacc.c:1646 */
break;
case 425:
-#line 2262 "conf_parser.y" /* yacc.c:1646 */
+#line 2268 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
}
-#line 5391 "conf_parser.c" /* yacc.c:1646 */
+#line 5390 "conf_parser.c" /* yacc.c:1646 */
break;
case 426:
-#line 2266 "conf_parser.y" /* yacc.c:1646 */
+#line 2272 "conf_parser.y" /* yacc.c:1646 */
{
struct MaskItem *conf = NULL;
@@ -5412,11 +5411,11 @@ yyreduce:
conf->reason = xstrdup(CONF_NOREASON);
add_conf_by_address(CONF_KLINE, conf);
}
-#line 5416 "conf_parser.c" /* yacc.c:1646 */
+#line 5415 "conf_parser.c" /* yacc.c:1646 */
break;
case 432:
-#line 2291 "conf_parser.y" /* yacc.c:1646 */
+#line 2297 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
@@ -5435,29 +5434,29 @@ yyreduce:
split_nuh(&nuh);
}
}
-#line 5439 "conf_parser.c" /* yacc.c:1646 */
+#line 5438 "conf_parser.c" /* yacc.c:1646 */
break;
case 433:
-#line 2311 "conf_parser.y" /* yacc.c:1646 */
+#line 2317 "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 5448 "conf_parser.c" /* yacc.c:1646 */
+#line 5447 "conf_parser.c" /* yacc.c:1646 */
break;
case 434:
-#line 2320 "conf_parser.y" /* yacc.c:1646 */
+#line 2326 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
}
-#line 5457 "conf_parser.c" /* yacc.c:1646 */
+#line 5456 "conf_parser.c" /* yacc.c:1646 */
break;
case 435:
-#line 2324 "conf_parser.y" /* yacc.c:1646 */
+#line 2330 "conf_parser.y" /* yacc.c:1646 */
{
struct MaskItem *conf = NULL;
@@ -5479,29 +5478,29 @@ yyreduce:
add_conf_by_address(CONF_DLINE, conf);
}
}
-#line 5483 "conf_parser.c" /* yacc.c:1646 */
+#line 5482 "conf_parser.c" /* yacc.c:1646 */
break;
case 441:
-#line 2350 "conf_parser.y" /* yacc.c:1646 */
+#line 2356 "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 5492 "conf_parser.c" /* yacc.c:1646 */
+#line 5491 "conf_parser.c" /* yacc.c:1646 */
break;
case 442:
-#line 2356 "conf_parser.y" /* yacc.c:1646 */
+#line 2362 "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 5501 "conf_parser.c" /* yacc.c:1646 */
+#line 5500 "conf_parser.c" /* yacc.c:1646 */
break;
case 448:
-#line 2370 "conf_parser.y" /* yacc.c:1646 */
+#line 2376 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -5514,20 +5513,20 @@ yyreduce:
}
}
}
-#line 5518 "conf_parser.c" /* yacc.c:1646 */
+#line 5517 "conf_parser.c" /* yacc.c:1646 */
break;
case 449:
-#line 2387 "conf_parser.y" /* yacc.c:1646 */
+#line 2393 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
}
-#line 5527 "conf_parser.c" /* yacc.c:1646 */
+#line 5526 "conf_parser.c" /* yacc.c:1646 */
break;
case 450:
-#line 2391 "conf_parser.y" /* yacc.c:1646 */
+#line 2397 "conf_parser.y" /* yacc.c:1646 */
{
struct MaskItem *conf = NULL;
@@ -5545,186 +5544,186 @@ yyreduce:
else
conf->reason = xstrdup(CONF_NOREASON);
}
-#line 5549 "conf_parser.c" /* yacc.c:1646 */
+#line 5548 "conf_parser.c" /* yacc.c:1646 */
break;
case 456:
-#line 2413 "conf_parser.y" /* yacc.c:1646 */
+#line 2419 "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 5558 "conf_parser.c" /* yacc.c:1646 */
+#line 5557 "conf_parser.c" /* yacc.c:1646 */
break;
case 457:
-#line 2419 "conf_parser.y" /* yacc.c:1646 */
+#line 2425 "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 5567 "conf_parser.c" /* yacc.c:1646 */
+#line 5566 "conf_parser.c" /* yacc.c:1646 */
break;
- case 511:
-#line 2464 "conf_parser.y" /* yacc.c:1646 */
+ case 509:
+#line 2469 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.max_watch = (yyvsp[-1].number);
}
-#line 5575 "conf_parser.c" /* yacc.c:1646 */
+#line 5574 "conf_parser.c" /* yacc.c:1646 */
break;
- case 512:
-#line 2469 "conf_parser.y" /* yacc.c:1646 */
+ case 510:
+#line 2474 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigFileEntry.cycle_on_host_change = yylval.number;
}
-#line 5584 "conf_parser.c" /* yacc.c:1646 */
+#line 5583 "conf_parser.c" /* yacc.c:1646 */
break;
- case 513:
-#line 2475 "conf_parser.y" /* yacc.c:1646 */
+ case 511:
+#line 2480 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigFileEntry.glines = yylval.number;
}
-#line 5593 "conf_parser.c" /* yacc.c:1646 */
+#line 5592 "conf_parser.c" /* yacc.c:1646 */
break;
- case 514:
-#line 2481 "conf_parser.y" /* yacc.c:1646 */
+ case 512:
+#line 2486 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigFileEntry.gline_time = (yyvsp[-1].number);
}
-#line 5602 "conf_parser.c" /* yacc.c:1646 */
+#line 5601 "conf_parser.c" /* yacc.c:1646 */
break;
- case 515:
-#line 2487 "conf_parser.y" /* yacc.c:1646 */
+ case 513:
+#line 2492 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigFileEntry.gline_request_time = (yyvsp[-1].number);
}
-#line 5611 "conf_parser.c" /* yacc.c:1646 */
+#line 5610 "conf_parser.c" /* yacc.c:1646 */
break;
- case 516:
-#line 2493 "conf_parser.y" /* yacc.c:1646 */
+ case 514:
+#line 2498 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.gline_min_cidr = (yyvsp[-1].number);
}
-#line 5619 "conf_parser.c" /* yacc.c:1646 */
+#line 5618 "conf_parser.c" /* yacc.c:1646 */
break;
- case 517:
-#line 2498 "conf_parser.y" /* yacc.c:1646 */
+ case 515:
+#line 2503 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.gline_min_cidr6 = (yyvsp[-1].number);
}
-#line 5627 "conf_parser.c" /* yacc.c:1646 */
+#line 5626 "conf_parser.c" /* yacc.c:1646 */
break;
- case 518:
-#line 2503 "conf_parser.y" /* yacc.c:1646 */
+ case 516:
+#line 2508 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.tkline_expire_notices = yylval.number;
}
-#line 5635 "conf_parser.c" /* yacc.c:1646 */
+#line 5634 "conf_parser.c" /* yacc.c:1646 */
break;
- case 519:
-#line 2508 "conf_parser.y" /* yacc.c:1646 */
+ case 517:
+#line 2513 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.kill_chase_time_limit = (yyvsp[-1].number);
}
-#line 5643 "conf_parser.c" /* yacc.c:1646 */
+#line 5642 "conf_parser.c" /* yacc.c:1646 */
break;
- case 520:
-#line 2513 "conf_parser.y" /* yacc.c:1646 */
+ case 518:
+#line 2518 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.hide_spoof_ips = yylval.number;
}
-#line 5651 "conf_parser.c" /* yacc.c:1646 */
+#line 5650 "conf_parser.c" /* yacc.c:1646 */
break;
- case 521:
-#line 2518 "conf_parser.y" /* yacc.c:1646 */
+ case 519:
+#line 2523 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.ignore_bogus_ts = yylval.number;
}
-#line 5659 "conf_parser.c" /* yacc.c:1646 */
+#line 5658 "conf_parser.c" /* yacc.c:1646 */
break;
- case 522:
-#line 2523 "conf_parser.y" /* yacc.c:1646 */
+ case 520:
+#line 2528 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.failed_oper_notice = yylval.number;
}
-#line 5667 "conf_parser.c" /* yacc.c:1646 */
+#line 5666 "conf_parser.c" /* yacc.c:1646 */
break;
- case 523:
-#line 2528 "conf_parser.y" /* yacc.c:1646 */
+ case 521:
+#line 2533 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.anti_nick_flood = yylval.number;
}
-#line 5675 "conf_parser.c" /* yacc.c:1646 */
+#line 5674 "conf_parser.c" /* yacc.c:1646 */
break;
- case 524:
-#line 2533 "conf_parser.y" /* yacc.c:1646 */
+ case 522:
+#line 2538 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.max_nick_time = (yyvsp[-1].number);
}
-#line 5683 "conf_parser.c" /* yacc.c:1646 */
+#line 5682 "conf_parser.c" /* yacc.c:1646 */
break;
- case 525:
-#line 2538 "conf_parser.y" /* yacc.c:1646 */
+ case 523:
+#line 2543 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.max_nick_changes = (yyvsp[-1].number);
}
-#line 5691 "conf_parser.c" /* yacc.c:1646 */
+#line 5690 "conf_parser.c" /* yacc.c:1646 */
break;
- case 526:
-#line 2543 "conf_parser.y" /* yacc.c:1646 */
+ case 524:
+#line 2548 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.max_accept = (yyvsp[-1].number);
}
-#line 5699 "conf_parser.c" /* yacc.c:1646 */
+#line 5698 "conf_parser.c" /* yacc.c:1646 */
break;
- case 527:
-#line 2548 "conf_parser.y" /* yacc.c:1646 */
+ case 525:
+#line 2553 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[-1].number);
}
-#line 5707 "conf_parser.c" /* yacc.c:1646 */
+#line 5706 "conf_parser.c" /* yacc.c:1646 */
break;
- case 528:
-#line 2553 "conf_parser.y" /* yacc.c:1646 */
+ case 526:
+#line 2558 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.ts_warn_delta = (yyvsp[-1].number);
}
-#line 5715 "conf_parser.c" /* yacc.c:1646 */
+#line 5714 "conf_parser.c" /* yacc.c:1646 */
break;
- case 529:
-#line 2558 "conf_parser.y" /* yacc.c:1646 */
+ case 527:
+#line 2563 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigFileEntry.ts_max_delta = (yyvsp[-1].number);
}
-#line 5724 "conf_parser.c" /* yacc.c:1646 */
+#line 5723 "conf_parser.c" /* yacc.c:1646 */
break;
- case 530:
-#line 2564 "conf_parser.y" /* yacc.c:1646 */
+ case 528:
+#line 2569 "conf_parser.y" /* yacc.c:1646 */
{
if (((yyvsp[-1].number) > 0) && conf_parser_ctx.pass == 1)
{
@@ -5734,735 +5733,715 @@ yyreduce:
exit(0);
}
}
-#line 5738 "conf_parser.c" /* yacc.c:1646 */
+#line 5737 "conf_parser.c" /* yacc.c:1646 */
break;
- case 531:
-#line 2575 "conf_parser.y" /* yacc.c:1646 */
+ case 529:
+#line 2580 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.invisible_on_connect = yylval.number;
}
-#line 5746 "conf_parser.c" /* yacc.c:1646 */
+#line 5745 "conf_parser.c" /* yacc.c:1646 */
break;
- case 532:
-#line 2580 "conf_parser.y" /* yacc.c:1646 */
+ case 530:
+#line 2585 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.warn_no_nline = yylval.number;
}
-#line 5754 "conf_parser.c" /* yacc.c:1646 */
+#line 5753 "conf_parser.c" /* yacc.c:1646 */
break;
- case 533:
-#line 2585 "conf_parser.y" /* yacc.c:1646 */
+ case 531:
+#line 2590 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.stats_e_disabled = yylval.number;
}
-#line 5762 "conf_parser.c" /* yacc.c:1646 */
+#line 5761 "conf_parser.c" /* yacc.c:1646 */
break;
- case 534:
-#line 2590 "conf_parser.y" /* yacc.c:1646 */
+ case 532:
+#line 2595 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.stats_o_oper_only = yylval.number;
}
-#line 5770 "conf_parser.c" /* yacc.c:1646 */
+#line 5769 "conf_parser.c" /* yacc.c:1646 */
break;
- case 535:
-#line 2595 "conf_parser.y" /* yacc.c:1646 */
+ case 533:
+#line 2600 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.stats_P_oper_only = yylval.number;
}
-#line 5778 "conf_parser.c" /* yacc.c:1646 */
+#line 5777 "conf_parser.c" /* yacc.c:1646 */
break;
- case 536:
-#line 2600 "conf_parser.y" /* yacc.c:1646 */
+ case 534:
+#line 2605 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.stats_u_oper_only = yylval.number;
}
-#line 5786 "conf_parser.c" /* yacc.c:1646 */
+#line 5785 "conf_parser.c" /* yacc.c:1646 */
break;
- case 537:
-#line 2605 "conf_parser.y" /* yacc.c:1646 */
+ case 535:
+#line 2610 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
}
-#line 5794 "conf_parser.c" /* yacc.c:1646 */
+#line 5793 "conf_parser.c" /* yacc.c:1646 */
break;
- case 538:
-#line 2608 "conf_parser.y" /* yacc.c:1646 */
+ case 536:
+#line 2613 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.stats_k_oper_only = 1;
}
-#line 5802 "conf_parser.c" /* yacc.c:1646 */
+#line 5801 "conf_parser.c" /* yacc.c:1646 */
break;
- case 539:
-#line 2613 "conf_parser.y" /* yacc.c:1646 */
+ case 537:
+#line 2618 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
}
-#line 5810 "conf_parser.c" /* yacc.c:1646 */
- break;
-
- case 540:
-#line 2616 "conf_parser.y" /* yacc.c:1646 */
- {
- ConfigFileEntry.stats_i_oper_only = 1;
-}
-#line 5818 "conf_parser.c" /* yacc.c:1646 */
+#line 5809 "conf_parser.c" /* yacc.c:1646 */
break;
- case 541:
+ case 538:
#line 2621 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.pace_wait = (yyvsp[-1].number);
+ ConfigFileEntry.stats_i_oper_only = 1;
}
-#line 5826 "conf_parser.c" /* yacc.c:1646 */
+#line 5817 "conf_parser.c" /* yacc.c:1646 */
break;
- case 542:
+ case 539:
#line 2626 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.caller_id_wait = (yyvsp[-1].number);
+ ConfigFileEntry.pace_wait = (yyvsp[-1].number);
}
-#line 5834 "conf_parser.c" /* yacc.c:1646 */
+#line 5825 "conf_parser.c" /* yacc.c:1646 */
break;
- case 543:
+ case 540:
#line 2631 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.opers_bypass_callerid = yylval.number;
+ ConfigFileEntry.caller_id_wait = (yyvsp[-1].number);
}
-#line 5842 "conf_parser.c" /* yacc.c:1646 */
+#line 5833 "conf_parser.c" /* yacc.c:1646 */
break;
- case 544:
+ case 541:
#line 2636 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.pace_wait_simple = (yyvsp[-1].number);
+ ConfigFileEntry.opers_bypass_callerid = yylval.number;
}
-#line 5850 "conf_parser.c" /* yacc.c:1646 */
+#line 5841 "conf_parser.c" /* yacc.c:1646 */
break;
- case 545:
+ case 542:
#line 2641 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.short_motd = yylval.number;
+ ConfigFileEntry.pace_wait_simple = (yyvsp[-1].number);
}
-#line 5858 "conf_parser.c" /* yacc.c:1646 */
+#line 5849 "conf_parser.c" /* yacc.c:1646 */
break;
- case 546:
+ case 543:
#line 2646 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.no_oper_flood = yylval.number;
+ ConfigFileEntry.short_motd = yylval.number;
}
-#line 5866 "conf_parser.c" /* yacc.c:1646 */
+#line 5857 "conf_parser.c" /* yacc.c:1646 */
break;
- case 547:
+ case 544:
#line 2651 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.true_no_oper_flood = yylval.number;
+ ConfigFileEntry.no_oper_flood = yylval.number;
}
-#line 5874 "conf_parser.c" /* yacc.c:1646 */
+#line 5865 "conf_parser.c" /* yacc.c:1646 */
break;
- case 548:
+ case 545:
#line 2656 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.oper_pass_resv = yylval.number;
+ ConfigFileEntry.true_no_oper_flood = yylval.number;
}
-#line 5882 "conf_parser.c" /* yacc.c:1646 */
+#line 5873 "conf_parser.c" /* yacc.c:1646 */
break;
- case 549:
+ case 546:
#line 2661 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.dots_in_ident = (yyvsp[-1].number);
+ ConfigFileEntry.oper_pass_resv = yylval.number;
}
-#line 5890 "conf_parser.c" /* yacc.c:1646 */
+#line 5881 "conf_parser.c" /* yacc.c:1646 */
break;
- case 550:
+ case 547:
#line 2666 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.max_targets = (yyvsp[-1].number);
+ ConfigFileEntry.dots_in_ident = (yyvsp[-1].number);
}
-#line 5898 "conf_parser.c" /* yacc.c:1646 */
+#line 5889 "conf_parser.c" /* yacc.c:1646 */
break;
- case 551:
+ case 548:
#line 2671 "conf_parser.y" /* yacc.c:1646 */
{
- ConfigFileEntry.use_egd = yylval.number;
+ ConfigFileEntry.max_targets = (yyvsp[-1].number);
}
-#line 5906 "conf_parser.c" /* yacc.c:1646 */
+#line 5897 "conf_parser.c" /* yacc.c:1646 */
break;
- case 552:
+ case 549:
#line 2676 "conf_parser.y" /* yacc.c:1646 */
{
- if (conf_parser_ctx.pass == 2)
- {
- MyFree(ConfigFileEntry.egdpool_path);
- ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
- }
-}
-#line 5918 "conf_parser.c" /* yacc.c:1646 */
- break;
-
- case 553:
-#line 2685 "conf_parser.y" /* yacc.c:1646 */
- {
if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
{
MyFree(ConfigFileEntry.service_name);
ConfigFileEntry.service_name = xstrdup(yylval.string);
}
}
-#line 5930 "conf_parser.c" /* yacc.c:1646 */
+#line 5909 "conf_parser.c" /* yacc.c:1646 */
break;
- case 554:
-#line 2694 "conf_parser.y" /* yacc.c:1646 */
+ case 550:
+#line 2685 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.ping_cookie = yylval.number;
}
-#line 5938 "conf_parser.c" /* yacc.c:1646 */
+#line 5917 "conf_parser.c" /* yacc.c:1646 */
break;
- case 555:
-#line 2699 "conf_parser.y" /* yacc.c:1646 */
+ case 551:
+#line 2690 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.disable_auth = yylval.number;
}
-#line 5946 "conf_parser.c" /* yacc.c:1646 */
+#line 5925 "conf_parser.c" /* yacc.c:1646 */
break;
- case 556:
-#line 2704 "conf_parser.y" /* yacc.c:1646 */
+ case 552:
+#line 2695 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.throttle_time = (yyvsp[-1].number);
}
-#line 5954 "conf_parser.c" /* yacc.c:1646 */
+#line 5933 "conf_parser.c" /* yacc.c:1646 */
break;
- case 557:
-#line 2709 "conf_parser.y" /* yacc.c:1646 */
+ case 553:
+#line 2700 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes = 0;
}
-#line 5962 "conf_parser.c" /* yacc.c:1646 */
+#line 5941 "conf_parser.c" /* yacc.c:1646 */
break;
- case 561:
-#line 2715 "conf_parser.y" /* yacc.c:1646 */
+ case 557:
+#line 2706 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_BOTS;
}
-#line 5970 "conf_parser.c" /* yacc.c:1646 */
+#line 5949 "conf_parser.c" /* yacc.c:1646 */
break;
- case 562:
-#line 2718 "conf_parser.y" /* yacc.c:1646 */
+ case 558:
+#line 2709 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_CCONN;
}
-#line 5978 "conf_parser.c" /* yacc.c:1646 */
+#line 5957 "conf_parser.c" /* yacc.c:1646 */
break;
- case 563:
-#line 2721 "conf_parser.y" /* yacc.c:1646 */
+ case 559:
+#line 2712 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_DEAF;
}
-#line 5986 "conf_parser.c" /* yacc.c:1646 */
+#line 5965 "conf_parser.c" /* yacc.c:1646 */
break;
- case 564:
-#line 2724 "conf_parser.y" /* yacc.c:1646 */
+ case 560:
+#line 2715 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
}
-#line 5994 "conf_parser.c" /* yacc.c:1646 */
+#line 5973 "conf_parser.c" /* yacc.c:1646 */
break;
- case 565:
-#line 2727 "conf_parser.y" /* yacc.c:1646 */
+ case 561:
+#line 2718 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_FULL;
}
-#line 6002 "conf_parser.c" /* yacc.c:1646 */
+#line 5981 "conf_parser.c" /* yacc.c:1646 */
break;
- case 566:
-#line 2730 "conf_parser.y" /* yacc.c:1646 */
+ case 562:
+#line 2721 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
}
-#line 6010 "conf_parser.c" /* yacc.c:1646 */
+#line 5989 "conf_parser.c" /* yacc.c:1646 */
break;
- case 567:
-#line 2733 "conf_parser.y" /* yacc.c:1646 */
+ case 563:
+#line 2724 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_SKILL;
}
-#line 6018 "conf_parser.c" /* yacc.c:1646 */
+#line 5997 "conf_parser.c" /* yacc.c:1646 */
break;
- case 568:
-#line 2736 "conf_parser.y" /* yacc.c:1646 */
+ case 564:
+#line 2727 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
}
-#line 6026 "conf_parser.c" /* yacc.c:1646 */
+#line 6005 "conf_parser.c" /* yacc.c:1646 */
break;
- case 569:
-#line 2739 "conf_parser.y" /* yacc.c:1646 */
+ case 565:
+#line 2730 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_REJ;
}
-#line 6034 "conf_parser.c" /* yacc.c:1646 */
+#line 6013 "conf_parser.c" /* yacc.c:1646 */
break;
- case 570:
-#line 2742 "conf_parser.y" /* yacc.c:1646 */
+ case 566:
+#line 2733 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
}
-#line 6042 "conf_parser.c" /* yacc.c:1646 */
+#line 6021 "conf_parser.c" /* yacc.c:1646 */
break;
- case 571:
-#line 2745 "conf_parser.y" /* yacc.c:1646 */
+ case 567:
+#line 2736 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_SPY;
}
-#line 6050 "conf_parser.c" /* yacc.c:1646 */
+#line 6029 "conf_parser.c" /* yacc.c:1646 */
break;
- case 572:
-#line 2748 "conf_parser.y" /* yacc.c:1646 */
+ case 568:
+#line 2739 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
}
-#line 6058 "conf_parser.c" /* yacc.c:1646 */
+#line 6037 "conf_parser.c" /* yacc.c:1646 */
break;
- case 573:
-#line 2751 "conf_parser.y" /* yacc.c:1646 */
+ case 569:
+#line 2742 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
}
-#line 6066 "conf_parser.c" /* yacc.c:1646 */
+#line 6045 "conf_parser.c" /* yacc.c:1646 */
break;
- case 574:
-#line 2754 "conf_parser.y" /* yacc.c:1646 */
+ case 570:
+#line 2745 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
}
-#line 6074 "conf_parser.c" /* yacc.c:1646 */
+#line 6053 "conf_parser.c" /* yacc.c:1646 */
break;
- case 575:
-#line 2757 "conf_parser.y" /* yacc.c:1646 */
+ case 571:
+#line 2748 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
}
-#line 6082 "conf_parser.c" /* yacc.c:1646 */
+#line 6061 "conf_parser.c" /* yacc.c:1646 */
break;
- case 576:
-#line 2760 "conf_parser.y" /* yacc.c:1646 */
+ case 572:
+#line 2751 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
}
-#line 6090 "conf_parser.c" /* yacc.c:1646 */
+#line 6069 "conf_parser.c" /* yacc.c:1646 */
break;
- case 577:
-#line 2763 "conf_parser.y" /* yacc.c:1646 */
+ case 573:
+#line 2754 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
}
-#line 6098 "conf_parser.c" /* yacc.c:1646 */
+#line 6077 "conf_parser.c" /* yacc.c:1646 */
break;
- case 578:
-#line 2766 "conf_parser.y" /* yacc.c:1646 */
+ case 574:
+#line 2757 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
}
-#line 6106 "conf_parser.c" /* yacc.c:1646 */
+#line 6085 "conf_parser.c" /* yacc.c:1646 */
break;
- case 579:
-#line 2769 "conf_parser.y" /* yacc.c:1646 */
+ case 575:
+#line 2760 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
}
-#line 6114 "conf_parser.c" /* yacc.c:1646 */
+#line 6093 "conf_parser.c" /* yacc.c:1646 */
break;
- case 580:
-#line 2772 "conf_parser.y" /* yacc.c:1646 */
+ case 576:
+#line 2763 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_REGONLY;
}
-#line 6122 "conf_parser.c" /* yacc.c:1646 */
+#line 6101 "conf_parser.c" /* yacc.c:1646 */
break;
- case 581:
-#line 2775 "conf_parser.y" /* yacc.c:1646 */
+ case 577:
+#line 2766 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT;
}
-#line 6130 "conf_parser.c" /* yacc.c:1646 */
+#line 6109 "conf_parser.c" /* yacc.c:1646 */
break;
- case 582:
-#line 2780 "conf_parser.y" /* yacc.c:1646 */
+ case 578:
+#line 2771 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes = 0;
}
-#line 6138 "conf_parser.c" /* yacc.c:1646 */
+#line 6117 "conf_parser.c" /* yacc.c:1646 */
break;
- case 586:
-#line 2786 "conf_parser.y" /* yacc.c:1646 */
+ case 582:
+#line 2777 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
}
-#line 6146 "conf_parser.c" /* yacc.c:1646 */
+#line 6125 "conf_parser.c" /* yacc.c:1646 */
break;
- case 587:
-#line 2789 "conf_parser.y" /* yacc.c:1646 */
+ case 583:
+#line 2780 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
}
-#line 6154 "conf_parser.c" /* yacc.c:1646 */
+#line 6133 "conf_parser.c" /* yacc.c:1646 */
break;
- case 588:
-#line 2792 "conf_parser.y" /* yacc.c:1646 */
+ case 584:
+#line 2783 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
}
-#line 6162 "conf_parser.c" /* yacc.c:1646 */
+#line 6141 "conf_parser.c" /* yacc.c:1646 */
break;
- case 589:
-#line 2795 "conf_parser.y" /* yacc.c:1646 */
+ case 585:
+#line 2786 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
}
-#line 6170 "conf_parser.c" /* yacc.c:1646 */
+#line 6149 "conf_parser.c" /* yacc.c:1646 */
break;
- case 590:
-#line 2798 "conf_parser.y" /* yacc.c:1646 */
+ case 586:
+#line 2789 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
}
-#line 6178 "conf_parser.c" /* yacc.c:1646 */
+#line 6157 "conf_parser.c" /* yacc.c:1646 */
break;
- case 591:
-#line 2801 "conf_parser.y" /* yacc.c:1646 */
+ case 587:
+#line 2792 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
}
-#line 6186 "conf_parser.c" /* yacc.c:1646 */
+#line 6165 "conf_parser.c" /* yacc.c:1646 */
break;
- case 592:
-#line 2804 "conf_parser.y" /* yacc.c:1646 */
+ case 588:
+#line 2795 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
}
-#line 6194 "conf_parser.c" /* yacc.c:1646 */
+#line 6173 "conf_parser.c" /* yacc.c:1646 */
break;
- case 593:
-#line 2807 "conf_parser.y" /* yacc.c:1646 */
+ case 589:
+#line 2798 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
}
-#line 6202 "conf_parser.c" /* yacc.c:1646 */
+#line 6181 "conf_parser.c" /* yacc.c:1646 */
break;
- case 594:
-#line 2810 "conf_parser.y" /* yacc.c:1646 */
+ case 590:
+#line 2801 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
}
-#line 6210 "conf_parser.c" /* yacc.c:1646 */
+#line 6189 "conf_parser.c" /* yacc.c:1646 */
break;
- case 595:
-#line 2813 "conf_parser.y" /* yacc.c:1646 */
+ case 591:
+#line 2804 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
}
-#line 6218 "conf_parser.c" /* yacc.c:1646 */
+#line 6197 "conf_parser.c" /* yacc.c:1646 */
break;
- case 596:
-#line 2816 "conf_parser.y" /* yacc.c:1646 */
+ case 592:
+#line 2807 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
}
-#line 6226 "conf_parser.c" /* yacc.c:1646 */
+#line 6205 "conf_parser.c" /* yacc.c:1646 */
break;
- case 597:
-#line 2819 "conf_parser.y" /* yacc.c:1646 */
+ case 593:
+#line 2810 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
}
-#line 6234 "conf_parser.c" /* yacc.c:1646 */
+#line 6213 "conf_parser.c" /* yacc.c:1646 */
break;
- case 598:
-#line 2822 "conf_parser.y" /* yacc.c:1646 */
+ case 594:
+#line 2813 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
}
-#line 6242 "conf_parser.c" /* yacc.c:1646 */
+#line 6221 "conf_parser.c" /* yacc.c:1646 */
break;
- case 599:
-#line 2825 "conf_parser.y" /* yacc.c:1646 */
+ case 595:
+#line 2816 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
}
-#line 6250 "conf_parser.c" /* yacc.c:1646 */
+#line 6229 "conf_parser.c" /* yacc.c:1646 */
break;
- case 600:
-#line 2828 "conf_parser.y" /* yacc.c:1646 */
+ case 596:
+#line 2819 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
}
-#line 6258 "conf_parser.c" /* yacc.c:1646 */
+#line 6237 "conf_parser.c" /* yacc.c:1646 */
break;
- case 601:
-#line 2831 "conf_parser.y" /* yacc.c:1646 */
+ case 597:
+#line 2822 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
}
-#line 6266 "conf_parser.c" /* yacc.c:1646 */
+#line 6245 "conf_parser.c" /* yacc.c:1646 */
break;
- case 602:
-#line 2834 "conf_parser.y" /* yacc.c:1646 */
+ case 598:
+#line 2825 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
}
-#line 6274 "conf_parser.c" /* yacc.c:1646 */
+#line 6253 "conf_parser.c" /* yacc.c:1646 */
break;
- case 603:
-#line 2837 "conf_parser.y" /* yacc.c:1646 */
+ case 599:
+#line 2828 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
}
-#line 6282 "conf_parser.c" /* yacc.c:1646 */
+#line 6261 "conf_parser.c" /* yacc.c:1646 */
break;
- case 604:
-#line 2840 "conf_parser.y" /* yacc.c:1646 */
+ case 600:
+#line 2831 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
}
-#line 6290 "conf_parser.c" /* yacc.c:1646 */
+#line 6269 "conf_parser.c" /* yacc.c:1646 */
break;
- case 605:
-#line 2843 "conf_parser.y" /* yacc.c:1646 */
+ case 601:
+#line 2834 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
}
-#line 6298 "conf_parser.c" /* yacc.c:1646 */
+#line 6277 "conf_parser.c" /* yacc.c:1646 */
break;
- case 606:
-#line 2846 "conf_parser.y" /* yacc.c:1646 */
+ case 602:
+#line 2837 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT;
}
-#line 6306 "conf_parser.c" /* yacc.c:1646 */
+#line 6285 "conf_parser.c" /* yacc.c:1646 */
break;
- case 607:
-#line 2851 "conf_parser.y" /* yacc.c:1646 */
+ case 603:
+#line 2842 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.min_nonwildcard = (yyvsp[-1].number);
}
-#line 6314 "conf_parser.c" /* yacc.c:1646 */
+#line 6293 "conf_parser.c" /* yacc.c:1646 */
break;
- case 608:
-#line 2856 "conf_parser.y" /* yacc.c:1646 */
+ case 604:
+#line 2847 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.min_nonwildcard_simple = (yyvsp[-1].number);
}
-#line 6322 "conf_parser.c" /* yacc.c:1646 */
+#line 6301 "conf_parser.c" /* yacc.c:1646 */
break;
- case 609:
-#line 2861 "conf_parser.y" /* yacc.c:1646 */
+ case 605:
+#line 2852 "conf_parser.y" /* yacc.c:1646 */
{
ConfigFileEntry.default_floodcount = (yyvsp[-1].number);
}
-#line 6330 "conf_parser.c" /* yacc.c:1646 */
+#line 6309 "conf_parser.c" /* yacc.c:1646 */
break;
- case 626:
-#line 2884 "conf_parser.y" /* yacc.c:1646 */
+ case 622:
+#line 2875 "conf_parser.y" /* yacc.c:1646 */
{
ConfigChannel.disable_fake_channels = yylval.number;
}
-#line 6338 "conf_parser.c" /* yacc.c:1646 */
+#line 6317 "conf_parser.c" /* yacc.c:1646 */
break;
- case 627:
-#line 2889 "conf_parser.y" /* yacc.c:1646 */
+ case 623:
+#line 2880 "conf_parser.y" /* yacc.c:1646 */
{
ConfigChannel.knock_delay = (yyvsp[-1].number);
}
-#line 6346 "conf_parser.c" /* yacc.c:1646 */
+#line 6325 "conf_parser.c" /* yacc.c:1646 */
break;
- case 628:
-#line 2894 "conf_parser.y" /* yacc.c:1646 */
+ case 624:
+#line 2885 "conf_parser.y" /* yacc.c:1646 */
{
ConfigChannel.knock_delay_channel = (yyvsp[-1].number);
}
-#line 6354 "conf_parser.c" /* yacc.c:1646 */
+#line 6333 "conf_parser.c" /* yacc.c:1646 */
break;
- case 629:
-#line 2899 "conf_parser.y" /* yacc.c:1646 */
+ case 625:
+#line 2890 "conf_parser.y" /* yacc.c:1646 */
{
ConfigChannel.max_chans_per_user = (yyvsp[-1].number);
}
-#line 6362 "conf_parser.c" /* yacc.c:1646 */
+#line 6341 "conf_parser.c" /* yacc.c:1646 */
break;
- case 630:
-#line 2904 "conf_parser.y" /* yacc.c:1646 */
+ case 626:
+#line 2895 "conf_parser.y" /* yacc.c:1646 */
{
ConfigChannel.max_chans_per_oper = (yyvsp[-1].number);
}
-#line 6370 "conf_parser.c" /* yacc.c:1646 */
+#line 6349 "conf_parser.c" /* yacc.c:1646 */
break;
- case 631:
-#line 2909 "conf_parser.y" /* yacc.c:1646 */
+ case 627:
+#line 2900 "conf_parser.y" /* yacc.c:1646 */
{
ConfigChannel.max_bans = (yyvsp[-1].number);
}
-#line 6378 "conf_parser.c" /* yacc.c:1646 */
+#line 6357 "conf_parser.c" /* yacc.c:1646 */
break;
- case 632:
-#line 2914 "conf_parser.y" /* yacc.c:1646 */
+ case 628:
+#line 2905 "conf_parser.y" /* yacc.c:1646 */
{
ConfigChannel.default_split_user_count = (yyvsp[-1].number);
}
-#line 6386 "conf_parser.c" /* yacc.c:1646 */
+#line 6365 "conf_parser.c" /* yacc.c:1646 */
break;
- case 633:
-#line 2919 "conf_parser.y" /* yacc.c:1646 */
+ case 629:
+#line 2910 "conf_parser.y" /* yacc.c:1646 */
{
ConfigChannel.default_split_server_count = (yyvsp[-1].number);
}
-#line 6394 "conf_parser.c" /* yacc.c:1646 */
+#line 6373 "conf_parser.c" /* yacc.c:1646 */
break;
- case 634:
-#line 2924 "conf_parser.y" /* yacc.c:1646 */
+ case 630:
+#line 2915 "conf_parser.y" /* yacc.c:1646 */
{
ConfigChannel.no_create_on_split = yylval.number;
}
-#line 6402 "conf_parser.c" /* yacc.c:1646 */
+#line 6381 "conf_parser.c" /* yacc.c:1646 */
break;
- case 635:
-#line 2929 "conf_parser.y" /* yacc.c:1646 */
+ case 631:
+#line 2920 "conf_parser.y" /* yacc.c:1646 */
{
ConfigChannel.no_join_on_split = yylval.number;
}
-#line 6410 "conf_parser.c" /* yacc.c:1646 */
+#line 6389 "conf_parser.c" /* yacc.c:1646 */
break;
- case 636:
-#line 2934 "conf_parser.y" /* yacc.c:1646 */
+ case 632:
+#line 2925 "conf_parser.y" /* yacc.c:1646 */
{
GlobalSetOptions.joinfloodcount = yylval.number;
}
-#line 6418 "conf_parser.c" /* yacc.c:1646 */
+#line 6397 "conf_parser.c" /* yacc.c:1646 */
break;
- case 637:
-#line 2939 "conf_parser.y" /* yacc.c:1646 */
+ case 633:
+#line 2930 "conf_parser.y" /* yacc.c:1646 */
{
GlobalSetOptions.joinfloodtime = (yyvsp[-1].number);
}
-#line 6426 "conf_parser.c" /* yacc.c:1646 */
+#line 6405 "conf_parser.c" /* yacc.c:1646 */
break;
- case 650:
-#line 2959 "conf_parser.y" /* yacc.c:1646 */
+ case 646:
+#line 2950 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.flatten_links = yylval.number;
}
-#line 6435 "conf_parser.c" /* yacc.c:1646 */
+#line 6414 "conf_parser.c" /* yacc.c:1646 */
break;
- case 651:
-#line 2965 "conf_parser.y" /* yacc.c:1646 */
+ case 647:
+#line 2956 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.disable_remote_commands = yylval.number;
}
-#line 6444 "conf_parser.c" /* yacc.c:1646 */
+#line 6423 "conf_parser.c" /* yacc.c:1646 */
break;
- case 652:
-#line 2971 "conf_parser.y" /* yacc.c:1646 */
+ case 648:
+#line 2962 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hide_servers = yylval.number;
}
-#line 6453 "conf_parser.c" /* yacc.c:1646 */
+#line 6432 "conf_parser.c" /* yacc.c:1646 */
break;
- case 653:
-#line 2977 "conf_parser.y" /* yacc.c:1646 */
+ case 649:
+#line 2968 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hide_services = yylval.number;
}
-#line 6462 "conf_parser.c" /* yacc.c:1646 */
+#line 6441 "conf_parser.c" /* yacc.c:1646 */
break;
- case 654:
-#line 2983 "conf_parser.y" /* yacc.c:1646 */
+ case 650:
+#line 2974 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -6470,11 +6449,11 @@ yyreduce:
ConfigServerHide.hidden_name = xstrdup(yylval.string);
}
}
-#line 6474 "conf_parser.c" /* yacc.c:1646 */
+#line 6453 "conf_parser.c" /* yacc.c:1646 */
break;
- case 655:
-#line 2992 "conf_parser.y" /* yacc.c:1646 */
+ case 651:
+#line 2983 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
{
@@ -6487,29 +6466,29 @@ yyreduce:
ConfigServerHide.links_delay = (yyvsp[-1].number);
}
}
-#line 6491 "conf_parser.c" /* yacc.c:1646 */
+#line 6470 "conf_parser.c" /* yacc.c:1646 */
break;
- case 656:
-#line 3006 "conf_parser.y" /* yacc.c:1646 */
+ case 652:
+#line 2997 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hidden = yylval.number;
}
-#line 6500 "conf_parser.c" /* yacc.c:1646 */
+#line 6479 "conf_parser.c" /* yacc.c:1646 */
break;
- case 657:
-#line 3012 "conf_parser.y" /* yacc.c:1646 */
+ case 653:
+#line 3003 "conf_parser.y" /* yacc.c:1646 */
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hide_server_ips = yylval.number;
}
-#line 6509 "conf_parser.c" /* yacc.c:1646 */
+#line 6488 "conf_parser.c" /* yacc.c:1646 */
break;
-#line 6513 "conf_parser.c" /* yacc.c:1646 */
+#line 6492 "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 d2f5c14..7d0e42d 100644
--- a/src/conf_parser.y
+++ b/src/conf_parser.y
@@ -1081,14 +1081,20 @@ oper_entry: OPERATOR
if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
{
- conf_error_report("Ignoring rsa_public_key_file -- file doesn't exist");
+ ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- file doesn't exist");
break;
}
if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
- conf_error_report("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
+ ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- Key invalid; check key syntax");
+ else
+ {
+ if (RSA_size(pkey) > 128)
+ ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key size must be 1024 or below");
+ else
+ conf->rsa_public_key = pkey;
+ }
- conf->rsa_public_key = pkey;
BIO_set_close(file, BIO_CLOSE);
BIO_free(file);
}
@@ -2443,7 +2449,6 @@ general_item: general_hide_spoof_ips | general_ignore_bogus_ts |
general_short_motd | general_no_oper_flood |
general_true_no_oper_flood | general_oper_pass_resv |
general_oper_only_umodes | general_max_targets |
- general_use_egd | general_egdpool_path |
general_oper_umodes | general_caller_id_wait |
general_opers_bypass_callerid | general_default_floodcount |
general_min_nonwildcard | general_min_nonwildcard_simple |
@@ -2667,20 +2672,6 @@ general_max_targets: MAX_TARGETS '=' NUMBER ';'
ConfigFileEntry.max_targets = $3;
};
-general_use_egd: USE_EGD '=' TBOOL ';'
-{
- ConfigFileEntry.use_egd = yylval.number;
-};
-
-general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
-{
- if (conf_parser_ctx.pass == 2)
- {
- MyFree(ConfigFileEntry.egdpool_path);
- ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
- }
-};
-
general_services_name: T_SERVICES_NAME '=' QSTRING ';'
{
if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
diff --git a/src/rsa.c b/src/rsa.c
index af1aaba..9ac1614 100644
--- a/src/rsa.c
+++ b/src/rsa.c
@@ -52,47 +52,42 @@ report_crypto_errors(void)
ilog(LOG_TYPE_IRCD, "SSL error: %s", ERR_error_string(e, 0));
}
-static void
-binary_to_hex(unsigned char *bin, char *hex, int length)
+void
+binary_to_hex(const unsigned char *bin, char *hex, unsigned int length)
{
static const char trans[] = "0123456789ABCDEF";
- int i;
- for (i = 0; i < length; ++i)
+ for (const unsigned char *end = bin + length; bin < end; ++bin)
{
- hex[(i << 1) ] = trans[bin[i] >> 4];
- hex[(i << 1) + 1] = trans[bin[i] & 0xf];
+ *hex++ = trans[*bin >> 4];
+ *hex++ = trans[*bin & 0xf];
}
- hex[i << 1] = '\0';
+ *hex = '\0';
}
int
get_randomness(unsigned char *buf, int length)
{
- /* Seed OpenSSL PRNG with EGD enthropy pool -kre */
- if (ConfigFileEntry.use_egd &&
- ConfigFileEntry.egdpool_path)
- if (RAND_egd(ConfigFileEntry.egdpool_path) == -1)
- return -1;
-
- if (RAND_status())
- return RAND_bytes(buf, length);
- /* XXX - abort? */
- return RAND_pseudo_bytes(buf, length);
+ return RAND_bytes(buf, length);
}
int
generate_challenge(char **r_challenge, char **r_response, RSA *rsa)
{
- unsigned char secret[32], *tmp;
- unsigned long length;
+ unsigned char secret[32], *tmp = NULL;
+ unsigned long length = 0;
int ret = -1;
if (!rsa)
return -1;
- get_randomness(secret, 32);
+ if (!get_randomness(secret, 32))
+ {
+ report_crypto_errors();
+ return -1;
+ }
+
*r_response = MyMalloc(65);
binary_to_hex(secret, *r_response, 32);
@@ -101,8 +96,7 @@ generate_challenge(char **r_challenge, char **r_response, RSA *rsa)
ret = RSA_public_encrypt(32, secret, tmp, rsa, RSA_PKCS1_PADDING);
*r_challenge = MyMalloc((length << 1) + 1);
- binary_to_hex( tmp, *r_challenge, length);
- (*r_challenge)[length<<1] = 0;
+ binary_to_hex(tmp, *r_challenge, length);
MyFree(tmp);
if (ret < 0)
generated by cgit (git 2.34.1) at 2024-05-21 07:20:48 +0000