ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/conf_parser.c
(Generate patch)

Comparing:
ircd-hybrid/src/ircd_parser.c (file contents), Revision 1028 by michael, Sun Nov 8 13:03:38 2009 UTC vs.
ircd-hybrid/trunk/src/conf_parser.c (file contents), Revision 6378 by michael, Fri Aug 21 10:38:26 2015 UTC

# Line 1 | Line 1
1 + /* A Bison parser, made by GNU Bison 3.0.4.  */
2  
3 < /* A Bison parser, made by GNU Bison 2.4.1.  */
3 > /* Bison implementation for Yacc-like parsers in C
4 >
5 >   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
6  
4 /* Skeleton implementation for Bison's Yacc-like parsers in C
5  
6      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
7   Free Software Foundation, Inc.
8  
7     This program is free software: you can redistribute it and/or modify
8     it under the terms of the GNU General Public License as published by
9     the Free Software Foundation, either version 3 of the License, or
10     (at your option) any later version.
11 <  
11 >
12     This program is distributed in the hope that it will be useful,
13     but WITHOUT ANY WARRANTY; without even the implied warranty of
14     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15     GNU General Public License for more details.
16 <  
16 >
17     You should have received a copy of the GNU General Public License
18     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
19  
# Line 28 | Line 26
26     special exception, which will cause the skeleton and the resulting
27     Bison output files to be licensed under the GNU General Public
28     License without this special exception.
29 <  
29 >
30     This special exception was added by the Free Software Foundation in
31     version 2.2 of Bison.  */
32  
# Line 46 | Line 44
44   #define YYBISON 1
45  
46   /* Bison version.  */
47 < #define YYBISON_VERSION "2.4.1"
47 > #define YYBISON_VERSION "3.0.4"
48  
49   /* Skeleton name.  */
50   #define YYSKELETON_NAME "yacc.c"
# Line 60 | Line 58
58   /* Pull parsers.  */
59   #define YYPULL 1
60  
63 /* Using locations.  */
64 #define YYLSP_NEEDED 0
61  
62  
63  
64   /* Copy the first part of user declarations.  */
65 + #line 28 "conf_parser.y" /* yacc.c:339  */
66  
70 /* Line 189 of yacc.c  */
71 #line 25 "ircd_parser.y"
67  
73
74 #define YY_NO_UNPUT
68   #include <sys/types.h>
69   #include <string.h>
70  
# Line 79 | Line 72
72   #include "stdinc.h"
73   #include "ircd.h"
74   #include "list.h"
75 < #include "s_conf.h"
75 > #include "conf.h"
76 > #include "conf_class.h"
77 > #include "conf_pseudo.h"
78   #include "event.h"
79 < #include "s_log.h"
80 < #include "client.h"     /* for UMODE_ALL only */
79 > #include "id.h"
80 > #include "log.h"
81 > #include "client.h"     /* for UMODE_SERVNOTICE only */
82   #include "irc_string.h"
87 #include "irc_getaddrinfo.h"
88 #include "sprintf_irc.h"
83   #include "memory.h"
84   #include "modules.h"
85 < #include "s_serv.h"
85 > #include "server.h"
86   #include "hostmask.h"
87   #include "send.h"
88   #include "listener.h"
89   #include "resv.h"
90   #include "numeric.h"
91 < #include "s_user.h"
91 > #include "user.h"
92 > #include "motd.h"
93  
94   #ifdef HAVE_LIBCRYPTO
95   #include <openssl/rsa.h>
96   #include <openssl/bio.h>
97   #include <openssl/pem.h>
98 + #include <openssl/dh.h>
99   #endif
100  
101 < static char *class_name = NULL;
106 < static struct ConfItem *yy_conf = NULL;
107 < static struct AccessItem *yy_aconf = NULL;
108 < static struct MatchItem *yy_match_item = NULL;
109 < static struct ClassItem *yy_class = NULL;
110 < static char *yy_class_name = NULL;
111 <
112 < static dlink_list col_conf_list  = { NULL, NULL, 0 };
113 < static dlink_list hub_conf_list  = { NULL, NULL, 0 };
114 < static dlink_list leaf_conf_list = { NULL, NULL, 0 };
115 < static unsigned int listener_flags = 0;
116 < static unsigned int regex_ban = 0;
117 < static char userbuf[IRCD_BUFSIZE];
118 < static char hostbuf[IRCD_BUFSIZE];
119 < static char reasonbuf[REASONLEN + 1];
120 < static char gecos_name[REALLEN * 4];
121 <
122 < static char *resv_reason = NULL;
123 < static char *listener_address = NULL;
124 < static int not_atom = 0;
101 > #include "rsa.h"
102  
103 < struct CollectItem
127 < {
128 <  dlink_node node;
129 <  char *name;
130 <  char *user;
131 <  char *host;
132 <  char *passwd;
133 <  int  port;
134 <  int  flags;
135 < #ifdef HAVE_LIBCRYPTO
136 <  char *rsa_public_key_file;
137 <  RSA *rsa_public_key;
138 < #endif
139 < };
103 > int yylex(void);
104  
105 < static void
142 < free_collect_item(struct CollectItem *item)
105 > static struct
106   {
107 <  MyFree(item->name);
108 <  MyFree(item->user);
109 <  MyFree(item->host);
110 <  MyFree(item->passwd);
111 < #ifdef HAVE_LIBCRYPTO
112 <  MyFree(item->rsa_public_key_file);
113 < #endif
114 <  MyFree(item);
115 < }
107 >  struct
108 >  {
109 >    dlink_list list;
110 >  } mask,
111 >    leaf,
112 >    hub;
113 >
114 >  struct
115 >  {
116 >    char buf[IRCD_BUFSIZE];
117 >  } name,
118 >    nick,
119 >    user,
120 >    host,
121 >    addr,
122 >    bind,
123 >    file,
124 >    ciph,
125 >    cert,
126 >    rpass,
127 >    spass,
128 >    whois,
129 >    class,
130 >    target,
131 >    prepend,
132 >    command;
133 >
134 >  struct
135 >  {
136 >    unsigned int value;
137 >  } flags,
138 >    modes,
139 >    size,
140 >    type,
141 >    port,
142 >    aftype,
143 >    ping_freq,
144 >    max_perip,
145 >    con_freq,
146 >    min_idle,
147 >    max_idle,
148 >    max_total,
149 >    max_global,
150 >    max_local,
151 >    max_ident,
152 >    max_sendq,
153 >    max_recvq,
154 >    max_channels,
155 >    cidr_bitlen_ipv4,
156 >    cidr_bitlen_ipv6,
157 >    number_per_cidr;
158 > } block_state;
159  
160   static void
161 < unhook_hub_leaf_confs(void)
161 > reset_block_state(void)
162   {
163 <  dlink_node *ptr;
158 <  dlink_node *next_ptr;
159 <  struct CollectItem *yy_hconf;
160 <  struct CollectItem *yy_lconf;
163 >  dlink_node *node = NULL, *node_next = NULL;
164  
165 <  DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
165 >  DLINK_FOREACH_SAFE(node, node_next, block_state.mask.list.head)
166    {
167 <    yy_hconf = ptr->data;
168 <    dlinkDelete(&yy_hconf->node, &hub_conf_list);
169 <    free_collect_item(yy_hconf);
167 >    MyFree(node->data);
168 >    dlinkDelete(node, &block_state.mask.list);
169 >    free_dlink_node(node);
170    }
171  
172 <  DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
172 >  DLINK_FOREACH_SAFE(node, node_next, block_state.leaf.list.head)
173    {
174 <    yy_lconf = ptr->data;
175 <    dlinkDelete(&yy_lconf->node, &leaf_conf_list);
176 <    free_collect_item(yy_lconf);
174 >    MyFree(node->data);
175 >    dlinkDelete(node, &block_state.leaf.list);
176 >    free_dlink_node(node);
177 >  }
178 >
179 >  DLINK_FOREACH_SAFE(node, node_next, block_state.hub.list.head)
180 >  {
181 >    MyFree(node->data);
182 >    dlinkDelete(node, &block_state.hub.list);
183 >    free_dlink_node(node);
184    }
175 }
185  
186 +  memset(&block_state, 0, sizeof(block_state));
187 + }
188  
189  
190 < /* Line 189 of yacc.c  */
180 < #line 181 "ircd_parser.c"
190 > #line 191 "conf_parser.c" /* yacc.c:339  */
191  
192 < /* Enabling traces.  */
193 < #ifndef YYDEBUG
194 < # define YYDEBUG 0
195 < #endif
192 > # ifndef YY_NULLPTR
193 > #  if defined __cplusplus && 201103L <= __cplusplus
194 > #   define YY_NULLPTR nullptr
195 > #  else
196 > #   define YY_NULLPTR 0
197 > #  endif
198 > # endif
199  
200   /* Enabling verbose error messages.  */
201   #ifdef YYERROR_VERBOSE
# Line 192 | Line 205 | unhook_hub_leaf_confs(void)
205   # define YYERROR_VERBOSE 0
206   #endif
207  
208 < /* Enabling the token table.  */
209 < #ifndef YYTOKEN_TABLE
210 < # define YYTOKEN_TABLE 0
208 > /* In a future release of Bison, this section will be replaced
209 >   by #include "y.tab.h".  */
210 > #ifndef YY_YY_CONF_PARSER_H_INCLUDED
211 > # define YY_YY_CONF_PARSER_H_INCLUDED
212 > /* Debug traces.  */
213 > #ifndef YYDEBUG
214 > # define YYDEBUG 0
215 > #endif
216 > #if YYDEBUG
217 > extern int yydebug;
218   #endif
219  
220 <
201 < /* Tokens.  */
220 > /* Token type.  */
221   #ifndef YYTOKENTYPE
222   # define YYTOKENTYPE
223 <   /* Put the tokens into the symbol table, so that GDB and other debuggers
224 <      know about them.  */
225 <   enum yytokentype {
226 <     ACCEPT_PASSWORD = 258,
227 <     ACTION = 259,
228 <     ADMIN = 260,
229 <     AFTYPE = 261,
230 <     T_ALLOW = 262,
231 <     ANTI_NICK_FLOOD = 263,
232 <     ANTI_SPAM_EXIT_MESSAGE_TIME = 264,
233 <     AUTOCONN = 265,
234 <     T_BLOCK = 266,
235 <     BURST_AWAY = 267,
236 <     BURST_TOPICWHO = 268,
237 <     BYTES = 269,
238 <     KBYTES = 270,
239 <     MBYTES = 271,
240 <     GBYTES = 272,
241 <     TBYTES = 273,
242 <     CALLER_ID_WAIT = 274,
243 <     CAN_FLOOD = 275,
244 <     CAN_IDLE = 276,
245 <     CHANNEL = 277,
246 <     CIDR_BITLEN_IPV4 = 278,
247 <     CIDR_BITLEN_IPV6 = 279,
248 <     CIPHER_PREFERENCE = 280,
249 <     CLASS = 281,
250 <     COMPRESSED = 282,
251 <     COMPRESSION_LEVEL = 283,
252 <     CONNECT = 284,
253 <     CONNECTFREQ = 285,
254 <     CRYPTLINK = 286,
255 <     DEFAULT_CIPHER_PREFERENCE = 287,
256 <     DEFAULT_FLOODCOUNT = 288,
257 <     DEFAULT_SPLIT_SERVER_COUNT = 289,
258 <     DEFAULT_SPLIT_USER_COUNT = 290,
259 <     DENY = 291,
260 <     DESCRIPTION = 292,
261 <     DIE = 293,
262 <     DISABLE_AUTH = 294,
263 <     DISABLE_FAKE_CHANNELS = 295,
264 <     DISABLE_HIDDEN = 296,
265 <     DISABLE_LOCAL_CHANNELS = 297,
266 <     DISABLE_REMOTE_COMMANDS = 298,
267 <     DOT_IN_IP6_ADDR = 299,
268 <     DOTS_IN_IDENT = 300,
269 <     DURATION = 301,
270 <     EGDPOOL_PATH = 302,
271 <     EMAIL = 303,
272 <     ENABLE = 304,
273 <     ENCRYPTED = 305,
274 <     EXCEED_LIMIT = 306,
275 <     EXEMPT = 307,
276 <     FAILED_OPER_NOTICE = 308,
277 <     FAKENAME = 309,
278 <     IRCD_FLAGS = 310,
279 <     FLATTEN_LINKS = 311,
280 <     FFAILED_OPERLOG = 312,
281 <     FKILLLOG = 313,
282 <     FKLINELOG = 314,
283 <     FGLINELOG = 315,
284 <     FIOERRLOG = 316,
285 <     FOPERLOG = 317,
286 <     FOPERSPYLOG = 318,
287 <     FUSERLOG = 319,
288 <     GECOS = 320,
289 <     GENERAL = 321,
290 <     GLINE = 322,
291 <     GLINES = 323,
292 <     GLINE_EXEMPT = 324,
293 <     GLINE_LOG = 325,
294 <     GLINE_TIME = 326,
295 <     GLINE_MIN_CIDR = 327,
296 <     GLINE_MIN_CIDR6 = 328,
297 <     GLOBAL_KILL = 329,
298 <     IRCD_AUTH = 330,
299 <     NEED_IDENT = 331,
300 <     HAVENT_READ_CONF = 332,
301 <     HIDDEN = 333,
302 <     HIDDEN_ADMIN = 334,
303 <     HIDDEN_NAME = 335,
304 <     HIDDEN_OPER = 336,
305 <     HIDE_SERVER_IPS = 337,
306 <     HIDE_SERVERS = 338,
307 <     HIDE_SPOOF_IPS = 339,
308 <     HOST = 340,
309 <     HUB = 341,
310 <     HUB_MASK = 342,
311 <     IDLETIME = 343,
312 <     IGNORE_BOGUS_TS = 344,
313 <     INVISIBLE_ON_CONNECT = 345,
314 <     IP = 346,
315 <     KILL = 347,
316 <     KILL_CHASE_TIME_LIMIT = 348,
317 <     KLINE = 349,
318 <     KLINE_EXEMPT = 350,
319 <     KLINE_REASON = 351,
320 <     KLINE_WITH_REASON = 352,
321 <     KNOCK_DELAY = 353,
322 <     KNOCK_DELAY_CHANNEL = 354,
323 <     LEAF_MASK = 355,
324 <     LINKS_DELAY = 356,
325 <     LISTEN = 357,
326 <     T_LOG = 358,
327 <     LOGGING = 359,
328 <     LOG_LEVEL = 360,
329 <     MAX_ACCEPT = 361,
330 <     MAX_BANS = 362,
331 <     MAX_CHANS_PER_USER = 363,
332 <     MAX_GLOBAL = 364,
333 <     MAX_IDENT = 365,
334 <     MAX_LOCAL = 366,
335 <     MAX_NICK_CHANGES = 367,
336 <     MAX_NICK_TIME = 368,
337 <     MAX_NUMBER = 369,
338 <     MAX_TARGETS = 370,
339 <     MAX_WATCH = 371,
340 <     MESSAGE_LOCALE = 372,
341 <     MIN_NONWILDCARD = 373,
342 <     MIN_NONWILDCARD_SIMPLE = 374,
343 <     MODULE = 375,
344 <     MODULES = 376,
345 <     NAME = 377,
346 <     NEED_PASSWORD = 378,
347 <     NETWORK_DESC = 379,
348 <     NETWORK_NAME = 380,
349 <     NICK = 381,
350 <     NICK_CHANGES = 382,
351 <     NO_CREATE_ON_SPLIT = 383,
352 <     NO_JOIN_ON_SPLIT = 384,
353 <     NO_OPER_FLOOD = 385,
354 <     NO_TILDE = 386,
355 <     NOT = 387,
356 <     NUMBER = 388,
357 <     NUMBER_PER_IDENT = 389,
358 <     NUMBER_PER_CIDR = 390,
359 <     NUMBER_PER_IP = 391,
360 <     NUMBER_PER_IP_GLOBAL = 392,
361 <     OPERATOR = 393,
362 <     OPERS_BYPASS_CALLERID = 394,
363 <     OPER_LOG = 395,
364 <     OPER_ONLY_UMODES = 396,
365 <     OPER_PASS_RESV = 397,
366 <     OPER_SPY_T = 398,
367 <     OPER_UMODES = 399,
368 <     JOIN_FLOOD_COUNT = 400,
369 <     JOIN_FLOOD_TIME = 401,
370 <     PACE_WAIT = 402,
371 <     PACE_WAIT_SIMPLE = 403,
372 <     PASSWORD = 404,
373 <     PATH = 405,
374 <     PING_COOKIE = 406,
375 <     PING_TIME = 407,
376 <     PING_WARNING = 408,
377 <     PORT = 409,
378 <     QSTRING = 410,
379 <     QUIET_ON_BAN = 411,
380 <     REASON = 412,
381 <     REDIRPORT = 413,
382 <     REDIRSERV = 414,
383 <     REGEX_T = 415,
384 <     REHASH = 416,
385 <     TREJECT_HOLD_TIME = 417,
386 <     REMOTE = 418,
387 <     REMOTEBAN = 419,
388 <     RESTRICT_CHANNELS = 420,
389 <     RESTRICTED = 421,
390 <     RSA_PRIVATE_KEY_FILE = 422,
391 <     RSA_PUBLIC_KEY_FILE = 423,
392 <     SSL_CERTIFICATE_FILE = 424,
393 <     T_SSL_CONNECTION_METHOD = 425,
394 <     T_SSLV3 = 426,
395 <     T_TLSV1 = 427,
396 <     RESV = 428,
397 <     RESV_EXEMPT = 429,
398 <     SECONDS = 430,
399 <     MINUTES = 431,
400 <     HOURS = 432,
401 <     DAYS = 433,
402 <     WEEKS = 434,
403 <     SENDQ = 435,
404 <     SEND_PASSWORD = 436,
405 <     SERVERHIDE = 437,
406 <     SERVERINFO = 438,
407 <     SERVLINK_PATH = 439,
408 <     IRCD_SID = 440,
409 <     TKLINE_EXPIRE_NOTICES = 441,
410 <     T_SHARED = 442,
411 <     T_CLUSTER = 443,
412 <     TYPE = 444,
413 <     SHORT_MOTD = 445,
414 <     SILENT = 446,
415 <     SPOOF = 447,
416 <     SPOOF_NOTICE = 448,
417 <     STATS_E_DISABLED = 449,
418 <     STATS_I_OPER_ONLY = 450,
419 <     STATS_K_OPER_ONLY = 451,
420 <     STATS_O_OPER_ONLY = 452,
421 <     STATS_P_OPER_ONLY = 453,
422 <     TBOOL = 454,
423 <     TMASKED = 455,
424 <     T_REJECT = 456,
425 <     TS_MAX_DELTA = 457,
426 <     TS_WARN_DELTA = 458,
427 <     TWODOTS = 459,
428 <     T_ALL = 460,
429 <     T_BOTS = 461,
430 <     T_SOFTCALLERID = 462,
431 <     T_CALLERID = 463,
432 <     T_CCONN = 464,
433 <     T_CCONN_FULL = 465,
434 <     T_CLIENT_FLOOD = 466,
435 <     T_DEAF = 467,
436 <     T_DEBUG = 468,
437 <     T_DRONE = 469,
438 <     T_EXTERNAL = 470,
439 <     T_FULL = 471,
440 <     T_INVISIBLE = 472,
441 <     T_IPV4 = 473,
442 <     T_IPV6 = 474,
443 <     T_LOCOPS = 475,
444 <     T_LOGPATH = 476,
445 <     T_L_CRIT = 477,
446 <     T_L_DEBUG = 478,
447 <     T_L_ERROR = 479,
429 <     T_L_INFO = 480,
430 <     T_L_NOTICE = 481,
431 <     T_L_TRACE = 482,
432 <     T_L_WARN = 483,
433 <     T_MAX_CLIENTS = 484,
434 <     T_NCHANGE = 485,
435 <     T_OPERWALL = 486,
436 <     T_REJ = 487,
437 <     T_SERVER = 488,
438 <     T_SERVNOTICE = 489,
439 <     T_SKILL = 490,
440 <     T_SPY = 491,
441 <     T_SSL = 492,
442 <     T_UMODES = 493,
443 <     T_UNAUTH = 494,
444 <     T_UNRESV = 495,
445 <     T_UNXLINE = 496,
446 <     T_WALLOP = 497,
447 <     THROTTLE_TIME = 498,
448 <     TOPICBURST = 499,
449 <     TRUE_NO_OPER_FLOOD = 500,
450 <     TKLINE = 501,
451 <     TXLINE = 502,
452 <     TRESV = 503,
453 <     UNKLINE = 504,
454 <     USER = 505,
455 <     USE_EGD = 506,
456 <     USE_EXCEPT = 507,
457 <     USE_INVEX = 508,
458 <     USE_KNOCK = 509,
459 <     USE_LOGGING = 510,
460 <     USE_WHOIS_ACTUALLY = 511,
461 <     VHOST = 512,
462 <     VHOST6 = 513,
463 <     XLINE = 514,
464 <     WARN = 515,
465 <     WARN_NO_NLINE = 516
466 <   };
223 >  enum yytokentype
224 >  {
225 >    ACCEPT_PASSWORD = 258,
226 >    ADMIN = 259,
227 >    AFTYPE = 260,
228 >    ANTI_NICK_FLOOD = 261,
229 >    ANTI_SPAM_EXIT_MESSAGE_TIME = 262,
230 >    AUTOCONN = 263,
231 >    AWAY_COUNT = 264,
232 >    AWAY_TIME = 265,
233 >    BYTES = 266,
234 >    KBYTES = 267,
235 >    MBYTES = 268,
236 >    CALLER_ID_WAIT = 269,
237 >    CAN_FLOOD = 270,
238 >    CHANNEL = 271,
239 >    CIDR_BITLEN_IPV4 = 272,
240 >    CIDR_BITLEN_IPV6 = 273,
241 >    CLASS = 274,
242 >    CONNECT = 275,
243 >    CONNECTFREQ = 276,
244 >    CYCLE_ON_HOST_CHANGE = 277,
245 >    DEFAULT_FLOODCOUNT = 278,
246 >    DEFAULT_JOIN_FLOOD_COUNT = 279,
247 >    DEFAULT_JOIN_FLOOD_TIME = 280,
248 >    DEFAULT_MAX_CLIENTS = 281,
249 >    DENY = 282,
250 >    DESCRIPTION = 283,
251 >    DIE = 284,
252 >    DISABLE_AUTH = 285,
253 >    DISABLE_FAKE_CHANNELS = 286,
254 >    DISABLE_REMOTE_COMMANDS = 287,
255 >    DLINE_MIN_CIDR = 288,
256 >    DLINE_MIN_CIDR6 = 289,
257 >    DOTS_IN_IDENT = 290,
258 >    EMAIL = 291,
259 >    ENCRYPTED = 292,
260 >    EXCEED_LIMIT = 293,
261 >    EXEMPT = 294,
262 >    FAILED_OPER_NOTICE = 295,
263 >    FLATTEN_LINKS = 296,
264 >    GECOS = 297,
265 >    GENERAL = 298,
266 >    HIDDEN = 299,
267 >    HIDDEN_NAME = 300,
268 >    HIDE_CHANS = 301,
269 >    HIDE_IDLE = 302,
270 >    HIDE_IDLE_FROM_OPERS = 303,
271 >    HIDE_SERVER_IPS = 304,
272 >    HIDE_SERVERS = 305,
273 >    HIDE_SERVICES = 306,
274 >    HOST = 307,
275 >    HUB = 308,
276 >    HUB_MASK = 309,
277 >    IGNORE_BOGUS_TS = 310,
278 >    INVISIBLE_ON_CONNECT = 311,
279 >    INVITE_CLIENT_COUNT = 312,
280 >    INVITE_CLIENT_TIME = 313,
281 >    IP = 314,
282 >    IRCD_AUTH = 315,
283 >    IRCD_FLAGS = 316,
284 >    IRCD_SID = 317,
285 >    KILL = 318,
286 >    KILL_CHASE_TIME_LIMIT = 319,
287 >    KLINE = 320,
288 >    KLINE_EXEMPT = 321,
289 >    KLINE_MIN_CIDR = 322,
290 >    KLINE_MIN_CIDR6 = 323,
291 >    KNOCK_CLIENT_COUNT = 324,
292 >    KNOCK_CLIENT_TIME = 325,
293 >    KNOCK_DELAY_CHANNEL = 326,
294 >    LEAF_MASK = 327,
295 >    LINKS_DELAY = 328,
296 >    LISTEN = 329,
297 >    MASK = 330,
298 >    MAX_ACCEPT = 331,
299 >    MAX_BANS = 332,
300 >    MAX_CHANNELS = 333,
301 >    MAX_GLOBAL = 334,
302 >    MAX_IDENT = 335,
303 >    MAX_IDLE = 336,
304 >    MAX_LOCAL = 337,
305 >    MAX_NICK_CHANGES = 338,
306 >    MAX_NICK_LENGTH = 339,
307 >    MAX_NICK_TIME = 340,
308 >    MAX_NUMBER = 341,
309 >    MAX_TARGETS = 342,
310 >    MAX_TOPIC_LENGTH = 343,
311 >    MAX_WATCH = 344,
312 >    MIN_IDLE = 345,
313 >    MIN_NONWILDCARD = 346,
314 >    MIN_NONWILDCARD_SIMPLE = 347,
315 >    MODULE = 348,
316 >    MODULES = 349,
317 >    MOTD = 350,
318 >    NAME = 351,
319 >    NEED_IDENT = 352,
320 >    NEED_PASSWORD = 353,
321 >    NETWORK_DESC = 354,
322 >    NETWORK_NAME = 355,
323 >    NICK = 356,
324 >    NO_OPER_FLOOD = 357,
325 >    NO_TILDE = 358,
326 >    NUMBER = 359,
327 >    NUMBER_PER_CIDR = 360,
328 >    NUMBER_PER_IP = 361,
329 >    OPER_ONLY_UMODES = 362,
330 >    OPER_PASS_RESV = 363,
331 >    OPER_UMODES = 364,
332 >    OPERATOR = 365,
333 >    OPERS_BYPASS_CALLERID = 366,
334 >    PACE_WAIT = 367,
335 >    PACE_WAIT_SIMPLE = 368,
336 >    PASSWORD = 369,
337 >    PATH = 370,
338 >    PING_COOKIE = 371,
339 >    PING_TIME = 372,
340 >    PORT = 373,
341 >    QSTRING = 374,
342 >    RANDOM_IDLE = 375,
343 >    REASON = 376,
344 >    REDIRPORT = 377,
345 >    REDIRSERV = 378,
346 >    REHASH = 379,
347 >    REMOTE = 380,
348 >    REMOTEBAN = 381,
349 >    RESV = 382,
350 >    RESV_EXEMPT = 383,
351 >    RSA_PRIVATE_KEY_FILE = 384,
352 >    RSA_PUBLIC_KEY_FILE = 385,
353 >    SECONDS = 386,
354 >    MINUTES = 387,
355 >    HOURS = 388,
356 >    DAYS = 389,
357 >    WEEKS = 390,
358 >    MONTHS = 391,
359 >    YEARS = 392,
360 >    SEND_PASSWORD = 393,
361 >    SENDQ = 394,
362 >    SERVERHIDE = 395,
363 >    SERVERINFO = 396,
364 >    SHORT_MOTD = 397,
365 >    SPOOF = 398,
366 >    SPOOF_NOTICE = 399,
367 >    SQUIT = 400,
368 >    SSL_CERTIFICATE_FILE = 401,
369 >    SSL_CERTIFICATE_FINGERPRINT = 402,
370 >    SSL_CONNECTION_REQUIRED = 403,
371 >    SSL_DH_ELLIPTIC_CURVE = 404,
372 >    SSL_DH_PARAM_FILE = 405,
373 >    SSL_MESSAGE_DIGEST_ALGORITHM = 406,
374 >    STATS_E_DISABLED = 407,
375 >    STATS_I_OPER_ONLY = 408,
376 >    STATS_K_OPER_ONLY = 409,
377 >    STATS_M_OPER_ONLY = 410,
378 >    STATS_O_OPER_ONLY = 411,
379 >    STATS_P_OPER_ONLY = 412,
380 >    STATS_U_OPER_ONLY = 413,
381 >    T_ALL = 414,
382 >    T_BOTS = 415,
383 >    T_CALLERID = 416,
384 >    T_CCONN = 417,
385 >    T_COMMAND = 418,
386 >    T_CLUSTER = 419,
387 >    T_DEAF = 420,
388 >    T_DEBUG = 421,
389 >    T_DLINE = 422,
390 >    T_EXTERNAL = 423,
391 >    T_FARCONNECT = 424,
392 >    T_FILE = 425,
393 >    T_FULL = 426,
394 >    T_GLOBOPS = 427,
395 >    T_INVISIBLE = 428,
396 >    T_IPV4 = 429,
397 >    T_IPV6 = 430,
398 >    T_LOCOPS = 431,
399 >    T_LOG = 432,
400 >    T_NCHANGE = 433,
401 >    T_NONONREG = 434,
402 >    T_OPME = 435,
403 >    T_PREPEND = 436,
404 >    T_PSEUDO = 437,
405 >    T_RECVQ = 438,
406 >    T_REJ = 439,
407 >    T_RESTART = 440,
408 >    T_SERVER = 441,
409 >    T_SERVICE = 442,
410 >    T_SERVNOTICE = 443,
411 >    T_SET = 444,
412 >    T_SHARED = 445,
413 >    T_SIZE = 446,
414 >    T_SKILL = 447,
415 >    T_SOFTCALLERID = 448,
416 >    T_SPY = 449,
417 >    T_SSL = 450,
418 >    T_SSL_CIPHER_LIST = 451,
419 >    T_TARGET = 452,
420 >    T_UMODES = 453,
421 >    T_UNAUTH = 454,
422 >    T_UNDLINE = 455,
423 >    T_UNLIMITED = 456,
424 >    T_UNRESV = 457,
425 >    T_UNXLINE = 458,
426 >    T_WALLOP = 459,
427 >    T_WALLOPS = 460,
428 >    T_WEBIRC = 461,
429 >    TBOOL = 462,
430 >    THROTTLE_COUNT = 463,
431 >    THROTTLE_TIME = 464,
432 >    TKLINE_EXPIRE_NOTICES = 465,
433 >    TMASKED = 466,
434 >    TS_MAX_DELTA = 467,
435 >    TS_WARN_DELTA = 468,
436 >    TWODOTS = 469,
437 >    TYPE = 470,
438 >    UNKLINE = 471,
439 >    USE_LOGGING = 472,
440 >    USER = 473,
441 >    VHOST = 474,
442 >    VHOST6 = 475,
443 >    WARN_NO_CONNECT_BLOCK = 476,
444 >    WHOIS = 477,
445 >    XLINE = 478,
446 >    XLINE_EXEMPT = 479
447 >  };
448   #endif
449   /* Tokens.  */
450   #define ACCEPT_PASSWORD 258
451 < #define ACTION 259
452 < #define ADMIN 260
453 < #define AFTYPE 261
454 < #define T_ALLOW 262
455 < #define ANTI_NICK_FLOOD 263
456 < #define ANTI_SPAM_EXIT_MESSAGE_TIME 264
457 < #define AUTOCONN 265
458 < #define T_BLOCK 266
459 < #define BURST_AWAY 267
460 < #define BURST_TOPICWHO 268
461 < #define BYTES 269
462 < #define KBYTES 270
463 < #define MBYTES 271
464 < #define GBYTES 272
465 < #define TBYTES 273
466 < #define CALLER_ID_WAIT 274
467 < #define CAN_FLOOD 275
468 < #define CAN_IDLE 276
469 < #define CHANNEL 277
470 < #define CIDR_BITLEN_IPV4 278
471 < #define CIDR_BITLEN_IPV6 279
472 < #define CIPHER_PREFERENCE 280
473 < #define CLASS 281
474 < #define COMPRESSED 282
475 < #define COMPRESSION_LEVEL 283
476 < #define CONNECT 284
477 < #define CONNECTFREQ 285
478 < #define CRYPTLINK 286
479 < #define DEFAULT_CIPHER_PREFERENCE 287
480 < #define DEFAULT_FLOODCOUNT 288
481 < #define DEFAULT_SPLIT_SERVER_COUNT 289
482 < #define DEFAULT_SPLIT_USER_COUNT 290
483 < #define DENY 291
484 < #define DESCRIPTION 292
485 < #define DIE 293
486 < #define DISABLE_AUTH 294
487 < #define DISABLE_FAKE_CHANNELS 295
488 < #define DISABLE_HIDDEN 296
489 < #define DISABLE_LOCAL_CHANNELS 297
490 < #define DISABLE_REMOTE_COMMANDS 298
491 < #define DOT_IN_IP6_ADDR 299
492 < #define DOTS_IN_IDENT 300
493 < #define DURATION 301
494 < #define EGDPOOL_PATH 302
495 < #define EMAIL 303
496 < #define ENABLE 304
497 < #define ENCRYPTED 305
498 < #define EXCEED_LIMIT 306
499 < #define EXEMPT 307
500 < #define FAILED_OPER_NOTICE 308
501 < #define FAKENAME 309
502 < #define IRCD_FLAGS 310
503 < #define FLATTEN_LINKS 311
504 < #define FFAILED_OPERLOG 312
505 < #define FKILLLOG 313
506 < #define FKLINELOG 314
507 < #define FGLINELOG 315
508 < #define FIOERRLOG 316
509 < #define FOPERLOG 317
510 < #define FOPERSPYLOG 318
511 < #define FUSERLOG 319
512 < #define GECOS 320
513 < #define GENERAL 321
514 < #define GLINE 322
515 < #define GLINES 323
516 < #define GLINE_EXEMPT 324
517 < #define GLINE_LOG 325
518 < #define GLINE_TIME 326
519 < #define GLINE_MIN_CIDR 327
520 < #define GLINE_MIN_CIDR6 328
521 < #define GLOBAL_KILL 329
522 < #define IRCD_AUTH 330
523 < #define NEED_IDENT 331
524 < #define HAVENT_READ_CONF 332
525 < #define HIDDEN 333
526 < #define HIDDEN_ADMIN 334
527 < #define HIDDEN_NAME 335
528 < #define HIDDEN_OPER 336
529 < #define HIDE_SERVER_IPS 337
530 < #define HIDE_SERVERS 338
531 < #define HIDE_SPOOF_IPS 339
532 < #define HOST 340
533 < #define HUB 341
534 < #define HUB_MASK 342
535 < #define IDLETIME 343
536 < #define IGNORE_BOGUS_TS 344
537 < #define INVISIBLE_ON_CONNECT 345
538 < #define IP 346
539 < #define KILL 347
540 < #define KILL_CHASE_TIME_LIMIT 348
541 < #define KLINE 349
542 < #define KLINE_EXEMPT 350
543 < #define KLINE_REASON 351
544 < #define KLINE_WITH_REASON 352
545 < #define KNOCK_DELAY 353
546 < #define KNOCK_DELAY_CHANNEL 354
547 < #define LEAF_MASK 355
548 < #define LINKS_DELAY 356
549 < #define LISTEN 357
550 < #define T_LOG 358
551 < #define LOGGING 359
552 < #define LOG_LEVEL 360
553 < #define MAX_ACCEPT 361
554 < #define MAX_BANS 362
555 < #define MAX_CHANS_PER_USER 363
556 < #define MAX_GLOBAL 364
557 < #define MAX_IDENT 365
558 < #define MAX_LOCAL 366
559 < #define MAX_NICK_CHANGES 367
560 < #define MAX_NICK_TIME 368
561 < #define MAX_NUMBER 369
562 < #define MAX_TARGETS 370
563 < #define MAX_WATCH 371
564 < #define MESSAGE_LOCALE 372
565 < #define MIN_NONWILDCARD 373
566 < #define MIN_NONWILDCARD_SIMPLE 374
567 < #define MODULE 375
568 < #define MODULES 376
569 < #define NAME 377
570 < #define NEED_PASSWORD 378
571 < #define NETWORK_DESC 379
572 < #define NETWORK_NAME 380
573 < #define NICK 381
574 < #define NICK_CHANGES 382
575 < #define NO_CREATE_ON_SPLIT 383
576 < #define NO_JOIN_ON_SPLIT 384
577 < #define NO_OPER_FLOOD 385
578 < #define NO_TILDE 386
579 < #define NOT 387
580 < #define NUMBER 388
581 < #define NUMBER_PER_IDENT 389
582 < #define NUMBER_PER_CIDR 390
583 < #define NUMBER_PER_IP 391
584 < #define NUMBER_PER_IP_GLOBAL 392
585 < #define OPERATOR 393
586 < #define OPERS_BYPASS_CALLERID 394
587 < #define OPER_LOG 395
588 < #define OPER_ONLY_UMODES 396
589 < #define OPER_PASS_RESV 397
590 < #define OPER_SPY_T 398
591 < #define OPER_UMODES 399
592 < #define JOIN_FLOOD_COUNT 400
593 < #define JOIN_FLOOD_TIME 401
594 < #define PACE_WAIT 402
595 < #define PACE_WAIT_SIMPLE 403
596 < #define PASSWORD 404
597 < #define PATH 405
598 < #define PING_COOKIE 406
599 < #define PING_TIME 407
600 < #define PING_WARNING 408
601 < #define PORT 409
602 < #define QSTRING 410
603 < #define QUIET_ON_BAN 411
604 < #define REASON 412
605 < #define REDIRPORT 413
606 < #define REDIRSERV 414
607 < #define REGEX_T 415
608 < #define REHASH 416
609 < #define TREJECT_HOLD_TIME 417
610 < #define REMOTE 418
611 < #define REMOTEBAN 419
612 < #define RESTRICT_CHANNELS 420
613 < #define RESTRICTED 421
614 < #define RSA_PRIVATE_KEY_FILE 422
615 < #define RSA_PUBLIC_KEY_FILE 423
616 < #define SSL_CERTIFICATE_FILE 424
617 < #define T_SSL_CONNECTION_METHOD 425
618 < #define T_SSLV3 426
619 < #define T_TLSV1 427
620 < #define RESV 428
621 < #define RESV_EXEMPT 429
622 < #define SECONDS 430
623 < #define MINUTES 431
624 < #define HOURS 432
625 < #define DAYS 433
626 < #define WEEKS 434
627 < #define SENDQ 435
628 < #define SEND_PASSWORD 436
629 < #define SERVERHIDE 437
630 < #define SERVERINFO 438
631 < #define SERVLINK_PATH 439
632 < #define IRCD_SID 440
633 < #define TKLINE_EXPIRE_NOTICES 441
634 < #define T_SHARED 442
635 < #define T_CLUSTER 443
636 < #define TYPE 444
637 < #define SHORT_MOTD 445
638 < #define SILENT 446
639 < #define SPOOF 447
640 < #define SPOOF_NOTICE 448
641 < #define STATS_E_DISABLED 449
642 < #define STATS_I_OPER_ONLY 450
643 < #define STATS_K_OPER_ONLY 451
644 < #define STATS_O_OPER_ONLY 452
645 < #define STATS_P_OPER_ONLY 453
646 < #define TBOOL 454
647 < #define TMASKED 455
648 < #define T_REJECT 456
649 < #define TS_MAX_DELTA 457
650 < #define TS_WARN_DELTA 458
651 < #define TWODOTS 459
652 < #define T_ALL 460
653 < #define T_BOTS 461
654 < #define T_SOFTCALLERID 462
655 < #define T_CALLERID 463
656 < #define T_CCONN 464
657 < #define T_CCONN_FULL 465
658 < #define T_CLIENT_FLOOD 466
659 < #define T_DEAF 467
660 < #define T_DEBUG 468
661 < #define T_DRONE 469
662 < #define T_EXTERNAL 470
663 < #define T_FULL 471
664 < #define T_INVISIBLE 472
665 < #define T_IPV4 473
666 < #define T_IPV6 474
667 < #define T_LOCOPS 475
668 < #define T_LOGPATH 476
669 < #define T_L_CRIT 477
670 < #define T_L_DEBUG 478
671 < #define T_L_ERROR 479
691 < #define T_L_INFO 480
692 < #define T_L_NOTICE 481
693 < #define T_L_TRACE 482
694 < #define T_L_WARN 483
695 < #define T_MAX_CLIENTS 484
696 < #define T_NCHANGE 485
697 < #define T_OPERWALL 486
698 < #define T_REJ 487
699 < #define T_SERVER 488
700 < #define T_SERVNOTICE 489
701 < #define T_SKILL 490
702 < #define T_SPY 491
703 < #define T_SSL 492
704 < #define T_UMODES 493
705 < #define T_UNAUTH 494
706 < #define T_UNRESV 495
707 < #define T_UNXLINE 496
708 < #define T_WALLOP 497
709 < #define THROTTLE_TIME 498
710 < #define TOPICBURST 499
711 < #define TRUE_NO_OPER_FLOOD 500
712 < #define TKLINE 501
713 < #define TXLINE 502
714 < #define TRESV 503
715 < #define UNKLINE 504
716 < #define USER 505
717 < #define USE_EGD 506
718 < #define USE_EXCEPT 507
719 < #define USE_INVEX 508
720 < #define USE_KNOCK 509
721 < #define USE_LOGGING 510
722 < #define USE_WHOIS_ACTUALLY 511
723 < #define VHOST 512
724 < #define VHOST6 513
725 < #define XLINE 514
726 < #define WARN 515
727 < #define WARN_NO_NLINE 516
728 <
729 <
730 <
451 > #define ADMIN 259
452 > #define AFTYPE 260
453 > #define ANTI_NICK_FLOOD 261
454 > #define ANTI_SPAM_EXIT_MESSAGE_TIME 262
455 > #define AUTOCONN 263
456 > #define AWAY_COUNT 264
457 > #define AWAY_TIME 265
458 > #define BYTES 266
459 > #define KBYTES 267
460 > #define MBYTES 268
461 > #define CALLER_ID_WAIT 269
462 > #define CAN_FLOOD 270
463 > #define CHANNEL 271
464 > #define CIDR_BITLEN_IPV4 272
465 > #define CIDR_BITLEN_IPV6 273
466 > #define CLASS 274
467 > #define CONNECT 275
468 > #define CONNECTFREQ 276
469 > #define CYCLE_ON_HOST_CHANGE 277
470 > #define DEFAULT_FLOODCOUNT 278
471 > #define DEFAULT_JOIN_FLOOD_COUNT 279
472 > #define DEFAULT_JOIN_FLOOD_TIME 280
473 > #define DEFAULT_MAX_CLIENTS 281
474 > #define DENY 282
475 > #define DESCRIPTION 283
476 > #define DIE 284
477 > #define DISABLE_AUTH 285
478 > #define DISABLE_FAKE_CHANNELS 286
479 > #define DISABLE_REMOTE_COMMANDS 287
480 > #define DLINE_MIN_CIDR 288
481 > #define DLINE_MIN_CIDR6 289
482 > #define DOTS_IN_IDENT 290
483 > #define EMAIL 291
484 > #define ENCRYPTED 292
485 > #define EXCEED_LIMIT 293
486 > #define EXEMPT 294
487 > #define FAILED_OPER_NOTICE 295
488 > #define FLATTEN_LINKS 296
489 > #define GECOS 297
490 > #define GENERAL 298
491 > #define HIDDEN 299
492 > #define HIDDEN_NAME 300
493 > #define HIDE_CHANS 301
494 > #define HIDE_IDLE 302
495 > #define HIDE_IDLE_FROM_OPERS 303
496 > #define HIDE_SERVER_IPS 304
497 > #define HIDE_SERVERS 305
498 > #define HIDE_SERVICES 306
499 > #define HOST 307
500 > #define HUB 308
501 > #define HUB_MASK 309
502 > #define IGNORE_BOGUS_TS 310
503 > #define INVISIBLE_ON_CONNECT 311
504 > #define INVITE_CLIENT_COUNT 312
505 > #define INVITE_CLIENT_TIME 313
506 > #define IP 314
507 > #define IRCD_AUTH 315
508 > #define IRCD_FLAGS 316
509 > #define IRCD_SID 317
510 > #define KILL 318
511 > #define KILL_CHASE_TIME_LIMIT 319
512 > #define KLINE 320
513 > #define KLINE_EXEMPT 321
514 > #define KLINE_MIN_CIDR 322
515 > #define KLINE_MIN_CIDR6 323
516 > #define KNOCK_CLIENT_COUNT 324
517 > #define KNOCK_CLIENT_TIME 325
518 > #define KNOCK_DELAY_CHANNEL 326
519 > #define LEAF_MASK 327
520 > #define LINKS_DELAY 328
521 > #define LISTEN 329
522 > #define MASK 330
523 > #define MAX_ACCEPT 331
524 > #define MAX_BANS 332
525 > #define MAX_CHANNELS 333
526 > #define MAX_GLOBAL 334
527 > #define MAX_IDENT 335
528 > #define MAX_IDLE 336
529 > #define MAX_LOCAL 337
530 > #define MAX_NICK_CHANGES 338
531 > #define MAX_NICK_LENGTH 339
532 > #define MAX_NICK_TIME 340
533 > #define MAX_NUMBER 341
534 > #define MAX_TARGETS 342
535 > #define MAX_TOPIC_LENGTH 343
536 > #define MAX_WATCH 344
537 > #define MIN_IDLE 345
538 > #define MIN_NONWILDCARD 346
539 > #define MIN_NONWILDCARD_SIMPLE 347
540 > #define MODULE 348
541 > #define MODULES 349
542 > #define MOTD 350
543 > #define NAME 351
544 > #define NEED_IDENT 352
545 > #define NEED_PASSWORD 353
546 > #define NETWORK_DESC 354
547 > #define NETWORK_NAME 355
548 > #define NICK 356
549 > #define NO_OPER_FLOOD 357
550 > #define NO_TILDE 358
551 > #define NUMBER 359
552 > #define NUMBER_PER_CIDR 360
553 > #define NUMBER_PER_IP 361
554 > #define OPER_ONLY_UMODES 362
555 > #define OPER_PASS_RESV 363
556 > #define OPER_UMODES 364
557 > #define OPERATOR 365
558 > #define OPERS_BYPASS_CALLERID 366
559 > #define PACE_WAIT 367
560 > #define PACE_WAIT_SIMPLE 368
561 > #define PASSWORD 369
562 > #define PATH 370
563 > #define PING_COOKIE 371
564 > #define PING_TIME 372
565 > #define PORT 373
566 > #define QSTRING 374
567 > #define RANDOM_IDLE 375
568 > #define REASON 376
569 > #define REDIRPORT 377
570 > #define REDIRSERV 378
571 > #define REHASH 379
572 > #define REMOTE 380
573 > #define REMOTEBAN 381
574 > #define RESV 382
575 > #define RESV_EXEMPT 383
576 > #define RSA_PRIVATE_KEY_FILE 384
577 > #define RSA_PUBLIC_KEY_FILE 385
578 > #define SECONDS 386
579 > #define MINUTES 387
580 > #define HOURS 388
581 > #define DAYS 389
582 > #define WEEKS 390
583 > #define MONTHS 391
584 > #define YEARS 392
585 > #define SEND_PASSWORD 393
586 > #define SENDQ 394
587 > #define SERVERHIDE 395
588 > #define SERVERINFO 396
589 > #define SHORT_MOTD 397
590 > #define SPOOF 398
591 > #define SPOOF_NOTICE 399
592 > #define SQUIT 400
593 > #define SSL_CERTIFICATE_FILE 401
594 > #define SSL_CERTIFICATE_FINGERPRINT 402
595 > #define SSL_CONNECTION_REQUIRED 403
596 > #define SSL_DH_ELLIPTIC_CURVE 404
597 > #define SSL_DH_PARAM_FILE 405
598 > #define SSL_MESSAGE_DIGEST_ALGORITHM 406
599 > #define STATS_E_DISABLED 407
600 > #define STATS_I_OPER_ONLY 408
601 > #define STATS_K_OPER_ONLY 409
602 > #define STATS_M_OPER_ONLY 410
603 > #define STATS_O_OPER_ONLY 411
604 > #define STATS_P_OPER_ONLY 412
605 > #define STATS_U_OPER_ONLY 413
606 > #define T_ALL 414
607 > #define T_BOTS 415
608 > #define T_CALLERID 416
609 > #define T_CCONN 417
610 > #define T_COMMAND 418
611 > #define T_CLUSTER 419
612 > #define T_DEAF 420
613 > #define T_DEBUG 421
614 > #define T_DLINE 422
615 > #define T_EXTERNAL 423
616 > #define T_FARCONNECT 424
617 > #define T_FILE 425
618 > #define T_FULL 426
619 > #define T_GLOBOPS 427
620 > #define T_INVISIBLE 428
621 > #define T_IPV4 429
622 > #define T_IPV6 430
623 > #define T_LOCOPS 431
624 > #define T_LOG 432
625 > #define T_NCHANGE 433
626 > #define T_NONONREG 434
627 > #define T_OPME 435
628 > #define T_PREPEND 436
629 > #define T_PSEUDO 437
630 > #define T_RECVQ 438
631 > #define T_REJ 439
632 > #define T_RESTART 440
633 > #define T_SERVER 441
634 > #define T_SERVICE 442
635 > #define T_SERVNOTICE 443
636 > #define T_SET 444
637 > #define T_SHARED 445
638 > #define T_SIZE 446
639 > #define T_SKILL 447
640 > #define T_SOFTCALLERID 448
641 > #define T_SPY 449
642 > #define T_SSL 450
643 > #define T_SSL_CIPHER_LIST 451
644 > #define T_TARGET 452
645 > #define T_UMODES 453
646 > #define T_UNAUTH 454
647 > #define T_UNDLINE 455
648 > #define T_UNLIMITED 456
649 > #define T_UNRESV 457
650 > #define T_UNXLINE 458
651 > #define T_WALLOP 459
652 > #define T_WALLOPS 460
653 > #define T_WEBIRC 461
654 > #define TBOOL 462
655 > #define THROTTLE_COUNT 463
656 > #define THROTTLE_TIME 464
657 > #define TKLINE_EXPIRE_NOTICES 465
658 > #define TMASKED 466
659 > #define TS_MAX_DELTA 467
660 > #define TS_WARN_DELTA 468
661 > #define TWODOTS 469
662 > #define TYPE 470
663 > #define UNKLINE 471
664 > #define USE_LOGGING 472
665 > #define USER 473
666 > #define VHOST 474
667 > #define VHOST6 475
668 > #define WARN_NO_CONNECT_BLOCK 476
669 > #define WHOIS 477
670 > #define XLINE 478
671 > #define XLINE_EXEMPT 479
672  
673 + /* Value type.  */
674   #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
733 typedef union YYSTYPE
734 {
675  
676 < /* Line 214 of yacc.c  */
677 < #line 132 "ircd_parser.y"
676 > union YYSTYPE
677 > {
678 > #line 153 "conf_parser.y" /* yacc.c:355  */
679  
680    int number;
681    char *string;
682  
683 + #line 684 "conf_parser.c" /* yacc.c:355  */
684 + };
685  
686 <
744 < /* Line 214 of yacc.c  */
745 < #line 746 "ircd_parser.c"
746 < } YYSTYPE;
686 > typedef union YYSTYPE YYSTYPE;
687   # define YYSTYPE_IS_TRIVIAL 1
748 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
688   # define YYSTYPE_IS_DECLARED 1
689   #endif
690  
691  
692 < /* Copy the second part of user declarations.  */
692 > extern YYSTYPE yylval;
693  
694 + int yyparse (void);
695 +
696 + #endif /* !YY_YY_CONF_PARSER_H_INCLUDED  */
697 +
698 + /* Copy the second part of user declarations.  */
699  
700 < /* Line 264 of yacc.c  */
757 < #line 758 "ircd_parser.c"
700 > #line 701 "conf_parser.c" /* yacc.c:358  */
701  
702   #ifdef short
703   # undef short
# Line 768 | Line 711 | typedef unsigned char yytype_uint8;
711  
712   #ifdef YYTYPE_INT8
713   typedef YYTYPE_INT8 yytype_int8;
771 #elif (defined __STDC__ || defined __C99__FUNC__ \
772     || defined __cplusplus || defined _MSC_VER)
773 typedef signed char yytype_int8;
714   #else
715 < typedef short int yytype_int8;
715 > typedef signed char yytype_int8;
716   #endif
717  
718   #ifdef YYTYPE_UINT16
# Line 792 | Line 732 | typedef short int yytype_int16;
732   #  define YYSIZE_T __SIZE_TYPE__
733   # elif defined size_t
734   #  define YYSIZE_T size_t
735 < # elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
796 <     || defined __cplusplus || defined _MSC_VER)
735 > # elif ! defined YYSIZE_T
736   #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
737   #  define YYSIZE_T size_t
738   # else
# Line 804 | Line 743 | typedef short int yytype_int16;
743   #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
744  
745   #ifndef YY_
746 < # if YYENABLE_NLS
746 > # if defined YYENABLE_NLS && YYENABLE_NLS
747   #  if ENABLE_NLS
748   #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
749 < #   define YY_(msgid) dgettext ("bison-runtime", msgid)
749 > #   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
750   #  endif
751   # endif
752   # ifndef YY_
753 < #  define YY_(msgid) msgid
753 > #  define YY_(Msgid) Msgid
754 > # endif
755 > #endif
756 >
757 > #ifndef YY_ATTRIBUTE
758 > # if (defined __GNUC__                                               \
759 >      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
760 >     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
761 > #  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
762 > # else
763 > #  define YY_ATTRIBUTE(Spec) /* empty */
764 > # endif
765 > #endif
766 >
767 > #ifndef YY_ATTRIBUTE_PURE
768 > # define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
769 > #endif
770 >
771 > #ifndef YY_ATTRIBUTE_UNUSED
772 > # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
773 > #endif
774 >
775 > #if !defined _Noreturn \
776 >     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
777 > # if defined _MSC_VER && 1200 <= _MSC_VER
778 > #  define _Noreturn __declspec (noreturn)
779 > # else
780 > #  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
781   # endif
782   #endif
783  
784   /* Suppress unused-variable warnings by "using" E.  */
785   #if ! defined lint || defined __GNUC__
786 < # define YYUSE(e) ((void) (e))
786 > # define YYUSE(E) ((void) (E))
787   #else
788 < # define YYUSE(e) /* empty */
788 > # define YYUSE(E) /* empty */
789   #endif
790  
791 < /* Identity function, used to suppress warnings about constant conditions.  */
792 < #ifndef lint
793 < # define YYID(n) (n)
794 < #else
795 < #if (defined __STDC__ || defined __C99__FUNC__ \
796 <     || defined __cplusplus || defined _MSC_VER)
797 < static int
798 < YYID (int yyi)
791 > #if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
792 > /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
793 > # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
794 >    _Pragma ("GCC diagnostic push") \
795 >    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
796 >    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
797 > # define YY_IGNORE_MAYBE_UNINITIALIZED_END \
798 >    _Pragma ("GCC diagnostic pop")
799   #else
800 < static int
835 < YYID (yyi)
836 <    int yyi;
800 > # define YY_INITIAL_VALUE(Value) Value
801   #endif
802 < {
803 <  return yyi;
804 < }
802 > #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
803 > # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
804 > # define YY_IGNORE_MAYBE_UNINITIALIZED_END
805 > #endif
806 > #ifndef YY_INITIAL_VALUE
807 > # define YY_INITIAL_VALUE(Value) /* Nothing. */
808   #endif
809  
810 +
811   #if ! defined yyoverflow || YYERROR_VERBOSE
812  
813   /* The parser invokes alloca or malloc; define the necessary symbols.  */
# Line 857 | Line 825 | YYID (yyi)
825   #    define alloca _alloca
826   #   else
827   #    define YYSTACK_ALLOC alloca
828 < #    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
861 <     || defined __cplusplus || defined _MSC_VER)
828 > #    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
829   #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
830 < #     ifndef _STDLIB_H
831 < #      define _STDLIB_H 1
830 >      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
831 > #     ifndef EXIT_SUCCESS
832 > #      define EXIT_SUCCESS 0
833   #     endif
834   #    endif
835   #   endif
# Line 869 | Line 837 | YYID (yyi)
837   # endif
838  
839   # ifdef YYSTACK_ALLOC
840 <   /* Pacify GCC's `empty if-body' warning.  */
841 < #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
840 >   /* Pacify GCC's 'empty if-body' warning.  */
841 > #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
842   #  ifndef YYSTACK_ALLOC_MAXIMUM
843      /* The OS might guarantee only one guard page at the bottom of the stack,
844         and a page size can be as small as 4096 bytes.  So we cannot safely
# Line 884 | Line 852 | YYID (yyi)
852   #  ifndef YYSTACK_ALLOC_MAXIMUM
853   #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
854   #  endif
855 < #  if (defined __cplusplus && ! defined _STDLIB_H \
855 > #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
856         && ! ((defined YYMALLOC || defined malloc) \
857 <             && (defined YYFREE || defined free)))
857 >             && (defined YYFREE || defined free)))
858   #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
859 < #   ifndef _STDLIB_H
860 < #    define _STDLIB_H 1
859 > #   ifndef EXIT_SUCCESS
860 > #    define EXIT_SUCCESS 0
861   #   endif
862   #  endif
863   #  ifndef YYMALLOC
864   #   define YYMALLOC malloc
865 < #   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
898 <     || defined __cplusplus || defined _MSC_VER)
865 > #   if ! defined malloc && ! defined EXIT_SUCCESS
866   void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
867   #   endif
868   #  endif
869   #  ifndef YYFREE
870   #   define YYFREE free
871 < #   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
905 <     || defined __cplusplus || defined _MSC_VER)
871 > #   if ! defined free && ! defined EXIT_SUCCESS
872   void free (void *); /* INFRINGES ON USER NAME SPACE */
873   #   endif
874   #  endif
# Line 912 | Line 878 | void free (void *); /* INFRINGES ON USER
878  
879   #if (! defined yyoverflow \
880       && (! defined __cplusplus \
881 <         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
881 >         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
882  
883   /* A type that is properly aligned for any stack member.  */
884   union yyalloc
# Line 930 | Line 896 | union yyalloc
896       ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
897        + YYSTACK_GAP_MAXIMUM)
898  
899 < /* Copy COUNT objects from FROM to TO.  The source and destination do
934 <   not overlap.  */
935 < # ifndef YYCOPY
936 < #  if defined __GNUC__ && 1 < __GNUC__
937 < #   define YYCOPY(To, From, Count) \
938 <      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
939 < #  else
940 < #   define YYCOPY(To, From, Count)              \
941 <      do                                        \
942 <        {                                       \
943 <          YYSIZE_T yyi;                         \
944 <          for (yyi = 0; yyi < (Count); yyi++)   \
945 <            (To)[yyi] = (From)[yyi];            \
946 <        }                                       \
947 <      while (YYID (0))
948 < #  endif
949 < # endif
899 > # define YYCOPY_NEEDED 1
900  
901   /* Relocate STACK from its old location to the new one.  The
902     local variables YYSIZE and YYSTACKSIZE give the old and new number of
903     elements in the stack, and YYPTR gives the new location of the
904     stack.  Advance YYPTR to a properly aligned location for the next
905     stack.  */
906 < # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
907 <    do                                                                  \
908 <      {                                                                 \
909 <        YYSIZE_T yynewbytes;                                            \
910 <        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
911 <        Stack = &yyptr->Stack_alloc;                                    \
912 <        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
913 <        yyptr += yynewbytes / sizeof (*yyptr);                          \
914 <      }                                                                 \
915 <    while (YYID (0))
906 > # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
907 >    do                                                                  \
908 >      {                                                                 \
909 >        YYSIZE_T yynewbytes;                                            \
910 >        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
911 >        Stack = &yyptr->Stack_alloc;                                    \
912 >        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
913 >        yyptr += yynewbytes / sizeof (*yyptr);                          \
914 >      }                                                                 \
915 >    while (0)
916  
917   #endif
918  
919 + #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
920 + /* Copy COUNT objects from SRC to DST.  The source and destination do
921 +   not overlap.  */
922 + # ifndef YYCOPY
923 + #  if defined __GNUC__ && 1 < __GNUC__
924 + #   define YYCOPY(Dst, Src, Count) \
925 +      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
926 + #  else
927 + #   define YYCOPY(Dst, Src, Count)              \
928 +      do                                        \
929 +        {                                       \
930 +          YYSIZE_T yyi;                         \
931 +          for (yyi = 0; yyi < (Count); yyi++)   \
932 +            (Dst)[yyi] = (Src)[yyi];            \
933 +        }                                       \
934 +      while (0)
935 + #  endif
936 + # endif
937 + #endif /* !YYCOPY_NEEDED */
938 +
939   /* YYFINAL -- State number of the termination state.  */
940   #define YYFINAL  2
941   /* YYLAST -- Last index in YYTABLE.  */
942 < #define YYLAST   1413
942 > #define YYLAST   1347
943  
944   /* YYNTOKENS -- Number of terminals.  */
945 < #define YYNTOKENS  267
945 > #define YYNTOKENS  231
946   /* YYNNTS -- Number of nonterminals.  */
947 < #define YYNNTS  346
947 > #define YYNNTS  292
948   /* YYNRULES -- Number of rules.  */
949 < #define YYNRULES  743
950 < /* YYNRULES -- Number of states.  */
951 < #define YYNSTATES  1494
949 > #define YYNRULES  656
950 > /* YYNSTATES -- Number of states.  */
951 > #define YYNSTATES  1293
952  
953 < /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
953 > /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
954 >   by yylex, with out-of-bounds checking.  */
955   #define YYUNDEFTOK  2
956 < #define YYMAXUTOK   516
956 > #define YYMAXUTOK   479
957  
958 < #define YYTRANSLATE(YYX)                                                \
958 > #define YYTRANSLATE(YYX)                                                \
959    ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
960  
961 < /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
962 < static const yytype_uint16 yytranslate[] =
961 > /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
962 >   as returned by yylex, without out-of-bounds checking.  */
963 > static const yytype_uint8 yytranslate[] =
964   {
965         0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
966         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
967         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
968         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
969 <       2,     2,     2,     2,   266,     2,     2,     2,     2,     2,
970 <       2,     2,     2,     2,     2,     2,     2,     2,     2,   262,
971 <       2,   265,     2,     2,     2,     2,     2,     2,     2,     2,
969 >       2,     2,     2,     2,   229,     2,     2,     2,     2,     2,
970 >       2,     2,     2,     2,     2,     2,     2,     2,   230,   225,
971 >       2,   228,     2,     2,     2,     2,     2,     2,     2,     2,
972         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
973         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
974         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
975         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
976         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
977 <       2,     2,     2,   264,     2,   263,     2,     2,     2,     2,
977 >       2,     2,     2,   227,     2,   226,     2,     2,     2,     2,
978         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
979         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
980         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
# Line 1037 | Line 1009 | static const yytype_uint16 yytranslate[]
1009       185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
1010       195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
1011       205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
1012 <     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
1041 <     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
1042 <     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
1043 <     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
1044 <     255,   256,   257,   258,   259,   260,   261
1012 >     215,   216,   217,   218,   219,   220,   221,   222,   223,   224
1013   };
1014  
1015   #if YYDEBUG
1016 < /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
1049 <   YYRHS.  */
1050 < static const yytype_uint16 yyprhs[] =
1051 < {
1052 <       0,     0,     3,     4,     7,     9,    11,    13,    15,    17,
1053 <      19,    21,    23,    25,    27,    29,    31,    33,    35,    37,
1054 <      39,    41,    43,    45,    47,    50,    53,    54,    56,    59,
1055 <      63,    67,    71,    75,    79,    80,    82,    85,    89,    93,
1056 <      97,   103,   106,   108,   110,   112,   115,   120,   125,   131,
1057 <     134,   136,   138,   140,   142,   144,   146,   148,   150,   152,
1058 <     154,   156,   158,   160,   163,   164,   170,   174,   176,   178,
1059 <     180,   185,   190,   195,   200,   205,   210,   215,   220,   225,
1060 <     230,   235,   241,   244,   246,   248,   250,   252,   255,   260,
1061 <     265,   270,   276,   279,   281,   283,   285,   287,   289,   291,
1062 <     293,   295,   297,   299,   301,   303,   305,   308,   313,   318,
1063 <     323,   328,   333,   338,   343,   348,   353,   358,   363,   368,
1064 <     373,   378,   383,   388,   393,   398,   399,   407,   408,   410,
1065 <     413,   415,   417,   419,   421,   423,   425,   427,   429,   431,
1066 <     433,   435,   437,   439,   441,   443,   445,   447,   449,   451,
1067 <     453,   455,   457,   459,   462,   467,   469,   474,   479,   484,
1068 <     489,   494,   495,   501,   505,   507,   509,   511,   513,   515,
1069 <     517,   519,   521,   523,   525,   527,   529,   531,   533,   535,
1070 <     537,   539,   541,   543,   545,   550,   555,   560,   565,   570,
1071 <     575,   580,   585,   590,   595,   600,   605,   610,   615,   616,
1072 <     622,   626,   628,   629,   633,   634,   637,   639,   641,   643,
1073 <     645,   647,   649,   651,   653,   655,   657,   659,   661,   663,
1074 <     665,   667,   669,   670,   678,   679,   681,   684,   686,   688,
1075 <     690,   692,   694,   696,   698,   700,   702,   704,   706,   708,
1076 <     710,   712,   715,   720,   722,   727,   732,   737,   742,   747,
1077 <     752,   757,   762,   767,   772,   777,   782,   783,   790,   791,
1078 <     797,   801,   803,   805,   807,   809,   812,   814,   816,   818,
1079 <     820,   822,   825,   826,   832,   836,   838,   840,   844,   849,
1080 <     854,   855,   862,   865,   867,   869,   871,   873,   875,   877,
1081 <     879,   881,   883,   885,   887,   889,   891,   893,   895,   897,
1082 <     899,   902,   907,   912,   917,   922,   927,   928,   934,   938,
1083 <     940,   941,   945,   946,   949,   951,   953,   955,   957,   959,
1084 <     961,   963,   965,   967,   969,   974,   979,   984,   989,   994,
1085 <     999,  1004,  1009,  1014,  1019,  1020,  1027,  1030,  1032,  1034,
1086 <    1036,  1038,  1041,  1046,  1051,  1056,  1057,  1064,  1067,  1069,
1087 <    1071,  1073,  1075,  1078,  1083,  1088,  1089,  1095,  1099,  1101,
1088 <    1103,  1105,  1107,  1109,  1111,  1113,  1115,  1117,  1119,  1121,
1089 <    1123,  1124,  1131,  1134,  1136,  1138,  1140,  1143,  1148,  1149,
1090 <    1155,  1159,  1161,  1163,  1165,  1167,  1169,  1171,  1173,  1175,
1091 <    1177,  1179,  1181,  1183,  1184,  1192,  1193,  1195,  1198,  1200,
1092 <    1202,  1204,  1206,  1208,  1210,  1212,  1214,  1216,  1218,  1220,
1093 <    1222,  1224,  1226,  1228,  1230,  1232,  1234,  1236,  1238,  1241,
1094 <    1246,  1248,  1253,  1258,  1263,  1268,  1273,  1278,  1283,  1288,
1095 <    1289,  1295,  1299,  1301,  1302,  1306,  1307,  1310,  1312,  1314,
1096 <    1316,  1318,  1320,  1325,  1330,  1335,  1340,  1345,  1350,  1355,
1097 <    1360,  1365,  1370,  1371,  1378,  1379,  1385,  1389,  1391,  1393,
1098 <    1396,  1398,  1400,  1402,  1404,  1406,  1411,  1416,  1417,  1424,
1099 <    1427,  1429,  1431,  1433,  1435,  1440,  1445,  1451,  1454,  1456,
1100 <    1458,  1460,  1465,  1466,  1473,  1474,  1480,  1484,  1486,  1488,
1101 <    1491,  1493,  1495,  1497,  1499,  1501,  1506,  1511,  1517,  1520,
1102 <    1522,  1524,  1526,  1528,  1530,  1532,  1534,  1536,  1538,  1540,
1103 <    1542,  1544,  1546,  1548,  1550,  1552,  1554,  1556,  1558,  1560,
1104 <    1562,  1564,  1566,  1568,  1570,  1572,  1574,  1576,  1578,  1580,
1105 <    1582,  1584,  1586,  1588,  1590,  1592,  1594,  1596,  1598,  1600,
1106 <    1602,  1604,  1606,  1608,  1610,  1612,  1614,  1616,  1618,  1620,
1107 <    1622,  1624,  1626,  1628,  1630,  1632,  1634,  1636,  1641,  1646,
1108 <    1651,  1656,  1661,  1666,  1671,  1676,  1681,  1686,  1691,  1696,
1109 <    1701,  1706,  1711,  1716,  1721,  1726,  1731,  1736,  1741,  1746,
1110 <    1751,  1756,  1761,  1766,  1771,  1776,  1781,  1786,  1791,  1796,
1111 <    1801,  1806,  1811,  1816,  1821,  1826,  1831,  1836,  1841,  1846,
1112 <    1851,  1856,  1861,  1866,  1871,  1876,  1881,  1886,  1891,  1892,
1113 <    1898,  1902,  1904,  1906,  1908,  1910,  1912,  1914,  1916,  1918,
1114 <    1920,  1922,  1924,  1926,  1928,  1930,  1932,  1934,  1936,  1938,
1115 <    1940,  1942,  1943,  1949,  1953,  1955,  1957,  1959,  1961,  1963,
1116 <    1965,  1967,  1969,  1971,  1973,  1975,  1977,  1979,  1981,  1983,
1117 <    1985,  1987,  1989,  1991,  1993,  1998,  2003,  2008,  2013,  2018,
1118 <    2019,  2026,  2029,  2031,  2033,  2035,  2037,  2039,  2041,  2043,
1119 <    2045,  2050,  2055,  2056,  2062,  2066,  2068,  2070,  2072,  2077,
1120 <    2082,  2083,  2089,  2093,  2095,  2097,  2099,  2105,  2108,  2110,
1121 <    2112,  2114,  2116,  2118,  2120,  2122,  2124,  2126,  2128,  2130,
1122 <    2132,  2134,  2136,  2138,  2140,  2142,  2144,  2146,  2148,  2153,
1123 <    2158,  2163,  2168,  2173,  2178,  2183,  2188,  2193,  2198,  2203,
1124 <    2208,  2213,  2218,  2223,  2228,  2233,  2238,  2244,  2247,  2249,
1125 <    2251,  2253,  2255,  2257,  2259,  2261,  2263,  2265,  2270,  2275,
1126 <    2280,  2285,  2290,  2295
1127 < };
1128 <
1129 < /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
1130 < static const yytype_int16 yyrhs[] =
1131 < {
1132 <     268,     0,    -1,    -1,   268,   269,    -1,   297,    -1,   303,
1133 <      -1,   318,    -1,   582,    -1,   355,    -1,   374,    -1,   388,
1134 <      -1,   279,    -1,   603,    -1,   414,    -1,   421,    -1,   431,
1135 <      -1,   440,    -1,   471,    -1,   481,    -1,   487,    -1,   501,
1136 <      -1,   566,    -1,   491,    -1,   274,    -1,     1,   262,    -1,
1137 <       1,   263,    -1,    -1,   271,    -1,   133,   270,    -1,   133,
1138 <     175,   270,    -1,   133,   176,   270,    -1,   133,   177,   270,
1139 <      -1,   133,   178,   270,    -1,   133,   179,   270,    -1,    -1,
1140 <     273,    -1,   133,   272,    -1,   133,    14,   272,    -1,   133,
1141 <      15,   272,    -1,   133,    16,   272,    -1,   121,   264,   275,
1142 <     263,   262,    -1,   275,   276,    -1,   276,    -1,   277,    -1,
1143 <     278,    -1,     1,   262,    -1,   120,   265,   155,   262,    -1,
1144 <     150,   265,   155,   262,    -1,   183,   264,   280,   263,   262,
1145 <      -1,   280,   281,    -1,   281,    -1,   288,    -1,   293,    -1,
1146 <     296,    -1,   290,    -1,   291,    -1,   292,    -1,   295,    -1,
1147 <     287,    -1,   294,    -1,   289,    -1,   286,    -1,   282,    -1,
1148 <       1,   262,    -1,    -1,   170,   283,   265,   284,   262,    -1,
1149 <     284,   266,   285,    -1,   285,    -1,   171,    -1,   172,    -1,
1150 <     169,   265,   155,   262,    -1,   167,   265,   155,   262,    -1,
1151 <     122,   265,   155,   262,    -1,   185,   265,   155,   262,    -1,
1152 <      37,   265,   155,   262,    -1,   125,   265,   155,   262,    -1,
1153 <     124,   265,   155,   262,    -1,   257,   265,   155,   262,    -1,
1154 <     258,   265,   155,   262,    -1,   229,   265,   133,   262,    -1,
1155 <      86,   265,   199,   262,    -1,     5,   264,   298,   263,   262,
1156 <      -1,   298,   299,    -1,   299,    -1,   300,    -1,   302,    -1,
1157 <     301,    -1,     1,   262,    -1,   122,   265,   155,   262,    -1,
1158 <      48,   265,   155,   262,    -1,    37,   265,   155,   262,    -1,
1159 <     104,   264,   304,   263,   262,    -1,   304,   305,    -1,   305,
1160 <      -1,   306,    -1,   307,    -1,   316,    -1,   317,    -1,   308,
1161 <      -1,   310,    -1,   312,    -1,   313,    -1,   315,    -1,   311,
1162 <      -1,   314,    -1,   309,    -1,     1,   262,    -1,   221,   265,
1163 <     155,   262,    -1,   140,   265,   155,   262,    -1,    64,   265,
1164 <     155,   262,    -1,    57,   265,   155,   262,    -1,    62,   265,
1165 <     155,   262,    -1,    63,   265,   155,   262,    -1,    60,   265,
1166 <     155,   262,    -1,    59,   265,   155,   262,    -1,    61,   265,
1167 <     155,   262,    -1,    58,   265,   155,   262,    -1,   105,   265,
1168 <     222,   262,    -1,   105,   265,   224,   262,    -1,   105,   265,
1169 <     228,   262,    -1,   105,   265,   226,   262,    -1,   105,   265,
1170 <     227,   262,    -1,   105,   265,   225,   262,    -1,   105,   265,
1171 <     223,   262,    -1,   255,   265,   199,   262,    -1,    -1,   138,
1172 <     319,   320,   264,   321,   263,   262,    -1,    -1,   324,    -1,
1173 <     321,   322,    -1,   322,    -1,   323,    -1,   325,    -1,   326,
1174 <      -1,   345,    -1,   346,    -1,   330,    -1,   329,    -1,   334,
1175 <      -1,   335,    -1,   337,    -1,   338,    -1,   339,    -1,   340,
1176 <      -1,   341,    -1,   336,    -1,   342,    -1,   343,    -1,   344,
1177 <      -1,   347,    -1,   327,    -1,   328,    -1,   348,    -1,     1,
1178 <     262,    -1,   122,   265,   155,   262,    -1,   155,    -1,   250,
1179 <     265,   155,   262,    -1,   149,   265,   155,   262,    -1,    50,
1180 <     265,   199,   262,    -1,   168,   265,   155,   262,    -1,    26,
1181 <     265,   155,   262,    -1,    -1,   238,   331,   265,   332,   262,
1182 <      -1,   332,   266,   333,    -1,   333,    -1,   206,    -1,   209,
1183 <      -1,   210,    -1,   212,    -1,   213,    -1,   216,    -1,   235,
1184 <      -1,   230,    -1,   232,    -1,   239,    -1,   236,    -1,   215,
1185 <      -1,   231,    -1,   234,    -1,   217,    -1,   242,    -1,   207,
1186 <      -1,   208,    -1,   220,    -1,    74,   265,   199,   262,    -1,
1187 <     163,   265,   199,   262,    -1,   164,   265,   199,   262,    -1,
1188 <      94,   265,   199,   262,    -1,   259,   265,   199,   262,    -1,
1189 <     249,   265,   199,   262,    -1,    67,   265,   199,   262,    -1,
1190 <     127,   265,   199,   262,    -1,    38,   265,   199,   262,    -1,
1191 <     161,   265,   199,   262,    -1,     5,   265,   199,   262,    -1,
1192 <      79,   265,   199,   262,    -1,    81,   265,   199,   262,    -1,
1193 <     231,   265,   199,   262,    -1,    -1,    55,   349,   265,   350,
1194 <     262,    -1,   350,   266,   351,    -1,   351,    -1,    -1,   132,
1195 <     352,   354,    -1,    -1,   353,   354,    -1,    74,    -1,   163,
1196 <      -1,    94,    -1,   249,    -1,   259,    -1,    67,    -1,    38,
1197 <      -1,   161,    -1,     5,    -1,    79,    -1,   127,    -1,   231,
1198 <      -1,   143,    -1,    81,    -1,   164,    -1,    50,    -1,    -1,
1199 <      26,   356,   357,   264,   358,   263,   262,    -1,    -1,   361,
1200 <      -1,   358,   359,    -1,   359,    -1,   360,    -1,   371,    -1,
1201 <     372,    -1,   362,    -1,   363,    -1,   373,    -1,   364,    -1,
1202 <     365,    -1,   366,    -1,   367,    -1,   368,    -1,   369,    -1,
1203 <     370,    -1,     1,   262,    -1,   122,   265,   155,   262,    -1,
1204 <     155,    -1,   152,   265,   271,   262,    -1,   153,   265,   271,
1205 <     262,    -1,   136,   265,   133,   262,    -1,    30,   265,   271,
1206 <     262,    -1,   114,   265,   133,   262,    -1,   109,   265,   133,
1207 <     262,    -1,   111,   265,   133,   262,    -1,   110,   265,   133,
1208 <     262,    -1,   180,   265,   273,   262,    -1,    23,   265,   133,
1209 <     262,    -1,    24,   265,   133,   262,    -1,   135,   265,   133,
1210 <     262,    -1,    -1,   102,   375,   264,   380,   263,   262,    -1,
1211 <      -1,    55,   377,   265,   378,   262,    -1,   378,   266,   379,
1212 <      -1,   379,    -1,   237,    -1,    78,    -1,   233,    -1,   380,
1213 <     381,    -1,   381,    -1,   382,    -1,   376,    -1,   386,    -1,
1214 <     387,    -1,     1,   262,    -1,    -1,   154,   265,   384,   383,
1215 <     262,    -1,   384,   266,   385,    -1,   385,    -1,   133,    -1,
1216 <     133,   204,   133,    -1,    91,   265,   155,   262,    -1,    85,
1217 <     265,   155,   262,    -1,    -1,    75,   389,   264,   390,   263,
1218 <     262,    -1,   390,   391,    -1,   391,    -1,   392,    -1,   393,
1219 <      -1,   395,    -1,   397,    -1,   404,    -1,   405,    -1,   406,
1220 <      -1,   408,    -1,   409,    -1,   410,    -1,   394,    -1,   411,
1221 <      -1,   412,    -1,   407,    -1,   413,    -1,   396,    -1,     1,
1222 <     262,    -1,   250,   265,   155,   262,    -1,   149,   265,   155,
1223 <     262,    -1,   193,   265,   199,   262,    -1,    26,   265,   155,
1224 <     262,    -1,    50,   265,   199,   262,    -1,    -1,    55,   398,
1225 <     265,   399,   262,    -1,   399,   266,   400,    -1,   400,    -1,
1226 <      -1,   132,   401,   403,    -1,    -1,   402,   403,    -1,   193,
1227 <      -1,    51,    -1,    95,    -1,    76,    -1,    20,    -1,    21,
1228 <      -1,   131,    -1,    69,    -1,   174,    -1,   123,    -1,    95,
1229 <     265,   199,   262,    -1,    76,   265,   199,   262,    -1,    51,
1230 <     265,   199,   262,    -1,    20,   265,   199,   262,    -1,   131,
1231 <     265,   199,   262,    -1,    69,   265,   199,   262,    -1,   192,
1232 <     265,   155,   262,    -1,   159,   265,   155,   262,    -1,   158,
1233 <     265,   133,   262,    -1,   123,   265,   199,   262,    -1,    -1,
1234 <     173,   415,   264,   416,   263,   262,    -1,   416,   417,    -1,
1235 <     417,    -1,   418,    -1,   419,    -1,   420,    -1,     1,   262,
1236 <      -1,   157,   265,   155,   262,    -1,    22,   265,   155,   262,
1237 <      -1,   126,   265,   155,   262,    -1,    -1,   187,   422,   264,
1238 <     423,   263,   262,    -1,   423,   424,    -1,   424,    -1,   425,
1239 <      -1,   426,    -1,   427,    -1,     1,   262,    -1,   122,   265,
1240 <     155,   262,    -1,   250,   265,   155,   262,    -1,    -1,   189,
1241 <     428,   265,   429,   262,    -1,   429,   266,   430,    -1,   430,
1242 <      -1,    94,    -1,   246,    -1,   249,    -1,   259,    -1,   247,
1243 <      -1,   241,    -1,   173,    -1,   248,    -1,   240,    -1,   220,
1244 <      -1,   205,    -1,    -1,   188,   432,   264,   433,   263,   262,
1245 <      -1,   433,   434,    -1,   434,    -1,   435,    -1,   436,    -1,
1246 <       1,   262,    -1,   122,   265,   155,   262,    -1,    -1,   189,
1247 <     437,   265,   438,   262,    -1,   438,   266,   439,    -1,   439,
1248 <      -1,    94,    -1,   246,    -1,   249,    -1,   259,    -1,   247,
1249 <      -1,   241,    -1,   173,    -1,   248,    -1,   240,    -1,   220,
1250 <      -1,   205,    -1,    -1,    29,   441,   442,   264,   443,   263,
1251 <     262,    -1,    -1,   446,    -1,   443,   444,    -1,   444,    -1,
1252 <     445,    -1,   447,    -1,   448,    -1,   449,    -1,   450,    -1,
1253 <     452,    -1,   451,    -1,   453,    -1,   454,    -1,   467,    -1,
1254 <     468,    -1,   469,    -1,   465,    -1,   462,    -1,   464,    -1,
1255 <     463,    -1,   461,    -1,   470,    -1,   466,    -1,     1,   262,
1256 <      -1,   122,   265,   155,   262,    -1,   155,    -1,    85,   265,
1257 <     155,   262,    -1,   257,   265,   155,   262,    -1,   181,   265,
1258 <     155,   262,    -1,     3,   265,   155,   262,    -1,   154,   265,
1259 <     133,   262,    -1,     6,   265,   218,   262,    -1,     6,   265,
1260 <     219,   262,    -1,    54,   265,   155,   262,    -1,    -1,    55,
1261 <     455,   265,   456,   262,    -1,   456,   266,   457,    -1,   457,
1262 <      -1,    -1,   132,   458,   460,    -1,    -1,   459,   460,    -1,
1263 <      27,    -1,    31,    -1,    10,    -1,    12,    -1,   244,    -1,
1264 <     168,   265,   155,   262,    -1,    50,   265,   199,   262,    -1,
1265 <      31,   265,   199,   262,    -1,    27,   265,   199,   262,    -1,
1266 <      10,   265,   199,   262,    -1,   244,   265,   199,   262,    -1,
1267 <      87,   265,   155,   262,    -1,   100,   265,   155,   262,    -1,
1268 <      26,   265,   155,   262,    -1,    25,   265,   155,   262,    -1,
1269 <      -1,    92,   472,   264,   477,   263,   262,    -1,    -1,   189,
1270 <     474,   265,   475,   262,    -1,   475,   266,   476,    -1,   476,
1271 <      -1,   160,    -1,   477,   478,    -1,   478,    -1,   479,    -1,
1272 <     480,    -1,   473,    -1,     1,    -1,   250,   265,   155,   262,
1273 <      -1,   157,   265,   155,   262,    -1,    -1,    36,   482,   264,
1274 <     483,   263,   262,    -1,   483,   484,    -1,   484,    -1,   485,
1275 <      -1,   486,    -1,     1,    -1,    91,   265,   155,   262,    -1,
1276 <     157,   265,   155,   262,    -1,    52,   264,   488,   263,   262,
1277 <      -1,   488,   489,    -1,   489,    -1,   490,    -1,     1,    -1,
1278 <      91,   265,   155,   262,    -1,    -1,    65,   492,   264,   497,
1279 <     263,   262,    -1,    -1,   189,   494,   265,   495,   262,    -1,
1280 <     495,   266,   496,    -1,   496,    -1,   160,    -1,   497,   498,
1281 <      -1,   498,    -1,   499,    -1,   500,    -1,   493,    -1,     1,
1282 <      -1,   122,   265,   155,   262,    -1,   157,   265,   155,   262,
1283 <      -1,    66,   264,   502,   263,   262,    -1,   502,   503,    -1,
1284 <     503,    -1,   512,    -1,   513,    -1,   515,    -1,   516,    -1,
1285 <     517,    -1,   518,    -1,   519,    -1,   520,    -1,   521,    -1,
1286 <     522,    -1,   511,    -1,   524,    -1,   525,    -1,   526,    -1,
1287 <     527,    -1,   543,    -1,   529,    -1,   531,    -1,   533,    -1,
1288 <     532,    -1,   536,    -1,   530,    -1,   537,    -1,   538,    -1,
1289 <     539,    -1,   540,    -1,   542,    -1,   541,    -1,   557,    -1,
1290 <     544,    -1,   548,    -1,   549,    -1,   553,    -1,   534,    -1,
1291 <     535,    -1,   563,    -1,   561,    -1,   562,    -1,   545,    -1,
1292 <     514,    -1,   546,    -1,   547,    -1,   564,    -1,   552,    -1,
1293 <     523,    -1,   565,    -1,   550,    -1,   551,    -1,   507,    -1,
1294 <     510,    -1,   505,    -1,   506,    -1,   508,    -1,   509,    -1,
1295 <     528,    -1,   504,    -1,     1,    -1,   116,   265,   133,   262,
1296 <      -1,    72,   265,   133,   262,    -1,    73,   265,   133,   262,
1297 <      -1,    12,   265,   199,   262,    -1,   256,   265,   199,   262,
1298 <      -1,   162,   265,   271,   262,    -1,   186,   265,   199,   262,
1299 <      -1,    93,   265,   133,   262,    -1,    84,   265,   199,   262,
1300 <      -1,    89,   265,   199,   262,    -1,    43,   265,   199,   262,
1301 <      -1,    53,   265,   199,   262,    -1,     8,   265,   199,   262,
1302 <      -1,   113,   265,   271,   262,    -1,   112,   265,   133,   262,
1303 <      -1,   106,   265,   133,   262,    -1,     9,   265,   271,   262,
1304 <      -1,   203,   265,   271,   262,    -1,   202,   265,   271,   262,
1305 <      -1,    77,   265,   133,   262,    -1,    97,   265,   199,   262,
1306 <      -1,    96,   265,   155,   262,    -1,    90,   265,   199,   262,
1307 <      -1,   261,   265,   199,   262,    -1,   194,   265,   199,   262,
1308 <      -1,   197,   265,   199,   262,    -1,   198,   265,   199,   262,
1309 <      -1,   196,   265,   199,   262,    -1,   196,   265,   200,   262,
1310 <      -1,   195,   265,   199,   262,    -1,   195,   265,   200,   262,
1311 <      -1,   147,   265,   271,   262,    -1,    19,   265,   271,   262,
1312 <      -1,   139,   265,   199,   262,    -1,   148,   265,   271,   262,
1313 <      -1,   190,   265,   199,   262,    -1,   130,   265,   199,   262,
1314 <      -1,   245,   265,   199,   262,    -1,   142,   265,   199,   262,
1315 <      -1,   117,   265,   155,   262,    -1,    88,   265,   271,   262,
1316 <      -1,    45,   265,   133,   262,    -1,   115,   265,   133,   262,
1317 <      -1,   184,   265,   155,   262,    -1,    32,   265,   155,   262,
1318 <      -1,    28,   265,   133,   262,    -1,   251,   265,   199,   262,
1319 <      -1,    47,   265,   155,   262,    -1,   151,   265,   199,   262,
1320 <      -1,    39,   265,   199,   262,    -1,   243,   265,   271,   262,
1321 <      -1,    -1,   144,   554,   265,   555,   262,    -1,   555,   266,
1322 <     556,    -1,   556,    -1,   206,    -1,   209,    -1,   210,    -1,
1323 <     212,    -1,   213,    -1,   216,    -1,   235,    -1,   230,    -1,
1324 <     232,    -1,   239,    -1,   236,    -1,   215,    -1,   231,    -1,
1325 <     234,    -1,   217,    -1,   242,    -1,   207,    -1,   208,    -1,
1326 <     220,    -1,    -1,   141,   558,   265,   559,   262,    -1,   559,
1327 <     266,   560,    -1,   560,    -1,   206,    -1,   209,    -1,   210,
1328 <      -1,   212,    -1,   213,    -1,   216,    -1,   235,    -1,   230,
1329 <      -1,   232,    -1,   239,    -1,   236,    -1,   215,    -1,   231,
1330 <      -1,   234,    -1,   217,    -1,   242,    -1,   207,    -1,   208,
1331 <      -1,   220,    -1,   118,   265,   133,   262,    -1,   119,   265,
1332 <     133,   262,    -1,    33,   265,   133,   262,    -1,   211,   265,
1333 <     273,   262,    -1,    44,   265,   199,   262,    -1,    -1,    68,
1334 <     567,   264,   568,   263,   262,    -1,   568,   569,    -1,   569,
1335 <      -1,   570,    -1,   571,    -1,   572,    -1,   576,    -1,   577,
1336 <      -1,   578,    -1,     1,    -1,    49,   265,   199,   262,    -1,
1337 <      46,   265,   271,   262,    -1,    -1,   104,   573,   265,   574,
1338 <     262,    -1,   574,   266,   575,    -1,   575,    -1,   201,    -1,
1339 <      11,    -1,   250,   265,   155,   262,    -1,   122,   265,   155,
1340 <     262,    -1,    -1,     4,   579,   265,   580,   262,    -1,   580,
1341 <     266,   581,    -1,   581,    -1,   201,    -1,    11,    -1,    22,
1342 <     264,   583,   263,   262,    -1,   583,   584,    -1,   584,    -1,
1343 <     587,    -1,   588,    -1,   589,    -1,   590,    -1,   595,    -1,
1344 <     591,    -1,   592,    -1,   593,    -1,   594,    -1,   596,    -1,
1345 <     597,    -1,   598,    -1,   586,    -1,   599,    -1,   600,    -1,
1346 <     601,    -1,   602,    -1,   585,    -1,     1,    -1,    40,   265,
1347 <     199,   262,    -1,   165,   265,   199,   262,    -1,    42,   265,
1348 <     199,   262,    -1,   252,   265,   199,   262,    -1,   253,   265,
1349 <     199,   262,    -1,   254,   265,   199,   262,    -1,    98,   265,
1350 <     271,   262,    -1,    99,   265,   271,   262,    -1,   108,   265,
1351 <     133,   262,    -1,   156,   265,   199,   262,    -1,   107,   265,
1352 <     133,   262,    -1,    35,   265,   133,   262,    -1,    34,   265,
1353 <     133,   262,    -1,   128,   265,   199,   262,    -1,   129,   265,
1354 <     199,   262,    -1,    13,   265,   199,   262,    -1,   145,   265,
1355 <     133,   262,    -1,   146,   265,   271,   262,    -1,   182,   264,
1356 <     604,   263,   262,    -1,   604,   605,    -1,   605,    -1,   606,
1357 <      -1,   607,    -1,   609,    -1,   611,    -1,   610,    -1,   608,
1358 <      -1,   612,    -1,     1,    -1,    56,   265,   199,   262,    -1,
1359 <      83,   265,   199,   262,    -1,    80,   265,   155,   262,    -1,
1360 <     101,   265,   271,   262,    -1,    78,   265,   199,   262,    -1,
1361 <      41,   265,   199,   262,    -1,    82,   265,   199,   262,    -1
1362 < };
1363 <
1364 < /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
1016 >  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
1017   static const yytype_uint16 yyrline[] =
1018   {
1019 <       0,   397,   397,   398,   401,   402,   403,   404,   405,   406,
1020 <     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
1021 <     417,   418,   419,   420,   421,   422,   426,   426,   427,   431,
1022 <     435,   439,   443,   447,   453,   453,   454,   455,   456,   457,
1023 <     464,   467,   467,   468,   468,   468,   470,   478,   487,   489,
1024 <     489,   490,   490,   491,   491,   492,   492,   493,   494,   494,
1025 <     495,   495,   496,   497,   501,   500,   519,   519,   520,   526,
1026 <     534,   568,   628,   642,   657,   666,   680,   689,   717,   747,
1027 <     770,   792,   794,   794,   795,   795,   796,   796,   798,   807,
1028 <     816,   829,   831,   832,   834,   834,   835,   836,   836,   837,
1029 <     837,   838,   838,   839,   839,   840,   841,   843,   847,   851,
1030 <     858,   865,   872,   879,   886,   893,   900,   907,   911,   915,
1031 <     919,   923,   927,   931,   937,   947,   946,  1040,  1040,  1041,
1032 <    1041,  1042,  1042,  1042,  1042,  1043,  1043,  1044,  1044,  1044,
1033 <    1045,  1045,  1045,  1046,  1046,  1046,  1047,  1047,  1047,  1047,
1034 <    1048,  1048,  1049,  1049,  1051,  1063,  1075,  1109,  1121,  1132,
1035 <    1174,  1184,  1183,  1189,  1189,  1190,  1194,  1198,  1202,  1206,
1036 <    1210,  1214,  1218,  1222,  1226,  1230,  1234,  1238,  1242,  1246,
1037 <    1250,  1254,  1258,  1262,  1268,  1279,  1290,  1301,  1312,  1323,
1038 <    1334,  1345,  1356,  1367,  1378,  1389,  1400,  1411,  1423,  1422,
1039 <    1426,  1426,  1427,  1427,  1428,  1428,  1430,  1437,  1444,  1451,
1040 <    1458,  1465,  1472,  1479,  1486,  1493,  1500,  1507,  1514,  1521,
1041 <    1528,  1535,  1549,  1548,  1598,  1598,  1600,  1600,  1601,  1602,
1042 <    1602,  1603,  1604,  1605,  1606,  1607,  1608,  1609,  1610,  1611,
1043 <    1612,  1613,  1615,  1624,  1633,  1639,  1645,  1651,  1657,  1663,
1044 <    1669,  1675,  1681,  1687,  1693,  1699,  1709,  1708,  1725,  1724,
1045 <    1729,  1729,  1730,  1734,  1738,  1746,  1746,  1747,  1747,  1747,
1046 <    1747,  1747,  1749,  1749,  1751,  1751,  1753,  1767,  1787,  1796,
1047 <    1809,  1808,  1877,  1877,  1878,  1878,  1878,  1878,  1879,  1879,
1048 <    1880,  1880,  1880,  1881,  1881,  1882,  1882,  1882,  1883,  1883,
1049 <    1883,  1885,  1922,  1935,  1946,  1955,  1967,  1966,  1970,  1970,
1050 <    1971,  1971,  1972,  1972,  1974,  1982,  1989,  1996,  2003,  2010,
1051 <    2017,  2024,  2031,  2038,  2047,  2058,  2069,  2080,  2091,  2102,
1052 <    2114,  2133,  2143,  2152,  2168,  2167,  2183,  2183,  2184,  2184,
1053 <    2184,  2184,  2186,  2195,  2210,  2224,  2223,  2239,  2239,  2240,
1054 <    2240,  2240,  2240,  2242,  2251,  2274,  2273,  2279,  2279,  2280,
1055 <    2284,  2288,  2292,  2296,  2300,  2304,  2308,  2312,  2316,  2320,
1056 <    2330,  2329,  2346,  2346,  2347,  2347,  2347,  2349,  2356,  2355,
1057 <    2361,  2361,  2362,  2366,  2370,  2374,  2378,  2382,  2386,  2390,
1058 <    2394,  2398,  2402,  2412,  2411,  2557,  2557,  2558,  2558,  2559,
1059 <    2559,  2559,  2560,  2560,  2561,  2561,  2562,  2562,  2562,  2563,
1060 <    2563,  2563,  2564,  2564,  2564,  2565,  2565,  2566,  2566,  2568,
1061 <    2580,  2592,  2601,  2627,  2645,  2663,  2669,  2673,  2681,  2691,
1062 <    2690,  2694,  2694,  2695,  2695,  2696,  2696,  2698,  2709,  2716,
1063 <    2723,  2730,  2740,  2781,  2792,  2803,  2818,  2829,  2840,  2853,
1064 <    2866,  2875,  2911,  2910,  2974,  2973,  2977,  2977,  2978,  2984,
1065 <    2984,  2985,  2985,  2985,  2985,  2987,  3006,  3016,  3015,  3038,
1066 <    3038,  3039,  3039,  3039,  3041,  3047,  3056,  3058,  3058,  3059,
1067 <    3059,  3061,  3080,  3079,  3127,  3126,  3130,  3130,  3131,  3137,
1068 <    3137,  3138,  3138,  3138,  3138,  3140,  3146,  3155,  3158,  3158,
1069 <    3159,  3159,  3160,  3160,  3161,  3161,  3162,  3162,  3163,  3163,
1070 <    3164,  3164,  3165,  3165,  3166,  3166,  3167,  3167,  3168,  3168,
1071 <    3169,  3169,  3170,  3170,  3171,  3171,  3172,  3172,  3173,  3173,
1072 <    3174,  3174,  3175,  3175,  3176,  3176,  3177,  3177,  3178,  3178,
1073 <    3179,  3180,  3180,  3181,  3181,  3182,  3182,  3183,  3183,  3184,
1074 <    3184,  3185,  3185,  3186,  3186,  3187,  3188,  3191,  3196,  3201,
1075 <    3206,  3211,  3216,  3221,  3226,  3231,  3236,  3241,  3246,  3251,
1076 <    3256,  3261,  3266,  3271,  3276,  3281,  3287,  3298,  3303,  3312,
1077 <    3317,  3322,  3327,  3332,  3337,  3340,  3345,  3348,  3353,  3358,
1078 <    3363,  3368,  3373,  3378,  3383,  3388,  3393,  3404,  3409,  3414,
1079 <    3419,  3428,  3460,  3478,  3483,  3492,  3497,  3502,  3508,  3507,
1080 <    3512,  3512,  3513,  3516,  3519,  3522,  3525,  3528,  3531,  3534,
1081 <    3537,  3540,  3543,  3546,  3549,  3552,  3555,  3558,  3561,  3564,
1082 <    3567,  3573,  3572,  3577,  3577,  3578,  3581,  3584,  3587,  3590,
1083 <    3593,  3596,  3599,  3602,  3605,  3608,  3611,  3614,  3617,  3620,
1084 <    3623,  3626,  3629,  3632,  3637,  3642,  3647,  3652,  3657,  3666,
1433 <    3665,  3689,  3689,  3690,  3691,  3692,  3693,  3694,  3695,  3696,
1434 <    3698,  3704,  3711,  3710,  3715,  3715,  3716,  3720,  3726,  3760,
1435 <    3770,  3769,  3819,  3819,  3820,  3824,  3833,  3836,  3836,  3837,
1436 <    3837,  3838,  3838,  3839,  3839,  3840,  3840,  3841,  3841,  3842,
1437 <    3843,  3843,  3844,  3844,  3845,  3845,  3846,  3846,  3848,  3853,
1438 <    3858,  3863,  3868,  3873,  3878,  3883,  3888,  3893,  3898,  3903,
1439 <    3908,  3913,  3918,  3923,  3928,  3933,  3941,  3944,  3944,  3945,
1440 <    3945,  3946,  3947,  3948,  3948,  3949,  3950,  3952,  3958,  3964,
1441 <    3973,  3987,  3993,  3999
1019 >       0,   381,   381,   382,   385,   386,   387,   388,   389,   390,
1020 >     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
1021 >     401,   402,   403,   404,   405,   406,   407,   408,   412,   412,
1022 >     413,   414,   415,   416,   417,   418,   419,   420,   423,   423,
1023 >     424,   425,   426,   427,   434,   437,   437,   438,   438,   438,
1024 >     440,   446,   453,   455,   455,   456,   457,   458,   459,   460,
1025 >     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
1026 >     471,   472,   473,   476,   516,   574,   603,   611,   625,   653,
1027 >     668,   683,   693,   707,   716,   744,   772,   797,   819,   841,
1028 >     850,   852,   852,   853,   854,   855,   856,   858,   867,   876,
1029 >     889,   888,   906,   906,   907,   907,   907,   909,   915,   925,
1030 >     924,   943,   943,   944,   944,   944,   944,   944,   946,   952,
1031 >     958,   964,   985,   986,   986,   988,   988,   989,   991,   998,
1032 >     998,  1011,  1012,  1014,  1014,  1015,  1015,  1017,  1025,  1028,
1033 >    1034,  1033,  1039,  1039,  1040,  1044,  1048,  1052,  1056,  1060,
1034 >    1064,  1068,  1079,  1078,  1167,  1167,  1168,  1169,  1170,  1171,
1035 >    1172,  1173,  1174,  1175,  1176,  1177,  1178,  1179,  1181,  1187,
1036 >    1193,  1199,  1205,  1216,  1222,  1228,  1239,  1246,  1245,  1251,
1037 >    1251,  1252,  1256,  1260,  1264,  1268,  1272,  1276,  1280,  1284,
1038 >    1288,  1292,  1296,  1300,  1304,  1308,  1312,  1316,  1320,  1324,
1039 >    1328,  1332,  1336,  1343,  1342,  1348,  1348,  1349,  1353,  1357,
1040 >    1361,  1365,  1369,  1373,  1377,  1381,  1385,  1389,  1393,  1397,
1041 >    1401,  1405,  1409,  1413,  1417,  1421,  1425,  1429,  1433,  1437,
1042 >    1448,  1447,  1504,  1504,  1505,  1506,  1507,  1508,  1509,  1510,
1043 >    1511,  1512,  1513,  1514,  1515,  1516,  1517,  1517,  1518,  1519,
1044 >    1520,  1521,  1523,  1529,  1535,  1541,  1547,  1553,  1559,  1565,
1045 >    1571,  1577,  1583,  1590,  1596,  1602,  1608,  1617,  1627,  1626,
1046 >    1632,  1632,  1633,  1637,  1648,  1647,  1654,  1653,  1658,  1658,
1047 >    1659,  1663,  1667,  1673,  1673,  1674,  1674,  1674,  1674,  1674,
1048 >    1676,  1676,  1678,  1678,  1680,  1693,  1710,  1716,  1726,  1725,
1049 >    1767,  1767,  1768,  1769,  1770,  1771,  1772,  1773,  1774,  1775,
1050 >    1776,  1778,  1784,  1790,  1796,  1808,  1807,  1813,  1813,  1814,
1051 >    1818,  1822,  1826,  1830,  1834,  1838,  1842,  1846,  1850,  1856,
1052 >    1870,  1879,  1893,  1892,  1907,  1907,  1908,  1908,  1908,  1908,
1053 >    1910,  1916,  1922,  1932,  1934,  1934,  1935,  1935,  1937,  1953,
1054 >    1952,  1977,  1977,  1978,  1978,  1978,  1978,  1980,  1986,  2006,
1055 >    2005,  2011,  2011,  2012,  2016,  2020,  2024,  2028,  2032,  2036,
1056 >    2040,  2044,  2048,  2058,  2057,  2078,  2078,  2079,  2079,  2079,
1057 >    2081,  2088,  2087,  2093,  2093,  2094,  2098,  2102,  2106,  2110,
1058 >    2114,  2118,  2122,  2126,  2130,  2140,  2139,  2211,  2211,  2212,
1059 >    2213,  2214,  2215,  2216,  2217,  2218,  2219,  2220,  2221,  2222,
1060 >    2223,  2224,  2225,  2226,  2228,  2234,  2240,  2246,  2259,  2272,
1061 >    2278,  2284,  2288,  2295,  2294,  2299,  2299,  2300,  2304,  2310,
1062 >    2321,  2327,  2333,  2339,  2355,  2354,  2380,  2380,  2381,  2381,
1063 >    2381,  2383,  2403,  2413,  2412,  2439,  2439,  2440,  2440,  2440,
1064 >    2442,  2448,  2457,  2459,  2459,  2460,  2460,  2462,  2480,  2479,
1065 >    2502,  2502,  2503,  2503,  2503,  2505,  2511,  2520,  2523,  2523,
1066 >    2524,  2525,  2526,  2527,  2528,  2529,  2530,  2531,  2532,  2533,
1067 >    2534,  2535,  2536,  2537,  2538,  2539,  2540,  2541,  2542,  2543,
1068 >    2544,  2545,  2546,  2547,  2548,  2549,  2550,  2551,  2552,  2553,
1069 >    2554,  2555,  2556,  2557,  2558,  2559,  2560,  2561,  2562,  2563,
1070 >    2564,  2565,  2566,  2567,  2568,  2569,  2570,  2573,  2578,  2583,
1071 >    2588,  2594,  2599,  2604,  2609,  2614,  2619,  2624,  2629,  2634,
1072 >    2639,  2644,  2649,  2654,  2659,  2664,  2670,  2675,  2680,  2685,
1073 >    2690,  2695,  2700,  2705,  2708,  2713,  2716,  2721,  2726,  2731,
1074 >    2736,  2741,  2746,  2751,  2756,  2761,  2766,  2771,  2776,  2781,
1075 >    2787,  2786,  2791,  2791,  2792,  2795,  2798,  2801,  2804,  2807,
1076 >    2810,  2813,  2816,  2819,  2822,  2825,  2828,  2831,  2834,  2837,
1077 >    2840,  2843,  2846,  2849,  2852,  2855,  2861,  2860,  2865,  2865,
1078 >    2866,  2869,  2872,  2875,  2878,  2881,  2884,  2887,  2890,  2893,
1079 >    2896,  2899,  2902,  2905,  2908,  2911,  2914,  2917,  2920,  2923,
1080 >    2928,  2933,  2938,  2947,  2950,  2950,  2951,  2952,  2953,  2954,
1081 >    2955,  2956,  2957,  2958,  2959,  2960,  2961,  2963,  2968,  2973,
1082 >    2978,  2983,  2988,  2993,  2998,  3003,  3008,  3016,  3019,  3019,
1083 >    3020,  3021,  3022,  3023,  3024,  3025,  3026,  3027,  3028,  3030,
1084 >    3036,  3042,  3048,  3054,  3063,  3078,  3084
1085   };
1086   #endif
1087  
1088 < #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
1088 > #if YYDEBUG || YYERROR_VERBOSE || 0
1089   /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
1090     First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
1091   static const char *const yytname[] =
1092   {
1093 <  "$end", "error", "$undefined", "ACCEPT_PASSWORD", "ACTION", "ADMIN",
1094 <  "AFTYPE", "T_ALLOW", "ANTI_NICK_FLOOD", "ANTI_SPAM_EXIT_MESSAGE_TIME",
1095 <  "AUTOCONN", "T_BLOCK", "BURST_AWAY", "BURST_TOPICWHO", "BYTES", "KBYTES",
1096 <  "MBYTES", "GBYTES", "TBYTES", "CALLER_ID_WAIT", "CAN_FLOOD", "CAN_IDLE",
1097 <  "CHANNEL", "CIDR_BITLEN_IPV4", "CIDR_BITLEN_IPV6", "CIPHER_PREFERENCE",
1098 <  "CLASS", "COMPRESSED", "COMPRESSION_LEVEL", "CONNECT", "CONNECTFREQ",
1099 <  "CRYPTLINK", "DEFAULT_CIPHER_PREFERENCE", "DEFAULT_FLOODCOUNT",
1100 <  "DEFAULT_SPLIT_SERVER_COUNT", "DEFAULT_SPLIT_USER_COUNT", "DENY",
1101 <  "DESCRIPTION", "DIE", "DISABLE_AUTH", "DISABLE_FAKE_CHANNELS",
1102 <  "DISABLE_HIDDEN", "DISABLE_LOCAL_CHANNELS", "DISABLE_REMOTE_COMMANDS",
1103 <  "DOT_IN_IP6_ADDR", "DOTS_IN_IDENT", "DURATION", "EGDPOOL_PATH", "EMAIL",
1104 <  "ENABLE", "ENCRYPTED", "EXCEED_LIMIT", "EXEMPT", "FAILED_OPER_NOTICE",
1105 <  "FAKENAME", "IRCD_FLAGS", "FLATTEN_LINKS", "FFAILED_OPERLOG", "FKILLLOG",
1106 <  "FKLINELOG", "FGLINELOG", "FIOERRLOG", "FOPERLOG", "FOPERSPYLOG",
1107 <  "FUSERLOG", "GECOS", "GENERAL", "GLINE", "GLINES", "GLINE_EXEMPT",
1108 <  "GLINE_LOG", "GLINE_TIME", "GLINE_MIN_CIDR", "GLINE_MIN_CIDR6",
1109 <  "GLOBAL_KILL", "IRCD_AUTH", "NEED_IDENT", "HAVENT_READ_CONF", "HIDDEN",
1110 <  "HIDDEN_ADMIN", "HIDDEN_NAME", "HIDDEN_OPER", "HIDE_SERVER_IPS",
1111 <  "HIDE_SERVERS", "HIDE_SPOOF_IPS", "HOST", "HUB", "HUB_MASK", "IDLETIME",
1112 <  "IGNORE_BOGUS_TS", "INVISIBLE_ON_CONNECT", "IP", "KILL",
1113 <  "KILL_CHASE_TIME_LIMIT", "KLINE", "KLINE_EXEMPT", "KLINE_REASON",
1114 <  "KLINE_WITH_REASON", "KNOCK_DELAY", "KNOCK_DELAY_CHANNEL", "LEAF_MASK",
1115 <  "LINKS_DELAY", "LISTEN", "T_LOG", "LOGGING", "LOG_LEVEL", "MAX_ACCEPT",
1116 <  "MAX_BANS", "MAX_CHANS_PER_USER", "MAX_GLOBAL", "MAX_IDENT", "MAX_LOCAL",
1117 <  "MAX_NICK_CHANGES", "MAX_NICK_TIME", "MAX_NUMBER", "MAX_TARGETS",
1118 <  "MAX_WATCH", "MESSAGE_LOCALE", "MIN_NONWILDCARD",
1119 <  "MIN_NONWILDCARD_SIMPLE", "MODULE", "MODULES", "NAME", "NEED_PASSWORD",
1120 <  "NETWORK_DESC", "NETWORK_NAME", "NICK", "NICK_CHANGES",
1121 <  "NO_CREATE_ON_SPLIT", "NO_JOIN_ON_SPLIT", "NO_OPER_FLOOD", "NO_TILDE",
1122 <  "NOT", "NUMBER", "NUMBER_PER_IDENT", "NUMBER_PER_CIDR", "NUMBER_PER_IP",
1123 <  "NUMBER_PER_IP_GLOBAL", "OPERATOR", "OPERS_BYPASS_CALLERID", "OPER_LOG",
1124 <  "OPER_ONLY_UMODES", "OPER_PASS_RESV", "OPER_SPY_T", "OPER_UMODES",
1125 <  "JOIN_FLOOD_COUNT", "JOIN_FLOOD_TIME", "PACE_WAIT", "PACE_WAIT_SIMPLE",
1126 <  "PASSWORD", "PATH", "PING_COOKIE", "PING_TIME", "PING_WARNING", "PORT",
1127 <  "QSTRING", "QUIET_ON_BAN", "REASON", "REDIRPORT", "REDIRSERV", "REGEX_T",
1128 <  "REHASH", "TREJECT_HOLD_TIME", "REMOTE", "REMOTEBAN",
1129 <  "RESTRICT_CHANNELS", "RESTRICTED", "RSA_PRIVATE_KEY_FILE",
1130 <  "RSA_PUBLIC_KEY_FILE", "SSL_CERTIFICATE_FILE", "T_SSL_CONNECTION_METHOD",
1131 <  "T_SSLV3", "T_TLSV1", "RESV", "RESV_EXEMPT", "SECONDS", "MINUTES",
1132 <  "HOURS", "DAYS", "WEEKS", "SENDQ", "SEND_PASSWORD", "SERVERHIDE",
1133 <  "SERVERINFO", "SERVLINK_PATH", "IRCD_SID", "TKLINE_EXPIRE_NOTICES",
1134 <  "T_SHARED", "T_CLUSTER", "TYPE", "SHORT_MOTD", "SILENT", "SPOOF",
1135 <  "SPOOF_NOTICE", "STATS_E_DISABLED", "STATS_I_OPER_ONLY",
1136 <  "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY", "TBOOL",
1137 <  "TMASKED", "T_REJECT", "TS_MAX_DELTA", "TS_WARN_DELTA", "TWODOTS",
1138 <  "T_ALL", "T_BOTS", "T_SOFTCALLERID", "T_CALLERID", "T_CCONN",
1139 <  "T_CCONN_FULL", "T_CLIENT_FLOOD", "T_DEAF", "T_DEBUG", "T_DRONE",
1140 <  "T_EXTERNAL", "T_FULL", "T_INVISIBLE", "T_IPV4", "T_IPV6", "T_LOCOPS",
1141 <  "T_LOGPATH", "T_L_CRIT", "T_L_DEBUG", "T_L_ERROR", "T_L_INFO",
1142 <  "T_L_NOTICE", "T_L_TRACE", "T_L_WARN", "T_MAX_CLIENTS", "T_NCHANGE",
1143 <  "T_OPERWALL", "T_REJ", "T_SERVER", "T_SERVNOTICE", "T_SKILL", "T_SPY",
1144 <  "T_SSL", "T_UMODES", "T_UNAUTH", "T_UNRESV", "T_UNXLINE", "T_WALLOP",
1145 <  "THROTTLE_TIME", "TOPICBURST", "TRUE_NO_OPER_FLOOD", "TKLINE", "TXLINE",
1146 <  "TRESV", "UNKLINE", "USER", "USE_EGD", "USE_EXCEPT", "USE_INVEX",
1147 <  "USE_KNOCK", "USE_LOGGING", "USE_WHOIS_ACTUALLY", "VHOST", "VHOST6",
1148 <  "XLINE", "WARN", "WARN_NO_NLINE", "';'", "'}'", "'{'", "'='", "','",
1506 <  "$accept", "conf", "conf_item", "timespec_", "timespec", "sizespec_",
1507 <  "sizespec", "modules_entry", "modules_items", "modules_item",
1508 <  "modules_module", "modules_path", "serverinfo_entry", "serverinfo_items",
1509 <  "serverinfo_item", "serverinfo_ssl_connection_method", "$@1",
1510 <  "method_types", "method_type_item", "serverinfo_ssl_certificate_file",
1511 <  "serverinfo_rsa_private_key_file", "serverinfo_name", "serverinfo_sid",
1093 >  "$end", "error", "$undefined", "ACCEPT_PASSWORD", "ADMIN", "AFTYPE",
1094 >  "ANTI_NICK_FLOOD", "ANTI_SPAM_EXIT_MESSAGE_TIME", "AUTOCONN",
1095 >  "AWAY_COUNT", "AWAY_TIME", "BYTES", "KBYTES", "MBYTES", "CALLER_ID_WAIT",
1096 >  "CAN_FLOOD", "CHANNEL", "CIDR_BITLEN_IPV4", "CIDR_BITLEN_IPV6", "CLASS",
1097 >  "CONNECT", "CONNECTFREQ", "CYCLE_ON_HOST_CHANGE", "DEFAULT_FLOODCOUNT",
1098 >  "DEFAULT_JOIN_FLOOD_COUNT", "DEFAULT_JOIN_FLOOD_TIME",
1099 >  "DEFAULT_MAX_CLIENTS", "DENY", "DESCRIPTION", "DIE", "DISABLE_AUTH",
1100 >  "DISABLE_FAKE_CHANNELS", "DISABLE_REMOTE_COMMANDS", "DLINE_MIN_CIDR",
1101 >  "DLINE_MIN_CIDR6", "DOTS_IN_IDENT", "EMAIL", "ENCRYPTED", "EXCEED_LIMIT",
1102 >  "EXEMPT", "FAILED_OPER_NOTICE", "FLATTEN_LINKS", "GECOS", "GENERAL",
1103 >  "HIDDEN", "HIDDEN_NAME", "HIDE_CHANS", "HIDE_IDLE",
1104 >  "HIDE_IDLE_FROM_OPERS", "HIDE_SERVER_IPS", "HIDE_SERVERS",
1105 >  "HIDE_SERVICES", "HOST", "HUB", "HUB_MASK", "IGNORE_BOGUS_TS",
1106 >  "INVISIBLE_ON_CONNECT", "INVITE_CLIENT_COUNT", "INVITE_CLIENT_TIME",
1107 >  "IP", "IRCD_AUTH", "IRCD_FLAGS", "IRCD_SID", "KILL",
1108 >  "KILL_CHASE_TIME_LIMIT", "KLINE", "KLINE_EXEMPT", "KLINE_MIN_CIDR",
1109 >  "KLINE_MIN_CIDR6", "KNOCK_CLIENT_COUNT", "KNOCK_CLIENT_TIME",
1110 >  "KNOCK_DELAY_CHANNEL", "LEAF_MASK", "LINKS_DELAY", "LISTEN", "MASK",
1111 >  "MAX_ACCEPT", "MAX_BANS", "MAX_CHANNELS", "MAX_GLOBAL", "MAX_IDENT",
1112 >  "MAX_IDLE", "MAX_LOCAL", "MAX_NICK_CHANGES", "MAX_NICK_LENGTH",
1113 >  "MAX_NICK_TIME", "MAX_NUMBER", "MAX_TARGETS", "MAX_TOPIC_LENGTH",
1114 >  "MAX_WATCH", "MIN_IDLE", "MIN_NONWILDCARD", "MIN_NONWILDCARD_SIMPLE",
1115 >  "MODULE", "MODULES", "MOTD", "NAME", "NEED_IDENT", "NEED_PASSWORD",
1116 >  "NETWORK_DESC", "NETWORK_NAME", "NICK", "NO_OPER_FLOOD", "NO_TILDE",
1117 >  "NUMBER", "NUMBER_PER_CIDR", "NUMBER_PER_IP", "OPER_ONLY_UMODES",
1118 >  "OPER_PASS_RESV", "OPER_UMODES", "OPERATOR", "OPERS_BYPASS_CALLERID",
1119 >  "PACE_WAIT", "PACE_WAIT_SIMPLE", "PASSWORD", "PATH", "PING_COOKIE",
1120 >  "PING_TIME", "PORT", "QSTRING", "RANDOM_IDLE", "REASON", "REDIRPORT",
1121 >  "REDIRSERV", "REHASH", "REMOTE", "REMOTEBAN", "RESV", "RESV_EXEMPT",
1122 >  "RSA_PRIVATE_KEY_FILE", "RSA_PUBLIC_KEY_FILE", "SECONDS", "MINUTES",
1123 >  "HOURS", "DAYS", "WEEKS", "MONTHS", "YEARS", "SEND_PASSWORD", "SENDQ",
1124 >  "SERVERHIDE", "SERVERINFO", "SHORT_MOTD", "SPOOF", "SPOOF_NOTICE",
1125 >  "SQUIT", "SSL_CERTIFICATE_FILE", "SSL_CERTIFICATE_FINGERPRINT",
1126 >  "SSL_CONNECTION_REQUIRED", "SSL_DH_ELLIPTIC_CURVE", "SSL_DH_PARAM_FILE",
1127 >  "SSL_MESSAGE_DIGEST_ALGORITHM", "STATS_E_DISABLED", "STATS_I_OPER_ONLY",
1128 >  "STATS_K_OPER_ONLY", "STATS_M_OPER_ONLY", "STATS_O_OPER_ONLY",
1129 >  "STATS_P_OPER_ONLY", "STATS_U_OPER_ONLY", "T_ALL", "T_BOTS",
1130 >  "T_CALLERID", "T_CCONN", "T_COMMAND", "T_CLUSTER", "T_DEAF", "T_DEBUG",
1131 >  "T_DLINE", "T_EXTERNAL", "T_FARCONNECT", "T_FILE", "T_FULL", "T_GLOBOPS",
1132 >  "T_INVISIBLE", "T_IPV4", "T_IPV6", "T_LOCOPS", "T_LOG", "T_NCHANGE",
1133 >  "T_NONONREG", "T_OPME", "T_PREPEND", "T_PSEUDO", "T_RECVQ", "T_REJ",
1134 >  "T_RESTART", "T_SERVER", "T_SERVICE", "T_SERVNOTICE", "T_SET",
1135 >  "T_SHARED", "T_SIZE", "T_SKILL", "T_SOFTCALLERID", "T_SPY", "T_SSL",
1136 >  "T_SSL_CIPHER_LIST", "T_TARGET", "T_UMODES", "T_UNAUTH", "T_UNDLINE",
1137 >  "T_UNLIMITED", "T_UNRESV", "T_UNXLINE", "T_WALLOP", "T_WALLOPS",
1138 >  "T_WEBIRC", "TBOOL", "THROTTLE_COUNT", "THROTTLE_TIME",
1139 >  "TKLINE_EXPIRE_NOTICES", "TMASKED", "TS_MAX_DELTA", "TS_WARN_DELTA",
1140 >  "TWODOTS", "TYPE", "UNKLINE", "USE_LOGGING", "USER", "VHOST", "VHOST6",
1141 >  "WARN_NO_CONNECT_BLOCK", "WHOIS", "XLINE", "XLINE_EXEMPT", "';'", "'}'",
1142 >  "'{'", "'='", "','", "':'", "$accept", "conf", "conf_item", "timespec_",
1143 >  "timespec", "sizespec_", "sizespec", "modules_entry", "modules_items",
1144 >  "modules_item", "modules_module", "modules_path", "serverinfo_entry",
1145 >  "serverinfo_items", "serverinfo_item", "serverinfo_ssl_certificate_file",
1146 >  "serverinfo_rsa_private_key_file", "serverinfo_ssl_dh_param_file",
1147 >  "serverinfo_ssl_cipher_list", "serverinfo_ssl_message_digest_algorithm",
1148 >  "serverinfo_ssl_dh_elliptic_curve", "serverinfo_name", "serverinfo_sid",
1149    "serverinfo_description", "serverinfo_network_name",
1150    "serverinfo_network_desc", "serverinfo_vhost", "serverinfo_vhost6",
1151 <  "serverinfo_max_clients", "serverinfo_hub", "admin_entry", "admin_items",
1152 <  "admin_item", "admin_name", "admin_email", "admin_description",
1153 <  "logging_entry", "logging_items", "logging_item", "logging_path",
1154 <  "logging_oper_log", "logging_fuserlog", "logging_ffailed_operlog",
1155 <  "logging_foperlog", "logging_foperspylog", "logging_fglinelog",
1156 <  "logging_fklinelog", "logging_ioerrlog", "logging_killlog",
1157 <  "logging_log_level", "logging_use_logging", "oper_entry", "$@2",
1158 <  "oper_name_b", "oper_items", "oper_item", "oper_name", "oper_name_t",
1159 <  "oper_user", "oper_password", "oper_encrypted",
1160 <  "oper_rsa_public_key_file", "oper_class", "oper_umodes", "$@3",
1161 <  "oper_umodes_items", "oper_umodes_item", "oper_global_kill",
1162 <  "oper_remote", "oper_remoteban", "oper_kline", "oper_xline",
1163 <  "oper_unkline", "oper_gline", "oper_nick_changes", "oper_die",
1164 <  "oper_rehash", "oper_admin", "oper_hidden_admin", "oper_hidden_oper",
1165 <  "oper_operwall", "oper_flags", "$@4", "oper_flags_items",
1166 <  "oper_flags_item", "$@5", "$@6", "oper_flags_item_atom", "class_entry",
1167 <  "$@7", "class_name_b", "class_items", "class_item", "class_name",
1168 <  "class_name_t", "class_ping_time", "class_ping_warning",
1169 <  "class_number_per_ip", "class_connectfreq", "class_max_number",
1151 >  "serverinfo_default_max_clients", "serverinfo_max_nick_length",
1152 >  "serverinfo_max_topic_length", "serverinfo_hub", "admin_entry",
1153 >  "admin_items", "admin_item", "admin_name", "admin_email",
1154 >  "admin_description", "motd_entry", "$@1", "motd_items", "motd_item",
1155 >  "motd_mask", "motd_file", "pseudo_entry", "$@2", "pseudo_items",
1156 >  "pseudo_item", "pseudo_command", "pseudo_name", "pseudo_prepend",
1157 >  "pseudo_target", "logging_entry", "logging_items", "logging_item",
1158 >  "logging_use_logging", "logging_file_entry", "$@3", "logging_file_items",
1159 >  "logging_file_item", "logging_file_name", "logging_file_size",
1160 >  "logging_file_type", "$@4", "logging_file_type_items",
1161 >  "logging_file_type_item", "oper_entry", "$@5", "oper_items", "oper_item",
1162 >  "oper_name", "oper_user", "oper_password", "oper_whois",
1163 >  "oper_encrypted", "oper_rsa_public_key_file",
1164 >  "oper_ssl_certificate_fingerprint", "oper_ssl_connection_required",
1165 >  "oper_class", "oper_umodes", "$@6", "oper_umodes_items",
1166 >  "oper_umodes_item", "oper_flags", "$@7", "oper_flags_items",
1167 >  "oper_flags_item", "class_entry", "$@8", "class_items", "class_item",
1168 >  "class_name", "class_ping_time", "class_number_per_ip",
1169 >  "class_connectfreq", "class_max_channels", "class_max_number",
1170    "class_max_global", "class_max_local", "class_max_ident", "class_sendq",
1171 <  "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6",
1172 <  "class_number_per_cidr", "listen_entry", "$@8", "listen_flags", "$@9",
1173 <  "listen_flags_items", "listen_flags_item", "listen_items", "listen_item",
1174 <  "listen_port", "$@10", "port_items", "port_item", "listen_address",
1175 <  "listen_host", "auth_entry", "$@11", "auth_items", "auth_item",
1176 <  "auth_user", "auth_passwd", "auth_spoof_notice", "auth_class",
1177 <  "auth_encrypted", "auth_flags", "$@12", "auth_flags_items",
1178 <  "auth_flags_item", "$@13", "$@14", "auth_flags_item_atom",
1179 <  "auth_kline_exempt", "auth_need_ident", "auth_exceed_limit",
1180 <  "auth_can_flood", "auth_no_tilde", "auth_gline_exempt", "auth_spoof",
1181 <  "auth_redir_serv", "auth_redir_port", "auth_need_password", "resv_entry",
1182 <  "$@15", "resv_items", "resv_item", "resv_creason", "resv_channel",
1183 <  "resv_nick", "shared_entry", "$@16", "shared_items", "shared_item",
1184 <  "shared_name", "shared_user", "shared_type", "$@17", "shared_types",
1185 <  "shared_type_item", "cluster_entry", "$@18", "cluster_items",
1186 <  "cluster_item", "cluster_name", "cluster_type", "$@19", "cluster_types",
1187 <  "cluster_type_item", "connect_entry", "$@20", "connect_name_b",
1551 <  "connect_items", "connect_item", "connect_name", "connect_name_t",
1171 >  "class_recvq", "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6",
1172 >  "class_number_per_cidr", "class_min_idle", "class_max_idle",
1173 >  "class_flags", "$@9", "class_flags_items", "class_flags_item",
1174 >  "listen_entry", "$@10", "listen_flags", "$@11", "listen_flags_items",
1175 >  "listen_flags_item", "listen_items", "listen_item", "listen_port",
1176 >  "$@12", "port_items", "port_item", "listen_address", "listen_host",
1177 >  "auth_entry", "$@13", "auth_items", "auth_item", "auth_user",
1178 >  "auth_passwd", "auth_class", "auth_encrypted", "auth_flags", "$@14",
1179 >  "auth_flags_items", "auth_flags_item", "auth_spoof", "auth_redir_serv",
1180 >  "auth_redir_port", "resv_entry", "$@15", "resv_items", "resv_item",
1181 >  "resv_mask", "resv_reason", "resv_exempt", "service_entry",
1182 >  "service_items", "service_item", "service_name", "shared_entry", "$@16",
1183 >  "shared_items", "shared_item", "shared_name", "shared_user",
1184 >  "shared_type", "$@17", "shared_types", "shared_type_item",
1185 >  "cluster_entry", "$@18", "cluster_items", "cluster_item", "cluster_name",
1186 >  "cluster_type", "$@19", "cluster_types", "cluster_type_item",
1187 >  "connect_entry", "$@20", "connect_items", "connect_item", "connect_name",
1188    "connect_host", "connect_vhost", "connect_send_password",
1189 <  "connect_accept_password", "connect_port", "connect_aftype",
1190 <  "connect_fakename", "connect_flags", "$@21", "connect_flags_items",
1191 <  "connect_flags_item", "$@22", "$@23", "connect_flags_item_atom",
1556 <  "connect_rsa_public_key_file", "connect_encrypted", "connect_cryptlink",
1557 <  "connect_compressed", "connect_auto", "connect_topicburst",
1189 >  "connect_accept_password", "connect_ssl_certificate_fingerprint",
1190 >  "connect_port", "connect_aftype", "connect_flags", "$@21",
1191 >  "connect_flags_items", "connect_flags_item", "connect_encrypted",
1192    "connect_hub_mask", "connect_leaf_mask", "connect_class",
1193 <  "connect_cipher_preference", "kill_entry", "$@24", "kill_type", "$@25",
1194 <  "kill_type_items", "kill_type_item", "kill_items", "kill_item",
1195 <  "kill_user", "kill_reason", "deny_entry", "$@26", "deny_items",
1196 <  "deny_item", "deny_ip", "deny_reason", "exempt_entry", "exempt_items",
1197 <  "exempt_item", "exempt_ip", "gecos_entry", "$@27", "gecos_flags", "$@28",
1198 <  "gecos_flags_items", "gecos_flags_item", "gecos_items", "gecos_item",
1199 <  "gecos_name", "gecos_reason", "general_entry", "general_items",
1200 <  "general_item", "general_max_watch", "general_gline_min_cidr",
1201 <  "general_gline_min_cidr6", "general_burst_away",
1568 <  "general_use_whois_actually", "general_reject_hold_time",
1193 >  "connect_ssl_cipher_list", "kill_entry", "$@22", "kill_items",
1194 >  "kill_item", "kill_user", "kill_reason", "deny_entry", "$@23",
1195 >  "deny_items", "deny_item", "deny_ip", "deny_reason", "exempt_entry",
1196 >  "exempt_items", "exempt_item", "exempt_ip", "gecos_entry", "$@24",
1197 >  "gecos_items", "gecos_item", "gecos_name", "gecos_reason",
1198 >  "general_entry", "general_items", "general_item", "general_away_count",
1199 >  "general_away_time", "general_max_watch", "general_cycle_on_host_change",
1200 >  "general_dline_min_cidr", "general_dline_min_cidr6",
1201 >  "general_kline_min_cidr", "general_kline_min_cidr6",
1202    "general_tkline_expire_notices", "general_kill_chase_time_limit",
1203 <  "general_hide_spoof_ips", "general_ignore_bogus_ts",
1571 <  "general_disable_remote_commands", "general_failed_oper_notice",
1203 >  "general_ignore_bogus_ts", "general_failed_oper_notice",
1204    "general_anti_nick_flood", "general_max_nick_time",
1205    "general_max_nick_changes", "general_max_accept",
1206    "general_anti_spam_exit_message_time", "general_ts_warn_delta",
1207 <  "general_ts_max_delta", "general_havent_read_conf",
1208 <  "general_kline_with_reason", "general_kline_reason",
1209 <  "general_invisible_on_connect", "general_warn_no_nline",
1210 <  "general_stats_e_disabled", "general_stats_o_oper_only",
1211 <  "general_stats_P_oper_only", "general_stats_k_oper_only",
1212 <  "general_stats_i_oper_only", "general_pace_wait",
1213 <  "general_caller_id_wait", "general_opers_bypass_callerid",
1214 <  "general_pace_wait_simple", "general_short_motd",
1215 <  "general_no_oper_flood", "general_true_no_oper_flood",
1216 <  "general_oper_pass_resv", "general_message_locale", "general_idletime",
1217 <  "general_dots_in_ident", "general_max_targets", "general_servlink_path",
1218 <  "general_default_cipher_preference", "general_compression_level",
1219 <  "general_use_egd", "general_egdpool_path", "general_ping_cookie",
1588 <  "general_disable_auth", "general_throttle_time", "general_oper_umodes",
1589 <  "$@29", "umode_oitems", "umode_oitem", "general_oper_only_umodes",
1590 <  "$@30", "umode_items", "umode_item", "general_min_nonwildcard",
1207 >  "general_ts_max_delta", "general_invisible_on_connect",
1208 >  "general_warn_no_connect_block", "general_stats_e_disabled",
1209 >  "general_stats_m_oper_only", "general_stats_o_oper_only",
1210 >  "general_stats_P_oper_only", "general_stats_u_oper_only",
1211 >  "general_stats_k_oper_only", "general_stats_i_oper_only",
1212 >  "general_pace_wait", "general_caller_id_wait",
1213 >  "general_opers_bypass_callerid", "general_pace_wait_simple",
1214 >  "general_short_motd", "general_no_oper_flood", "general_oper_pass_resv",
1215 >  "general_dots_in_ident", "general_max_targets", "general_ping_cookie",
1216 >  "general_disable_auth", "general_throttle_count",
1217 >  "general_throttle_time", "general_oper_umodes", "$@25", "umode_oitems",
1218 >  "umode_oitem", "general_oper_only_umodes", "$@26", "umode_items",
1219 >  "umode_item", "general_min_nonwildcard",
1220    "general_min_nonwildcard_simple", "general_default_floodcount",
1221 <  "general_client_flood", "general_dot_in_ip6_addr", "gline_entry", "$@31",
1222 <  "gline_items", "gline_item", "gline_enable", "gline_duration",
1223 <  "gline_logging", "$@32", "gline_logging_types",
1224 <  "gline_logging_type_item", "gline_user", "gline_server", "gline_action",
1225 <  "$@33", "gdeny_types", "gdeny_type_item", "channel_entry",
1226 <  "channel_items", "channel_item", "channel_disable_fake_channels",
1598 <  "channel_restrict_channels", "channel_disable_local_channels",
1599 <  "channel_use_except", "channel_use_invex", "channel_use_knock",
1600 <  "channel_knock_delay", "channel_knock_delay_channel",
1601 <  "channel_max_chans_per_user", "channel_quiet_on_ban", "channel_max_bans",
1602 <  "channel_default_split_user_count", "channel_default_split_server_count",
1603 <  "channel_no_create_on_split", "channel_no_join_on_split",
1604 <  "channel_burst_topicwho", "channel_jflood_count", "channel_jflood_time",
1221 >  "channel_entry", "channel_items", "channel_item",
1222 >  "channel_disable_fake_channels", "channel_invite_client_count",
1223 >  "channel_invite_client_time", "channel_knock_client_count",
1224 >  "channel_knock_client_time", "channel_knock_delay_channel",
1225 >  "channel_max_channels", "channel_max_bans",
1226 >  "channel_default_join_flood_count", "channel_default_join_flood_time",
1227    "serverhide_entry", "serverhide_items", "serverhide_item",
1228 <  "serverhide_flatten_links", "serverhide_hide_servers",
1228 >  "serverhide_flatten_links", "serverhide_disable_remote_commands",
1229 >  "serverhide_hide_servers", "serverhide_hide_services",
1230    "serverhide_hidden_name", "serverhide_links_delay", "serverhide_hidden",
1231 <  "serverhide_disable_hidden", "serverhide_hide_server_ips", 0
1231 >  "serverhide_hide_server_ips", YY_NULLPTR
1232   };
1233   #endif
1234  
1235   # ifdef YYPRINT
1236 < /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
1237 <   token YYLEX-NUM.  */
1236 > /* YYTOKNUM[NUM] -- (External) token number corresponding to the
1237 >   (internal) symbol number NUM (which must be that of a token).  */
1238   static const yytype_uint16 yytoknum[] =
1239   {
1240         0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
# Line 1636 | Line 1259 | static const yytype_uint16 yytoknum[] =
1259       445,   446,   447,   448,   449,   450,   451,   452,   453,   454,
1260       455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
1261       465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
1262 <     475,   476,   477,   478,   479,   480,   481,   482,   483,   484,
1263 <     485,   486,   487,   488,   489,   490,   491,   492,   493,   494,
1641 <     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
1642 <     505,   506,   507,   508,   509,   510,   511,   512,   513,   514,
1643 <     515,   516,    59,   125,   123,    61,    44
1262 >     475,   476,   477,   478,   479,    59,   125,   123,    61,    44,
1263 >      58
1264   };
1265   # endif
1266  
1267 < /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
1648 < static const yytype_uint16 yyr1[] =
1649 < {
1650 <       0,   267,   268,   268,   269,   269,   269,   269,   269,   269,
1651 <     269,   269,   269,   269,   269,   269,   269,   269,   269,   269,
1652 <     269,   269,   269,   269,   269,   269,   270,   270,   271,   271,
1653 <     271,   271,   271,   271,   272,   272,   273,   273,   273,   273,
1654 <     274,   275,   275,   276,   276,   276,   277,   278,   279,   280,
1655 <     280,   281,   281,   281,   281,   281,   281,   281,   281,   281,
1656 <     281,   281,   281,   281,   283,   282,   284,   284,   285,   285,
1657 <     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
1658 <     296,   297,   298,   298,   299,   299,   299,   299,   300,   301,
1659 <     302,   303,   304,   304,   305,   305,   305,   305,   305,   305,
1660 <     305,   305,   305,   305,   305,   305,   305,   306,   307,   308,
1661 <     309,   310,   311,   312,   313,   314,   315,   316,   316,   316,
1662 <     316,   316,   316,   316,   317,   319,   318,   320,   320,   321,
1663 <     321,   322,   322,   322,   322,   322,   322,   322,   322,   322,
1664 <     322,   322,   322,   322,   322,   322,   322,   322,   322,   322,
1665 <     322,   322,   322,   322,   323,   324,   325,   326,   327,   328,
1666 <     329,   331,   330,   332,   332,   333,   333,   333,   333,   333,
1667 <     333,   333,   333,   333,   333,   333,   333,   333,   333,   333,
1668 <     333,   333,   333,   333,   334,   335,   336,   337,   338,   339,
1669 <     340,   341,   342,   343,   344,   345,   346,   347,   349,   348,
1670 <     350,   350,   352,   351,   353,   351,   354,   354,   354,   354,
1671 <     354,   354,   354,   354,   354,   354,   354,   354,   354,   354,
1672 <     354,   354,   356,   355,   357,   357,   358,   358,   359,   359,
1673 <     359,   359,   359,   359,   359,   359,   359,   359,   359,   359,
1674 <     359,   359,   360,   361,   362,   363,   364,   365,   366,   367,
1675 <     368,   369,   370,   371,   372,   373,   375,   374,   377,   376,
1676 <     378,   378,   379,   379,   379,   380,   380,   381,   381,   381,
1677 <     381,   381,   383,   382,   384,   384,   385,   385,   386,   387,
1678 <     389,   388,   390,   390,   391,   391,   391,   391,   391,   391,
1679 <     391,   391,   391,   391,   391,   391,   391,   391,   391,   391,
1680 <     391,   392,   393,   394,   395,   396,   398,   397,   399,   399,
1681 <     401,   400,   402,   400,   403,   403,   403,   403,   403,   403,
1682 <     403,   403,   403,   403,   404,   405,   406,   407,   408,   409,
1683 <     410,   411,   412,   413,   415,   414,   416,   416,   417,   417,
1684 <     417,   417,   418,   419,   420,   422,   421,   423,   423,   424,
1685 <     424,   424,   424,   425,   426,   428,   427,   429,   429,   430,
1686 <     430,   430,   430,   430,   430,   430,   430,   430,   430,   430,
1687 <     432,   431,   433,   433,   434,   434,   434,   435,   437,   436,
1688 <     438,   438,   439,   439,   439,   439,   439,   439,   439,   439,
1689 <     439,   439,   439,   441,   440,   442,   442,   443,   443,   444,
1690 <     444,   444,   444,   444,   444,   444,   444,   444,   444,   444,
1691 <     444,   444,   444,   444,   444,   444,   444,   444,   444,   445,
1692 <     446,   447,   448,   449,   450,   451,   452,   452,   453,   455,
1693 <     454,   456,   456,   458,   457,   459,   457,   460,   460,   460,
1694 <     460,   460,   461,   462,   463,   464,   465,   466,   467,   468,
1695 <     469,   470,   472,   471,   474,   473,   475,   475,   476,   477,
1696 <     477,   478,   478,   478,   478,   479,   480,   482,   481,   483,
1697 <     483,   484,   484,   484,   485,   486,   487,   488,   488,   489,
1698 <     489,   490,   492,   491,   494,   493,   495,   495,   496,   497,
1699 <     497,   498,   498,   498,   498,   499,   500,   501,   502,   502,
1700 <     503,   503,   503,   503,   503,   503,   503,   503,   503,   503,
1701 <     503,   503,   503,   503,   503,   503,   503,   503,   503,   503,
1702 <     503,   503,   503,   503,   503,   503,   503,   503,   503,   503,
1703 <     503,   503,   503,   503,   503,   503,   503,   503,   503,   503,
1704 <     503,   503,   503,   503,   503,   503,   503,   503,   503,   503,
1705 <     503,   503,   503,   503,   503,   503,   503,   504,   505,   506,
1706 <     507,   508,   509,   510,   511,   512,   513,   514,   515,   516,
1707 <     517,   518,   519,   520,   521,   522,   523,   524,   525,   526,
1708 <     527,   528,   529,   530,   531,   531,   532,   532,   533,   534,
1709 <     535,   536,   537,   538,   539,   540,   541,   542,   543,   544,
1710 <     545,   546,   547,   548,   549,   550,   551,   552,   554,   553,
1711 <     555,   555,   556,   556,   556,   556,   556,   556,   556,   556,
1712 <     556,   556,   556,   556,   556,   556,   556,   556,   556,   556,
1713 <     556,   558,   557,   559,   559,   560,   560,   560,   560,   560,
1714 <     560,   560,   560,   560,   560,   560,   560,   560,   560,   560,
1715 <     560,   560,   560,   560,   561,   562,   563,   564,   565,   567,
1716 <     566,   568,   568,   569,   569,   569,   569,   569,   569,   569,
1717 <     570,   571,   573,   572,   574,   574,   575,   575,   576,   577,
1718 <     579,   578,   580,   580,   581,   581,   582,   583,   583,   584,
1719 <     584,   584,   584,   584,   584,   584,   584,   584,   584,   584,
1720 <     584,   584,   584,   584,   584,   584,   584,   584,   585,   586,
1721 <     587,   588,   589,   590,   591,   592,   593,   594,   595,   596,
1722 <     597,   598,   599,   600,   601,   602,   603,   604,   604,   605,
1723 <     605,   605,   605,   605,   605,   605,   605,   606,   607,   608,
1724 <     609,   610,   611,   612
1725 < };
1267 > #define YYPACT_NINF -689
1268  
1269 < /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
1270 < static const yytype_uint8 yyr2[] =
1269 > #define yypact_value_is_default(Yystate) \
1270 >  (!!((Yystate) == (-689)))
1271 >
1272 > #define YYTABLE_NINF -130
1273 >
1274 > #define yytable_value_is_error(Yytable_value) \
1275 >  0
1276 >
1277 >  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
1278 >     STATE-NUM.  */
1279 > static const yytype_int16 yypact[] =
1280   {
1281 <       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
1282 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1283 <       1,     1,     1,     1,     2,     2,     0,     1,     2,     3,
1284 <       3,     3,     3,     3,     0,     1,     2,     3,     3,     3,
1285 <       5,     2,     1,     1,     1,     2,     4,     4,     5,     2,
1286 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1287 <       1,     1,     1,     2,     0,     5,     3,     1,     1,     1,
1288 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1289 <       4,     5,     2,     1,     1,     1,     1,     2,     4,     4,
1290 <       4,     5,     2,     1,     1,     1,     1,     1,     1,     1,
1291 <       1,     1,     1,     1,     1,     1,     2,     4,     4,     4,
1292 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1293 <       4,     4,     4,     4,     4,     0,     7,     0,     1,     2,
1294 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1295 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1296 <       1,     1,     1,     2,     4,     1,     4,     4,     4,     4,
1297 <       4,     0,     5,     3,     1,     1,     1,     1,     1,     1,
1298 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1299 <       1,     1,     1,     1,     4,     4,     4,     4,     4,     4,
1300 <       4,     4,     4,     4,     4,     4,     4,     4,     0,     5,
1301 <       3,     1,     0,     3,     0,     2,     1,     1,     1,     1,
1302 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1303 <       1,     1,     0,     7,     0,     1,     2,     1,     1,     1,
1304 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1305 <       1,     2,     4,     1,     4,     4,     4,     4,     4,     4,
1306 <       4,     4,     4,     4,     4,     4,     0,     6,     0,     5,
1307 <       3,     1,     1,     1,     1,     2,     1,     1,     1,     1,
1308 <       1,     2,     0,     5,     3,     1,     1,     3,     4,     4,
1309 <       0,     6,     2,     1,     1,     1,     1,     1,     1,     1,
1310 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1311 <       2,     4,     4,     4,     4,     4,     0,     5,     3,     1,
1312 <       0,     3,     0,     2,     1,     1,     1,     1,     1,     1,
1313 <       1,     1,     1,     1,     4,     4,     4,     4,     4,     4,
1314 <       4,     4,     4,     4,     0,     6,     2,     1,     1,     1,
1315 <       1,     2,     4,     4,     4,     0,     6,     2,     1,     1,
1316 <       1,     1,     2,     4,     4,     0,     5,     3,     1,     1,
1317 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1318 <       0,     6,     2,     1,     1,     1,     2,     4,     0,     5,
1319 <       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1320 <       1,     1,     1,     0,     7,     0,     1,     2,     1,     1,
1321 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1322 <       1,     1,     1,     1,     1,     1,     1,     1,     2,     4,
1323 <       1,     4,     4,     4,     4,     4,     4,     4,     4,     0,
1324 <       5,     3,     1,     0,     3,     0,     2,     1,     1,     1,
1325 <       1,     1,     4,     4,     4,     4,     4,     4,     4,     4,
1326 <       4,     4,     0,     6,     0,     5,     3,     1,     1,     2,
1327 <       1,     1,     1,     1,     1,     4,     4,     0,     6,     2,
1328 <       1,     1,     1,     1,     4,     4,     5,     2,     1,     1,
1329 <       1,     4,     0,     6,     0,     5,     3,     1,     1,     2,
1330 <       1,     1,     1,     1,     1,     4,     4,     5,     2,     1,
1331 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1332 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1333 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1334 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1335 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1336 <       1,     1,     1,     1,     1,     1,     1,     4,     4,     4,
1337 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1338 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1339 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1340 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1341 <       4,     4,     4,     4,     4,     4,     4,     4,     0,     5,
1342 <       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1343 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1344 <       1,     0,     5,     3,     1,     1,     1,     1,     1,     1,
1345 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1346 <       1,     1,     1,     1,     4,     4,     4,     4,     4,     0,
1347 <       6,     2,     1,     1,     1,     1,     1,     1,     1,     1,
1348 <       4,     4,     0,     5,     3,     1,     1,     1,     4,     4,
1349 <       0,     5,     3,     1,     1,     1,     5,     2,     1,     1,
1350 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1351 <       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
1352 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1353 <       4,     4,     4,     4,     4,     4,     5,     2,     1,     1,
1354 <       1,     1,     1,     1,     1,     1,     1,     4,     4,     4,
1355 <       4,     4,     4,     4
1281 >    -689,   632,  -689,  -172,  -202,  -200,  -689,  -689,  -689,  -189,
1282 >    -689,  -187,  -689,  -689,  -689,  -176,  -689,  -689,  -689,  -167,
1283 >    -158,  -689,  -156,  -689,  -130,  -689,  -689,  -689,  -689,  -689,
1284 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1285 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1286 >    -689,    14,   898,  -127,  -104,   -90,     5,   -76,   393,   -70,
1287 >     -46,   -33,   221,   -28,   -27,   -19,   488,   491,   -18,    48,
1288 >     -13,    71,   -10,  -190,     1,    35,    36,    60,  -689,  -689,
1289 >    -689,  -689,  -689,    44,    45,    56,    57,    76,    77,    98,
1290 >     101,   103,   109,   270,  -689,  -689,  -689,  -689,  -689,  -689,
1291 >    -689,  -689,  -689,  -689,  -689,   699,   606,    15,  -689,   110,
1292 >      16,  -689,  -689,   201,  -689,   115,   116,   121,   123,   124,
1293 >     131,   134,   135,   137,   139,   141,   143,   145,   148,   150,
1294 >     160,   163,   165,   168,   169,   177,   178,   182,   185,   193,
1295 >    -689,   194,  -689,   196,   197,   203,   204,   209,   228,   234,
1296 >     235,   236,   237,   238,   240,   243,   244,   247,   249,   253,
1297 >     255,    22,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1298 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1299 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1300 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1301 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,   316,
1302 >      38,   322,    -1,   258,   259,    33,  -689,  -689,  -689,    18,
1303 >     305,    19,  -689,   260,   262,   269,   271,   280,   282,   283,
1304 >     284,   225,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1305 >    -689,    87,   290,   293,   296,   298,   300,   303,   308,   313,
1306 >     314,   324,   326,   327,   329,   330,   331,   332,   341,    20,
1307 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1308 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,    10,   167,
1309 >     342,     2,  -689,  -689,  -689,    91,   359,  -689,   343,    67,
1310 >    -689,  -689,   164,  -689,   453,   454,   458,   353,  -689,   325,
1311 >     476,   374,   478,   476,   479,   476,   476,   480,   481,   361,
1312 >    -689,   364,   365,   366,   368,  -689,   369,   370,   371,   372,
1313 >     376,   380,   382,   384,   385,   387,   388,   390,   391,   172,
1314 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1315 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,   367,   395,
1316 >     396,   399,   400,   401,   403,  -689,   406,   410,   416,   417,
1317 >     418,   419,   421,   149,  -689,  -689,  -689,  -689,  -689,  -689,
1318 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1319 >     426,   428,    11,  -689,  -689,  -689,   502,   432,  -689,  -689,
1320 >     433,   434,    64,  -689,  -689,  -689,   456,   476,   560,   476,
1321 >     476,   461,   561,   462,   566,   568,   572,   470,   472,   473,
1322 >     476,   577,   578,   579,   580,   476,   581,   582,   584,   585,
1323 >     483,   463,   486,   466,   489,   476,   476,   490,   492,   494,
1324 >    -197,  -185,   496,   497,   498,   500,   594,   476,   501,   476,
1325 >     476,   511,   484,  -689,   503,   493,   495,  -689,   504,   505,
1326 >     506,   507,   508,    84,  -689,  -689,  -689,  -689,  -689,  -689,
1327 >    -689,  -689,  -689,  -689,   509,   510,    23,  -689,  -689,  -689,
1328 >     514,   512,   513,  -689,   515,  -689,    94,  -689,  -689,  -689,
1329 >    -689,  -689,   600,   603,   520,  -689,   521,   519,   522,    12,
1330 >    -689,  -689,  -689,   523,   528,   529,  -689,   530,   533,   534,
1331 >     535,   536,  -689,   537,   538,   186,  -689,  -689,  -689,  -689,
1332 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,   524,   539,
1333 >     540,   541,    83,  -689,  -689,  -689,  -689,   518,   544,   563,
1334 >     610,   564,   567,   569,   476,   557,  -689,  -689,   626,   612,
1335 >     576,   665,   682,   683,   669,   671,   672,   674,   675,   678,
1336 >     679,   680,   681,   684,   687,   583,  -689,   586,   573,  -689,
1337 >      66,  -689,  -689,  -689,  -689,   605,   588,  -689,   590,   593,
1338 >     592,   595,   598,   599,   183,  -689,  -689,  -689,  -689,  -689,
1339 >     691,   596,  -689,   607,   614,  -689,   615,    65,  -689,  -689,
1340 >    -689,  -689,   620,   624,   628,  -689,   629,   310,   630,   633,
1341 >     634,   638,   640,   641,   650,   653,   655,  -689,  -689,   727,
1342 >     731,   476,   657,   736,   753,   779,   476,   784,   785,   476,
1343 >     771,   787,   789,   476,   790,   790,   670,  -689,  -689,   778,
1344 >     -83,   786,   696,   792,   796,   676,   799,   801,   794,   806,
1345 >     809,   811,   812,   709,  -689,   814,   816,   712,  -689,   713,
1346 >    -689,   820,   824,   719,  -689,   720,   721,   723,   724,   725,
1347 >     726,   728,   729,   732,   733,   734,   735,   737,   738,   739,
1348 >     740,   741,   745,   746,   747,   749,   752,   754,   755,   756,
1349 >     748,   757,   668,   758,   759,   760,   761,   762,   763,   764,
1350 >     765,   766,   767,   768,   769,   770,   772,   773,   774,   775,
1351 >     776,   777,   780,  -689,  -689,   842,   797,   750,   854,   802,
1352 >     877,   884,   887,   782,  -689,   889,   890,   788,  -689,  -689,
1353 >     891,   892,   791,   908,   793,  -689,   795,   798,  -689,  -689,
1354 >     895,   896,   800,  -689,  -689,   897,   810,   803,   902,   903,
1355 >     905,   907,   821,   804,   910,   911,   808,  -689,  -689,   915,
1356 >     916,   917,   813,  -689,   815,   817,   818,   819,   822,   823,
1357 >     825,   826,  -689,   827,   828,   829,   830,   831,   832,   833,
1358 >     834,   835,   836,   837,   838,   839,   840,   841,   843,   844,
1359 >    -689,  -689,   918,   845,   846,  -689,   847,  -689,   117,  -689,
1360 >     920,   922,   926,   927,   849,  -689,   850,  -689,  -689,   930,
1361 >     848,   948,   852,  -689,  -689,  -689,  -689,  -689,   476,   476,
1362 >     476,   476,   476,   476,   476,  -689,  -689,  -689,  -689,  -689,
1363 >    -689,  -689,  -689,  -689,  -689,  -689,   853,   855,   856,   -39,
1364 >     857,   858,   859,   860,   861,   862,   863,   864,   865,   866,
1365 >     867,   184,   868,   869,  -689,   870,   871,   872,   873,   874,
1366 >     875,   876,    -4,   878,   879,   880,   881,   882,   883,   885,
1367 >    -689,   886,   888,  -689,  -689,   893,   894,  -689,  -689,  -689,
1368 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1369 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1370 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1371 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1372 >    -689,  -689,  -689,  -192,  -689,  -689,  -689,  -689,  -689,  -689,
1373 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1374 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -182,  -689,
1375 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1376 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1377 >     899,   900,   292,   901,   904,   906,   909,   912,  -689,   913,
1378 >     914,  -689,   919,   921,    -3,   928,   923,  -689,  -689,  -689,
1379 >    -689,   924,   925,  -689,   929,   931,   450,   932,   933,   934,
1380 >     935,   936,   708,   937,   938,  -689,   939,   940,   941,  -689,
1381 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1382 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1383 >    -689,  -689,  -689,  -689,  -689,   942,   291,  -689,  -689,   943,
1384 >     851,   944,  -689,    29,  -689,  -689,  -689,  -689,   945,   946,
1385 >     949,   950,  -689,  -689,   951,   648,   952,  -689,  -689,  -689,
1386 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1387 >    -166,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1388 >    -689,  -689,  -689,   790,   790,   790,  -689,  -689,  -689,  -689,
1389 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -149,
1390 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1391 >    -689,  -689,  -689,   748,  -689,   668,  -689,  -689,  -689,  -689,
1392 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -146,  -689,
1393 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1394 >    -689,  -689,   -82,  -689,   966,   908,   953,  -689,  -689,  -689,
1395 >    -689,  -689,   181,  -689,   954,  -689,  -689,  -689,  -689,   955,
1396 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1397 >    -689,   -14,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1398 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1399 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1400 >      74,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1401 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,    90,  -689,
1402 >    -689,   983,   -86,   958,   956,  -689,  -689,  -689,  -689,  -689,
1403 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1404 >    -689,   125,  -689,  -689,  -689,   -39,  -689,  -689,  -689,  -689,
1405 >      -4,  -689,  -689,  -689,   292,  -689,    -3,  -689,  -689,  -689,
1406 >     984,   987,   989,  -689,   450,  -689,   708,  -689,   291,   957,
1407 >     962,   963,   307,  -689,  -689,   648,  -689,  -689,  -689,  -689,
1408 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1409 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,   132,  -689,  -689,
1410 >    -689,   307,  -689
1411   };
1412  
1413 < /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
1414 <   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
1415 <   means the default is an error.  */
1413 >  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
1414 >     Performed when YYTABLE does not specify something else to do.  Zero
1415 >     means the default is an error.  */
1416   static const yytype_uint16 yydefact[] =
1417   {
1418 <       2,     0,     1,     0,     0,     0,   222,   393,   467,     0,
1419 <     482,     0,   659,   280,   452,   256,     0,     0,   125,   334,
1420 <       0,     0,   345,   370,     3,    23,    11,     4,     5,     6,
1421 <       8,     9,    10,    13,    14,    15,    16,    17,    18,    19,
1422 <      22,    20,    21,     7,    12,    24,    25,     0,     0,   224,
1423 <     395,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1818 <       0,   127,     0,     0,     0,     0,     0,     0,     0,     0,
1819 <       0,     0,    83,    84,    86,    85,   707,     0,     0,     0,
1820 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1821 <       0,     0,     0,     0,     0,     0,   688,   706,   701,   689,
1822 <     690,   691,   692,   694,   695,   696,   697,   693,   698,   699,
1823 <     700,   702,   703,   704,   705,   243,     0,   225,   420,     0,
1824 <     396,     0,   480,     0,     0,   478,   479,     0,   556,     0,
1825 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1826 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1418 >       2,     0,     1,     0,     0,     0,   230,   395,   443,     0,
1419 >     458,     0,   298,   434,   274,     0,   100,   152,   332,     0,
1420 >       0,   373,     0,   109,     0,   349,     3,    23,    11,     4,
1421 >      24,    25,     5,     6,     8,     9,    10,    13,    14,    15,
1422 >      16,    17,    18,    19,    20,    22,    21,     7,    12,    26,
1423 >      27,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1424         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1425 <       0,     0,   631,     0,   608,     0,     0,     0,     0,     0,
1425 >       0,     0,     0,     0,     0,     0,     0,     0,    92,    93,
1426 >      95,    94,   626,     0,     0,     0,     0,     0,     0,     0,
1427 >       0,     0,     0,     0,   615,   625,   617,   618,   619,   620,
1428 >     621,   622,   616,   623,   624,     0,     0,     0,   456,     0,
1429 >       0,   454,   455,     0,   516,     0,     0,     0,     0,     0,
1430         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1830       0,     0,     0,     0,     0,     0,   499,   555,   550,   551,
1831     548,   552,   553,   549,   510,   500,   501,   539,   502,   503,
1832     504,   505,   506,   507,   508,   509,   544,   511,   512,   513,
1833     514,   554,   516,   521,   517,   519,   518,   533,   534,   520,
1834     522,   523,   524,   525,   527,   526,   515,   529,   538,   540,
1835     541,   530,   531,   546,   547,   543,   532,   528,   536,   537,
1836     535,   542,   545,     0,     0,     0,     0,     0,     0,     0,
1431         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1432 <       0,    93,    94,    95,    98,   105,    99,   103,   100,   101,
1839 <     104,   102,    96,    97,     0,     0,     0,     0,    42,    43,
1840 <      44,   155,     0,   128,     0,   736,     0,     0,     0,     0,
1841 <       0,     0,     0,     0,   728,   729,   730,   734,   731,   733,
1842 <     732,   735,     0,     0,     0,     0,     0,     0,     0,     0,
1843 <      64,     0,     0,     0,     0,     0,    50,    62,    61,    58,
1844 <      51,    60,    54,    55,    56,    52,    59,    57,    53,     0,
1845 <       0,    87,     0,     0,     0,     0,    82,     0,     0,     0,
1432 >     586,     0,   560,     0,     0,     0,     0,     0,     0,     0,
1433         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1434 <       0,     0,     0,     0,     0,     0,   687,     0,     0,   473,
1435 <       0,     0,     0,   470,   471,   472,     0,     0,   477,   494,
1436 <       0,     0,   484,   493,     0,   490,   491,   492,     0,     0,
1434 >       0,     0,   469,   470,   471,   514,   515,   509,   510,   511,
1435 >     512,   508,   481,   472,   473,   474,   475,   476,   477,   478,
1436 >     479,   480,   482,   483,   513,   487,   488,   489,   490,   486,
1437 >     485,   491,   499,   500,   492,   493,   494,   495,   484,   497,
1438 >     506,   507,   504,   505,   498,   496,   502,   503,   501,     0,
1439 >       0,     0,     0,     0,     0,     0,    46,    47,    48,     0,
1440 >       0,     0,   648,     0,     0,     0,     0,     0,     0,     0,
1441 >       0,     0,   639,   640,   641,   642,   643,   646,   644,   645,
1442 >     647,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1443         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1444 +      54,    69,    66,    64,    70,    71,    65,    55,    68,    58,
1445 +      59,    60,    56,    67,    61,    62,    63,    57,     0,     0,
1446 +       0,     0,   124,   125,   126,     0,     0,   347,     0,     0,
1447 +     345,   346,     0,    96,     0,     0,     0,     0,    91,     0,
1448         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1449 +     614,     0,     0,     0,     0,   268,     0,     0,     0,     0,
1450         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1451 +     233,   234,   237,   239,   240,   241,   242,   243,   244,   245,
1452 +     246,   247,   235,   236,   238,   248,   249,   250,     0,     0,
1453 +       0,     0,     0,     0,     0,   423,     0,     0,     0,     0,
1454 +       0,     0,     0,     0,   398,   399,   400,   401,   402,   403,
1455 +     404,   406,   405,   408,   412,   409,   410,   411,   407,   449,
1456 +       0,     0,     0,   446,   447,   448,     0,     0,   453,   464,
1457 +       0,     0,     0,   461,   462,   463,     0,     0,     0,     0,
1458         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1459         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1855       0,     0,     0,     0,     0,   498,   669,   680,     0,     0,
1856     672,     0,     0,     0,   662,   663,   664,   665,   666,   667,
1857     668,     0,     0,     0,     0,     0,   306,     0,     0,     0,
1858       0,     0,     0,     0,     0,     0,     0,     0,     0,   283,
1859     284,   285,   294,   286,   299,   287,   288,   289,   290,   297,
1860     291,   292,   293,   295,   296,   298,   464,     0,   454,     0,
1861     463,     0,   460,   461,   462,     0,   258,     0,     0,     0,
1862     268,     0,   266,   267,   269,   270,   106,     0,     0,     0,
1460         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1864      92,    45,     0,     0,     0,    41,     0,     0,     0,     0,
1865       0,     0,   337,   338,   339,   340,     0,     0,     0,     0,
1866       0,     0,     0,     0,   727,    63,     0,     0,     0,     0,
1867       0,     0,     0,     0,     0,     0,     0,     0,     0,    49,
1868       0,     0,   355,     0,     0,   348,   349,   350,   351,     0,
1869       0,   378,     0,   373,   374,   375,     0,     0,     0,    81,
1870       0,     0,     0,     0,     0,    26,     0,     0,     0,     0,
1871       0,     0,     0,     0,     0,     0,     0,     0,     0,   686,
1461         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1462 <       0,     0,     0,     0,     0,   227,   228,   231,   232,   234,
1463 <     235,   236,   237,   238,   239,   240,   229,   230,   233,     0,
1464 <       0,     0,     0,     0,     0,     0,     0,     0,     0,   429,
1462 >       0,     0,     0,   468,     0,     0,     0,   315,     0,     0,
1463 >       0,     0,     0,     0,   301,   302,   303,   304,   309,   305,
1464 >     306,   307,   308,   440,     0,     0,     0,   437,   438,   439,
1465 >       0,     0,     0,   276,     0,   286,     0,   284,   285,   287,
1466 >     288,    49,     0,     0,     0,    45,     0,     0,     0,     0,
1467 >     103,   104,   105,     0,     0,     0,   203,     0,     0,     0,
1468 >       0,     0,   177,     0,     0,     0,   155,   156,   157,   158,
1469 >     159,   162,   163,   164,   165,   161,   160,   166,     0,     0,
1470 >       0,     0,     0,   335,   336,   337,   338,     0,     0,     0,
1471 >       0,     0,     0,     0,     0,     0,   638,    72,     0,     0,
1472         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1473 <     398,   399,   400,   401,   402,   403,   405,   404,   406,   407,
1474 <     415,   412,   414,   413,   411,   417,   408,   409,   410,   416,
1475 <       0,     0,     0,   469,     0,   476,     0,     0,     0,     0,
1476 <     489,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1473 >       0,     0,     0,     0,     0,     0,    53,     0,     0,   381,
1474 >       0,   376,   377,   378,   127,     0,     0,   123,     0,     0,
1475 >       0,     0,     0,     0,     0,   112,   113,   115,   114,   116,
1476 >       0,     0,   344,     0,     0,   359,     0,     0,   352,   353,
1477 >     354,   355,     0,     0,     0,    90,     0,    28,     0,     0,
1478 >       0,     0,     0,     0,     0,     0,     0,   613,   251,     0,
1479         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1480 +       0,     0,     0,     0,     0,     0,     0,   232,   413,     0,
1481         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1482 +       0,     0,     0,     0,   397,     0,     0,     0,   445,     0,
1483 +     452,     0,     0,     0,   460,     0,     0,     0,     0,     0,
1484         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1485         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1885       0,     0,     0,    34,     0,     0,     0,     0,     0,     0,
1886     497,     0,     0,     0,     0,     0,     0,     0,   661,   300,
1486         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1888       0,     0,     0,     0,     0,     0,     0,   282,     0,     0,
1889       0,     0,   459,   271,     0,     0,     0,     0,     0,   265,
1487         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1488 <       0,     0,     0,     0,     0,     0,     0,     0,    91,     0,
1489 <       0,    40,     0,     0,     0,     0,     0,   198,     0,     0,
1488 >       0,     0,     0,   467,   310,     0,     0,     0,     0,     0,
1489 >       0,     0,     0,     0,   300,     0,     0,     0,   436,   289,
1490 >       0,     0,     0,     0,     0,   283,     0,     0,    44,   106,
1491 >       0,     0,     0,   102,   167,     0,     0,     0,     0,     0,
1492 >       0,     0,     0,     0,     0,     0,     0,   154,   339,     0,
1493 >       0,     0,     0,   334,     0,     0,     0,     0,     0,     0,
1494 >       0,     0,   637,     0,     0,     0,     0,     0,     0,     0,
1495         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1496 <       0,   161,     0,     0,     0,     0,   130,   131,   132,   133,
1497 <     150,   151,   137,   136,   138,   139,   145,   140,   141,   142,
1498 <     143,   144,   146,   147,   148,   134,   135,   149,   152,   341,
1499 <       0,     0,     0,     0,   336,     0,     0,     0,     0,     0,
1500 <       0,     0,   726,     0,     0,     0,     0,     0,     0,     0,
1899 <       0,     0,     0,     0,     0,    48,   352,     0,     0,     0,
1900 <       0,   347,   376,     0,     0,     0,   372,    90,    89,    88,
1901 <     723,   720,   719,   708,   710,    26,    26,    26,    26,    26,
1902 <      28,    27,   714,   715,   718,   716,   721,   722,   724,   725,
1903 <     717,   709,   711,   712,   713,   241,     0,     0,     0,     0,
1496 >      52,   379,     0,     0,     0,   375,     0,   122,     0,   117,
1497 >       0,     0,     0,     0,     0,   111,     0,   343,   356,     0,
1498 >       0,     0,     0,   351,    99,    98,    97,   635,    28,    28,
1499 >      28,    28,    28,    28,    28,    30,    29,   636,   627,   628,
1500 >     629,   630,   631,   632,   634,   633,     0,     0,     0,     0,
1501         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1502 <     226,   418,     0,     0,     0,     0,     0,     0,     0,     0,
1502 >       0,    38,     0,     0,   231,     0,     0,     0,     0,     0,
1503         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1504 <       0,     0,   397,     0,     0,   468,   481,     0,     0,     0,
1505 <     483,   569,   573,   560,   589,   602,   601,   656,   606,   567,
1506 <     658,   598,   604,   568,   558,   559,   576,   565,   597,   566,
1507 <     579,   564,   578,   577,   572,   571,   570,   599,   557,   596,
1508 <     654,   655,   593,   590,   635,   651,   652,   636,   637,   638,
1509 <     639,   646,   640,   649,   653,   642,   647,   643,   648,   641,
1510 <     645,   644,   650,     0,   634,   595,   612,   628,   629,   613,
1511 <     614,   615,   616,   623,   617,   626,   630,   619,   624,   620,
1512 <     625,   618,   622,   621,   627,     0,   611,   588,   591,   605,
1513 <     562,   600,   563,   592,   581,   586,   587,   584,   585,   582,
1514 <     583,   575,   574,    34,    34,    34,    36,    35,   657,   607,
1515 <     594,   603,   561,   580,     0,     0,     0,     0,     0,     0,
1516 <     660,     0,     0,     0,     0,   312,     0,     0,     0,     0,
1517 <       0,     0,     0,     0,     0,     0,     0,   281,     0,     0,
1518 <       0,   453,     0,     0,     0,   276,   272,   275,   257,   110,
1519 <     116,   114,   113,   115,   111,   112,   109,   117,   123,   118,
1520 <     122,   120,   121,   119,   108,   107,   124,    46,    47,   153,
1521 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1522 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1523 <       0,     0,     0,   129,     0,     0,     0,   335,   742,   737,
1524 <     741,   739,   743,   738,   740,    74,    80,    72,    76,    75,
1525 <      71,    70,    68,    69,     0,    67,    73,    79,    77,    78,
1526 <       0,     0,     0,   346,     0,     0,   371,    29,    30,    31,
1527 <      32,    33,     0,     0,     0,     0,     0,     0,     0,     0,
1528 <       0,     0,     0,     0,     0,   223,     0,     0,     0,     0,
1529 <       0,     0,     0,     0,     0,     0,   435,     0,     0,     0,
1530 <       0,     0,     0,     0,     0,     0,   394,   474,   475,   495,
1531 <     496,   488,     0,   487,   632,     0,   609,     0,    37,    38,
1532 <      39,   685,   684,     0,   683,   671,   670,   677,   676,     0,
1533 <     675,   679,   678,   327,   304,   305,   326,   310,     0,   309,
1534 <       0,   329,   325,   324,   333,   328,   302,   332,   331,   330,
1535 <     303,   301,   466,   458,     0,   457,   465,   263,   264,   262,
1536 <       0,   261,   279,   278,     0,     0,     0,     0,     0,     0,
1537 <       0,   204,     0,     0,     0,     0,     0,     0,     0,     0,
1538 <       0,     0,     0,     0,     0,     0,     0,     0,     0,   126,
1539 <     343,   344,   342,    65,     0,   353,   359,   365,   369,   368,
1540 <     367,   364,   360,   363,   366,   361,   362,     0,   358,   354,
1541 <     377,   382,   388,   392,   391,   390,   387,   383,   386,   389,
1542 <     384,   385,     0,   381,   253,   254,   247,   249,   251,   250,
1543 <     248,   242,   255,   246,   244,   245,   252,   424,   426,   427,
1544 <     446,   451,   450,   445,   444,   443,   428,   433,     0,   432,
1545 <       0,   421,   448,   449,   419,   425,   442,   423,   447,   422,
1546 <     485,     0,   633,   610,   681,     0,   673,     0,     0,   307,
1547 <     312,   318,   319,   315,   321,   317,   316,   323,   320,   322,
1951 <     314,   313,   455,     0,   259,     0,   277,   274,   273,   194,
1952 <     160,   192,   158,   202,     0,   201,     0,   190,   184,   195,
1953 <     196,   187,   154,   191,   157,   193,   185,   186,   159,   197,
1954 <     165,   181,   182,   166,   167,   168,   169,   176,   170,   179,
1955 <     183,   172,   177,   173,   178,   171,   175,   174,   180,     0,
1956 <     164,   189,   156,   188,    66,   356,     0,   379,     0,     0,
1957 <     430,   435,   439,   440,   437,   438,   441,   436,   486,   682,
1958 <     674,   311,   308,   456,   260,     0,   199,   204,   214,   212,
1959 <     221,   211,   206,   215,   219,   208,   216,   218,   213,   207,
1960 <     220,   217,   209,   210,   205,   162,     0,   357,   380,   434,
1961 <     431,   203,   200,   163
1962 < };
1963 <
1964 < /* YYDEFGOTO[NTERM-NUM].  */
1965 < static const yytype_int16 yydefgoto[] =
1966 < {
1967 <      -1,     1,    24,   900,   901,  1056,  1057,    25,   277,   278,
1968 <     279,   280,    26,   315,   316,   317,   553,  1164,  1165,   318,
1969 <     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
1970 <      27,    71,    72,    73,    74,    75,    28,   260,   261,   262,
1971 <     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
1972 <     273,    29,    61,   282,   825,   826,   827,   283,   828,   829,
1973 <     830,   831,   832,   833,  1138,  1439,  1440,   834,   835,   836,
1974 <     837,   838,   839,   840,   841,   842,   843,   844,   845,   846,
1975 <     847,   848,  1124,  1404,  1405,  1465,  1406,  1484,    30,    49,
1976 <     116,   614,   615,   616,   117,   617,   618,   619,   620,   621,
1977 <     622,   623,   624,   625,   626,   627,   628,    31,    58,   500,
1978 <     774,  1270,  1271,   501,   502,   503,  1276,  1096,  1097,   504,
1979 <     505,    32,    56,   468,   469,   470,   471,   472,   473,   474,
1980 <     475,   754,  1248,  1249,  1378,  1250,  1391,   476,   477,   478,
1981 <     479,   480,   481,   482,   483,   484,   485,    33,    62,   531,
1982 <     532,   533,   534,   535,    34,    65,   564,   565,   566,   567,
1983 <     568,   878,  1317,  1318,    35,    66,   572,   573,   574,   575,
1984 <     884,  1332,  1333,    36,    50,   119,   649,   650,   651,   120,
1985 <     652,   653,   654,   655,   656,   657,   658,   659,   941,  1358,
1986 <    1359,  1449,  1360,  1457,   660,   661,   662,   663,   664,   665,
1987 <     666,   667,   668,   669,    37,    57,   490,   769,  1264,  1265,
1988 <     491,   492,   493,   494,    38,    51,   362,   363,   364,   365,
1989 <      39,   124,   125,   126,    40,    53,   373,   678,  1222,  1223,
1990 <     374,   375,   376,   377,    41,   185,   186,   187,   188,   189,
1991 <     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
1992 <     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
1993 <     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
1994 <     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
1995 <     230,   231,   232,   233,   234,   235,   236,   413,  1035,  1036,
1996 <     237,   411,  1013,  1014,   238,   239,   240,   241,   242,    42,
1997 <      55,   443,   444,   445,   446,   447,   744,  1239,  1240,   448,
1998 <     449,   450,   741,  1233,  1234,    43,    95,    96,    97,    98,
1999 <      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
2000 <     109,   110,   111,   112,   113,   114,    44,   293,   294,   295,
2001 <     296,   297,   298,   299,   300,   301
1504 >     396,     0,     0,   444,   457,     0,     0,   459,   529,   533,
1505 >     517,   518,   548,   520,   612,   557,   521,   522,   554,   528,
1506 >     527,   536,   526,   523,   524,   532,   531,   530,   555,   519,
1507 >     610,   611,   552,   596,   590,   606,   591,   592,   593,   601,
1508 >     609,   594,   603,   607,   597,   608,   598,   602,   595,   605,
1509 >     600,   599,   604,     0,   589,   553,   569,   570,   571,   564,
1510 >     582,   565,   566,   567,   577,   585,   568,   579,   583,   573,
1511 >     584,   574,   578,   572,   581,   576,   575,   580,     0,   563,
1512 >     549,   547,   550,   556,   551,   538,   545,   546,   543,   544,
1513 >     539,   540,   541,   542,   558,   559,   525,   535,   534,   537,
1514 >       0,     0,     0,     0,     0,     0,     0,     0,   299,     0,
1515 >       0,   435,     0,     0,     0,   294,   290,   293,   275,    50,
1516 >      51,     0,     0,   101,     0,     0,     0,     0,     0,     0,
1517 >       0,     0,     0,     0,     0,   153,     0,     0,     0,   333,
1518 >     650,   649,   655,   653,   656,   651,   652,   654,    86,    81,
1519 >      89,    80,    87,    88,    79,    83,    82,    74,    73,    78,
1520 >      75,    77,    76,    84,    85,     0,     0,   374,   128,     0,
1521 >       0,     0,   140,     0,   132,   133,   135,   134,     0,     0,
1522 >       0,     0,   110,   348,     0,     0,     0,   350,    31,    32,
1523 >      33,    34,    35,    36,    37,   263,   264,   255,   273,   272,
1524 >       0,   271,   256,   258,   260,   267,   259,   257,   266,   252,
1525 >     265,   254,   253,    38,    38,    38,    40,    39,   261,   262,
1526 >     418,   421,   422,   432,   429,   415,   430,   427,   428,     0,
1527 >     426,   431,   414,   420,   417,   419,   433,   416,   450,   451,
1528 >     465,   466,   587,     0,   561,     0,   313,   314,   324,   320,
1529 >     321,   323,   328,   325,   326,   319,   327,   322,     0,   318,
1530 >     312,   331,   330,   329,   311,   442,   441,   297,   296,   281,
1531 >     282,   280,     0,   279,     0,     0,     0,   107,   108,   176,
1532 >     172,   222,   210,   219,   208,   213,   228,   221,   226,   212,
1533 >     215,   223,   225,   229,   220,   227,   216,   218,   224,   214,
1534 >     217,     0,   206,   168,   170,   173,   174,   175,   186,   187,
1535 >     188,   181,   199,   182,   183,   184,   194,   202,   185,   196,
1536 >     200,   190,   201,   191,   195,   189,   198,   193,   192,   197,
1537 >       0,   180,   169,   171,   342,   340,   341,   380,   385,   391,
1538 >     394,   387,   393,   388,   392,   390,   386,   389,     0,   384,
1539 >     136,     0,     0,     0,     0,   131,   119,   118,   120,   121,
1540 >     357,   363,   369,   372,   365,   371,   366,   370,   368,   364,
1541 >     367,     0,   362,   358,   269,     0,    41,    42,    43,   424,
1542 >       0,   588,   562,   316,     0,   277,     0,   295,   292,   291,
1543 >       0,     0,     0,   204,     0,   178,     0,   382,     0,     0,
1544 >       0,     0,     0,   130,   360,     0,   270,   425,   317,   278,
1545 >     209,   207,   211,   205,   179,   383,   137,   139,   138,   150,
1546 >     149,   145,   147,   151,   148,   144,   146,     0,   143,   361,
1547 >     141,     0,   142
1548   };
1549  
1550 < /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
1551 <   STATE-NUM.  */
2006 < #define YYPACT_NINF -952
2007 < static const yytype_int16 yypact[] =
1550 >  /* YYPGOTO[NTERM-NUM].  */
1551 > static const yytype_int16 yypgoto[] =
1552   {
1553 <    -952,   888,  -952,  -233,  -260,  -258,  -952,  -952,  -952,  -255,
1554 <    -952,  -253,  -952,  -952,  -952,  -952,  -250,  -237,  -952,  -952,
1555 <    -228,  -226,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1556 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1557 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,   302,   766,  -136,
1558 <    -112,  -199,    17,  -193,   475,  -190,  -187,  -173,  -167,   702,
1559 <       2,   -46,  -149,   361,   520,  -140,  -134,  -130,  -121,  -102,
1560 <     -84,     4,  -952,  -952,  -952,  -952,  -952,   -82,   -77,   -62,
1561 <     -57,   -51,   -33,   -30,   -25,   -16,    -5,    -4,    20,    24,
1562 <      37,    40,    46,    49,    59,   286,  -952,  -952,  -952,  -952,
1563 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1564 <    -952,  -952,  -952,  -952,  -952,  -952,    36,  -952,  -952,    63,
1565 <    -952,    19,  -952,    70,     7,  -952,  -952,   159,  -952,    71,
1566 <      76,    79,    84,    91,    98,   104,   105,   107,   108,   109,
1567 <     112,   113,   114,   116,   117,   118,   121,   125,   126,   130,
1568 <     132,   136,   140,   142,   144,   146,   148,   153,   155,   157,
1569 <     161,   164,  -952,   165,  -952,   169,   170,   171,   172,   173,
1570 <     181,   184,   185,   194,   196,   198,   199,   200,   201,   204,
1571 <     206,   209,   210,   212,   213,    23,  -952,  -952,  -952,  -952,
1572 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1573 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1574 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1575 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1576 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1577 <    -952,  -952,  -952,   552,   784,    93,    88,   217,   215,   216,
1578 <     220,   224,   225,   226,   227,   231,   232,   234,   235,   239,
1579 <     133,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1580 <    -952,  -952,  -952,  -952,   243,   241,   245,    27,  -952,  -952,
1581 <    -952,  -952,   247,  -952,    25,  -952,   248,   250,   252,   259,
1582 <     260,   261,   266,    45,  -952,  -952,  -952,  -952,  -952,  -952,
2039 <    -952,  -952,   271,   269,   270,   272,   276,   278,   279,   280,
2040 <    -952,   281,   285,   289,   290,   303,  -952,  -952,  -952,  -952,
2041 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,    56,
2042 <      62,  -952,   357,   381,   396,   296,  -952,   363,   434,   436,
2043 <     374,   375,   444,   444,   449,   450,   387,   390,   462,   444,
2044 <     397,   400,   403,   404,   405,   318,  -952,   634,   703,  -952,
2045 <     342,   343,    15,  -952,  -952,  -952,   454,   348,  -952,  -952,
2046 <     346,   353,  -952,  -952,   158,  -952,  -952,  -952,   414,   444,
2047 <     421,   444,   494,   476,   497,   433,   435,   437,   500,   483,
2048 <     440,   510,   513,   514,   451,   444,   452,   453,   516,   499,
2049 <     461,   529,   530,   444,   533,   542,   512,   543,   546,   481,
2050 <     482,   417,   484,   419,   444,   444,   486,   444,   536,   489,
2051 <     493,   495,  -150,  -141,   496,   498,   444,   444,   560,   444,
2052 <     501,   503,   509,   511,   455,  -952,  -952,  -952,   446,   456,
2053 <    -952,   457,   459,    44,  -952,  -952,  -952,  -952,  -952,  -952,
2054 <    -952,   463,   467,   468,   485,   487,  -952,   490,   506,   507,
2055 <     508,   519,   524,   526,   527,   531,   532,   544,   160,  -952,
2056 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2057 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,   548,  -952,   550,
2058 <    -952,    12,  -952,  -952,  -952,   465,  -952,   551,   553,   554,
2059 <    -952,    14,  -952,  -952,  -952,  -952,  -952,   557,   559,   561,
2060 <     564,   585,   586,   591,   592,   230,   596,   613,   577,   537,
2061 <    -952,  -952,   640,   643,   549,  -952,   574,   555,   556,   562,
2062 <     563,    32,  -952,  -952,  -952,  -952,   623,   630,   631,   665,
2063 <     632,   633,   444,   575,  -952,  -952,   681,   639,   685,   688,
2064 <     689,   690,   691,   582,   693,   565,   694,   695,   589,  -952,
2065 <     590,   593,  -952,   594,     9,  -952,  -952,  -952,  -952,   601,
2066 <     607,  -952,    33,  -952,  -952,  -952,   604,   614,   615,  -952,
2067 <     616,   619,   620,   624,   625,   189,   628,   629,   635,   636,
2068 <     637,   638,   641,   642,   644,   646,   647,   651,   654,  -952,
2069 <     656,   610,   618,   627,   655,   660,   661,   662,   663,   664,
2070 <     667,   669,   670,   671,   223,  -952,  -952,  -952,  -952,  -952,
2071 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,   657,
2072 <     672,   673,   674,   676,   679,   680,   683,   684,   686,  -952,
2073 <     687,   696,   697,   699,   700,   701,   704,   705,   706,   238,
2074 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2075 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2076 <     730,   741,   659,  -952,   668,  -952,   746,   747,   707,   711,
2077 <    -952,   712,   713,   716,   717,   719,   720,   721,   722,   723,
2078 <     724,   725,   726,   727,   729,   731,   732,   733,   734,   735,
2079 <     736,   737,   738,   739,   740,   742,   743,   744,   745,   748,
2080 <     749,   750,   751,   752,   815,   753,   871,   754,   755,   767,
2081 <     771,   774,   775,   776,   777,   778,   779,   780,   781,   782,
2082 <     786,   790,   791,   315,   793,   794,   796,   797,   798,   800,
2083 <    -952,   799,   444,   756,   801,   795,   803,   805,  -952,  -952,
2084 <     760,   812,   769,   804,   807,   809,   864,   866,   869,   870,
2085 <     918,   566,   919,   927,   886,   934,   828,  -952,   937,   829,
2086 <     938,   833,  -952,  -952,   831,   942,   943,   772,   837,  -952,
2087 <     838,   842,   846,   847,   849,   850,   857,   860,   865,   867,
2088 <     868,   872,   873,   874,   875,   879,   883,   884,  -952,   887,
2089 <     889,  -952,   890,   861,   891,   892,   893,  -952,   894,   895,
2090 <     896,   897,   898,   899,   900,   901,   902,   903,   904,   905,
2091 <     906,  -952,   907,   909,   910,   149,  -952,  -952,  -952,  -952,
2092 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2093 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2094 <     976,   977,   978,   911,  -952,   914,   915,   916,   917,   920,
2095 <     921,   922,  -952,   923,   924,   925,   926,   928,   929,   930,
2096 <     -15,   931,   932,   933,   935,  -952,  -952,   993,   936,   998,
2097 <     940,  -952,  -952,   999,   939,   941,  -952,  -952,  -952,  -952,
2098 <    -952,  -952,  -952,  -952,  -952,   444,   444,   444,   444,   444,
2099 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2100 <    -952,  -952,  -952,  -952,  -952,  -952,   813,  1022,   444,  1047,
2101 <    1048,  1056,  1063,  1043,  1066,  1067,   444,   444,   560,   944,
2102 <    -952,  -952,  1050,   -13,  1008,  1053,  1054,  1011,  1012,  1013,
2103 <    1058,   949,  1060,  1061,  1062,  1064,  1085,  1065,  1068,  1023,
2104 <    1069,   959,  -952,   963,   964,  -952,  -952,   965,   966,  1070,
2105 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2106 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2107 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2108 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2109 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2110 <    -952,  -952,  -952,  -245,  -952,  -952,  -952,  -952,  -952,  -952,
2111 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2112 <    -952,  -952,  -952,  -952,  -952,  -202,  -952,  -952,  -952,  -952,
2113 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2114 <    -952,  -952,  -952,   560,   560,   560,  -952,  -952,  -952,  -952,
2115 <    -952,  -952,  -952,  -952,     1,   967,   969,    11,   970,   971,
2116 <    -952,   972,   973,   974,   975,  1106,   979,   980,   981,   982,
2117 <     983,   984,   985,   986,   987,   988,   989,  -952,   990,  1079,
2118 <     991,  -952,     0,   992,   994,   650,   995,  -952,  -952,  -952,
2119 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2120 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2121 <    1041,  1100,  1059,  1071,   997,  1072,  1073,  1074,  1075,  1076,
2122 <    1102,  1077,  1104,  1078,  1080,  1081,  1105,  1082,  1000,  1083,
2123 <    1108,  1084,  1002,  -952,  1004,  1005,  1006,  -952,  -952,  -952,
2124 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2125 <    -952,  -952,  -952,  -952,  -174,  -952,  -952,  -952,  -952,  -952,
2126 <    1007,   534,  1016,  -952,  1024,   621,  -952,  -952,  -952,  -952,
2127 <    -952,  -952,  1025,  1026,  1027,  1028,  1029,  1030,  1031,  1032,
2128 <    1033,  1034,  1035,  1036,  1037,  -952,  1038,  1039,  1040,  1042,
2129 <    1044,  1045,  1046,  1049,  1051,  1052,  1152,  1055,  1057,  1086,
2130 <    1087,  1088,  1089,  1090,  1091,  1092,  -952,  -952,  -952,  -952,
2131 <    -952,  -952,  -148,  -952,  -952,   815,  -952,   871,  -952,  -952,
2132 <    -952,  -952,  -952,  -145,  -952,  -952,  -952,  -952,  -952,  -129,
2133 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -117,  -952,
2134 <     447,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2135 <    -952,  -952,  -952,  -952,   -35,  -952,  -952,  -952,  -952,  -952,
2136 <     -10,  -952,  -952,  -952,  1170,   772,  1093,  1094,  1095,  1096,
2137 <    1097,  1153,  1098,  1099,  1101,  1103,  1107,  1109,  1110,  1111,
2138 <    1112,  1113,  1114,  1115,  1116,   908,  1117,  1118,  1119,  -952,
2139 <    -952,  -952,  -952,  -952,   -15,  -952,  -952,  -952,  -952,  -952,
2140 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,    -8,  -952,  -952,
2141 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2142 <    -952,  -952,    35,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2143 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2144 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,    80,  -952,
2145 <      13,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2146 <    -952,  1070,  -952,  -952,  -952,     1,  -952,    11,   447,  -952,
2147 <    1106,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2148 <    -952,  -952,  -952,  1079,  -952,     0,  -952,  -952,  -952,  -952,
2149 <    -952,  -952,  -952,  -952,    89,  -952,   366,  -952,  -952,  -952,
2150 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2151 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2152 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,    95,
2153 <    -952,  -952,  -952,  -952,  -952,  -952,   534,  -952,   621,    13,
2154 <    -952,  1152,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2155 <    -952,  -952,  -952,  -952,  -952,   366,  -952,  1153,  -952,  -952,
2156 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2157 <    -952,  -952,  -952,  -952,  -952,  -952,   908,  -952,  -952,  -952,
2158 <    -952,  -952,  -952,  -952
1553 >    -689,  -689,  -689,  -246,  -298,  -688,  -624,  -689,  -689,   964,
1554 >    -689,  -689,  -689,  -689,   947,  -689,  -689,  -689,  -689,  -689,
1555 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1556 >    -689,  -689,  -689,  -689,  1038,  -689,  -689,  -689,  -689,  -689,
1557 >    -689,   627,  -689,  -689,  -689,  -689,  -689,   543,  -689,  -689,
1558 >    -689,  -689,  -689,  -689,   959,  -689,  -689,  -689,  -689,    -6,
1559 >    -689,  -689,  -689,  -689,  -689,  -171,  -689,  -689,  -689,   616,
1560 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1561 >    -689,  -689,  -134,  -689,  -689,  -689,  -131,  -689,  -689,  -689,
1562 >     807,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1563 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1564 >    -108,  -689,  -689,  -689,  -689,  -689,  -118,  -689,   654,  -689,
1565 >    -689,  -689,    -2,  -689,  -689,  -689,  -689,  -689,   688,  -689,
1566 >    -689,  -689,  -689,  -689,  -689,  -689,  -112,  -689,  -689,  -689,
1567 >    -689,  -689,  -689,   613,  -689,  -689,  -689,  -689,  -689,   960,
1568 >    -689,  -689,  -689,  -689,   553,  -689,  -689,  -689,  -689,  -689,
1569 >    -122,  -689,  -689,  -689,   587,  -689,  -689,  -689,  -689,  -113,
1570 >    -689,  -689,  -689,   961,  -689,  -689,  -689,  -689,  -689,  -689,
1571 >    -689,  -689,  -689,  -689,  -689,   -92,  -689,  -689,  -689,  -689,
1572 >    -689,  -689,  -689,  -689,   685,  -689,  -689,  -689,  -689,  -689,
1573 >     965,  -689,  -689,  -689,  -689,  1043,  -689,  -689,  -689,  -689,
1574 >     781,  -689,  -689,  -689,  -689,   994,  -689,  -689,  -689,  -689,
1575 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1576 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1577 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1578 >    -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1579 >      75,  -689,  -689,  -689,    80,  -689,  -689,  -689,  -689,  -689,
1580 >    1076,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,  -689,
1581 >    -689,  -689,  -689,   967,  -689,  -689,  -689,  -689,  -689,  -689,
1582 >    -689,  -689
1583   };
1584  
1585 < /* YYPGOTO[NTERM-NUM].  */
1586 < static const yytype_int16 yypgoto[] =
1585 >  /* YYDEFGOTO[NTERM-NUM].  */
1586 > static const yytype_int16 yydefgoto[] =
1587   {
1588 <    -952,  -952,  -952,  -816,  -342,  -951,  -426,  -952,  -952,   578,
1589 <    -952,  -952,  -952,  -952,   541,  -952,  -952,  -952,     5,  -952,
1590 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1591 <    -952,  -952,  1234,  -952,  -952,  -952,  -952,  -952,  1122,  -952,
1592 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1593 <    -952,  -952,  -952,  -952,  -952,   491,  -952,  -952,  -952,  -952,
1594 <    -952,  -952,  -952,  -952,  -952,  -952,  -176,  -952,  -952,  -952,
1595 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1596 <    -952,  -952,  -952,  -952,  -155,  -952,  -952,  -147,  -952,  -952,
1597 <    -952,  -952,   708,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1598 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1599 <    -952,  -952,   -80,  -952,   819,  -952,  -952,  -952,    48,  -952,
1600 <    -952,  -952,  -952,  -952,   853,  -952,  -952,  -952,  -952,  -952,
1601 <    -952,  -952,  -952,   -56,  -952,  -952,   -53,  -952,  -952,  -952,
1602 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1603 <     802,  -952,  -952,  -952,  -952,  -952,  -952,   762,  -952,  -952,
1604 <    -952,  -952,  -952,  -119,  -952,  -952,  -952,   757,  -952,  -952,
1605 <    -952,  -952,  -120,  -952,  -952,  -952,  -952,   682,  -952,  -952,
1606 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1607 <    -116,  -952,  -952,  -115,  -952,  -952,  -952,  -952,  -952,  -952,
1608 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,   -63,
1609 <    -952,   841,  -952,  -952,  -952,  -952,  -952,  1021,  -952,  -952,
1610 <    -952,  -952,  1212,  -952,  -952,  -952,  -952,  -952,  -952,   -34,
1611 <    -952,   968,  -952,  -952,  -952,  -952,  1154,  -952,  -952,  -952,
1612 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1613 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1614 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1615 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1616 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,   111,
1617 <    -952,  -952,  -952,   115,  -952,  -952,  -952,  -952,  -952,  -952,
2194 <    -952,  -952,   945,  -952,  -952,  -952,  -952,  -952,   -36,  -952,
2195 <    -952,  -952,  -952,  -952,   -32,  -952,  -952,  1249,  -952,  -952,
2196 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2197 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  1120,  -952,
2198 <    -952,  -952,  -952,  -952,  -952,  -952
1588 >      -1,     1,    26,   815,   816,  1076,  1077,    27,   215,   216,
1589 >     217,   218,    28,   259,   260,   261,   262,   263,   264,   265,
1590 >     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
1591 >     276,   277,    29,    77,    78,    79,    80,    81,    30,    63,
1592 >     489,   490,   491,   492,    31,    70,   574,   575,   576,   577,
1593 >     578,   579,    32,   281,   282,   283,   284,   285,  1033,  1034,
1594 >    1035,  1036,  1037,  1213,  1287,  1288,    33,    64,   505,   506,
1595 >     507,   508,   509,   510,   511,   512,   513,   514,   515,   516,
1596 >     743,  1190,  1191,   517,   737,  1161,  1162,    34,    53,   329,
1597 >     330,   331,   332,   333,   334,   335,   336,   337,   338,   339,
1598 >     340,   341,   342,   343,   344,   345,   346,   347,   612,  1060,
1599 >    1061,    35,    61,   475,   722,  1132,  1133,   476,   477,   478,
1600 >    1136,   976,   977,   479,   480,    36,    59,   453,   454,   455,
1601 >     456,   457,   458,   459,   707,  1118,  1119,   460,   461,   462,
1602 >      37,    65,   522,   523,   524,   525,   526,    38,   289,   290,
1603 >     291,    39,    72,   587,   588,   589,   590,   591,   800,  1231,
1604 >    1232,    40,    68,   560,   561,   562,   563,   783,  1208,  1209,
1605 >      41,    54,   363,   364,   365,   366,   367,   368,   369,   370,
1606 >     371,   372,   373,   635,  1089,  1090,   374,   375,   376,   377,
1607 >     378,    42,    60,   466,   467,   468,   469,    43,    55,   382,
1608 >     383,   384,   385,    44,   110,   111,   112,    45,    57,   392,
1609 >     393,   394,   395,    46,   161,   162,   163,   164,   165,   166,
1610 >     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
1611 >     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
1612 >     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
1613 >     197,   198,   199,   200,   201,   202,   203,   204,   423,   938,
1614 >     939,   205,   421,   913,   914,   206,   207,   208,    47,    93,
1615 >      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
1616 >     104,    48,   231,   232,   233,   234,   235,   236,   237,   238,
1617 >     239,   240
1618   };
1619  
1620 < /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
1621 <   positive, shift that token.  If negative, reduce the rule which
1622 <   number is the opposite.  If zero, do what YYDEFACT says.
1623 <   If YYTABLE_NINF, syntax error.  */
2205 < #define YYTABLE_NINF -1
2206 < static const yytype_uint16 yytable[] =
1620 >  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
1621 >     positive, shift that token.  If negative, reduce the rule whose
1622 >     number is the opposite.  If YYTABLE_NINF, syntax error.  */
1623 > static const yytype_int16 yytable[] =
1624   {
1625 <     586,   587,   734,   274,    47,    67,    48,   593,   122,    52,
1626 <     560,    54,  1231,   486,    59,   495,   359,  1224,   122,   115,
1627 <     359,  1225,  1237,  1452,   128,  1453,   527,    60,   274,    45,
1628 <      46,   129,   130,   527,   569,   131,    63,   682,    64,   684,
1629 <    1454,    68,   132,   118,  1455,   436,   285,   528,   437,   725,
1630 <     726,   133,    69,   698,   528,   134,   135,   560,   727,   728,
1631 <    1226,   706,   136,   569,  1227,   121,   137,   138,   139,   496,
1632 <     140,   127,   717,   718,   243,   720,   141,   244,  1267,  1177,
1633 <    1178,  1179,  1180,  1181,   731,   732,   286,   735,  1303,   495,
1634 <     438,   245,  1304,   439,   486,   142,   143,   246,   123,   497,
1635 <     144,   287,  1228,  1229,  1230,   498,   360,   145,   123,   281,
1636 <     360,   146,   147,   148,  1370,   284,   149,  1374,  1371,   150,
1637 <     151,  1375,   275,   288,   329,   289,    70,   290,   291,   152,
1638 <     330,   561,   331,  1376,   247,   153,   154,  1377,   155,   156,
1639 <     157,   158,   159,   496,   332,  1379,   292,   275,   440,  1380,
1640 <     802,   529,   276,   160,   803,   570,  1162,  1163,   529,   369,
1641 <     369,   451,   161,   333,   162,   163,   441,   164,   499,   487,
1642 <     165,   166,   361,   497,   167,   804,   361,   276,   561,   498,
1643 <     452,   334,   530,   337,   570,   168,   453,   805,   338,   530,
1644 <     248,   249,   250,   251,   252,   253,   254,   255,   562,   806,
1645 <     861,   488,  1232,   339,   807,  1197,  1198,   169,   340,   170,
1646 <     454,   455,  1238,   171,   341,   456,   808,   172,   173,   174,
1647 <     175,   176,   571,   809,   600,   177,   178,  1392,   810,   457,
1648 <     811,  1393,   342,  1268,   179,   343,   458,  1269,   256,   629,
1649 <     344,   630,   499,   812,   631,   562,   601,   602,   632,   345,
1650 <     487,   571,  1394,   603,  1445,   459,  1395,  1456,  1446,   563,
1651 <     346,   347,   489,   633,   634,   635,   180,   335,   181,   636,
1652 <     367,   813,   880,   257,   182,   771,   814,   778,   672,   183,
1653 <     370,   370,   488,   460,   184,   348,   434,    76,   637,   349,
1654 <     524,   461,   638,   639,   442,   853,   885,  1447,   815,    77,
1655 <     357,  1448,   350,    67,   302,   351,   563,   747,   543,   462,
1656 <     816,   352,   817,   818,   353,   371,   371,   819,   463,   464,
1657 <      78,    79,   585,   640,   354,   641,    80,   358,    81,  1053,
1658 <    1054,  1055,   604,   605,   606,   366,   378,   607,   642,    68,
1659 <     303,   379,  1450,   489,   380,   608,  1451,   372,   372,   381,
1660 <      69,  1466,   465,   466,   258,  1467,   382,  1485,   609,   610,
1661 <     643,  1486,   285,   383,   895,   896,   897,   898,   899,   384,
1662 <     385,  1468,   386,   387,   388,   611,   612,   389,   390,   391,
1663 <     820,   392,   393,   394,    82,    83,   395,   821,   259,   304,
1664 <     396,   397,   644,    84,    85,   398,   519,   399,   822,   823,
1665 <    1065,   400,   286,   613,  1469,   401,   645,   402,   824,   403,
1666 <     467,   404,  1142,   405,    86,    87,  1470,   287,   406,   646,
1667 <     407,   679,   408,   766,    70,   305,   409,   306,   307,   410,
1668 <     412,    88,    89,  1471,   414,   415,   416,   417,   418,   288,
1669 <    1472,   289,    90,   290,   291,  1473,   419,  1474,   733,   420,
1670 <     421,    91,   788,   789,   790,   791,   792,   793,   794,   422,
1671 <    1475,   423,   292,   424,   425,   426,   427,  1381,  1382,   428,
1672 <     308,   429,   309,   310,   430,   431,   128,   432,   433,   506,
1673 <     507,   508,   647,   129,   130,   509,   929,   131,   311,   510,
1674 <     511,   512,   513,  1476,   132,   648,   514,   515,  1383,   516,
1675 <     517,   951,  1194,   133,   518,   521,   522,   134,   135,  1477,
1676 <     523,   526,   576,   536,   136,   537,  1384,   538,   137,   138,
1677 <     139,   302,   140,  1385,   539,   540,   541,  1478,   141,  1479,
1678 <    1480,   542,   312,   545,   546,   547,   577,   548,    92,    93,
1679 <      94,   549,  1386,   550,   551,   552,   554,   142,   143,   355,
1680 <     555,   578,   144,   436,   556,   557,   437,   303,   579,   145,
1681 <     313,   314,   580,   146,   147,   148,   558,   581,   149,   582,
1682 <    1387,   150,   151,   583,   584,   802,  1184,   585,  1388,   803,
1683 <     599,   152,   588,   589,  1192,  1193,   590,   153,   154,   591,
1684 <     155,   156,   157,   158,   159,   592,   594,  1481,   438,   595,
1685 <     804,   439,   596,   597,   598,   160,   304,   670,   671,   674,
1686 <     675,   676,   805,   681,   161,  1482,   162,   163,   677,   164,
1687 <     683,  1389,   165,   166,   806,  1483,   167,   685,  1306,   807,
1688 <     687,   686,   688,   691,   689,   600,   690,   168,   692,   693,
1689 <    1390,   808,   305,   694,   306,   307,   695,   696,   809,   701,
1690 <     697,   699,   700,   810,   702,   811,   440,   601,   602,   169,
1691 <     703,   170,   704,   705,   603,   171,   707,   709,   812,   172,
1692 <     173,   174,   175,   176,   441,   708,   710,   177,   178,   711,
1693 <     712,   713,   714,   715,   716,   719,   179,   308,   722,   309,
1694 <     310,   721,   723,   733,   724,   729,   813,   730,   872,  1082,
1695 <     736,   814,   737,   247,   629,   311,   630,  1307,   738,   631,
1696 <     739,   742,   780,   632,   781,  1321,   782,   740,   180,   783,
1697 <     181,   743,   745,   815,   746,   749,   182,   773,   633,   634,
1698 <     635,   183,   750,   751,   636,   816,   184,   817,   818,  1308,
1699 <     784,   785,   819,   604,   605,   606,   786,   787,   607,   312,
1700 <     752,   795,   753,   637,  1309,   755,   608,   638,   639,   248,
1701 <     249,   250,   251,   252,   253,   254,   255,    76,   796,   609,
1702 <     610,   756,   757,   758,  1310,  1311,   797,   313,   314,    77,
1703 <    1312,  1313,  1314,  1315,   759,   451,   611,   612,   640,   760,
1704 <     641,   761,   762,  1316,  1322,   799,   763,   764,   800,   798,
1705 <      78,    79,   442,   642,   452,   820,    80,   256,    81,   765,
1706 <     453,   801,   821,   768,   613,   770,   775,   849,   776,   777,
1707 <     858,   850,   855,   822,   823,   643,  1323,   851,   852,   856,
1708 <     857,   859,   860,   824,   454,   455,   863,   862,   864,   456,
1709 <     865,  1324,   257,   866,   867,   868,   869,   870,   871,   873,
1710 <     874,   875,   876,   457,  1274,   525,   559,   644,   877,   879,
1711 <     458,  1325,  1326,   882,    82,    83,   887,  1327,  1328,  1329,
1712 <    1330,   645,   883,    84,    85,   916,   888,   889,   890,   459,
1713 <    1331,   891,   892,   917,   646,   953,   893,   894,     2,     3,
1714 <     902,   903,   918,     4,    86,    87,   954,   904,   905,   906,
1715 <     907,   957,   958,   908,   909,  1095,   910,   460,   911,   912,
1716 <       5,    88,    89,   913,     6,   461,   914,     7,   915,   931,
1717 <     919,   955,    90,   258,     8,   920,   921,   922,   923,   924,
1718 <     956,    91,   925,   462,   926,   927,   928,   932,   933,   934,
1719 <       9,   935,   463,   464,   936,   937,  1182,   647,   938,   939,
1720 <    1068,   940,   942,    10,    11,  1066,    12,   259,  1069,  1071,
1721 <     648,   943,   944,    13,   945,   946,   947,  1072,  1073,   948,
1722 <     949,   950,   959,   960,   961,   962,   465,   466,   963,   964,
1723 <      14,   965,   966,   967,   968,   969,   970,   971,   972,   973,
1724 <      15,   974,    16,   975,   976,   977,   978,   979,   980,   981,
1725 <     982,   983,   984,  1074,   985,   986,   987,   988,  1076,    17,
1726 <     989,   990,   991,   992,   993,  1015,  1037,  1038,    92,    93,
1727 <      94,   994,   995,   996,   997,   998,    18,   999,  1000,  1039,
1728 <    1001,  1002,  1003,  1040,   467,  1004,  1041,  1042,  1043,  1044,
1729 <    1045,  1046,  1047,  1048,  1049,  1005,  1006,  1007,  1050,  1008,
1730 <    1009,  1010,  1051,  1052,  1011,  1058,  1059,  1012,  1060,  1061,
1731 <    1062,    19,  1063,  1077,  1064,  1078,  1067,  1070,  1079,  1080,
1732 <      20,    21,  1075,  1081,  1083,    22,    23,  1016,  1017,  1018,
1733 <    1019,  1020,  1084,  1021,  1022,  1085,  1023,  1024,  1025,  1086,
1734 <    1087,  1026,  1088,  1090,  1089,  1091,  1092,  1093,  1094,  1098,
1735 <    1099,  1027,  1028,  1029,  1100,  1030,  1031,  1032,  1101,  1102,
1736 <    1033,  1103,  1104,  1034,  1420,  1421,  1422,  1423,  1424,  1105,
1737 <    1425,  1426,  1106,  1427,  1428,  1429,  1120,  1107,  1430,  1108,
1738 <    1109,  1144,  1145,  1146,  1110,  1111,  1112,  1113,  1431,  1432,
1739 <    1433,  1114,  1434,  1435,  1436,  1115,  1116,  1437,  1170,  1117,
1740 <    1438,  1118,  1119,  1172,  1174,  1183,  1121,  1122,  1123,  1125,
1741 <    1126,  1127,  1128,  1129,  1130,  1131,  1132,  1133,  1134,  1135,
1742 <    1136,  1137,  1139,  1147,  1140,  1141,  1148,  1149,  1150,  1151,
1743 <    1185,  1186,  1152,  1153,  1154,  1155,  1156,  1157,  1158,  1187,
1744 <    1159,  1160,  1161,  1166,  1167,  1168,  1188,  1169,  1189,  1190,
1745 <    1191,  1171,  1173,  1176,  1175,  1196,  1195,  1199,  1200,  1201,
1746 <    1202,  1203,  1204,  1205,  1206,  1207,  1208,  1209,  1211,  1210,
2330 <    1212,  1216,  1214,  1213,  1215,  1217,  1218,  1219,  1220,  1235,
2331 <    1221,  1236,  1241,  1242,  1243,  1244,  1245,  1246,  1247,  1263,
2332 <    1277,  1251,  1252,  1253,  1254,  1255,  1256,  1257,  1258,  1259,
2333 <    1260,  1261,  1262,  1266,  1272,  1278,  1273,  1287,  1279,  1289,
2334 <    1293,  1275,  1281,  1297,  1299,  1295,  1300,  1301,  1302,  1305,
2335 <    1280,  1282,  1283,  1284,  1285,  1286,  1288,  1290,  1319,  1291,
2336 <    1292,  1294,  1296,  1298,  1357,  1403,  1320,  1334,  1335,  1336,
2337 <    1337,  1338,  1339,  1340,  1341,  1342,  1343,  1344,  1345,  1346,
2338 <    1347,  1348,  1349,  1396,  1350,   336,  1351,  1352,  1353,  1444,
2339 <    1493,  1354,  1492,  1355,  1356,  1464,  1143,  1361,  1491,  1362,
2340 <     779,   767,   930,  1397,  1462,  1461,   881,  1487,  1488,   886,
2341 <    1463,   952,   772,   854,  1489,  1490,   368,  1458,  1373,   435,
2342 <    1372,  1460,   680,  1459,   356,     0,     0,     0,  1363,  1364,
2343 <    1365,  1366,  1367,  1368,  1369,  1398,  1399,  1400,  1401,  1402,
2344 <    1407,  1408,     0,  1409,     0,  1410,     0,     0,     0,  1411,
2345 <       0,  1412,  1413,  1414,  1415,  1416,  1417,  1418,  1419,  1441,
2346 <    1442,  1443,   520,   673,     0,     0,     0,     0,   748,     0,
1625 >     842,   843,   598,   279,  1087,   601,   108,   603,   604,  1058,
1626 >     689,   557,   379,   486,   690,    73,   379,   108,   841,   486,
1627 >     518,   241,   691,   114,   463,    51,   692,    52,   115,   116,
1628 >    1029,   117,   118,  1102,   212,   293,   119,  1103,    56,   463,
1629 >      58,  1129,    74,  1104,   120,   121,   242,  1105,   243,   279,
1630 >      75,    62,   122,    49,    50,   123,   124,   125,   519,  1234,
1631 >      66,    73,   126,  1235,   109,   389,   583,   557,   287,    67,
1632 >     380,    69,   287,   244,   380,   109,  1239,   127,   128,  1243,
1633 >    1240,  1059,   245,  1244,   518,   444,   129,   487,    74,   130,
1634 >     131,   846,   847,   487,   520,   470,    75,    71,   132,   656,
1635 >     105,   658,   659,   445,   246,   133,   558,   134,   247,   135,
1636 >      76,   136,   669,   137,   138,  1260,   248,   674,  1029,   249,
1637 >     250,   446,   519,   106,   139,  1030,   213,   684,   685,   140,
1638 >     141,   142,   381,   143,   144,   145,   381,   107,   146,   698,
1639 >     521,   700,   701,  1245,   464,   447,   471,  1246,   214,   251,
1640 >     348,   113,   349,   472,   350,   473,    76,   209,   520,   464,
1641 >     390,   584,   558,   288,   147,   583,   252,   288,   351,   253,
1642 >     254,   255,  -129,   311,   148,   149,   150,   151,   152,   153,
1643 >     154,   210,   488,  1130,   569,   391,   352,   493,   488,   312,
1644 >     313,  1088,  1131,   314,   211,  1073,  1074,  1075,   448,   219,
1645 >     220,   353,   389,   354,   521,   494,   449,   450,   221,   278,
1646 >     355,  1253,   474,  1030,   286,  1254,   256,   292,  -129,   280,
1647 >    1031,   356,   212,   495,   481,   559,   222,   451,   566,   294,
1648 >     155,   156,   157,   315,   158,   159,   761,   647,   732,   257,
1649 >     258,   465,   387,   160,  1032,   357,   555,   496,   442,   717,
1650 >     316,   317,   318,   319,   320,  1214,   465,   223,   321,   484,
1651 >     584,   568,   322,   295,   296,   280,   224,   358,   323,   225,
1652 >     226,    82,   299,   300,   227,   228,   229,   324,   325,   570,
1653 >     585,   559,   497,   586,   301,   302,   297,   359,   841,   326,
1654 >     653,   802,   784,   581,    83,    84,   360,   390,   230,  1255,
1655 >     498,    85,   452,  1256,   303,   304,   493,  1108,  1031,   752,
1656 >     713,   327,   537,   828,   213,  1257,   499,   444,   833,  1258,
1657 >     724,   836,   391,   470,   494,   840,   305,    86,    87,   306,
1658 >    1109,   307,  1032,   500,   501,   445,   214,   308,   386,    88,
1659 >      89,    90,   495,   396,   397,   361,   571,    91,    92,   398,
1660 >    1264,   399,   400,   446,  1265,   328,  1198,  1290,  1110,   401,
1661 >     569,  1291,   402,   403,   572,   404,   496,   405,   362,   406,
1662 >    1279,   407,  1280,   408,   471,   643,   409,   447,   410,   585,
1663 >     573,   472,   586,   473,   502,  1236,  1237,  1238,   411,  1111,
1664 >    1112,   412,   564,   413,   114,  1113,   414,   415,   626,   115,
1665 >     116,   497,   117,   118,   503,   416,   417,   119,   504,   794,
1666 >     418,  1250,   746,   419,   597,   120,   121,  1281,  1199,   498,
1667 >    1114,   420,   422,   122,   424,   425,   123,   124,   125,   596,
1668 >     448,   426,   427,   126,  1282,   499,  1115,   428,   449,   450,
1669 >     474,   808,   809,   810,   811,   812,   813,   814,   127,   128,
1670 >    1200,   535,   500,   501,  1141,   570,   429,   129,  1201,   451,
1671 >     130,   131,   430,   431,   432,   433,   434,  1202,   435,   132,
1672 >    1142,   436,   437,  1283,  1284,   438,   133,   439,   134,  1143,
1673 >     135,   440,   136,   441,   137,   138,   482,   483,   527,   222,
1674 >     528,  1203,   241,  1204,  1205,   139,   309,   529,  1116,   530,
1675 >     140,   141,   142,   502,   143,   144,   145,  1206,   531,   146,
1676 >     532,   533,   534,  1144,  1207,  1145,  1117,   242,   538,   243,
1677 >     223,   539,   571,   503,   540,  1285,   541,   504,   542,   224,
1678 >    1286,   543,   225,   226,   452,   147,   544,   227,   228,   229,
1679 >     572,   545,   546,  1146,   244,   148,   149,   150,   151,   152,
1680 >     153,   154,   547,   245,   548,   549,   573,   550,   551,   552,
1681 >     553,   230,  1048,  1049,  1050,  1051,  1052,  1053,  1054,   554,
1682 >     565,   580,   592,   593,  1147,   246,  1148,   594,   595,   247,
1683 >     597,   599,   600,   602,   605,   606,   607,   248,  1261,   608,
1684 >     249,   250,   628,   609,   610,  1149,   611,   613,   614,   615,
1685 >     616,   155,   156,   157,   617,   158,   159,   348,   618,   349,
1686 >     619,   350,   620,   621,   160,   622,   623,  1150,   624,   625,
1687 >     251,   649,  1151,   629,   630,   351,  1152,   631,   632,   633,
1688 >    1153,   634,     2,     3,   636,  1154,     4,   252,   637,  1155,
1689 >     253,   254,   255,   352,   638,   639,   640,   641,     5,   642,
1690 >    1156,     6,     7,  1157,   645,  1158,   646,   650,   353,     8,
1691 >     354,   651,   652,   655,   657,   661,  1159,   355,   660,   662,
1692 >     663,     9,   664,  1160,    10,    11,   665,   666,   356,   667,
1693 >     668,   670,   671,   672,   673,   675,   676,   256,   677,   678,
1694 >     679,   680,    12,   681,   682,    13,   683,   686,   697,   687,
1695 >     311,   688,   357,   693,   694,   695,    14,   696,   699,   703,
1696 >     257,   258,   916,  1221,   917,   918,   312,   313,   702,   726,
1697 >     314,   705,   727,   706,   358,   754,    15,    16,   704,   757,
1698 >     763,   764,   708,   709,   710,   711,   712,   715,   716,   719,
1699 >     720,   721,    17,   723,   359,   728,   729,   730,   734,   748,
1700 >     731,   755,  1168,   360,  1169,  1170,   735,   736,   738,    18,
1701 >     315,   739,   740,   741,   742,   744,   745,   749,   750,   751,
1702 >     756,   758,    19,    20,   759,  1222,   760,   316,   317,   318,
1703 >     319,   320,   762,   765,   766,   321,   767,   768,   769,   322,
1704 >     770,   771,   893,   772,   773,   323,    21,   774,   775,   776,
1705 >     777,   782,   361,   778,   324,   325,   779,  1223,   780,    22,
1706 >     796,   781,   786,   787,    23,  1224,   326,   788,   789,    24,
1707 >     790,   797,    25,   791,  1225,   362,   792,   793,   919,   920,
1708 >     921,   826,   798,   922,   923,   827,   924,   925,   327,   926,
1709 >     830,   927,   799,   801,   928,   804,   929,   930,  1226,   805,
1710 >    1227,  1228,   931,   806,   807,   817,   932,   831,   818,   819,
1711 >     933,   934,   935,   820,  1229,   821,   822,   936,  1171,  1172,
1712 >    1173,  1230,   937,  1174,  1175,   823,  1176,  1177,   824,  1178,
1713 >     825,  1179,   328,   832,  1180,   829,  1181,  1182,   834,   835,
1714 >     837,   838,  1183,   839,   841,   844,  1184,   845,   855,    82,
1715 >    1185,  1186,  1187,   849,   852,   848,   964,  1188,   894,   895,
1716 >     896,   850,  1189,   897,   898,   851,   899,   900,   853,   901,
1717 >     854,   902,    83,    84,   903,   856,   904,   905,   857,    85,
1718 >     858,   859,   906,   861,   860,   862,   907,   863,   864,   865,
1719 >     908,   909,   910,   866,   867,   868,   869,   911,   870,   871,
1720 >     872,   873,   912,   874,   875,    86,    87,   876,   877,   878,
1721 >     879,   960,   880,   881,   882,   883,   884,    88,    89,    90,
1722 >     885,   886,   887,   963,   888,    91,    92,   889,   962,   890,
1723 >     891,   892,   915,   940,   941,   942,   943,   944,   945,   946,
1724 >     947,   948,   949,   950,   951,   952,   965,   953,   954,   955,
1725 >     956,   957,   958,   966,   961,   959,   967,   968,   969,   970,
1726 >     972,   973,   975,   971,   981,   982,   984,   985,   978,   974,
1727 >     979,   987,   988,   980,   989,   983,   990,  1215,   991,   993,
1728 >     994,   986,   992,   995,   996,   997,   998,  1025,   999,  1038,
1729 >    1000,  1039,  1001,  1002,  1003,  1040,  1041,  1004,  1005,  1044,
1730 >    1006,  1007,  1008,  1009,  1010,  1011,  1012,  1013,  1014,  1015,
1731 >    1016,  1017,  1018,  1019,  1020,  1021,  1022,  1046,  1023,  1024,
1732 >    1247,  1027,  1028,  1026,  1042,  1043,  1045,  1047,  1055,  1211,
1733 >    1056,  1057,  1062,  1063,  1064,  1065,  1066,  1067,  1068,  1069,
1734 >    1070,  1071,  1072,  1078,  1079,  1080,  1081,  1082,  1083,  1084,
1735 >    1085,  1086,  1259,  1091,  1092,  1093,  1094,  1095,  1096,  1270,
1736 >    1097,  1098,  1271,  1099,  1272,   298,   733,   795,  1100,  1101,
1737 >    1292,   747,  1274,  1273,  1106,  1107,  1120,  1266,  1269,  1121,
1738 >     725,  1122,  1268,  1248,  1123,   753,   627,  1124,  1125,  1126,
1739 >     803,   714,  1134,  1289,  1127,  1275,  1128,   785,  1267,  1137,
1740 >    1138,   718,  1135,   388,  1139,   443,  1140,  1163,  1164,  1165,
1741 >    1166,  1167,  1192,  1193,  1194,  1195,  1196,  1197,  1210,   310,
1742 >    1216,  1217,  1212,   654,  1218,  1219,  1220,  1233,  1249,   485,
1743 >    1242,  1263,  1276,  1241,  1251,  1252,  1262,  1277,  1278,     0,
1744 >       0,     0,     0,     0,     0,     0,     0,     0,   536,     0,
1745 >       0,     0,     0,     0,     0,     0,   556,     0,     0,     0,
1746 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1747         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1748         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1749 <       0,     0,     0,   544
1749 >     567,     0,     0,     0,     0,     0,     0,     0,     0,   582,
1750 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1751 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1752 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1753 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1754 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1755 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1756 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1757 >       0,     0,     0,     0,   644,     0,     0,     0,     0,     0,
1758 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1759 >       0,     0,     0,     0,     0,     0,     0,   648
1760   };
1761  
1762   static const yytype_int16 yycheck[] =
1763   {
1764 <     342,   343,   428,     1,   264,     1,   264,   349,     1,   264,
1765 <       1,   264,    11,     1,   264,     1,     1,   262,     1,   155,
1766 <       1,   266,    11,    10,     1,    12,     1,   264,     1,   262,
1767 <     263,     8,     9,     1,     1,    12,   264,   379,   264,   381,
1768 <      27,    37,    19,   155,    31,     1,     1,    22,     4,   199,
1769 <     200,    28,    48,   395,    22,    32,    33,     1,   199,   200,
1770 <     262,   403,    39,     1,   266,   264,    43,    44,    45,    55,
1771 <      47,   264,   414,   415,   264,   417,    53,   264,    78,   895,
1772 <     896,   897,   898,   899,   426,   427,    41,   429,   262,     1,
1773 <      46,   264,   266,    49,     1,    72,    73,   264,    91,    85,
1774 <      77,    56,  1053,  1054,  1055,    91,    91,    84,    91,   155,
1775 <      91,    88,    89,    90,   262,   264,    93,   262,   266,    96,
1776 <      97,   266,   120,    78,   264,    80,   122,    82,    83,   106,
1777 <     264,   122,   262,   262,     1,   112,   113,   266,   115,   116,
1778 <     117,   118,   119,    55,   265,   262,   101,   120,   104,   266,
1779 <       1,   126,   150,   130,     5,   122,   171,   172,   126,     1,
1780 <       1,     1,   139,   265,   141,   142,   122,   144,   154,   157,
1781 <     147,   148,   157,    85,   151,    26,   157,   150,   122,    91,
1782 <      20,   265,   157,   265,   122,   162,    26,    38,   265,   157,
1783 <      57,    58,    59,    60,    61,    62,    63,    64,   189,    50,
1784 <     542,   189,   201,   265,    55,   218,   219,   184,   265,   186,
1785 <      50,    51,   201,   190,   265,    55,    67,   194,   195,   196,
1786 <     197,   198,   189,    74,     1,   202,   203,   262,    79,    69,
1787 <      81,   266,   265,   233,   211,   265,    76,   237,   105,     1,
1788 <     265,     3,   154,    94,     6,   189,    23,    24,    10,   265,
1789 <     157,   189,   262,    30,   262,    95,   266,   244,   266,   250,
1790 <     265,   265,   250,    25,    26,    27,   243,   263,   245,    31,
1791 <     263,   122,   263,   140,   251,   263,   127,   263,   263,   256,
1792 <     122,   122,   189,   123,   261,   265,   263,     1,    50,   265,
1793 <     263,   131,    54,    55,   250,   263,   263,   262,   149,    13,
1794 <     264,   266,   265,     1,     1,   265,   250,   263,   263,   149,
1795 <     161,   265,   163,   164,   265,   157,   157,   168,   158,   159,
1796 <      34,    35,   133,    85,   265,    87,    40,   264,    42,    14,
1797 <      15,    16,   109,   110,   111,   265,   265,   114,   100,    37,
1798 <      37,   265,   262,   250,   265,   122,   266,   189,   189,   265,
1799 <      48,   262,   192,   193,   221,   266,   265,   262,   135,   136,
1800 <     122,   266,     1,   265,   175,   176,   177,   178,   179,   265,
1801 <     265,     5,   265,   265,   265,   152,   153,   265,   265,   265,
1802 <     231,   265,   265,   265,    98,    99,   265,   238,   255,    86,
1803 <     265,   265,   154,   107,   108,   265,   263,   265,   249,   250,
1804 <     742,   265,    41,   180,    38,   265,   168,   265,   259,   265,
1805 <     250,   265,   263,   265,   128,   129,    50,    56,   265,   181,
1806 <     265,   263,   265,   263,   122,   122,   265,   124,   125,   265,
1807 <     265,   145,   146,    67,   265,   265,   265,   265,   265,    78,
1808 <      74,    80,   156,    82,    83,    79,   265,    81,   133,   265,
1809 <     265,   165,   222,   223,   224,   225,   226,   227,   228,   265,
1810 <      94,   265,   101,   265,   265,   265,   265,    20,    21,   265,
1811 <     167,   265,   169,   170,   265,   265,     1,   265,   265,   262,
1812 <     265,   265,   244,     8,     9,   265,   263,    12,   185,   265,
1813 <     265,   265,   265,   127,    19,   257,   265,   265,    51,   265,
1814 <     265,   263,   928,    28,   265,   262,   265,    32,    33,   143,
1815 <     265,   264,   155,   265,    39,   265,    69,   265,    43,    44,
1816 <      45,     1,    47,    76,   265,   265,   265,   161,    53,   163,
1817 <     164,   265,   229,   262,   265,   265,   155,   265,   252,   253,
1818 <     254,   265,    95,   265,   265,   265,   265,    72,    73,   263,
1819 <     265,   155,    77,     1,   265,   265,     4,    37,   262,    84,
1820 <     257,   258,   199,    88,    89,    90,   263,   133,    93,   133,
1821 <     123,    96,    97,   199,   199,     1,   918,   133,   131,     5,
1822 <     262,   106,   133,   133,   926,   927,   199,   112,   113,   199,
1823 <     115,   116,   117,   118,   119,   133,   199,   231,    46,   199,
1824 <      26,    49,   199,   199,   199,   130,    86,   265,   265,   155,
1825 <     262,   265,    38,   199,   139,   249,   141,   142,   265,   144,
1826 <     199,   174,   147,   148,    50,   259,   151,   133,    94,    55,
1827 <     133,   155,   199,   133,   199,     1,   199,   162,   155,   199,
1828 <     193,    67,   122,   133,   124,   125,   133,   133,    74,   133,
1829 <     199,   199,   199,    79,   155,    81,   104,    23,    24,   184,
1830 <     199,   186,   133,   133,    30,   190,   133,   155,    94,   194,
1831 <     195,   196,   197,   198,   122,   133,   133,   202,   203,   133,
1832 <     199,   199,   265,   199,   265,   199,   211,   167,   199,   169,
1833 <     170,   155,   199,   133,   199,   199,   122,   199,   133,   133,
1834 <     199,   127,   199,     1,     1,   185,     3,   173,   199,     6,
1835 <     199,   265,   155,    10,   155,    94,   155,   262,   243,   155,
1836 <     245,   265,   265,   149,   265,   262,   251,   262,    25,    26,
1837 <      27,   256,   265,   265,    31,   161,   261,   163,   164,   205,
1838 <     155,   155,   168,   109,   110,   111,   155,   155,   114,   229,
1839 <     265,   155,   265,    50,   220,   265,   122,    54,    55,    57,
1840 <      58,    59,    60,    61,    62,    63,    64,     1,   155,   135,
1841 <     136,   265,   265,   265,   240,   241,   199,   257,   258,    13,
1842 <     246,   247,   248,   249,   265,     1,   152,   153,    85,   265,
1843 <      87,   265,   265,   259,   173,   155,   265,   265,   155,   262,
1844 <      34,    35,   250,   100,    20,   231,    40,   105,    42,   265,
1845 <      26,   262,   238,   265,   180,   265,   265,   262,   265,   265,
1846 <     155,   265,   199,   249,   250,   122,   205,   265,   265,   199,
1847 <     199,   199,   199,   259,    50,    51,   155,   262,   199,    55,
1848 <     155,   220,   140,   155,   155,   155,   155,   265,   155,   155,
1849 <     155,   262,   262,    69,   204,   277,   315,   154,   265,   265,
1850 <      76,   240,   241,   262,    98,    99,   262,   246,   247,   248,
1851 <     249,   168,   265,   107,   108,   265,   262,   262,   262,    95,
1852 <     259,   262,   262,   265,   181,   155,   262,   262,     0,     1,
1853 <     262,   262,   265,     5,   128,   129,   155,   262,   262,   262,
1854 <     262,   155,   155,   262,   262,   133,   262,   123,   262,   262,
1855 <      22,   145,   146,   262,    26,   131,   262,    29,   262,   262,
1856 <     265,   262,   156,   221,    36,   265,   265,   265,   265,   265,
1857 <     262,   165,   265,   149,   265,   265,   265,   265,   265,   265,
1858 <      52,   265,   158,   159,   265,   265,   133,   244,   265,   265,
1859 <     155,   265,   265,    65,    66,   199,    68,   255,   155,   199,
1860 <     257,   265,   265,    75,   265,   265,   265,   155,   199,   265,
1861 <     265,   265,   265,   262,   262,   262,   192,   193,   262,   262,
1862 <      92,   262,   262,   262,   262,   262,   262,   262,   262,   262,
1863 <     102,   262,   104,   262,   262,   262,   262,   262,   262,   262,
1864 <     262,   262,   262,   199,   262,   262,   262,   262,   199,   121,
1865 <     262,   262,   262,   262,   262,   262,   262,   262,   252,   253,
1866 <     254,   206,   207,   208,   209,   210,   138,   212,   213,   262,
1867 <     215,   216,   217,   262,   250,   220,   262,   262,   262,   262,
1868 <     262,   262,   262,   262,   262,   230,   231,   232,   262,   234,
1869 <     235,   236,   262,   262,   239,   262,   262,   242,   262,   262,
1870 <     262,   173,   262,   199,   265,   199,   265,   262,   199,   199,
1871 <     182,   183,   265,   155,   155,   187,   188,   206,   207,   208,
1872 <     209,   210,   155,   212,   213,   199,   215,   216,   217,   155,
1873 <     262,   220,   155,   155,   265,   262,   265,   155,   155,   262,
1874 <     262,   230,   231,   232,   262,   234,   235,   236,   262,   262,
1875 <     239,   262,   262,   242,   206,   207,   208,   209,   210,   262,
1876 <     212,   213,   262,   215,   216,   217,   265,   262,   220,   262,
1877 <     262,   155,   155,   155,   262,   262,   262,   262,   230,   231,
1878 <     232,   262,   234,   235,   236,   262,   262,   239,   155,   262,
1879 <     242,   262,   262,   155,   155,   133,   265,   265,   265,   265,
1880 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
1881 <     265,   265,   265,   262,   265,   265,   262,   262,   262,   262,
1882 <     133,   133,   262,   262,   262,   262,   262,   262,   262,   133,
1883 <     262,   262,   262,   262,   262,   262,   133,   262,   155,   133,
1884 <     133,   265,   262,   262,   265,   155,   262,   199,   155,   155,
1885 <     199,   199,   199,   155,   265,   155,   155,   155,   133,   155,
1886 <     155,   262,   199,   155,   155,   262,   262,   262,   262,   262,
1887 <     160,   262,   262,   262,   262,   262,   262,   262,   132,   160,
1888 <     199,   262,   262,   262,   262,   262,   262,   262,   262,   262,
1889 <     262,   262,   262,   262,   262,   155,   262,   155,   199,   155,
1890 <     155,   266,   265,   155,   262,   265,   262,   262,   262,   262,
1891 <     199,   199,   199,   199,   199,   199,   199,   199,   262,   199,
1892 <     199,   199,   199,   199,   132,   132,   262,   262,   262,   262,
1893 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2484 <     262,   262,   262,   133,   262,    71,   262,   262,   262,  1304,
2485 <    1486,   262,  1467,   262,   262,  1395,   825,   262,  1465,   262,
2486 <     501,   468,   614,  1275,  1380,  1378,   564,  1446,  1448,   572,
2487 <    1393,   649,   491,   531,  1449,  1451,   124,  1371,  1227,   185,
2488 <    1225,  1377,   374,  1375,    95,    -1,    -1,    -1,   262,   262,
2489 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2490 <     262,   262,    -1,   262,    -1,   262,    -1,    -1,    -1,   262,
2491 <      -1,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2492 <     262,   262,   260,   362,    -1,    -1,    -1,    -1,   443,    -1,
1764 >     624,   625,   300,     1,     8,   303,     1,   305,   306,    48,
1765 >     207,     1,     1,     1,   211,     1,     1,     1,   104,     1,
1766 >       1,     1,   207,     1,     1,   227,   211,   227,     6,     7,
1767 >       1,     9,    10,   225,     1,   225,    14,   229,   227,     1,
1768 >     227,    44,    28,   225,    22,    23,    26,   229,    28,     1,
1769 >      36,   227,    30,   225,   226,    33,    34,    35,    39,   225,
1770 >     227,     1,    40,   229,    59,     1,     1,     1,     1,   227,
1771 >      59,   227,     1,    53,    59,    59,   225,    55,    56,   225,
1772 >     229,   120,    62,   229,     1,     1,    64,    75,    28,    67,
1773 >      68,   174,   175,    75,    75,     1,    36,   227,    76,   397,
1774 >     227,   399,   400,    19,    84,    83,    96,    85,    88,    87,
1775 >      96,    89,   410,    91,    92,   201,    96,   415,     1,    99,
1776 >     100,    37,    39,   227,   102,    96,    93,   425,   426,   107,
1777 >     108,   109,   121,   111,   112,   113,   121,   227,   116,   437,
1778 >     121,   439,   440,   225,   121,    61,    52,   229,   115,   129,
1779 >       1,   227,     3,    59,     5,    61,    96,   227,    75,   121,
1780 >      96,    96,    96,    96,   142,     1,   146,    96,    19,   149,
1781 >     150,   151,   170,     1,   152,   153,   154,   155,   156,   157,
1782 >     158,   227,   170,   186,     1,   121,    37,     1,   170,    17,
1783 >      18,   195,   195,    21,   227,    11,    12,    13,   114,   227,
1784 >     227,    52,     1,    54,   121,    19,   122,   123,   227,   227,
1785 >      61,   225,   118,    96,   227,   229,   196,   227,   170,   217,
1786 >     191,    72,     1,    37,   225,   215,     1,   143,   226,   228,
1787 >     208,   209,   210,    61,   212,   213,   534,   226,   226,   219,
1788 >     220,   218,   226,   221,   215,    96,   226,    61,   226,   226,
1789 >      78,    79,    80,    81,    82,   226,   218,    32,    86,   226,
1790 >      96,   170,    90,   228,   228,   217,    41,   118,    96,    44,
1791 >      45,     1,   228,   228,    49,    50,    51,   105,   106,    96,
1792 >     215,   215,    96,   218,   228,   228,   226,   138,   104,   117,
1793 >     226,   226,   226,   226,    24,    25,   147,    96,    73,   225,
1794 >     114,    31,   218,   229,   228,   228,     1,    15,   191,   226,
1795 >     226,   139,   225,   611,    93,   225,   130,     1,   616,   229,
1796 >     226,   619,   121,     1,    19,   623,   228,    57,    58,   228,
1797 >      38,   228,   215,   147,   148,    19,   115,   228,   228,    69,
1798 >      70,    71,    37,   228,   228,   196,   163,    77,    78,   228,
1799 >     225,   228,   228,    37,   229,   183,    65,   225,    66,   228,
1800 >       1,   229,   228,   228,   181,   228,    61,   228,   219,   228,
1801 >      63,   228,    65,   228,    52,   226,   228,    61,   228,   215,
1802 >     197,    59,   218,    61,   198,  1073,  1074,  1075,   228,    97,
1803 >      98,   228,   225,   228,     1,   103,   228,   228,   226,     6,
1804 >       7,    96,     9,    10,   218,   228,   228,    14,   222,   226,
1805 >     228,   230,   226,   228,   104,    22,    23,   110,   127,   114,
1806 >     128,   228,   228,    30,   228,   228,    33,    34,    35,   104,
1807 >     114,   228,   228,    40,   127,   130,   144,   228,   122,   123,
1808 >     118,   131,   132,   133,   134,   135,   136,   137,    55,    56,
1809 >     159,   226,   147,   148,     4,    96,   228,    64,   167,   143,
1810 >      67,    68,   228,   228,   228,   228,   228,   176,   228,    76,
1811 >      20,   228,   228,   166,   167,   228,    83,   228,    85,    29,
1812 >      87,   228,    89,   228,    91,    92,   228,   228,   228,     1,
1813 >     228,   200,     1,   202,   203,   102,   226,   228,   206,   228,
1814 >     107,   108,   109,   198,   111,   112,   113,   216,   228,   116,
1815 >     228,   228,   228,    63,   223,    65,   224,    26,   228,    28,
1816 >      32,   228,   163,   218,   228,   218,   228,   222,   228,    41,
1817 >     223,   228,    44,    45,   218,   142,   228,    49,    50,    51,
1818 >     181,   228,   228,    93,    53,   152,   153,   154,   155,   156,
1819 >     157,   158,   228,    62,   228,   228,   197,   228,   228,   228,
1820 >     228,    73,   808,   809,   810,   811,   812,   813,   814,   228,
1821 >     228,   228,   119,   119,   124,    84,   126,   119,   225,    88,
1822 >     104,   207,   104,   104,   104,   104,   225,    96,  1212,   225,
1823 >      99,   100,   225,   228,   228,   145,   228,   228,   228,   228,
1824 >     228,   208,   209,   210,   228,   212,   213,     1,   228,     3,
1825 >     228,     5,   228,   228,   221,   228,   228,   167,   228,   228,
1826 >     129,   119,   172,   228,   228,    19,   176,   228,   228,   228,
1827 >     180,   228,     0,     1,   228,   185,     4,   146,   228,   189,
1828 >     149,   150,   151,    37,   228,   228,   228,   228,    16,   228,
1829 >     200,    19,    20,   203,   228,   205,   228,   225,    52,    27,
1830 >      54,   228,   228,   207,   104,   104,   216,    61,   207,   207,
1831 >     104,    39,   104,   223,    42,    43,   104,   207,    72,   207,
1832 >     207,   104,   104,   104,   104,   104,   104,   196,   104,   104,
1833 >     207,   228,    60,   207,   228,    63,   207,   207,   104,   207,
1834 >       1,   207,    96,   207,   207,   207,    74,   207,   207,   225,
1835 >     219,   220,    44,    65,    46,    47,    17,    18,   207,   119,
1836 >      21,   228,   119,   228,   118,   207,    94,    95,   225,   119,
1837 >     104,   119,   228,   228,   228,   228,   228,   228,   228,   225,
1838 >     228,   228,   110,   228,   138,   225,   225,   228,   225,   225,
1839 >     228,   207,    44,   147,    46,    47,   228,   228,   228,   127,
1840 >      61,   228,   228,   228,   228,   228,   228,   228,   228,   228,
1841 >     207,   207,   140,   141,   207,   127,   207,    78,    79,    80,
1842 >      81,    82,   225,   207,   119,    86,   104,   104,   119,    90,
1843 >     119,   119,    44,   119,   119,    96,   164,   119,   119,   119,
1844 >     119,   228,   196,   119,   105,   106,   119,   159,   225,   177,
1845 >     119,   225,   207,   225,   182,   167,   117,   227,   225,   187,
1846 >     228,   225,   190,   228,   176,   219,   228,   228,   160,   161,
1847 >     162,   104,   225,   165,   166,   104,   168,   169,   139,   171,
1848 >     104,   173,   228,   228,   176,   225,   178,   179,   200,   225,
1849 >     202,   203,   184,   225,   225,   225,   188,   104,   225,   225,
1850 >     192,   193,   194,   225,   216,   225,   225,   199,   160,   161,
1851 >     162,   223,   204,   165,   166,   225,   168,   169,   225,   171,
1852 >     225,   173,   183,   104,   176,   228,   178,   179,   104,   104,
1853 >     119,   104,   184,   104,   104,   225,   188,   119,   104,     1,
1854 >     192,   193,   194,   207,   228,   119,   104,   199,   160,   161,
1855 >     162,   119,   204,   165,   166,   119,   168,   169,   119,   171,
1856 >     119,   173,    24,    25,   176,   119,   178,   179,   119,    31,
1857 >     119,   119,   184,   119,   225,   119,   188,   225,   225,   119,
1858 >     192,   193,   194,   119,   225,   225,   225,   199,   225,   225,
1859 >     225,   225,   204,   225,   225,    57,    58,   225,   225,   225,
1860 >     225,   119,   225,   225,   225,   225,   225,    69,    70,    71,
1861 >     225,   225,   225,   119,   225,    77,    78,   225,   228,   225,
1862 >     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
1863 >     225,   225,   225,   225,   225,   225,   119,   225,   225,   225,
1864 >     225,   225,   225,   119,   207,   225,   119,   225,   119,   119,
1865 >     119,   119,   104,   225,   119,   119,   119,   207,   225,   228,
1866 >     225,   119,   119,   225,   119,   225,   119,  1033,   207,   119,
1867 >     119,   228,   228,   225,   119,   119,   119,   119,   225,   119,
1868 >     225,   119,   225,   225,   225,   119,   119,   225,   225,   119,
1869 >     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
1870 >     225,   225,   225,   225,   225,   225,   225,   119,   225,   225,
1871 >     104,   225,   225,   228,   225,   225,   228,   225,   225,   228,
1872 >     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
1873 >     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
1874 >     225,   225,   119,   225,   225,   225,   225,   225,   225,   125,
1875 >     225,   225,   125,   225,   125,    77,   489,   574,   225,   225,
1876 >    1291,   505,  1256,  1254,   225,   225,   225,  1235,  1246,   225,
1877 >     476,   225,  1244,  1135,   225,   522,   329,   225,   225,   225,
1878 >     587,   453,   214,  1265,   225,  1258,   225,   560,  1240,   225,
1879 >     225,   466,   229,   110,   225,   161,   225,   225,   225,   225,
1880 >     225,   225,   225,   225,   225,   225,   225,   225,   225,    93,
1881 >     225,   225,   228,   392,   225,   225,   225,   225,   225,   215,
1882 >    1105,   225,   225,  1103,   230,   230,   228,   225,   225,    -1,
1883 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   231,    -1,
1884 >      -1,    -1,    -1,    -1,    -1,    -1,   259,    -1,    -1,    -1,
1885 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1886 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1887 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1888 >     281,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   289,
1889 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1890 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1891 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1892 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1893 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1894        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1895        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1896 <      -1,    -1,    -1,   293
1896 >      -1,    -1,    -1,    -1,   363,    -1,    -1,    -1,    -1,    -1,
1897 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1898 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,   382
1899   };
1900  
1901 < /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
1902 <   symbol of state STATE-NUM.  */
1901 >  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
1902 >     symbol of state STATE-NUM.  */
1903   static const yytype_uint16 yystos[] =
1904   {
1905 <       0,   268,     0,     1,     5,    22,    26,    29,    36,    52,
1906 <      65,    66,    68,    75,    92,   102,   104,   121,   138,   173,
1907 <     182,   183,   187,   188,   269,   274,   279,   297,   303,   318,
1908 <     355,   374,   388,   414,   421,   431,   440,   471,   481,   487,
1909 <     491,   501,   566,   582,   603,   262,   263,   264,   264,   356,
1910 <     441,   482,   264,   492,   264,   567,   389,   472,   375,   264,
1911 <     264,   319,   415,   264,   264,   422,   432,     1,    37,    48,
1912 <     122,   298,   299,   300,   301,   302,     1,    13,    34,    35,
1913 <      40,    42,    98,    99,   107,   108,   128,   129,   145,   146,
1914 <     156,   165,   252,   253,   254,   583,   584,   585,   586,   587,
1915 <     588,   589,   590,   591,   592,   593,   594,   595,   596,   597,
1916 <     598,   599,   600,   601,   602,   155,   357,   361,   155,   442,
1917 <     446,   264,     1,    91,   488,   489,   490,   264,     1,     8,
1918 <       9,    12,    19,    28,    32,    33,    39,    43,    44,    45,
1919 <      47,    53,    72,    73,    77,    84,    88,    89,    90,    93,
1920 <      96,    97,   106,   112,   113,   115,   116,   117,   118,   119,
1921 <     130,   139,   141,   142,   144,   147,   148,   151,   162,   184,
1922 <     186,   190,   194,   195,   196,   197,   198,   202,   203,   211,
1923 <     243,   245,   251,   256,   261,   502,   503,   504,   505,   506,
1924 <     507,   508,   509,   510,   511,   512,   513,   514,   515,   516,
1925 <     517,   518,   519,   520,   521,   522,   523,   524,   525,   526,
1926 <     527,   528,   529,   530,   531,   532,   533,   534,   535,   536,
1927 <     537,   538,   539,   540,   541,   542,   543,   544,   545,   546,
1928 <     547,   548,   549,   550,   551,   552,   553,   557,   561,   562,
1929 <     563,   564,   565,   264,   264,   264,   264,     1,    57,    58,
1930 <      59,    60,    61,    62,    63,    64,   105,   140,   221,   255,
1931 <     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
1932 <     314,   315,   316,   317,     1,   120,   150,   275,   276,   277,
1933 <     278,   155,   320,   324,   264,     1,    41,    56,    78,    80,
1934 <      82,    83,   101,   604,   605,   606,   607,   608,   609,   610,
1935 <     611,   612,     1,    37,    86,   122,   124,   125,   167,   169,
1936 <     170,   185,   229,   257,   258,   280,   281,   282,   286,   287,
1937 <     288,   289,   290,   291,   292,   293,   294,   295,   296,   264,
1938 <     264,   262,   265,   265,   265,   263,   299,   265,   265,   265,
1939 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
1940 <     265,   265,   265,   265,   265,   263,   584,   264,   264,     1,
1941 <      91,   157,   483,   484,   485,   486,   265,   263,   489,     1,
1942 <     122,   157,   189,   493,   497,   498,   499,   500,   265,   265,
1943 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
1944 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
1945 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
1946 <     265,   558,   265,   554,   265,   265,   265,   265,   265,   265,
1947 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
1948 <     265,   265,   265,   265,   263,   503,     1,     4,    46,    49,
1949 <     104,   122,   250,   568,   569,   570,   571,   572,   576,   577,
1950 <     578,     1,    20,    26,    50,    51,    55,    69,    76,    95,
1951 <     123,   131,   149,   158,   159,   192,   193,   250,   390,   391,
1952 <     392,   393,   394,   395,   396,   397,   404,   405,   406,   407,
1953 <     408,   409,   410,   411,   412,   413,     1,   157,   189,   250,
1954 <     473,   477,   478,   479,   480,     1,    55,    85,    91,   154,
1955 <     376,   380,   381,   382,   386,   387,   262,   265,   265,   265,
1956 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   263,
1957 <     305,   262,   265,   265,   263,   276,   264,     1,    22,   126,
1958 <     157,   416,   417,   418,   419,   420,   265,   265,   265,   265,
1959 <     265,   265,   265,   263,   605,   262,   265,   265,   265,   265,
1960 <     265,   265,   265,   283,   265,   265,   265,   265,   263,   281,
1961 <       1,   122,   189,   250,   423,   424,   425,   426,   427,     1,
1962 <     122,   189,   433,   434,   435,   436,   155,   155,   155,   262,
1963 <     199,   133,   133,   199,   199,   133,   271,   271,   133,   133,
1964 <     199,   199,   133,   271,   199,   199,   199,   199,   199,   262,
1965 <       1,    23,    24,    30,   109,   110,   111,   114,   122,   135,
1966 <     136,   152,   153,   180,   358,   359,   360,   362,   363,   364,
1967 <     365,   366,   367,   368,   369,   370,   371,   372,   373,     1,
1968 <       3,     6,    10,    25,    26,    27,    31,    50,    54,    55,
1969 <      85,    87,   100,   122,   154,   168,   181,   244,   257,   443,
1970 <     444,   445,   447,   448,   449,   450,   451,   452,   453,   454,
1971 <     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
1972 <     265,   265,   263,   484,   155,   262,   265,   265,   494,   263,
1973 <     498,   199,   271,   199,   271,   133,   155,   133,   199,   199,
1974 <     199,   133,   155,   199,   133,   133,   133,   199,   271,   199,
1975 <     199,   133,   155,   199,   133,   133,   271,   133,   133,   155,
1976 <     133,   133,   199,   199,   265,   199,   265,   271,   271,   199,
1977 <     271,   155,   199,   199,   199,   199,   200,   199,   200,   199,
1978 <     199,   271,   271,   133,   273,   271,   199,   199,   199,   199,
1979 <     262,   579,   265,   265,   573,   265,   265,   263,   569,   262,
1980 <     265,   265,   265,   265,   398,   265,   265,   265,   265,   265,
1981 <     265,   265,   265,   265,   265,   265,   263,   391,   265,   474,
1982 <     265,   263,   478,   262,   377,   265,   265,   265,   263,   381,
1983 <     155,   155,   155,   155,   155,   155,   155,   155,   222,   223,
1984 <     224,   225,   226,   227,   228,   155,   155,   199,   262,   155,
1985 <     155,   262,     1,     5,    26,    38,    50,    55,    67,    74,
1986 <      79,    81,    94,   122,   127,   149,   161,   163,   164,   168,
1987 <     231,   238,   249,   250,   259,   321,   322,   323,   325,   326,
1988 <     327,   328,   329,   330,   334,   335,   336,   337,   338,   339,
1989 <     340,   341,   342,   343,   344,   345,   346,   347,   348,   262,
1990 <     265,   265,   265,   263,   417,   199,   199,   199,   155,   199,
1991 <     199,   271,   262,   155,   199,   155,   155,   155,   155,   155,
1992 <     265,   155,   133,   155,   155,   262,   262,   265,   428,   265,
1993 <     263,   424,   262,   265,   437,   263,   434,   262,   262,   262,
1994 <     262,   262,   262,   262,   262,   175,   176,   177,   178,   179,
1995 <     270,   271,   262,   262,   262,   262,   262,   262,   262,   262,
1996 <     262,   262,   262,   262,   262,   262,   265,   265,   265,   265,
1997 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   263,
1998 <     359,   262,   265,   265,   265,   265,   265,   265,   265,   265,
1999 <     265,   455,   265,   265,   265,   265,   265,   265,   265,   265,
2000 <     265,   263,   444,   155,   155,   262,   262,   155,   155,   265,
2001 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2002 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2003 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2004 <     262,   262,   262,   262,   206,   207,   208,   209,   210,   212,
2005 <     213,   215,   216,   217,   220,   230,   231,   232,   234,   235,
2006 <     236,   239,   242,   559,   560,   262,   206,   207,   208,   209,
2007 <     210,   212,   213,   215,   216,   217,   220,   230,   231,   232,
2008 <     234,   235,   236,   239,   242,   555,   556,   262,   262,   262,
2009 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2010 <     262,   262,   262,    14,    15,    16,   272,   273,   262,   262,
2011 <     262,   262,   262,   262,   265,   271,   199,   265,   155,   155,
2012 <     262,   199,   155,   199,   199,   265,   199,   199,   199,   199,
2013 <     199,   155,   133,   155,   155,   199,   155,   262,   155,   265,
2014 <     155,   262,   265,   155,   155,   133,   384,   385,   262,   262,
2015 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2016 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2017 <     265,   265,   265,   265,   349,   265,   265,   265,   265,   265,
2018 <     265,   265,   265,   265,   265,   265,   265,   265,   331,   265,
2019 <     265,   265,   263,   322,   155,   155,   155,   262,   262,   262,
2020 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2021 <     262,   262,   171,   172,   284,   285,   262,   262,   262,   262,
2022 <     155,   265,   155,   262,   155,   265,   262,   270,   270,   270,
2023 <     270,   270,   133,   133,   271,   133,   133,   133,   133,   155,
2024 <     133,   133,   271,   271,   273,   262,   155,   218,   219,   199,
2025 <     155,   155,   199,   199,   199,   155,   265,   155,   155,   155,
2026 <     155,   133,   155,   155,   199,   155,   262,   262,   262,   262,
2027 <     262,   160,   495,   496,   262,   266,   262,   266,   272,   272,
2028 <     272,    11,   201,   580,   581,   262,   262,    11,   201,   574,
2029 <     575,   262,   262,   262,   262,   262,   262,   132,   399,   400,
2030 <     402,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2031 <     262,   262,   262,   160,   475,   476,   262,    78,   233,   237,
2032 <     378,   379,   262,   262,   204,   266,   383,   199,   155,   199,
2033 <     199,   265,   199,   199,   199,   199,   199,   155,   199,   155,
2034 <     199,   199,   199,   155,   199,   265,   199,   155,   199,   262,
2632 <     262,   262,   262,   262,   266,   262,    94,   173,   205,   220,
2633 <     240,   241,   246,   247,   248,   249,   259,   429,   430,   262,
2634 <     262,    94,   173,   205,   220,   240,   241,   246,   247,   248,
2635 <     249,   259,   438,   439,   262,   262,   262,   262,   262,   262,
2636 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2637 <     262,   262,   262,   262,   262,   262,   262,   132,   456,   457,
2638 <     459,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2639 <     262,   266,   560,   556,   262,   266,   262,   266,   401,   262,
2640 <     266,    20,    21,    51,    69,    76,    95,   123,   131,   174,
2641 <     193,   403,   262,   266,   262,   266,   133,   385,   262,   262,
2642 <     262,   262,   262,   132,   350,   351,   353,   262,   262,   262,
2643 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2644 <     206,   207,   208,   209,   210,   212,   213,   215,   216,   217,
2645 <     220,   230,   231,   232,   234,   235,   236,   239,   242,   332,
2646 <     333,   262,   262,   262,   285,   262,   266,   262,   266,   458,
2647 <     262,   266,    10,    12,    27,    31,   244,   460,   496,   581,
2648 <     575,   403,   400,   476,   379,   352,   262,   266,     5,    38,
2649 <      50,    67,    74,    79,    81,    94,   127,   143,   161,   163,
2650 <     164,   231,   249,   259,   354,   262,   266,   430,   439,   460,
2651 <     457,   354,   351,   333
1905 >       0,   232,     0,     1,     4,    16,    19,    20,    27,    39,
1906 >      42,    43,    60,    63,    74,    94,    95,   110,   127,   140,
1907 >     141,   164,   177,   182,   187,   190,   233,   238,   243,   263,
1908 >     269,   275,   283,   297,   318,   342,   356,   371,   378,   382,
1909 >     392,   401,   422,   428,   434,   438,   444,   499,   512,   225,
1910 >     226,   227,   227,   319,   402,   429,   227,   439,   227,   357,
1911 >     423,   343,   227,   270,   298,   372,   227,   227,   393,   227,
1912 >     276,   227,   383,     1,    28,    36,    96,   264,   265,   266,
1913 >     267,   268,     1,    24,    25,    31,    57,    58,    69,    70,
1914 >      71,    77,    78,   500,   501,   502,   503,   504,   505,   506,
1915 >     507,   508,   509,   510,   511,   227,   227,   227,     1,    59,
1916 >     435,   436,   437,   227,     1,     6,     7,     9,    10,    14,
1917 >      22,    23,    30,    33,    34,    35,    40,    55,    56,    64,
1918 >      67,    68,    76,    83,    85,    87,    89,    91,    92,   102,
1919 >     107,   108,   109,   111,   112,   113,   116,   142,   152,   153,
1920 >     154,   155,   156,   157,   158,   208,   209,   210,   212,   213,
1921 >     221,   445,   446,   447,   448,   449,   450,   451,   452,   453,
1922 >     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
1923 >     464,   465,   466,   467,   468,   469,   470,   471,   472,   473,
1924 >     474,   475,   476,   477,   478,   479,   480,   481,   482,   483,
1925 >     484,   485,   486,   487,   488,   492,   496,   497,   498,   227,
1926 >     227,   227,     1,    93,   115,   239,   240,   241,   242,   227,
1927 >     227,   227,     1,    32,    41,    44,    45,    49,    50,    51,
1928 >      73,   513,   514,   515,   516,   517,   518,   519,   520,   521,
1929 >     522,     1,    26,    28,    53,    62,    84,    88,    96,    99,
1930 >     100,   129,   146,   149,   150,   151,   196,   219,   220,   244,
1931 >     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
1932 >     255,   256,   257,   258,   259,   260,   261,   262,   227,     1,
1933 >     217,   284,   285,   286,   287,   288,   227,     1,    96,   379,
1934 >     380,   381,   227,   225,   228,   228,   228,   226,   265,   228,
1935 >     228,   228,   228,   228,   228,   228,   228,   228,   228,   226,
1936 >     501,     1,    17,    18,    21,    61,    78,    79,    80,    81,
1937 >      82,    86,    90,    96,   105,   106,   117,   139,   183,   320,
1938 >     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
1939 >     331,   332,   333,   334,   335,   336,   337,   338,     1,     3,
1940 >       5,    19,    37,    52,    54,    61,    72,    96,   118,   138,
1941 >     147,   196,   219,   403,   404,   405,   406,   407,   408,   409,
1942 >     410,   411,   412,   413,   417,   418,   419,   420,   421,     1,
1943 >      59,   121,   430,   431,   432,   433,   228,   226,   436,     1,
1944 >      96,   121,   440,   441,   442,   443,   228,   228,   228,   228,
1945 >     228,   228,   228,   228,   228,   228,   228,   228,   228,   228,
1946 >     228,   228,   228,   228,   228,   228,   228,   228,   228,   228,
1947 >     228,   493,   228,   489,   228,   228,   228,   228,   228,   228,
1948 >     228,   228,   228,   228,   228,   228,   228,   228,   228,   228,
1949 >     228,   228,   226,   446,     1,    19,    37,    61,   114,   122,
1950 >     123,   143,   218,   358,   359,   360,   361,   362,   363,   364,
1951 >     368,   369,   370,     1,   121,   218,   424,   425,   426,   427,
1952 >       1,    52,    59,    61,   118,   344,   348,   349,   350,   354,
1953 >     355,   225,   228,   228,   226,   240,     1,    75,   170,   271,
1954 >     272,   273,   274,     1,    19,    37,    61,    96,   114,   130,
1955 >     147,   148,   198,   218,   222,   299,   300,   301,   302,   303,
1956 >     304,   305,   306,   307,   308,   309,   310,   314,     1,    39,
1957 >      75,   121,   373,   374,   375,   376,   377,   228,   228,   228,
1958 >     228,   228,   228,   228,   228,   226,   514,   225,   228,   228,
1959 >     228,   228,   228,   228,   228,   228,   228,   228,   228,   228,
1960 >     228,   228,   228,   228,   228,   226,   245,     1,    96,   215,
1961 >     394,   395,   396,   397,   225,   228,   226,   285,   170,     1,
1962 >      96,   163,   181,   197,   277,   278,   279,   280,   281,   282,
1963 >     228,   226,   380,     1,    96,   215,   218,   384,   385,   386,
1964 >     387,   388,   119,   119,   119,   225,   104,   104,   235,   207,
1965 >     104,   235,   104,   235,   235,   104,   104,   225,   225,   228,
1966 >     228,   228,   339,   228,   228,   228,   228,   228,   228,   228,
1967 >     228,   228,   228,   228,   228,   228,   226,   321,   225,   228,
1968 >     228,   228,   228,   228,   228,   414,   228,   228,   228,   228,
1969 >     228,   228,   228,   226,   404,   228,   228,   226,   431,   119,
1970 >     225,   228,   228,   226,   441,   207,   235,   104,   235,   235,
1971 >     207,   104,   207,   104,   104,   104,   207,   207,   207,   235,
1972 >     104,   104,   104,   104,   235,   104,   104,   104,   104,   207,
1973 >     228,   207,   228,   207,   235,   235,   207,   207,   207,   207,
1974 >     211,   207,   211,   207,   207,   207,   207,   104,   235,   207,
1975 >     235,   235,   207,   225,   225,   228,   228,   365,   228,   228,
1976 >     228,   228,   228,   226,   359,   228,   228,   226,   425,   225,
1977 >     228,   228,   345,   228,   226,   349,   119,   119,   225,   225,
1978 >     228,   228,   226,   272,   225,   228,   228,   315,   228,   228,
1979 >     228,   228,   228,   311,   228,   228,   226,   300,   225,   228,
1980 >     228,   228,   226,   374,   207,   207,   207,   119,   207,   207,
1981 >     207,   235,   225,   104,   119,   207,   119,   104,   104,   119,
1982 >     119,   119,   119,   119,   119,   119,   119,   119,   119,   119,
1983 >     225,   225,   228,   398,   226,   395,   207,   225,   227,   225,
1984 >     228,   228,   228,   228,   226,   278,   119,   225,   225,   228,
1985 >     389,   228,   226,   385,   225,   225,   225,   225,   131,   132,
1986 >     133,   134,   135,   136,   137,   234,   235,   225,   225,   225,
1987 >     225,   225,   225,   225,   225,   225,   104,   104,   235,   228,
1988 >     104,   104,   104,   235,   104,   104,   235,   119,   104,   104,
1989 >     235,   104,   237,   237,   225,   119,   174,   175,   119,   207,
1990 >     119,   119,   228,   119,   119,   104,   119,   119,   119,   119,
1991 >     225,   119,   119,   225,   225,   119,   119,   225,   225,   225,
1992 >     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
1993 >     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
1994 >     225,   225,   225,    44,   160,   161,   162,   165,   166,   168,
1995 >     169,   171,   173,   176,   178,   179,   184,   188,   192,   193,
1996 >     194,   199,   204,   494,   495,   225,    44,    46,    47,   160,
1997 >     161,   162,   165,   166,   168,   169,   171,   173,   176,   178,
1998 >     179,   184,   188,   192,   193,   194,   199,   204,   490,   491,
1999 >     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
2000 >     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
2001 >     119,   207,   228,   119,   104,   119,   119,   119,   225,   119,
2002 >     119,   225,   119,   119,   228,   104,   352,   353,   225,   225,
2003 >     225,   119,   119,   225,   119,   207,   228,   119,   119,   119,
2004 >     119,   207,   228,   119,   119,   225,   119,   119,   119,   225,
2005 >     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
2006 >     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
2007 >     225,   225,   225,   225,   225,   119,   228,   225,   225,     1,
2008 >      96,   191,   215,   289,   290,   291,   292,   293,   119,   119,
2009 >     119,   119,   225,   225,   119,   228,   119,   225,   234,   234,
2010 >     234,   234,   234,   234,   234,   225,   225,   225,    48,   120,
2011 >     340,   341,   225,   225,   225,   225,   225,   225,   225,   225,
2012 >     225,   225,   225,    11,    12,    13,   236,   237,   225,   225,
2013 >     225,   225,   225,   225,   225,   225,   225,     8,   195,   415,
2014 >     416,   225,   225,   225,   225,   225,   225,   225,   225,   225,
2015 >     225,   225,   225,   229,   225,   229,   225,   225,    15,    38,
2016 >      66,    97,    98,   103,   128,   144,   206,   224,   366,   367,
2017 >     225,   225,   225,   225,   225,   225,   225,   225,   225,    44,
2018 >     186,   195,   346,   347,   214,   229,   351,   225,   225,   225,
2019 >     225,     4,    20,    29,    63,    65,    93,   124,   126,   145,
2020 >     167,   172,   176,   180,   185,   189,   200,   203,   205,   216,
2021 >     223,   316,   317,   225,   225,   225,   225,   225,    44,    46,
2022 >      47,   160,   161,   162,   165,   166,   168,   169,   171,   173,
2023 >     176,   178,   179,   184,   188,   192,   193,   194,   199,   204,
2024 >     312,   313,   225,   225,   225,   225,   225,   225,    65,   127,
2025 >     159,   167,   176,   200,   202,   203,   216,   223,   399,   400,
2026 >     225,   228,   228,   294,   226,   290,   225,   225,   225,   225,
2027 >     225,    65,   127,   159,   167,   176,   200,   202,   203,   216,
2028 >     223,   390,   391,   225,   225,   229,   236,   236,   236,   225,
2029 >     229,   495,   491,   225,   229,   225,   229,   104,   353,   225,
2030 >     230,   230,   230,   225,   229,   225,   229,   225,   229,   119,
2031 >     201,   237,   228,   225,   225,   229,   341,   416,   367,   347,
2032 >     125,   125,   125,   317,   313,   400,   225,   225,   225,    63,
2033 >      65,   110,   127,   166,   167,   218,   223,   295,   296,   391,
2034 >     225,   229,   296
2035   };
2036  
2037 < #define yyerrok         (yyerrstatus = 0)
2038 < #define yyclearin       (yychar = YYEMPTY)
2039 < #define YYEMPTY         (-2)
2040 < #define YYEOF           0
2037 >  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
2038 > static const yytype_uint16 yyr1[] =
2039 > {
2040 >       0,   231,   232,   232,   233,   233,   233,   233,   233,   233,
2041 >     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
2042 >     233,   233,   233,   233,   233,   233,   233,   233,   234,   234,
2043 >     235,   235,   235,   235,   235,   235,   235,   235,   236,   236,
2044 >     237,   237,   237,   237,   238,   239,   239,   240,   240,   240,
2045 >     241,   242,   243,   244,   244,   245,   245,   245,   245,   245,
2046 >     245,   245,   245,   245,   245,   245,   245,   245,   245,   245,
2047 >     245,   245,   245,   246,   247,   248,   249,   250,   251,   252,
2048 >     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
2049 >     263,   264,   264,   265,   265,   265,   265,   266,   267,   268,
2050 >     270,   269,   271,   271,   272,   272,   272,   273,   274,   276,
2051 >     275,   277,   277,   278,   278,   278,   278,   278,   279,   280,
2052 >     281,   282,   283,   284,   284,   285,   285,   285,   286,   288,
2053 >     287,   289,   289,   290,   290,   290,   290,   291,   292,   292,
2054 >     294,   293,   295,   295,   296,   296,   296,   296,   296,   296,
2055 >     296,   296,   298,   297,   299,   299,   300,   300,   300,   300,
2056 >     300,   300,   300,   300,   300,   300,   300,   300,   301,   302,
2057 >     303,   304,   305,   306,   307,   308,   309,   311,   310,   312,
2058 >     312,   313,   313,   313,   313,   313,   313,   313,   313,   313,
2059 >     313,   313,   313,   313,   313,   313,   313,   313,   313,   313,
2060 >     313,   313,   313,   315,   314,   316,   316,   317,   317,   317,
2061 >     317,   317,   317,   317,   317,   317,   317,   317,   317,   317,
2062 >     317,   317,   317,   317,   317,   317,   317,   317,   317,   317,
2063 >     319,   318,   320,   320,   321,   321,   321,   321,   321,   321,
2064 >     321,   321,   321,   321,   321,   321,   321,   321,   321,   321,
2065 >     321,   321,   322,   323,   324,   325,   326,   327,   328,   329,
2066 >     330,   331,   332,   333,   334,   335,   336,   337,   339,   338,
2067 >     340,   340,   341,   341,   343,   342,   345,   344,   346,   346,
2068 >     347,   347,   347,   348,   348,   349,   349,   349,   349,   349,
2069 >     351,   350,   352,   352,   353,   353,   354,   355,   357,   356,
2070 >     358,   358,   359,   359,   359,   359,   359,   359,   359,   359,
2071 >     359,   360,   361,   362,   363,   365,   364,   366,   366,   367,
2072 >     367,   367,   367,   367,   367,   367,   367,   367,   367,   368,
2073 >     369,   370,   372,   371,   373,   373,   374,   374,   374,   374,
2074 >     375,   376,   377,   378,   379,   379,   380,   380,   381,   383,
2075 >     382,   384,   384,   385,   385,   385,   385,   386,   387,   389,
2076 >     388,   390,   390,   391,   391,   391,   391,   391,   391,   391,
2077 >     391,   391,   391,   393,   392,   394,   394,   395,   395,   395,
2078 >     396,   398,   397,   399,   399,   400,   400,   400,   400,   400,
2079 >     400,   400,   400,   400,   400,   402,   401,   403,   403,   404,
2080 >     404,   404,   404,   404,   404,   404,   404,   404,   404,   404,
2081 >     404,   404,   404,   404,   405,   406,   407,   408,   409,   410,
2082 >     411,   412,   412,   414,   413,   415,   415,   416,   416,   417,
2083 >     418,   419,   420,   421,   423,   422,   424,   424,   425,   425,
2084 >     425,   426,   427,   429,   428,   430,   430,   431,   431,   431,
2085 >     432,   433,   434,   435,   435,   436,   436,   437,   439,   438,
2086 >     440,   440,   441,   441,   441,   442,   443,   444,   445,   445,
2087 >     446,   446,   446,   446,   446,   446,   446,   446,   446,   446,
2088 >     446,   446,   446,   446,   446,   446,   446,   446,   446,   446,
2089 >     446,   446,   446,   446,   446,   446,   446,   446,   446,   446,
2090 >     446,   446,   446,   446,   446,   446,   446,   446,   446,   446,
2091 >     446,   446,   446,   446,   446,   446,   446,   447,   448,   449,
2092 >     450,   451,   452,   453,   454,   455,   456,   457,   458,   459,
2093 >     460,   461,   462,   463,   464,   465,   466,   467,   468,   469,
2094 >     470,   471,   472,   473,   473,   474,   474,   475,   476,   477,
2095 >     478,   479,   480,   481,   482,   483,   484,   485,   486,   487,
2096 >     489,   488,   490,   490,   491,   491,   491,   491,   491,   491,
2097 >     491,   491,   491,   491,   491,   491,   491,   491,   491,   491,
2098 >     491,   491,   491,   491,   491,   491,   493,   492,   494,   494,
2099 >     495,   495,   495,   495,   495,   495,   495,   495,   495,   495,
2100 >     495,   495,   495,   495,   495,   495,   495,   495,   495,   495,
2101 >     496,   497,   498,   499,   500,   500,   501,   501,   501,   501,
2102 >     501,   501,   501,   501,   501,   501,   501,   502,   503,   504,
2103 >     505,   506,   507,   508,   509,   510,   511,   512,   513,   513,
2104 >     514,   514,   514,   514,   514,   514,   514,   514,   514,   515,
2105 >     516,   517,   518,   519,   520,   521,   522
2106 > };
2107  
2108 < #define YYACCEPT        goto yyacceptlab
2109 < #define YYABORT         goto yyabortlab
2110 < #define YYERROR         goto yyerrorlab
2108 >  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
2109 > static const yytype_uint8 yyr2[] =
2110 > {
2111 >       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
2112 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2113 >       1,     1,     1,     1,     1,     1,     2,     2,     0,     1,
2114 >       2,     3,     3,     3,     3,     3,     3,     3,     0,     1,
2115 >       2,     3,     3,     3,     5,     2,     1,     1,     1,     2,
2116 >       4,     4,     5,     2,     1,     1,     1,     1,     1,     1,
2117 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2118 >       1,     1,     2,     4,     4,     4,     4,     4,     4,     4,
2119 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2120 >       5,     2,     1,     1,     1,     1,     2,     4,     4,     4,
2121 >       0,     6,     2,     1,     1,     1,     2,     4,     4,     0,
2122 >       6,     2,     1,     1,     1,     1,     1,     2,     4,     4,
2123 >       4,     4,     5,     2,     1,     1,     1,     2,     4,     0,
2124 >       6,     2,     1,     1,     1,     1,     2,     4,     4,     4,
2125 >       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
2126 >       1,     1,     0,     6,     2,     1,     1,     1,     1,     1,
2127 >       1,     1,     1,     1,     1,     1,     1,     2,     4,     4,
2128 >       4,     4,     4,     4,     4,     4,     4,     0,     5,     3,
2129 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2130 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2131 >       1,     1,     1,     0,     5,     3,     1,     3,     1,     3,
2132 >       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
2133 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2134 >       0,     6,     2,     1,     1,     1,     1,     1,     1,     1,
2135 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2136 >       1,     2,     4,     4,     4,     4,     4,     4,     4,     4,
2137 >       4,     4,     4,     4,     4,     4,     4,     4,     0,     5,
2138 >       3,     1,     1,     1,     0,     6,     0,     5,     3,     1,
2139 >       1,     1,     1,     2,     1,     1,     1,     1,     1,     2,
2140 >       0,     5,     3,     1,     1,     3,     4,     4,     0,     6,
2141 >       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2142 >       2,     4,     4,     4,     4,     0,     5,     3,     1,     1,
2143 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     4,
2144 >       4,     4,     0,     6,     2,     1,     1,     1,     1,     2,
2145 >       4,     4,     4,     5,     2,     1,     1,     1,     4,     0,
2146 >       6,     2,     1,     1,     1,     1,     2,     4,     4,     0,
2147 >       5,     3,     1,     1,     1,     1,     1,     1,     1,     1,
2148 >       1,     1,     1,     0,     6,     2,     1,     1,     1,     2,
2149 >       4,     0,     5,     3,     1,     1,     1,     1,     1,     1,
2150 >       1,     1,     1,     1,     1,     0,     6,     2,     1,     1,
2151 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2152 >       1,     1,     1,     2,     4,     4,     4,     4,     4,     4,
2153 >       4,     4,     4,     0,     5,     3,     1,     1,     1,     4,
2154 >       4,     4,     4,     4,     0,     6,     2,     1,     1,     1,
2155 >       1,     4,     4,     0,     6,     2,     1,     1,     1,     1,
2156 >       4,     4,     5,     2,     1,     1,     1,     4,     0,     6,
2157 >       2,     1,     1,     1,     1,     4,     4,     5,     2,     1,
2158 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2159 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2160 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2161 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2162 >       1,     1,     1,     1,     1,     1,     1,     4,     4,     4,
2163 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2164 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2165 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2166 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2167 >       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
2168 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2169 >       1,     1,     1,     1,     1,     1,     0,     5,     3,     1,
2170 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2171 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2172 >       4,     4,     4,     5,     2,     1,     1,     1,     1,     1,
2173 >       1,     1,     1,     1,     1,     1,     1,     4,     4,     4,
2174 >       4,     4,     4,     4,     4,     4,     4,     5,     2,     1,
2175 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     4,
2176 >       4,     4,     4,     4,     4,     4,     4
2177 > };
2178  
2179  
2180 < /* Like YYERROR except do call yyerror.  This remains here temporarily
2181 <   to ease the transition to the new meaning of YYERROR, for GCC.
2182 <   Once GCC version 2 has supplanted version 1, this can go.  */
2180 > #define yyerrok         (yyerrstatus = 0)
2181 > #define yyclearin       (yychar = YYEMPTY)
2182 > #define YYEMPTY         (-2)
2183 > #define YYEOF           0
2184 >
2185 > #define YYACCEPT        goto yyacceptlab
2186 > #define YYABORT         goto yyabortlab
2187 > #define YYERROR         goto yyerrorlab
2188  
2668 #define YYFAIL          goto yyerrlab
2189  
2190   #define YYRECOVERING()  (!!yyerrstatus)
2191  
2192 < #define YYBACKUP(Token, Value)                                  \
2193 < do                                                              \
2194 <  if (yychar == YYEMPTY && yylen == 1)                          \
2195 <    {                                                           \
2196 <      yychar = (Token);                                         \
2197 <      yylval = (Value);                                         \
2198 <      yytoken = YYTRANSLATE (yychar);                           \
2199 <      YYPOPSTACK (1);                                           \
2200 <      goto yybackup;                                            \
2201 <    }                                                           \
2202 <  else                                                          \
2203 <    {                                                           \
2192 > #define YYBACKUP(Token, Value)                                  \
2193 > do                                                              \
2194 >  if (yychar == YYEMPTY)                                        \
2195 >    {                                                           \
2196 >      yychar = (Token);                                         \
2197 >      yylval = (Value);                                         \
2198 >      YYPOPSTACK (yylen);                                       \
2199 >      yystate = *yyssp;                                         \
2200 >      goto yybackup;                                            \
2201 >    }                                                           \
2202 >  else                                                          \
2203 >    {                                                           \
2204        yyerror (YY_("syntax error: cannot back up")); \
2205 <      YYERROR;                                                  \
2206 <    }                                                           \
2207 < while (YYID (0))
2208 <
2209 <
2210 < #define YYTERROR        1
2211 < #define YYERRCODE       256
2692 <
2693 <
2694 < /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
2695 <   If N is 0, then set CURRENT to the empty location which ends
2696 <   the previous symbol: RHS[0] (always defined).  */
2697 <
2698 < #define YYRHSLOC(Rhs, K) ((Rhs)[K])
2699 < #ifndef YYLLOC_DEFAULT
2700 < # define YYLLOC_DEFAULT(Current, Rhs, N)                                \
2701 <    do                                                                  \
2702 <      if (YYID (N))                                                    \
2703 <        {                                                               \
2704 <          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
2705 <          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
2706 <          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
2707 <          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
2708 <        }                                                               \
2709 <      else                                                              \
2710 <        {                                                               \
2711 <          (Current).first_line   = (Current).last_line   =              \
2712 <            YYRHSLOC (Rhs, 0).last_line;                                \
2713 <          (Current).first_column = (Current).last_column =              \
2714 <            YYRHSLOC (Rhs, 0).last_column;                              \
2715 <        }                                                               \
2716 <    while (YYID (0))
2717 < #endif
2718 <
2719 <
2720 < /* YY_LOCATION_PRINT -- Print the location on the stream.
2721 <   This macro was not mandated originally: define only if we know
2722 <   we won't break user code: when these are the locations we know.  */
2723 <
2724 < #ifndef YY_LOCATION_PRINT
2725 < # if YYLTYPE_IS_TRIVIAL
2726 < #  define YY_LOCATION_PRINT(File, Loc)                  \
2727 <     fprintf (File, "%d.%d-%d.%d",                      \
2728 <              (Loc).first_line, (Loc).first_column,     \
2729 <              (Loc).last_line,  (Loc).last_column)
2730 < # else
2731 < #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
2732 < # endif
2733 < #endif
2205 >      YYERROR;                                                  \
2206 >    }                                                           \
2207 > while (0)
2208 >
2209 > /* Error token number */
2210 > #define YYTERROR        1
2211 > #define YYERRCODE       256
2212  
2213  
2736 /* YYLEX -- calling `yylex' with the right arguments.  */
2737
2738 #ifdef YYLEX_PARAM
2739 # define YYLEX yylex (YYLEX_PARAM)
2740 #else
2741 # define YYLEX yylex ()
2742 #endif
2214  
2215   /* Enable debugging if requested.  */
2216   #if YYDEBUG
# Line 2749 | Line 2220 | while (YYID (0))
2220   #  define YYFPRINTF fprintf
2221   # endif
2222  
2223 < # define YYDPRINTF(Args)                        \
2224 < do {                                            \
2225 <  if (yydebug)                                  \
2226 <    YYFPRINTF Args;                             \
2227 < } while (YYID (0))
2228 <
2229 < # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
2230 < do {                                                                      \
2231 <  if (yydebug)                                                            \
2232 <    {                                                                     \
2762 <      YYFPRINTF (stderr, "%s ", Title);                                   \
2763 <      yy_symbol_print (stderr,                                            \
2764 <                  Type, Value); \
2765 <      YYFPRINTF (stderr, "\n");                                           \
2766 <    }                                                                     \
2767 < } while (YYID (0))
2223 > # define YYDPRINTF(Args)                        \
2224 > do {                                            \
2225 >  if (yydebug)                                  \
2226 >    YYFPRINTF Args;                             \
2227 > } while (0)
2228 >
2229 > /* This macro is provided for backward compatibility. */
2230 > #ifndef YY_LOCATION_PRINT
2231 > # define YY_LOCATION_PRINT(File, Loc) ((void) 0)
2232 > #endif
2233  
2234  
2235 < /*--------------------------------.
2236 < | Print this symbol on YYOUTPUT.  |
2237 < `--------------------------------*/
2235 > # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
2236 > do {                                                                      \
2237 >  if (yydebug)                                                            \
2238 >    {                                                                     \
2239 >      YYFPRINTF (stderr, "%s ", Title);                                   \
2240 >      yy_symbol_print (stderr,                                            \
2241 >                  Type, Value); \
2242 >      YYFPRINTF (stderr, "\n");                                           \
2243 >    }                                                                     \
2244 > } while (0)
2245 >
2246 >
2247 > /*----------------------------------------.
2248 > | Print this symbol's value on YYOUTPUT.  |
2249 > `----------------------------------------*/
2250  
2774 /*ARGSUSED*/
2775 #if (defined __STDC__ || defined __C99__FUNC__ \
2776     || defined __cplusplus || defined _MSC_VER)
2251   static void
2252   yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
2779 #else
2780 static void
2781 yy_symbol_value_print (yyoutput, yytype, yyvaluep)
2782    FILE *yyoutput;
2783    int yytype;
2784    YYSTYPE const * const yyvaluep;
2785 #endif
2253   {
2254 +  FILE *yyo = yyoutput;
2255 +  YYUSE (yyo);
2256    if (!yyvaluep)
2257      return;
2258   # ifdef YYPRINT
2259    if (yytype < YYNTOKENS)
2260      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
2792 # else
2793  YYUSE (yyoutput);
2261   # endif
2262 <  switch (yytype)
2796 <    {
2797 <      default:
2798 <        break;
2799 <    }
2262 >  YYUSE (yytype);
2263   }
2264  
2265  
# Line 2804 | Line 2267 | yy_symbol_value_print (yyoutput, yytype,
2267   | Print this symbol on YYOUTPUT.  |
2268   `--------------------------------*/
2269  
2807 #if (defined __STDC__ || defined __C99__FUNC__ \
2808     || defined __cplusplus || defined _MSC_VER)
2270   static void
2271   yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
2811 #else
2812 static void
2813 yy_symbol_print (yyoutput, yytype, yyvaluep)
2814    FILE *yyoutput;
2815    int yytype;
2816    YYSTYPE const * const yyvaluep;
2817 #endif
2272   {
2273 <  if (yytype < YYNTOKENS)
2274 <    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
2821 <  else
2822 <    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
2273 >  YYFPRINTF (yyoutput, "%s %s (",
2274 >             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
2275  
2276    yy_symbol_value_print (yyoutput, yytype, yyvaluep);
2277    YYFPRINTF (yyoutput, ")");
# Line 2830 | Line 2282 | yy_symbol_print (yyoutput, yytype, yyval
2282   | TOP (included).                                                   |
2283   `------------------------------------------------------------------*/
2284  
2833 #if (defined __STDC__ || defined __C99__FUNC__ \
2834     || defined __cplusplus || defined _MSC_VER)
2285   static void
2286   yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
2837 #else
2838 static void
2839 yy_stack_print (yybottom, yytop)
2840    yytype_int16 *yybottom;
2841    yytype_int16 *yytop;
2842 #endif
2287   {
2288    YYFPRINTF (stderr, "Stack now");
2289    for (; yybottom <= yytop; yybottom++)
# Line 2850 | Line 2294 | yy_stack_print (yybottom, yytop)
2294    YYFPRINTF (stderr, "\n");
2295   }
2296  
2297 < # define YY_STACK_PRINT(Bottom, Top)                            \
2298 < do {                                                            \
2299 <  if (yydebug)                                                  \
2300 <    yy_stack_print ((Bottom), (Top));                           \
2301 < } while (YYID (0))
2297 > # define YY_STACK_PRINT(Bottom, Top)                            \
2298 > do {                                                            \
2299 >  if (yydebug)                                                  \
2300 >    yy_stack_print ((Bottom), (Top));                           \
2301 > } while (0)
2302  
2303  
2304   /*------------------------------------------------.
2305   | Report that the YYRULE is going to be reduced.  |
2306   `------------------------------------------------*/
2307  
2864 #if (defined __STDC__ || defined __C99__FUNC__ \
2865     || defined __cplusplus || defined _MSC_VER)
2866 static void
2867 yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
2868 #else
2308   static void
2309 < yy_reduce_print (yyvsp, yyrule)
2871 <    YYSTYPE *yyvsp;
2872 <    int yyrule;
2873 < #endif
2309 > yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
2310   {
2311 +  unsigned long int yylno = yyrline[yyrule];
2312    int yynrhs = yyr2[yyrule];
2313    int yyi;
2877  unsigned long int yylno = yyrline[yyrule];
2314    YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
2315 <             yyrule - 1, yylno);
2315 >             yyrule - 1, yylno);
2316    /* The symbols being reduced.  */
2317    for (yyi = 0; yyi < yynrhs; yyi++)
2318      {
2319        YYFPRINTF (stderr, "   $%d = ", yyi + 1);
2320 <      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
2321 <                       &(yyvsp[(yyi + 1) - (yynrhs)])
2322 <                                       );
2320 >      yy_symbol_print (stderr,
2321 >                       yystos[yyssp[yyi + 1 - yynrhs]],
2322 >                       &(yyvsp[(yyi + 1) - (yynrhs)])
2323 >                                              );
2324        YYFPRINTF (stderr, "\n");
2325      }
2326   }
2327  
2328 < # define YY_REDUCE_PRINT(Rule)          \
2329 < do {                                    \
2330 <  if (yydebug)                          \
2331 <    yy_reduce_print (yyvsp, Rule); \
2332 < } while (YYID (0))
2328 > # define YY_REDUCE_PRINT(Rule)          \
2329 > do {                                    \
2330 >  if (yydebug)                          \
2331 >    yy_reduce_print (yyssp, yyvsp, Rule); \
2332 > } while (0)
2333  
2334   /* Nonzero means print parse trace.  It is left uninitialized so that
2335     multiple parsers can coexist.  */
# Line 2906 | Line 2343 | int yydebug;
2343  
2344  
2345   /* YYINITDEPTH -- initial size of the parser's stacks.  */
2346 < #ifndef YYINITDEPTH
2346 > #ifndef YYINITDEPTH
2347   # define YYINITDEPTH 200
2348   #endif
2349  
# Line 2921 | Line 2358 | int yydebug;
2358   # define YYMAXDEPTH 10000
2359   #endif
2360  
2924
2361  
2362   #if YYERROR_VERBOSE
2363  
# Line 2930 | Line 2366 | int yydebug;
2366   #   define yystrlen strlen
2367   #  else
2368   /* Return the length of YYSTR.  */
2933 #if (defined __STDC__ || defined __C99__FUNC__ \
2934     || defined __cplusplus || defined _MSC_VER)
2369   static YYSIZE_T
2370   yystrlen (const char *yystr)
2937 #else
2938 static YYSIZE_T
2939 yystrlen (yystr)
2940    const char *yystr;
2941 #endif
2371   {
2372    YYSIZE_T yylen;
2373    for (yylen = 0; yystr[yylen]; yylen++)
# Line 2954 | Line 2383 | yystrlen (yystr)
2383   #  else
2384   /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
2385     YYDEST.  */
2957 #if (defined __STDC__ || defined __C99__FUNC__ \
2958     || defined __cplusplus || defined _MSC_VER)
2386   static char *
2387   yystpcpy (char *yydest, const char *yysrc)
2961 #else
2962 static char *
2963 yystpcpy (yydest, yysrc)
2964    char *yydest;
2965    const char *yysrc;
2966 #endif
2388   {
2389    char *yyd = yydest;
2390    const char *yys = yysrc;
# Line 2993 | Line 2414 | yytnamerr (char *yyres, const char *yyst
2414        char const *yyp = yystr;
2415  
2416        for (;;)
2417 <        switch (*++yyp)
2418 <          {
2419 <          case '\'':
2420 <          case ',':
2421 <            goto do_not_strip_quotes;
2422 <
2423 <          case '\\':
2424 <            if (*++yyp != '\\')
2425 <              goto do_not_strip_quotes;
2426 <            /* Fall through.  */
2427 <          default:
2428 <            if (yyres)
2429 <              yyres[yyn] = *yyp;
2430 <            yyn++;
2431 <            break;
2432 <
2433 <          case '"':
2434 <            if (yyres)
2435 <              yyres[yyn] = '\0';
2436 <            return yyn;
2437 <          }
2417 >        switch (*++yyp)
2418 >          {
2419 >          case '\'':
2420 >          case ',':
2421 >            goto do_not_strip_quotes;
2422 >
2423 >          case '\\':
2424 >            if (*++yyp != '\\')
2425 >              goto do_not_strip_quotes;
2426 >            /* Fall through.  */
2427 >          default:
2428 >            if (yyres)
2429 >              yyres[yyn] = *yyp;
2430 >            yyn++;
2431 >            break;
2432 >
2433 >          case '"':
2434 >            if (yyres)
2435 >              yyres[yyn] = '\0';
2436 >            return yyn;
2437 >          }
2438      do_not_strip_quotes: ;
2439      }
2440  
# Line 3024 | Line 2445 | yytnamerr (char *yyres, const char *yyst
2445   }
2446   # endif
2447  
2448 < /* Copy into YYRESULT an error message about the unexpected token
2449 <   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
2450 <   including the terminating null byte.  If YYRESULT is null, do not
2451 <   copy anything; just return the number of bytes that would be
2452 <   copied.  As a special case, return 0 if an ordinary "syntax error"
2453 <   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
2454 <   size calculation.  */
2455 < static YYSIZE_T
2456 < yysyntax_error (char *yyresult, int yystate, int yychar)
2448 > /* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
2449 >   about the unexpected token YYTOKEN for the state stack whose top is
2450 >   YYSSP.
2451 >
2452 >   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
2453 >   not large enough to hold the message.  In that case, also set
2454 >   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
2455 >   required number of bytes is too large to store.  */
2456 > static int
2457 > yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
2458 >                yytype_int16 *yyssp, int yytoken)
2459   {
2460 <  int yyn = yypact[yystate];
2460 >  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
2461 >  YYSIZE_T yysize = yysize0;
2462 >  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
2463 >  /* Internationalized format string. */
2464 >  const char *yyformat = YY_NULLPTR;
2465 >  /* Arguments of yyformat. */
2466 >  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
2467 >  /* Number of reported tokens (one for the "unexpected", one per
2468 >     "expected"). */
2469 >  int yycount = 0;
2470 >
2471 >  /* There are many possibilities here to consider:
2472 >     - If this state is a consistent state with a default action, then
2473 >       the only way this function was invoked is if the default action
2474 >       is an error action.  In that case, don't check for expected
2475 >       tokens because there are none.
2476 >     - The only way there can be no lookahead present (in yychar) is if
2477 >       this state is a consistent state with a default action.  Thus,
2478 >       detecting the absence of a lookahead is sufficient to determine
2479 >       that there is no unexpected or expected token to report.  In that
2480 >       case, just report a simple "syntax error".
2481 >     - Don't assume there isn't a lookahead just because this state is a
2482 >       consistent state with a default action.  There might have been a
2483 >       previous inconsistent state, consistent state with a non-default
2484 >       action, or user semantic action that manipulated yychar.
2485 >     - Of course, the expected token list depends on states to have
2486 >       correct lookahead information, and it depends on the parser not
2487 >       to perform extra reductions after fetching a lookahead from the
2488 >       scanner and before detecting a syntax error.  Thus, state merging
2489 >       (from LALR or IELR) and default reductions corrupt the expected
2490 >       token list.  However, the list is correct for canonical LR with
2491 >       one exception: it will still contain any token that will not be
2492 >       accepted due to an error action in a later state.
2493 >  */
2494 >  if (yytoken != YYEMPTY)
2495 >    {
2496 >      int yyn = yypact[*yyssp];
2497 >      yyarg[yycount++] = yytname[yytoken];
2498 >      if (!yypact_value_is_default (yyn))
2499 >        {
2500 >          /* Start YYX at -YYN if negative to avoid negative indexes in
2501 >             YYCHECK.  In other words, skip the first -YYN actions for
2502 >             this state because they are default actions.  */
2503 >          int yyxbegin = yyn < 0 ? -yyn : 0;
2504 >          /* Stay within bounds of both yycheck and yytname.  */
2505 >          int yychecklim = YYLAST - yyn + 1;
2506 >          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
2507 >          int yyx;
2508 >
2509 >          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
2510 >            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
2511 >                && !yytable_value_is_error (yytable[yyx + yyn]))
2512 >              {
2513 >                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
2514 >                  {
2515 >                    yycount = 1;
2516 >                    yysize = yysize0;
2517 >                    break;
2518 >                  }
2519 >                yyarg[yycount++] = yytname[yyx];
2520 >                {
2521 >                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
2522 >                  if (! (yysize <= yysize1
2523 >                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2524 >                    return 2;
2525 >                  yysize = yysize1;
2526 >                }
2527 >              }
2528 >        }
2529 >    }
2530  
2531 <  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
3040 <    return 0;
3041 <  else
2531 >  switch (yycount)
2532      {
2533 <      int yytype = YYTRANSLATE (yychar);
2534 <      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
2535 <      YYSIZE_T yysize = yysize0;
2536 <      YYSIZE_T yysize1;
2537 <      int yysize_overflow = 0;
2538 <      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
2539 <      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
2540 <      int yyx;
2541 <
2542 < # if 0
2543 <      /* This is so xgettext sees the translatable formats that are
3054 <         constructed on the fly.  */
3055 <      YY_("syntax error, unexpected %s");
3056 <      YY_("syntax error, unexpected %s, expecting %s");
3057 <      YY_("syntax error, unexpected %s, expecting %s or %s");
3058 <      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
3059 <      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
3060 < # endif
3061 <      char *yyfmt;
3062 <      char const *yyf;
3063 <      static char const yyunexpected[] = "syntax error, unexpected %s";
3064 <      static char const yyexpecting[] = ", expecting %s";
3065 <      static char const yyor[] = " or %s";
3066 <      char yyformat[sizeof yyunexpected
3067 <                    + sizeof yyexpecting - 1
3068 <                    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
3069 <                       * (sizeof yyor - 1))];
3070 <      char const *yyprefix = yyexpecting;
3071 <
3072 <      /* Start YYX at -YYN if negative to avoid negative indexes in
3073 <         YYCHECK.  */
3074 <      int yyxbegin = yyn < 0 ? -yyn : 0;
3075 <
3076 <      /* Stay within bounds of both yycheck and yytname.  */
3077 <      int yychecklim = YYLAST - yyn + 1;
3078 <      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
3079 <      int yycount = 1;
3080 <
3081 <      yyarg[0] = yytname[yytype];
3082 <      yyfmt = yystpcpy (yyformat, yyunexpected);
3083 <
3084 <      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
3085 <        if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
3086 <          {
3087 <            if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
3088 <              {
3089 <                yycount = 1;
3090 <                yysize = yysize0;
3091 <                yyformat[sizeof yyunexpected - 1] = '\0';
3092 <                break;
3093 <              }
3094 <            yyarg[yycount++] = yytname[yyx];
3095 <            yysize1 = yysize + yytnamerr (0, yytname[yyx]);
3096 <            yysize_overflow |= (yysize1 < yysize);
3097 <            yysize = yysize1;
3098 <            yyfmt = yystpcpy (yyfmt, yyprefix);
3099 <            yyprefix = yyor;
3100 <          }
3101 <
3102 <      yyf = YY_(yyformat);
3103 <      yysize1 = yysize + yystrlen (yyf);
3104 <      yysize_overflow |= (yysize1 < yysize);
3105 <      yysize = yysize1;
3106 <
3107 <      if (yysize_overflow)
3108 <        return YYSIZE_MAXIMUM;
3109 <
3110 <      if (yyresult)
3111 <        {
3112 <          /* Avoid sprintf, as that infringes on the user's name space.
3113 <             Don't have undefined behavior even if the translation
3114 <             produced a string with the wrong number of "%s"s.  */
3115 <          char *yyp = yyresult;
3116 <          int yyi = 0;
3117 <          while ((*yyp = *yyf) != '\0')
3118 <            {
3119 <              if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
3120 <                {
3121 <                  yyp += yytnamerr (yyp, yyarg[yyi++]);
3122 <                  yyf += 2;
3123 <                }
3124 <              else
3125 <                {
3126 <                  yyp++;
3127 <                  yyf++;
3128 <                }
3129 <            }
3130 <        }
3131 <      return yysize;
2533 > # define YYCASE_(N, S)                      \
2534 >      case N:                               \
2535 >        yyformat = S;                       \
2536 >      break
2537 >      YYCASE_(0, YY_("syntax error"));
2538 >      YYCASE_(1, YY_("syntax error, unexpected %s"));
2539 >      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
2540 >      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
2541 >      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
2542 >      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
2543 > # undef YYCASE_
2544      }
2545 +
2546 +  {
2547 +    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
2548 +    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2549 +      return 2;
2550 +    yysize = yysize1;
2551 +  }
2552 +
2553 +  if (*yymsg_alloc < yysize)
2554 +    {
2555 +      *yymsg_alloc = 2 * yysize;
2556 +      if (! (yysize <= *yymsg_alloc
2557 +             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
2558 +        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
2559 +      return 1;
2560 +    }
2561 +
2562 +  /* Avoid sprintf, as that infringes on the user's name space.
2563 +     Don't have undefined behavior even if the translation
2564 +     produced a string with the wrong number of "%s"s.  */
2565 +  {
2566 +    char *yyp = *yymsg;
2567 +    int yyi = 0;
2568 +    while ((*yyp = *yyformat) != '\0')
2569 +      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
2570 +        {
2571 +          yyp += yytnamerr (yyp, yyarg[yyi++]);
2572 +          yyformat += 2;
2573 +        }
2574 +      else
2575 +        {
2576 +          yyp++;
2577 +          yyformat++;
2578 +        }
2579 +  }
2580 +  return 0;
2581   }
2582   #endif /* YYERROR_VERBOSE */
3135
2583  
2584   /*-----------------------------------------------.
2585   | Release the memory associated to this symbol.  |
2586   `-----------------------------------------------*/
2587  
3141 /*ARGSUSED*/
3142 #if (defined __STDC__ || defined __C99__FUNC__ \
3143     || defined __cplusplus || defined _MSC_VER)
2588   static void
2589   yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
3146 #else
3147 static void
3148 yydestruct (yymsg, yytype, yyvaluep)
3149    const char *yymsg;
3150    int yytype;
3151    YYSTYPE *yyvaluep;
3152 #endif
2590   {
2591    YYUSE (yyvaluep);
3155
2592    if (!yymsg)
2593      yymsg = "Deleting";
2594    YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
2595  
2596 <  switch (yytype)
2597 <    {
2598 <
3163 <      default:
3164 <        break;
3165 <    }
2596 >  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
2597 >  YYUSE (yytype);
2598 >  YY_IGNORE_MAYBE_UNINITIALIZED_END
2599   }
2600  
2601 < /* Prevent warnings from -Wmissing-prototypes.  */
3169 < #ifdef YYPARSE_PARAM
3170 < #if defined __STDC__ || defined __cplusplus
3171 < int yyparse (void *YYPARSE_PARAM);
3172 < #else
3173 < int yyparse ();
3174 < #endif
3175 < #else /* ! YYPARSE_PARAM */
3176 < #if defined __STDC__ || defined __cplusplus
3177 < int yyparse (void);
3178 < #else
3179 < int yyparse ();
3180 < #endif
3181 < #endif /* ! YYPARSE_PARAM */
2601 >
2602  
2603  
2604   /* The lookahead symbol.  */
# Line 3186 | Line 2606 | int yychar;
2606  
2607   /* The semantic value of the lookahead symbol.  */
2608   YYSTYPE yylval;
3189
2609   /* Number of syntax errors so far.  */
2610   int yynerrs;
2611  
2612  
2613 + /*----------.
2614 + | yyparse.  |
2615 + `----------*/
2616  
3195 /*-------------------------.
3196 | yyparse or yypush_parse.  |
3197 `-------------------------*/
3198
3199 #ifdef YYPARSE_PARAM
3200 #if (defined __STDC__ || defined __C99__FUNC__ \
3201     || defined __cplusplus || defined _MSC_VER)
3202 int
3203 yyparse (void *YYPARSE_PARAM)
3204 #else
3205 int
3206 yyparse (YYPARSE_PARAM)
3207    void *YYPARSE_PARAM;
3208 #endif
3209 #else /* ! YYPARSE_PARAM */
3210 #if (defined __STDC__ || defined __C99__FUNC__ \
3211     || defined __cplusplus || defined _MSC_VER)
2617   int
2618   yyparse (void)
3214 #else
3215 int
3216 yyparse ()
3217
3218 #endif
3219 #endif
2619   {
3221
3222
2620      int yystate;
2621      /* Number of tokens to shift before error messages enabled.  */
2622      int yyerrstatus;
2623  
2624      /* The stacks and their tools:
2625 <       `yyss': related to states.
2626 <       `yyvs': related to semantic values.
2625 >       'yyss': related to states.
2626 >       'yyvs': related to semantic values.
2627  
2628 <       Refer to the stacks thru separate pointers, to allow yyoverflow
2628 >       Refer to the stacks through separate pointers, to allow yyoverflow
2629         to reallocate them elsewhere.  */
2630  
2631      /* The state stack.  */
# Line 3246 | Line 2643 | yyparse ()
2643    int yyn;
2644    int yyresult;
2645    /* Lookahead token as an internal (translated) token number.  */
2646 <  int yytoken;
2646 >  int yytoken = 0;
2647    /* The variables used to return semantic value and location from the
2648       action routines.  */
2649    YYSTYPE yyval;
# Line 3264 | Line 2661 | yyparse ()
2661       Keep to zero when no symbol should be popped.  */
2662    int yylen = 0;
2663  
2664 <  yytoken = 0;
2665 <  yyss = yyssa;
3269 <  yyvs = yyvsa;
2664 >  yyssp = yyss = yyssa;
2665 >  yyvsp = yyvs = yyvsa;
2666    yystacksize = YYINITDEPTH;
2667  
2668    YYDPRINTF ((stderr, "Starting parse\n"));
# Line 3275 | Line 2671 | yyparse ()
2671    yyerrstatus = 0;
2672    yynerrs = 0;
2673    yychar = YYEMPTY; /* Cause a token to be read.  */
3278
3279  /* Initialize stack pointers.
3280     Waste one element of value and location stack
3281     so that they stay on the same level as the state stack.
3282     The wasted elements are never initialized.  */
3283  yyssp = yyss;
3284  yyvsp = yyvs;
3285
2674    goto yysetstate;
2675  
2676   /*------------------------------------------------------------.
# Line 3303 | Line 2691 | yyparse ()
2691  
2692   #ifdef yyoverflow
2693        {
2694 <        /* Give user a chance to reallocate the stack.  Use copies of
2695 <           these so that the &'s don't force the real ones into
2696 <           memory.  */
2697 <        YYSTYPE *yyvs1 = yyvs;
2698 <        yytype_int16 *yyss1 = yyss;
2699 <
2700 <        /* Each stack pointer address is followed by the size of the
2701 <           data in use in that stack, in bytes.  This used to be a
2702 <           conditional around just the two extra args, but that might
2703 <           be undefined if yyoverflow is a macro.  */
2704 <        yyoverflow (YY_("memory exhausted"),
2705 <                    &yyss1, yysize * sizeof (*yyssp),
2706 <                    &yyvs1, yysize * sizeof (*yyvsp),
2707 <                    &yystacksize);
2694 >        /* Give user a chance to reallocate the stack.  Use copies of
2695 >           these so that the &'s don't force the real ones into
2696 >           memory.  */
2697 >        YYSTYPE *yyvs1 = yyvs;
2698 >        yytype_int16 *yyss1 = yyss;
2699 >
2700 >        /* Each stack pointer address is followed by the size of the
2701 >           data in use in that stack, in bytes.  This used to be a
2702 >           conditional around just the two extra args, but that might
2703 >           be undefined if yyoverflow is a macro.  */
2704 >        yyoverflow (YY_("memory exhausted"),
2705 >                    &yyss1, yysize * sizeof (*yyssp),
2706 >                    &yyvs1, yysize * sizeof (*yyvsp),
2707 >                    &yystacksize);
2708  
2709 <        yyss = yyss1;
2710 <        yyvs = yyvs1;
2709 >        yyss = yyss1;
2710 >        yyvs = yyvs1;
2711        }
2712   #else /* no yyoverflow */
2713   # ifndef YYSTACK_RELOCATE
# Line 3327 | Line 2715 | yyparse ()
2715   # else
2716        /* Extend the stack our own way.  */
2717        if (YYMAXDEPTH <= yystacksize)
2718 <        goto yyexhaustedlab;
2718 >        goto yyexhaustedlab;
2719        yystacksize *= 2;
2720        if (YYMAXDEPTH < yystacksize)
2721 <        yystacksize = YYMAXDEPTH;
2721 >        yystacksize = YYMAXDEPTH;
2722  
2723        {
2724 <        yytype_int16 *yyss1 = yyss;
2725 <        union yyalloc *yyptr =
2726 <          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
2727 <        if (! yyptr)
2728 <          goto yyexhaustedlab;
2729 <        YYSTACK_RELOCATE (yyss_alloc, yyss);
2730 <        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
2724 >        yytype_int16 *yyss1 = yyss;
2725 >        union yyalloc *yyptr =
2726 >          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
2727 >        if (! yyptr)
2728 >          goto yyexhaustedlab;
2729 >        YYSTACK_RELOCATE (yyss_alloc, yyss);
2730 >        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
2731   #  undef YYSTACK_RELOCATE
2732 <        if (yyss1 != yyssa)
2733 <          YYSTACK_FREE (yyss1);
2732 >        if (yyss1 != yyssa)
2733 >          YYSTACK_FREE (yyss1);
2734        }
2735   # endif
2736   #endif /* no yyoverflow */
# Line 3351 | Line 2739 | yyparse ()
2739        yyvsp = yyvs + yysize - 1;
2740  
2741        YYDPRINTF ((stderr, "Stack size increased to %lu\n",
2742 <                  (unsigned long int) yystacksize));
2742 >                  (unsigned long int) yystacksize));
2743  
2744        if (yyss + yystacksize - 1 <= yyssp)
2745 <        YYABORT;
2745 >        YYABORT;
2746      }
2747  
2748    YYDPRINTF ((stderr, "Entering state %d\n", yystate));
# Line 3374 | Line 2762 | yybackup:
2762  
2763    /* First try to decide what to do without reference to lookahead token.  */
2764    yyn = yypact[yystate];
2765 <  if (yyn == YYPACT_NINF)
2765 >  if (yypact_value_is_default (yyn))
2766      goto yydefault;
2767  
2768    /* Not known => get a lookahead token if don't already have one.  */
# Line 3383 | Line 2771 | yybackup:
2771    if (yychar == YYEMPTY)
2772      {
2773        YYDPRINTF ((stderr, "Reading a token: "));
2774 <      yychar = YYLEX;
2774 >      yychar = yylex ();
2775      }
2776  
2777    if (yychar <= YYEOF)
# Line 3405 | Line 2793 | yybackup:
2793    yyn = yytable[yyn];
2794    if (yyn <= 0)
2795      {
2796 <      if (yyn == 0 || yyn == YYTABLE_NINF)
2797 <        goto yyerrlab;
2796 >      if (yytable_value_is_error (yyn))
2797 >        goto yyerrlab;
2798        yyn = -yyn;
2799        goto yyreduce;
2800      }
# Line 3423 | Line 2811 | yybackup:
2811    yychar = YYEMPTY;
2812  
2813    yystate = yyn;
2814 +  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
2815    *++yyvsp = yylval;
2816 +  YY_IGNORE_MAYBE_UNINITIALIZED_END
2817  
2818    goto yynewstate;
2819  
# Line 3446 | Line 2836 | yyreduce:
2836    yylen = yyr2[yyn];
2837  
2838    /* If YYLEN is nonzero, implement the default value of the action:
2839 <     `$$ = $1'.
2839 >     '$$ = $1'.
2840  
2841       Otherwise, the following line sets YYVAL to garbage.
2842       This behavior is undocumented and Bison
# Line 3459 | Line 2849 | yyreduce:
2849    YY_REDUCE_PRINT (yyn);
2850    switch (yyn)
2851      {
2852 <        case 26:
2853 <
3464 < /* Line 1455 of yacc.c  */
3465 < #line 426 "ircd_parser.y"
2852 >        case 28:
2853 > #line 412 "conf_parser.y" /* yacc.c:1646  */
2854      { (yyval.number) = 0; }
2855 <    break;
3468 <
3469 <  case 28:
3470 <
3471 < /* Line 1455 of yacc.c  */
3472 < #line 428 "ircd_parser.y"
3473 <    {
3474 <                        (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number);
3475 <                }
3476 <    break;
3477 <
3478 <  case 29:
3479 <
3480 < /* Line 1455 of yacc.c  */
3481 < #line 432 "ircd_parser.y"
3482 <    {
3483 <                        (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number);
3484 <                }
2855 > #line 2856 "conf_parser.c" /* yacc.c:1646  */
2856      break;
2857  
2858    case 30:
2859 <
2860 < /* Line 1455 of yacc.c  */
2861 < #line 436 "ircd_parser.y"
3491 <    {
3492 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 + (yyvsp[(3) - (3)].number);
3493 <                }
2859 > #line 413 "conf_parser.y" /* yacc.c:1646  */
2860 >    { (yyval.number) = (yyvsp[-1].number) + (yyvsp[0].number); }
2861 > #line 2862 "conf_parser.c" /* yacc.c:1646  */
2862      break;
2863  
2864    case 31:
2865 <
2866 < /* Line 1455 of yacc.c  */
2867 < #line 440 "ircd_parser.y"
3500 <    {
3501 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 + (yyvsp[(3) - (3)].number);
3502 <                }
2865 > #line 414 "conf_parser.y" /* yacc.c:1646  */
2866 >    { (yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number); }
2867 > #line 2868 "conf_parser.c" /* yacc.c:1646  */
2868      break;
2869  
2870    case 32:
2871 <
2872 < /* Line 1455 of yacc.c  */
2873 < #line 444 "ircd_parser.y"
3509 <    {
3510 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 + (yyvsp[(3) - (3)].number);
3511 <                }
2871 > #line 415 "conf_parser.y" /* yacc.c:1646  */
2872 >    { (yyval.number) = (yyvsp[-2].number) * 60 + (yyvsp[0].number); }
2873 > #line 2874 "conf_parser.c" /* yacc.c:1646  */
2874      break;
2875  
2876    case 33:
2877 <
2878 < /* Line 1455 of yacc.c  */
2879 < #line 448 "ircd_parser.y"
3518 <    {
3519 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 + (yyvsp[(3) - (3)].number);
3520 <                }
2877 > #line 416 "conf_parser.y" /* yacc.c:1646  */
2878 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 + (yyvsp[0].number); }
2879 > #line 2880 "conf_parser.c" /* yacc.c:1646  */
2880      break;
2881  
2882    case 34:
2883 + #line 417 "conf_parser.y" /* yacc.c:1646  */
2884 +    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 + (yyvsp[0].number); }
2885 + #line 2886 "conf_parser.c" /* yacc.c:1646  */
2886 +    break;
2887  
2888 < /* Line 1455 of yacc.c  */
2889 < #line 453 "ircd_parser.y"
2890 <    { (yyval.number) = 0; }
2888 >  case 35:
2889 > #line 418 "conf_parser.y" /* yacc.c:1646  */
2890 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 7 + (yyvsp[0].number); }
2891 > #line 2892 "conf_parser.c" /* yacc.c:1646  */
2892      break;
2893  
2894    case 36:
2895 <
2896 < /* Line 1455 of yacc.c  */
2897 < #line 454 "ircd_parser.y"
3534 <    { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); }
2895 > #line 419 "conf_parser.y" /* yacc.c:1646  */
2896 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 7 * 4 + (yyvsp[0].number); }
2897 > #line 2898 "conf_parser.c" /* yacc.c:1646  */
2898      break;
2899  
2900    case 37:
2901 <
2902 < /* Line 1455 of yacc.c  */
2903 < #line 455 "ircd_parser.y"
3541 <    { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); }
2901 > #line 420 "conf_parser.y" /* yacc.c:1646  */
2902 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 365 + (yyvsp[0].number); }
2903 > #line 2904 "conf_parser.c" /* yacc.c:1646  */
2904      break;
2905  
2906    case 38:
2907 + #line 423 "conf_parser.y" /* yacc.c:1646  */
2908 +    { (yyval.number) = 0; }
2909 + #line 2910 "conf_parser.c" /* yacc.c:1646  */
2910 +    break;
2911  
2912 < /* Line 1455 of yacc.c  */
2913 < #line 456 "ircd_parser.y"
2914 <    { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 + (yyvsp[(3) - (3)].number); }
2912 >  case 40:
2913 > #line 424 "conf_parser.y" /* yacc.c:1646  */
2914 >    { (yyval.number) = (yyvsp[-1].number) + (yyvsp[0].number); }
2915 > #line 2916 "conf_parser.c" /* yacc.c:1646  */
2916      break;
2917  
2918 <  case 39:
2918 >  case 41:
2919 > #line 425 "conf_parser.y" /* yacc.c:1646  */
2920 >    { (yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number); }
2921 > #line 2922 "conf_parser.c" /* yacc.c:1646  */
2922 >    break;
2923  
2924 < /* Line 1455 of yacc.c  */
2925 < #line 457 "ircd_parser.y"
2926 <    { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 * 1024 + (yyvsp[(3) - (3)].number); }
2924 >  case 42:
2925 > #line 426 "conf_parser.y" /* yacc.c:1646  */
2926 >    { (yyval.number) = (yyvsp[-2].number) * 1024 + (yyvsp[0].number); }
2927 > #line 2928 "conf_parser.c" /* yacc.c:1646  */
2928      break;
2929  
2930 <  case 46:
2930 >  case 43:
2931 > #line 427 "conf_parser.y" /* yacc.c:1646  */
2932 >    { (yyval.number) = (yyvsp[-2].number) * 1024 * 1024 + (yyvsp[0].number); }
2933 > #line 2934 "conf_parser.c" /* yacc.c:1646  */
2934 >    break;
2935  
2936 < /* Line 1455 of yacc.c  */
2937 < #line 471 "ircd_parser.y"
2936 >  case 50:
2937 > #line 441 "conf_parser.y" /* yacc.c:1646  */
2938      {
3563 #ifndef STATIC_MODULES /* NOOP in the static case */
2939    if (conf_parser_ctx.pass == 2)
2940      add_conf_module(libio_basename(yylval.string));
3566 #endif
2941   }
2942 + #line 2943 "conf_parser.c" /* yacc.c:1646  */
2943      break;
2944  
2945 <  case 47:
2946 <
3572 < /* Line 1455 of yacc.c  */
3573 < #line 479 "ircd_parser.y"
2945 >  case 51:
2946 > #line 447 "conf_parser.y" /* yacc.c:1646  */
2947      {
3575 #ifndef STATIC_MODULES
2948    if (conf_parser_ctx.pass == 2)
2949      mod_add_path(yylval.string);
3578 #endif
2950   }
2951 + #line 2952 "conf_parser.c" /* yacc.c:1646  */
2952      break;
2953  
2954 <  case 64:
2955 <
3584 < /* Line 1455 of yacc.c  */
3585 < #line 501 "ircd_parser.y"
2954 >  case 73:
2955 > #line 477 "conf_parser.y" /* yacc.c:1646  */
2956      {
2957   #ifdef HAVE_LIBCRYPTO
2958 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
2959 <    ServerInfo.tls_version = 0;
2958 >  if (conf_parser_ctx.pass == 2)
2959 >  {
2960 >    if (!ConfigServerInfo.rsa_private_key_file)
2961 >    {
2962 >      conf_error_report("No rsa_private_key_file specified, SSL disabled");
2963 >      break;
2964 >    }
2965 >
2966 >    if (SSL_CTX_use_certificate_chain_file(ConfigServerInfo.server_ctx, yylval.string) <= 0 ||
2967 >        SSL_CTX_use_certificate_chain_file(ConfigServerInfo.client_ctx, yylval.string) <= 0)
2968 >    {
2969 >      report_crypto_errors();
2970 >      conf_error_report("Could not open/read certificate file");
2971 >      break;
2972 >    }
2973 >
2974 >    if (SSL_CTX_use_PrivateKey_file(ConfigServerInfo.server_ctx, ConfigServerInfo.rsa_private_key_file,
2975 >                                    SSL_FILETYPE_PEM) <= 0 ||
2976 >        SSL_CTX_use_PrivateKey_file(ConfigServerInfo.client_ctx, ConfigServerInfo.rsa_private_key_file,
2977 >                                    SSL_FILETYPE_PEM) <= 0)
2978 >    {
2979 >      report_crypto_errors();
2980 >      conf_error_report("Could not read RSA private key");
2981 >      break;
2982 >    }
2983 >
2984 >    if (!SSL_CTX_check_private_key(ConfigServerInfo.server_ctx) ||
2985 >        !SSL_CTX_check_private_key(ConfigServerInfo.client_ctx))
2986 >    {
2987 >      report_crypto_errors();
2988 >      conf_error_report("Could not read RSA private key");
2989 >      break;
2990 >    }
2991 >  }
2992   #endif
2993   }
2994 + #line 2995 "conf_parser.c" /* yacc.c:1646  */
2995      break;
2996  
2997 <  case 65:
2998 <
3596 < /* Line 1455 of yacc.c  */
3597 < #line 507 "ircd_parser.y"
2997 >  case 74:
2998 > #line 517 "conf_parser.y" /* yacc.c:1646  */
2999      {
3000   #ifdef HAVE_LIBCRYPTO
3001 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3001 >  BIO *file = NULL;
3002 >
3003 >  if (conf_parser_ctx.pass != 1)
3004 >    break;
3005 >
3006 >  if (ConfigServerInfo.rsa_private_key)
3007    {
3008 <    if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_SSLV3))
3009 <      SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
3604 <    if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_TLSV1))
3605 <      SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
3008 >    RSA_free(ConfigServerInfo.rsa_private_key);
3009 >    ConfigServerInfo.rsa_private_key = NULL;
3010    }
3011 < #endif
3012 < }
3011 >
3012 >  if (ConfigServerInfo.rsa_private_key_file)
3013 >  {
3014 >    MyFree(ConfigServerInfo.rsa_private_key_file);
3015 >    ConfigServerInfo.rsa_private_key_file = NULL;
3016 >  }
3017 >
3018 >  ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
3019 >
3020 >  if ((file = BIO_new_file(yylval.string, "r")) == NULL)
3021 >  {
3022 >    conf_error_report("File open failed, ignoring");
3023      break;
3024 +  }
3025  
3026 <  case 68:
3026 >  ConfigServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
3027  
3028 < /* Line 1455 of yacc.c  */
3029 < #line 521 "ircd_parser.y"
3030 <    {
3031 < #ifdef HAVE_LIBCRYPTO
3032 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3033 <    ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_SSLV3;
3034 < #endif
3035 < }
3028 >  BIO_set_close(file, BIO_CLOSE);
3029 >  BIO_free(file);
3030 >
3031 >  if (ConfigServerInfo.rsa_private_key == NULL)
3032 >  {
3033 >    conf_error_report("Couldn't extract key, ignoring");
3034 >    break;
3035 >  }
3036 >
3037 >  if (!RSA_check_key(ConfigServerInfo.rsa_private_key))
3038 >  {
3039 >    RSA_free(ConfigServerInfo.rsa_private_key);
3040 >    ConfigServerInfo.rsa_private_key = NULL;
3041 >
3042 >    conf_error_report("Invalid key, ignoring");
3043      break;
3044 +  }
3045  
3046 <  case 69:
3046 >  if (RSA_size(ConfigServerInfo.rsa_private_key) < 128)
3047 >  {
3048 >    RSA_free(ConfigServerInfo.rsa_private_key);
3049 >    ConfigServerInfo.rsa_private_key = NULL;
3050  
3051 < /* Line 1455 of yacc.c  */
3052 < #line 527 "ircd_parser.y"
3627 <    {
3628 < #ifdef HAVE_LIBCRYPTO
3629 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3630 <    ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_TLSV1;
3051 >    conf_error_report("Ignoring serverinfo::rsa_private_key_file -- need at least a 1024 bit key size");
3052 >  }
3053   #endif
3054   }
3055 + #line 3056 "conf_parser.c" /* yacc.c:1646  */
3056      break;
3057  
3058 <  case 70:
3059 <
3637 < /* Line 1455 of yacc.c  */
3638 < #line 535 "ircd_parser.y"
3058 >  case 75:
3059 > #line 575 "conf_parser.y" /* yacc.c:1646  */
3060      {
3061   #ifdef HAVE_LIBCRYPTO
3062 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
3062 >  if (conf_parser_ctx.pass == 2)
3063    {
3064 <    if (!ServerInfo.rsa_private_key_file)
3644 <    {
3645 <      yyerror("No rsa_private_key_file specified, SSL disabled");
3646 <      break;
3647 <    }
3064 >    BIO *file = BIO_new_file(yylval.string, "r");
3065  
3066 <    if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
3650 <                                     SSL_FILETYPE_PEM) <= 0)
3066 >    if (file)
3067      {
3068 <      yyerror(ERR_lib_error_string(ERR_get_error()));
3653 <      break;
3654 <    }
3068 >      DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
3069  
3070 <    if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
3657 <                                    SSL_FILETYPE_PEM) <= 0)
3658 <    {
3659 <      yyerror(ERR_lib_error_string(ERR_get_error()));
3660 <      break;
3661 <    }
3070 >      BIO_free(file);
3071  
3072 <    if (!SSL_CTX_check_private_key(ServerInfo.server_ctx))
3073 <    {
3074 <      yyerror(ERR_lib_error_string(ERR_get_error()));
3075 <      break;
3072 >      if (dh)
3073 >      {
3074 >        if (DH_size(dh) < 128)
3075 >          conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
3076 >        else
3077 >          SSL_CTX_set_tmp_dh(ConfigServerInfo.server_ctx, dh);
3078 >
3079 >        DH_free(dh);
3080 >      }
3081      }
3082 +    else
3083 +      conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- could not open/read Diffie-Hellman parameter file");
3084    }
3085   #endif
3086   }
3087 + #line 3088 "conf_parser.c" /* yacc.c:1646  */
3088      break;
3089  
3090 <  case 71:
3091 <
3675 < /* Line 1455 of yacc.c  */
3676 < #line 569 "ircd_parser.y"
3090 >  case 76:
3091 > #line 604 "conf_parser.y" /* yacc.c:1646  */
3092      {
3093   #ifdef HAVE_LIBCRYPTO
3094 <  if (conf_parser_ctx.pass == 1)
3095 <  {
3096 <    BIO *file;
3094 >  if (conf_parser_ctx.pass == 2)
3095 >    SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, yylval.string);
3096 > #endif
3097 > }
3098 > #line 3099 "conf_parser.c" /* yacc.c:1646  */
3099 >    break;
3100  
3101 <    if (ServerInfo.rsa_private_key)
3101 >  case 77:
3102 > #line 612 "conf_parser.y" /* yacc.c:1646  */
3103      {
3104 <      RSA_free(ServerInfo.rsa_private_key);
3105 <      ServerInfo.rsa_private_key = NULL;
3106 <    }
3107 <
3689 <    if (ServerInfo.rsa_private_key_file)
3104 > #ifdef HAVE_LIBCRYPTO
3105 >  if (conf_parser_ctx.pass == 2)
3106 >  {
3107 >    if ((ConfigServerInfo.message_digest_algorithm = EVP_get_digestbyname(yylval.string)) == NULL)
3108      {
3109 <      MyFree(ServerInfo.rsa_private_key_file);
3110 <      ServerInfo.rsa_private_key_file = NULL;
3109 >      ConfigServerInfo.message_digest_algorithm = EVP_sha256();
3110 >      conf_error_report("Ignoring serverinfo::ssl_message_digest_algorithm -- unknown message digest algorithm");
3111      }
3112 +  }
3113 + #endif
3114 + }
3115 + #line 3116 "conf_parser.c" /* yacc.c:1646  */
3116 +    break;
3117  
3118 <    DupString(ServerInfo.rsa_private_key_file, yylval.string);
3119 <
3697 <    if ((file = BIO_new_file(yylval.string, "r")) == NULL)
3118 >  case 78:
3119 > #line 626 "conf_parser.y" /* yacc.c:1646  */
3120      {
3121 <      yyerror("File open failed, ignoring");
3122 <      break;
3123 <    }
3124 <
3703 <    ServerInfo.rsa_private_key = (RSA *)PEM_read_bio_RSAPrivateKey(file, NULL,
3704 <      0, NULL);
3705 <
3706 <    BIO_set_close(file, BIO_CLOSE);
3707 <    BIO_free(file);
3121 > #ifdef HAVE_LIBCRYPTO
3122 > #if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
3123 >  int nid = 0;
3124 >  EC_KEY *key = NULL;
3125  
3126 <    if (ServerInfo.rsa_private_key == NULL)
3126 >  if (conf_parser_ctx.pass == 2)
3127 >  {
3128 >    if ((nid = OBJ_sn2nid(yylval.string)) == 0)
3129      {
3130 <      yyerror("Couldn't extract key, ignoring");
3131 <      break;
3130 >        conf_error_report("Ignoring serverinfo::ssl_dh_elliptic_curve -- unknown curve name");
3131 >        break;
3132      }
3133  
3134 <    if (!RSA_check_key(ServerInfo.rsa_private_key))
3134 >    if ((key = EC_KEY_new_by_curve_name(nid)) == NULL)
3135      {
3136 <      RSA_free(ServerInfo.rsa_private_key);
3718 <      ServerInfo.rsa_private_key = NULL;
3719 <
3720 <      yyerror("Invalid key, ignoring");
3136 >      conf_error_report("Ignoring serverinfo::ssl_dh_elliptic_curve -- could not create curve");
3137        break;
3138      }
3139  
3140 <    /* require 2048 bit (256 byte) key */
3141 <    if (RSA_size(ServerInfo.rsa_private_key) != 256)
3142 <    {
3143 <      RSA_free(ServerInfo.rsa_private_key);
3728 <      ServerInfo.rsa_private_key = NULL;
3729 <
3730 <      yyerror("Not a 2048 bit key, ignoring");
3731 <    }
3732 <  }
3140 >    SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
3141 >    EC_KEY_free(key);
3142 > }
3143 > #endif
3144   #endif
3145   }
3146 + #line 3147 "conf_parser.c" /* yacc.c:1646  */
3147      break;
3148  
3149 <  case 72:
3150 <
3739 < /* Line 1455 of yacc.c  */
3740 < #line 629 "ircd_parser.y"
3149 >  case 79:
3150 > #line 654 "conf_parser.y" /* yacc.c:1646  */
3151      {
3152    /* this isn't rehashable */
3153 <  if (conf_parser_ctx.pass == 2)
3153 >  if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.name)
3154    {
3155 <    if (ServerInfo.name == NULL)
3155 >    if (valid_servname(yylval.string))
3156 >      ConfigServerInfo.name = xstrdup(yylval.string);
3157 >    else
3158      {
3159 <      /* the ircd will exit() in main() if we dont set one */
3160 <      if (strlen(yylval.string) <= HOSTLEN)
3749 <        DupString(ServerInfo.name, yylval.string);
3159 >      conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
3160 >      exit(0);
3161      }
3162    }
3163   }
3164 + #line 3165 "conf_parser.c" /* yacc.c:1646  */
3165      break;
3166  
3167 <  case 73:
3168 <
3757 < /* Line 1455 of yacc.c  */
3758 < #line 643 "ircd_parser.y"
3167 >  case 80:
3168 > #line 669 "conf_parser.y" /* yacc.c:1646  */
3169      {
3170    /* this isn't rehashable */
3171 <  if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
3171 >  if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.sid)
3172    {
3173      if (valid_sid(yylval.string))
3174 <      DupString(ServerInfo.sid, yylval.string);
3174 >      ConfigServerInfo.sid = xstrdup(yylval.string);
3175      else
3176      {
3177 <      ilog(L_ERROR, "Ignoring config file entry SID -- invalid SID. Aborting.");
3177 >      conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
3178        exit(0);
3179      }
3180    }
3181   }
3182 + #line 3183 "conf_parser.c" /* yacc.c:1646  */
3183      break;
3184  
3185 <  case 74:
3186 <
3776 < /* Line 1455 of yacc.c  */
3777 < #line 658 "ircd_parser.y"
3185 >  case 81:
3186 > #line 684 "conf_parser.y" /* yacc.c:1646  */
3187      {
3188    if (conf_parser_ctx.pass == 2)
3189    {
3190 <    MyFree(ServerInfo.description);
3191 <    DupString(ServerInfo.description,yylval.string);
3190 >    MyFree(ConfigServerInfo.description);
3191 >    ConfigServerInfo.description = xstrdup(yylval.string);
3192 >    strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
3193    }
3194   }
3195 + #line 3196 "conf_parser.c" /* yacc.c:1646  */
3196      break;
3197  
3198 <  case 75:
3199 <
3789 < /* Line 1455 of yacc.c  */
3790 < #line 667 "ircd_parser.y"
3198 >  case 82:
3199 > #line 694 "conf_parser.y" /* yacc.c:1646  */
3200      {
3201    if (conf_parser_ctx.pass == 2)
3202    {
3203      char *p;
3204  
3205 <    if ((p = strchr(yylval.string, ' ')) != NULL)
3206 <      p = '\0';
3205 >    if ((p = strchr(yylval.string, ' ')))
3206 >      *p = '\0';
3207  
3208 <    MyFree(ServerInfo.network_name);
3209 <    DupString(ServerInfo.network_name, yylval.string);
3208 >    MyFree(ConfigServerInfo.network_name);
3209 >    ConfigServerInfo.network_name = xstrdup(yylval.string);
3210    }
3211   }
3212 + #line 3213 "conf_parser.c" /* yacc.c:1646  */
3213      break;
3214  
3215 <  case 76:
3216 <
3807 < /* Line 1455 of yacc.c  */
3808 < #line 681 "ircd_parser.y"
3215 >  case 83:
3216 > #line 708 "conf_parser.y" /* yacc.c:1646  */
3217      {
3218 <  if (conf_parser_ctx.pass == 2)
3811 <  {
3812 <    MyFree(ServerInfo.network_desc);
3813 <    DupString(ServerInfo.network_desc, yylval.string);
3814 <  }
3815 < }
3218 >  if (conf_parser_ctx.pass != 2)
3219      break;
3220  
3221 <  case 77:
3221 >  MyFree(ConfigServerInfo.network_desc);
3222 >  ConfigServerInfo.network_desc = xstrdup(yylval.string);
3223 > }
3224 > #line 3225 "conf_parser.c" /* yacc.c:1646  */
3225 >    break;
3226  
3227 < /* Line 1455 of yacc.c  */
3228 < #line 690 "ircd_parser.y"
3227 >  case 84:
3228 > #line 717 "conf_parser.y" /* yacc.c:1646  */
3229      {
3230    if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
3231    {
# Line 3830 | Line 3237 | yyreduce:
3237      hints.ai_socktype = SOCK_STREAM;
3238      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
3239  
3240 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
3241 <      ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
3240 >    if (getaddrinfo(yylval.string, NULL, &hints, &res))
3241 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
3242      else
3243      {
3244 <      assert(res != NULL);
3244 >      assert(res);
3245  
3246 <      memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
3247 <      ServerInfo.ip.ss.ss_family = res->ai_family;
3248 <      ServerInfo.ip.ss_len = res->ai_addrlen;
3249 <      irc_freeaddrinfo(res);
3246 >      memcpy(&ConfigServerInfo.ip, res->ai_addr, res->ai_addrlen);
3247 >      ConfigServerInfo.ip.ss.ss_family = res->ai_family;
3248 >      ConfigServerInfo.ip.ss_len = res->ai_addrlen;
3249 >      freeaddrinfo(res);
3250  
3251 <      ServerInfo.specific_ipv4_vhost = 1;
3251 >      ConfigServerInfo.specific_ipv4_vhost = 1;
3252      }
3253    }
3254   }
3255 + #line 3256 "conf_parser.c" /* yacc.c:1646  */
3256      break;
3257  
3258 <  case 78:
3259 <
3852 < /* Line 1455 of yacc.c  */
3853 < #line 718 "ircd_parser.y"
3258 >  case 85:
3259 > #line 745 "conf_parser.y" /* yacc.c:1646  */
3260      {
3855 #ifdef IPV6
3261    if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
3262    {
3263      struct addrinfo hints, *res;
# Line 3863 | Line 3268 | yyreduce:
3268      hints.ai_socktype = SOCK_STREAM;
3269      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
3270  
3271 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
3272 <      ilog(L_ERROR, "Invalid netmask for server vhost6(%s)", yylval.string);
3271 >    if (getaddrinfo(yylval.string, NULL, &hints, &res))
3272 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
3273      else
3274      {
3275 <      assert(res != NULL);
3275 >      assert(res);
3276  
3277 <      memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
3278 <      ServerInfo.ip6.ss.ss_family = res->ai_family;
3279 <      ServerInfo.ip6.ss_len = res->ai_addrlen;
3280 <      irc_freeaddrinfo(res);
3277 >      memcpy(&ConfigServerInfo.ip6, res->ai_addr, res->ai_addrlen);
3278 >      ConfigServerInfo.ip6.ss.ss_family = res->ai_family;
3279 >      ConfigServerInfo.ip6.ss_len = res->ai_addrlen;
3280 >      freeaddrinfo(res);
3281  
3282 <      ServerInfo.specific_ipv6_vhost = 1;
3282 >      ConfigServerInfo.specific_ipv6_vhost = 1;
3283      }
3284    }
3880 #endif
3285   }
3286 + #line 3287 "conf_parser.c" /* yacc.c:1646  */
3287      break;
3288  
3289 <  case 79:
3290 <
3886 < /* Line 1455 of yacc.c  */
3887 < #line 748 "ircd_parser.y"
3289 >  case 86:
3290 > #line 773 "conf_parser.y" /* yacc.c:1646  */
3291      {
3292 <  if (conf_parser_ctx.pass == 2)
3292 >  if (conf_parser_ctx.pass != 2)
3293 >    break;
3294 >
3295 >  if ((yyvsp[-1].number) < MAXCLIENTS_MIN)
3296    {
3297 <    recalc_fdlimit(NULL);
3297 >    char buf[IRCD_BUFSIZE] = "";
3298  
3299 <    if ((yyvsp[(3) - (4)].number) < MAXCLIENTS_MIN)
3300 <    {
3301 <      char buf[IRCD_BUFSIZE];
3302 <      ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
3303 <      yyerror(buf);
3304 <    }
3305 <    else if ((yyvsp[(3) - (4)].number) > MAXCLIENTS_MAX)
3306 <    {
3307 <      char buf[IRCD_BUFSIZE];
3308 <      ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
3309 <      yyerror(buf);
3904 <    }
3905 <    else
3906 <      ServerInfo.max_clients = (yyvsp[(3) - (4)].number);
3299 >    snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
3300 >    conf_error_report(buf);
3301 >    ConfigServerInfo.default_max_clients = MAXCLIENTS_MIN;
3302 >  }
3303 >  else if ((yyvsp[-1].number) > MAXCLIENTS_MAX)
3304 >  {
3305 >    char buf[IRCD_BUFSIZE] = "";
3306 >
3307 >    snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
3308 >    conf_error_report(buf);
3309 >    ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
3310    }
3311 +  else
3312 +    ConfigServerInfo.default_max_clients = (yyvsp[-1].number);
3313   }
3314 + #line 3315 "conf_parser.c" /* yacc.c:1646  */
3315      break;
3316  
3317 <  case 80:
3318 <
3913 < /* Line 1455 of yacc.c  */
3914 < #line 771 "ircd_parser.y"
3317 >  case 87:
3318 > #line 798 "conf_parser.y" /* yacc.c:1646  */
3319      {
3320 <  if (conf_parser_ctx.pass == 2)
3320 >  if (conf_parser_ctx.pass != 2)
3321 >    break;
3322 >
3323 >  if ((yyvsp[-1].number) < 9)
3324    {
3325 <    if (yylval.number)
3326 <    {
3327 <      ServerInfo.hub = 1;
3328 <      delete_capability("HUB");
3329 <      add_capability("HUB", CAP_HUB, 1);
3330 <    }
3924 <    else if (ServerInfo.hub)
3925 <    {
3325 >    conf_error_report("max_nick_length too low, setting to 9");
3326 >    ConfigServerInfo.max_nick_length = 9;
3327 >  }
3328 >  else if ((yyvsp[-1].number) > NICKLEN)
3329 >  {
3330 >    char buf[IRCD_BUFSIZE] = "";
3331  
3332 <      ServerInfo.hub = 0;
3333 <      delete_capability("HUB");
3334 <    }
3332 >    snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
3333 >    conf_error_report(buf);
3334 >    ConfigServerInfo.max_nick_length = NICKLEN;
3335    }
3336 +  else
3337 +    ConfigServerInfo.max_nick_length = (yyvsp[-1].number);
3338   }
3339 + #line 3340 "conf_parser.c" /* yacc.c:1646  */
3340      break;
3341  
3342    case 88:
3343 <
3936 < /* Line 1455 of yacc.c  */
3937 < #line 799 "ircd_parser.y"
3343 > #line 820 "conf_parser.y" /* yacc.c:1646  */
3344      {
3345 <  if (conf_parser_ctx.pass == 2)
3345 >  if (conf_parser_ctx.pass != 2)
3346 >    break;
3347 >
3348 >  if ((yyvsp[-1].number) < 80)
3349    {
3350 <    MyFree(AdminInfo.name);
3351 <    DupString(AdminInfo.name, yylval.string);
3350 >    conf_error_report("max_topic_length too low, setting to 80");
3351 >    ConfigServerInfo.max_topic_length = 80;
3352    }
3353 +  else if ((yyvsp[-1].number) > TOPICLEN)
3354 +  {
3355 +    char buf[IRCD_BUFSIZE] = "";
3356 +
3357 +    snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
3358 +    conf_error_report(buf);
3359 +    ConfigServerInfo.max_topic_length = TOPICLEN;
3360 +  }
3361 +  else
3362 +    ConfigServerInfo.max_topic_length = (yyvsp[-1].number);
3363   }
3364 + #line 3365 "conf_parser.c" /* yacc.c:1646  */
3365      break;
3366  
3367    case 89:
3368 <
3949 < /* Line 1455 of yacc.c  */
3950 < #line 808 "ircd_parser.y"
3368 > #line 842 "conf_parser.y" /* yacc.c:1646  */
3369      {
3370    if (conf_parser_ctx.pass == 2)
3371 <  {
3954 <    MyFree(AdminInfo.email);
3955 <    DupString(AdminInfo.email, yylval.string);
3956 <  }
3371 >    ConfigServerInfo.hub = yylval.number;
3372   }
3373 + #line 3374 "conf_parser.c" /* yacc.c:1646  */
3374      break;
3375  
3376 <  case 90:
3377 <
3962 < /* Line 1455 of yacc.c  */
3963 < #line 817 "ircd_parser.y"
3376 >  case 97:
3377 > #line 859 "conf_parser.y" /* yacc.c:1646  */
3378      {
3379 <  if (conf_parser_ctx.pass == 2)
3966 <  {
3967 <    MyFree(AdminInfo.description);
3968 <    DupString(AdminInfo.description, yylval.string);
3969 <  }
3970 < }
3379 >  if (conf_parser_ctx.pass != 2)
3380      break;
3381  
3382 <  case 107:
3382 >  MyFree(ConfigAdminInfo.name);
3383 >  ConfigAdminInfo.name = xstrdup(yylval.string);
3384 > }
3385 > #line 3386 "conf_parser.c" /* yacc.c:1646  */
3386 >    break;
3387  
3388 < /* Line 1455 of yacc.c  */
3389 < #line 844 "ircd_parser.y"
3388 >  case 98:
3389 > #line 868 "conf_parser.y" /* yacc.c:1646  */
3390      {
3391 <                        }
3391 >  if (conf_parser_ctx.pass != 2)
3392      break;
3393  
3394 <  case 108:
3394 >  MyFree(ConfigAdminInfo.email);
3395 >  ConfigAdminInfo.email = xstrdup(yylval.string);
3396 > }
3397 > #line 3398 "conf_parser.c" /* yacc.c:1646  */
3398 >    break;
3399  
3400 < /* Line 1455 of yacc.c  */
3401 < #line 848 "ircd_parser.y"
3400 >  case 99:
3401 > #line 877 "conf_parser.y" /* yacc.c:1646  */
3402      {
3403 <                        }
3403 >  if (conf_parser_ctx.pass != 2)
3404      break;
3405  
3406 <  case 109:
3407 <
3991 < /* Line 1455 of yacc.c  */
3992 < #line 852 "ircd_parser.y"
3993 <    {
3994 <  if (conf_parser_ctx.pass == 2)
3995 <    strlcpy(ConfigLoggingEntry.userlog, yylval.string,
3996 <            sizeof(ConfigLoggingEntry.userlog));
3406 >  MyFree(ConfigAdminInfo.description);
3407 >  ConfigAdminInfo.description = xstrdup(yylval.string);
3408   }
3409 + #line 3410 "conf_parser.c" /* yacc.c:1646  */
3410      break;
3411  
3412 <  case 110:
3413 <
4002 < /* Line 1455 of yacc.c  */
4003 < #line 859 "ircd_parser.y"
3412 >  case 100:
3413 > #line 889 "conf_parser.y" /* yacc.c:1646  */
3414      {
3415    if (conf_parser_ctx.pass == 2)
3416 <    strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
4007 <            sizeof(ConfigLoggingEntry.failed_operlog));
3416 >    reset_block_state();
3417   }
3418 + #line 3419 "conf_parser.c" /* yacc.c:1646  */
3419      break;
3420  
3421 <  case 111:
3422 <
4013 < /* Line 1455 of yacc.c  */
4014 < #line 866 "ircd_parser.y"
3421 >  case 101:
3422 > #line 893 "conf_parser.y" /* yacc.c:1646  */
3423      {
3424 <  if (conf_parser_ctx.pass == 2)
3425 <    strlcpy(ConfigLoggingEntry.operlog, yylval.string,
3426 <            sizeof(ConfigLoggingEntry.operlog));
4019 < }
3424 >  dlink_node *node = NULL;
3425 >
3426 >  if (conf_parser_ctx.pass != 2)
3427      break;
3428  
3429 <  case 112:
3429 >  if (!block_state.file.buf[0])
3430 >    break;
3431  
3432 < /* Line 1455 of yacc.c  */
3433 < #line 873 "ircd_parser.y"
4026 <    {
4027 <  if (conf_parser_ctx.pass == 2)
4028 <    strlcpy(ConfigLoggingEntry.operspylog, yylval.string,
4029 <            sizeof(ConfigLoggingEntry.operspylog));
3432 >  DLINK_FOREACH(node, block_state.mask.list.head)
3433 >    motd_add(node->data, block_state.file.buf);
3434   }
3435 + #line 3436 "conf_parser.c" /* yacc.c:1646  */
3436      break;
3437  
3438 <  case 113:
3439 <
4035 < /* Line 1455 of yacc.c  */
4036 < #line 880 "ircd_parser.y"
3438 >  case 107:
3439 > #line 910 "conf_parser.y" /* yacc.c:1646  */
3440      {
3441    if (conf_parser_ctx.pass == 2)
3442 <    strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
4040 <            sizeof(ConfigLoggingEntry.glinelog));
3442 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
3443   }
3444 + #line 3445 "conf_parser.c" /* yacc.c:1646  */
3445      break;
3446  
3447 <  case 114:
3448 <
4046 < /* Line 1455 of yacc.c  */
4047 < #line 887 "ircd_parser.y"
3447 >  case 108:
3448 > #line 916 "conf_parser.y" /* yacc.c:1646  */
3449      {
3450    if (conf_parser_ctx.pass == 2)
3451 <    strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
4051 <            sizeof(ConfigLoggingEntry.klinelog));
3451 >    strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3452   }
3453 + #line 3454 "conf_parser.c" /* yacc.c:1646  */
3454      break;
3455  
3456 <  case 115:
3457 <
4057 < /* Line 1455 of yacc.c  */
4058 < #line 894 "ircd_parser.y"
3456 >  case 109:
3457 > #line 925 "conf_parser.y" /* yacc.c:1646  */
3458      {
3459    if (conf_parser_ctx.pass == 2)
3460 <    strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
4062 <            sizeof(ConfigLoggingEntry.ioerrlog));
3460 >    reset_block_state();
3461   }
3462 + #line 3463 "conf_parser.c" /* yacc.c:1646  */
3463      break;
3464  
3465 <  case 116:
3466 <
4068 < /* Line 1455 of yacc.c  */
4069 < #line 901 "ircd_parser.y"
3465 >  case 110:
3466 > #line 929 "conf_parser.y" /* yacc.c:1646  */
3467      {
3468 <  if (conf_parser_ctx.pass == 2)
4072 <    strlcpy(ConfigLoggingEntry.killlog, yylval.string,
4073 <            sizeof(ConfigLoggingEntry.killlog));
4074 < }
3468 >  if (conf_parser_ctx.pass != 2)
3469      break;
3470  
3471 <  case 117:
3471 >  if (!block_state.command.buf[0] ||
3472 >      !block_state.name.buf[0] ||
3473 >      !block_state.nick.buf[0] ||
3474 >      !block_state.host.buf[0])
3475 >    break;
3476  
3477 < /* Line 1455 of yacc.c  */
3478 < #line 908 "ircd_parser.y"
4081 <    {
4082 <  if (conf_parser_ctx.pass == 2)
4083 <    set_log_level(L_CRIT);
3477 >  pseudo_register(block_state.name.buf, block_state.nick.buf, block_state.host.buf,
3478 >                  block_state.prepend.buf, block_state.command.buf);
3479   }
3480 + #line 3481 "conf_parser.c" /* yacc.c:1646  */
3481      break;
3482  
3483    case 118:
3484 <
4089 < /* Line 1455 of yacc.c  */
4090 < #line 912 "ircd_parser.y"
3484 > #line 947 "conf_parser.y" /* yacc.c:1646  */
3485      {
3486    if (conf_parser_ctx.pass == 2)
3487 <    set_log_level(L_ERROR);
3487 >    strlcpy(block_state.command.buf, yylval.string, sizeof(block_state.command.buf));
3488   }
3489 + #line 3490 "conf_parser.c" /* yacc.c:1646  */
3490      break;
3491  
3492    case 119:
3493 <
4099 < /* Line 1455 of yacc.c  */
4100 < #line 916 "ircd_parser.y"
3493 > #line 953 "conf_parser.y" /* yacc.c:1646  */
3494      {
3495    if (conf_parser_ctx.pass == 2)
3496 <    set_log_level(L_WARN);
3496 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
3497   }
3498 + #line 3499 "conf_parser.c" /* yacc.c:1646  */
3499      break;
3500  
3501    case 120:
3502 <
4109 < /* Line 1455 of yacc.c  */
4110 < #line 920 "ircd_parser.y"
3502 > #line 959 "conf_parser.y" /* yacc.c:1646  */
3503      {
3504    if (conf_parser_ctx.pass == 2)
3505 <    set_log_level(L_NOTICE);
3505 >    strlcpy(block_state.prepend.buf, yylval.string, sizeof(block_state.prepend.buf));
3506   }
3507 + #line 3508 "conf_parser.c" /* yacc.c:1646  */
3508      break;
3509  
3510    case 121:
3511 <
4119 < /* Line 1455 of yacc.c  */
4120 < #line 924 "ircd_parser.y"
3511 > #line 965 "conf_parser.y" /* yacc.c:1646  */
3512      {
3513    if (conf_parser_ctx.pass == 2)
3514 <    set_log_level(L_TRACE);
3515 < }
4125 <    break;
3514 >  {
3515 >    struct split_nuh_item nuh;
3516  
3517 <  case 122:
3517 >    nuh.nuhmask  = yylval.string;
3518 >    nuh.nickptr  = NULL;
3519 >    nuh.userptr  = block_state.nick.buf;
3520 >    nuh.hostptr  = block_state.host.buf;
3521 >    nuh.nicksize = 0;
3522 >    nuh.usersize = sizeof(block_state.nick.buf);
3523 >    nuh.hostsize = sizeof(block_state.host.buf);
3524  
3525 < /* Line 1455 of yacc.c  */
3526 < #line 928 "ircd_parser.y"
4131 <    {
4132 <  if (conf_parser_ctx.pass == 2)
4133 <    set_log_level(L_INFO);
3525 >    split_nuh(&nuh);
3526 >  }
3527   }
3528 + #line 3529 "conf_parser.c" /* yacc.c:1646  */
3529      break;
3530  
3531 <  case 123:
3532 <
4139 < /* Line 1455 of yacc.c  */
4140 < #line 932 "ircd_parser.y"
3531 >  case 128:
3532 > #line 992 "conf_parser.y" /* yacc.c:1646  */
3533      {
3534    if (conf_parser_ctx.pass == 2)
3535 <    set_log_level(L_DEBUG);
3535 >    ConfigLog.use_logging = yylval.number;
3536   }
3537 + #line 3538 "conf_parser.c" /* yacc.c:1646  */
3538      break;
3539  
3540 <  case 124:
3541 <
4149 < /* Line 1455 of yacc.c  */
4150 < #line 938 "ircd_parser.y"
3540 >  case 129:
3541 > #line 998 "conf_parser.y" /* yacc.c:1646  */
3542      {
3543    if (conf_parser_ctx.pass == 2)
3544 <    ConfigLoggingEntry.use_logging = yylval.number;
3544 >    reset_block_state();
3545   }
3546 + #line 3547 "conf_parser.c" /* yacc.c:1646  */
3547      break;
3548  
3549 <  case 125:
3550 <
4159 < /* Line 1455 of yacc.c  */
4160 < #line 947 "ircd_parser.y"
3549 >  case 130:
3550 > #line 1002 "conf_parser.y" /* yacc.c:1646  */
3551      {
3552 <  if (conf_parser_ctx.pass == 2)
4163 <  {
4164 <    yy_conf = make_conf_item(OPER_TYPE);
4165 <    yy_aconf = map_to_conf(yy_conf);
4166 <    SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
4167 <  }
4168 <  else
4169 <  {
4170 <    MyFree(class_name);
4171 <    class_name = NULL;
4172 <  }
4173 < }
3552 >  if (conf_parser_ctx.pass != 2)
3553      break;
3554  
3555 <  case 126:
3555 >  if (block_state.type.value && block_state.file.buf[0])
3556 >    log_set_file(block_state.type.value, block_state.size.value,
3557 >                 block_state.file.buf);
3558 > }
3559 > #line 3560 "conf_parser.c" /* yacc.c:1646  */
3560 >    break;
3561  
3562 < /* Line 1455 of yacc.c  */
3563 < #line 960 "ircd_parser.y"
3562 >  case 137:
3563 > #line 1018 "conf_parser.y" /* yacc.c:1646  */
3564      {
3565 <  if (conf_parser_ctx.pass == 2)
3566 <  {
4183 <    struct CollectItem *yy_tmp;
4184 <    dlink_node *ptr;
4185 <    dlink_node *next_ptr;
4186 <
4187 <    conf_add_class_to_conf(yy_conf, class_name);
3565 >  if (conf_parser_ctx.pass != 2)
3566 >    break;
3567  
3568 <    /* Now, make sure there is a copy of the "base" given oper
3569 <     * block in each of the collected copies
3570 <     */
3568 >  strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3569 > }
3570 > #line 3571 "conf_parser.c" /* yacc.c:1646  */
3571 >    break;
3572  
3573 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3573 >  case 138:
3574 > #line 1026 "conf_parser.y" /* yacc.c:1646  */
3575      {
3576 <      struct AccessItem *new_aconf;
4196 <      struct ConfItem *new_conf;
4197 <      yy_tmp = ptr->data;
4198 <
4199 <      new_conf = make_conf_item(OPER_TYPE);
4200 <      new_aconf = (struct AccessItem *)map_to_conf(new_conf);
4201 <
4202 <      new_aconf->flags = yy_aconf->flags;
4203 <
4204 <      if (yy_conf->name != NULL)
4205 <        DupString(new_conf->name, yy_conf->name);
4206 <      if (yy_tmp->user != NULL)
4207 <        DupString(new_aconf->user, yy_tmp->user);
4208 <      else
4209 <        DupString(new_aconf->user, "*");
4210 <      if (yy_tmp->host != NULL)
4211 <        DupString(new_aconf->host, yy_tmp->host);
4212 <      else
4213 <        DupString(new_aconf->host, "*");
4214 <      conf_add_class_to_conf(new_conf, class_name);
4215 <      if (yy_aconf->passwd != NULL)
4216 <        DupString(new_aconf->passwd, yy_aconf->passwd);
4217 <
4218 <      new_aconf->port = yy_aconf->port;
4219 < #ifdef HAVE_LIBCRYPTO
4220 <      if (yy_aconf->rsa_public_key_file != NULL)
4221 <      {
4222 <        BIO *file;
4223 <
4224 <        DupString(new_aconf->rsa_public_key_file,
4225 <                  yy_aconf->rsa_public_key_file);
4226 <
4227 <        file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
4228 <        new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
4229 <                                                           NULL, 0, NULL);
4230 <        BIO_set_close(file, BIO_CLOSE);
4231 <        BIO_free(file);
4232 <      }
4233 < #endif
4234 <
4235 < #ifdef HAVE_LIBCRYPTO
4236 <      if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
4237 <          && yy_tmp->host)
4238 < #else
4239 <      if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
4240 < #endif
4241 <      {
4242 <        conf_add_class_to_conf(new_conf, class_name);
4243 <        if (yy_tmp->name != NULL)
4244 <          DupString(new_conf->name, yy_tmp->name);
4245 <      }
4246 <
4247 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
4248 <      free_collect_item(yy_tmp);
4249 <    }
4250 <
4251 <    yy_conf = NULL;
4252 <    yy_aconf = NULL;
4253 <
4254 <
4255 <    MyFree(class_name);
4256 <    class_name = NULL;
4257 <  }
3576 >  block_state.size.value = (yyvsp[-1].number);
3577   }
3578 + #line 3579 "conf_parser.c" /* yacc.c:1646  */
3579      break;
3580  
3581 <  case 154:
3582 <
4263 < /* Line 1455 of yacc.c  */
4264 < #line 1052 "ircd_parser.y"
3581 >  case 139:
3582 > #line 1029 "conf_parser.y" /* yacc.c:1646  */
3583      {
3584 <  if (conf_parser_ctx.pass == 2)
4267 <  {
4268 <    if (strlen(yylval.string) > OPERNICKLEN)
4269 <      yylval.string[OPERNICKLEN] = '\0';
4270 <
4271 <    MyFree(yy_conf->name);
4272 <    DupString(yy_conf->name, yylval.string);
4273 <  }
3584 >  block_state.size.value = 0;
3585   }
3586 + #line 3587 "conf_parser.c" /* yacc.c:1646  */
3587      break;
3588  
3589 <  case 155:
3590 <
4279 < /* Line 1455 of yacc.c  */
4280 < #line 1064 "ircd_parser.y"
3589 >  case 140:
3590 > #line 1034 "conf_parser.y" /* yacc.c:1646  */
3591      {
3592    if (conf_parser_ctx.pass == 2)
3593 <  {
4284 <    if (strlen(yylval.string) > OPERNICKLEN)
4285 <      yylval.string[OPERNICKLEN] = '\0';
4286 <
4287 <    MyFree(yy_conf->name);
4288 <    DupString(yy_conf->name, yylval.string);
4289 <  }
3593 >    block_state.type.value = 0;
3594   }
3595 + #line 3596 "conf_parser.c" /* yacc.c:1646  */
3596      break;
3597  
3598 <  case 156:
3599 <
4295 < /* Line 1455 of yacc.c  */
4296 < #line 1076 "ircd_parser.y"
3598 >  case 144:
3599 > #line 1041 "conf_parser.y" /* yacc.c:1646  */
3600      {
3601    if (conf_parser_ctx.pass == 2)
3602 <  {
4300 <    struct split_nuh_item nuh;
4301 <
4302 <    nuh.nuhmask  = yylval.string;
4303 <    nuh.nickptr  = NULL;
4304 <    nuh.userptr  = userbuf;
4305 <    nuh.hostptr  = hostbuf;
4306 <
4307 <    nuh.nicksize = 0;
4308 <    nuh.usersize = sizeof(userbuf);
4309 <    nuh.hostsize = sizeof(hostbuf);
4310 <
4311 <    split_nuh(&nuh);
4312 <
4313 <    if (yy_aconf->user == NULL)
4314 <    {
4315 <      DupString(yy_aconf->user, userbuf);
4316 <      DupString(yy_aconf->host, hostbuf);
4317 <    }
4318 <    else
4319 <    {
4320 <      struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
4321 <
4322 <      DupString(yy_tmp->user, userbuf);
4323 <      DupString(yy_tmp->host, hostbuf);
4324 <
4325 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
4326 <    }
4327 <  }
3602 >    block_state.type.value = LOG_TYPE_USER;
3603   }
3604 + #line 3605 "conf_parser.c" /* yacc.c:1646  */
3605      break;
3606  
3607 <  case 157:
3608 <
4333 < /* Line 1455 of yacc.c  */
4334 < #line 1110 "ircd_parser.y"
3607 >  case 145:
3608 > #line 1045 "conf_parser.y" /* yacc.c:1646  */
3609      {
3610    if (conf_parser_ctx.pass == 2)
3611 <  {
4338 <    if (yy_aconf->passwd != NULL)
4339 <      memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
4340 <
4341 <    MyFree(yy_aconf->passwd);
4342 <    DupString(yy_aconf->passwd, yylval.string);
4343 <  }
3611 >    block_state.type.value = LOG_TYPE_OPER;
3612   }
3613 + #line 3614 "conf_parser.c" /* yacc.c:1646  */
3614      break;
3615  
3616 <  case 158:
3617 <
4349 < /* Line 1455 of yacc.c  */
4350 < #line 1122 "ircd_parser.y"
3616 >  case 146:
3617 > #line 1049 "conf_parser.y" /* yacc.c:1646  */
3618      {
3619    if (conf_parser_ctx.pass == 2)
3620 <  {
4354 <    if (yylval.number)
4355 <      SetConfEncrypted(yy_aconf);
4356 <    else
4357 <      ClearConfEncrypted(yy_aconf);
4358 <  }
3620 >    block_state.type.value = LOG_TYPE_XLINE;
3621   }
3622 + #line 3623 "conf_parser.c" /* yacc.c:1646  */
3623      break;
3624  
3625 <  case 159:
3626 <
4364 < /* Line 1455 of yacc.c  */
4365 < #line 1133 "ircd_parser.y"
3625 >  case 147:
3626 > #line 1053 "conf_parser.y" /* yacc.c:1646  */
3627      {
4367 #ifdef HAVE_LIBCRYPTO
3628    if (conf_parser_ctx.pass == 2)
3629 <  {
3630 <    BIO *file;
3631 <
3632 <    if (yy_aconf->rsa_public_key != NULL)
4373 <    {
4374 <      RSA_free(yy_aconf->rsa_public_key);
4375 <      yy_aconf->rsa_public_key = NULL;
4376 <    }
4377 <
4378 <    if (yy_aconf->rsa_public_key_file != NULL)
4379 <    {
4380 <      MyFree(yy_aconf->rsa_public_key_file);
4381 <      yy_aconf->rsa_public_key_file = NULL;
4382 <    }
4383 <
4384 <    DupString(yy_aconf->rsa_public_key_file, yylval.string);
4385 <    file = BIO_new_file(yylval.string, "r");
4386 <
4387 <    if (file == NULL)
4388 <    {
4389 <      yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
4390 <      break;
4391 <    }
4392 <
4393 <    yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
3629 >    block_state.type.value = LOG_TYPE_RESV;
3630 > }
3631 > #line 3632 "conf_parser.c" /* yacc.c:1646  */
3632 >    break;
3633  
3634 <    if (yy_aconf->rsa_public_key == NULL)
3634 >  case 148:
3635 > #line 1057 "conf_parser.y" /* yacc.c:1646  */
3636      {
3637 <      yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
3638 <      break;
4399 <    }
4400 <
4401 <    BIO_set_close(file, BIO_CLOSE);
4402 <    BIO_free(file);
4403 <  }
4404 < #endif /* HAVE_LIBCRYPTO */
3637 >  if (conf_parser_ctx.pass == 2)
3638 >    block_state.type.value = LOG_TYPE_DLINE;
3639   }
3640 + #line 3641 "conf_parser.c" /* yacc.c:1646  */
3641      break;
3642  
3643 <  case 160:
3644 <
4410 < /* Line 1455 of yacc.c  */
4411 < #line 1175 "ircd_parser.y"
3643 >  case 149:
3644 > #line 1061 "conf_parser.y" /* yacc.c:1646  */
3645      {
3646    if (conf_parser_ctx.pass == 2)
3647 <  {
4415 <    MyFree(class_name);
4416 <    DupString(class_name, yylval.string);
4417 <  }
3647 >    block_state.type.value = LOG_TYPE_KLINE;
3648   }
3649 + #line 3650 "conf_parser.c" /* yacc.c:1646  */
3650      break;
3651  
3652 <  case 161:
3653 <
4423 < /* Line 1455 of yacc.c  */
4424 < #line 1184 "ircd_parser.y"
3652 >  case 150:
3653 > #line 1065 "conf_parser.y" /* yacc.c:1646  */
3654      {
3655    if (conf_parser_ctx.pass == 2)
3656 <    yy_aconf->modes = 0;
3656 >    block_state.type.value = LOG_TYPE_KILL;
3657   }
3658 + #line 3659 "conf_parser.c" /* yacc.c:1646  */
3659      break;
3660  
3661 <  case 165:
3662 <
4433 < /* Line 1455 of yacc.c  */
4434 < #line 1191 "ircd_parser.y"
3661 >  case 151:
3662 > #line 1069 "conf_parser.y" /* yacc.c:1646  */
3663      {
3664    if (conf_parser_ctx.pass == 2)
3665 <    yy_aconf->modes |= UMODE_BOTS;
3665 >    block_state.type.value = LOG_TYPE_DEBUG;
3666   }
3667 + #line 3668 "conf_parser.c" /* yacc.c:1646  */
3668      break;
3669  
3670 <  case 166:
3671 <
4443 < /* Line 1455 of yacc.c  */
4444 < #line 1195 "ircd_parser.y"
3670 >  case 152:
3671 > #line 1079 "conf_parser.y" /* yacc.c:1646  */
3672      {
3673 <  if (conf_parser_ctx.pass == 2)
3674 <    yy_aconf->modes |= UMODE_CCONN;
3673 >  if (conf_parser_ctx.pass != 2)
3674 >    break;
3675 >
3676 >  reset_block_state();
3677 >  block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
3678   }
3679 + #line 3680 "conf_parser.c" /* yacc.c:1646  */
3680 +    break;
3681 +
3682 +  case 153:
3683 + #line 1086 "conf_parser.y" /* yacc.c:1646  */
3684 +    {
3685 +  dlink_node *node = NULL;
3686 +
3687 +  if (conf_parser_ctx.pass != 2)
3688 +    break;
3689 +
3690 +  if (!block_state.name.buf[0])
3691 +    break;
3692 + #ifdef HAVE_LIBCRYPTO
3693 +  if (!block_state.file.buf[0] &&
3694 +      !block_state.rpass.buf[0])
3695 +    break;
3696 + #else
3697 +  if (!block_state.rpass.buf[0])
3698      break;
3699 + #endif
3700 +
3701 +  DLINK_FOREACH(node, block_state.mask.list.head)
3702 +  {
3703 +    struct MaskItem *conf = NULL;
3704 +    struct split_nuh_item nuh;
3705 +
3706 +    nuh.nuhmask  = node->data;
3707 +    nuh.nickptr  = NULL;
3708 +    nuh.userptr  = block_state.user.buf;
3709 +    nuh.hostptr  = block_state.host.buf;
3710 +    nuh.nicksize = 0;
3711 +    nuh.usersize = sizeof(block_state.user.buf);
3712 +    nuh.hostsize = sizeof(block_state.host.buf);
3713 +    split_nuh(&nuh);
3714 +
3715 +    conf         = conf_make(CONF_OPER);
3716 +    conf->name   = xstrdup(block_state.name.buf);
3717 +    conf->user   = xstrdup(block_state.user.buf);
3718 +    conf->host   = xstrdup(block_state.host.buf);
3719 +
3720 +    if (block_state.cert.buf[0])
3721 +      conf->certfp = xstrdup(block_state.cert.buf);
3722 +
3723 +    if (block_state.rpass.buf[0])
3724 +      conf->passwd = xstrdup(block_state.rpass.buf);
3725 +
3726 +    if (block_state.whois.buf[0])
3727 +      conf->whois = xstrdup(block_state.whois.buf);
3728 +
3729 +    conf->flags = block_state.flags.value;
3730 +    conf->modes = block_state.modes.value;
3731 +    conf->port  = block_state.port.value;
3732 +    conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
3733  
3734 <  case 167:
3734 >    conf_add_class_to_conf(conf, block_state.class.buf);
3735  
3736 < /* Line 1455 of yacc.c  */
3737 < #line 1199 "ircd_parser.y"
3736 > #ifdef HAVE_LIBCRYPTO
3737 >    if (block_state.file.buf[0])
3738      {
3739 <  if (conf_parser_ctx.pass == 2)
3740 <    yy_aconf->modes |= UMODE_CCONN_FULL;
3739 >      BIO *file = NULL;
3740 >      RSA *pkey = NULL;
3741 >
3742 >      if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
3743 >      {
3744 >        ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- file doesn't exist");
3745 >        break;
3746 >      }
3747 >
3748 >      if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
3749 >        ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key invalid; check key syntax");
3750 >      else
3751 >      {
3752 >        if (RSA_size(pkey) > 128)
3753 >          ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key size must be 1024 or below");
3754 >        else
3755 >          conf->rsa_public_key = pkey;
3756 >      }
3757 >
3758 >      BIO_set_close(file, BIO_CLOSE);
3759 >      BIO_free(file);
3760 >    }
3761 > #endif /* HAVE_LIBCRYPTO */
3762 >  }
3763   }
3764 + #line 3765 "conf_parser.c" /* yacc.c:1646  */
3765      break;
3766  
3767    case 168:
3768 <
4463 < /* Line 1455 of yacc.c  */
4464 < #line 1203 "ircd_parser.y"
3768 > #line 1182 "conf_parser.y" /* yacc.c:1646  */
3769      {
3770    if (conf_parser_ctx.pass == 2)
3771 <    yy_aconf->modes |= UMODE_DEAF;
3771 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
3772   }
3773 + #line 3774 "conf_parser.c" /* yacc.c:1646  */
3774      break;
3775  
3776    case 169:
3777 <
4473 < /* Line 1455 of yacc.c  */
4474 < #line 1207 "ircd_parser.y"
3777 > #line 1188 "conf_parser.y" /* yacc.c:1646  */
3778      {
3779    if (conf_parser_ctx.pass == 2)
3780 <    yy_aconf->modes |= UMODE_DEBUG;
3780 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
3781   }
3782 + #line 3783 "conf_parser.c" /* yacc.c:1646  */
3783      break;
3784  
3785    case 170:
3786 <
4483 < /* Line 1455 of yacc.c  */
4484 < #line 1211 "ircd_parser.y"
3786 > #line 1194 "conf_parser.y" /* yacc.c:1646  */
3787      {
3788    if (conf_parser_ctx.pass == 2)
3789 <    yy_aconf->modes |= UMODE_FULL;
3789 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
3790   }
3791 + #line 3792 "conf_parser.c" /* yacc.c:1646  */
3792      break;
3793  
3794    case 171:
3795 <
4493 < /* Line 1455 of yacc.c  */
4494 < #line 1215 "ircd_parser.y"
3795 > #line 1200 "conf_parser.y" /* yacc.c:1646  */
3796      {
3797    if (conf_parser_ctx.pass == 2)
3798 <    yy_aconf->modes |= UMODE_SKILL;
3798 >    strlcpy(block_state.whois.buf, yylval.string, sizeof(block_state.whois.buf));
3799   }
3800 + #line 3801 "conf_parser.c" /* yacc.c:1646  */
3801      break;
3802  
3803    case 172:
3804 <
4503 < /* Line 1455 of yacc.c  */
4504 < #line 1219 "ircd_parser.y"
3804 > #line 1206 "conf_parser.y" /* yacc.c:1646  */
3805      {
3806 <  if (conf_parser_ctx.pass == 2)
3807 <    yy_aconf->modes |= UMODE_NCHANGE;
3806 >  if (conf_parser_ctx.pass != 2)
3807 >    break;
3808 >
3809 >  if (yylval.number)
3810 >    block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
3811 >  else
3812 >    block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
3813   }
3814 + #line 3815 "conf_parser.c" /* yacc.c:1646  */
3815      break;
3816  
3817    case 173:
3818 <
4513 < /* Line 1455 of yacc.c  */
4514 < #line 1223 "ircd_parser.y"
3818 > #line 1217 "conf_parser.y" /* yacc.c:1646  */
3819      {
3820    if (conf_parser_ctx.pass == 2)
3821 <    yy_aconf->modes |= UMODE_REJ;
3821 >    strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3822   }
3823 + #line 3824 "conf_parser.c" /* yacc.c:1646  */
3824      break;
3825  
3826    case 174:
3827 <
4523 < /* Line 1455 of yacc.c  */
4524 < #line 1227 "ircd_parser.y"
3827 > #line 1223 "conf_parser.y" /* yacc.c:1646  */
3828      {
3829    if (conf_parser_ctx.pass == 2)
3830 <    yy_aconf->modes |= UMODE_UNAUTH;
3830 >    strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
3831   }
3832 + #line 3833 "conf_parser.c" /* yacc.c:1646  */
3833      break;
3834  
3835    case 175:
3836 <
4533 < /* Line 1455 of yacc.c  */
4534 < #line 1231 "ircd_parser.y"
3836 > #line 1229 "conf_parser.y" /* yacc.c:1646  */
3837      {
3838 <  if (conf_parser_ctx.pass == 2)
4537 <    yy_aconf->modes |= UMODE_SPY;
4538 < }
3838 >  if (conf_parser_ctx.pass != 2)
3839      break;
3840  
3841 <  case 176:
3842 <
3843 < /* Line 1455 of yacc.c  */
3844 < #line 1235 "ircd_parser.y"
4545 <    {
4546 <  if (conf_parser_ctx.pass == 2)
4547 <    yy_aconf->modes |= UMODE_EXTERNAL;
4548 < }
4549 <    break;
4550 <
4551 <  case 177:
4552 <
4553 < /* Line 1455 of yacc.c  */
4554 < #line 1239 "ircd_parser.y"
4555 <    {
4556 <  if (conf_parser_ctx.pass == 2)
4557 <    yy_aconf->modes |= UMODE_OPERWALL;
4558 < }
4559 <    break;
4560 <
4561 <  case 178:
4562 <
4563 < /* Line 1455 of yacc.c  */
4564 < #line 1243 "ircd_parser.y"
4565 <    {
4566 <  if (conf_parser_ctx.pass == 2)
4567 <    yy_aconf->modes |= UMODE_SERVNOTICE;
3841 >  if (yylval.number)
3842 >    block_state.flags.value |= CONF_FLAGS_SSL;
3843 >  else
3844 >    block_state.flags.value &= ~CONF_FLAGS_SSL;
3845   }
3846 + #line 3847 "conf_parser.c" /* yacc.c:1646  */
3847      break;
3848  
3849 <  case 179:
3850 <
4573 < /* Line 1455 of yacc.c  */
4574 < #line 1247 "ircd_parser.y"
3849 >  case 176:
3850 > #line 1240 "conf_parser.y" /* yacc.c:1646  */
3851      {
3852    if (conf_parser_ctx.pass == 2)
3853 <    yy_aconf->modes |= UMODE_INVISIBLE;
3853 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
3854   }
3855 + #line 3856 "conf_parser.c" /* yacc.c:1646  */
3856      break;
3857  
3858 <  case 180:
3859 <
4583 < /* Line 1455 of yacc.c  */
4584 < #line 1251 "ircd_parser.y"
3858 >  case 177:
3859 > #line 1246 "conf_parser.y" /* yacc.c:1646  */
3860      {
3861    if (conf_parser_ctx.pass == 2)
3862 <    yy_aconf->modes |= UMODE_WALLOP;
3862 >    block_state.modes.value = 0;
3863   }
3864 + #line 3865 "conf_parser.c" /* yacc.c:1646  */
3865      break;
3866  
3867    case 181:
3868 <
4593 < /* Line 1455 of yacc.c  */
4594 < #line 1255 "ircd_parser.y"
3868 > #line 1253 "conf_parser.y" /* yacc.c:1646  */
3869      {
3870    if (conf_parser_ctx.pass == 2)
3871 <    yy_aconf->modes |= UMODE_SOFTCALLERID;
3871 >    block_state.modes.value |= UMODE_BOTS;
3872   }
3873 + #line 3874 "conf_parser.c" /* yacc.c:1646  */
3874      break;
3875  
3876    case 182:
3877 <
4603 < /* Line 1455 of yacc.c  */
4604 < #line 1259 "ircd_parser.y"
3877 > #line 1257 "conf_parser.y" /* yacc.c:1646  */
3878      {
3879    if (conf_parser_ctx.pass == 2)
3880 <    yy_aconf->modes |= UMODE_CALLERID;
3880 >    block_state.modes.value |= UMODE_CCONN;
3881   }
3882 + #line 3883 "conf_parser.c" /* yacc.c:1646  */
3883      break;
3884  
3885    case 183:
3886 <
4613 < /* Line 1455 of yacc.c  */
4614 < #line 1263 "ircd_parser.y"
3886 > #line 1261 "conf_parser.y" /* yacc.c:1646  */
3887      {
3888    if (conf_parser_ctx.pass == 2)
3889 <    yy_aconf->modes |= UMODE_LOCOPS;
3889 >    block_state.modes.value |= UMODE_DEAF;
3890   }
3891 + #line 3892 "conf_parser.c" /* yacc.c:1646  */
3892      break;
3893  
3894    case 184:
3895 <
4623 < /* Line 1455 of yacc.c  */
4624 < #line 1269 "ircd_parser.y"
3895 > #line 1265 "conf_parser.y" /* yacc.c:1646  */
3896      {
3897    if (conf_parser_ctx.pass == 2)
3898 <  {
4628 <    if (yylval.number)
4629 <      yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
4630 <    else
4631 <      yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
4632 <  }
3898 >    block_state.modes.value |= UMODE_DEBUG;
3899   }
3900 + #line 3901 "conf_parser.c" /* yacc.c:1646  */
3901      break;
3902  
3903    case 185:
3904 <
4638 < /* Line 1455 of yacc.c  */
4639 < #line 1280 "ircd_parser.y"
3904 > #line 1269 "conf_parser.y" /* yacc.c:1646  */
3905      {
3906    if (conf_parser_ctx.pass == 2)
3907 <  {
4643 <    if (yylval.number)
4644 <      yy_aconf->port |= OPER_FLAG_REMOTE;
4645 <    else
4646 <      yy_aconf->port &= ~OPER_FLAG_REMOTE;
4647 <  }
3907 >    block_state.modes.value |= UMODE_FULL;
3908   }
3909 + #line 3910 "conf_parser.c" /* yacc.c:1646  */
3910      break;
3911  
3912    case 186:
3913 <
4653 < /* Line 1455 of yacc.c  */
4654 < #line 1291 "ircd_parser.y"
3913 > #line 1273 "conf_parser.y" /* yacc.c:1646  */
3914      {
3915    if (conf_parser_ctx.pass == 2)
3916 <  {
4658 <    if (yylval.number)
4659 <      yy_aconf->port |= OPER_FLAG_REMOTEBAN;
4660 <    else
4661 <      yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
4662 <  }
3916 >    block_state.modes.value |= UMODE_HIDDEN;
3917   }
3918 + #line 3919 "conf_parser.c" /* yacc.c:1646  */
3919      break;
3920  
3921    case 187:
3922 <
4668 < /* Line 1455 of yacc.c  */
4669 < #line 1302 "ircd_parser.y"
3922 > #line 1277 "conf_parser.y" /* yacc.c:1646  */
3923      {
3924    if (conf_parser_ctx.pass == 2)
3925 <  {
4673 <    if (yylval.number)
4674 <      yy_aconf->port |= OPER_FLAG_K;
4675 <    else
4676 <      yy_aconf->port &= ~OPER_FLAG_K;
4677 <  }
3925 >    block_state.modes.value |= UMODE_HIDECHANS;
3926   }
3927 + #line 3928 "conf_parser.c" /* yacc.c:1646  */
3928      break;
3929  
3930    case 188:
3931 <
4683 < /* Line 1455 of yacc.c  */
4684 < #line 1313 "ircd_parser.y"
3931 > #line 1281 "conf_parser.y" /* yacc.c:1646  */
3932      {
3933    if (conf_parser_ctx.pass == 2)
3934 <  {
4688 <    if (yylval.number)
4689 <      yy_aconf->port |= OPER_FLAG_X;
4690 <    else
4691 <      yy_aconf->port &= ~OPER_FLAG_X;
4692 <  }
3934 >    block_state.modes.value |= UMODE_HIDEIDLE;
3935   }
3936 + #line 3937 "conf_parser.c" /* yacc.c:1646  */
3937      break;
3938  
3939    case 189:
3940 <
4698 < /* Line 1455 of yacc.c  */
4699 < #line 1324 "ircd_parser.y"
3940 > #line 1285 "conf_parser.y" /* yacc.c:1646  */
3941      {
3942    if (conf_parser_ctx.pass == 2)
3943 <  {
4703 <    if (yylval.number)
4704 <      yy_aconf->port |= OPER_FLAG_UNKLINE;
4705 <    else
4706 <      yy_aconf->port &= ~OPER_FLAG_UNKLINE;
4707 <  }
3943 >    block_state.modes.value |= UMODE_SKILL;
3944   }
3945 + #line 3946 "conf_parser.c" /* yacc.c:1646  */
3946      break;
3947  
3948    case 190:
3949 <
4713 < /* Line 1455 of yacc.c  */
4714 < #line 1335 "ircd_parser.y"
3949 > #line 1289 "conf_parser.y" /* yacc.c:1646  */
3950      {
3951    if (conf_parser_ctx.pass == 2)
3952 <  {
4718 <    if (yylval.number)
4719 <      yy_aconf->port |= OPER_FLAG_GLINE;
4720 <    else
4721 <      yy_aconf->port &= ~OPER_FLAG_GLINE;
4722 <  }
3952 >    block_state.modes.value |= UMODE_NCHANGE;
3953   }
3954 + #line 3955 "conf_parser.c" /* yacc.c:1646  */
3955      break;
3956  
3957    case 191:
3958 <
4728 < /* Line 1455 of yacc.c  */
4729 < #line 1346 "ircd_parser.y"
3958 > #line 1293 "conf_parser.y" /* yacc.c:1646  */
3959      {
3960    if (conf_parser_ctx.pass == 2)
3961 <  {
4733 <    if (yylval.number)
4734 <      yy_aconf->port |= OPER_FLAG_N;
4735 <    else
4736 <      yy_aconf->port &= ~OPER_FLAG_N;
4737 <  }
3961 >    block_state.modes.value |= UMODE_REJ;
3962   }
3963 + #line 3964 "conf_parser.c" /* yacc.c:1646  */
3964      break;
3965  
3966    case 192:
3967 <
4743 < /* Line 1455 of yacc.c  */
4744 < #line 1357 "ircd_parser.y"
3967 > #line 1297 "conf_parser.y" /* yacc.c:1646  */
3968      {
3969    if (conf_parser_ctx.pass == 2)
3970 <  {
4748 <    if (yylval.number)
4749 <      yy_aconf->port |= OPER_FLAG_DIE;
4750 <    else
4751 <      yy_aconf->port &= ~OPER_FLAG_DIE;
4752 <  }
3970 >    block_state.modes.value |= UMODE_UNAUTH;
3971   }
3972 + #line 3973 "conf_parser.c" /* yacc.c:1646  */
3973      break;
3974  
3975    case 193:
3976 <
4758 < /* Line 1455 of yacc.c  */
4759 < #line 1368 "ircd_parser.y"
3976 > #line 1301 "conf_parser.y" /* yacc.c:1646  */
3977      {
3978    if (conf_parser_ctx.pass == 2)
3979 <  {
4763 <    if (yylval.number)
4764 <      yy_aconf->port |= OPER_FLAG_REHASH;
4765 <    else
4766 <      yy_aconf->port &= ~OPER_FLAG_REHASH;
4767 <  }
3979 >    block_state.modes.value |= UMODE_SPY;
3980   }
3981 + #line 3982 "conf_parser.c" /* yacc.c:1646  */
3982      break;
3983  
3984    case 194:
3985 <
4773 < /* Line 1455 of yacc.c  */
4774 < #line 1379 "ircd_parser.y"
3985 > #line 1305 "conf_parser.y" /* yacc.c:1646  */
3986      {
3987    if (conf_parser_ctx.pass == 2)
3988 <  {
4778 <    if (yylval.number)
4779 <      yy_aconf->port |= OPER_FLAG_ADMIN;
4780 <    else
4781 <      yy_aconf->port &= ~OPER_FLAG_ADMIN;
4782 <  }
3988 >    block_state.modes.value |= UMODE_EXTERNAL;
3989   }
3990 + #line 3991 "conf_parser.c" /* yacc.c:1646  */
3991      break;
3992  
3993    case 195:
3994 <
4788 < /* Line 1455 of yacc.c  */
4789 < #line 1390 "ircd_parser.y"
3994 > #line 1309 "conf_parser.y" /* yacc.c:1646  */
3995      {
3996    if (conf_parser_ctx.pass == 2)
3997 <  {
4793 <    if (yylval.number)
4794 <      yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
4795 <    else
4796 <      yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
4797 <  }
3997 >    block_state.modes.value |= UMODE_SERVNOTICE;
3998   }
3999 + #line 4000 "conf_parser.c" /* yacc.c:1646  */
4000      break;
4001  
4002    case 196:
4003 <
4803 < /* Line 1455 of yacc.c  */
4804 < #line 1401 "ircd_parser.y"
4003 > #line 1313 "conf_parser.y" /* yacc.c:1646  */
4004      {
4005    if (conf_parser_ctx.pass == 2)
4006 <  {
4808 <    if (yylval.number)
4809 <      yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
4810 <    else
4811 <      yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
4812 <  }
4006 >    block_state.modes.value |= UMODE_INVISIBLE;
4007   }
4008 + #line 4009 "conf_parser.c" /* yacc.c:1646  */
4009      break;
4010  
4011    case 197:
4012 <
4818 < /* Line 1455 of yacc.c  */
4819 < #line 1412 "ircd_parser.y"
4012 > #line 1317 "conf_parser.y" /* yacc.c:1646  */
4013      {
4014    if (conf_parser_ctx.pass == 2)
4015 <  {
4823 <    if (yylval.number)
4824 <      yy_aconf->port |= OPER_FLAG_OPERWALL;
4825 <    else
4826 <      yy_aconf->port &= ~OPER_FLAG_OPERWALL;
4827 <  }
4015 >    block_state.modes.value |= UMODE_WALLOP;
4016   }
4017 + #line 4018 "conf_parser.c" /* yacc.c:1646  */
4018      break;
4019  
4020    case 198:
4021 <
4833 < /* Line 1455 of yacc.c  */
4834 < #line 1423 "ircd_parser.y"
4021 > #line 1321 "conf_parser.y" /* yacc.c:1646  */
4022      {
4023 +  if (conf_parser_ctx.pass == 2)
4024 +    block_state.modes.value |= UMODE_SOFTCALLERID;
4025   }
4026 + #line 4027 "conf_parser.c" /* yacc.c:1646  */
4027      break;
4028  
4029 <  case 202:
4030 <
4031 < /* Line 1455 of yacc.c  */
4032 < #line 1427 "ircd_parser.y"
4033 <    { not_atom = 1; }
4029 >  case 199:
4030 > #line 1325 "conf_parser.y" /* yacc.c:1646  */
4031 >    {
4032 >  if (conf_parser_ctx.pass == 2)
4033 >    block_state.modes.value |= UMODE_CALLERID;
4034 > }
4035 > #line 4036 "conf_parser.c" /* yacc.c:1646  */
4036      break;
4037  
4038 <  case 204:
4038 >  case 200:
4039 > #line 1329 "conf_parser.y" /* yacc.c:1646  */
4040 >    {
4041 >  if (conf_parser_ctx.pass == 2)
4042 >    block_state.modes.value |= UMODE_LOCOPS;
4043 > }
4044 > #line 4045 "conf_parser.c" /* yacc.c:1646  */
4045 >    break;
4046  
4047 < /* Line 1455 of yacc.c  */
4048 < #line 1428 "ircd_parser.y"
4049 <    { not_atom = 0; }
4047 >  case 201:
4048 > #line 1333 "conf_parser.y" /* yacc.c:1646  */
4049 >    {
4050 >  if (conf_parser_ctx.pass == 2)
4051 >    block_state.modes.value |= UMODE_REGONLY;
4052 > }
4053 > #line 4054 "conf_parser.c" /* yacc.c:1646  */
4054      break;
4055  
4056 <  case 206:
4056 >  case 202:
4057 > #line 1337 "conf_parser.y" /* yacc.c:1646  */
4058 >    {
4059 >  if (conf_parser_ctx.pass == 2)
4060 >    block_state.modes.value |= UMODE_FARCONNECT;
4061 > }
4062 > #line 4063 "conf_parser.c" /* yacc.c:1646  */
4063 >    break;
4064  
4065 < /* Line 1455 of yacc.c  */
4066 < #line 1431 "ircd_parser.y"
4065 >  case 203:
4066 > #line 1343 "conf_parser.y" /* yacc.c:1646  */
4067      {
4068    if (conf_parser_ctx.pass == 2)
4069 <  {
4860 <    if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
4861 <    else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
4862 <  }
4069 >    block_state.port.value = 0;
4070   }
4071 + #line 4072 "conf_parser.c" /* yacc.c:1646  */
4072      break;
4073  
4074    case 207:
4075 <
4868 < /* Line 1455 of yacc.c  */
4869 < #line 1438 "ircd_parser.y"
4075 > #line 1350 "conf_parser.y" /* yacc.c:1646  */
4076      {
4077    if (conf_parser_ctx.pass == 2)
4078 <  {
4873 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
4874 <    else yy_aconf->port |= OPER_FLAG_REMOTE;
4875 <  }
4078 >    block_state.port.value |= OPER_FLAG_KILL_REMOTE;
4079   }
4080 + #line 4081 "conf_parser.c" /* yacc.c:1646  */
4081      break;
4082  
4083    case 208:
4084 <
4881 < /* Line 1455 of yacc.c  */
4882 < #line 1445 "ircd_parser.y"
4084 > #line 1354 "conf_parser.y" /* yacc.c:1646  */
4085      {
4086    if (conf_parser_ctx.pass == 2)
4087 <  {
4886 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
4887 <    else yy_aconf->port |= OPER_FLAG_K;
4888 <  }
4087 >    block_state.port.value |= OPER_FLAG_KILL;
4088   }
4089 + #line 4090 "conf_parser.c" /* yacc.c:1646  */
4090      break;
4091  
4092    case 209:
4093 <
4894 < /* Line 1455 of yacc.c  */
4895 < #line 1452 "ircd_parser.y"
4093 > #line 1358 "conf_parser.y" /* yacc.c:1646  */
4094      {
4095    if (conf_parser_ctx.pass == 2)
4096 <  {
4899 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
4900 <    else yy_aconf->port |= OPER_FLAG_UNKLINE;
4901 <  }
4096 >    block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
4097   }
4098 + #line 4099 "conf_parser.c" /* yacc.c:1646  */
4099      break;
4100  
4101    case 210:
4102 <
4907 < /* Line 1455 of yacc.c  */
4908 < #line 1459 "ircd_parser.y"
4102 > #line 1362 "conf_parser.y" /* yacc.c:1646  */
4103      {
4104    if (conf_parser_ctx.pass == 2)
4105 <  {
4912 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
4913 <    else yy_aconf->port |= OPER_FLAG_X;
4914 <  }
4105 >    block_state.port.value |= OPER_FLAG_CONNECT;
4106   }
4107 + #line 4108 "conf_parser.c" /* yacc.c:1646  */
4108      break;
4109  
4110    case 211:
4111 <
4920 < /* Line 1455 of yacc.c  */
4921 < #line 1466 "ircd_parser.y"
4111 > #line 1366 "conf_parser.y" /* yacc.c:1646  */
4112      {
4113    if (conf_parser_ctx.pass == 2)
4114 <  {
4925 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
4926 <    else yy_aconf->port |= OPER_FLAG_GLINE;
4927 <  }
4114 >    block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
4115   }
4116 + #line 4117 "conf_parser.c" /* yacc.c:1646  */
4117      break;
4118  
4119    case 212:
4120 <
4933 < /* Line 1455 of yacc.c  */
4934 < #line 1473 "ircd_parser.y"
4120 > #line 1370 "conf_parser.y" /* yacc.c:1646  */
4121      {
4122    if (conf_parser_ctx.pass == 2)
4123 <  {
4938 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
4939 <    else yy_aconf->port |= OPER_FLAG_DIE;
4940 <  }
4123 >    block_state.port.value |= OPER_FLAG_SQUIT;
4124   }
4125 + #line 4126 "conf_parser.c" /* yacc.c:1646  */
4126      break;
4127  
4128    case 213:
4129 <
4946 < /* Line 1455 of yacc.c  */
4947 < #line 1480 "ircd_parser.y"
4129 > #line 1374 "conf_parser.y" /* yacc.c:1646  */
4130      {
4131    if (conf_parser_ctx.pass == 2)
4132 <  {
4951 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
4952 <    else yy_aconf->port |= OPER_FLAG_REHASH;
4953 <  }
4132 >    block_state.port.value |= OPER_FLAG_KLINE;
4133   }
4134 + #line 4135 "conf_parser.c" /* yacc.c:1646  */
4135      break;
4136  
4137    case 214:
4138 <
4959 < /* Line 1455 of yacc.c  */
4960 < #line 1487 "ircd_parser.y"
4138 > #line 1378 "conf_parser.y" /* yacc.c:1646  */
4139      {
4140    if (conf_parser_ctx.pass == 2)
4141 <  {
4964 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_ADMIN;
4965 <    else yy_aconf->port |= OPER_FLAG_ADMIN;
4966 <  }
4141 >    block_state.port.value |= OPER_FLAG_UNKLINE;
4142   }
4143 + #line 4144 "conf_parser.c" /* yacc.c:1646  */
4144      break;
4145  
4146    case 215:
4147 <
4972 < /* Line 1455 of yacc.c  */
4973 < #line 1494 "ircd_parser.y"
4147 > #line 1382 "conf_parser.y" /* yacc.c:1646  */
4148      {
4149    if (conf_parser_ctx.pass == 2)
4150 <  {
4977 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
4978 <    else yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
4979 <  }
4150 >    block_state.port.value |= OPER_FLAG_DLINE;
4151   }
4152 + #line 4153 "conf_parser.c" /* yacc.c:1646  */
4153      break;
4154  
4155    case 216:
4156 <
4985 < /* Line 1455 of yacc.c  */
4986 < #line 1501 "ircd_parser.y"
4156 > #line 1386 "conf_parser.y" /* yacc.c:1646  */
4157      {
4158    if (conf_parser_ctx.pass == 2)
4159 <  {
4990 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
4991 <    else yy_aconf->port |= OPER_FLAG_N;
4992 <  }
4159 >    block_state.port.value |= OPER_FLAG_UNDLINE;
4160   }
4161 + #line 4162 "conf_parser.c" /* yacc.c:1646  */
4162      break;
4163  
4164    case 217:
4165 <
4998 < /* Line 1455 of yacc.c  */
4999 < #line 1508 "ircd_parser.y"
4165 > #line 1390 "conf_parser.y" /* yacc.c:1646  */
4166      {
4167    if (conf_parser_ctx.pass == 2)
4168 <  {
5003 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
5004 <    else yy_aconf->port |= OPER_FLAG_OPERWALL;
5005 <  }
4168 >    block_state.port.value |= OPER_FLAG_XLINE;
4169   }
4170 + #line 4171 "conf_parser.c" /* yacc.c:1646  */
4171      break;
4172  
4173    case 218:
4174 <
5011 < /* Line 1455 of yacc.c  */
5012 < #line 1515 "ircd_parser.y"
4174 > #line 1394 "conf_parser.y" /* yacc.c:1646  */
4175      {
4176    if (conf_parser_ctx.pass == 2)
4177 <  {
5016 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
5017 <    else yy_aconf->port |= OPER_FLAG_OPER_SPY;
5018 <  }
4177 >    block_state.port.value |= OPER_FLAG_UNXLINE;
4178   }
4179 + #line 4180 "conf_parser.c" /* yacc.c:1646  */
4180      break;
4181  
4182    case 219:
4183 <
5024 < /* Line 1455 of yacc.c  */
5025 < #line 1522 "ircd_parser.y"
4183 > #line 1398 "conf_parser.y" /* yacc.c:1646  */
4184      {
4185    if (conf_parser_ctx.pass == 2)
4186 <  {
5029 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
5030 <    else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
5031 <  }
4186 >    block_state.port.value |= OPER_FLAG_DIE;
4187   }
4188 + #line 4189 "conf_parser.c" /* yacc.c:1646  */
4189      break;
4190  
4191    case 220:
4192 <
5037 < /* Line 1455 of yacc.c  */
5038 < #line 1529 "ircd_parser.y"
4192 > #line 1402 "conf_parser.y" /* yacc.c:1646  */
4193      {
4194    if (conf_parser_ctx.pass == 2)
4195 <  {
5042 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
5043 <    else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
5044 <  }
4195 >    block_state.port.value |= OPER_FLAG_RESTART;
4196   }
4197 + #line 4198 "conf_parser.c" /* yacc.c:1646  */
4198      break;
4199  
4200    case 221:
4201 <
5050 < /* Line 1455 of yacc.c  */
5051 < #line 1536 "ircd_parser.y"
4201 > #line 1406 "conf_parser.y" /* yacc.c:1646  */
4202      {
4203    if (conf_parser_ctx.pass == 2)
4204 <  {
5055 <    if (not_atom) ClearConfEncrypted(yy_aconf);
5056 <    else SetConfEncrypted(yy_aconf);
5057 <  }
4204 >    block_state.port.value |= OPER_FLAG_REHASH;
4205   }
4206 + #line 4207 "conf_parser.c" /* yacc.c:1646  */
4207      break;
4208  
4209    case 222:
4210 <
5063 < /* Line 1455 of yacc.c  */
5064 < #line 1549 "ircd_parser.y"
4210 > #line 1410 "conf_parser.y" /* yacc.c:1646  */
4211      {
4212 <  if (conf_parser_ctx.pass == 1)
4213 <  {
5068 <    yy_conf = make_conf_item(CLASS_TYPE);
5069 <    yy_class = map_to_conf(yy_conf);
5070 <  }
4212 >  if (conf_parser_ctx.pass == 2)
4213 >    block_state.port.value |= OPER_FLAG_ADMIN;
4214   }
4215 + #line 4216 "conf_parser.c" /* yacc.c:1646  */
4216      break;
4217  
4218    case 223:
4219 + #line 1414 "conf_parser.y" /* yacc.c:1646  */
4220 +    {
4221 +  if (conf_parser_ctx.pass == 2)
4222 +    block_state.port.value |= OPER_FLAG_GLOBOPS;
4223 + }
4224 + #line 4225 "conf_parser.c" /* yacc.c:1646  */
4225 +    break;
4226  
4227 < /* Line 1455 of yacc.c  */
4228 < #line 1556 "ircd_parser.y"
4227 >  case 224:
4228 > #line 1418 "conf_parser.y" /* yacc.c:1646  */
4229      {
4230 <  if (conf_parser_ctx.pass == 1)
4231 <  {
4232 <    struct ConfItem *cconf = NULL;
4233 <    struct ClassItem *class = NULL;
4230 >  if (conf_parser_ctx.pass == 2)
4231 >    block_state.port.value |= OPER_FLAG_WALLOPS;
4232 > }
4233 > #line 4234 "conf_parser.c" /* yacc.c:1646  */
4234 >    break;
4235  
4236 <    if (yy_class_name == NULL)
4237 <      delete_conf_item(yy_conf);
5086 <    else
4236 >  case 225:
4237 > #line 1422 "conf_parser.y" /* yacc.c:1646  */
4238      {
4239 <      cconf = find_exact_name_conf(CLASS_TYPE, yy_class_name, NULL, NULL);
4239 >  if (conf_parser_ctx.pass == 2)
4240 >    block_state.port.value |= OPER_FLAG_LOCOPS;
4241 > }
4242 > #line 4243 "conf_parser.c" /* yacc.c:1646  */
4243 >    break;
4244  
4245 <      if (cconf != NULL)                /* The class existed already */
4246 <      {
4247 <        int user_count = 0;
4245 >  case 226:
4246 > #line 1426 "conf_parser.y" /* yacc.c:1646  */
4247 >    {
4248 >  if (conf_parser_ctx.pass == 2)
4249 >    block_state.port.value |= OPER_FLAG_REMOTEBAN;
4250 > }
4251 > #line 4252 "conf_parser.c" /* yacc.c:1646  */
4252 >    break;
4253  
4254 <        rebuild_cidr_class(cconf, yy_class);
4254 >  case 227:
4255 > #line 1430 "conf_parser.y" /* yacc.c:1646  */
4256 >    {
4257 >  if (conf_parser_ctx.pass == 2)
4258 >    block_state.port.value |= OPER_FLAG_SET;
4259 > }
4260 > #line 4261 "conf_parser.c" /* yacc.c:1646  */
4261 >    break;
4262  
4263 <        class = map_to_conf(cconf);
4263 >  case 228:
4264 > #line 1434 "conf_parser.y" /* yacc.c:1646  */
4265 >    {
4266 >  if (conf_parser_ctx.pass == 2)
4267 >    block_state.port.value |= OPER_FLAG_MODULE;
4268 > }
4269 > #line 4270 "conf_parser.c" /* yacc.c:1646  */
4270 >    break;
4271  
4272 <        user_count = class->curr_user_count;
4273 <        memcpy(class, yy_class, sizeof(*class));
4274 <        class->curr_user_count = user_count;
4275 <        class->active = 1;
4272 >  case 229:
4273 > #line 1438 "conf_parser.y" /* yacc.c:1646  */
4274 >    {
4275 >  if (conf_parser_ctx.pass == 2)
4276 >    block_state.port.value |= OPER_FLAG_OPME;
4277 > }
4278 > #line 4279 "conf_parser.c" /* yacc.c:1646  */
4279 >    break;
4280  
4281 <        delete_conf_item(yy_conf);
4281 >  case 230:
4282 > #line 1448 "conf_parser.y" /* yacc.c:1646  */
4283 >    {
4284 >  if (conf_parser_ctx.pass != 1)
4285 >    break;
4286  
4287 <        MyFree(cconf->name);            /* Allows case change of class name */
5106 <        cconf->name = yy_class_name;
5107 <      }
5108 <      else      /* Brand new class */
5109 <      {
5110 <        MyFree(yy_conf->name);          /* just in case it was allocated */
5111 <        yy_conf->name = yy_class_name;
5112 <        yy_class->active = 1;
5113 <      }
5114 <    }
4287 >  reset_block_state();
4288  
4289 <    yy_class_name = NULL;
4290 <  }
4289 >  block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
4290 >  block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
4291 >  block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
4292 >  block_state.max_sendq.value = DEFAULT_SENDQ;
4293 >  block_state.max_recvq.value = DEFAULT_RECVQ;
4294   }
4295 + #line 4296 "conf_parser.c" /* yacc.c:1646  */
4296      break;
4297  
4298 <  case 242:
4299 <
5123 < /* Line 1455 of yacc.c  */
5124 < #line 1616 "ircd_parser.y"
4298 >  case 231:
4299 > #line 1460 "conf_parser.y" /* yacc.c:1646  */
4300      {
4301 <  if (conf_parser_ctx.pass == 1)
4302 <  {
4303 <    MyFree(yy_class_name);
5129 <    DupString(yy_class_name, yylval.string);
5130 <  }
5131 < }
4301 >  struct ClassItem *class = NULL;
4302 >
4303 >  if (conf_parser_ctx.pass != 1)
4304      break;
4305  
4306 <  case 243:
4306 >  if (!block_state.class.buf[0])
4307 >    break;
4308  
4309 < /* Line 1455 of yacc.c  */
4310 < #line 1625 "ircd_parser.y"
4311 <    {
4312 <  if (conf_parser_ctx.pass == 1)
4309 >  if (!(class = class_find(block_state.class.buf, 0)))
4310 >    class = class_make();
4311 >
4312 >  class->active = 1;
4313 >  MyFree(class->name);
4314 >  class->name = xstrdup(block_state.class.buf);
4315 >  class->ping_freq = block_state.ping_freq.value;
4316 >  class->max_perip = block_state.max_perip.value;
4317 >  class->con_freq = block_state.con_freq.value;
4318 >  class->max_total = block_state.max_total.value;
4319 >  class->max_global = block_state.max_global.value;
4320 >  class->max_local = block_state.max_local.value;
4321 >  class->max_ident = block_state.max_ident.value;
4322 >  class->max_sendq = block_state.max_sendq.value;
4323 >  class->max_recvq = block_state.max_recvq.value;
4324 >  class->max_channels = block_state.max_channels.value;
4325 >
4326 >  if (block_state.min_idle.value > block_state.max_idle.value)
4327    {
4328 <    MyFree(yy_class_name);
4329 <    DupString(yy_class_name, yylval.string);
4328 >    block_state.min_idle.value = 0;
4329 >    block_state.max_idle.value = 0;
4330 >    block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
4331    }
4332 +
4333 +  class->flags = block_state.flags.value;
4334 +  class->min_idle = block_state.min_idle.value;
4335 +  class->max_idle = block_state.max_idle.value;
4336 +
4337 +  rebuild_cidr_list(class);
4338 +
4339 +  class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
4340 +  class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
4341 +  class->number_per_cidr = block_state.number_per_cidr.value;
4342   }
4343 + #line 4344 "conf_parser.c" /* yacc.c:1646  */
4344      break;
4345  
4346 <  case 244:
4347 <
5149 < /* Line 1455 of yacc.c  */
5150 < #line 1634 "ircd_parser.y"
4346 >  case 252:
4347 > #line 1524 "conf_parser.y" /* yacc.c:1646  */
4348      {
4349    if (conf_parser_ctx.pass == 1)
4350 <    PingFreq(yy_class) = (yyvsp[(3) - (4)].number);
4350 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
4351   }
4352 + #line 4353 "conf_parser.c" /* yacc.c:1646  */
4353      break;
4354  
4355 <  case 245:
4356 <
5159 < /* Line 1455 of yacc.c  */
5160 < #line 1640 "ircd_parser.y"
4355 >  case 253:
4356 > #line 1530 "conf_parser.y" /* yacc.c:1646  */
4357      {
4358    if (conf_parser_ctx.pass == 1)
4359 <    PingWarning(yy_class) = (yyvsp[(3) - (4)].number);
4359 >    block_state.ping_freq.value = (yyvsp[-1].number);
4360   }
4361 + #line 4362 "conf_parser.c" /* yacc.c:1646  */
4362      break;
4363  
4364 <  case 246:
4365 <
5169 < /* Line 1455 of yacc.c  */
5170 < #line 1646 "ircd_parser.y"
4364 >  case 254:
4365 > #line 1536 "conf_parser.y" /* yacc.c:1646  */
4366      {
4367    if (conf_parser_ctx.pass == 1)
4368 <    MaxPerIp(yy_class) = (yyvsp[(3) - (4)].number);
4368 >    block_state.max_perip.value = (yyvsp[-1].number);
4369   }
4370 + #line 4371 "conf_parser.c" /* yacc.c:1646  */
4371      break;
4372  
4373 <  case 247:
4374 <
5179 < /* Line 1455 of yacc.c  */
5180 < #line 1652 "ircd_parser.y"
4373 >  case 255:
4374 > #line 1542 "conf_parser.y" /* yacc.c:1646  */
4375      {
4376    if (conf_parser_ctx.pass == 1)
4377 <    ConFreq(yy_class) = (yyvsp[(3) - (4)].number);
4377 >    block_state.con_freq.value = (yyvsp[-1].number);
4378   }
4379 + #line 4380 "conf_parser.c" /* yacc.c:1646  */
4380      break;
4381  
4382 <  case 248:
4383 <
5189 < /* Line 1455 of yacc.c  */
5190 < #line 1658 "ircd_parser.y"
4382 >  case 256:
4383 > #line 1548 "conf_parser.y" /* yacc.c:1646  */
4384      {
4385    if (conf_parser_ctx.pass == 1)
4386 <    MaxTotal(yy_class) = (yyvsp[(3) - (4)].number);
4386 >    block_state.max_channels.value = (yyvsp[-1].number);
4387   }
4388 + #line 4389 "conf_parser.c" /* yacc.c:1646  */
4389      break;
4390  
4391 <  case 249:
4392 <
5199 < /* Line 1455 of yacc.c  */
5200 < #line 1664 "ircd_parser.y"
4391 >  case 257:
4392 > #line 1554 "conf_parser.y" /* yacc.c:1646  */
4393      {
4394    if (conf_parser_ctx.pass == 1)
4395 <    MaxGlobal(yy_class) = (yyvsp[(3) - (4)].number);
4395 >    block_state.max_total.value = (yyvsp[-1].number);
4396   }
4397 + #line 4398 "conf_parser.c" /* yacc.c:1646  */
4398      break;
4399  
4400 <  case 250:
4401 <
5209 < /* Line 1455 of yacc.c  */
5210 < #line 1670 "ircd_parser.y"
4400 >  case 258:
4401 > #line 1560 "conf_parser.y" /* yacc.c:1646  */
4402      {
4403    if (conf_parser_ctx.pass == 1)
4404 <    MaxLocal(yy_class) = (yyvsp[(3) - (4)].number);
4404 >    block_state.max_global.value = (yyvsp[-1].number);
4405   }
4406 + #line 4407 "conf_parser.c" /* yacc.c:1646  */
4407      break;
4408  
4409 <  case 251:
4410 <
5219 < /* Line 1455 of yacc.c  */
5220 < #line 1676 "ircd_parser.y"
4409 >  case 259:
4410 > #line 1566 "conf_parser.y" /* yacc.c:1646  */
4411      {
4412    if (conf_parser_ctx.pass == 1)
4413 <    MaxIdent(yy_class) = (yyvsp[(3) - (4)].number);
4413 >    block_state.max_local.value = (yyvsp[-1].number);
4414   }
4415 + #line 4416 "conf_parser.c" /* yacc.c:1646  */
4416      break;
4417  
4418 <  case 252:
4419 <
5229 < /* Line 1455 of yacc.c  */
5230 < #line 1682 "ircd_parser.y"
4418 >  case 260:
4419 > #line 1572 "conf_parser.y" /* yacc.c:1646  */
4420      {
4421    if (conf_parser_ctx.pass == 1)
4422 <    MaxSendq(yy_class) = (yyvsp[(3) - (4)].number);
4422 >    block_state.max_ident.value = (yyvsp[-1].number);
4423   }
4424 + #line 4425 "conf_parser.c" /* yacc.c:1646  */
4425      break;
4426  
4427 <  case 253:
4428 <
5239 < /* Line 1455 of yacc.c  */
5240 < #line 1688 "ircd_parser.y"
4427 >  case 261:
4428 > #line 1578 "conf_parser.y" /* yacc.c:1646  */
4429      {
4430    if (conf_parser_ctx.pass == 1)
4431 <    CidrBitlenIPV4(yy_class) = (yyvsp[(3) - (4)].number);
4431 >    block_state.max_sendq.value = (yyvsp[-1].number);
4432   }
4433 + #line 4434 "conf_parser.c" /* yacc.c:1646  */
4434      break;
4435  
4436 <  case 254:
4437 <
5249 < /* Line 1455 of yacc.c  */
5250 < #line 1694 "ircd_parser.y"
4436 >  case 262:
4437 > #line 1584 "conf_parser.y" /* yacc.c:1646  */
4438      {
4439    if (conf_parser_ctx.pass == 1)
4440 <    CidrBitlenIPV6(yy_class) = (yyvsp[(3) - (4)].number);
4440 >    if ((yyvsp[-1].number) >= CLIENT_FLOOD_MIN && (yyvsp[-1].number) <= CLIENT_FLOOD_MAX)
4441 >      block_state.max_recvq.value = (yyvsp[-1].number);
4442   }
4443 + #line 4444 "conf_parser.c" /* yacc.c:1646  */
4444      break;
4445  
4446 <  case 255:
4447 <
5259 < /* Line 1455 of yacc.c  */
5260 < #line 1700 "ircd_parser.y"
4446 >  case 263:
4447 > #line 1591 "conf_parser.y" /* yacc.c:1646  */
4448      {
4449    if (conf_parser_ctx.pass == 1)
4450 <    NumberPerCidr(yy_class) = (yyvsp[(3) - (4)].number);
4450 >    block_state.cidr_bitlen_ipv4.value = (yyvsp[-1].number) > 32 ? 32 : (yyvsp[-1].number);
4451   }
4452 + #line 4453 "conf_parser.c" /* yacc.c:1646  */
4453      break;
4454  
4455 <  case 256:
4456 <
5269 < /* Line 1455 of yacc.c  */
5270 < #line 1709 "ircd_parser.y"
4455 >  case 264:
4456 > #line 1597 "conf_parser.y" /* yacc.c:1646  */
4457      {
4458 <  if (conf_parser_ctx.pass == 2)
4459 <  {
5274 <    listener_address = NULL;
5275 <    listener_flags = 0;
5276 <  }
4458 >  if (conf_parser_ctx.pass == 1)
4459 >    block_state.cidr_bitlen_ipv6.value = (yyvsp[-1].number) > 128 ? 128 : (yyvsp[-1].number);
4460   }
4461 + #line 4462 "conf_parser.c" /* yacc.c:1646  */
4462      break;
4463  
4464 <  case 257:
4465 <
5282 < /* Line 1455 of yacc.c  */
5283 < #line 1716 "ircd_parser.y"
4464 >  case 265:
4465 > #line 1603 "conf_parser.y" /* yacc.c:1646  */
4466      {
4467 <  if (conf_parser_ctx.pass == 2)
4468 <  {
5287 <    MyFree(listener_address);
5288 <    listener_address = NULL;
5289 <  }
4467 >  if (conf_parser_ctx.pass == 1)
4468 >    block_state.number_per_cidr.value = (yyvsp[-1].number);
4469   }
4470 + #line 4471 "conf_parser.c" /* yacc.c:1646  */
4471      break;
4472  
4473 <  case 258:
4474 <
5295 < /* Line 1455 of yacc.c  */
5296 < #line 1725 "ircd_parser.y"
4473 >  case 266:
4474 > #line 1609 "conf_parser.y" /* yacc.c:1646  */
4475      {
4476 <  listener_flags = 0;
5299 < }
4476 >  if (conf_parser_ctx.pass != 1)
4477      break;
4478  
4479 <  case 262:
4480 <
5304 < /* Line 1455 of yacc.c  */
5305 < #line 1731 "ircd_parser.y"
5306 <    {
5307 <  if (conf_parser_ctx.pass == 2)
5308 <    listener_flags |= LISTENER_SSL;
4479 >  block_state.min_idle.value = (yyvsp[-1].number);
4480 >  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
4481   }
4482 + #line 4483 "conf_parser.c" /* yacc.c:1646  */
4483      break;
4484  
4485 <  case 263:
4486 <
5314 < /* Line 1455 of yacc.c  */
5315 < #line 1735 "ircd_parser.y"
4485 >  case 267:
4486 > #line 1618 "conf_parser.y" /* yacc.c:1646  */
4487      {
4488 <  if (conf_parser_ctx.pass == 2)
5318 <    listener_flags |= LISTENER_HIDDEN;
5319 < }
4488 >  if (conf_parser_ctx.pass != 1)
4489      break;
4490  
4491 <  case 264:
4491 >  block_state.max_idle.value = (yyvsp[-1].number);
4492 >  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
4493 > }
4494 > #line 4495 "conf_parser.c" /* yacc.c:1646  */
4495 >    break;
4496  
4497 < /* Line 1455 of yacc.c  */
4498 < #line 1739 "ircd_parser.y"
4497 >  case 268:
4498 > #line 1627 "conf_parser.y" /* yacc.c:1646  */
4499      {
4500 <  if (conf_parser_ctx.pass == 2)
4501 <    listener_flags |= LISTENER_SERVER;
4500 >  if (conf_parser_ctx.pass == 1)
4501 >    block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
4502   }
4503 + #line 4504 "conf_parser.c" /* yacc.c:1646  */
4504      break;
4505  
4506    case 272:
4507 <
5334 < /* Line 1455 of yacc.c  */
5335 < #line 1749 "ircd_parser.y"
5336 <    { listener_flags = 0; }
5337 <    break;
5338 <
5339 <  case 276:
5340 <
5341 < /* Line 1455 of yacc.c  */
5342 < #line 1754 "ircd_parser.y"
4507 > #line 1634 "conf_parser.y" /* yacc.c:1646  */
4508      {
4509 <  if (conf_parser_ctx.pass == 2)
4510 <  {
5346 <    if ((listener_flags & LISTENER_SSL))
5347 < #ifdef HAVE_LIBCRYPTO
5348 <      if (!ServerInfo.server_ctx)
5349 < #endif
5350 <      {
5351 <        yyerror("SSL not available - port closed");
5352 <        break;
5353 <      }
5354 <    add_listener((yyvsp[(1) - (1)].number), listener_address, listener_flags);
5355 <  }
4509 >  if (conf_parser_ctx.pass == 1)
4510 >    block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
4511   }
4512 + #line 4513 "conf_parser.c" /* yacc.c:1646  */
4513      break;
4514  
4515 <  case 277:
4516 <
5361 < /* Line 1455 of yacc.c  */
5362 < #line 1768 "ircd_parser.y"
4515 >  case 273:
4516 > #line 1638 "conf_parser.y" /* yacc.c:1646  */
4517      {
4518 <  if (conf_parser_ctx.pass == 2)
4519 <  {
5366 <    int i;
5367 <
5368 <    if ((listener_flags & LISTENER_SSL))
5369 < #ifdef HAVE_LIBCRYPTO
5370 <      if (!ServerInfo.server_ctx)
5371 < #endif
5372 <      {
5373 <        yyerror("SSL not available - port closed");
5374 <        break;
5375 <      }
5376 <
5377 <    for (i = (yyvsp[(1) - (3)].number); i <= (yyvsp[(3) - (3)].number); ++i)
5378 <      add_listener(i, listener_address, listener_flags);
5379 <  }
4518 >  if (conf_parser_ctx.pass == 1)
4519 >    block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
4520   }
4521 + #line 4522 "conf_parser.c" /* yacc.c:1646  */
4522      break;
4523  
4524 <  case 278:
4525 <
5385 < /* Line 1455 of yacc.c  */
5386 < #line 1788 "ircd_parser.y"
4524 >  case 274:
4525 > #line 1648 "conf_parser.y" /* yacc.c:1646  */
4526      {
4527    if (conf_parser_ctx.pass == 2)
4528 <  {
5390 <    MyFree(listener_address);
5391 <    DupString(listener_address, yylval.string);
5392 <  }
4528 >    reset_block_state();
4529   }
4530 + #line 4531 "conf_parser.c" /* yacc.c:1646  */
4531      break;
4532  
4533 <  case 279:
4534 <
5398 < /* Line 1455 of yacc.c  */
5399 < #line 1797 "ircd_parser.y"
4533 >  case 276:
4534 > #line 1654 "conf_parser.y" /* yacc.c:1646  */
4535      {
4536 <  if (conf_parser_ctx.pass == 2)
5402 <  {
5403 <    MyFree(listener_address);
5404 <    DupString(listener_address, yylval.string);
5405 <  }
4536 >  block_state.flags.value = 0;
4537   }
4538 + #line 4539 "conf_parser.c" /* yacc.c:1646  */
4539      break;
4540  
4541    case 280:
4542 <
5411 < /* Line 1455 of yacc.c  */
5412 < #line 1809 "ircd_parser.y"
4542 > #line 1660 "conf_parser.y" /* yacc.c:1646  */
4543      {
4544    if (conf_parser_ctx.pass == 2)
4545 <  {
5416 <    yy_conf = make_conf_item(CLIENT_TYPE);
5417 <    yy_aconf = map_to_conf(yy_conf);
5418 <  }
5419 <  else
5420 <  {
5421 <    MyFree(class_name);
5422 <    class_name = NULL;
5423 <  }
4545 >    block_state.flags.value |= LISTENER_SSL;
4546   }
4547 + #line 4548 "conf_parser.c" /* yacc.c:1646  */
4548      break;
4549  
4550    case 281:
4551 <
5429 < /* Line 1455 of yacc.c  */
5430 < #line 1821 "ircd_parser.y"
4551 > #line 1664 "conf_parser.y" /* yacc.c:1646  */
4552      {
4553    if (conf_parser_ctx.pass == 2)
4554 <  {
4555 <    struct CollectItem *yy_tmp = NULL;
4556 <    dlink_node *ptr = NULL, *next_ptr = NULL;
4557 <
5437 <    if (yy_aconf->user && yy_aconf->host)
5438 <    {
5439 <      conf_add_class_to_conf(yy_conf, class_name);
5440 <      add_conf_by_address(CONF_CLIENT, yy_aconf);
5441 <    }
5442 <    else
5443 <      delete_conf_item(yy_conf);
4554 >    block_state.flags.value |= LISTENER_HIDDEN;
4555 > }
4556 > #line 4557 "conf_parser.c" /* yacc.c:1646  */
4557 >    break;
4558  
4559 <    /* copy over settings from first struct */
4560 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
4559 >  case 282:
4560 > #line 1668 "conf_parser.y" /* yacc.c:1646  */
4561      {
4562 <      struct AccessItem *new_aconf;
4563 <      struct ConfItem *new_conf;
5450 <
5451 <      new_conf = make_conf_item(CLIENT_TYPE);
5452 <      new_aconf = map_to_conf(new_conf);
5453 <
5454 <      yy_tmp = ptr->data;
5455 <
5456 <      assert(yy_tmp->user && yy_tmp->host);
5457 <
5458 <      if (yy_aconf->passwd != NULL)
5459 <        DupString(new_aconf->passwd, yy_aconf->passwd);
5460 <      if (yy_conf->name != NULL)
5461 <        DupString(new_conf->name, yy_conf->name);
5462 <      if (yy_aconf->passwd != NULL)
5463 <        DupString(new_aconf->passwd, yy_aconf->passwd);
5464 <
5465 <      new_aconf->flags = yy_aconf->flags;
5466 <      new_aconf->port  = yy_aconf->port;
5467 <
5468 <      DupString(new_aconf->user, yy_tmp->user);
5469 <      collapse(new_aconf->user);
5470 <
5471 <      DupString(new_aconf->host, yy_tmp->host);
5472 <      collapse(new_aconf->host);
5473 <
5474 <      conf_add_class_to_conf(new_conf, class_name);
5475 <      add_conf_by_address(CONF_CLIENT, new_aconf);
5476 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
5477 <      free_collect_item(yy_tmp);
5478 <    }
5479 <
5480 <    MyFree(class_name);
5481 <    class_name = NULL;
5482 <    yy_conf = NULL;
5483 <    yy_aconf = NULL;
5484 <  }
4562 >  if (conf_parser_ctx.pass == 2)
4563 >   block_state.flags.value |= LISTENER_SERVER;
4564   }
4565 + #line 4566 "conf_parser.c" /* yacc.c:1646  */
4566      break;
4567  
4568 <  case 301:
4568 >  case 290:
4569 > #line 1676 "conf_parser.y" /* yacc.c:1646  */
4570 >    { block_state.flags.value = 0; }
4571 > #line 4572 "conf_parser.c" /* yacc.c:1646  */
4572 >    break;
4573  
4574 < /* Line 1455 of yacc.c  */
4575 < #line 1886 "ircd_parser.y"
4574 >  case 294:
4575 > #line 1681 "conf_parser.y" /* yacc.c:1646  */
4576      {
4577    if (conf_parser_ctx.pass == 2)
4578    {
4579 <    struct CollectItem *yy_tmp = NULL;
4580 <    struct split_nuh_item nuh;
5497 <
5498 <    nuh.nuhmask  = yylval.string;
5499 <    nuh.nickptr  = NULL;
5500 <    nuh.userptr  = userbuf;
5501 <    nuh.hostptr  = hostbuf;
5502 <
5503 <    nuh.nicksize = 0;
5504 <    nuh.usersize = sizeof(userbuf);
5505 <    nuh.hostsize = sizeof(hostbuf);
5506 <
5507 <    split_nuh(&nuh);
5508 <
5509 <    if (yy_aconf->user == NULL)
5510 <    {
5511 <      DupString(yy_aconf->user, userbuf);
5512 <      DupString(yy_aconf->host, hostbuf);
5513 <    }
5514 <    else
4579 > #ifndef HAVE_LIBCRYPTO
4580 >    if (block_state.flags.value & LISTENER_SSL)
4581      {
4582 <      yy_tmp = MyMalloc(sizeof(struct CollectItem));
4583 <
5518 <      DupString(yy_tmp->user, userbuf);
5519 <      DupString(yy_tmp->host, hostbuf);
5520 <
5521 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
4582 >      conf_error_report("SSL not available - port closed");
4583 >      break;
4584      }
4585 + #endif
4586 +    listener_add((yyvsp[0].number), block_state.addr.buf, block_state.flags.value);
4587    }
4588   }
4589 + #line 4590 "conf_parser.c" /* yacc.c:1646  */
4590      break;
4591  
4592 <  case 302:
4593 <
5529 < /* Line 1455 of yacc.c  */
5530 < #line 1923 "ircd_parser.y"
4592 >  case 295:
4593 > #line 1694 "conf_parser.y" /* yacc.c:1646  */
4594      {
4595    if (conf_parser_ctx.pass == 2)
4596    {
4597 <    /* be paranoid */
4598 <    if (yy_aconf->passwd != NULL)
4599 <      memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
4597 > #ifndef HAVE_LIBCRYPTO
4598 >    if (block_state.flags.value & LISTENER_SSL)
4599 >    {
4600 >      conf_error_report("SSL not available - port closed");
4601 >      break;
4602 >    }
4603 > #endif
4604  
4605 <    MyFree(yy_aconf->passwd);
4606 <    DupString(yy_aconf->passwd, yylval.string);
4605 >    for (int i = (yyvsp[-2].number); i <= (yyvsp[0].number); ++i)
4606 >      listener_add(i, block_state.addr.buf, block_state.flags.value);
4607    }
4608   }
4609 + #line 4610 "conf_parser.c" /* yacc.c:1646  */
4610      break;
4611  
4612 <  case 303:
4613 <
5546 < /* Line 1455 of yacc.c  */
5547 < #line 1936 "ircd_parser.y"
4612 >  case 296:
4613 > #line 1711 "conf_parser.y" /* yacc.c:1646  */
4614      {
4615    if (conf_parser_ctx.pass == 2)
4616 <  {
5551 <    if (yylval.number)
5552 <      yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
5553 <    else
5554 <      yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
5555 <  }
4616 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
4617   }
4618 + #line 4619 "conf_parser.c" /* yacc.c:1646  */
4619      break;
4620  
4621 <  case 304:
4622 <
5561 < /* Line 1455 of yacc.c  */
5562 < #line 1947 "ircd_parser.y"
4621 >  case 297:
4622 > #line 1717 "conf_parser.y" /* yacc.c:1646  */
4623      {
4624    if (conf_parser_ctx.pass == 2)
4625 <  {
5566 <    MyFree(class_name);
5567 <    DupString(class_name, yylval.string);
5568 <  }
4625 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
4626   }
4627 + #line 4628 "conf_parser.c" /* yacc.c:1646  */
4628      break;
4629  
4630 <  case 305:
4631 <
5574 < /* Line 1455 of yacc.c  */
5575 < #line 1956 "ircd_parser.y"
4630 >  case 298:
4631 > #line 1726 "conf_parser.y" /* yacc.c:1646  */
4632      {
4633    if (conf_parser_ctx.pass == 2)
4634 <  {
5579 <    if (yylval.number)
5580 <      SetConfEncrypted(yy_aconf);
5581 <    else
5582 <      ClearConfEncrypted(yy_aconf);
5583 <  }
4634 >    reset_block_state();
4635   }
4636 + #line 4637 "conf_parser.c" /* yacc.c:1646  */
4637      break;
4638  
4639 <  case 306:
4640 <
5589 < /* Line 1455 of yacc.c  */
5590 < #line 1967 "ircd_parser.y"
4639 >  case 299:
4640 > #line 1730 "conf_parser.y" /* yacc.c:1646  */
4641      {
4642 < }
4642 >  dlink_node *node = NULL;
4643 >
4644 >  if (conf_parser_ctx.pass != 2)
4645      break;
4646  
4647 <  case 310:
4647 >  DLINK_FOREACH(node, block_state.mask.list.head)
4648 >  {
4649 >    struct MaskItem *conf = NULL;
4650 >    struct split_nuh_item nuh;
4651  
4652 < /* Line 1455 of yacc.c  */
4653 < #line 1971 "ircd_parser.y"
4654 <    { not_atom = 1; }
4655 <    break;
4652 >    nuh.nuhmask  = node->data;
4653 >    nuh.nickptr  = NULL;
4654 >    nuh.userptr  = block_state.user.buf;
4655 >    nuh.hostptr  = block_state.host.buf;
4656 >    nuh.nicksize = 0;
4657 >    nuh.usersize = sizeof(block_state.user.buf);
4658 >    nuh.hostsize = sizeof(block_state.host.buf);
4659 >    split_nuh(&nuh);
4660  
4661 <  case 312:
4661 >    conf        = conf_make(CONF_CLIENT);
4662 >    conf->user  = xstrdup(block_state.user.buf);
4663 >    conf->host  = xstrdup(block_state.host.buf);
4664  
4665 < /* Line 1455 of yacc.c  */
4666 < #line 1972 "ircd_parser.y"
4667 <    { not_atom = 0; }
4668 <    break;
4665 >    if (block_state.rpass.buf[0])
4666 >      conf->passwd = xstrdup(block_state.rpass.buf);
4667 >    if (block_state.name.buf[0])
4668 >      conf->name = xstrdup(block_state.name.buf);
4669  
4670 <  case 314:
4670 >    conf->flags = block_state.flags.value;
4671 >    conf->port  = block_state.port.value;
4672  
4673 < /* Line 1455 of yacc.c  */
4674 < #line 1975 "ircd_parser.y"
5613 <    {
5614 <  if (conf_parser_ctx.pass == 2)
5615 <  {
5616 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
5617 <    else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
4673 >    conf_add_class_to_conf(conf, block_state.class.buf);
4674 >    add_conf_by_address(CONF_CLIENT, conf);
4675    }
5619
4676   }
4677 + #line 4678 "conf_parser.c" /* yacc.c:1646  */
4678      break;
4679  
4680 <  case 315:
4681 <
5625 < /* Line 1455 of yacc.c  */
5626 < #line 1983 "ircd_parser.y"
4680 >  case 311:
4681 > #line 1779 "conf_parser.y" /* yacc.c:1646  */
4682      {
4683    if (conf_parser_ctx.pass == 2)
4684 <  {
5630 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
5631 <    else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
5632 <  }
4684 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
4685   }
4686 + #line 4687 "conf_parser.c" /* yacc.c:1646  */
4687      break;
4688  
4689 <  case 316:
4690 <
5638 < /* Line 1455 of yacc.c  */
5639 < #line 1990 "ircd_parser.y"
4689 >  case 312:
4690 > #line 1785 "conf_parser.y" /* yacc.c:1646  */
4691      {
4692    if (conf_parser_ctx.pass == 2)
4693 <  {
5643 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
5644 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
5645 <  }
4693 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
4694   }
4695 + #line 4696 "conf_parser.c" /* yacc.c:1646  */
4696      break;
4697  
4698 <  case 317:
4698 >  case 313:
4699 > #line 1791 "conf_parser.y" /* yacc.c:1646  */
4700 >    {
4701 >  if (conf_parser_ctx.pass == 2)
4702 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
4703 > }
4704 > #line 4705 "conf_parser.c" /* yacc.c:1646  */
4705 >    break;
4706  
4707 < /* Line 1455 of yacc.c  */
4708 < #line 1997 "ircd_parser.y"
4707 >  case 314:
4708 > #line 1797 "conf_parser.y" /* yacc.c:1646  */
4709      {
4710    if (conf_parser_ctx.pass == 2)
4711    {
4712 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
4713 <    else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
4712 >    if (yylval.number)
4713 >      block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
4714 >    else
4715 >      block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
4716    }
4717   }
4718 + #line 4719 "conf_parser.c" /* yacc.c:1646  */
4719      break;
4720  
4721 <  case 318:
4722 <
5664 < /* Line 1455 of yacc.c  */
5665 < #line 2004 "ircd_parser.y"
4721 >  case 315:
4722 > #line 1808 "conf_parser.y" /* yacc.c:1646  */
4723      {
4724    if (conf_parser_ctx.pass == 2)
4725 <  {
5669 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
5670 <    else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
5671 <  }
4725 >    block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
4726   }
4727 + #line 4728 "conf_parser.c" /* yacc.c:1646  */
4728      break;
4729  
4730    case 319:
4731 <
5677 < /* Line 1455 of yacc.c  */
5678 < #line 2011 "ircd_parser.y"
4731 > #line 1815 "conf_parser.y" /* yacc.c:1646  */
4732      {
4733    if (conf_parser_ctx.pass == 2)
4734 <  {
5682 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_IDLE_LINED;
5683 <    else yy_aconf->flags |= CONF_FLAGS_IDLE_LINED;
5684 <  }
4734 >    block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
4735   }
4736 + #line 4737 "conf_parser.c" /* yacc.c:1646  */
4737      break;
4738  
4739    case 320:
4740 <
5690 < /* Line 1455 of yacc.c  */
5691 < #line 2018 "ircd_parser.y"
4740 > #line 1819 "conf_parser.y" /* yacc.c:1646  */
4741      {
4742    if (conf_parser_ctx.pass == 2)
4743 <  {
5695 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
5696 <    else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
5697 <  }
4743 >    block_state.flags.value |= CONF_FLAGS_NOLIMIT;
4744   }
4745 + #line 4746 "conf_parser.c" /* yacc.c:1646  */
4746      break;
4747  
4748    case 321:
4749 <
5703 < /* Line 1455 of yacc.c  */
5704 < #line 2025 "ircd_parser.y"
4749 > #line 1823 "conf_parser.y" /* yacc.c:1646  */
4750      {
4751    if (conf_parser_ctx.pass == 2)
4752 <  {
5708 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
5709 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
5710 <  }
4752 >    block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
4753   }
4754 + #line 4755 "conf_parser.c" /* yacc.c:1646  */
4755      break;
4756  
4757    case 322:
4758 <
5716 < /* Line 1455 of yacc.c  */
5717 < #line 2032 "ircd_parser.y"
4758 > #line 1827 "conf_parser.y" /* yacc.c:1646  */
4759      {
4760    if (conf_parser_ctx.pass == 2)
4761 <  {
5721 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
5722 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
5723 <  }
4761 >    block_state.flags.value |= CONF_FLAGS_EXEMPTXLINE;
4762   }
4763 + #line 4764 "conf_parser.c" /* yacc.c:1646  */
4764      break;
4765  
4766    case 323:
4767 <
5729 < /* Line 1455 of yacc.c  */
5730 < #line 2039 "ircd_parser.y"
4767 > #line 1831 "conf_parser.y" /* yacc.c:1646  */
4768      {
4769    if (conf_parser_ctx.pass == 2)
4770 <  {
5734 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
5735 <    else yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
5736 <  }
4770 >    block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
4771   }
4772 + #line 4773 "conf_parser.c" /* yacc.c:1646  */
4773      break;
4774  
4775    case 324:
4776 <
5742 < /* Line 1455 of yacc.c  */
5743 < #line 2048 "ircd_parser.y"
4776 > #line 1835 "conf_parser.y" /* yacc.c:1646  */
4777      {
4778    if (conf_parser_ctx.pass == 2)
4779 <  {
5747 <    if (yylval.number)
5748 <      yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
5749 <    else
5750 <      yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
5751 <  }
4779 >    block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
4780   }
4781 + #line 4782 "conf_parser.c" /* yacc.c:1646  */
4782      break;
4783  
4784    case 325:
4785 <
5757 < /* Line 1455 of yacc.c  */
5758 < #line 2059 "ircd_parser.y"
4785 > #line 1839 "conf_parser.y" /* yacc.c:1646  */
4786      {
4787    if (conf_parser_ctx.pass == 2)
4788 <  {
5762 <    if (yylval.number)
5763 <      yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
5764 <    else
5765 <      yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
5766 <  }
4788 >    block_state.flags.value |= CONF_FLAGS_NO_TILDE;
4789   }
4790 + #line 4791 "conf_parser.c" /* yacc.c:1646  */
4791      break;
4792  
4793    case 326:
4794 <
5772 < /* Line 1455 of yacc.c  */
5773 < #line 2070 "ircd_parser.y"
4794 > #line 1843 "conf_parser.y" /* yacc.c:1646  */
4795      {
4796    if (conf_parser_ctx.pass == 2)
4797 <  {
5777 <    if (yylval.number)
5778 <      yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
5779 <    else
5780 <      yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
5781 <  }
4797 >    block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
4798   }
4799 + #line 4800 "conf_parser.c" /* yacc.c:1646  */
4800      break;
4801  
4802    case 327:
4803 <
5787 < /* Line 1455 of yacc.c  */
5788 < #line 2081 "ircd_parser.y"
4803 > #line 1847 "conf_parser.y" /* yacc.c:1646  */
4804      {
4805    if (conf_parser_ctx.pass == 2)
4806 <  {
5792 <    if (yylval.number)
5793 <      yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
5794 <    else
5795 <      yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
5796 <  }
4806 >    block_state.flags.value |= CONF_FLAGS_WEBIRC;
4807   }
4808 + #line 4809 "conf_parser.c" /* yacc.c:1646  */
4809      break;
4810  
4811    case 328:
4812 <
5802 < /* Line 1455 of yacc.c  */
5803 < #line 2092 "ircd_parser.y"
4812 > #line 1851 "conf_parser.y" /* yacc.c:1646  */
4813      {
4814    if (conf_parser_ctx.pass == 2)
4815 <  {
5807 <    if (yylval.number)
5808 <      yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
5809 <    else
5810 <      yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
5811 <  }
4815 >    block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
4816   }
4817 + #line 4818 "conf_parser.c" /* yacc.c:1646  */
4818      break;
4819  
4820    case 329:
4821 <
5817 < /* Line 1455 of yacc.c  */
5818 < #line 2103 "ircd_parser.y"
4821 > #line 1857 "conf_parser.y" /* yacc.c:1646  */
4822      {
4823 <  if (conf_parser_ctx.pass == 2)
4823 >  if (conf_parser_ctx.pass != 2)
4824 >    break;
4825 >
4826 >  if (valid_hostname(yylval.string))
4827    {
4828 <    if (yylval.number)
4829 <      yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
5824 <    else
5825 <      yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
4828 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4829 >    block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
4830    }
4831 +  else
4832 +    ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
4833   }
4834 + #line 4835 "conf_parser.c" /* yacc.c:1646  */
4835      break;
4836  
4837    case 330:
4838 <
5832 < /* Line 1455 of yacc.c  */
5833 < #line 2115 "ircd_parser.y"
4838 > #line 1871 "conf_parser.y" /* yacc.c:1646  */
4839      {
4840 <  if (conf_parser_ctx.pass == 2)
4841 <  {
5837 <    MyFree(yy_conf->name);
4840 >  if (conf_parser_ctx.pass != 2)
4841 >    break;
4842  
4843 <    if (strlen(yylval.string) < HOSTLEN)
4844 <    {    
5841 <      DupString(yy_conf->name, yylval.string);
5842 <      yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
5843 <    }
5844 <    else
5845 <    {
5846 <      ilog(L_ERROR, "Spoofs must be less than %d..ignoring it", HOSTLEN);
5847 <      yy_conf->name = NULL;
5848 <    }
5849 <  }
4843 >  strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4844 >  block_state.flags.value |= CONF_FLAGS_REDIR;
4845   }
4846 + #line 4847 "conf_parser.c" /* yacc.c:1646  */
4847      break;
4848  
4849    case 331:
4850 <
5855 < /* Line 1455 of yacc.c  */
5856 < #line 2134 "ircd_parser.y"
4850 > #line 1880 "conf_parser.y" /* yacc.c:1646  */
4851      {
4852 <  if (conf_parser_ctx.pass == 2)
4853 <  {
4854 <    yy_aconf->flags |= CONF_FLAGS_REDIR;
4855 <    MyFree(yy_conf->name);
4856 <    DupString(yy_conf->name, yylval.string);
5863 <  }
4852 >  if (conf_parser_ctx.pass != 2)
4853 >    break;
4854 >
4855 >  block_state.flags.value |= CONF_FLAGS_REDIR;
4856 >  block_state.port.value = (yyvsp[-1].number);
4857   }
4858 + #line 4859 "conf_parser.c" /* yacc.c:1646  */
4859      break;
4860  
4861    case 332:
4862 <
5869 < /* Line 1455 of yacc.c  */
5870 < #line 2144 "ircd_parser.y"
4862 > #line 1893 "conf_parser.y" /* yacc.c:1646  */
4863      {
4864 <  if (conf_parser_ctx.pass == 2)
4865 <  {
4866 <    yy_aconf->flags |= CONF_FLAGS_REDIR;
4867 <    yy_aconf->port = (yyvsp[(3) - (4)].number);
4868 <  }
4864 >  if (conf_parser_ctx.pass != 2)
4865 >    break;
4866 >
4867 >  reset_block_state();
4868 >  strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
4869   }
4870 + #line 4871 "conf_parser.c" /* yacc.c:1646  */
4871      break;
4872  
4873    case 333:
4874 <
5882 < /* Line 1455 of yacc.c  */
5883 < #line 2153 "ircd_parser.y"
4874 > #line 1900 "conf_parser.y" /* yacc.c:1646  */
4875      {
4876 <  if (conf_parser_ctx.pass == 2)
5886 <  {
5887 <    if (yylval.number)
5888 <      yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
5889 <    else
5890 <      yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
5891 <  }
5892 < }
4876 >  if (conf_parser_ctx.pass != 2)
4877      break;
4878  
4879 <  case 334:
4879 >  create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
4880 > }
4881 > #line 4882 "conf_parser.c" /* yacc.c:1646  */
4882 >    break;
4883  
4884 < /* Line 1455 of yacc.c  */
4885 < #line 2168 "ircd_parser.y"
4884 >  case 340:
4885 > #line 1911 "conf_parser.y" /* yacc.c:1646  */
4886      {
4887    if (conf_parser_ctx.pass == 2)
4888 <  {
5902 <    MyFree(resv_reason);
5903 <    resv_reason = NULL;
5904 <  }
4888 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4889   }
4890 + #line 4891 "conf_parser.c" /* yacc.c:1646  */
4891      break;
4892  
4893 <  case 335:
4894 <
5910 < /* Line 1455 of yacc.c  */
5911 < #line 2175 "ircd_parser.y"
4893 >  case 341:
4894 > #line 1917 "conf_parser.y" /* yacc.c:1646  */
4895      {
4896    if (conf_parser_ctx.pass == 2)
4897 <  {
5915 <    MyFree(resv_reason);
5916 <    resv_reason = NULL;
5917 <  }
4897 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
4898   }
4899 + #line 4900 "conf_parser.c" /* yacc.c:1646  */
4900      break;
4901  
4902    case 342:
4903 <
5923 < /* Line 1455 of yacc.c  */
5924 < #line 2187 "ircd_parser.y"
4903 > #line 1923 "conf_parser.y" /* yacc.c:1646  */
4904      {
4905    if (conf_parser_ctx.pass == 2)
4906 <  {
5928 <    MyFree(resv_reason);
5929 <    DupString(resv_reason, yylval.string);
5930 <  }
4906 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
4907   }
4908 + #line 4909 "conf_parser.c" /* yacc.c:1646  */
4909      break;
4910  
4911 <  case 343:
4912 <
5936 < /* Line 1455 of yacc.c  */
5937 < #line 2196 "ircd_parser.y"
5938 <    {
5939 <  if (conf_parser_ctx.pass == 2)
5940 <  {
5941 <    if (IsChanPrefix(*yylval.string))
4911 >  case 348:
4912 > #line 1938 "conf_parser.y" /* yacc.c:1646  */
4913      {
4914 <      char def_reason[] = "No reason";
4914 >  if (conf_parser_ctx.pass != 2)
4915 >    break;
4916  
4917 <      create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
4918 <    }
4917 >  if (valid_servname(yylval.string))
4918 >  {
4919 >    struct MaskItem *conf = conf_make(CONF_SERVICE);
4920 >    conf->name = xstrdup(yylval.string);
4921    }
5948  /* ignore it for now.. but we really should make a warning if
5949   * its an erroneous name --fl_ */
4922   }
4923 + #line 4924 "conf_parser.c" /* yacc.c:1646  */
4924      break;
4925  
4926 <  case 344:
4927 <
5955 < /* Line 1455 of yacc.c  */
5956 < #line 2211 "ircd_parser.y"
4926 >  case 349:
4927 > #line 1953 "conf_parser.y" /* yacc.c:1646  */
4928      {
4929 <  if (conf_parser_ctx.pass == 2)
5959 <  {
5960 <    char def_reason[] = "No reason";
5961 <
5962 <    create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
5963 <  }
5964 < }
4929 >  if (conf_parser_ctx.pass != 2)
4930      break;
4931  
4932 <  case 345:
4932 >  reset_block_state();
4933  
4934 < /* Line 1455 of yacc.c  */
4935 < #line 2224 "ircd_parser.y"
4936 <    {
4937 <  if (conf_parser_ctx.pass == 2)
5973 <  {
5974 <    yy_conf = make_conf_item(ULINE_TYPE);
5975 <    yy_match_item = map_to_conf(yy_conf);
5976 <    yy_match_item->action = SHARED_ALL;
5977 <  }
4934 >  strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
4935 >  strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
4936 >  strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
4937 >  block_state.flags.value = SHARED_ALL;
4938   }
4939 + #line 4940 "conf_parser.c" /* yacc.c:1646  */
4940      break;
4941  
4942 <  case 346:
4943 <
5983 < /* Line 1455 of yacc.c  */
5984 < #line 2232 "ircd_parser.y"
4942 >  case 350:
4943 > #line 1964 "conf_parser.y" /* yacc.c:1646  */
4944      {
4945 <  if (conf_parser_ctx.pass == 2)
4946 <  {
4947 <    yy_conf = NULL;
5989 <  }
5990 < }
4945 >  struct MaskItem *conf = NULL;
4946 >
4947 >  if (conf_parser_ctx.pass != 2)
4948      break;
4949  
4950 <  case 353:
4950 >  conf = conf_make(CONF_ULINE);
4951 >  conf->flags = block_state.flags.value;
4952 >  conf->name = xstrdup(block_state.name.buf);
4953 >  conf->user = xstrdup(block_state.user.buf);
4954 >  conf->host = xstrdup(block_state.host.buf);
4955 > }
4956 > #line 4957 "conf_parser.c" /* yacc.c:1646  */
4957 >    break;
4958  
4959 < /* Line 1455 of yacc.c  */
4960 < #line 2243 "ircd_parser.y"
4959 >  case 357:
4960 > #line 1981 "conf_parser.y" /* yacc.c:1646  */
4961      {
4962    if (conf_parser_ctx.pass == 2)
4963 <  {
6000 <    MyFree(yy_conf->name);
6001 <    DupString(yy_conf->name, yylval.string);
6002 <  }
4963 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4964   }
4965 + #line 4966 "conf_parser.c" /* yacc.c:1646  */
4966      break;
4967  
4968 <  case 354:
4969 <
6008 < /* Line 1455 of yacc.c  */
6009 < #line 2252 "ircd_parser.y"
4968 >  case 358:
4969 > #line 1987 "conf_parser.y" /* yacc.c:1646  */
4970      {
4971    if (conf_parser_ctx.pass == 2)
4972    {
# Line 6014 | Line 4974 | yyreduce:
4974  
4975      nuh.nuhmask  = yylval.string;
4976      nuh.nickptr  = NULL;
4977 <    nuh.userptr  = userbuf;
4978 <    nuh.hostptr  = hostbuf;
4977 >    nuh.userptr  = block_state.user.buf;
4978 >    nuh.hostptr  = block_state.host.buf;
4979  
4980      nuh.nicksize = 0;
4981 <    nuh.usersize = sizeof(userbuf);
4982 <    nuh.hostsize = sizeof(hostbuf);
4981 >    nuh.usersize = sizeof(block_state.user.buf);
4982 >    nuh.hostsize = sizeof(block_state.host.buf);
4983  
4984      split_nuh(&nuh);
6025
6026    DupString(yy_match_item->user, userbuf);
6027    DupString(yy_match_item->host, hostbuf);
4985    }
4986   }
4987 <    break;
6031 <
6032 <  case 355:
6033 <
6034 < /* Line 1455 of yacc.c  */
6035 < #line 2274 "ircd_parser.y"
6036 <    {
6037 <  if (conf_parser_ctx.pass == 2)
6038 <    yy_match_item->action = 0;
6039 < }
4987 > #line 4988 "conf_parser.c" /* yacc.c:1646  */
4988      break;
4989  
4990    case 359:
4991 <
6044 < /* Line 1455 of yacc.c  */
6045 < #line 2281 "ircd_parser.y"
6046 <    {
6047 <  if (conf_parser_ctx.pass == 2)
6048 <    yy_match_item->action |= SHARED_KLINE;
6049 < }
6050 <    break;
6051 <
6052 <  case 360:
6053 <
6054 < /* Line 1455 of yacc.c  */
6055 < #line 2285 "ircd_parser.y"
6056 <    {
6057 <  if (conf_parser_ctx.pass == 2)
6058 <    yy_match_item->action |= SHARED_TKLINE;
6059 < }
6060 <    break;
6061 <
6062 <  case 361:
6063 <
6064 < /* Line 1455 of yacc.c  */
6065 < #line 2289 "ircd_parser.y"
6066 <    {
6067 <  if (conf_parser_ctx.pass == 2)
6068 <    yy_match_item->action |= SHARED_UNKLINE;
6069 < }
6070 <    break;
6071 <
6072 <  case 362:
6073 <
6074 < /* Line 1455 of yacc.c  */
6075 < #line 2293 "ircd_parser.y"
4991 > #line 2006 "conf_parser.y" /* yacc.c:1646  */
4992      {
4993    if (conf_parser_ctx.pass == 2)
4994 <    yy_match_item->action |= SHARED_XLINE;
4994 >    block_state.flags.value = 0;
4995   }
4996 + #line 4997 "conf_parser.c" /* yacc.c:1646  */
4997      break;
4998  
4999    case 363:
5000 <
6084 < /* Line 1455 of yacc.c  */
6085 < #line 2297 "ircd_parser.y"
5000 > #line 2013 "conf_parser.y" /* yacc.c:1646  */
5001      {
5002    if (conf_parser_ctx.pass == 2)
5003 <    yy_match_item->action |= SHARED_TXLINE;
5003 >    block_state.flags.value |= SHARED_KLINE;
5004   }
5005 + #line 5006 "conf_parser.c" /* yacc.c:1646  */
5006      break;
5007  
5008    case 364:
5009 <
6094 < /* Line 1455 of yacc.c  */
6095 < #line 2301 "ircd_parser.y"
5009 > #line 2017 "conf_parser.y" /* yacc.c:1646  */
5010      {
5011    if (conf_parser_ctx.pass == 2)
5012 <    yy_match_item->action |= SHARED_UNXLINE;
5012 >    block_state.flags.value |= SHARED_UNKLINE;
5013   }
5014 + #line 5015 "conf_parser.c" /* yacc.c:1646  */
5015      break;
5016  
5017    case 365:
5018 <
6104 < /* Line 1455 of yacc.c  */
6105 < #line 2305 "ircd_parser.y"
5018 > #line 2021 "conf_parser.y" /* yacc.c:1646  */
5019      {
5020    if (conf_parser_ctx.pass == 2)
5021 <    yy_match_item->action |= SHARED_RESV;
5021 >    block_state.flags.value |= SHARED_DLINE;
5022   }
5023 + #line 5024 "conf_parser.c" /* yacc.c:1646  */
5024      break;
5025  
5026    case 366:
5027 <
6114 < /* Line 1455 of yacc.c  */
6115 < #line 2309 "ircd_parser.y"
5027 > #line 2025 "conf_parser.y" /* yacc.c:1646  */
5028      {
5029    if (conf_parser_ctx.pass == 2)
5030 <    yy_match_item->action |= SHARED_TRESV;
5030 >    block_state.flags.value |= SHARED_UNDLINE;
5031   }
5032 + #line 5033 "conf_parser.c" /* yacc.c:1646  */
5033      break;
5034  
5035    case 367:
5036 <
6124 < /* Line 1455 of yacc.c  */
6125 < #line 2313 "ircd_parser.y"
5036 > #line 2029 "conf_parser.y" /* yacc.c:1646  */
5037      {
5038    if (conf_parser_ctx.pass == 2)
5039 <    yy_match_item->action |= SHARED_UNRESV;
5039 >    block_state.flags.value |= SHARED_XLINE;
5040   }
5041 + #line 5042 "conf_parser.c" /* yacc.c:1646  */
5042      break;
5043  
5044    case 368:
5045 <
6134 < /* Line 1455 of yacc.c  */
6135 < #line 2317 "ircd_parser.y"
5045 > #line 2033 "conf_parser.y" /* yacc.c:1646  */
5046      {
5047    if (conf_parser_ctx.pass == 2)
5048 <    yy_match_item->action |= SHARED_LOCOPS;
5048 >    block_state.flags.value |= SHARED_UNXLINE;
5049   }
5050 + #line 5051 "conf_parser.c" /* yacc.c:1646  */
5051      break;
5052  
5053    case 369:
5054 <
6144 < /* Line 1455 of yacc.c  */
6145 < #line 2321 "ircd_parser.y"
5054 > #line 2037 "conf_parser.y" /* yacc.c:1646  */
5055      {
5056    if (conf_parser_ctx.pass == 2)
5057 <    yy_match_item->action = SHARED_ALL;
5057 >    block_state.flags.value |= SHARED_RESV;
5058   }
5059 + #line 5060 "conf_parser.c" /* yacc.c:1646  */
5060      break;
5061  
5062    case 370:
5063 <
6154 < /* Line 1455 of yacc.c  */
6155 < #line 2330 "ircd_parser.y"
5063 > #line 2041 "conf_parser.y" /* yacc.c:1646  */
5064      {
5065    if (conf_parser_ctx.pass == 2)
5066 <  {
6159 <    yy_conf = make_conf_item(CLUSTER_TYPE);
6160 <    yy_conf->flags = SHARED_ALL;
6161 <  }
5066 >    block_state.flags.value |= SHARED_UNRESV;
5067   }
5068 + #line 5069 "conf_parser.c" /* yacc.c:1646  */
5069      break;
5070  
5071    case 371:
5072 <
6167 < /* Line 1455 of yacc.c  */
6168 < #line 2337 "ircd_parser.y"
5072 > #line 2045 "conf_parser.y" /* yacc.c:1646  */
5073      {
5074    if (conf_parser_ctx.pass == 2)
5075 <  {
6172 <    if (yy_conf->name == NULL)
6173 <      DupString(yy_conf->name, "*");
6174 <    yy_conf = NULL;
6175 <  }
5075 >    block_state.flags.value |= SHARED_LOCOPS;
5076   }
5077 + #line 5078 "conf_parser.c" /* yacc.c:1646  */
5078      break;
5079  
5080 <  case 377:
5081 <
6181 < /* Line 1455 of yacc.c  */
6182 < #line 2350 "ircd_parser.y"
5080 >  case 372:
5081 > #line 2049 "conf_parser.y" /* yacc.c:1646  */
5082      {
5083    if (conf_parser_ctx.pass == 2)
5084 <    DupString(yy_conf->name, yylval.string);
5084 >    block_state.flags.value = SHARED_ALL;
5085   }
5086 + #line 5087 "conf_parser.c" /* yacc.c:1646  */
5087      break;
5088  
5089 <  case 378:
5090 <
6191 < /* Line 1455 of yacc.c  */
6192 < #line 2356 "ircd_parser.y"
5089 >  case 373:
5090 > #line 2058 "conf_parser.y" /* yacc.c:1646  */
5091      {
5092 <  if (conf_parser_ctx.pass == 2)
6195 <    yy_conf->flags = 0;
6196 < }
5092 >  if (conf_parser_ctx.pass != 2)
5093      break;
5094  
5095 <  case 382:
5095 >  reset_block_state();
5096  
5097 < /* Line 1455 of yacc.c  */
5098 < #line 2363 "ircd_parser.y"
6203 <    {
6204 <  if (conf_parser_ctx.pass == 2)
6205 <    yy_conf->flags |= SHARED_KLINE;
5097 >  strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
5098 >  block_state.flags.value = SHARED_ALL;
5099   }
5100 + #line 5101 "conf_parser.c" /* yacc.c:1646  */
5101 +    break;
5102 +
5103 +  case 374:
5104 + #line 2067 "conf_parser.y" /* yacc.c:1646  */
5105 +    {
5106 +  struct MaskItem *conf = NULL;
5107 +
5108 +  if (conf_parser_ctx.pass != 2)
5109      break;
5110  
5111 <  case 383:
5111 >  conf = conf_make(CONF_CLUSTER);
5112 >  conf->flags = block_state.flags.value;
5113 >  conf->name = xstrdup(block_state.name.buf);
5114 > }
5115 > #line 5116 "conf_parser.c" /* yacc.c:1646  */
5116 >    break;
5117  
5118 < /* Line 1455 of yacc.c  */
5119 < #line 2367 "ircd_parser.y"
5118 >  case 380:
5119 > #line 2082 "conf_parser.y" /* yacc.c:1646  */
5120      {
5121    if (conf_parser_ctx.pass == 2)
5122 <    yy_conf->flags |= SHARED_TKLINE;
5122 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5123   }
5124 + #line 5125 "conf_parser.c" /* yacc.c:1646  */
5125      break;
5126  
5127 <  case 384:
5128 <
6221 < /* Line 1455 of yacc.c  */
6222 < #line 2371 "ircd_parser.y"
5127 >  case 381:
5128 > #line 2088 "conf_parser.y" /* yacc.c:1646  */
5129      {
5130    if (conf_parser_ctx.pass == 2)
5131 <    yy_conf->flags |= SHARED_UNKLINE;
5131 >    block_state.flags.value = 0;
5132   }
5133 + #line 5134 "conf_parser.c" /* yacc.c:1646  */
5134      break;
5135  
5136    case 385:
5137 <
6231 < /* Line 1455 of yacc.c  */
6232 < #line 2375 "ircd_parser.y"
5137 > #line 2095 "conf_parser.y" /* yacc.c:1646  */
5138      {
5139    if (conf_parser_ctx.pass == 2)
5140 <    yy_conf->flags |= SHARED_XLINE;
5140 >    block_state.flags.value |= SHARED_KLINE;
5141   }
5142 + #line 5143 "conf_parser.c" /* yacc.c:1646  */
5143      break;
5144  
5145    case 386:
5146 <
6241 < /* Line 1455 of yacc.c  */
6242 < #line 2379 "ircd_parser.y"
5146 > #line 2099 "conf_parser.y" /* yacc.c:1646  */
5147      {
5148    if (conf_parser_ctx.pass == 2)
5149 <    yy_conf->flags |= SHARED_TXLINE;
5149 >    block_state.flags.value |= SHARED_UNKLINE;
5150   }
5151 + #line 5152 "conf_parser.c" /* yacc.c:1646  */
5152      break;
5153  
5154    case 387:
5155 <
6251 < /* Line 1455 of yacc.c  */
6252 < #line 2383 "ircd_parser.y"
5155 > #line 2103 "conf_parser.y" /* yacc.c:1646  */
5156      {
5157    if (conf_parser_ctx.pass == 2)
5158 <    yy_conf->flags |= SHARED_UNXLINE;
5158 >    block_state.flags.value |= SHARED_DLINE;
5159   }
5160 + #line 5161 "conf_parser.c" /* yacc.c:1646  */
5161      break;
5162  
5163    case 388:
5164 <
6261 < /* Line 1455 of yacc.c  */
6262 < #line 2387 "ircd_parser.y"
5164 > #line 2107 "conf_parser.y" /* yacc.c:1646  */
5165      {
5166    if (conf_parser_ctx.pass == 2)
5167 <    yy_conf->flags |= SHARED_RESV;
5167 >    block_state.flags.value |= SHARED_UNDLINE;
5168   }
5169 + #line 5170 "conf_parser.c" /* yacc.c:1646  */
5170      break;
5171  
5172    case 389:
5173 <
6271 < /* Line 1455 of yacc.c  */
6272 < #line 2391 "ircd_parser.y"
5173 > #line 2111 "conf_parser.y" /* yacc.c:1646  */
5174      {
5175    if (conf_parser_ctx.pass == 2)
5176 <    yy_conf->flags |= SHARED_TRESV;
5176 >    block_state.flags.value |= SHARED_XLINE;
5177   }
5178 + #line 5179 "conf_parser.c" /* yacc.c:1646  */
5179      break;
5180  
5181    case 390:
5182 <
6281 < /* Line 1455 of yacc.c  */
6282 < #line 2395 "ircd_parser.y"
5182 > #line 2115 "conf_parser.y" /* yacc.c:1646  */
5183      {
5184    if (conf_parser_ctx.pass == 2)
5185 <    yy_conf->flags |= SHARED_UNRESV;
5185 >    block_state.flags.value |= SHARED_UNXLINE;
5186   }
5187 + #line 5188 "conf_parser.c" /* yacc.c:1646  */
5188      break;
5189  
5190    case 391:
5191 <
6291 < /* Line 1455 of yacc.c  */
6292 < #line 2399 "ircd_parser.y"
5191 > #line 2119 "conf_parser.y" /* yacc.c:1646  */
5192      {
5193    if (conf_parser_ctx.pass == 2)
5194 <    yy_conf->flags |= SHARED_LOCOPS;
5194 >    block_state.flags.value |= SHARED_RESV;
5195   }
5196 + #line 5197 "conf_parser.c" /* yacc.c:1646  */
5197      break;
5198  
5199    case 392:
5200 <
6301 < /* Line 1455 of yacc.c  */
6302 < #line 2403 "ircd_parser.y"
5200 > #line 2123 "conf_parser.y" /* yacc.c:1646  */
5201      {
5202    if (conf_parser_ctx.pass == 2)
5203 <    yy_conf->flags = SHARED_ALL;
5203 >    block_state.flags.value |= SHARED_UNRESV;
5204   }
5205 + #line 5206 "conf_parser.c" /* yacc.c:1646  */
5206      break;
5207  
5208    case 393:
5209 <
6311 < /* Line 1455 of yacc.c  */
6312 < #line 2412 "ircd_parser.y"
5209 > #line 2127 "conf_parser.y" /* yacc.c:1646  */
5210      {
5211    if (conf_parser_ctx.pass == 2)
5212 <  {
6316 <    yy_conf = make_conf_item(SERVER_TYPE);
6317 <    yy_aconf = (struct AccessItem *)map_to_conf(yy_conf);
6318 <    yy_aconf->passwd = NULL;
6319 <    /* defaults */
6320 <    yy_aconf->port = PORTNUM;
6321 <
6322 <    if (ConfigFileEntry.burst_away)
6323 <      yy_aconf->flags = CONF_FLAGS_BURST_AWAY;
6324 <  }
6325 <  else
6326 <  {
6327 <    MyFree(class_name);
6328 <    class_name = NULL;
6329 <  }
5212 >    block_state.flags.value |= SHARED_LOCOPS;
5213   }
5214 + #line 5215 "conf_parser.c" /* yacc.c:1646  */
5215      break;
5216  
5217    case 394:
5218 <
6335 < /* Line 1455 of yacc.c  */
6336 < #line 2430 "ircd_parser.y"
5218 > #line 2131 "conf_parser.y" /* yacc.c:1646  */
5219      {
5220    if (conf_parser_ctx.pass == 2)
5221 <  {
5222 <    struct CollectItem *yy_hconf=NULL;
5223 <    struct CollectItem *yy_lconf=NULL;
5224 <    dlink_node *ptr;
6343 <    dlink_node *next_ptr;
6344 < #ifdef HAVE_LIBCRYPTO
6345 <    if (yy_aconf->host &&
6346 <        ((yy_aconf->passwd && yy_aconf->spasswd) ||
6347 <         (yy_aconf->rsa_public_key && IsConfCryptLink(yy_aconf))))
6348 < #else /* !HAVE_LIBCRYPTO */
6349 <      if (yy_aconf->host && !IsConfCryptLink(yy_aconf) &&
6350 <          yy_aconf->passwd && yy_aconf->spasswd)
6351 < #endif /* !HAVE_LIBCRYPTO */
6352 <        {
6353 <          if (conf_add_server(yy_conf, class_name) == -1)
6354 <          {
6355 <            delete_conf_item(yy_conf);
6356 <            yy_conf = NULL;
6357 <            yy_aconf = NULL;
6358 <          }
6359 <        }
6360 <        else
6361 <        {
6362 <          /* Even if yy_conf ->name is NULL
6363 <           * should still unhook any hub/leaf confs still pending
6364 <           */
6365 <          unhook_hub_leaf_confs();
6366 <
6367 <          if (yy_conf->name != NULL)
6368 <          {
6369 < #ifndef HAVE_LIBCRYPTO
6370 <            if (IsConfCryptLink(yy_aconf))
6371 <              yyerror("Ignoring connect block -- no OpenSSL support");
6372 < #else
6373 <            if (IsConfCryptLink(yy_aconf) && !yy_aconf->rsa_public_key)
6374 <              yyerror("Ignoring connect block -- missing key");
6375 < #endif
6376 <            if (yy_aconf->host == NULL)
6377 <              yyerror("Ignoring connect block -- missing host");
6378 <            else if (!IsConfCryptLink(yy_aconf) &&
6379 <                    (!yy_aconf->passwd || !yy_aconf->spasswd))
6380 <              yyerror("Ignoring connect block -- missing password");
6381 <          }
6382 <
6383 <
6384 <          /* XXX
6385 <           * This fixes a try_connections() core (caused by invalid class_ptr
6386 <           * pointers) reported by metalrock. That's an ugly fix, but there
6387 <           * is currently no better way. The entire config subsystem needs an
6388 <           * rewrite ASAP. make_conf_item() shouldn't really add things onto
6389 <           * a doubly linked list immediately without any sanity checks!  -Michael
6390 <           */
6391 <          delete_conf_item(yy_conf);
6392 <
6393 <          yy_aconf = NULL;
6394 <          yy_conf = NULL;
6395 <        }
6396 <
6397 <      /*
6398 <       * yy_conf is still pointing at the server that is having
6399 <       * a connect block built for it. This means, y_aconf->name
6400 <       * points to the actual irc name this server will be known as.
6401 <       * Now this new server has a set or even just one hub_mask (or leaf_mask)
6402 <       * given in the link list at yy_hconf. Fill in the HUB confs
6403 <       * from this link list now.
6404 <       */        
6405 <      DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
6406 <      {
6407 <        struct ConfItem *new_hub_conf;
6408 <        struct MatchItem *match_item;
6409 <
6410 <        yy_hconf = ptr->data;
6411 <
6412 <        /* yy_conf == NULL is a fatal error for this connect block! */
6413 <        if ((yy_conf != NULL) && (yy_conf->name != NULL))
6414 <        {
6415 <          new_hub_conf = make_conf_item(HUB_TYPE);
6416 <          match_item = (struct MatchItem *)map_to_conf(new_hub_conf);
6417 <          DupString(new_hub_conf->name, yy_conf->name);
6418 <          if (yy_hconf->user != NULL)
6419 <            DupString(match_item->user, yy_hconf->user);
6420 <          else
6421 <            DupString(match_item->user, "*");
6422 <          if (yy_hconf->host != NULL)
6423 <            DupString(match_item->host, yy_hconf->host);
6424 <          else
6425 <            DupString(match_item->host, "*");
6426 <        }
6427 <        dlinkDelete(&yy_hconf->node, &hub_conf_list);
6428 <        free_collect_item(yy_hconf);
6429 <      }
6430 <
6431 <      /* Ditto for the LEAF confs */
5221 >    block_state.flags.value = SHARED_ALL;
5222 > }
5223 > #line 5224 "conf_parser.c" /* yacc.c:1646  */
5224 >    break;
5225  
5226 <      DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
5227 <      {
5228 <        struct ConfItem *new_leaf_conf;
6436 <        struct MatchItem *match_item;
5226 >  case 395:
5227 > #line 2140 "conf_parser.y" /* yacc.c:1646  */
5228 >    {
5229  
5230 <        yy_lconf = ptr->data;
5230 >  if (conf_parser_ctx.pass != 2)
5231 >    break;
5232  
5233 <        if ((yy_conf != NULL) && (yy_conf->name != NULL))
5234 <        {
5235 <          new_leaf_conf = make_conf_item(LEAF_TYPE);
6443 <          match_item = (struct MatchItem *)map_to_conf(new_leaf_conf);
6444 <          DupString(new_leaf_conf->name, yy_conf->name);
6445 <          if (yy_lconf->user != NULL)
6446 <            DupString(match_item->user, yy_lconf->user);
6447 <          else
6448 <            DupString(match_item->user, "*");
6449 <          if (yy_lconf->host != NULL)
6450 <            DupString(match_item->host, yy_lconf->host);
6451 <          else
6452 <            DupString(match_item->host, "*");
6453 <        }
6454 <        dlinkDelete(&yy_lconf->node, &leaf_conf_list);
6455 <        free_collect_item(yy_lconf);
6456 <      }
6457 <      MyFree(class_name);
6458 <      class_name = NULL;
6459 <      yy_conf = NULL;
6460 <      yy_aconf = NULL;
6461 <  }
5233 >  reset_block_state();
5234 >  block_state.aftype.value = AF_INET;
5235 >  block_state.port.value = PORTNUM;
5236   }
5237 + #line 5238 "conf_parser.c" /* yacc.c:1646  */
5238      break;
5239  
5240 <  case 419:
5241 <
6467 < /* Line 1455 of yacc.c  */
6468 < #line 2569 "ircd_parser.y"
5240 >  case 396:
5241 > #line 2149 "conf_parser.y" /* yacc.c:1646  */
5242      {
5243 <  if (conf_parser_ctx.pass == 2)
5244 <  {
6472 <    if (yy_conf->name != NULL)
6473 <      yyerror("Multiple connect name entry");
5243 >  struct MaskItem *conf = NULL;
5244 >  struct addrinfo hints, *res;
5245  
5246 <    MyFree(yy_conf->name);
6476 <    DupString(yy_conf->name, yylval.string);
6477 <  }
6478 < }
5246 >  if (conf_parser_ctx.pass != 2)
5247      break;
5248  
5249 <  case 420:
5249 >  if (!block_state.name.buf[0] ||
5250 >      !block_state.host.buf[0])
5251 >    break;
5252  
5253 < /* Line 1455 of yacc.c  */
5254 < #line 2581 "ircd_parser.y"
5255 <    {
6486 <  if (conf_parser_ctx.pass == 2)
6487 <  {
6488 <    if (yy_conf->name != NULL)
6489 <      yyerror("Multiple connect name entry");
5253 >  if (!block_state.rpass.buf[0] ||
5254 >      !block_state.spass.buf[0])
5255 >    break;
5256  
5257 <    MyFree(yy_conf->name);
5258 <    DupString(yy_conf->name, yylval.string);
6493 <  }
6494 < }
5257 >  if (has_wildcards(block_state.name.buf) ||
5258 >      has_wildcards(block_state.host.buf))
5259      break;
5260  
5261 <  case 421:
5261 >  conf = conf_make(CONF_SERVER);
5262 >  conf->port = block_state.port.value;
5263 >  conf->flags = block_state.flags.value;
5264 >  conf->aftype = block_state.aftype.value;
5265 >  conf->host = xstrdup(block_state.host.buf);
5266 >  conf->name = xstrdup(block_state.name.buf);
5267 >  conf->passwd = xstrdup(block_state.rpass.buf);
5268 >  conf->spasswd = xstrdup(block_state.spass.buf);
5269  
5270 < /* Line 1455 of yacc.c  */
5271 < #line 2593 "ircd_parser.y"
6501 <    {
6502 <  if (conf_parser_ctx.pass == 2)
6503 <  {
6504 <    MyFree(yy_aconf->host);
6505 <    DupString(yy_aconf->host, yylval.string);
6506 <  }
6507 < }
6508 <    break;
5270 >  if (block_state.cert.buf[0])
5271 >    conf->certfp = xstrdup(block_state.cert.buf);
5272  
5273 <  case 422:
5273 >  if (block_state.ciph.buf[0])
5274 >    conf->cipher_list = xstrdup(block_state.ciph.buf);
5275  
5276 < /* Line 1455 of yacc.c  */
5277 < #line 2602 "ircd_parser.y"
6514 <    {
6515 <  if (conf_parser_ctx.pass == 2)
6516 <  {
6517 <    struct addrinfo hints, *res;
5276 >  dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
5277 >  dlinkMoveList(&block_state.hub.list, &conf->hub_list);
5278  
5279 +  if (block_state.bind.buf[0])
5280 +  {
5281      memset(&hints, 0, sizeof(hints));
5282  
5283      hints.ai_family   = AF_UNSPEC;
5284      hints.ai_socktype = SOCK_STREAM;
5285      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
5286  
5287 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
5288 <      ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
5287 >    if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
5288 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
5289      else
5290      {
5291 <      assert(res != NULL);
5291 >      assert(res);
5292  
5293 <      memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
5294 <      yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
5295 <      yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
5296 <      irc_freeaddrinfo(res);
5293 >      memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
5294 >      conf->bind.ss.ss_family = res->ai_family;
5295 >      conf->bind.ss_len = res->ai_addrlen;
5296 >      freeaddrinfo(res);
5297      }
5298    }
6537 }
6538    break;
6539
6540  case 423:
6541
6542 /* Line 1455 of yacc.c  */
6543 #line 2628 "ircd_parser.y"
6544    {
6545  if (conf_parser_ctx.pass == 2)
6546  {
6547    if ((yyvsp[(3) - (4)].string)[0] == ':')
6548      yyerror("Server passwords cannot begin with a colon");
6549    else if (strchr((yyvsp[(3) - (4)].string), ' ') != NULL)
6550      yyerror("Server passwords cannot contain spaces");
6551    else {
6552      if (yy_aconf->spasswd != NULL)
6553        memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
5299  
5300 <      MyFree(yy_aconf->spasswd);
5301 <      DupString(yy_aconf->spasswd, yylval.string);
6557 <    }
6558 <  }
5300 >  conf_add_class_to_conf(conf, block_state.class.buf);
5301 >  lookup_confhost(conf);
5302   }
5303 + #line 5304 "conf_parser.c" /* yacc.c:1646  */
5304      break;
5305  
5306 <  case 424:
5307 <
6564 < /* Line 1455 of yacc.c  */
6565 < #line 2646 "ircd_parser.y"
5306 >  case 414:
5307 > #line 2229 "conf_parser.y" /* yacc.c:1646  */
5308      {
5309    if (conf_parser_ctx.pass == 2)
5310 <  {
6569 <    if ((yyvsp[(3) - (4)].string)[0] == ':')
6570 <      yyerror("Server passwords cannot begin with a colon");
6571 <    else if (strchr((yyvsp[(3) - (4)].string), ' ') != NULL)
6572 <      yyerror("Server passwords cannot contain spaces");
6573 <    else {
6574 <      if (yy_aconf->passwd != NULL)
6575 <        memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
6576 <
6577 <      MyFree(yy_aconf->passwd);
6578 <      DupString(yy_aconf->passwd, yylval.string);
6579 <    }
6580 <  }
5310 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5311   }
5312 + #line 5313 "conf_parser.c" /* yacc.c:1646  */
5313      break;
5314  
5315 <  case 425:
5316 <
6586 < /* Line 1455 of yacc.c  */
6587 < #line 2664 "ircd_parser.y"
5315 >  case 415:
5316 > #line 2235 "conf_parser.y" /* yacc.c:1646  */
5317      {
5318    if (conf_parser_ctx.pass == 2)
5319 <    yy_aconf->port = (yyvsp[(3) - (4)].number);
5319 >    strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
5320   }
5321 + #line 5322 "conf_parser.c" /* yacc.c:1646  */
5322      break;
5323  
5324 <  case 426:
5325 <
6596 < /* Line 1455 of yacc.c  */
6597 < #line 2670 "ircd_parser.y"
5324 >  case 416:
5325 > #line 2241 "conf_parser.y" /* yacc.c:1646  */
5326      {
5327    if (conf_parser_ctx.pass == 2)
5328 <    yy_aconf->aftype = AF_INET;
5328 >    strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
5329   }
5330 + #line 5331 "conf_parser.c" /* yacc.c:1646  */
5331      break;
5332  
5333 <  case 427:
5334 <
6606 < /* Line 1455 of yacc.c  */
6607 < #line 2674 "ircd_parser.y"
6608 <    {
6609 < #ifdef IPV6
6610 <  if (conf_parser_ctx.pass == 2)
6611 <    yy_aconf->aftype = AF_INET6;
6612 < #endif
6613 < }
6614 <    break;
6615 <
6616 <  case 428:
6617 <
6618 < /* Line 1455 of yacc.c  */
6619 < #line 2682 "ircd_parser.y"
6620 <    {
6621 <  if (conf_parser_ctx.pass == 2)
6622 <  {
6623 <    MyFree(yy_aconf->fakename);
6624 <    DupString(yy_aconf->fakename, yylval.string);
6625 <  }
6626 < }
6627 <    break;
6628 <
6629 <  case 429:
6630 <
6631 < /* Line 1455 of yacc.c  */
6632 < #line 2691 "ircd_parser.y"
5333 >  case 417:
5334 > #line 2247 "conf_parser.y" /* yacc.c:1646  */
5335      {
5336 < }
6635 <    break;
6636 <
6637 <  case 433:
6638 <
6639 < /* Line 1455 of yacc.c  */
6640 < #line 2695 "ircd_parser.y"
6641 <    { not_atom = 1; }
5336 >  if (conf_parser_ctx.pass != 2)
5337      break;
5338  
5339 <  case 435:
5340 <
5341 < /* Line 1455 of yacc.c  */
5342 < #line 2696 "ircd_parser.y"
5343 <    { not_atom = 0; }
5344 <    break;
6650 <
6651 <  case 437:
6652 <
6653 < /* Line 1455 of yacc.c  */
6654 < #line 2699 "ircd_parser.y"
6655 <    {
6656 <  if (conf_parser_ctx.pass == 2)
6657 < #ifndef HAVE_LIBZ
6658 <    yyerror("Ignoring flags = compressed; -- no zlib support");
6659 < #else
6660 < {
6661 <   if (not_atom)ClearConfCompressed(yy_aconf);
6662 <   else SetConfCompressed(yy_aconf);
6663 < }
6664 < #endif
5339 >  if ((yyvsp[-1].string)[0] == ':')
5340 >    conf_error_report("Server passwords cannot begin with a colon");
5341 >  else if (strchr((yyvsp[-1].string), ' '))
5342 >    conf_error_report("Server passwords cannot contain spaces");
5343 >  else
5344 >    strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
5345   }
5346 + #line 5347 "conf_parser.c" /* yacc.c:1646  */
5347      break;
5348  
5349 <  case 438:
5350 <
6670 < /* Line 1455 of yacc.c  */
6671 < #line 2710 "ircd_parser.y"
5349 >  case 418:
5350 > #line 2260 "conf_parser.y" /* yacc.c:1646  */
5351      {
5352 <  if (conf_parser_ctx.pass == 2)
6674 <  {
6675 <    if (not_atom)ClearConfCryptLink(yy_aconf);
6676 <    else SetConfCryptLink(yy_aconf);
6677 <  }
6678 < }
5352 >  if (conf_parser_ctx.pass != 2)
5353      break;
5354  
5355 <  case 439:
5356 <
5357 < /* Line 1455 of yacc.c  */
5358 < #line 2717 "ircd_parser.y"
5359 <    {
5360 <  if (conf_parser_ctx.pass == 2)
6687 <  {
6688 <    if (not_atom)ClearConfAllowAutoConn(yy_aconf);
6689 <    else SetConfAllowAutoConn(yy_aconf);
6690 <  }
5355 >  if ((yyvsp[-1].string)[0] == ':')
5356 >    conf_error_report("Server passwords cannot begin with a colon");
5357 >  else if (strchr((yyvsp[-1].string), ' '))
5358 >    conf_error_report("Server passwords cannot contain spaces");
5359 >  else
5360 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5361   }
5362 + #line 5363 "conf_parser.c" /* yacc.c:1646  */
5363      break;
5364  
5365 <  case 440:
5366 <
6696 < /* Line 1455 of yacc.c  */
6697 < #line 2724 "ircd_parser.y"
5365 >  case 419:
5366 > #line 2273 "conf_parser.y" /* yacc.c:1646  */
5367      {
5368    if (conf_parser_ctx.pass == 2)
5369 <  {
6701 <    if (not_atom)ClearConfAwayBurst(yy_aconf);
6702 <    else SetConfAwayBurst(yy_aconf);
6703 <  }
5369 >    strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
5370   }
5371 + #line 5372 "conf_parser.c" /* yacc.c:1646  */
5372      break;
5373  
5374 <  case 441:
5375 <
6709 < /* Line 1455 of yacc.c  */
6710 < #line 2731 "ircd_parser.y"
5374 >  case 420:
5375 > #line 2279 "conf_parser.y" /* yacc.c:1646  */
5376      {
5377    if (conf_parser_ctx.pass == 2)
5378 <  {
6714 <    if (not_atom)ClearConfTopicBurst(yy_aconf);
6715 <    else SetConfTopicBurst(yy_aconf);
6716 <  }
5378 >    block_state.port.value = (yyvsp[-1].number);
5379   }
5380 + #line 5381 "conf_parser.c" /* yacc.c:1646  */
5381      break;
5382  
5383 <  case 442:
5384 <
6722 < /* Line 1455 of yacc.c  */
6723 < #line 2741 "ircd_parser.y"
5383 >  case 421:
5384 > #line 2285 "conf_parser.y" /* yacc.c:1646  */
5385      {
6725 #ifdef HAVE_LIBCRYPTO
5386    if (conf_parser_ctx.pass == 2)
5387 <  {
6728 <    BIO *file;
6729 <
6730 <    if (yy_aconf->rsa_public_key != NULL)
6731 <    {
6732 <      RSA_free(yy_aconf->rsa_public_key);
6733 <      yy_aconf->rsa_public_key = NULL;
6734 <    }
6735 <
6736 <    if (yy_aconf->rsa_public_key_file != NULL)
6737 <    {
6738 <      MyFree(yy_aconf->rsa_public_key_file);
6739 <      yy_aconf->rsa_public_key_file = NULL;
6740 <    }
6741 <
6742 <    DupString(yy_aconf->rsa_public_key_file, yylval.string);
6743 <
6744 <    if ((file = BIO_new_file(yylval.string, "r")) == NULL)
6745 <    {
6746 <      yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
6747 <      break;
6748 <    }
6749 <
6750 <    yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
6751 <
6752 <    if (yy_aconf->rsa_public_key == NULL)
6753 <    {
6754 <      yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
6755 <      break;
6756 <    }
6757 <      
6758 <    BIO_set_close(file, BIO_CLOSE);
6759 <    BIO_free(file);
6760 <  }
6761 < #endif /* HAVE_LIBCRYPTO */
5387 >    block_state.aftype.value = AF_INET;
5388   }
5389 + #line 5390 "conf_parser.c" /* yacc.c:1646  */
5390      break;
5391  
5392 <  case 443:
5393 <
6767 < /* Line 1455 of yacc.c  */
6768 < #line 2782 "ircd_parser.y"
5392 >  case 422:
5393 > #line 2289 "conf_parser.y" /* yacc.c:1646  */
5394      {
5395    if (conf_parser_ctx.pass == 2)
5396 <  {
6772 <    if (yylval.number)
6773 <      yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
6774 <    else
6775 <      yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
6776 <  }
5396 >    block_state.aftype.value = AF_INET6;
5397   }
5398 + #line 5399 "conf_parser.c" /* yacc.c:1646  */
5399      break;
5400  
5401 <  case 444:
5402 <
6782 < /* Line 1455 of yacc.c  */
6783 < #line 2793 "ircd_parser.y"
5401 >  case 423:
5402 > #line 2295 "conf_parser.y" /* yacc.c:1646  */
5403      {
5404 <  if (conf_parser_ctx.pass == 2)
6786 <  {
6787 <    if (yylval.number)
6788 <      yy_aconf->flags |= CONF_FLAGS_CRYPTLINK;
6789 <    else
6790 <      yy_aconf->flags &= ~CONF_FLAGS_CRYPTLINK;
6791 <  }
5404 >  block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
5405   }
5406 + #line 5407 "conf_parser.c" /* yacc.c:1646  */
5407      break;
5408  
5409 <  case 445:
5410 <
6797 < /* Line 1455 of yacc.c  */
6798 < #line 2804 "ircd_parser.y"
5409 >  case 427:
5410 > #line 2301 "conf_parser.y" /* yacc.c:1646  */
5411      {
5412    if (conf_parser_ctx.pass == 2)
5413 <  {
6802 <    if (yylval.number)
6803 < #ifndef HAVE_LIBZ
6804 <      yyerror("Ignoring compressed=yes; -- no zlib support");
6805 < #else
6806 <      yy_aconf->flags |= CONF_FLAGS_COMPRESSED;
6807 < #endif
6808 <    else
6809 <      yy_aconf->flags &= ~CONF_FLAGS_COMPRESSED;
6810 <  }
5413 >    block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
5414   }
5415 + #line 5416 "conf_parser.c" /* yacc.c:1646  */
5416      break;
5417  
5418 <  case 446:
5419 <
6816 < /* Line 1455 of yacc.c  */
6817 < #line 2819 "ircd_parser.y"
5418 >  case 428:
5419 > #line 2305 "conf_parser.y" /* yacc.c:1646  */
5420      {
5421    if (conf_parser_ctx.pass == 2)
5422 <  {
6821 <    if (yylval.number)
6822 <      yy_aconf->flags |= CONF_FLAGS_ALLOW_AUTO_CONN;
6823 <    else
6824 <      yy_aconf->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN;
6825 <  }
5422 >    block_state.flags.value |= CONF_FLAGS_SSL;
5423   }
5424 + #line 5425 "conf_parser.c" /* yacc.c:1646  */
5425      break;
5426  
5427 <  case 447:
5428 <
6831 < /* Line 1455 of yacc.c  */
6832 < #line 2830 "ircd_parser.y"
5427 >  case 429:
5428 > #line 2311 "conf_parser.y" /* yacc.c:1646  */
5429      {
5430    if (conf_parser_ctx.pass == 2)
5431    {
5432      if (yylval.number)
5433 <      SetConfTopicBurst(yy_aconf);
5433 >      block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
5434      else
5435 <      ClearConfTopicBurst(yy_aconf);
5435 >      block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
5436    }
5437   }
5438 + #line 5439 "conf_parser.c" /* yacc.c:1646  */
5439      break;
5440  
5441 <  case 448:
5442 <
6846 < /* Line 1455 of yacc.c  */
6847 < #line 2841 "ircd_parser.y"
5441 >  case 430:
5442 > #line 2322 "conf_parser.y" /* yacc.c:1646  */
5443      {
5444    if (conf_parser_ctx.pass == 2)
5445 <  {
6851 <    struct CollectItem *yy_tmp;
6852 <
6853 <    yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
6854 <    DupString(yy_tmp->host, yylval.string);
6855 <    DupString(yy_tmp->user, "*");
6856 <    dlinkAdd(yy_tmp, &yy_tmp->node, &hub_conf_list);
6857 <  }
5445 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
5446   }
5447 + #line 5448 "conf_parser.c" /* yacc.c:1646  */
5448      break;
5449  
5450 <  case 449:
5451 <
6863 < /* Line 1455 of yacc.c  */
6864 < #line 2854 "ircd_parser.y"
5450 >  case 431:
5451 > #line 2328 "conf_parser.y" /* yacc.c:1646  */
5452      {
5453    if (conf_parser_ctx.pass == 2)
5454 <  {
6868 <    struct CollectItem *yy_tmp;
6869 <
6870 <    yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
6871 <    DupString(yy_tmp->host, yylval.string);
6872 <    DupString(yy_tmp->user, "*");
6873 <    dlinkAdd(yy_tmp, &yy_tmp->node, &leaf_conf_list);
6874 <  }
5454 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
5455   }
5456 + #line 5457 "conf_parser.c" /* yacc.c:1646  */
5457      break;
5458  
5459 <  case 450:
5460 <
6880 < /* Line 1455 of yacc.c  */
6881 < #line 2867 "ircd_parser.y"
5459 >  case 432:
5460 > #line 2334 "conf_parser.y" /* yacc.c:1646  */
5461      {
5462    if (conf_parser_ctx.pass == 2)
5463 <  {
6885 <    MyFree(class_name);
6886 <    DupString(class_name, yylval.string);
6887 <  }
5463 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
5464   }
5465 + #line 5466 "conf_parser.c" /* yacc.c:1646  */
5466      break;
5467  
5468 <  case 451:
5469 <
6893 < /* Line 1455 of yacc.c  */
6894 < #line 2876 "ircd_parser.y"
5468 >  case 433:
5469 > #line 2340 "conf_parser.y" /* yacc.c:1646  */
5470      {
5471   #ifdef HAVE_LIBCRYPTO
5472    if (conf_parser_ctx.pass == 2)
5473 <  {
6899 <    struct EncCapability *ecap;
6900 <    const char *cipher_name;
6901 <    int found = 0;
6902 <
6903 <    yy_aconf->cipher_preference = NULL;
6904 <    cipher_name = yylval.string;
6905 <
6906 <    for (ecap = CipherTable; ecap->name; ecap++)
6907 <    {
6908 <      if ((irccmp(ecap->name, cipher_name) == 0) &&
6909 <          (ecap->cap & CAP_ENC_MASK))
6910 <      {
6911 <        yy_aconf->cipher_preference = ecap;
6912 <        found = 1;
6913 <        break;
6914 <      }
6915 <    }
6916 <
6917 <    if (!found)
6918 <      yyerror("Invalid cipher");
6919 <  }
5473 >    strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
5474   #else
5475    if (conf_parser_ctx.pass == 2)
5476 <    yyerror("Ignoring cipher_preference -- no OpenSSL support");
5476 >    conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
5477   #endif
5478   }
5479 + #line 5480 "conf_parser.c" /* yacc.c:1646  */
5480      break;
5481  
5482 <  case 452:
5483 <
6929 < /* Line 1455 of yacc.c  */
6930 < #line 2911 "ircd_parser.y"
5482 >  case 434:
5483 > #line 2355 "conf_parser.y" /* yacc.c:1646  */
5484      {
5485    if (conf_parser_ctx.pass == 2)
5486 <  {
6934 <    userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
6935 <    regex_ban = 0;
6936 <  }
5486 >    reset_block_state();
5487   }
5488 + #line 5489 "conf_parser.c" /* yacc.c:1646  */
5489      break;
5490  
5491 <  case 453:
5492 <
6942 < /* Line 1455 of yacc.c  */
6943 < #line 2918 "ircd_parser.y"
6944 <    {
6945 <  if (conf_parser_ctx.pass == 2)
6946 <  {
6947 <    if (userbuf[0] && hostbuf[0])
5491 >  case 435:
5492 > #line 2359 "conf_parser.y" /* yacc.c:1646  */
5493      {
5494 <      if (regex_ban)
6950 <      {
6951 < #ifdef HAVE_LIBPCRE
6952 <        void *exp_user = NULL;
6953 <        void *exp_host = NULL;
6954 <        const char *errptr = NULL;
6955 <
6956 <        if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
6957 <            !(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
6958 <        {
6959 <          ilog(L_ERROR, "Failed to add regular expression based K-Line: %s",
6960 <               errptr);
6961 <          break;
6962 <        }
6963 <
6964 <        yy_aconf = map_to_conf(make_conf_item(RKLINE_TYPE));
6965 <        yy_aconf->regexuser = exp_user;
6966 <        yy_aconf->regexhost = exp_host;
6967 <
6968 <        DupString(yy_aconf->user, userbuf);
6969 <        DupString(yy_aconf->host, hostbuf);
6970 <
6971 <        if (reasonbuf[0])
6972 <          DupString(yy_aconf->reason, reasonbuf);
6973 <        else
6974 <          DupString(yy_aconf->reason, "No reason");
6975 < #else
6976 <        ilog(L_ERROR, "Failed to add regular expression based K-Line: no PCRE support");
6977 <        break;
6978 < #endif
6979 <      }
6980 <      else
6981 <      {
6982 <        yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
5494 >  struct MaskItem *conf = NULL;
5495  
5496 <        DupString(yy_aconf->user, userbuf);
6985 <        DupString(yy_aconf->host, hostbuf);
6986 <
6987 <        if (reasonbuf[0])
6988 <          DupString(yy_aconf->reason, reasonbuf);
6989 <        else
6990 <          DupString(yy_aconf->reason, "No reason");
6991 <        add_conf_by_address(CONF_KILL, yy_aconf);
6992 <      }
6993 <    }
6994 <
6995 <    yy_aconf = NULL;
6996 <  }
6997 < }
5496 >  if (conf_parser_ctx.pass != 2)
5497      break;
5498  
5499 <  case 454:
5500 <
7002 < /* Line 1455 of yacc.c  */
7003 < #line 2974 "ircd_parser.y"
7004 <    {
7005 < }
5499 >  if (!block_state.user.buf[0] ||
5500 >      !block_state.host.buf[0])
5501      break;
5502  
5503 <  case 458:
5503 >  conf = conf_make(CONF_KLINE);
5504 >  conf->user = xstrdup(block_state.user.buf);
5505 >  conf->host = xstrdup(block_state.host.buf);
5506  
5507 < /* Line 1455 of yacc.c  */
5508 < #line 2979 "ircd_parser.y"
5509 <    {
5510 <  if (conf_parser_ctx.pass == 2)
5511 <    regex_ban = 1;
5507 >  if (block_state.rpass.buf[0])
5508 >    conf->reason = xstrdup(block_state.rpass.buf);
5509 >  else
5510 >    conf->reason = xstrdup(CONF_NOREASON);
5511 >  add_conf_by_address(CONF_KLINE, conf);
5512   }
5513 + #line 5514 "conf_parser.c" /* yacc.c:1646  */
5514      break;
5515  
5516 <  case 465:
5517 <
7020 < /* Line 1455 of yacc.c  */
7021 < #line 2988 "ircd_parser.y"
5516 >  case 441:
5517 > #line 2384 "conf_parser.y" /* yacc.c:1646  */
5518      {
5519 +
5520    if (conf_parser_ctx.pass == 2)
5521    {
5522      struct split_nuh_item nuh;
5523  
5524      nuh.nuhmask  = yylval.string;
5525      nuh.nickptr  = NULL;
5526 <    nuh.userptr  = userbuf;
5527 <    nuh.hostptr  = hostbuf;
5526 >    nuh.userptr  = block_state.user.buf;
5527 >    nuh.hostptr  = block_state.host.buf;
5528  
5529      nuh.nicksize = 0;
5530 <    nuh.usersize = sizeof(userbuf);
5531 <    nuh.hostsize = sizeof(hostbuf);
5530 >    nuh.usersize = sizeof(block_state.user.buf);
5531 >    nuh.hostsize = sizeof(block_state.host.buf);
5532  
5533      split_nuh(&nuh);
5534    }
5535   }
5536 + #line 5537 "conf_parser.c" /* yacc.c:1646  */
5537      break;
5538  
5539 <  case 466:
5540 <
7043 < /* Line 1455 of yacc.c  */
7044 < #line 3007 "ircd_parser.y"
5539 >  case 442:
5540 > #line 2404 "conf_parser.y" /* yacc.c:1646  */
5541      {
5542    if (conf_parser_ctx.pass == 2)
5543 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5543 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5544   }
5545 + #line 5546 "conf_parser.c" /* yacc.c:1646  */
5546      break;
5547  
5548 <  case 467:
5549 <
7053 < /* Line 1455 of yacc.c  */
7054 < #line 3016 "ircd_parser.y"
5548 >  case 443:
5549 > #line 2413 "conf_parser.y" /* yacc.c:1646  */
5550      {
5551    if (conf_parser_ctx.pass == 2)
5552 <    hostbuf[0] = reasonbuf[0] = '\0';
5552 >    reset_block_state();
5553   }
5554 + #line 5555 "conf_parser.c" /* yacc.c:1646  */
5555      break;
5556  
5557 <  case 468:
5558 <
7063 < /* Line 1455 of yacc.c  */
7064 < #line 3020 "ircd_parser.y"
5557 >  case 444:
5558 > #line 2417 "conf_parser.y" /* yacc.c:1646  */
5559      {
5560 <  if (conf_parser_ctx.pass == 2)
5560 >  struct MaskItem *conf = NULL;
5561 >
5562 >  if (conf_parser_ctx.pass != 2)
5563 >    break;
5564 >
5565 >  if (!block_state.addr.buf[0])
5566 >    break;
5567 >
5568 >  if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
5569    {
5570 <    if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
5571 <    {
7070 <      yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
7071 <      DupString(yy_aconf->host, hostbuf);
5570 >    conf = conf_make(CONF_DLINE);
5571 >    conf->host = xstrdup(block_state.addr.buf);
5572  
5573 <      if (reasonbuf[0])
5574 <        DupString(yy_aconf->reason, reasonbuf);
5575 <      else
5576 <        DupString(yy_aconf->reason, "No reason");
5577 <      add_conf_by_address(CONF_DLINE, yy_aconf);
7078 <      yy_aconf = NULL;
7079 <    }
5573 >    if (block_state.rpass.buf[0])
5574 >      conf->reason = xstrdup(block_state.rpass.buf);
5575 >    else
5576 >      conf->reason = xstrdup(CONF_NOREASON);
5577 >    add_conf_by_address(CONF_DLINE, conf);
5578    }
5579   }
5580 + #line 5581 "conf_parser.c" /* yacc.c:1646  */
5581      break;
5582  
5583 <  case 474:
5584 <
7086 < /* Line 1455 of yacc.c  */
7087 < #line 3042 "ircd_parser.y"
5583 >  case 450:
5584 > #line 2443 "conf_parser.y" /* yacc.c:1646  */
5585      {
5586    if (conf_parser_ctx.pass == 2)
5587 <    strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
5587 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
5588   }
5589 + #line 5590 "conf_parser.c" /* yacc.c:1646  */
5590      break;
5591  
5592 <  case 475:
5593 <
7096 < /* Line 1455 of yacc.c  */
7097 < #line 3048 "ircd_parser.y"
5592 >  case 451:
5593 > #line 2449 "conf_parser.y" /* yacc.c:1646  */
5594      {
5595    if (conf_parser_ctx.pass == 2)
5596 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5596 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5597   }
5598 + #line 5599 "conf_parser.c" /* yacc.c:1646  */
5599      break;
5600  
5601 <  case 481:
5602 <
7106 < /* Line 1455 of yacc.c  */
7107 < #line 3062 "ircd_parser.y"
5601 >  case 457:
5602 > #line 2463 "conf_parser.y" /* yacc.c:1646  */
5603      {
5604    if (conf_parser_ctx.pass == 2)
5605    {
5606      if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
5607      {
5608 <      yy_aconf = map_to_conf(make_conf_item(EXEMPTDLINE_TYPE));
5609 <      DupString(yy_aconf->host, yylval.string);
5608 >      struct MaskItem *conf = conf_make(CONF_EXEMPT);
5609 >      conf->host = xstrdup(yylval.string);
5610  
5611 <      add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
7117 <      yy_aconf = NULL;
5611 >      add_conf_by_address(CONF_EXEMPT, conf);
5612      }
5613    }
5614   }
5615 + #line 5616 "conf_parser.c" /* yacc.c:1646  */
5616      break;
5617  
5618 <  case 482:
5619 <
7125 < /* Line 1455 of yacc.c  */
7126 < #line 3080 "ircd_parser.y"
5618 >  case 458:
5619 > #line 2480 "conf_parser.y" /* yacc.c:1646  */
5620      {
5621    if (conf_parser_ctx.pass == 2)
5622 <  {
7130 <    regex_ban = 0;
7131 <    reasonbuf[0] = gecos_name[0] = '\0';
7132 <  }
5622 >    reset_block_state();
5623   }
5624 + #line 5625 "conf_parser.c" /* yacc.c:1646  */
5625      break;
5626  
5627 <  case 483:
5628 <
7138 < /* Line 1455 of yacc.c  */
7139 < #line 3087 "ircd_parser.y"
7140 <    {
7141 <  if (conf_parser_ctx.pass == 2)
7142 <  {
7143 <    if (gecos_name[0])
5627 >  case 459:
5628 > #line 2484 "conf_parser.y" /* yacc.c:1646  */
5629      {
5630 <      if (regex_ban)
7146 <      {
7147 < #ifdef HAVE_LIBPCRE
7148 <        void *exp_p = NULL;
7149 <        const char *errptr = NULL;
7150 <
7151 <        if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
7152 <        {
7153 <          ilog(L_ERROR, "Failed to add regular expression based X-Line: %s",
7154 <               errptr);
7155 <          break;
7156 <        }
7157 <
7158 <        yy_conf = make_conf_item(RXLINE_TYPE);
7159 <        yy_conf->regexpname = exp_p;
7160 < #else
7161 <        ilog(L_ERROR, "Failed to add regular expression based X-Line: no PCRE support");
7162 <        break;
7163 < #endif
7164 <      }
7165 <      else
7166 <        yy_conf = make_conf_item(XLINE_TYPE);
7167 <
7168 <      yy_match_item = map_to_conf(yy_conf);
7169 <      DupString(yy_conf->name, gecos_name);
5630 >  struct MaskItem *conf = NULL;
5631  
5632 <      if (reasonbuf[0])
7172 <        DupString(yy_match_item->reason, reasonbuf);
7173 <      else
7174 <        DupString(yy_match_item->reason, "No reason");
7175 <    }
7176 <  }
7177 < }
5632 >  if (conf_parser_ctx.pass != 2)
5633      break;
5634  
5635 <  case 484:
7181 <
7182 < /* Line 1455 of yacc.c  */
7183 < #line 3127 "ircd_parser.y"
7184 <    {
7185 < }
5635 >  if (!block_state.name.buf[0])
5636      break;
5637  
5638 <  case 488:
5638 >  conf = conf_make(CONF_XLINE);
5639 >  conf->name = xstrdup(block_state.name.buf);
5640  
5641 < /* Line 1455 of yacc.c  */
5642 < #line 3132 "ircd_parser.y"
5643 <    {
5644 <  if (conf_parser_ctx.pass == 2)
7194 <    regex_ban = 1;
5641 >  if (block_state.rpass.buf[0])
5642 >    conf->reason = xstrdup(block_state.rpass.buf);
5643 >  else
5644 >    conf->reason = xstrdup(CONF_NOREASON);
5645   }
5646 + #line 5647 "conf_parser.c" /* yacc.c:1646  */
5647      break;
5648  
5649 <  case 495:
5650 <
7200 < /* Line 1455 of yacc.c  */
7201 < #line 3141 "ircd_parser.y"
5649 >  case 465:
5650 > #line 2506 "conf_parser.y" /* yacc.c:1646  */
5651      {
5652    if (conf_parser_ctx.pass == 2)
5653 <    strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
5653 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5654   }
5655 + #line 5656 "conf_parser.c" /* yacc.c:1646  */
5656      break;
5657  
5658 <  case 496:
5659 <
7210 < /* Line 1455 of yacc.c  */
7211 < #line 3147 "ircd_parser.y"
5658 >  case 466:
5659 > #line 2512 "conf_parser.y" /* yacc.c:1646  */
5660      {
5661    if (conf_parser_ctx.pass == 2)
5662 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5662 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5663   }
5664 + #line 5665 "conf_parser.c" /* yacc.c:1646  */
5665      break;
5666  
5667 <  case 557:
5668 <
7220 < /* Line 1455 of yacc.c  */
7221 < #line 3192 "ircd_parser.y"
5667 >  case 517:
5668 > #line 2574 "conf_parser.y" /* yacc.c:1646  */
5669      {
5670 <  ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number);
5670 >  ConfigGeneral.away_count = (yyvsp[-1].number);
5671   }
5672 + #line 5673 "conf_parser.c" /* yacc.c:1646  */
5673      break;
5674  
5675 <  case 558:
5676 <
7229 < /* Line 1455 of yacc.c  */
7230 < #line 3197 "ircd_parser.y"
5675 >  case 518:
5676 > #line 2579 "conf_parser.y" /* yacc.c:1646  */
5677      {
5678 <  ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number);
5678 >  ConfigGeneral.away_time = (yyvsp[-1].number);
5679   }
5680 + #line 5681 "conf_parser.c" /* yacc.c:1646  */
5681      break;
5682  
5683 <  case 559:
5684 <
7238 < /* Line 1455 of yacc.c  */
7239 < #line 3202 "ircd_parser.y"
5683 >  case 519:
5684 > #line 2584 "conf_parser.y" /* yacc.c:1646  */
5685      {
5686 <  ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number);
5686 >  ConfigGeneral.max_watch = (yyvsp[-1].number);
5687   }
5688 + #line 5689 "conf_parser.c" /* yacc.c:1646  */
5689      break;
5690  
5691 <  case 560:
5692 <
7247 < /* Line 1455 of yacc.c  */
7248 < #line 3207 "ircd_parser.y"
5691 >  case 520:
5692 > #line 2589 "conf_parser.y" /* yacc.c:1646  */
5693      {
5694 <  ConfigFileEntry.burst_away = yylval.number;
5694 >  if (conf_parser_ctx.pass == 2)
5695 >    ConfigGeneral.cycle_on_host_change = yylval.number;
5696   }
5697 + #line 5698 "conf_parser.c" /* yacc.c:1646  */
5698      break;
5699  
5700 <  case 561:
5701 <
7256 < /* Line 1455 of yacc.c  */
7257 < #line 3212 "ircd_parser.y"
5700 >  case 521:
5701 > #line 2595 "conf_parser.y" /* yacc.c:1646  */
5702      {
5703 <  ConfigFileEntry.use_whois_actually = yylval.number;
5703 >  ConfigGeneral.dline_min_cidr = (yyvsp[-1].number);
5704   }
5705 + #line 5706 "conf_parser.c" /* yacc.c:1646  */
5706      break;
5707  
5708 <  case 562:
5709 <
7265 < /* Line 1455 of yacc.c  */
7266 < #line 3217 "ircd_parser.y"
5708 >  case 522:
5709 > #line 2600 "conf_parser.y" /* yacc.c:1646  */
5710      {
5711 <  GlobalSetOptions.rejecttime = yylval.number;
5711 >  ConfigGeneral.dline_min_cidr6 = (yyvsp[-1].number);
5712   }
5713 + #line 5714 "conf_parser.c" /* yacc.c:1646  */
5714      break;
5715  
5716 <  case 563:
5717 <
7274 < /* Line 1455 of yacc.c  */
7275 < #line 3222 "ircd_parser.y"
5716 >  case 523:
5717 > #line 2605 "conf_parser.y" /* yacc.c:1646  */
5718      {
5719 <  ConfigFileEntry.tkline_expire_notices = yylval.number;
5719 >  ConfigGeneral.kline_min_cidr = (yyvsp[-1].number);
5720   }
5721 + #line 5722 "conf_parser.c" /* yacc.c:1646  */
5722      break;
5723  
5724 <  case 564:
5725 <
7283 < /* Line 1455 of yacc.c  */
7284 < #line 3227 "ircd_parser.y"
5724 >  case 524:
5725 > #line 2610 "conf_parser.y" /* yacc.c:1646  */
5726      {
5727 <  ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number);
5727 >  ConfigGeneral.kline_min_cidr6 = (yyvsp[-1].number);
5728   }
5729 + #line 5730 "conf_parser.c" /* yacc.c:1646  */
5730      break;
5731  
5732 <  case 565:
5733 <
7292 < /* Line 1455 of yacc.c  */
7293 < #line 3232 "ircd_parser.y"
5732 >  case 525:
5733 > #line 2615 "conf_parser.y" /* yacc.c:1646  */
5734      {
5735 <  ConfigFileEntry.hide_spoof_ips = yylval.number;
5735 >  ConfigGeneral.tkline_expire_notices = yylval.number;
5736   }
5737 + #line 5738 "conf_parser.c" /* yacc.c:1646  */
5738      break;
5739  
5740 <  case 566:
5741 <
7301 < /* Line 1455 of yacc.c  */
7302 < #line 3237 "ircd_parser.y"
5740 >  case 526:
5741 > #line 2620 "conf_parser.y" /* yacc.c:1646  */
5742      {
5743 <  ConfigFileEntry.ignore_bogus_ts = yylval.number;
5743 >  ConfigGeneral.kill_chase_time_limit = (yyvsp[-1].number);
5744   }
5745 + #line 5746 "conf_parser.c" /* yacc.c:1646  */
5746      break;
5747  
5748 <  case 567:
5749 <
7310 < /* Line 1455 of yacc.c  */
7311 < #line 3242 "ircd_parser.y"
5748 >  case 527:
5749 > #line 2625 "conf_parser.y" /* yacc.c:1646  */
5750      {
5751 <  ConfigFileEntry.disable_remote = yylval.number;
5751 >  ConfigGeneral.ignore_bogus_ts = yylval.number;
5752   }
5753 + #line 5754 "conf_parser.c" /* yacc.c:1646  */
5754      break;
5755  
5756 <  case 568:
5757 <
7319 < /* Line 1455 of yacc.c  */
7320 < #line 3247 "ircd_parser.y"
5756 >  case 528:
5757 > #line 2630 "conf_parser.y" /* yacc.c:1646  */
5758      {
5759 <  ConfigFileEntry.failed_oper_notice = yylval.number;
5759 >  ConfigGeneral.failed_oper_notice = yylval.number;
5760   }
5761 + #line 5762 "conf_parser.c" /* yacc.c:1646  */
5762      break;
5763  
5764 <  case 569:
5765 <
7328 < /* Line 1455 of yacc.c  */
7329 < #line 3252 "ircd_parser.y"
5764 >  case 529:
5765 > #line 2635 "conf_parser.y" /* yacc.c:1646  */
5766      {
5767 <  ConfigFileEntry.anti_nick_flood = yylval.number;
5767 >  ConfigGeneral.anti_nick_flood = yylval.number;
5768   }
5769 + #line 5770 "conf_parser.c" /* yacc.c:1646  */
5770      break;
5771  
5772 <  case 570:
5773 <
7337 < /* Line 1455 of yacc.c  */
7338 < #line 3257 "ircd_parser.y"
5772 >  case 530:
5773 > #line 2640 "conf_parser.y" /* yacc.c:1646  */
5774      {
5775 <  ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number);
5775 >  ConfigGeneral.max_nick_time = (yyvsp[-1].number);
5776   }
5777 + #line 5778 "conf_parser.c" /* yacc.c:1646  */
5778      break;
5779  
5780 <  case 571:
5781 <
7346 < /* Line 1455 of yacc.c  */
7347 < #line 3262 "ircd_parser.y"
5780 >  case 531:
5781 > #line 2645 "conf_parser.y" /* yacc.c:1646  */
5782      {
5783 <  ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number);
5783 >  ConfigGeneral.max_nick_changes = (yyvsp[-1].number);
5784   }
5785 + #line 5786 "conf_parser.c" /* yacc.c:1646  */
5786      break;
5787  
5788 <  case 572:
5789 <
7355 < /* Line 1455 of yacc.c  */
7356 < #line 3267 "ircd_parser.y"
5788 >  case 532:
5789 > #line 2650 "conf_parser.y" /* yacc.c:1646  */
5790      {
5791 <  ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number);
5791 >  ConfigGeneral.max_accept = (yyvsp[-1].number);
5792   }
5793 + #line 5794 "conf_parser.c" /* yacc.c:1646  */
5794      break;
5795  
5796 <  case 573:
5797 <
7364 < /* Line 1455 of yacc.c  */
7365 < #line 3272 "ircd_parser.y"
5796 >  case 533:
5797 > #line 2655 "conf_parser.y" /* yacc.c:1646  */
5798      {
5799 <  ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number);
5799 >  ConfigGeneral.anti_spam_exit_message_time = (yyvsp[-1].number);
5800   }
5801 + #line 5802 "conf_parser.c" /* yacc.c:1646  */
5802      break;
5803  
5804 <  case 574:
5805 <
7373 < /* Line 1455 of yacc.c  */
7374 < #line 3277 "ircd_parser.y"
5804 >  case 534:
5805 > #line 2660 "conf_parser.y" /* yacc.c:1646  */
5806      {
5807 <  ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number);
5807 >  ConfigGeneral.ts_warn_delta = (yyvsp[-1].number);
5808   }
5809 + #line 5810 "conf_parser.c" /* yacc.c:1646  */
5810      break;
5811  
5812 <  case 575:
5813 <
7382 < /* Line 1455 of yacc.c  */
7383 < #line 3282 "ircd_parser.y"
5812 >  case 535:
5813 > #line 2665 "conf_parser.y" /* yacc.c:1646  */
5814      {
5815    if (conf_parser_ctx.pass == 2)
5816 <    ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number);
5816 >    ConfigGeneral.ts_max_delta = (yyvsp[-1].number);
5817   }
5818 + #line 5819 "conf_parser.c" /* yacc.c:1646  */
5819      break;
5820  
5821 <  case 576:
5822 <
7392 < /* Line 1455 of yacc.c  */
7393 < #line 3288 "ircd_parser.y"
5821 >  case 536:
5822 > #line 2671 "conf_parser.y" /* yacc.c:1646  */
5823      {
5824 <  if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1)
7396 <  {
7397 <    ilog(L_CRIT, "You haven't read your config file properly.");
7398 <    ilog(L_CRIT, "There is a line in the example conf that will kill your server if not removed.");
7399 <    ilog(L_CRIT, "Consider actually reading/editing the conf file, and removing this line.");
7400 <    exit(0);
7401 <  }
5824 >  ConfigGeneral.invisible_on_connect = yylval.number;
5825   }
5826 + #line 5827 "conf_parser.c" /* yacc.c:1646  */
5827      break;
5828  
5829 <  case 577:
5830 <
7407 < /* Line 1455 of yacc.c  */
7408 < #line 3299 "ircd_parser.y"
5829 >  case 537:
5830 > #line 2676 "conf_parser.y" /* yacc.c:1646  */
5831      {
5832 <  ConfigFileEntry.kline_with_reason = yylval.number;
5832 >  ConfigGeneral.warn_no_connect_block = yylval.number;
5833   }
5834 + #line 5835 "conf_parser.c" /* yacc.c:1646  */
5835      break;
5836  
5837 <  case 578:
5838 <
7416 < /* Line 1455 of yacc.c  */
7417 < #line 3304 "ircd_parser.y"
5837 >  case 538:
5838 > #line 2681 "conf_parser.y" /* yacc.c:1646  */
5839      {
5840 <  if (conf_parser_ctx.pass == 2)
7420 <  {
7421 <    MyFree(ConfigFileEntry.kline_reason);
7422 <    DupString(ConfigFileEntry.kline_reason, yylval.string);
7423 <  }
5840 >  ConfigGeneral.stats_e_disabled = yylval.number;
5841   }
5842 + #line 5843 "conf_parser.c" /* yacc.c:1646  */
5843      break;
5844  
5845 <  case 579:
5846 <
7429 < /* Line 1455 of yacc.c  */
7430 < #line 3313 "ircd_parser.y"
5845 >  case 539:
5846 > #line 2686 "conf_parser.y" /* yacc.c:1646  */
5847      {
5848 <  ConfigFileEntry.invisible_on_connect = yylval.number;
5848 >  ConfigGeneral.stats_m_oper_only = yylval.number;
5849   }
5850 + #line 5851 "conf_parser.c" /* yacc.c:1646  */
5851      break;
5852  
5853 <  case 580:
5854 <
7438 < /* Line 1455 of yacc.c  */
7439 < #line 3318 "ircd_parser.y"
5853 >  case 540:
5854 > #line 2691 "conf_parser.y" /* yacc.c:1646  */
5855      {
5856 <  ConfigFileEntry.warn_no_nline = yylval.number;
5856 >  ConfigGeneral.stats_o_oper_only = yylval.number;
5857   }
5858 + #line 5859 "conf_parser.c" /* yacc.c:1646  */
5859      break;
5860  
5861 <  case 581:
5862 <
7447 < /* Line 1455 of yacc.c  */
7448 < #line 3323 "ircd_parser.y"
5861 >  case 541:
5862 > #line 2696 "conf_parser.y" /* yacc.c:1646  */
5863      {
5864 <  ConfigFileEntry.stats_e_disabled = yylval.number;
5864 >  ConfigGeneral.stats_P_oper_only = yylval.number;
5865   }
5866 + #line 5867 "conf_parser.c" /* yacc.c:1646  */
5867      break;
5868  
5869 <  case 582:
5870 <
7456 < /* Line 1455 of yacc.c  */
7457 < #line 3328 "ircd_parser.y"
7458 <    {
7459 <  ConfigFileEntry.stats_o_oper_only = yylval.number;
7460 < }
7461 <    break;
7462 <
7463 <  case 583:
7464 <
7465 < /* Line 1455 of yacc.c  */
7466 < #line 3333 "ircd_parser.y"
7467 <    {
7468 <  ConfigFileEntry.stats_P_oper_only = yylval.number;
7469 < }
7470 <    break;
7471 <
7472 <  case 584:
7473 <
7474 < /* Line 1455 of yacc.c  */
7475 < #line 3338 "ircd_parser.y"
7476 <    {
7477 <  ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
7478 < }
7479 <    break;
7480 <
7481 <  case 585:
7482 <
7483 < /* Line 1455 of yacc.c  */
7484 < #line 3341 "ircd_parser.y"
7485 <    {
7486 <  ConfigFileEntry.stats_k_oper_only = 1;
7487 < }
7488 <    break;
7489 <
7490 <  case 586:
7491 <
7492 < /* Line 1455 of yacc.c  */
7493 < #line 3346 "ircd_parser.y"
7494 <    {
7495 <  ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
7496 < }
7497 <    break;
7498 <
7499 <  case 587:
7500 <
7501 < /* Line 1455 of yacc.c  */
7502 < #line 3349 "ircd_parser.y"
7503 <    {
7504 <  ConfigFileEntry.stats_i_oper_only = 1;
7505 < }
7506 <    break;
7507 <
7508 <  case 588:
7509 <
7510 < /* Line 1455 of yacc.c  */
7511 < #line 3354 "ircd_parser.y"
5869 >  case 542:
5870 > #line 2701 "conf_parser.y" /* yacc.c:1646  */
5871      {
5872 <  ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number);
5872 >  ConfigGeneral.stats_u_oper_only = yylval.number;
5873   }
5874 + #line 5875 "conf_parser.c" /* yacc.c:1646  */
5875      break;
5876  
5877 <  case 589:
5878 <
7519 < /* Line 1455 of yacc.c  */
7520 < #line 3359 "ircd_parser.y"
5877 >  case 543:
5878 > #line 2706 "conf_parser.y" /* yacc.c:1646  */
5879      {
5880 <  ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number);
5880 >  ConfigGeneral.stats_k_oper_only = 2 * yylval.number;
5881   }
5882 + #line 5883 "conf_parser.c" /* yacc.c:1646  */
5883      break;
5884  
5885 <  case 590:
5886 <
7528 < /* Line 1455 of yacc.c  */
7529 < #line 3364 "ircd_parser.y"
5885 >  case 544:
5886 > #line 2709 "conf_parser.y" /* yacc.c:1646  */
5887      {
5888 <  ConfigFileEntry.opers_bypass_callerid = yylval.number;
5888 >  ConfigGeneral.stats_k_oper_only = 1;
5889   }
5890 + #line 5891 "conf_parser.c" /* yacc.c:1646  */
5891      break;
5892  
5893 <  case 591:
5894 <
7537 < /* Line 1455 of yacc.c  */
7538 < #line 3369 "ircd_parser.y"
5893 >  case 545:
5894 > #line 2714 "conf_parser.y" /* yacc.c:1646  */
5895      {
5896 <  ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number);
5896 >  ConfigGeneral.stats_i_oper_only = 2 * yylval.number;
5897   }
5898 + #line 5899 "conf_parser.c" /* yacc.c:1646  */
5899      break;
5900  
5901 <  case 592:
5902 <
7546 < /* Line 1455 of yacc.c  */
7547 < #line 3374 "ircd_parser.y"
5901 >  case 546:
5902 > #line 2717 "conf_parser.y" /* yacc.c:1646  */
5903      {
5904 <  ConfigFileEntry.short_motd = yylval.number;
5904 >  ConfigGeneral.stats_i_oper_only = 1;
5905   }
5906 + #line 5907 "conf_parser.c" /* yacc.c:1646  */
5907      break;
5908  
5909 <  case 593:
5910 <
7555 < /* Line 1455 of yacc.c  */
7556 < #line 3379 "ircd_parser.y"
5909 >  case 547:
5910 > #line 2722 "conf_parser.y" /* yacc.c:1646  */
5911      {
5912 <  ConfigFileEntry.no_oper_flood = yylval.number;
5912 >  ConfigGeneral.pace_wait = (yyvsp[-1].number);
5913   }
5914 + #line 5915 "conf_parser.c" /* yacc.c:1646  */
5915      break;
5916  
5917 <  case 594:
5918 <
7564 < /* Line 1455 of yacc.c  */
7565 < #line 3384 "ircd_parser.y"
5917 >  case 548:
5918 > #line 2727 "conf_parser.y" /* yacc.c:1646  */
5919      {
5920 <  ConfigFileEntry.true_no_oper_flood = yylval.number;
5920 >  ConfigGeneral.caller_id_wait = (yyvsp[-1].number);
5921   }
5922 + #line 5923 "conf_parser.c" /* yacc.c:1646  */
5923      break;
5924  
5925 <  case 595:
5926 <
7573 < /* Line 1455 of yacc.c  */
7574 < #line 3389 "ircd_parser.y"
5925 >  case 549:
5926 > #line 2732 "conf_parser.y" /* yacc.c:1646  */
5927      {
5928 <  ConfigFileEntry.oper_pass_resv = yylval.number;
5928 >  ConfigGeneral.opers_bypass_callerid = yylval.number;
5929   }
5930 + #line 5931 "conf_parser.c" /* yacc.c:1646  */
5931      break;
5932  
5933 <  case 596:
5934 <
7582 < /* Line 1455 of yacc.c  */
7583 < #line 3394 "ircd_parser.y"
5933 >  case 550:
5934 > #line 2737 "conf_parser.y" /* yacc.c:1646  */
5935      {
5936 <  if (conf_parser_ctx.pass == 2)
7586 <  {
7587 <    if (strlen(yylval.string) > LOCALE_LENGTH-2)
7588 <      yylval.string[LOCALE_LENGTH-1] = '\0';
7589 <
7590 <    set_locale(yylval.string);
7591 <  }
5936 >  ConfigGeneral.pace_wait_simple = (yyvsp[-1].number);
5937   }
5938 + #line 5939 "conf_parser.c" /* yacc.c:1646  */
5939      break;
5940  
5941 <  case 597:
5942 <
7597 < /* Line 1455 of yacc.c  */
7598 < #line 3405 "ircd_parser.y"
5941 >  case 551:
5942 > #line 2742 "conf_parser.y" /* yacc.c:1646  */
5943      {
5944 <  ConfigFileEntry.idletime = (yyvsp[(3) - (4)].number);
5944 >  ConfigGeneral.short_motd = yylval.number;
5945   }
5946 + #line 5947 "conf_parser.c" /* yacc.c:1646  */
5947      break;
5948  
5949 <  case 598:
5950 <
7606 < /* Line 1455 of yacc.c  */
7607 < #line 3410 "ircd_parser.y"
5949 >  case 552:
5950 > #line 2747 "conf_parser.y" /* yacc.c:1646  */
5951      {
5952 <  ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number);
5952 >  ConfigGeneral.no_oper_flood = yylval.number;
5953   }
5954 + #line 5955 "conf_parser.c" /* yacc.c:1646  */
5955      break;
5956  
5957 <  case 599:
5958 <
7615 < /* Line 1455 of yacc.c  */
7616 < #line 3415 "ircd_parser.y"
5957 >  case 553:
5958 > #line 2752 "conf_parser.y" /* yacc.c:1646  */
5959      {
5960 <  ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number);
5960 >  ConfigGeneral.oper_pass_resv = yylval.number;
5961   }
5962 + #line 5963 "conf_parser.c" /* yacc.c:1646  */
5963      break;
5964  
5965 <  case 600:
5966 <
7624 < /* Line 1455 of yacc.c  */
7625 < #line 3420 "ircd_parser.y"
5965 >  case 554:
5966 > #line 2757 "conf_parser.y" /* yacc.c:1646  */
5967      {
5968 <  if (conf_parser_ctx.pass == 2)
7628 <  {
7629 <    MyFree(ConfigFileEntry.servlink_path);
7630 <    DupString(ConfigFileEntry.servlink_path, yylval.string);
7631 <  }
5968 >  ConfigGeneral.dots_in_ident = (yyvsp[-1].number);
5969   }
5970 + #line 5971 "conf_parser.c" /* yacc.c:1646  */
5971      break;
5972  
5973 <  case 601:
5974 <
7637 < /* Line 1455 of yacc.c  */
7638 < #line 3429 "ircd_parser.y"
5973 >  case 555:
5974 > #line 2762 "conf_parser.y" /* yacc.c:1646  */
5975      {
5976 < #ifdef HAVE_LIBCRYPTO
7641 <  if (conf_parser_ctx.pass == 2)
7642 <  {
7643 <    struct EncCapability *ecap;
7644 <    const char *cipher_name;
7645 <    int found = 0;
7646 <
7647 <    ConfigFileEntry.default_cipher_preference = NULL;
7648 <    cipher_name = yylval.string;
7649 <
7650 <    for (ecap = CipherTable; ecap->name; ecap++)
7651 <    {
7652 <      if ((irccmp(ecap->name, cipher_name) == 0) &&
7653 <          (ecap->cap & CAP_ENC_MASK))
7654 <      {
7655 <        ConfigFileEntry.default_cipher_preference = ecap;
7656 <        found = 1;
7657 <        break;
7658 <      }
7659 <    }
7660 <
7661 <    if (!found)
7662 <      yyerror("Invalid cipher");
7663 <  }
7664 < #else
7665 <  if (conf_parser_ctx.pass == 2)
7666 <    yyerror("Ignoring default_cipher_preference -- no OpenSSL support");
7667 < #endif
5976 >  ConfigGeneral.max_targets = (yyvsp[-1].number);
5977   }
5978 + #line 5979 "conf_parser.c" /* yacc.c:1646  */
5979      break;
5980  
5981 <  case 602:
5982 <
7673 < /* Line 1455 of yacc.c  */
7674 < #line 3461 "ircd_parser.y"
7675 <    {
7676 <  if (conf_parser_ctx.pass == 2)
7677 <  {
7678 <    ConfigFileEntry.compression_level = (yyvsp[(3) - (4)].number);
7679 < #ifndef HAVE_LIBZ
7680 <    yyerror("Ignoring compression_level -- no zlib support");
7681 < #else
7682 <    if ((ConfigFileEntry.compression_level < 1) ||
7683 <        (ConfigFileEntry.compression_level > 9))
5981 >  case 556:
5982 > #line 2767 "conf_parser.y" /* yacc.c:1646  */
5983      {
5984 <      yyerror("Ignoring invalid compression_level, using default");
7686 <      ConfigFileEntry.compression_level = 0;
7687 <    }
7688 < #endif
7689 <  }
5984 >  ConfigGeneral.ping_cookie = yylval.number;
5985   }
5986 + #line 5987 "conf_parser.c" /* yacc.c:1646  */
5987      break;
5988  
5989 <  case 603:
5990 <
7695 < /* Line 1455 of yacc.c  */
7696 < #line 3479 "ircd_parser.y"
5989 >  case 557:
5990 > #line 2772 "conf_parser.y" /* yacc.c:1646  */
5991      {
5992 <  ConfigFileEntry.use_egd = yylval.number;
5992 >  ConfigGeneral.disable_auth = yylval.number;
5993   }
5994 + #line 5995 "conf_parser.c" /* yacc.c:1646  */
5995      break;
5996  
5997 <  case 604:
5998 <
7704 < /* Line 1455 of yacc.c  */
7705 < #line 3484 "ircd_parser.y"
5997 >  case 558:
5998 > #line 2777 "conf_parser.y" /* yacc.c:1646  */
5999      {
6000 <  if (conf_parser_ctx.pass == 2)
7708 <  {
7709 <    MyFree(ConfigFileEntry.egdpool_path);
7710 <    DupString(ConfigFileEntry.egdpool_path, yylval.string);
7711 <  }
6000 >  ConfigGeneral.throttle_count = (yyvsp[-1].number);
6001   }
6002 + #line 6003 "conf_parser.c" /* yacc.c:1646  */
6003      break;
6004  
6005 <  case 605:
6006 <
7717 < /* Line 1455 of yacc.c  */
7718 < #line 3493 "ircd_parser.y"
6005 >  case 559:
6006 > #line 2782 "conf_parser.y" /* yacc.c:1646  */
6007      {
6008 <  ConfigFileEntry.ping_cookie = yylval.number;
6008 >  ConfigGeneral.throttle_time = (yyvsp[-1].number);
6009   }
6010 + #line 6011 "conf_parser.c" /* yacc.c:1646  */
6011      break;
6012  
6013 <  case 606:
6014 <
7726 < /* Line 1455 of yacc.c  */
7727 < #line 3498 "ircd_parser.y"
6013 >  case 560:
6014 > #line 2787 "conf_parser.y" /* yacc.c:1646  */
6015      {
6016 <  ConfigFileEntry.disable_auth = yylval.number;
6016 >  ConfigGeneral.oper_umodes = 0;
6017   }
6018 + #line 6019 "conf_parser.c" /* yacc.c:1646  */
6019      break;
6020  
6021 <  case 607:
6022 <
7735 < /* Line 1455 of yacc.c  */
7736 < #line 3503 "ircd_parser.y"
6021 >  case 564:
6022 > #line 2793 "conf_parser.y" /* yacc.c:1646  */
6023      {
6024 <  ConfigFileEntry.throttle_time = yylval.number;
6024 >  ConfigGeneral.oper_umodes |= UMODE_BOTS;
6025   }
6026 + #line 6027 "conf_parser.c" /* yacc.c:1646  */
6027      break;
6028  
6029 <  case 608:
6030 <
7744 < /* Line 1455 of yacc.c  */
7745 < #line 3508 "ircd_parser.y"
6029 >  case 565:
6030 > #line 2796 "conf_parser.y" /* yacc.c:1646  */
6031      {
6032 <  ConfigFileEntry.oper_umodes = 0;
6032 >  ConfigGeneral.oper_umodes |= UMODE_CCONN;
6033   }
6034 + #line 6035 "conf_parser.c" /* yacc.c:1646  */
6035      break;
6036  
6037 <  case 612:
6038 <
7753 < /* Line 1455 of yacc.c  */
7754 < #line 3514 "ircd_parser.y"
6037 >  case 566:
6038 > #line 2799 "conf_parser.y" /* yacc.c:1646  */
6039      {
6040 <  ConfigFileEntry.oper_umodes |= UMODE_BOTS;
6040 >  ConfigGeneral.oper_umodes |= UMODE_DEAF;
6041   }
6042 + #line 6043 "conf_parser.c" /* yacc.c:1646  */
6043      break;
6044  
6045 <  case 613:
6046 <
7762 < /* Line 1455 of yacc.c  */
7763 < #line 3517 "ircd_parser.y"
6045 >  case 567:
6046 > #line 2802 "conf_parser.y" /* yacc.c:1646  */
6047      {
6048 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN;
6048 >  ConfigGeneral.oper_umodes |= UMODE_DEBUG;
6049   }
6050 + #line 6051 "conf_parser.c" /* yacc.c:1646  */
6051      break;
6052  
6053 <  case 614:
6054 <
7771 < /* Line 1455 of yacc.c  */
7772 < #line 3520 "ircd_parser.y"
6053 >  case 568:
6054 > #line 2805 "conf_parser.y" /* yacc.c:1646  */
6055      {
6056 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
6056 >  ConfigGeneral.oper_umodes |= UMODE_FULL;
6057   }
6058 + #line 6059 "conf_parser.c" /* yacc.c:1646  */
6059      break;
6060  
6061 <  case 615:
6062 <
7780 < /* Line 1455 of yacc.c  */
7781 < #line 3523 "ircd_parser.y"
6061 >  case 569:
6062 > #line 2808 "conf_parser.y" /* yacc.c:1646  */
6063      {
6064 <  ConfigFileEntry.oper_umodes |= UMODE_DEAF;
6064 >  ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
6065   }
6066 + #line 6067 "conf_parser.c" /* yacc.c:1646  */
6067      break;
6068  
6069 <  case 616:
6070 <
7789 < /* Line 1455 of yacc.c  */
7790 < #line 3526 "ircd_parser.y"
6069 >  case 570:
6070 > #line 2811 "conf_parser.y" /* yacc.c:1646  */
6071      {
6072 <  ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
6072 >  ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
6073   }
6074 + #line 6075 "conf_parser.c" /* yacc.c:1646  */
6075      break;
6076  
6077 <  case 617:
6078 <
7798 < /* Line 1455 of yacc.c  */
7799 < #line 3529 "ircd_parser.y"
6077 >  case 571:
6078 > #line 2814 "conf_parser.y" /* yacc.c:1646  */
6079      {
6080 <  ConfigFileEntry.oper_umodes |= UMODE_FULL;
6080 >  ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
6081   }
6082 + #line 6083 "conf_parser.c" /* yacc.c:1646  */
6083      break;
6084  
6085 <  case 618:
6086 <
7807 < /* Line 1455 of yacc.c  */
7808 < #line 3532 "ircd_parser.y"
6085 >  case 572:
6086 > #line 2817 "conf_parser.y" /* yacc.c:1646  */
6087      {
6088 <  ConfigFileEntry.oper_umodes |= UMODE_SKILL;
6088 >  ConfigGeneral.oper_umodes |= UMODE_SKILL;
6089   }
6090 + #line 6091 "conf_parser.c" /* yacc.c:1646  */
6091      break;
6092  
6093 <  case 619:
6094 <
7816 < /* Line 1455 of yacc.c  */
7817 < #line 3535 "ircd_parser.y"
6093 >  case 573:
6094 > #line 2820 "conf_parser.y" /* yacc.c:1646  */
6095      {
6096 <  ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
6096 >  ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
6097   }
6098 + #line 6099 "conf_parser.c" /* yacc.c:1646  */
6099      break;
6100  
6101 <  case 620:
6102 <
7825 < /* Line 1455 of yacc.c  */
7826 < #line 3538 "ircd_parser.y"
6101 >  case 574:
6102 > #line 2823 "conf_parser.y" /* yacc.c:1646  */
6103      {
6104 <  ConfigFileEntry.oper_umodes |= UMODE_REJ;
6104 >  ConfigGeneral.oper_umodes |= UMODE_REJ;
6105   }
6106 + #line 6107 "conf_parser.c" /* yacc.c:1646  */
6107      break;
6108  
6109 <  case 621:
6110 <
7834 < /* Line 1455 of yacc.c  */
7835 < #line 3541 "ircd_parser.y"
6109 >  case 575:
6110 > #line 2826 "conf_parser.y" /* yacc.c:1646  */
6111      {
6112 <  ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
6112 >  ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
6113   }
6114 + #line 6115 "conf_parser.c" /* yacc.c:1646  */
6115      break;
6116  
6117 <  case 622:
6118 <
7843 < /* Line 1455 of yacc.c  */
7844 < #line 3544 "ircd_parser.y"
6117 >  case 576:
6118 > #line 2829 "conf_parser.y" /* yacc.c:1646  */
6119      {
6120 <  ConfigFileEntry.oper_umodes |= UMODE_SPY;
6120 >  ConfigGeneral.oper_umodes |= UMODE_SPY;
6121   }
6122 + #line 6123 "conf_parser.c" /* yacc.c:1646  */
6123      break;
6124  
6125 <  case 623:
6126 <
7852 < /* Line 1455 of yacc.c  */
7853 < #line 3547 "ircd_parser.y"
6125 >  case 577:
6126 > #line 2832 "conf_parser.y" /* yacc.c:1646  */
6127      {
6128 <  ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
6128 >  ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
6129   }
6130 + #line 6131 "conf_parser.c" /* yacc.c:1646  */
6131      break;
6132  
6133 <  case 624:
6134 <
7861 < /* Line 1455 of yacc.c  */
7862 < #line 3550 "ircd_parser.y"
6133 >  case 578:
6134 > #line 2835 "conf_parser.y" /* yacc.c:1646  */
6135      {
6136 <  ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
6136 >  ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
6137   }
6138 + #line 6139 "conf_parser.c" /* yacc.c:1646  */
6139      break;
6140  
6141 <  case 625:
6142 <
7870 < /* Line 1455 of yacc.c  */
7871 < #line 3553 "ircd_parser.y"
6141 >  case 579:
6142 > #line 2838 "conf_parser.y" /* yacc.c:1646  */
6143      {
6144 <  ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
6144 >  ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
6145   }
6146 + #line 6147 "conf_parser.c" /* yacc.c:1646  */
6147      break;
6148  
6149 <  case 626:
6150 <
7879 < /* Line 1455 of yacc.c  */
7880 < #line 3556 "ircd_parser.y"
6149 >  case 580:
6150 > #line 2841 "conf_parser.y" /* yacc.c:1646  */
6151      {
6152 <  ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
6152 >  ConfigGeneral.oper_umodes |= UMODE_WALLOP;
6153   }
6154 + #line 6155 "conf_parser.c" /* yacc.c:1646  */
6155      break;
6156  
6157 <  case 627:
6158 <
7888 < /* Line 1455 of yacc.c  */
7889 < #line 3559 "ircd_parser.y"
6157 >  case 581:
6158 > #line 2844 "conf_parser.y" /* yacc.c:1646  */
6159      {
6160 <  ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
6160 >  ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
6161   }
6162 + #line 6163 "conf_parser.c" /* yacc.c:1646  */
6163      break;
6164  
6165 <  case 628:
6166 <
7897 < /* Line 1455 of yacc.c  */
7898 < #line 3562 "ircd_parser.y"
6165 >  case 582:
6166 > #line 2847 "conf_parser.y" /* yacc.c:1646  */
6167      {
6168 <  ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
6168 >  ConfigGeneral.oper_umodes |= UMODE_CALLERID;
6169   }
6170 + #line 6171 "conf_parser.c" /* yacc.c:1646  */
6171      break;
6172  
6173 <  case 629:
6174 <
7906 < /* Line 1455 of yacc.c  */
7907 < #line 3565 "ircd_parser.y"
6173 >  case 583:
6174 > #line 2850 "conf_parser.y" /* yacc.c:1646  */
6175      {
6176 <  ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
6176 >  ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
6177   }
6178 + #line 6179 "conf_parser.c" /* yacc.c:1646  */
6179      break;
6180  
6181 <  case 630:
6182 <
7915 < /* Line 1455 of yacc.c  */
7916 < #line 3568 "ircd_parser.y"
6181 >  case 584:
6182 > #line 2853 "conf_parser.y" /* yacc.c:1646  */
6183      {
6184 <  ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
6184 >  ConfigGeneral.oper_umodes |= UMODE_REGONLY;
6185   }
6186 + #line 6187 "conf_parser.c" /* yacc.c:1646  */
6187      break;
6188  
6189 <  case 631:
6190 <
7924 < /* Line 1455 of yacc.c  */
7925 < #line 3573 "ircd_parser.y"
6189 >  case 585:
6190 > #line 2856 "conf_parser.y" /* yacc.c:1646  */
6191      {
6192 <  ConfigFileEntry.oper_only_umodes = 0;
6192 >  ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
6193   }
6194 + #line 6195 "conf_parser.c" /* yacc.c:1646  */
6195      break;
6196  
6197 <  case 635:
6198 <
7933 < /* Line 1455 of yacc.c  */
7934 < #line 3579 "ircd_parser.y"
6197 >  case 586:
6198 > #line 2861 "conf_parser.y" /* yacc.c:1646  */
6199      {
6200 <  ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
6200 >  ConfigGeneral.oper_only_umodes = 0;
6201   }
6202 + #line 6203 "conf_parser.c" /* yacc.c:1646  */
6203      break;
6204  
6205 <  case 636:
6206 <
7942 < /* Line 1455 of yacc.c  */
7943 < #line 3582 "ircd_parser.y"
6205 >  case 590:
6206 > #line 2867 "conf_parser.y" /* yacc.c:1646  */
6207      {
6208 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
6208 >  ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
6209   }
6210 + #line 6211 "conf_parser.c" /* yacc.c:1646  */
6211      break;
6212  
6213 <  case 637:
6214 <
7951 < /* Line 1455 of yacc.c  */
7952 < #line 3585 "ircd_parser.y"
6213 >  case 591:
6214 > #line 2870 "conf_parser.y" /* yacc.c:1646  */
6215      {
6216 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
6216 >  ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
6217   }
6218 + #line 6219 "conf_parser.c" /* yacc.c:1646  */
6219      break;
6220  
6221 <  case 638:
6222 <
7960 < /* Line 1455 of yacc.c  */
7961 < #line 3588 "ircd_parser.y"
6221 >  case 592:
6222 > #line 2873 "conf_parser.y" /* yacc.c:1646  */
6223      {
6224 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
6224 >  ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
6225   }
6226 + #line 6227 "conf_parser.c" /* yacc.c:1646  */
6227      break;
6228  
6229 <  case 639:
6230 <
7969 < /* Line 1455 of yacc.c  */
7970 < #line 3591 "ircd_parser.y"
6229 >  case 593:
6230 > #line 2876 "conf_parser.y" /* yacc.c:1646  */
6231      {
6232 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
6232 >  ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
6233   }
6234 + #line 6235 "conf_parser.c" /* yacc.c:1646  */
6235      break;
6236  
6237 <  case 640:
6238 <
7978 < /* Line 1455 of yacc.c  */
7979 < #line 3594 "ircd_parser.y"
7980 <    {
7981 <  ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
7982 < }
7983 <    break;
7984 <
7985 <  case 641:
7986 <
7987 < /* Line 1455 of yacc.c  */
7988 < #line 3597 "ircd_parser.y"
6237 >  case 594:
6238 > #line 2879 "conf_parser.y" /* yacc.c:1646  */
6239      {
6240 <  ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
6240 >  ConfigGeneral.oper_only_umodes |= UMODE_FULL;
6241   }
6242 + #line 6243 "conf_parser.c" /* yacc.c:1646  */
6243      break;
6244  
6245 <  case 642:
6246 <
7996 < /* Line 1455 of yacc.c  */
7997 < #line 3600 "ircd_parser.y"
6245 >  case 595:
6246 > #line 2882 "conf_parser.y" /* yacc.c:1646  */
6247      {
6248 <  ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
6248 >  ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
6249   }
6250 + #line 6251 "conf_parser.c" /* yacc.c:1646  */
6251      break;
6252  
6253 <  case 643:
6254 <
8005 < /* Line 1455 of yacc.c  */
8006 < #line 3603 "ircd_parser.y"
6253 >  case 596:
6254 > #line 2885 "conf_parser.y" /* yacc.c:1646  */
6255      {
6256 <  ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
6256 >  ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
6257   }
6258 + #line 6259 "conf_parser.c" /* yacc.c:1646  */
6259      break;
6260  
6261 <  case 644:
6262 <
8014 < /* Line 1455 of yacc.c  */
8015 < #line 3606 "ircd_parser.y"
6261 >  case 597:
6262 > #line 2888 "conf_parser.y" /* yacc.c:1646  */
6263      {
6264 <  ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
6264 >  ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
6265   }
6266 + #line 6267 "conf_parser.c" /* yacc.c:1646  */
6267      break;
6268  
6269 <  case 645:
6270 <
8023 < /* Line 1455 of yacc.c  */
8024 < #line 3609 "ircd_parser.y"
6269 >  case 598:
6270 > #line 2891 "conf_parser.y" /* yacc.c:1646  */
6271      {
6272 <  ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
6272 >  ConfigGeneral.oper_only_umodes |= UMODE_REJ;
6273   }
6274 + #line 6275 "conf_parser.c" /* yacc.c:1646  */
6275      break;
6276  
6277 <  case 646:
6278 <
8032 < /* Line 1455 of yacc.c  */
8033 < #line 3612 "ircd_parser.y"
6277 >  case 599:
6278 > #line 2894 "conf_parser.y" /* yacc.c:1646  */
6279      {
6280 <  ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
6280 >  ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
6281   }
6282 + #line 6283 "conf_parser.c" /* yacc.c:1646  */
6283      break;
6284  
6285 <  case 647:
6286 <
8041 < /* Line 1455 of yacc.c  */
8042 < #line 3615 "ircd_parser.y"
6285 >  case 600:
6286 > #line 2897 "conf_parser.y" /* yacc.c:1646  */
6287      {
6288 <  ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
6288 >  ConfigGeneral.oper_only_umodes |= UMODE_SPY;
6289   }
6290 + #line 6291 "conf_parser.c" /* yacc.c:1646  */
6291      break;
6292  
6293 <  case 648:
6294 <
8050 < /* Line 1455 of yacc.c  */
8051 < #line 3618 "ircd_parser.y"
6293 >  case 601:
6294 > #line 2900 "conf_parser.y" /* yacc.c:1646  */
6295      {
6296 <  ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
6296 >  ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
6297   }
6298 + #line 6299 "conf_parser.c" /* yacc.c:1646  */
6299      break;
6300  
6301 <  case 649:
6302 <
8059 < /* Line 1455 of yacc.c  */
8060 < #line 3621 "ircd_parser.y"
6301 >  case 602:
6302 > #line 2903 "conf_parser.y" /* yacc.c:1646  */
6303      {
6304 <  ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
6304 >  ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
6305   }
6306 + #line 6307 "conf_parser.c" /* yacc.c:1646  */
6307      break;
6308  
6309 <  case 650:
6310 <
8068 < /* Line 1455 of yacc.c  */
8069 < #line 3624 "ircd_parser.y"
6309 >  case 603:
6310 > #line 2906 "conf_parser.y" /* yacc.c:1646  */
6311      {
6312 <  ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
6312 >  ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
6313   }
6314 + #line 6315 "conf_parser.c" /* yacc.c:1646  */
6315      break;
6316  
6317 <  case 651:
6318 <
8077 < /* Line 1455 of yacc.c  */
8078 < #line 3627 "ircd_parser.y"
6317 >  case 604:
6318 > #line 2909 "conf_parser.y" /* yacc.c:1646  */
6319      {
6320 <  ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
6320 >  ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
6321   }
6322 + #line 6323 "conf_parser.c" /* yacc.c:1646  */
6323      break;
6324  
6325 <  case 652:
6326 <
8086 < /* Line 1455 of yacc.c  */
8087 < #line 3630 "ircd_parser.y"
6325 >  case 605:
6326 > #line 2912 "conf_parser.y" /* yacc.c:1646  */
6327      {
6328 <  ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
6328 >  ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
6329   }
6330 + #line 6331 "conf_parser.c" /* yacc.c:1646  */
6331      break;
6332  
6333 <  case 653:
6334 <
8095 < /* Line 1455 of yacc.c  */
8096 < #line 3633 "ircd_parser.y"
6333 >  case 606:
6334 > #line 2915 "conf_parser.y" /* yacc.c:1646  */
6335      {
6336 <  ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
6336 >  ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
6337   }
6338 + #line 6339 "conf_parser.c" /* yacc.c:1646  */
6339      break;
6340  
6341 <  case 654:
6342 <
8104 < /* Line 1455 of yacc.c  */
8105 < #line 3638 "ircd_parser.y"
6341 >  case 607:
6342 > #line 2918 "conf_parser.y" /* yacc.c:1646  */
6343      {
6344 <  ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number);
6344 >  ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
6345   }
6346 + #line 6347 "conf_parser.c" /* yacc.c:1646  */
6347      break;
6348  
6349 <  case 655:
6350 <
8113 < /* Line 1455 of yacc.c  */
8114 < #line 3643 "ircd_parser.y"
6349 >  case 608:
6350 > #line 2921 "conf_parser.y" /* yacc.c:1646  */
6351      {
6352 <  ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number);
6352 >  ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
6353   }
6354 + #line 6355 "conf_parser.c" /* yacc.c:1646  */
6355      break;
6356  
6357 <  case 656:
6358 <
8122 < /* Line 1455 of yacc.c  */
8123 < #line 3648 "ircd_parser.y"
6357 >  case 609:
6358 > #line 2924 "conf_parser.y" /* yacc.c:1646  */
6359      {
6360 <  ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number);
6360 >  ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
6361   }
6362 + #line 6363 "conf_parser.c" /* yacc.c:1646  */
6363      break;
6364  
6365 <  case 657:
6366 <
8131 < /* Line 1455 of yacc.c  */
8132 < #line 3653 "ircd_parser.y"
6365 >  case 610:
6366 > #line 2929 "conf_parser.y" /* yacc.c:1646  */
6367      {
6368 <  ConfigFileEntry.client_flood = (yyvsp[(3) - (4)].number);
6368 >  ConfigGeneral.min_nonwildcard = (yyvsp[-1].number);
6369   }
6370 + #line 6371 "conf_parser.c" /* yacc.c:1646  */
6371      break;
6372  
6373 <  case 658:
6374 <
8140 < /* Line 1455 of yacc.c  */
8141 < #line 3658 "ircd_parser.y"
6373 >  case 611:
6374 > #line 2934 "conf_parser.y" /* yacc.c:1646  */
6375      {
6376 <  ConfigFileEntry.dot_in_ip6_addr = yylval.number;
6376 >  ConfigGeneral.min_nonwildcard_simple = (yyvsp[-1].number);
6377   }
6378 + #line 6379 "conf_parser.c" /* yacc.c:1646  */
6379      break;
6380  
6381 <  case 659:
6382 <
8149 < /* Line 1455 of yacc.c  */
8150 < #line 3666 "ircd_parser.y"
6381 >  case 612:
6382 > #line 2939 "conf_parser.y" /* yacc.c:1646  */
6383      {
6384 <  if (conf_parser_ctx.pass == 2)
8153 <  {
8154 <    yy_conf = make_conf_item(GDENY_TYPE);
8155 <    yy_aconf = map_to_conf(yy_conf);
8156 <  }
6384 >  ConfigGeneral.default_floodcount = (yyvsp[-1].number);
6385   }
6386 + #line 6387 "conf_parser.c" /* yacc.c:1646  */
6387      break;
6388  
6389 <  case 660:
6390 <
8162 < /* Line 1455 of yacc.c  */
8163 < #line 3673 "ircd_parser.y"
8164 <    {
8165 <  if (conf_parser_ctx.pass == 2)
8166 <  {
8167 <    /*
8168 <     * since we re-allocate yy_conf/yy_aconf after the end of action=, at the
8169 <     * end we will have one extra, so we should free it.
8170 <     */
8171 <    if (yy_conf->name == NULL || yy_aconf->user == NULL)
6389 >  case 627:
6390 > #line 2964 "conf_parser.y" /* yacc.c:1646  */
6391      {
6392 <      delete_conf_item(yy_conf);
8174 <      yy_conf = NULL;
8175 <      yy_aconf = NULL;
8176 <    }
8177 <  }
6392 >  ConfigChannel.disable_fake_channels = yylval.number;
6393   }
6394 + #line 6395 "conf_parser.c" /* yacc.c:1646  */
6395      break;
6396  
6397 <  case 670:
6398 <
8183 < /* Line 1455 of yacc.c  */
8184 < #line 3699 "ircd_parser.y"
6397 >  case 628:
6398 > #line 2969 "conf_parser.y" /* yacc.c:1646  */
6399      {
6400 <  if (conf_parser_ctx.pass == 2)
8187 <    ConfigFileEntry.glines = yylval.number;
6400 >  ConfigChannel.invite_client_count = (yyvsp[-1].number);
6401   }
6402 + #line 6403 "conf_parser.c" /* yacc.c:1646  */
6403      break;
6404  
6405 <  case 671:
6406 <
8193 < /* Line 1455 of yacc.c  */
8194 < #line 3705 "ircd_parser.y"
6405 >  case 629:
6406 > #line 2974 "conf_parser.y" /* yacc.c:1646  */
6407      {
6408 <  if (conf_parser_ctx.pass == 2)
8197 <    ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number);
6408 >  ConfigChannel.invite_client_time = (yyvsp[-1].number);
6409   }
6410 + #line 6411 "conf_parser.c" /* yacc.c:1646  */
6411      break;
6412  
6413 <  case 672:
6414 <
8203 < /* Line 1455 of yacc.c  */
8204 < #line 3711 "ircd_parser.y"
6413 >  case 630:
6414 > #line 2979 "conf_parser.y" /* yacc.c:1646  */
6415      {
6416 <  if (conf_parser_ctx.pass == 2)
8207 <    ConfigFileEntry.gline_logging = 0;
6416 >  ConfigChannel.knock_client_count = (yyvsp[-1].number);
6417   }
6418 + #line 6419 "conf_parser.c" /* yacc.c:1646  */
6419      break;
6420  
6421 <  case 676:
6422 <
8213 < /* Line 1455 of yacc.c  */
8214 < #line 3717 "ircd_parser.y"
6421 >  case 631:
6422 > #line 2984 "conf_parser.y" /* yacc.c:1646  */
6423      {
6424 <  if (conf_parser_ctx.pass == 2)
8217 <    ConfigFileEntry.gline_logging |= GDENY_REJECT;
6424 >  ConfigChannel.knock_client_time = (yyvsp[-1].number);
6425   }
6426 + #line 6427 "conf_parser.c" /* yacc.c:1646  */
6427      break;
6428  
6429 <  case 677:
6430 <
8223 < /* Line 1455 of yacc.c  */
8224 < #line 3721 "ircd_parser.y"
6429 >  case 632:
6430 > #line 2989 "conf_parser.y" /* yacc.c:1646  */
6431      {
6432 <  if (conf_parser_ctx.pass == 2)
8227 <    ConfigFileEntry.gline_logging |= GDENY_BLOCK;
6432 >  ConfigChannel.knock_delay_channel = (yyvsp[-1].number);
6433   }
6434 + #line 6435 "conf_parser.c" /* yacc.c:1646  */
6435      break;
6436  
6437 <  case 678:
6438 <
8233 < /* Line 1455 of yacc.c  */
8234 < #line 3727 "ircd_parser.y"
8235 <    {
8236 <  if (conf_parser_ctx.pass == 2)
8237 <  {
8238 <    struct split_nuh_item nuh;
8239 <
8240 <    nuh.nuhmask  = yylval.string;
8241 <    nuh.nickptr  = NULL;
8242 <    nuh.userptr  = userbuf;
8243 <    nuh.hostptr  = hostbuf;
8244 <
8245 <    nuh.nicksize = 0;
8246 <    nuh.usersize = sizeof(userbuf);
8247 <    nuh.hostsize = sizeof(hostbuf);
8248 <
8249 <    split_nuh(&nuh);
8250 <
8251 <    if (yy_aconf->user == NULL)
8252 <    {
8253 <      DupString(yy_aconf->user, userbuf);
8254 <      DupString(yy_aconf->host, hostbuf);
8255 <    }
8256 <    else
6437 >  case 633:
6438 > #line 2994 "conf_parser.y" /* yacc.c:1646  */
6439      {
6440 <      struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
8259 <
8260 <      DupString(yy_tmp->user, userbuf);
8261 <      DupString(yy_tmp->host, hostbuf);
8262 <
8263 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
8264 <    }
8265 <  }
6440 >  ConfigChannel.max_channels = (yyvsp[-1].number);
6441   }
6442 + #line 6443 "conf_parser.c" /* yacc.c:1646  */
6443      break;
6444  
6445 <  case 679:
6446 <
8271 < /* Line 1455 of yacc.c  */
8272 < #line 3761 "ircd_parser.y"
6445 >  case 634:
6446 > #line 2999 "conf_parser.y" /* yacc.c:1646  */
6447      {
6448 <  if (conf_parser_ctx.pass == 2)  
8275 <  {
8276 <    MyFree(yy_conf->name);
8277 <    DupString(yy_conf->name, yylval.string);
8278 <  }
6448 >  ConfigChannel.max_bans = (yyvsp[-1].number);
6449   }
6450 + #line 6451 "conf_parser.c" /* yacc.c:1646  */
6451      break;
6452  
6453 <  case 680:
6454 <
8284 < /* Line 1455 of yacc.c  */
8285 < #line 3770 "ircd_parser.y"
6453 >  case 635:
6454 > #line 3004 "conf_parser.y" /* yacc.c:1646  */
6455      {
6456 <  if (conf_parser_ctx.pass == 2)
8288 <    yy_aconf->flags = 0;
6456 >  ConfigChannel.default_join_flood_count = yylval.number;
6457   }
6458 + #line 6459 "conf_parser.c" /* yacc.c:1646  */
6459      break;
6460  
6461 <  case 681:
6462 <
8294 < /* Line 1455 of yacc.c  */
8295 < #line 3774 "ircd_parser.y"
8296 <    {
8297 <  if (conf_parser_ctx.pass == 2)
8298 <  {
8299 <    struct CollectItem *yy_tmp = NULL;
8300 <    dlink_node *ptr, *next_ptr;
8301 <
8302 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
6461 >  case 636:
6462 > #line 3009 "conf_parser.y" /* yacc.c:1646  */
6463      {
6464 <      struct AccessItem *new_aconf;
8305 <      struct ConfItem *new_conf;
8306 <
8307 <      yy_tmp = ptr->data;
8308 <      new_conf = make_conf_item(GDENY_TYPE);
8309 <      new_aconf = map_to_conf(new_conf);
8310 <
8311 <      new_aconf->flags = yy_aconf->flags;
8312 <
8313 <      if (yy_conf->name != NULL)
8314 <        DupString(new_conf->name, yy_conf->name);
8315 <      else
8316 <        DupString(new_conf->name, "*");
8317 <      if (yy_aconf->user != NULL)
8318 <         DupString(new_aconf->user, yy_tmp->user);
8319 <      else  
8320 <        DupString(new_aconf->user, "*");
8321 <      if (yy_aconf->host != NULL)
8322 <        DupString(new_aconf->host, yy_tmp->host);
8323 <      else
8324 <        DupString(new_aconf->host, "*");
8325 <
8326 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
8327 <    }
8328 <
8329 <    /*
8330 <     * In case someone has fed us with more than one action= after user/name
8331 <     * which would leak memory  -Michael
8332 <     */
8333 <    if (yy_conf->name == NULL || yy_aconf->user == NULL)
8334 <      delete_conf_item(yy_conf);
8335 <
8336 <    yy_conf = make_conf_item(GDENY_TYPE);
8337 <    yy_aconf = map_to_conf(yy_conf);
8338 <  }
6464 >  ConfigChannel.default_join_flood_time = (yyvsp[-1].number);
6465   }
6466 + #line 6467 "conf_parser.c" /* yacc.c:1646  */
6467      break;
6468  
6469 <  case 684:
6470 <
8344 < /* Line 1455 of yacc.c  */
8345 < #line 3821 "ircd_parser.y"
6469 >  case 649:
6470 > #line 3031 "conf_parser.y" /* yacc.c:1646  */
6471      {
6472    if (conf_parser_ctx.pass == 2)
6473 <    yy_aconf->flags |= GDENY_REJECT;
6473 >    ConfigServerHide.flatten_links = yylval.number;
6474   }
6475 + #line 6476 "conf_parser.c" /* yacc.c:1646  */
6476      break;
6477  
6478 <  case 685:
6479 <
8354 < /* Line 1455 of yacc.c  */
8355 < #line 3825 "ircd_parser.y"
6478 >  case 650:
6479 > #line 3037 "conf_parser.y" /* yacc.c:1646  */
6480      {
6481    if (conf_parser_ctx.pass == 2)
6482 <    yy_aconf->flags |= GDENY_BLOCK;
6482 >    ConfigServerHide.disable_remote_commands = yylval.number;
6483   }
6484 + #line 6485 "conf_parser.c" /* yacc.c:1646  */
6485      break;
6486  
6487 <  case 708:
6488 <
8364 < /* Line 1455 of yacc.c  */
8365 < #line 3849 "ircd_parser.y"
8366 <    {
8367 <  ConfigChannel.disable_fake_channels = yylval.number;
8368 < }
8369 <    break;
8370 <
8371 <  case 709:
8372 <
8373 < /* Line 1455 of yacc.c  */
8374 < #line 3854 "ircd_parser.y"
8375 <    {
8376 <  ConfigChannel.restrict_channels = yylval.number;
8377 < }
8378 <    break;
8379 <
8380 <  case 710:
8381 <
8382 < /* Line 1455 of yacc.c  */
8383 < #line 3859 "ircd_parser.y"
8384 <    {
8385 <  ConfigChannel.disable_local_channels = yylval.number;
8386 < }
8387 <    break;
8388 <
8389 <  case 711:
8390 <
8391 < /* Line 1455 of yacc.c  */
8392 < #line 3864 "ircd_parser.y"
8393 <    {
8394 <  ConfigChannel.use_except = yylval.number;
8395 < }
8396 <    break;
8397 <
8398 <  case 712:
8399 <
8400 < /* Line 1455 of yacc.c  */
8401 < #line 3869 "ircd_parser.y"
8402 <    {
8403 <  ConfigChannel.use_invex = yylval.number;
8404 < }
8405 <    break;
8406 <
8407 <  case 713:
8408 <
8409 < /* Line 1455 of yacc.c  */
8410 < #line 3874 "ircd_parser.y"
8411 <    {
8412 <  ConfigChannel.use_knock = yylval.number;
8413 < }
8414 <    break;
8415 <
8416 <  case 714:
8417 <
8418 < /* Line 1455 of yacc.c  */
8419 < #line 3879 "ircd_parser.y"
8420 <    {
8421 <  ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number);
8422 < }
8423 <    break;
8424 <
8425 <  case 715:
8426 <
8427 < /* Line 1455 of yacc.c  */
8428 < #line 3884 "ircd_parser.y"
8429 <    {
8430 <  ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number);
8431 < }
8432 <    break;
8433 <
8434 <  case 716:
8435 <
8436 < /* Line 1455 of yacc.c  */
8437 < #line 3889 "ircd_parser.y"
8438 <    {
8439 <  ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number);
8440 < }
8441 <    break;
8442 <
8443 <  case 717:
8444 <
8445 < /* Line 1455 of yacc.c  */
8446 < #line 3894 "ircd_parser.y"
8447 <    {
8448 <  ConfigChannel.quiet_on_ban = yylval.number;
8449 < }
8450 <    break;
8451 <
8452 <  case 718:
8453 <
8454 < /* Line 1455 of yacc.c  */
8455 < #line 3899 "ircd_parser.y"
8456 <    {
8457 <  ConfigChannel.max_bans = (yyvsp[(3) - (4)].number);
8458 < }
8459 <    break;
8460 <
8461 <  case 719:
8462 <
8463 < /* Line 1455 of yacc.c  */
8464 < #line 3904 "ircd_parser.y"
8465 <    {
8466 <  ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number);
8467 < }
8468 <    break;
8469 <
8470 <  case 720:
8471 <
8472 < /* Line 1455 of yacc.c  */
8473 < #line 3909 "ircd_parser.y"
8474 <    {
8475 <  ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number);
8476 < }
8477 <    break;
8478 <
8479 <  case 721:
8480 <
8481 < /* Line 1455 of yacc.c  */
8482 < #line 3914 "ircd_parser.y"
8483 <    {
8484 <  ConfigChannel.no_create_on_split = yylval.number;
8485 < }
8486 <    break;
8487 <
8488 <  case 722:
8489 <
8490 < /* Line 1455 of yacc.c  */
8491 < #line 3919 "ircd_parser.y"
8492 <    {
8493 <  ConfigChannel.no_join_on_split = yylval.number;
8494 < }
8495 <    break;
8496 <
8497 <  case 723:
8498 <
8499 < /* Line 1455 of yacc.c  */
8500 < #line 3924 "ircd_parser.y"
8501 <    {
8502 <  ConfigChannel.burst_topicwho = yylval.number;
8503 < }
8504 <    break;
8505 <
8506 <  case 724:
8507 <
8508 < /* Line 1455 of yacc.c  */
8509 < #line 3929 "ircd_parser.y"
8510 <    {
8511 <  GlobalSetOptions.joinfloodcount = yylval.number;
8512 < }
8513 <    break;
8514 <
8515 <  case 725:
8516 <
8517 < /* Line 1455 of yacc.c  */
8518 < #line 3934 "ircd_parser.y"
8519 <    {
8520 <  GlobalSetOptions.joinfloodtime = yylval.number;
8521 < }
8522 <    break;
8523 <
8524 <  case 737:
8525 <
8526 < /* Line 1455 of yacc.c  */
8527 < #line 3953 "ircd_parser.y"
6487 >  case 651:
6488 > #line 3043 "conf_parser.y" /* yacc.c:1646  */
6489      {
6490    if (conf_parser_ctx.pass == 2)
6491 <    ConfigServerHide.flatten_links = yylval.number;
6491 >    ConfigServerHide.hide_servers = yylval.number;
6492   }
6493 + #line 6494 "conf_parser.c" /* yacc.c:1646  */
6494      break;
6495  
6496 <  case 738:
6497 <
8536 < /* Line 1455 of yacc.c  */
8537 < #line 3959 "ircd_parser.y"
6496 >  case 652:
6497 > #line 3049 "conf_parser.y" /* yacc.c:1646  */
6498      {
6499    if (conf_parser_ctx.pass == 2)
6500 <    ConfigServerHide.hide_servers = yylval.number;
6500 >    ConfigServerHide.hide_services = yylval.number;
6501   }
6502 + #line 6503 "conf_parser.c" /* yacc.c:1646  */
6503      break;
6504  
6505 <  case 739:
6506 <
8546 < /* Line 1455 of yacc.c  */
8547 < #line 3965 "ircd_parser.y"
6505 >  case 653:
6506 > #line 3055 "conf_parser.y" /* yacc.c:1646  */
6507      {
6508    if (conf_parser_ctx.pass == 2)
6509    {
6510      MyFree(ConfigServerHide.hidden_name);
6511 <    DupString(ConfigServerHide.hidden_name, yylval.string);
6511 >    ConfigServerHide.hidden_name = xstrdup(yylval.string);
6512    }
6513   }
6514 + #line 6515 "conf_parser.c" /* yacc.c:1646  */
6515      break;
6516  
6517 <  case 740:
6518 <
8559 < /* Line 1455 of yacc.c  */
8560 < #line 3974 "ircd_parser.y"
6517 >  case 654:
6518 > #line 3064 "conf_parser.y" /* yacc.c:1646  */
6519      {
6520    if (conf_parser_ctx.pass == 2)
6521    {
6522 <    if (((yyvsp[(3) - (4)].number) > 0) && ConfigServerHide.links_disabled == 1)
6522 >    if (((yyvsp[-1].number) > 0) && ConfigServerHide.links_disabled == 1)
6523      {
6524 <      eventAddIsh("write_links_file", write_links_file, NULL, (yyvsp[(3) - (4)].number));
6524 >      event_write_links_file.when = (yyvsp[-1].number);
6525 >      event_addish(&event_write_links_file, NULL);
6526        ConfigServerHide.links_disabled = 0;
6527      }
6528  
6529 <    ConfigServerHide.links_delay = (yyvsp[(3) - (4)].number);
6529 >    ConfigServerHide.links_delay = (yyvsp[-1].number);
6530    }
6531   }
6532 + #line 6533 "conf_parser.c" /* yacc.c:1646  */
6533      break;
6534  
6535 <  case 741:
6536 <
8577 < /* Line 1455 of yacc.c  */
8578 < #line 3988 "ircd_parser.y"
6535 >  case 655:
6536 > #line 3079 "conf_parser.y" /* yacc.c:1646  */
6537      {
6538    if (conf_parser_ctx.pass == 2)
6539      ConfigServerHide.hidden = yylval.number;
6540   }
6541 + #line 6542 "conf_parser.c" /* yacc.c:1646  */
6542      break;
6543  
6544 <  case 742:
6545 <
8587 < /* Line 1455 of yacc.c  */
8588 < #line 3994 "ircd_parser.y"
8589 <    {
8590 <  if (conf_parser_ctx.pass == 2)
8591 <    ConfigServerHide.disable_hidden = yylval.number;
8592 < }
8593 <    break;
8594 <
8595 <  case 743:
8596 <
8597 < /* Line 1455 of yacc.c  */
8598 < #line 4000 "ircd_parser.y"
6544 >  case 656:
6545 > #line 3085 "conf_parser.y" /* yacc.c:1646  */
6546      {
6547    if (conf_parser_ctx.pass == 2)
6548      ConfigServerHide.hide_server_ips = yylval.number;
6549   }
6550 + #line 6551 "conf_parser.c" /* yacc.c:1646  */
6551      break;
6552  
6553  
6554 <
8607 < /* Line 1455 of yacc.c  */
8608 < #line 8609 "ircd_parser.c"
6554 > #line 6555 "conf_parser.c" /* yacc.c:1646  */
6555        default: break;
6556      }
6557 +  /* User semantic actions sometimes alter yychar, and that requires
6558 +     that yytoken be updated with the new translation.  We take the
6559 +     approach of translating immediately before every use of yytoken.
6560 +     One alternative is translating here after every semantic action,
6561 +     but that translation would be missed if the semantic action invokes
6562 +     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
6563 +     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
6564 +     incorrect destructor might then be invoked immediately.  In the
6565 +     case of YYERROR or YYBACKUP, subsequent parser actions might lead
6566 +     to an incorrect destructor call or verbose syntax error message
6567 +     before the lookahead is translated.  */
6568    YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
6569  
6570    YYPOPSTACK (yylen);
# Line 8616 | Line 6573 | yyreduce:
6573  
6574    *++yyvsp = yyval;
6575  
6576 <  /* Now `shift' the result of the reduction.  Determine what state
6576 >  /* Now 'shift' the result of the reduction.  Determine what state
6577       that goes to, based on the state we popped back to and the rule
6578       number reduced by.  */
6579  
# Line 8631 | Line 6588 | yyreduce:
6588    goto yynewstate;
6589  
6590  
6591 < /*------------------------------------.
6592 < | yyerrlab -- here on detecting error |
6593 < `------------------------------------*/
6591 > /*--------------------------------------.
6592 > | yyerrlab -- here on detecting error.  |
6593 > `--------------------------------------*/
6594   yyerrlab:
6595 +  /* Make sure we have latest lookahead translation.  See comments at
6596 +     user semantic actions for why this is necessary.  */
6597 +  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
6598 +
6599    /* If not already recovering from an error, report this error.  */
6600    if (!yyerrstatus)
6601      {
# Line 8642 | Line 6603 | yyerrlab:
6603   #if ! YYERROR_VERBOSE
6604        yyerror (YY_("syntax error"));
6605   #else
6606 + # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
6607 +                                        yyssp, yytoken)
6608        {
6609 <        YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
6610 <        if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
6611 <          {
6612 <            YYSIZE_T yyalloc = 2 * yysize;
6613 <            if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
6614 <              yyalloc = YYSTACK_ALLOC_MAXIMUM;
6615 <            if (yymsg != yymsgbuf)
6616 <              YYSTACK_FREE (yymsg);
6617 <            yymsg = (char *) YYSTACK_ALLOC (yyalloc);
6618 <            if (yymsg)
6619 <              yymsg_alloc = yyalloc;
6620 <            else
6621 <              {
6622 <                yymsg = yymsgbuf;
6623 <                yymsg_alloc = sizeof yymsgbuf;
6624 <              }
6625 <          }
6626 <
6627 <        if (0 < yysize && yysize <= yymsg_alloc)
6628 <          {
6629 <            (void) yysyntax_error (yymsg, yystate, yychar);
6630 <            yyerror (yymsg);
6631 <          }
6632 <        else
6633 <          {
8671 <            yyerror (YY_("syntax error"));
8672 <            if (yysize != 0)
8673 <              goto yyexhaustedlab;
8674 <          }
6609 >        char const *yymsgp = YY_("syntax error");
6610 >        int yysyntax_error_status;
6611 >        yysyntax_error_status = YYSYNTAX_ERROR;
6612 >        if (yysyntax_error_status == 0)
6613 >          yymsgp = yymsg;
6614 >        else if (yysyntax_error_status == 1)
6615 >          {
6616 >            if (yymsg != yymsgbuf)
6617 >              YYSTACK_FREE (yymsg);
6618 >            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
6619 >            if (!yymsg)
6620 >              {
6621 >                yymsg = yymsgbuf;
6622 >                yymsg_alloc = sizeof yymsgbuf;
6623 >                yysyntax_error_status = 2;
6624 >              }
6625 >            else
6626 >              {
6627 >                yysyntax_error_status = YYSYNTAX_ERROR;
6628 >                yymsgp = yymsg;
6629 >              }
6630 >          }
6631 >        yyerror (yymsgp);
6632 >        if (yysyntax_error_status == 2)
6633 >          goto yyexhaustedlab;
6634        }
6635 + # undef YYSYNTAX_ERROR
6636   #endif
6637      }
6638  
# Line 8681 | Line 6641 | yyerrlab:
6641    if (yyerrstatus == 3)
6642      {
6643        /* If just tried and failed to reuse lookahead token after an
6644 <         error, discard it.  */
6644 >         error, discard it.  */
6645  
6646        if (yychar <= YYEOF)
6647 <        {
6648 <          /* Return failure if at end of input.  */
6649 <          if (yychar == YYEOF)
6650 <            YYABORT;
6651 <        }
6647 >        {
6648 >          /* Return failure if at end of input.  */
6649 >          if (yychar == YYEOF)
6650 >            YYABORT;
6651 >        }
6652        else
6653 <        {
6654 <          yydestruct ("Error: discarding",
6655 <                      yytoken, &yylval);
6656 <          yychar = YYEMPTY;
6657 <        }
6653 >        {
6654 >          yydestruct ("Error: discarding",
6655 >                      yytoken, &yylval);
6656 >          yychar = YYEMPTY;
6657 >        }
6658      }
6659  
6660    /* Else will try to reuse lookahead token after shifting the error
# Line 8713 | Line 6673 | yyerrorlab:
6673    if (/*CONSTCOND*/ 0)
6674       goto yyerrorlab;
6675  
6676 <  /* Do not reclaim the symbols of the rule which action triggered
6676 >  /* Do not reclaim the symbols of the rule whose action triggered
6677       this YYERROR.  */
6678    YYPOPSTACK (yylen);
6679    yylen = 0;
# Line 8726 | Line 6686 | yyerrorlab:
6686   | yyerrlab1 -- common code for both syntax error and YYERROR.  |
6687   `-------------------------------------------------------------*/
6688   yyerrlab1:
6689 <  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
6689 >  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
6690  
6691    for (;;)
6692      {
6693        yyn = yypact[yystate];
6694 <      if (yyn != YYPACT_NINF)
6695 <        {
6696 <          yyn += YYTERROR;
6697 <          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
6698 <            {
6699 <              yyn = yytable[yyn];
6700 <              if (0 < yyn)
6701 <                break;
6702 <            }
6703 <        }
6694 >      if (!yypact_value_is_default (yyn))
6695 >        {
6696 >          yyn += YYTERROR;
6697 >          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
6698 >            {
6699 >              yyn = yytable[yyn];
6700 >              if (0 < yyn)
6701 >                break;
6702 >            }
6703 >        }
6704  
6705        /* Pop the current state because it cannot handle the error token.  */
6706        if (yyssp == yyss)
6707 <        YYABORT;
6707 >        YYABORT;
6708  
6709  
6710        yydestruct ("Error: popping",
6711 <                  yystos[yystate], yyvsp);
6711 >                  yystos[yystate], yyvsp);
6712        YYPOPSTACK (1);
6713        yystate = *yyssp;
6714        YY_STACK_PRINT (yyss, yyssp);
6715      }
6716  
6717 +  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
6718    *++yyvsp = yylval;
6719 +  YY_IGNORE_MAYBE_UNINITIALIZED_END
6720  
6721  
6722    /* Shift the error token.  */
# Line 8778 | Line 6740 | yyabortlab:
6740    yyresult = 1;
6741    goto yyreturn;
6742  
6743 < #if !defined(yyoverflow) || YYERROR_VERBOSE
6743 > #if !defined yyoverflow || YYERROR_VERBOSE
6744   /*-------------------------------------------------.
6745   | yyexhaustedlab -- memory exhaustion comes here.  |
6746   `-------------------------------------------------*/
# Line 8790 | Line 6752 | yyexhaustedlab:
6752  
6753   yyreturn:
6754    if (yychar != YYEMPTY)
6755 <     yydestruct ("Cleanup: discarding lookahead",
6756 <                 yytoken, &yylval);
6757 <  /* Do not reclaim the symbols of the rule which action triggered
6755 >    {
6756 >      /* Make sure we have latest lookahead translation.  See comments at
6757 >         user semantic actions for why this is necessary.  */
6758 >      yytoken = YYTRANSLATE (yychar);
6759 >      yydestruct ("Cleanup: discarding lookahead",
6760 >                  yytoken, &yylval);
6761 >    }
6762 >  /* Do not reclaim the symbols of the rule whose action triggered
6763       this YYABORT or YYACCEPT.  */
6764    YYPOPSTACK (yylen);
6765    YY_STACK_PRINT (yyss, yyssp);
6766    while (yyssp != yyss)
6767      {
6768        yydestruct ("Cleanup: popping",
6769 <                  yystos[*yyssp], yyvsp);
6769 >                  yystos[*yyssp], yyvsp);
6770        YYPOPSTACK (1);
6771      }
6772   #ifndef yyoverflow
# Line 8810 | Line 6777 | yyreturn:
6777    if (yymsg != yymsgbuf)
6778      YYSTACK_FREE (yymsg);
6779   #endif
6780 <  /* Make sure YYID is used.  */
8814 <  return YYID (yyresult);
6780 >  return yyresult;
6781   }
8816
8817
8818

Comparing:
ircd-hybrid/src/ircd_parser.c (property svn:keywords), Revision 1028 by michael, Sun Nov 8 13:03:38 2009 UTC vs.
ircd-hybrid/trunk/src/conf_parser.c (property svn:keywords), Revision 6378 by michael, Fri Aug 21 10:38:26 2015 UTC

# Line 0 | Line 1
1 + Id Revision

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)