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-7.2/src/ircd_parser.c (file contents), Revision 978 by michael, Sun Aug 9 09:47:58 2009 UTC vs.
ircd-hybrid/trunk/src/conf_parser.c (file contents), Revision 4744 by michael, Thu Oct 16 11:46:19 2014 UTC

# Line 1 | Line 1
1 + /* A Bison parser, made by GNU Bison 3.0.2.  */
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-2013 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.2"
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 <
70 < /* Line 189 of yacc.c  */
71 < #line 25 "ircd_parser.y"
65 > #line 28 "conf_parser.y" /* yacc.c:339  */
66  
67  
68   #define YY_NO_UNPUT
69   #include <sys/types.h>
70   #include <string.h>
71  
72 + #include "config.h"
73   #include "stdinc.h"
74   #include "ircd.h"
80 #include "tools.h"
75   #include "list.h"
76 < #include "s_conf.h"
76 > #include "conf.h"
77 > #include "conf_class.h"
78 > #include "conf_pseudo.h"
79   #include "event.h"
80 < #include "s_log.h"
80 > #include "log.h"
81   #include "client.h"     /* for UMODE_ALL only */
86 #include "pcre.h"
82   #include "irc_string.h"
88 #include "irc_getaddrinfo.h"
89 #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;
107 < static struct ConfItem *yy_conf = NULL;
108 < static struct AccessItem *yy_aconf = NULL;
109 < static struct MatchItem *yy_match_item = NULL;
110 < static struct ClassItem *yy_class = NULL;
111 < static char *yy_class_name = NULL;
112 <
113 < static dlink_list col_conf_list  = { NULL, NULL, 0 };
114 < static dlink_list hub_conf_list  = { NULL, NULL, 0 };
115 < static dlink_list leaf_conf_list = { NULL, NULL, 0 };
116 < static unsigned int listener_flags = 0;
117 < static unsigned int regex_ban = 0;
118 < static char userbuf[IRCD_BUFSIZE];
119 < static char hostbuf[IRCD_BUFSIZE];
120 < static char reasonbuf[REASONLEN + 1];
121 < static char gecos_name[REALLEN * 4];
122 <
123 < extern dlink_list gdeny_items; /* XXX */
124 <
125 < static char *resv_reason = NULL;
126 < static char *listener_address = NULL;
127 < static int not_atom = 0;
101 > #include "rsa.h"
102  
103 < struct CollectItem
130 < {
131 <  dlink_node node;
132 <  char *name;
133 <  char *user;
134 <  char *host;
135 <  char *passwd;
136 <  int  port;
137 <  int  flags;
138 < #ifdef HAVE_LIBCRYPTO
139 <  char *rsa_public_key_file;
140 <  RSA *rsa_public_key;
141 < #endif
142 < };
103 > int yylex(void);
104  
105 < static void
145 < 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 >    class,
129 >    target,
130 >    prepend,
131 >    command;
132 >
133 >  struct
134 >  {
135 >    unsigned int value;
136 >  } flags,
137 >    modes,
138 >    size,
139 >    type,
140 >    port,
141 >    aftype,
142 >    ping_freq,
143 >    max_perip,
144 >    con_freq,
145 >    min_idle,
146 >    max_idle,
147 >    max_total,
148 >    max_global,
149 >    max_local,
150 >    max_ident,
151 >    max_sendq,
152 >    max_recvq,
153 >    max_channels,
154 >    cidr_bitlen_ipv4,
155 >    cidr_bitlen_ipv6,
156 >    number_per_cidr;
157 > } block_state;
158  
159   static void
160 < unhook_hub_leaf_confs(void)
160 > reset_block_state(void)
161   {
162 <  dlink_node *ptr;
161 <  dlink_node *next_ptr;
162 <  struct CollectItem *yy_hconf;
163 <  struct CollectItem *yy_lconf;
162 >  dlink_node *ptr = NULL, *ptr_next = NULL;
163  
164 <  DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
164 >  DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.mask.list.head)
165    {
166 <    yy_hconf = ptr->data;
167 <    dlinkDelete(&yy_hconf->node, &hub_conf_list);
168 <    free_collect_item(yy_hconf);
166 >    MyFree(ptr->data);
167 >    dlinkDelete(ptr, &block_state.mask.list);
168 >    free_dlink_node(ptr);
169    }
170  
171 <  DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
171 >  DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
172    {
173 <    yy_lconf = ptr->data;
174 <    dlinkDelete(&yy_lconf->node, &leaf_conf_list);
175 <    free_collect_item(yy_lconf);
173 >    MyFree(ptr->data);
174 >    dlinkDelete(ptr, &block_state.leaf.list);
175 >    free_dlink_node(ptr);
176 >  }
177 >
178 >  DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.hub.list.head)
179 >  {
180 >    MyFree(ptr->data);
181 >    dlinkDelete(ptr, &block_state.hub.list);
182 >    free_dlink_node(ptr);
183    }
178 }
184  
185 +  memset(&block_state, 0, sizeof(block_state));
186 + }
187  
188  
189 < /* Line 189 of yacc.c  */
183 < #line 184 "ircd_parser.c"
189 > #line 190 "conf_parser.c" /* yacc.c:339  */
190  
191 < /* Enabling traces.  */
192 < #ifndef YYDEBUG
193 < # define YYDEBUG 0
194 < #endif
191 > # ifndef YY_NULLPTR
192 > #  if defined __cplusplus && 201103L <= __cplusplus
193 > #   define YY_NULLPTR nullptr
194 > #  else
195 > #   define YY_NULLPTR 0
196 > #  endif
197 > # endif
198  
199   /* Enabling verbose error messages.  */
200   #ifdef YYERROR_VERBOSE
# Line 195 | Line 204 | unhook_hub_leaf_confs(void)
204   # define YYERROR_VERBOSE 0
205   #endif
206  
207 < /* Enabling the token table.  */
208 < #ifndef YYTOKEN_TABLE
209 < # define YYTOKEN_TABLE 0
207 > /* In a future release of Bison, this section will be replaced
208 >   by #include "y.tab.h".  */
209 > #ifndef YY_YY_CONF_PARSER_H_INCLUDED
210 > # define YY_YY_CONF_PARSER_H_INCLUDED
211 > /* Debug traces.  */
212 > #ifndef YYDEBUG
213 > # define YYDEBUG 0
214 > #endif
215 > #if YYDEBUG
216 > extern int yydebug;
217   #endif
218  
219 <
204 < /* Tokens.  */
219 > /* Token type.  */
220   #ifndef YYTOKENTYPE
221   # define YYTOKENTYPE
222 <   /* Put the tokens into the symbol table, so that GDB and other debuggers
223 <      know about them.  */
224 <   enum yytokentype {
225 <     ACCEPT_PASSWORD = 258,
226 <     ACTION = 259,
227 <     ADMIN = 260,
228 <     AFTYPE = 261,
229 <     T_ALLOW = 262,
230 <     ANTI_NICK_FLOOD = 263,
231 <     ANTI_SPAM_EXIT_MESSAGE_TIME = 264,
232 <     AUTOCONN = 265,
233 <     T_BLOCK = 266,
234 <     BURST_AWAY = 267,
235 <     BURST_TOPICWHO = 268,
236 <     BYTES = 269,
237 <     KBYTES = 270,
238 <     MBYTES = 271,
239 <     GBYTES = 272,
240 <     TBYTES = 273,
241 <     CALLER_ID_WAIT = 274,
242 <     CAN_FLOOD = 275,
243 <     CAN_IDLE = 276,
244 <     CHANNEL = 277,
245 <     CIDR_BITLEN_IPV4 = 278,
246 <     CIDR_BITLEN_IPV6 = 279,
247 <     CIPHER_PREFERENCE = 280,
248 <     CLASS = 281,
249 <     COMPRESSED = 282,
250 <     COMPRESSION_LEVEL = 283,
251 <     CONNECT = 284,
252 <     CONNECTFREQ = 285,
253 <     CRYPTLINK = 286,
254 <     DEFAULT_CIPHER_PREFERENCE = 287,
255 <     DEFAULT_FLOODCOUNT = 288,
256 <     DEFAULT_SPLIT_SERVER_COUNT = 289,
257 <     DEFAULT_SPLIT_USER_COUNT = 290,
258 <     DENY = 291,
259 <     DESCRIPTION = 292,
260 <     DIE = 293,
261 <     DISABLE_AUTH = 294,
262 <     DISABLE_FAKE_CHANNELS = 295,
263 <     DISABLE_HIDDEN = 296,
264 <     DISABLE_LOCAL_CHANNELS = 297,
265 <     DISABLE_REMOTE_COMMANDS = 298,
266 <     DOT_IN_IP6_ADDR = 299,
267 <     DOTS_IN_IDENT = 300,
268 <     DURATION = 301,
269 <     EGDPOOL_PATH = 302,
270 <     EMAIL = 303,
271 <     ENABLE = 304,
272 <     ENCRYPTED = 305,
273 <     EXCEED_LIMIT = 306,
274 <     EXEMPT = 307,
275 <     FAILED_OPER_NOTICE = 308,
276 <     FAKENAME = 309,
277 <     IRCD_FLAGS = 310,
278 <     FLATTEN_LINKS = 311,
279 <     FFAILED_OPERLOG = 312,
280 <     FKILLLOG = 313,
281 <     FKLINELOG = 314,
282 <     FGLINELOG = 315,
283 <     FIOERRLOG = 316,
284 <     FOPERLOG = 317,
285 <     FOPERSPYLOG = 318,
286 <     FUSERLOG = 319,
287 <     GECOS = 320,
288 <     GENERAL = 321,
289 <     GLINE = 322,
290 <     GLINES = 323,
291 <     GLINE_EXEMPT = 324,
292 <     GLINE_LOG = 325,
293 <     GLINE_TIME = 326,
294 <     GLINE_MIN_CIDR = 327,
295 <     GLINE_MIN_CIDR6 = 328,
296 <     GLOBAL_KILL = 329,
297 <     IRCD_AUTH = 330,
298 <     NEED_IDENT = 331,
299 <     HAVENT_READ_CONF = 332,
300 <     HIDDEN = 333,
301 <     HIDDEN_ADMIN = 334,
302 <     HIDDEN_NAME = 335,
303 <     HIDDEN_OPER = 336,
304 <     HIDE_SERVER_IPS = 337,
305 <     HIDE_SERVERS = 338,
306 <     HIDE_SPOOF_IPS = 339,
307 <     HOST = 340,
308 <     HUB = 341,
309 <     HUB_MASK = 342,
310 <     IDLETIME = 343,
311 <     IGNORE_BOGUS_TS = 344,
312 <     INVISIBLE_ON_CONNECT = 345,
313 <     IP = 346,
314 <     KILL = 347,
315 <     KILL_CHASE_TIME_LIMIT = 348,
316 <     KLINE = 349,
317 <     KLINE_EXEMPT = 350,
318 <     KLINE_REASON = 351,
319 <     KLINE_WITH_REASON = 352,
320 <     KNOCK_DELAY = 353,
321 <     KNOCK_DELAY_CHANNEL = 354,
322 <     LEAF_MASK = 355,
323 <     LINKS_DELAY = 356,
324 <     LISTEN = 357,
325 <     T_LOG = 358,
326 <     LOGGING = 359,
327 <     LOG_LEVEL = 360,
328 <     MAX_ACCEPT = 361,
329 <     MAX_BANS = 362,
330 <     MAX_CHANS_PER_USER = 363,
331 <     MAX_GLOBAL = 364,
332 <     MAX_IDENT = 365,
333 <     MAX_LOCAL = 366,
334 <     MAX_NICK_CHANGES = 367,
335 <     MAX_NICK_TIME = 368,
336 <     MAX_NUMBER = 369,
337 <     MAX_TARGETS = 370,
338 <     MAX_WATCH = 371,
339 <     MESSAGE_LOCALE = 372,
340 <     MIN_NONWILDCARD = 373,
341 <     MIN_NONWILDCARD_SIMPLE = 374,
342 <     MODULE = 375,
343 <     MODULES = 376,
344 <     NAME = 377,
345 <     NEED_PASSWORD = 378,
346 <     NETWORK_DESC = 379,
347 <     NETWORK_NAME = 380,
348 <     NICK = 381,
349 <     NICK_CHANGES = 382,
350 <     NO_CREATE_ON_SPLIT = 383,
351 <     NO_JOIN_ON_SPLIT = 384,
352 <     NO_OPER_FLOOD = 385,
353 <     NO_TILDE = 386,
354 <     NOT = 387,
355 <     NUMBER = 388,
356 <     NUMBER_PER_IDENT = 389,
357 <     NUMBER_PER_CIDR = 390,
358 <     NUMBER_PER_IP = 391,
359 <     NUMBER_PER_IP_GLOBAL = 392,
360 <     OPERATOR = 393,
361 <     OPERS_BYPASS_CALLERID = 394,
362 <     OPER_LOG = 395,
363 <     OPER_ONLY_UMODES = 396,
364 <     OPER_PASS_RESV = 397,
365 <     OPER_SPY_T = 398,
366 <     OPER_UMODES = 399,
367 <     JOIN_FLOOD_COUNT = 400,
368 <     JOIN_FLOOD_TIME = 401,
369 <     PACE_WAIT = 402,
370 <     PACE_WAIT_SIMPLE = 403,
371 <     PASSWORD = 404,
372 <     PATH = 405,
373 <     PING_COOKIE = 406,
374 <     PING_TIME = 407,
375 <     PING_WARNING = 408,
376 <     PORT = 409,
377 <     QSTRING = 410,
378 <     QUIET_ON_BAN = 411,
379 <     REASON = 412,
380 <     REDIRPORT = 413,
381 <     REDIRSERV = 414,
382 <     REGEX_T = 415,
383 <     REHASH = 416,
384 <     TREJECT_HOLD_TIME = 417,
385 <     REMOTE = 418,
386 <     REMOTEBAN = 419,
387 <     RESTRICT_CHANNELS = 420,
388 <     RESTRICTED = 421,
389 <     RSA_PRIVATE_KEY_FILE = 422,
390 <     RSA_PUBLIC_KEY_FILE = 423,
391 <     SSL_CERTIFICATE_FILE = 424,
392 <     T_SSL_CONNECTION_METHOD = 425,
393 <     T_SSLV3 = 426,
394 <     T_TLSV1 = 427,
395 <     RESV = 428,
396 <     RESV_EXEMPT = 429,
397 <     SECONDS = 430,
398 <     MINUTES = 431,
399 <     HOURS = 432,
400 <     DAYS = 433,
401 <     WEEKS = 434,
402 <     SENDQ = 435,
403 <     SEND_PASSWORD = 436,
404 <     SERVERHIDE = 437,
405 <     SERVERINFO = 438,
406 <     SERVLINK_PATH = 439,
407 <     IRCD_SID = 440,
408 <     TKLINE_EXPIRE_NOTICES = 441,
409 <     T_SHARED = 442,
410 <     T_CLUSTER = 443,
411 <     TYPE = 444,
412 <     SHORT_MOTD = 445,
413 <     SILENT = 446,
414 <     SPOOF = 447,
415 <     SPOOF_NOTICE = 448,
416 <     STATS_E_DISABLED = 449,
417 <     STATS_I_OPER_ONLY = 450,
418 <     STATS_K_OPER_ONLY = 451,
419 <     STATS_O_OPER_ONLY = 452,
420 <     STATS_P_OPER_ONLY = 453,
421 <     TBOOL = 454,
422 <     TMASKED = 455,
423 <     T_REJECT = 456,
424 <     TS_MAX_DELTA = 457,
425 <     TS_WARN_DELTA = 458,
426 <     TWODOTS = 459,
427 <     T_ALL = 460,
428 <     T_BOTS = 461,
429 <     T_SOFTCALLERID = 462,
430 <     T_CALLERID = 463,
431 <     T_CCONN = 464,
432 <     T_CCONN_FULL = 465,
433 <     T_CLIENT_FLOOD = 466,
434 <     T_DEAF = 467,
435 <     T_DEBUG = 468,
436 <     T_DRONE = 469,
437 <     T_EXTERNAL = 470,
438 <     T_FULL = 471,
439 <     T_INVISIBLE = 472,
440 <     T_IPV4 = 473,
441 <     T_IPV6 = 474,
442 <     T_LOCOPS = 475,
443 <     T_LOGPATH = 476,
444 <     T_L_CRIT = 477,
445 <     T_L_DEBUG = 478,
446 <     T_L_ERROR = 479,
447 <     T_L_INFO = 480,
448 <     T_L_NOTICE = 481,
449 <     T_L_TRACE = 482,
450 <     T_L_WARN = 483,
451 <     T_MAX_CLIENTS = 484,
452 <     T_NCHANGE = 485,
453 <     T_OPERWALL = 486,
454 <     T_REJ = 487,
455 <     T_SERVER = 488,
441 <     T_SERVNOTICE = 489,
442 <     T_SKILL = 490,
443 <     T_SPY = 491,
444 <     T_SSL = 492,
445 <     T_UMODES = 493,
446 <     T_UNAUTH = 494,
447 <     T_UNRESV = 495,
448 <     T_UNXLINE = 496,
449 <     T_WALLOP = 497,
450 <     THROTTLE_TIME = 498,
451 <     TOPICBURST = 499,
452 <     TRUE_NO_OPER_FLOOD = 500,
453 <     TKLINE = 501,
454 <     TXLINE = 502,
455 <     TRESV = 503,
456 <     UNKLINE = 504,
457 <     USER = 505,
458 <     USE_EGD = 506,
459 <     USE_EXCEPT = 507,
460 <     USE_INVEX = 508,
461 <     USE_KNOCK = 509,
462 <     USE_LOGGING = 510,
463 <     USE_WHOIS_ACTUALLY = 511,
464 <     VHOST = 512,
465 <     VHOST6 = 513,
466 <     XLINE = 514,
467 <     WARN = 515,
468 <     WARN_NO_NLINE = 516
469 <   };
222 >  enum yytokentype
223 >  {
224 >    ACCEPT_PASSWORD = 258,
225 >    ADMIN = 259,
226 >    AFTYPE = 260,
227 >    ANTI_NICK_FLOOD = 261,
228 >    ANTI_SPAM_EXIT_MESSAGE_TIME = 262,
229 >    AUTOCONN = 263,
230 >    AWAY_COUNT = 264,
231 >    AWAY_TIME = 265,
232 >    BYTES = 266,
233 >    KBYTES = 267,
234 >    MBYTES = 268,
235 >    CALLER_ID_WAIT = 269,
236 >    CAN_FLOOD = 270,
237 >    CHANNEL = 271,
238 >    CIDR_BITLEN_IPV4 = 272,
239 >    CIDR_BITLEN_IPV6 = 273,
240 >    CLASS = 274,
241 >    CONNECT = 275,
242 >    CONNECTFREQ = 276,
243 >    CYCLE_ON_HOST_CHANGE = 277,
244 >    DEFAULT_FLOODCOUNT = 278,
245 >    DEFAULT_SPLIT_SERVER_COUNT = 279,
246 >    DEFAULT_SPLIT_USER_COUNT = 280,
247 >    DENY = 281,
248 >    DESCRIPTION = 282,
249 >    DIE = 283,
250 >    DISABLE_AUTH = 284,
251 >    DISABLE_FAKE_CHANNELS = 285,
252 >    DISABLE_REMOTE_COMMANDS = 286,
253 >    DOTS_IN_IDENT = 287,
254 >    EGDPOOL_PATH = 288,
255 >    EMAIL = 289,
256 >    ENCRYPTED = 290,
257 >    EXCEED_LIMIT = 291,
258 >    EXEMPT = 292,
259 >    FAILED_OPER_NOTICE = 293,
260 >    FLATTEN_LINKS = 294,
261 >    GECOS = 295,
262 >    GENERAL = 296,
263 >    GLINE = 297,
264 >    GLINE_DURATION = 298,
265 >    GLINE_ENABLE = 299,
266 >    GLINE_EXEMPT = 300,
267 >    GLINE_MIN_CIDR = 301,
268 >    GLINE_MIN_CIDR6 = 302,
269 >    GLINE_REQUEST_DURATION = 303,
270 >    GLOBAL_KILL = 304,
271 >    HAVENT_READ_CONF = 305,
272 >    HIDDEN = 306,
273 >    HIDDEN_NAME = 307,
274 >    HIDE_CHANS = 308,
275 >    HIDE_IDLE = 309,
276 >    HIDE_IDLE_FROM_OPERS = 310,
277 >    HIDE_SERVER_IPS = 311,
278 >    HIDE_SERVERS = 312,
279 >    HIDE_SERVICES = 313,
280 >    HIDE_SPOOF_IPS = 314,
281 >    HOST = 315,
282 >    HUB = 316,
283 >    HUB_MASK = 317,
284 >    IGNORE_BOGUS_TS = 318,
285 >    INVISIBLE_ON_CONNECT = 319,
286 >    INVITE_CLIENT_COUNT = 320,
287 >    INVITE_CLIENT_TIME = 321,
288 >    IP = 322,
289 >    IRCD_AUTH = 323,
290 >    IRCD_FLAGS = 324,
291 >    IRCD_SID = 325,
292 >    JOIN_FLOOD_COUNT = 326,
293 >    JOIN_FLOOD_TIME = 327,
294 >    KILL = 328,
295 >    KILL_CHASE_TIME_LIMIT = 329,
296 >    KLINE = 330,
297 >    KLINE_EXEMPT = 331,
298 >    KNOCK_CLIENT_COUNT = 332,
299 >    KNOCK_CLIENT_TIME = 333,
300 >    KNOCK_DELAY_CHANNEL = 334,
301 >    LEAF_MASK = 335,
302 >    LINKS_DELAY = 336,
303 >    LISTEN = 337,
304 >    MASK = 338,
305 >    MAX_ACCEPT = 339,
306 >    MAX_BANS = 340,
307 >    MAX_CHANNELS = 341,
308 >    MAX_GLOBAL = 342,
309 >    MAX_IDENT = 343,
310 >    MAX_IDLE = 344,
311 >    MAX_LOCAL = 345,
312 >    MAX_NICK_CHANGES = 346,
313 >    MAX_NICK_LENGTH = 347,
314 >    MAX_NICK_TIME = 348,
315 >    MAX_NUMBER = 349,
316 >    MAX_TARGETS = 350,
317 >    MAX_TOPIC_LENGTH = 351,
318 >    MAX_WATCH = 352,
319 >    MIN_IDLE = 353,
320 >    MIN_NONWILDCARD = 354,
321 >    MIN_NONWILDCARD_SIMPLE = 355,
322 >    MODULE = 356,
323 >    MODULES = 357,
324 >    MOTD = 358,
325 >    NAME = 359,
326 >    NEED_IDENT = 360,
327 >    NEED_PASSWORD = 361,
328 >    NETWORK_DESC = 362,
329 >    NETWORK_NAME = 363,
330 >    NICK = 364,
331 >    NO_CREATE_ON_SPLIT = 365,
332 >    NO_JOIN_ON_SPLIT = 366,
333 >    NO_OPER_FLOOD = 367,
334 >    NO_TILDE = 368,
335 >    NUMBER = 369,
336 >    NUMBER_PER_CIDR = 370,
337 >    NUMBER_PER_IP = 371,
338 >    OPER_ONLY_UMODES = 372,
339 >    OPER_PASS_RESV = 373,
340 >    OPER_UMODES = 374,
341 >    OPERATOR = 375,
342 >    OPERS_BYPASS_CALLERID = 376,
343 >    PACE_WAIT = 377,
344 >    PACE_WAIT_SIMPLE = 378,
345 >    PASSWORD = 379,
346 >    PATH = 380,
347 >    PING_COOKIE = 381,
348 >    PING_TIME = 382,
349 >    PORT = 383,
350 >    QSTRING = 384,
351 >    RANDOM_IDLE = 385,
352 >    REASON = 386,
353 >    REDIRPORT = 387,
354 >    REDIRSERV = 388,
355 >    REHASH = 389,
356 >    REMOTE = 390,
357 >    REMOTEBAN = 391,
358 >    RESV = 392,
359 >    RESV_EXEMPT = 393,
360 >    RSA_PRIVATE_KEY_FILE = 394,
361 >    RSA_PUBLIC_KEY_FILE = 395,
362 >    SECONDS = 396,
363 >    MINUTES = 397,
364 >    HOURS = 398,
365 >    DAYS = 399,
366 >    WEEKS = 400,
367 >    MONTHS = 401,
368 >    YEARS = 402,
369 >    SEND_PASSWORD = 403,
370 >    SENDQ = 404,
371 >    SERVERHIDE = 405,
372 >    SERVERINFO = 406,
373 >    SHORT_MOTD = 407,
374 >    SPOOF = 408,
375 >    SPOOF_NOTICE = 409,
376 >    SQUIT = 410,
377 >    SSL_CERTIFICATE_FILE = 411,
378 >    SSL_CERTIFICATE_FINGERPRINT = 412,
379 >    SSL_CONNECTION_REQUIRED = 413,
380 >    SSL_DH_ELLIPTIC_CURVE = 414,
381 >    SSL_DH_PARAM_FILE = 415,
382 >    SSL_MESSAGE_DIGEST_ALGORITHM = 416,
383 >    STATS_E_DISABLED = 417,
384 >    STATS_I_OPER_ONLY = 418,
385 >    STATS_K_OPER_ONLY = 419,
386 >    STATS_O_OPER_ONLY = 420,
387 >    STATS_P_OPER_ONLY = 421,
388 >    STATS_U_OPER_ONLY = 422,
389 >    T_ALL = 423,
390 >    T_BOTS = 424,
391 >    T_CALLERID = 425,
392 >    T_CCONN = 426,
393 >    T_COMMAND = 427,
394 >    T_CLUSTER = 428,
395 >    T_DEAF = 429,
396 >    T_DEBUG = 430,
397 >    T_DLINE = 431,
398 >    T_EXTERNAL = 432,
399 >    T_FARCONNECT = 433,
400 >    T_FILE = 434,
401 >    T_FULL = 435,
402 >    T_GLOBOPS = 436,
403 >    T_INVISIBLE = 437,
404 >    T_IPV4 = 438,
405 >    T_IPV6 = 439,
406 >    T_LOCOPS = 440,
407 >    T_LOG = 441,
408 >    T_MAX_CLIENTS = 442,
409 >    T_NCHANGE = 443,
410 >    T_NONONREG = 444,
411 >    T_PREPEND = 445,
412 >    T_PSEUDO = 446,
413 >    T_RECVQ = 447,
414 >    T_REJ = 448,
415 >    T_RESTART = 449,
416 >    T_SERVER = 450,
417 >    T_SERVICE = 451,
418 >    T_SERVNOTICE = 452,
419 >    T_SET = 453,
420 >    T_SHARED = 454,
421 >    T_SIZE = 455,
422 >    T_SKILL = 456,
423 >    T_SOFTCALLERID = 457,
424 >    T_SPY = 458,
425 >    T_SSL = 459,
426 >    T_SSL_CIPHER_LIST = 460,
427 >    T_TARGET = 461,
428 >    T_UMODES = 462,
429 >    T_UNAUTH = 463,
430 >    T_UNDLINE = 464,
431 >    T_UNLIMITED = 465,
432 >    T_UNRESV = 466,
433 >    T_UNXLINE = 467,
434 >    T_WALLOP = 468,
435 >    T_WALLOPS = 469,
436 >    T_WEBIRC = 470,
437 >    TBOOL = 471,
438 >    THROTTLE_COUNT = 472,
439 >    THROTTLE_TIME = 473,
440 >    TKLINE_EXPIRE_NOTICES = 474,
441 >    TMASKED = 475,
442 >    TRUE_NO_OPER_FLOOD = 476,
443 >    TS_MAX_DELTA = 477,
444 >    TS_WARN_DELTA = 478,
445 >    TWODOTS = 479,
446 >    TYPE = 480,
447 >    UNKLINE = 481,
448 >    USE_EGD = 482,
449 >    USE_LOGGING = 483,
450 >    USER = 484,
451 >    VHOST = 485,
452 >    VHOST6 = 486,
453 >    WARN_NO_CONNECT_BLOCK = 487,
454 >    XLINE = 488
455 >  };
456   #endif
457   /* Tokens.  */
458   #define ACCEPT_PASSWORD 258
459 < #define ACTION 259
460 < #define ADMIN 260
461 < #define AFTYPE 261
462 < #define T_ALLOW 262
463 < #define ANTI_NICK_FLOOD 263
464 < #define ANTI_SPAM_EXIT_MESSAGE_TIME 264
465 < #define AUTOCONN 265
466 < #define T_BLOCK 266
467 < #define BURST_AWAY 267
468 < #define BURST_TOPICWHO 268
469 < #define BYTES 269
470 < #define KBYTES 270
471 < #define MBYTES 271
472 < #define GBYTES 272
473 < #define TBYTES 273
474 < #define CALLER_ID_WAIT 274
475 < #define CAN_FLOOD 275
476 < #define CAN_IDLE 276
477 < #define CHANNEL 277
478 < #define CIDR_BITLEN_IPV4 278
479 < #define CIDR_BITLEN_IPV6 279
480 < #define CIPHER_PREFERENCE 280
481 < #define CLASS 281
482 < #define COMPRESSED 282
483 < #define COMPRESSION_LEVEL 283
484 < #define CONNECT 284
485 < #define CONNECTFREQ 285
486 < #define CRYPTLINK 286
487 < #define DEFAULT_CIPHER_PREFERENCE 287
488 < #define DEFAULT_FLOODCOUNT 288
489 < #define DEFAULT_SPLIT_SERVER_COUNT 289
490 < #define DEFAULT_SPLIT_USER_COUNT 290
491 < #define DENY 291
492 < #define DESCRIPTION 292
493 < #define DIE 293
494 < #define DISABLE_AUTH 294
495 < #define DISABLE_FAKE_CHANNELS 295
496 < #define DISABLE_HIDDEN 296
497 < #define DISABLE_LOCAL_CHANNELS 297
498 < #define DISABLE_REMOTE_COMMANDS 298
499 < #define DOT_IN_IP6_ADDR 299
500 < #define DOTS_IN_IDENT 300
501 < #define DURATION 301
502 < #define EGDPOOL_PATH 302
503 < #define EMAIL 303
504 < #define ENABLE 304
505 < #define ENCRYPTED 305
506 < #define EXCEED_LIMIT 306
507 < #define EXEMPT 307
508 < #define FAILED_OPER_NOTICE 308
509 < #define FAKENAME 309
510 < #define IRCD_FLAGS 310
511 < #define FLATTEN_LINKS 311
512 < #define FFAILED_OPERLOG 312
513 < #define FKILLLOG 313
514 < #define FKLINELOG 314
515 < #define FGLINELOG 315
516 < #define FIOERRLOG 316
517 < #define FOPERLOG 317
518 < #define FOPERSPYLOG 318
519 < #define FUSERLOG 319
520 < #define GECOS 320
521 < #define GENERAL 321
522 < #define GLINE 322
523 < #define GLINES 323
524 < #define GLINE_EXEMPT 324
525 < #define GLINE_LOG 325
526 < #define GLINE_TIME 326
527 < #define GLINE_MIN_CIDR 327
528 < #define GLINE_MIN_CIDR6 328
529 < #define GLOBAL_KILL 329
530 < #define IRCD_AUTH 330
531 < #define NEED_IDENT 331
532 < #define HAVENT_READ_CONF 332
533 < #define HIDDEN 333
534 < #define HIDDEN_ADMIN 334
535 < #define HIDDEN_NAME 335
536 < #define HIDDEN_OPER 336
537 < #define HIDE_SERVER_IPS 337
538 < #define HIDE_SERVERS 338
539 < #define HIDE_SPOOF_IPS 339
540 < #define HOST 340
541 < #define HUB 341
542 < #define HUB_MASK 342
543 < #define IDLETIME 343
544 < #define IGNORE_BOGUS_TS 344
545 < #define INVISIBLE_ON_CONNECT 345
546 < #define IP 346
547 < #define KILL 347
548 < #define KILL_CHASE_TIME_LIMIT 348
549 < #define KLINE 349
550 < #define KLINE_EXEMPT 350
551 < #define KLINE_REASON 351
552 < #define KLINE_WITH_REASON 352
553 < #define KNOCK_DELAY 353
554 < #define KNOCK_DELAY_CHANNEL 354
555 < #define LEAF_MASK 355
556 < #define LINKS_DELAY 356
557 < #define LISTEN 357
558 < #define T_LOG 358
559 < #define LOGGING 359
560 < #define LOG_LEVEL 360
561 < #define MAX_ACCEPT 361
562 < #define MAX_BANS 362
563 < #define MAX_CHANS_PER_USER 363
564 < #define MAX_GLOBAL 364
565 < #define MAX_IDENT 365
566 < #define MAX_LOCAL 366
567 < #define MAX_NICK_CHANGES 367
568 < #define MAX_NICK_TIME 368
569 < #define MAX_NUMBER 369
570 < #define MAX_TARGETS 370
571 < #define MAX_WATCH 371
572 < #define MESSAGE_LOCALE 372
573 < #define MIN_NONWILDCARD 373
574 < #define MIN_NONWILDCARD_SIMPLE 374
575 < #define MODULE 375
576 < #define MODULES 376
577 < #define NAME 377
578 < #define NEED_PASSWORD 378
579 < #define NETWORK_DESC 379
580 < #define NETWORK_NAME 380
581 < #define NICK 381
582 < #define NICK_CHANGES 382
583 < #define NO_CREATE_ON_SPLIT 383
584 < #define NO_JOIN_ON_SPLIT 384
585 < #define NO_OPER_FLOOD 385
586 < #define NO_TILDE 386
587 < #define NOT 387
588 < #define NUMBER 388
589 < #define NUMBER_PER_IDENT 389
590 < #define NUMBER_PER_CIDR 390
591 < #define NUMBER_PER_IP 391
592 < #define NUMBER_PER_IP_GLOBAL 392
593 < #define OPERATOR 393
594 < #define OPERS_BYPASS_CALLERID 394
595 < #define OPER_LOG 395
596 < #define OPER_ONLY_UMODES 396
597 < #define OPER_PASS_RESV 397
598 < #define OPER_SPY_T 398
599 < #define OPER_UMODES 399
600 < #define JOIN_FLOOD_COUNT 400
601 < #define JOIN_FLOOD_TIME 401
602 < #define PACE_WAIT 402
603 < #define PACE_WAIT_SIMPLE 403
604 < #define PASSWORD 404
605 < #define PATH 405
606 < #define PING_COOKIE 406
607 < #define PING_TIME 407
608 < #define PING_WARNING 408
609 < #define PORT 409
610 < #define QSTRING 410
611 < #define QUIET_ON_BAN 411
612 < #define REASON 412
613 < #define REDIRPORT 413
614 < #define REDIRSERV 414
615 < #define REGEX_T 415
616 < #define REHASH 416
617 < #define TREJECT_HOLD_TIME 417
618 < #define REMOTE 418
619 < #define REMOTEBAN 419
620 < #define RESTRICT_CHANNELS 420
621 < #define RESTRICTED 421
622 < #define RSA_PRIVATE_KEY_FILE 422
623 < #define RSA_PUBLIC_KEY_FILE 423
624 < #define SSL_CERTIFICATE_FILE 424
625 < #define T_SSL_CONNECTION_METHOD 425
626 < #define T_SSLV3 426
627 < #define T_TLSV1 427
628 < #define RESV 428
629 < #define RESV_EXEMPT 429
630 < #define SECONDS 430
631 < #define MINUTES 431
632 < #define HOURS 432
633 < #define DAYS 433
634 < #define WEEKS 434
635 < #define SENDQ 435
636 < #define SEND_PASSWORD 436
637 < #define SERVERHIDE 437
638 < #define SERVERINFO 438
639 < #define SERVLINK_PATH 439
640 < #define IRCD_SID 440
641 < #define TKLINE_EXPIRE_NOTICES 441
642 < #define T_SHARED 442
643 < #define T_CLUSTER 443
644 < #define TYPE 444
645 < #define SHORT_MOTD 445
646 < #define SILENT 446
647 < #define SPOOF 447
648 < #define SPOOF_NOTICE 448
649 < #define STATS_E_DISABLED 449
650 < #define STATS_I_OPER_ONLY 450
651 < #define STATS_K_OPER_ONLY 451
652 < #define STATS_O_OPER_ONLY 452
653 < #define STATS_P_OPER_ONLY 453
654 < #define TBOOL 454
655 < #define TMASKED 455
656 < #define T_REJECT 456
657 < #define TS_MAX_DELTA 457
658 < #define TS_WARN_DELTA 458
659 < #define TWODOTS 459
660 < #define T_ALL 460
661 < #define T_BOTS 461
662 < #define T_SOFTCALLERID 462
663 < #define T_CALLERID 463
664 < #define T_CCONN 464
665 < #define T_CCONN_FULL 465
666 < #define T_CLIENT_FLOOD 466
667 < #define T_DEAF 467
668 < #define T_DEBUG 468
669 < #define T_DRONE 469
670 < #define T_EXTERNAL 470
671 < #define T_FULL 471
672 < #define T_INVISIBLE 472
673 < #define T_IPV4 473
674 < #define T_IPV6 474
675 < #define T_LOCOPS 475
676 < #define T_LOGPATH 476
677 < #define T_L_CRIT 477
678 < #define T_L_DEBUG 478
679 < #define T_L_ERROR 479
680 < #define T_L_INFO 480
681 < #define T_L_NOTICE 481
682 < #define T_L_TRACE 482
683 < #define T_L_WARN 483
684 < #define T_MAX_CLIENTS 484
685 < #define T_NCHANGE 485
686 < #define T_OPERWALL 486
687 < #define T_REJ 487
688 < #define T_SERVER 488
703 < #define T_SERVNOTICE 489
704 < #define T_SKILL 490
705 < #define T_SPY 491
706 < #define T_SSL 492
707 < #define T_UMODES 493
708 < #define T_UNAUTH 494
709 < #define T_UNRESV 495
710 < #define T_UNXLINE 496
711 < #define T_WALLOP 497
712 < #define THROTTLE_TIME 498
713 < #define TOPICBURST 499
714 < #define TRUE_NO_OPER_FLOOD 500
715 < #define TKLINE 501
716 < #define TXLINE 502
717 < #define TRESV 503
718 < #define UNKLINE 504
719 < #define USER 505
720 < #define USE_EGD 506
721 < #define USE_EXCEPT 507
722 < #define USE_INVEX 508
723 < #define USE_KNOCK 509
724 < #define USE_LOGGING 510
725 < #define USE_WHOIS_ACTUALLY 511
726 < #define VHOST 512
727 < #define VHOST6 513
728 < #define XLINE 514
729 < #define WARN 515
730 < #define WARN_NO_NLINE 516
731 <
732 <
733 <
459 > #define ADMIN 259
460 > #define AFTYPE 260
461 > #define ANTI_NICK_FLOOD 261
462 > #define ANTI_SPAM_EXIT_MESSAGE_TIME 262
463 > #define AUTOCONN 263
464 > #define AWAY_COUNT 264
465 > #define AWAY_TIME 265
466 > #define BYTES 266
467 > #define KBYTES 267
468 > #define MBYTES 268
469 > #define CALLER_ID_WAIT 269
470 > #define CAN_FLOOD 270
471 > #define CHANNEL 271
472 > #define CIDR_BITLEN_IPV4 272
473 > #define CIDR_BITLEN_IPV6 273
474 > #define CLASS 274
475 > #define CONNECT 275
476 > #define CONNECTFREQ 276
477 > #define CYCLE_ON_HOST_CHANGE 277
478 > #define DEFAULT_FLOODCOUNT 278
479 > #define DEFAULT_SPLIT_SERVER_COUNT 279
480 > #define DEFAULT_SPLIT_USER_COUNT 280
481 > #define DENY 281
482 > #define DESCRIPTION 282
483 > #define DIE 283
484 > #define DISABLE_AUTH 284
485 > #define DISABLE_FAKE_CHANNELS 285
486 > #define DISABLE_REMOTE_COMMANDS 286
487 > #define DOTS_IN_IDENT 287
488 > #define EGDPOOL_PATH 288
489 > #define EMAIL 289
490 > #define ENCRYPTED 290
491 > #define EXCEED_LIMIT 291
492 > #define EXEMPT 292
493 > #define FAILED_OPER_NOTICE 293
494 > #define FLATTEN_LINKS 294
495 > #define GECOS 295
496 > #define GENERAL 296
497 > #define GLINE 297
498 > #define GLINE_DURATION 298
499 > #define GLINE_ENABLE 299
500 > #define GLINE_EXEMPT 300
501 > #define GLINE_MIN_CIDR 301
502 > #define GLINE_MIN_CIDR6 302
503 > #define GLINE_REQUEST_DURATION 303
504 > #define GLOBAL_KILL 304
505 > #define HAVENT_READ_CONF 305
506 > #define HIDDEN 306
507 > #define HIDDEN_NAME 307
508 > #define HIDE_CHANS 308
509 > #define HIDE_IDLE 309
510 > #define HIDE_IDLE_FROM_OPERS 310
511 > #define HIDE_SERVER_IPS 311
512 > #define HIDE_SERVERS 312
513 > #define HIDE_SERVICES 313
514 > #define HIDE_SPOOF_IPS 314
515 > #define HOST 315
516 > #define HUB 316
517 > #define HUB_MASK 317
518 > #define IGNORE_BOGUS_TS 318
519 > #define INVISIBLE_ON_CONNECT 319
520 > #define INVITE_CLIENT_COUNT 320
521 > #define INVITE_CLIENT_TIME 321
522 > #define IP 322
523 > #define IRCD_AUTH 323
524 > #define IRCD_FLAGS 324
525 > #define IRCD_SID 325
526 > #define JOIN_FLOOD_COUNT 326
527 > #define JOIN_FLOOD_TIME 327
528 > #define KILL 328
529 > #define KILL_CHASE_TIME_LIMIT 329
530 > #define KLINE 330
531 > #define KLINE_EXEMPT 331
532 > #define KNOCK_CLIENT_COUNT 332
533 > #define KNOCK_CLIENT_TIME 333
534 > #define KNOCK_DELAY_CHANNEL 334
535 > #define LEAF_MASK 335
536 > #define LINKS_DELAY 336
537 > #define LISTEN 337
538 > #define MASK 338
539 > #define MAX_ACCEPT 339
540 > #define MAX_BANS 340
541 > #define MAX_CHANNELS 341
542 > #define MAX_GLOBAL 342
543 > #define MAX_IDENT 343
544 > #define MAX_IDLE 344
545 > #define MAX_LOCAL 345
546 > #define MAX_NICK_CHANGES 346
547 > #define MAX_NICK_LENGTH 347
548 > #define MAX_NICK_TIME 348
549 > #define MAX_NUMBER 349
550 > #define MAX_TARGETS 350
551 > #define MAX_TOPIC_LENGTH 351
552 > #define MAX_WATCH 352
553 > #define MIN_IDLE 353
554 > #define MIN_NONWILDCARD 354
555 > #define MIN_NONWILDCARD_SIMPLE 355
556 > #define MODULE 356
557 > #define MODULES 357
558 > #define MOTD 358
559 > #define NAME 359
560 > #define NEED_IDENT 360
561 > #define NEED_PASSWORD 361
562 > #define NETWORK_DESC 362
563 > #define NETWORK_NAME 363
564 > #define NICK 364
565 > #define NO_CREATE_ON_SPLIT 365
566 > #define NO_JOIN_ON_SPLIT 366
567 > #define NO_OPER_FLOOD 367
568 > #define NO_TILDE 368
569 > #define NUMBER 369
570 > #define NUMBER_PER_CIDR 370
571 > #define NUMBER_PER_IP 371
572 > #define OPER_ONLY_UMODES 372
573 > #define OPER_PASS_RESV 373
574 > #define OPER_UMODES 374
575 > #define OPERATOR 375
576 > #define OPERS_BYPASS_CALLERID 376
577 > #define PACE_WAIT 377
578 > #define PACE_WAIT_SIMPLE 378
579 > #define PASSWORD 379
580 > #define PATH 380
581 > #define PING_COOKIE 381
582 > #define PING_TIME 382
583 > #define PORT 383
584 > #define QSTRING 384
585 > #define RANDOM_IDLE 385
586 > #define REASON 386
587 > #define REDIRPORT 387
588 > #define REDIRSERV 388
589 > #define REHASH 389
590 > #define REMOTE 390
591 > #define REMOTEBAN 391
592 > #define RESV 392
593 > #define RESV_EXEMPT 393
594 > #define RSA_PRIVATE_KEY_FILE 394
595 > #define RSA_PUBLIC_KEY_FILE 395
596 > #define SECONDS 396
597 > #define MINUTES 397
598 > #define HOURS 398
599 > #define DAYS 399
600 > #define WEEKS 400
601 > #define MONTHS 401
602 > #define YEARS 402
603 > #define SEND_PASSWORD 403
604 > #define SENDQ 404
605 > #define SERVERHIDE 405
606 > #define SERVERINFO 406
607 > #define SHORT_MOTD 407
608 > #define SPOOF 408
609 > #define SPOOF_NOTICE 409
610 > #define SQUIT 410
611 > #define SSL_CERTIFICATE_FILE 411
612 > #define SSL_CERTIFICATE_FINGERPRINT 412
613 > #define SSL_CONNECTION_REQUIRED 413
614 > #define SSL_DH_ELLIPTIC_CURVE 414
615 > #define SSL_DH_PARAM_FILE 415
616 > #define SSL_MESSAGE_DIGEST_ALGORITHM 416
617 > #define STATS_E_DISABLED 417
618 > #define STATS_I_OPER_ONLY 418
619 > #define STATS_K_OPER_ONLY 419
620 > #define STATS_O_OPER_ONLY 420
621 > #define STATS_P_OPER_ONLY 421
622 > #define STATS_U_OPER_ONLY 422
623 > #define T_ALL 423
624 > #define T_BOTS 424
625 > #define T_CALLERID 425
626 > #define T_CCONN 426
627 > #define T_COMMAND 427
628 > #define T_CLUSTER 428
629 > #define T_DEAF 429
630 > #define T_DEBUG 430
631 > #define T_DLINE 431
632 > #define T_EXTERNAL 432
633 > #define T_FARCONNECT 433
634 > #define T_FILE 434
635 > #define T_FULL 435
636 > #define T_GLOBOPS 436
637 > #define T_INVISIBLE 437
638 > #define T_IPV4 438
639 > #define T_IPV6 439
640 > #define T_LOCOPS 440
641 > #define T_LOG 441
642 > #define T_MAX_CLIENTS 442
643 > #define T_NCHANGE 443
644 > #define T_NONONREG 444
645 > #define T_PREPEND 445
646 > #define T_PSEUDO 446
647 > #define T_RECVQ 447
648 > #define T_REJ 448
649 > #define T_RESTART 449
650 > #define T_SERVER 450
651 > #define T_SERVICE 451
652 > #define T_SERVNOTICE 452
653 > #define T_SET 453
654 > #define T_SHARED 454
655 > #define T_SIZE 455
656 > #define T_SKILL 456
657 > #define T_SOFTCALLERID 457
658 > #define T_SPY 458
659 > #define T_SSL 459
660 > #define T_SSL_CIPHER_LIST 460
661 > #define T_TARGET 461
662 > #define T_UMODES 462
663 > #define T_UNAUTH 463
664 > #define T_UNDLINE 464
665 > #define T_UNLIMITED 465
666 > #define T_UNRESV 466
667 > #define T_UNXLINE 467
668 > #define T_WALLOP 468
669 > #define T_WALLOPS 469
670 > #define T_WEBIRC 470
671 > #define TBOOL 471
672 > #define THROTTLE_COUNT 472
673 > #define THROTTLE_TIME 473
674 > #define TKLINE_EXPIRE_NOTICES 474
675 > #define TMASKED 475
676 > #define TRUE_NO_OPER_FLOOD 476
677 > #define TS_MAX_DELTA 477
678 > #define TS_WARN_DELTA 478
679 > #define TWODOTS 479
680 > #define TYPE 480
681 > #define UNKLINE 481
682 > #define USE_EGD 482
683 > #define USE_LOGGING 483
684 > #define USER 484
685 > #define VHOST 485
686 > #define VHOST6 486
687 > #define WARN_NO_CONNECT_BLOCK 487
688 > #define XLINE 488
689  
690 + /* Value type.  */
691   #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
692 < typedef union YYSTYPE
692 > typedef union YYSTYPE YYSTYPE;
693 > union YYSTYPE
694   {
695 <
739 < /* Line 214 of yacc.c  */
740 < #line 135 "ircd_parser.y"
695 > #line 152 "conf_parser.y" /* yacc.c:355  */
696  
697    int number;
698    char *string;
699  
700 <
701 <
747 < /* Line 214 of yacc.c  */
748 < #line 749 "ircd_parser.c"
749 < } YYSTYPE;
700 > #line 701 "conf_parser.c" /* yacc.c:355  */
701 > };
702   # define YYSTYPE_IS_TRIVIAL 1
751 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
703   # define YYSTYPE_IS_DECLARED 1
704   #endif
705  
706  
707 < /* Copy the second part of user declarations.  */
707 > extern YYSTYPE yylval;
708  
709 + int yyparse (void);
710 +
711 + #endif /* !YY_YY_CONF_PARSER_H_INCLUDED  */
712 +
713 + /* Copy the second part of user declarations.  */
714  
715 < /* Line 264 of yacc.c  */
760 < #line 761 "ircd_parser.c"
715 > #line 716 "conf_parser.c" /* yacc.c:358  */
716  
717   #ifdef short
718   # undef short
# Line 771 | Line 726 | typedef unsigned char yytype_uint8;
726  
727   #ifdef YYTYPE_INT8
728   typedef YYTYPE_INT8 yytype_int8;
774 #elif (defined __STDC__ || defined __C99__FUNC__ \
775     || defined __cplusplus || defined _MSC_VER)
776 typedef signed char yytype_int8;
729   #else
730 < typedef short int yytype_int8;
730 > typedef signed char yytype_int8;
731   #endif
732  
733   #ifdef YYTYPE_UINT16
# Line 795 | Line 747 | typedef short int yytype_int16;
747   #  define YYSIZE_T __SIZE_TYPE__
748   # elif defined size_t
749   #  define YYSIZE_T size_t
750 < # elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
799 <     || defined __cplusplus || defined _MSC_VER)
750 > # elif ! defined YYSIZE_T
751   #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
752   #  define YYSIZE_T size_t
753   # else
# Line 807 | Line 758 | typedef short int yytype_int16;
758   #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
759  
760   #ifndef YY_
761 < # if YYENABLE_NLS
761 > # if defined YYENABLE_NLS && YYENABLE_NLS
762   #  if ENABLE_NLS
763   #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
764 < #   define YY_(msgid) dgettext ("bison-runtime", msgid)
764 > #   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
765   #  endif
766   # endif
767   # ifndef YY_
768 < #  define YY_(msgid) msgid
768 > #  define YY_(Msgid) Msgid
769 > # endif
770 > #endif
771 >
772 > #ifndef YY_ATTRIBUTE
773 > # if (defined __GNUC__                                               \
774 >      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
775 >     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
776 > #  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
777 > # else
778 > #  define YY_ATTRIBUTE(Spec) /* empty */
779 > # endif
780 > #endif
781 >
782 > #ifndef YY_ATTRIBUTE_PURE
783 > # define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
784 > #endif
785 >
786 > #ifndef YY_ATTRIBUTE_UNUSED
787 > # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
788 > #endif
789 >
790 > #if !defined _Noreturn \
791 >     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
792 > # if defined _MSC_VER && 1200 <= _MSC_VER
793 > #  define _Noreturn __declspec (noreturn)
794 > # else
795 > #  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
796   # endif
797   #endif
798  
799   /* Suppress unused-variable warnings by "using" E.  */
800   #if ! defined lint || defined __GNUC__
801 < # define YYUSE(e) ((void) (e))
801 > # define YYUSE(E) ((void) (E))
802   #else
803 < # define YYUSE(e) /* empty */
803 > # define YYUSE(E) /* empty */
804   #endif
805  
806 < /* Identity function, used to suppress warnings about constant conditions.  */
807 < #ifndef lint
808 < # define YYID(n) (n)
809 < #else
810 < #if (defined __STDC__ || defined __C99__FUNC__ \
811 <     || defined __cplusplus || defined _MSC_VER)
812 < static int
813 < YYID (int yyi)
806 > #if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
807 > /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
808 > # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
809 >    _Pragma ("GCC diagnostic push") \
810 >    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
811 >    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
812 > # define YY_IGNORE_MAYBE_UNINITIALIZED_END \
813 >    _Pragma ("GCC diagnostic pop")
814   #else
815 < static int
838 < YYID (yyi)
839 <    int yyi;
815 > # define YY_INITIAL_VALUE(Value) Value
816   #endif
817 < {
818 <  return yyi;
819 < }
817 > #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
818 > # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
819 > # define YY_IGNORE_MAYBE_UNINITIALIZED_END
820   #endif
821 + #ifndef YY_INITIAL_VALUE
822 + # define YY_INITIAL_VALUE(Value) /* Nothing. */
823 + #endif
824 +
825  
826   #if ! defined yyoverflow || YYERROR_VERBOSE
827  
# Line 860 | Line 840 | YYID (yyi)
840   #    define alloca _alloca
841   #   else
842   #    define YYSTACK_ALLOC alloca
843 < #    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
864 <     || defined __cplusplus || defined _MSC_VER)
843 > #    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
844   #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
845 < #     ifndef _STDLIB_H
846 < #      define _STDLIB_H 1
845 >      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
846 > #     ifndef EXIT_SUCCESS
847 > #      define EXIT_SUCCESS 0
848   #     endif
849   #    endif
850   #   endif
# Line 872 | Line 852 | YYID (yyi)
852   # endif
853  
854   # ifdef YYSTACK_ALLOC
855 <   /* Pacify GCC's `empty if-body' warning.  */
856 < #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
855 >   /* Pacify GCC's 'empty if-body' warning.  */
856 > #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
857   #  ifndef YYSTACK_ALLOC_MAXIMUM
858      /* The OS might guarantee only one guard page at the bottom of the stack,
859         and a page size can be as small as 4096 bytes.  So we cannot safely
# Line 887 | Line 867 | YYID (yyi)
867   #  ifndef YYSTACK_ALLOC_MAXIMUM
868   #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
869   #  endif
870 < #  if (defined __cplusplus && ! defined _STDLIB_H \
870 > #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
871         && ! ((defined YYMALLOC || defined malloc) \
872 <             && (defined YYFREE || defined free)))
872 >             && (defined YYFREE || defined free)))
873   #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
874 < #   ifndef _STDLIB_H
875 < #    define _STDLIB_H 1
874 > #   ifndef EXIT_SUCCESS
875 > #    define EXIT_SUCCESS 0
876   #   endif
877   #  endif
878   #  ifndef YYMALLOC
879   #   define YYMALLOC malloc
880 < #   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
901 <     || defined __cplusplus || defined _MSC_VER)
880 > #   if ! defined malloc && ! defined EXIT_SUCCESS
881   void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
882   #   endif
883   #  endif
884   #  ifndef YYFREE
885   #   define YYFREE free
886 < #   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
908 <     || defined __cplusplus || defined _MSC_VER)
886 > #   if ! defined free && ! defined EXIT_SUCCESS
887   void free (void *); /* INFRINGES ON USER NAME SPACE */
888   #   endif
889   #  endif
# Line 915 | Line 893 | void free (void *); /* INFRINGES ON USER
893  
894   #if (! defined yyoverflow \
895       && (! defined __cplusplus \
896 <         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
896 >         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
897  
898   /* A type that is properly aligned for any stack member.  */
899   union yyalloc
# Line 933 | Line 911 | union yyalloc
911       ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
912        + YYSTACK_GAP_MAXIMUM)
913  
914 < /* Copy COUNT objects from FROM to TO.  The source and destination do
937 <   not overlap.  */
938 < # ifndef YYCOPY
939 < #  if defined __GNUC__ && 1 < __GNUC__
940 < #   define YYCOPY(To, From, Count) \
941 <      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
942 < #  else
943 < #   define YYCOPY(To, From, Count)              \
944 <      do                                        \
945 <        {                                       \
946 <          YYSIZE_T yyi;                         \
947 <          for (yyi = 0; yyi < (Count); yyi++)   \
948 <            (To)[yyi] = (From)[yyi];            \
949 <        }                                       \
950 <      while (YYID (0))
951 < #  endif
952 < # endif
914 > # define YYCOPY_NEEDED 1
915  
916   /* Relocate STACK from its old location to the new one.  The
917     local variables YYSIZE and YYSTACKSIZE give the old and new number of
918     elements in the stack, and YYPTR gives the new location of the
919     stack.  Advance YYPTR to a properly aligned location for the next
920     stack.  */
921 < # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
922 <    do                                                                  \
923 <      {                                                                 \
924 <        YYSIZE_T yynewbytes;                                            \
925 <        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
926 <        Stack = &yyptr->Stack_alloc;                                    \
927 <        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
928 <        yyptr += yynewbytes / sizeof (*yyptr);                          \
929 <      }                                                                 \
930 <    while (YYID (0))
921 > # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
922 >    do                                                                  \
923 >      {                                                                 \
924 >        YYSIZE_T yynewbytes;                                            \
925 >        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
926 >        Stack = &yyptr->Stack_alloc;                                    \
927 >        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
928 >        yyptr += yynewbytes / sizeof (*yyptr);                          \
929 >      }                                                                 \
930 >    while (0)
931  
932   #endif
933  
934 + #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
935 + /* Copy COUNT objects from SRC to DST.  The source and destination do
936 +   not overlap.  */
937 + # ifndef YYCOPY
938 + #  if defined __GNUC__ && 1 < __GNUC__
939 + #   define YYCOPY(Dst, Src, Count) \
940 +      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
941 + #  else
942 + #   define YYCOPY(Dst, Src, Count)              \
943 +      do                                        \
944 +        {                                       \
945 +          YYSIZE_T yyi;                         \
946 +          for (yyi = 0; yyi < (Count); yyi++)   \
947 +            (Dst)[yyi] = (Src)[yyi];            \
948 +        }                                       \
949 +      while (0)
950 + #  endif
951 + # endif
952 + #endif /* !YYCOPY_NEEDED */
953 +
954   /* YYFINAL -- State number of the termination state.  */
955   #define YYFINAL  2
956   /* YYLAST -- Last index in YYTABLE.  */
957 < #define YYLAST   1413
957 > #define YYLAST   1270
958  
959   /* YYNTOKENS -- Number of terminals.  */
960 < #define YYNTOKENS  267
960 > #define YYNTOKENS  240
961   /* YYNNTS -- Number of nonterminals.  */
962 < #define YYNNTS  346
962 > #define YYNNTS  298
963   /* YYNRULES -- Number of rules.  */
964 < #define YYNRULES  743
965 < /* YYNRULES -- Number of states.  */
966 < #define YYNSTATES  1494
964 > #define YYNRULES  669
965 > /* YYNSTATES -- Number of states.  */
966 > #define YYNSTATES  1324
967  
968 < /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
968 > /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
969 >   by yylex, with out-of-bounds checking.  */
970   #define YYUNDEFTOK  2
971 < #define YYMAXUTOK   516
971 > #define YYMAXUTOK   488
972  
973 < #define YYTRANSLATE(YYX)                                                \
973 > #define YYTRANSLATE(YYX)                                                \
974    ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
975  
976 < /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
977 < static const yytype_uint16 yytranslate[] =
976 > /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
977 >   as returned by yylex, without out-of-bounds checking.  */
978 > static const yytype_uint8 yytranslate[] =
979   {
980         0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
981         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
982         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
983         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
984 <       2,     2,     2,     2,   266,     2,     2,     2,     2,     2,
985 <       2,     2,     2,     2,     2,     2,     2,     2,     2,   262,
986 <       2,   265,     2,     2,     2,     2,     2,     2,     2,     2,
984 >       2,     2,     2,     2,   238,     2,     2,     2,     2,     2,
985 >       2,     2,     2,     2,     2,     2,     2,     2,   239,   234,
986 >       2,   237,     2,     2,     2,     2,     2,     2,     2,     2,
987         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
988         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
989         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
990         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
991         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
992 <       2,     2,     2,   264,     2,   263,     2,     2,     2,     2,
992 >       2,     2,     2,   236,     2,   235,     2,     2,     2,     2,
993         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
994         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
995         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
# Line 1041 | Line 1025 | static const yytype_uint16 yytranslate[]
1025       195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
1026       205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
1027       215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
1028 <     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
1045 <     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
1046 <     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
1047 <     255,   256,   257,   258,   259,   260,   261
1028 >     225,   226,   227,   228,   229,   230,   231,   232,   233
1029   };
1030  
1031   #if YYDEBUG
1032 < /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
1052 <   YYRHS.  */
1053 < static const yytype_uint16 yyprhs[] =
1054 < {
1055 <       0,     0,     3,     4,     7,     9,    11,    13,    15,    17,
1056 <      19,    21,    23,    25,    27,    29,    31,    33,    35,    37,
1057 <      39,    41,    43,    45,    47,    50,    53,    54,    56,    59,
1058 <      63,    67,    71,    75,    79,    80,    82,    85,    89,    93,
1059 <      97,   103,   106,   108,   110,   112,   115,   120,   125,   131,
1060 <     134,   136,   138,   140,   142,   144,   146,   148,   150,   152,
1061 <     154,   156,   158,   160,   163,   164,   170,   174,   176,   178,
1062 <     180,   185,   190,   195,   200,   205,   210,   215,   220,   225,
1063 <     230,   235,   241,   244,   246,   248,   250,   252,   255,   260,
1064 <     265,   270,   276,   279,   281,   283,   285,   287,   289,   291,
1065 <     293,   295,   297,   299,   301,   303,   305,   308,   313,   318,
1066 <     323,   328,   333,   338,   343,   348,   353,   358,   363,   368,
1067 <     373,   378,   383,   388,   393,   398,   399,   407,   408,   410,
1068 <     413,   415,   417,   419,   421,   423,   425,   427,   429,   431,
1069 <     433,   435,   437,   439,   441,   443,   445,   447,   449,   451,
1070 <     453,   455,   457,   459,   462,   467,   469,   474,   479,   484,
1071 <     489,   494,   495,   501,   505,   507,   509,   511,   513,   515,
1072 <     517,   519,   521,   523,   525,   527,   529,   531,   533,   535,
1073 <     537,   539,   541,   543,   545,   550,   555,   560,   565,   570,
1074 <     575,   580,   585,   590,   595,   600,   605,   610,   615,   616,
1075 <     622,   626,   628,   629,   633,   634,   637,   639,   641,   643,
1076 <     645,   647,   649,   651,   653,   655,   657,   659,   661,   663,
1077 <     665,   667,   669,   670,   678,   679,   681,   684,   686,   688,
1078 <     690,   692,   694,   696,   698,   700,   702,   704,   706,   708,
1079 <     710,   712,   715,   720,   722,   727,   732,   737,   742,   747,
1080 <     752,   757,   762,   767,   772,   777,   782,   783,   790,   791,
1081 <     797,   801,   803,   805,   807,   809,   812,   814,   816,   818,
1082 <     820,   822,   825,   826,   832,   836,   838,   840,   844,   849,
1083 <     854,   855,   862,   865,   867,   869,   871,   873,   875,   877,
1084 <     879,   881,   883,   885,   887,   889,   891,   893,   895,   897,
1085 <     899,   902,   907,   912,   917,   922,   927,   928,   934,   938,
1086 <     940,   941,   945,   946,   949,   951,   953,   955,   957,   959,
1087 <     961,   963,   965,   967,   969,   974,   979,   984,   989,   994,
1088 <     999,  1004,  1009,  1014,  1019,  1020,  1027,  1030,  1032,  1034,
1089 <    1036,  1038,  1041,  1046,  1051,  1056,  1057,  1064,  1067,  1069,
1090 <    1071,  1073,  1075,  1078,  1083,  1088,  1089,  1095,  1099,  1101,
1091 <    1103,  1105,  1107,  1109,  1111,  1113,  1115,  1117,  1119,  1121,
1092 <    1123,  1124,  1131,  1134,  1136,  1138,  1140,  1143,  1148,  1149,
1093 <    1155,  1159,  1161,  1163,  1165,  1167,  1169,  1171,  1173,  1175,
1094 <    1177,  1179,  1181,  1183,  1184,  1192,  1193,  1195,  1198,  1200,
1095 <    1202,  1204,  1206,  1208,  1210,  1212,  1214,  1216,  1218,  1220,
1096 <    1222,  1224,  1226,  1228,  1230,  1232,  1234,  1236,  1238,  1241,
1097 <    1246,  1248,  1253,  1258,  1263,  1268,  1273,  1278,  1283,  1288,
1098 <    1289,  1295,  1299,  1301,  1302,  1306,  1307,  1310,  1312,  1314,
1099 <    1316,  1318,  1320,  1325,  1330,  1335,  1340,  1345,  1350,  1355,
1100 <    1360,  1365,  1370,  1371,  1378,  1379,  1385,  1389,  1391,  1393,
1101 <    1396,  1398,  1400,  1402,  1404,  1406,  1411,  1416,  1417,  1424,
1102 <    1427,  1429,  1431,  1433,  1435,  1440,  1445,  1451,  1454,  1456,
1103 <    1458,  1460,  1465,  1466,  1473,  1474,  1480,  1484,  1486,  1488,
1104 <    1491,  1493,  1495,  1497,  1499,  1501,  1506,  1511,  1517,  1520,
1105 <    1522,  1524,  1526,  1528,  1530,  1532,  1534,  1536,  1538,  1540,
1106 <    1542,  1544,  1546,  1548,  1550,  1552,  1554,  1556,  1558,  1560,
1107 <    1562,  1564,  1566,  1568,  1570,  1572,  1574,  1576,  1578,  1580,
1108 <    1582,  1584,  1586,  1588,  1590,  1592,  1594,  1596,  1598,  1600,
1109 <    1602,  1604,  1606,  1608,  1610,  1612,  1614,  1616,  1618,  1620,
1110 <    1622,  1624,  1626,  1628,  1630,  1632,  1634,  1636,  1641,  1646,
1111 <    1651,  1656,  1661,  1666,  1671,  1676,  1681,  1686,  1691,  1696,
1112 <    1701,  1706,  1711,  1716,  1721,  1726,  1731,  1736,  1741,  1746,
1113 <    1751,  1756,  1761,  1766,  1771,  1776,  1781,  1786,  1791,  1796,
1114 <    1801,  1806,  1811,  1816,  1821,  1826,  1831,  1836,  1841,  1846,
1115 <    1851,  1856,  1861,  1866,  1871,  1876,  1881,  1886,  1891,  1892,
1116 <    1898,  1902,  1904,  1906,  1908,  1910,  1912,  1914,  1916,  1918,
1117 <    1920,  1922,  1924,  1926,  1928,  1930,  1932,  1934,  1936,  1938,
1118 <    1940,  1942,  1943,  1949,  1953,  1955,  1957,  1959,  1961,  1963,
1119 <    1965,  1967,  1969,  1971,  1973,  1975,  1977,  1979,  1981,  1983,
1120 <    1985,  1987,  1989,  1991,  1993,  1998,  2003,  2008,  2013,  2018,
1121 <    2019,  2026,  2029,  2031,  2033,  2035,  2037,  2039,  2041,  2043,
1122 <    2045,  2050,  2055,  2056,  2062,  2066,  2068,  2070,  2072,  2077,
1123 <    2082,  2083,  2089,  2093,  2095,  2097,  2099,  2105,  2108,  2110,
1124 <    2112,  2114,  2116,  2118,  2120,  2122,  2124,  2126,  2128,  2130,
1125 <    2132,  2134,  2136,  2138,  2140,  2142,  2144,  2146,  2148,  2153,
1126 <    2158,  2163,  2168,  2173,  2178,  2183,  2188,  2193,  2198,  2203,
1127 <    2208,  2213,  2218,  2223,  2228,  2233,  2238,  2244,  2247,  2249,
1128 <    2251,  2253,  2255,  2257,  2259,  2261,  2263,  2265,  2270,  2275,
1129 <    2280,  2285,  2290,  2295
1130 < };
1131 <
1132 < /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
1133 < static const yytype_int16 yyrhs[] =
1134 < {
1135 <     268,     0,    -1,    -1,   268,   269,    -1,   297,    -1,   303,
1136 <      -1,   318,    -1,   582,    -1,   355,    -1,   374,    -1,   388,
1137 <      -1,   279,    -1,   603,    -1,   414,    -1,   421,    -1,   431,
1138 <      -1,   440,    -1,   471,    -1,   481,    -1,   487,    -1,   501,
1139 <      -1,   566,    -1,   491,    -1,   274,    -1,     1,   262,    -1,
1140 <       1,   263,    -1,    -1,   271,    -1,   133,   270,    -1,   133,
1141 <     175,   270,    -1,   133,   176,   270,    -1,   133,   177,   270,
1142 <      -1,   133,   178,   270,    -1,   133,   179,   270,    -1,    -1,
1143 <     273,    -1,   133,   272,    -1,   133,    14,   272,    -1,   133,
1144 <      15,   272,    -1,   133,    16,   272,    -1,   121,   264,   275,
1145 <     263,   262,    -1,   275,   276,    -1,   276,    -1,   277,    -1,
1146 <     278,    -1,     1,   262,    -1,   120,   265,   155,   262,    -1,
1147 <     150,   265,   155,   262,    -1,   183,   264,   280,   263,   262,
1148 <      -1,   280,   281,    -1,   281,    -1,   288,    -1,   293,    -1,
1149 <     296,    -1,   290,    -1,   291,    -1,   292,    -1,   295,    -1,
1150 <     287,    -1,   294,    -1,   289,    -1,   286,    -1,   282,    -1,
1151 <       1,   262,    -1,    -1,   170,   283,   265,   284,   262,    -1,
1152 <     284,   266,   285,    -1,   285,    -1,   171,    -1,   172,    -1,
1153 <     169,   265,   155,   262,    -1,   167,   265,   155,   262,    -1,
1154 <     122,   265,   155,   262,    -1,   185,   265,   155,   262,    -1,
1155 <      37,   265,   155,   262,    -1,   125,   265,   155,   262,    -1,
1156 <     124,   265,   155,   262,    -1,   257,   265,   155,   262,    -1,
1157 <     258,   265,   155,   262,    -1,   229,   265,   133,   262,    -1,
1158 <      86,   265,   199,   262,    -1,     5,   264,   298,   263,   262,
1159 <      -1,   298,   299,    -1,   299,    -1,   300,    -1,   302,    -1,
1160 <     301,    -1,     1,   262,    -1,   122,   265,   155,   262,    -1,
1161 <      48,   265,   155,   262,    -1,    37,   265,   155,   262,    -1,
1162 <     104,   264,   304,   263,   262,    -1,   304,   305,    -1,   305,
1163 <      -1,   306,    -1,   307,    -1,   316,    -1,   317,    -1,   308,
1164 <      -1,   310,    -1,   312,    -1,   313,    -1,   315,    -1,   311,
1165 <      -1,   314,    -1,   309,    -1,     1,   262,    -1,   221,   265,
1166 <     155,   262,    -1,   140,   265,   155,   262,    -1,    64,   265,
1167 <     155,   262,    -1,    57,   265,   155,   262,    -1,    62,   265,
1168 <     155,   262,    -1,    63,   265,   155,   262,    -1,    60,   265,
1169 <     155,   262,    -1,    59,   265,   155,   262,    -1,    61,   265,
1170 <     155,   262,    -1,    58,   265,   155,   262,    -1,   105,   265,
1171 <     222,   262,    -1,   105,   265,   224,   262,    -1,   105,   265,
1172 <     228,   262,    -1,   105,   265,   226,   262,    -1,   105,   265,
1173 <     227,   262,    -1,   105,   265,   225,   262,    -1,   105,   265,
1174 <     223,   262,    -1,   255,   265,   199,   262,    -1,    -1,   138,
1175 <     319,   320,   264,   321,   263,   262,    -1,    -1,   324,    -1,
1176 <     321,   322,    -1,   322,    -1,   323,    -1,   325,    -1,   326,
1177 <      -1,   345,    -1,   346,    -1,   330,    -1,   329,    -1,   334,
1178 <      -1,   335,    -1,   337,    -1,   338,    -1,   339,    -1,   340,
1179 <      -1,   341,    -1,   336,    -1,   342,    -1,   343,    -1,   344,
1180 <      -1,   347,    -1,   327,    -1,   328,    -1,   348,    -1,     1,
1181 <     262,    -1,   122,   265,   155,   262,    -1,   155,    -1,   250,
1182 <     265,   155,   262,    -1,   149,   265,   155,   262,    -1,    50,
1183 <     265,   199,   262,    -1,   168,   265,   155,   262,    -1,    26,
1184 <     265,   155,   262,    -1,    -1,   238,   331,   265,   332,   262,
1185 <      -1,   332,   266,   333,    -1,   333,    -1,   206,    -1,   209,
1186 <      -1,   210,    -1,   212,    -1,   213,    -1,   216,    -1,   235,
1187 <      -1,   230,    -1,   232,    -1,   239,    -1,   236,    -1,   215,
1188 <      -1,   231,    -1,   234,    -1,   217,    -1,   242,    -1,   207,
1189 <      -1,   208,    -1,   220,    -1,    74,   265,   199,   262,    -1,
1190 <     163,   265,   199,   262,    -1,   164,   265,   199,   262,    -1,
1191 <      94,   265,   199,   262,    -1,   259,   265,   199,   262,    -1,
1192 <     249,   265,   199,   262,    -1,    67,   265,   199,   262,    -1,
1193 <     127,   265,   199,   262,    -1,    38,   265,   199,   262,    -1,
1194 <     161,   265,   199,   262,    -1,     5,   265,   199,   262,    -1,
1195 <      79,   265,   199,   262,    -1,    81,   265,   199,   262,    -1,
1196 <     231,   265,   199,   262,    -1,    -1,    55,   349,   265,   350,
1197 <     262,    -1,   350,   266,   351,    -1,   351,    -1,    -1,   132,
1198 <     352,   354,    -1,    -1,   353,   354,    -1,    74,    -1,   163,
1199 <      -1,    94,    -1,   249,    -1,   259,    -1,    67,    -1,    38,
1200 <      -1,   161,    -1,     5,    -1,    79,    -1,   127,    -1,   231,
1201 <      -1,   143,    -1,    81,    -1,   164,    -1,    50,    -1,    -1,
1202 <      26,   356,   357,   264,   358,   263,   262,    -1,    -1,   361,
1203 <      -1,   358,   359,    -1,   359,    -1,   360,    -1,   371,    -1,
1204 <     372,    -1,   362,    -1,   363,    -1,   373,    -1,   364,    -1,
1205 <     365,    -1,   366,    -1,   367,    -1,   368,    -1,   369,    -1,
1206 <     370,    -1,     1,   262,    -1,   122,   265,   155,   262,    -1,
1207 <     155,    -1,   152,   265,   271,   262,    -1,   153,   265,   271,
1208 <     262,    -1,   136,   265,   133,   262,    -1,    30,   265,   271,
1209 <     262,    -1,   114,   265,   133,   262,    -1,   109,   265,   133,
1210 <     262,    -1,   111,   265,   133,   262,    -1,   110,   265,   133,
1211 <     262,    -1,   180,   265,   273,   262,    -1,    23,   265,   133,
1212 <     262,    -1,    24,   265,   133,   262,    -1,   135,   265,   133,
1213 <     262,    -1,    -1,   102,   375,   264,   380,   263,   262,    -1,
1214 <      -1,    55,   377,   265,   378,   262,    -1,   378,   266,   379,
1215 <      -1,   379,    -1,   237,    -1,    78,    -1,   233,    -1,   380,
1216 <     381,    -1,   381,    -1,   382,    -1,   376,    -1,   386,    -1,
1217 <     387,    -1,     1,   262,    -1,    -1,   154,   265,   384,   383,
1218 <     262,    -1,   384,   266,   385,    -1,   385,    -1,   133,    -1,
1219 <     133,   204,   133,    -1,    91,   265,   155,   262,    -1,    85,
1220 <     265,   155,   262,    -1,    -1,    75,   389,   264,   390,   263,
1221 <     262,    -1,   390,   391,    -1,   391,    -1,   392,    -1,   393,
1222 <      -1,   395,    -1,   397,    -1,   404,    -1,   405,    -1,   406,
1223 <      -1,   408,    -1,   409,    -1,   410,    -1,   394,    -1,   411,
1224 <      -1,   412,    -1,   407,    -1,   413,    -1,   396,    -1,     1,
1225 <     262,    -1,   250,   265,   155,   262,    -1,   149,   265,   155,
1226 <     262,    -1,   193,   265,   199,   262,    -1,    26,   265,   155,
1227 <     262,    -1,    50,   265,   199,   262,    -1,    -1,    55,   398,
1228 <     265,   399,   262,    -1,   399,   266,   400,    -1,   400,    -1,
1229 <      -1,   132,   401,   403,    -1,    -1,   402,   403,    -1,   193,
1230 <      -1,    51,    -1,    95,    -1,    76,    -1,    20,    -1,    21,
1231 <      -1,   131,    -1,    69,    -1,   174,    -1,   123,    -1,    95,
1232 <     265,   199,   262,    -1,    76,   265,   199,   262,    -1,    51,
1233 <     265,   199,   262,    -1,    20,   265,   199,   262,    -1,   131,
1234 <     265,   199,   262,    -1,    69,   265,   199,   262,    -1,   192,
1235 <     265,   155,   262,    -1,   159,   265,   155,   262,    -1,   158,
1236 <     265,   133,   262,    -1,   123,   265,   199,   262,    -1,    -1,
1237 <     173,   415,   264,   416,   263,   262,    -1,   416,   417,    -1,
1238 <     417,    -1,   418,    -1,   419,    -1,   420,    -1,     1,   262,
1239 <      -1,   157,   265,   155,   262,    -1,    22,   265,   155,   262,
1240 <      -1,   126,   265,   155,   262,    -1,    -1,   187,   422,   264,
1241 <     423,   263,   262,    -1,   423,   424,    -1,   424,    -1,   425,
1242 <      -1,   426,    -1,   427,    -1,     1,   262,    -1,   122,   265,
1243 <     155,   262,    -1,   250,   265,   155,   262,    -1,    -1,   189,
1244 <     428,   265,   429,   262,    -1,   429,   266,   430,    -1,   430,
1245 <      -1,    94,    -1,   246,    -1,   249,    -1,   259,    -1,   247,
1246 <      -1,   241,    -1,   173,    -1,   248,    -1,   240,    -1,   220,
1247 <      -1,   205,    -1,    -1,   188,   432,   264,   433,   263,   262,
1248 <      -1,   433,   434,    -1,   434,    -1,   435,    -1,   436,    -1,
1249 <       1,   262,    -1,   122,   265,   155,   262,    -1,    -1,   189,
1250 <     437,   265,   438,   262,    -1,   438,   266,   439,    -1,   439,
1251 <      -1,    94,    -1,   246,    -1,   249,    -1,   259,    -1,   247,
1252 <      -1,   241,    -1,   173,    -1,   248,    -1,   240,    -1,   220,
1253 <      -1,   205,    -1,    -1,    29,   441,   442,   264,   443,   263,
1254 <     262,    -1,    -1,   446,    -1,   443,   444,    -1,   444,    -1,
1255 <     445,    -1,   447,    -1,   448,    -1,   449,    -1,   450,    -1,
1256 <     452,    -1,   451,    -1,   453,    -1,   454,    -1,   467,    -1,
1257 <     468,    -1,   469,    -1,   465,    -1,   462,    -1,   464,    -1,
1258 <     463,    -1,   461,    -1,   470,    -1,   466,    -1,     1,   262,
1259 <      -1,   122,   265,   155,   262,    -1,   155,    -1,    85,   265,
1260 <     155,   262,    -1,   257,   265,   155,   262,    -1,   181,   265,
1261 <     155,   262,    -1,     3,   265,   155,   262,    -1,   154,   265,
1262 <     133,   262,    -1,     6,   265,   218,   262,    -1,     6,   265,
1263 <     219,   262,    -1,    54,   265,   155,   262,    -1,    -1,    55,
1264 <     455,   265,   456,   262,    -1,   456,   266,   457,    -1,   457,
1265 <      -1,    -1,   132,   458,   460,    -1,    -1,   459,   460,    -1,
1266 <      27,    -1,    31,    -1,    10,    -1,    12,    -1,   244,    -1,
1267 <     168,   265,   155,   262,    -1,    50,   265,   199,   262,    -1,
1268 <      31,   265,   199,   262,    -1,    27,   265,   199,   262,    -1,
1269 <      10,   265,   199,   262,    -1,   244,   265,   199,   262,    -1,
1270 <      87,   265,   155,   262,    -1,   100,   265,   155,   262,    -1,
1271 <      26,   265,   155,   262,    -1,    25,   265,   155,   262,    -1,
1272 <      -1,    92,   472,   264,   477,   263,   262,    -1,    -1,   189,
1273 <     474,   265,   475,   262,    -1,   475,   266,   476,    -1,   476,
1274 <      -1,   160,    -1,   477,   478,    -1,   478,    -1,   479,    -1,
1275 <     480,    -1,   473,    -1,     1,    -1,   250,   265,   155,   262,
1276 <      -1,   157,   265,   155,   262,    -1,    -1,    36,   482,   264,
1277 <     483,   263,   262,    -1,   483,   484,    -1,   484,    -1,   485,
1278 <      -1,   486,    -1,     1,    -1,    91,   265,   155,   262,    -1,
1279 <     157,   265,   155,   262,    -1,    52,   264,   488,   263,   262,
1280 <      -1,   488,   489,    -1,   489,    -1,   490,    -1,     1,    -1,
1281 <      91,   265,   155,   262,    -1,    -1,    65,   492,   264,   497,
1282 <     263,   262,    -1,    -1,   189,   494,   265,   495,   262,    -1,
1283 <     495,   266,   496,    -1,   496,    -1,   160,    -1,   497,   498,
1284 <      -1,   498,    -1,   499,    -1,   500,    -1,   493,    -1,     1,
1285 <      -1,   122,   265,   155,   262,    -1,   157,   265,   155,   262,
1286 <      -1,    66,   264,   502,   263,   262,    -1,   502,   503,    -1,
1287 <     503,    -1,   512,    -1,   513,    -1,   515,    -1,   516,    -1,
1288 <     517,    -1,   518,    -1,   519,    -1,   520,    -1,   521,    -1,
1289 <     522,    -1,   511,    -1,   524,    -1,   525,    -1,   526,    -1,
1290 <     527,    -1,   543,    -1,   529,    -1,   531,    -1,   533,    -1,
1291 <     532,    -1,   536,    -1,   530,    -1,   537,    -1,   538,    -1,
1292 <     539,    -1,   540,    -1,   542,    -1,   541,    -1,   557,    -1,
1293 <     544,    -1,   548,    -1,   549,    -1,   553,    -1,   534,    -1,
1294 <     535,    -1,   563,    -1,   561,    -1,   562,    -1,   545,    -1,
1295 <     514,    -1,   546,    -1,   547,    -1,   564,    -1,   552,    -1,
1296 <     523,    -1,   565,    -1,   550,    -1,   551,    -1,   507,    -1,
1297 <     510,    -1,   505,    -1,   506,    -1,   508,    -1,   509,    -1,
1298 <     528,    -1,   504,    -1,     1,    -1,   116,   265,   133,   262,
1299 <      -1,    72,   265,   133,   262,    -1,    73,   265,   133,   262,
1300 <      -1,    12,   265,   199,   262,    -1,   256,   265,   199,   262,
1301 <      -1,   162,   265,   271,   262,    -1,   186,   265,   199,   262,
1302 <      -1,    93,   265,   133,   262,    -1,    84,   265,   199,   262,
1303 <      -1,    89,   265,   199,   262,    -1,    43,   265,   199,   262,
1304 <      -1,    53,   265,   199,   262,    -1,     8,   265,   199,   262,
1305 <      -1,   113,   265,   271,   262,    -1,   112,   265,   133,   262,
1306 <      -1,   106,   265,   133,   262,    -1,     9,   265,   271,   262,
1307 <      -1,   203,   265,   271,   262,    -1,   202,   265,   271,   262,
1308 <      -1,    77,   265,   133,   262,    -1,    97,   265,   199,   262,
1309 <      -1,    96,   265,   155,   262,    -1,    90,   265,   199,   262,
1310 <      -1,   261,   265,   199,   262,    -1,   194,   265,   199,   262,
1311 <      -1,   197,   265,   199,   262,    -1,   198,   265,   199,   262,
1312 <      -1,   196,   265,   199,   262,    -1,   196,   265,   200,   262,
1313 <      -1,   195,   265,   199,   262,    -1,   195,   265,   200,   262,
1314 <      -1,   147,   265,   271,   262,    -1,    19,   265,   271,   262,
1315 <      -1,   139,   265,   199,   262,    -1,   148,   265,   271,   262,
1316 <      -1,   190,   265,   199,   262,    -1,   130,   265,   199,   262,
1317 <      -1,   245,   265,   199,   262,    -1,   142,   265,   199,   262,
1318 <      -1,   117,   265,   155,   262,    -1,    88,   265,   271,   262,
1319 <      -1,    45,   265,   133,   262,    -1,   115,   265,   133,   262,
1320 <      -1,   184,   265,   155,   262,    -1,    32,   265,   155,   262,
1321 <      -1,    28,   265,   133,   262,    -1,   251,   265,   199,   262,
1322 <      -1,    47,   265,   155,   262,    -1,   151,   265,   199,   262,
1323 <      -1,    39,   265,   199,   262,    -1,   243,   265,   271,   262,
1324 <      -1,    -1,   144,   554,   265,   555,   262,    -1,   555,   266,
1325 <     556,    -1,   556,    -1,   206,    -1,   209,    -1,   210,    -1,
1326 <     212,    -1,   213,    -1,   216,    -1,   235,    -1,   230,    -1,
1327 <     232,    -1,   239,    -1,   236,    -1,   215,    -1,   231,    -1,
1328 <     234,    -1,   217,    -1,   242,    -1,   207,    -1,   208,    -1,
1329 <     220,    -1,    -1,   141,   558,   265,   559,   262,    -1,   559,
1330 <     266,   560,    -1,   560,    -1,   206,    -1,   209,    -1,   210,
1331 <      -1,   212,    -1,   213,    -1,   216,    -1,   235,    -1,   230,
1332 <      -1,   232,    -1,   239,    -1,   236,    -1,   215,    -1,   231,
1333 <      -1,   234,    -1,   217,    -1,   242,    -1,   207,    -1,   208,
1334 <      -1,   220,    -1,   118,   265,   133,   262,    -1,   119,   265,
1335 <     133,   262,    -1,    33,   265,   133,   262,    -1,   211,   265,
1336 <     273,   262,    -1,    44,   265,   199,   262,    -1,    -1,    68,
1337 <     567,   264,   568,   263,   262,    -1,   568,   569,    -1,   569,
1338 <      -1,   570,    -1,   571,    -1,   572,    -1,   576,    -1,   577,
1339 <      -1,   578,    -1,     1,    -1,    49,   265,   199,   262,    -1,
1340 <      46,   265,   271,   262,    -1,    -1,   104,   573,   265,   574,
1341 <     262,    -1,   574,   266,   575,    -1,   575,    -1,   201,    -1,
1342 <      11,    -1,   250,   265,   155,   262,    -1,   122,   265,   155,
1343 <     262,    -1,    -1,     4,   579,   265,   580,   262,    -1,   580,
1344 <     266,   581,    -1,   581,    -1,   201,    -1,    11,    -1,    22,
1345 <     264,   583,   263,   262,    -1,   583,   584,    -1,   584,    -1,
1346 <     587,    -1,   588,    -1,   589,    -1,   590,    -1,   595,    -1,
1347 <     591,    -1,   592,    -1,   593,    -1,   594,    -1,   596,    -1,
1348 <     597,    -1,   598,    -1,   586,    -1,   599,    -1,   600,    -1,
1349 <     601,    -1,   602,    -1,   585,    -1,     1,    -1,    40,   265,
1350 <     199,   262,    -1,   165,   265,   199,   262,    -1,    42,   265,
1351 <     199,   262,    -1,   252,   265,   199,   262,    -1,   253,   265,
1352 <     199,   262,    -1,   254,   265,   199,   262,    -1,    98,   265,
1353 <     271,   262,    -1,    99,   265,   271,   262,    -1,   108,   265,
1354 <     133,   262,    -1,   156,   265,   199,   262,    -1,   107,   265,
1355 <     133,   262,    -1,    35,   265,   133,   262,    -1,    34,   265,
1356 <     133,   262,    -1,   128,   265,   199,   262,    -1,   129,   265,
1357 <     199,   262,    -1,    13,   265,   199,   262,    -1,   145,   265,
1358 <     133,   262,    -1,   146,   265,   271,   262,    -1,   182,   264,
1359 <     604,   263,   262,    -1,   604,   605,    -1,   605,    -1,   606,
1360 <      -1,   607,    -1,   609,    -1,   611,    -1,   610,    -1,   608,
1361 <      -1,   612,    -1,     1,    -1,    56,   265,   199,   262,    -1,
1362 <      83,   265,   199,   262,    -1,    80,   265,   155,   262,    -1,
1363 <     101,   265,   271,   262,    -1,    78,   265,   199,   262,    -1,
1364 <      41,   265,   199,   262,    -1,    82,   265,   199,   262,    -1
1365 < };
1366 <
1367 < /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
1032 >  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
1033   static const yytype_uint16 yyrline[] =
1034   {
1035 <       0,   400,   400,   401,   404,   405,   406,   407,   408,   409,
1036 <     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
1037 <     420,   421,   422,   423,   424,   425,   429,   429,   430,   434,
1038 <     438,   442,   446,   450,   456,   456,   457,   458,   459,   460,
1039 <     467,   470,   470,   471,   471,   471,   473,   481,   490,   492,
1040 <     492,   493,   493,   494,   494,   495,   495,   496,   497,   497,
1041 <     498,   498,   499,   500,   504,   503,   518,   518,   519,   523,
1042 <     529,   563,   623,   637,   652,   661,   675,   684,   712,   742,
1043 <     765,   787,   789,   789,   790,   790,   791,   791,   793,   802,
1044 <     811,   824,   826,   827,   829,   829,   830,   831,   831,   832,
1045 <     832,   833,   833,   834,   834,   835,   836,   838,   842,   846,
1046 <     853,   860,   867,   874,   881,   888,   895,   902,   906,   910,
1047 <     914,   918,   922,   926,   932,   942,   941,  1035,  1035,  1036,
1048 <    1036,  1037,  1037,  1037,  1037,  1038,  1038,  1039,  1039,  1039,
1049 <    1040,  1040,  1040,  1041,  1041,  1041,  1042,  1042,  1042,  1042,
1050 <    1043,  1043,  1044,  1044,  1046,  1058,  1070,  1104,  1116,  1127,
1051 <    1169,  1179,  1178,  1184,  1184,  1185,  1189,  1193,  1197,  1201,
1052 <    1205,  1209,  1213,  1217,  1221,  1225,  1229,  1233,  1237,  1241,
1053 <    1245,  1249,  1253,  1257,  1263,  1274,  1285,  1296,  1307,  1318,
1054 <    1329,  1340,  1351,  1362,  1373,  1384,  1395,  1406,  1418,  1417,
1055 <    1421,  1421,  1422,  1422,  1423,  1423,  1425,  1432,  1439,  1446,
1056 <    1453,  1460,  1467,  1474,  1481,  1488,  1495,  1502,  1509,  1516,
1057 <    1523,  1530,  1544,  1543,  1593,  1593,  1595,  1595,  1596,  1597,
1058 <    1597,  1598,  1599,  1600,  1601,  1602,  1603,  1604,  1605,  1606,
1059 <    1607,  1608,  1610,  1619,  1628,  1634,  1640,  1646,  1652,  1658,
1060 <    1664,  1670,  1676,  1682,  1688,  1694,  1704,  1703,  1720,  1719,
1061 <    1724,  1724,  1725,  1729,  1733,  1741,  1741,  1742,  1742,  1742,
1062 <    1742,  1742,  1744,  1744,  1746,  1746,  1748,  1762,  1782,  1791,
1063 <    1804,  1803,  1872,  1872,  1873,  1873,  1873,  1873,  1874,  1874,
1064 <    1875,  1875,  1875,  1876,  1876,  1877,  1877,  1877,  1878,  1878,
1065 <    1878,  1880,  1917,  1930,  1941,  1950,  1962,  1961,  1965,  1965,
1066 <    1966,  1966,  1967,  1967,  1969,  1977,  1984,  1991,  1998,  2005,
1067 <    2012,  2019,  2026,  2033,  2042,  2053,  2064,  2075,  2086,  2097,
1068 <    2109,  2128,  2138,  2147,  2163,  2162,  2178,  2178,  2179,  2179,
1069 <    2179,  2179,  2181,  2190,  2205,  2219,  2218,  2234,  2234,  2235,
1070 <    2235,  2235,  2235,  2237,  2246,  2269,  2268,  2274,  2274,  2275,
1071 <    2279,  2283,  2287,  2291,  2295,  2299,  2303,  2307,  2311,  2315,
1072 <    2325,  2324,  2341,  2341,  2342,  2342,  2342,  2344,  2351,  2350,
1073 <    2356,  2356,  2357,  2361,  2365,  2369,  2373,  2377,  2381,  2385,
1074 <    2389,  2393,  2397,  2407,  2406,  2552,  2552,  2553,  2553,  2554,
1075 <    2554,  2554,  2555,  2555,  2556,  2556,  2557,  2557,  2557,  2558,
1076 <    2558,  2558,  2559,  2559,  2559,  2560,  2560,  2561,  2561,  2563,
1077 <    2575,  2587,  2596,  2622,  2640,  2658,  2664,  2668,  2676,  2686,
1078 <    2685,  2689,  2689,  2690,  2690,  2691,  2691,  2693,  2704,  2711,
1079 <    2718,  2725,  2735,  2776,  2787,  2798,  2813,  2824,  2835,  2848,
1080 <    2861,  2870,  2906,  2905,  2970,  2969,  2973,  2973,  2974,  2980,
1081 <    2980,  2981,  2981,  2981,  2981,  2983,  3002,  3012,  3011,  3033,
1082 <    3033,  3034,  3034,  3034,  3036,  3045,  3057,  3059,  3059,  3060,
1083 <    3060,  3062,  3084,  3083,  3126,  3125,  3129,  3129,  3130,  3136,
1084 <    3136,  3137,  3137,  3137,  3137,  3139,  3145,  3154,  3157,  3157,
1085 <    3158,  3158,  3159,  3159,  3160,  3160,  3161,  3161,  3162,  3162,
1086 <    3163,  3163,  3164,  3164,  3165,  3165,  3166,  3166,  3167,  3167,
1087 <    3168,  3168,  3169,  3169,  3170,  3170,  3171,  3171,  3172,  3172,
1088 <    3173,  3173,  3174,  3174,  3175,  3175,  3176,  3176,  3177,  3177,
1089 <    3178,  3179,  3179,  3180,  3180,  3181,  3181,  3182,  3182,  3183,
1090 <    3183,  3184,  3184,  3185,  3185,  3186,  3187,  3190,  3195,  3200,
1091 <    3205,  3210,  3215,  3220,  3225,  3230,  3235,  3240,  3245,  3250,
1092 <    3255,  3260,  3265,  3270,  3275,  3280,  3286,  3297,  3302,  3311,
1093 <    3316,  3321,  3326,  3331,  3336,  3339,  3344,  3347,  3352,  3357,
1094 <    3362,  3367,  3372,  3377,  3382,  3387,  3392,  3403,  3408,  3413,
1095 <    3418,  3427,  3459,  3477,  3482,  3491,  3496,  3501,  3507,  3506,
1096 <    3511,  3511,  3512,  3515,  3518,  3521,  3524,  3527,  3530,  3533,
1097 <    3536,  3539,  3542,  3545,  3548,  3551,  3554,  3557,  3560,  3563,
1098 <    3566,  3572,  3571,  3576,  3576,  3577,  3580,  3583,  3586,  3589,
1099 <    3592,  3595,  3598,  3601,  3604,  3607,  3610,  3613,  3616,  3619,
1100 <    3622,  3625,  3628,  3631,  3636,  3641,  3646,  3651,  3656,  3665,
1101 <    3664,  3688,  3688,  3689,  3690,  3691,  3692,  3693,  3694,  3695,
1437 <    3697,  3703,  3710,  3709,  3714,  3714,  3715,  3719,  3725,  3759,
1438 <    3769,  3768,  3818,  3818,  3819,  3823,  3832,  3835,  3835,  3836,
1439 <    3836,  3837,  3837,  3838,  3838,  3839,  3839,  3840,  3840,  3841,
1440 <    3842,  3842,  3843,  3843,  3844,  3844,  3845,  3845,  3847,  3852,
1441 <    3857,  3862,  3867,  3872,  3877,  3882,  3887,  3892,  3897,  3902,
1442 <    3907,  3912,  3917,  3922,  3927,  3932,  3940,  3943,  3943,  3944,
1443 <    3944,  3945,  3946,  3947,  3947,  3948,  3949,  3951,  3957,  3963,
1444 <    3972,  3986,  3992,  3998
1035 >       0,   389,   389,   390,   393,   394,   395,   396,   397,   398,
1036 >     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
1037 >     409,   410,   411,   412,   413,   414,   415,   416,   420,   420,
1038 >     421,   422,   423,   424,   425,   426,   427,   428,   431,   431,
1039 >     432,   433,   434,   435,   442,   445,   445,   446,   446,   446,
1040 >     448,   454,   461,   463,   463,   464,   465,   466,   467,   468,
1041 >     469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
1042 >     479,   480,   481,   484,   524,   582,   611,   619,   633,   661,
1043 >     676,   691,   701,   715,   724,   752,   780,   805,   827,   849,
1044 >     858,   860,   860,   861,   862,   863,   864,   866,   875,   884,
1045 >     897,   896,   914,   914,   915,   915,   915,   917,   923,   933,
1046 >     932,   951,   951,   952,   952,   952,   952,   952,   954,   960,
1047 >     966,   972,   995,   996,   996,   998,   998,   999,  1001,  1008,
1048 >    1008,  1021,  1022,  1024,  1024,  1025,  1025,  1027,  1035,  1038,
1049 >    1044,  1043,  1049,  1049,  1050,  1054,  1058,  1062,  1066,  1070,
1050 >    1074,  1078,  1082,  1093,  1092,  1178,  1178,  1179,  1180,  1181,
1051 >    1182,  1183,  1184,  1185,  1186,  1187,  1188,  1189,  1191,  1197,
1052 >    1203,  1209,  1220,  1226,  1232,  1243,  1250,  1249,  1255,  1255,
1053 >    1256,  1260,  1264,  1268,  1272,  1276,  1280,  1284,  1288,  1292,
1054 >    1296,  1300,  1304,  1308,  1312,  1316,  1320,  1324,  1328,  1332,
1055 >    1336,  1340,  1347,  1346,  1352,  1352,  1353,  1357,  1361,  1365,
1056 >    1369,  1373,  1377,  1381,  1385,  1389,  1393,  1397,  1401,  1405,
1057 >    1409,  1413,  1417,  1421,  1425,  1429,  1433,  1437,  1441,  1452,
1058 >    1451,  1513,  1513,  1514,  1515,  1516,  1517,  1518,  1519,  1520,
1059 >    1521,  1522,  1523,  1524,  1525,  1526,  1526,  1527,  1528,  1529,
1060 >    1530,  1532,  1538,  1544,  1550,  1556,  1562,  1568,  1574,  1580,
1061 >    1586,  1592,  1599,  1605,  1611,  1617,  1626,  1636,  1635,  1641,
1062 >    1641,  1642,  1646,  1657,  1656,  1663,  1662,  1667,  1667,  1668,
1063 >    1672,  1676,  1682,  1682,  1683,  1683,  1683,  1683,  1683,  1685,
1064 >    1685,  1687,  1687,  1689,  1702,  1719,  1725,  1735,  1734,  1776,
1065 >    1776,  1777,  1778,  1779,  1780,  1781,  1782,  1783,  1784,  1785,
1066 >    1787,  1793,  1799,  1805,  1817,  1816,  1822,  1822,  1823,  1827,
1067 >    1831,  1835,  1839,  1843,  1847,  1851,  1855,  1859,  1865,  1879,
1068 >    1888,  1902,  1901,  1916,  1916,  1917,  1917,  1917,  1917,  1919,
1069 >    1925,  1931,  1941,  1943,  1943,  1944,  1944,  1946,  1962,  1961,
1070 >    1986,  1986,  1987,  1987,  1987,  1987,  1989,  1995,  2015,  2014,
1071 >    2020,  2020,  2021,  2025,  2029,  2033,  2037,  2041,  2045,  2049,
1072 >    2053,  2057,  2067,  2066,  2087,  2087,  2088,  2088,  2088,  2090,
1073 >    2097,  2096,  2102,  2102,  2103,  2107,  2111,  2115,  2119,  2123,
1074 >    2127,  2131,  2135,  2139,  2149,  2148,  2220,  2220,  2221,  2222,
1075 >    2223,  2224,  2225,  2226,  2227,  2228,  2229,  2230,  2231,  2232,
1076 >    2233,  2234,  2235,  2237,  2243,  2249,  2255,  2268,  2281,  2287,
1077 >    2293,  2297,  2304,  2303,  2308,  2308,  2309,  2313,  2319,  2330,
1078 >    2336,  2342,  2348,  2364,  2363,  2389,  2389,  2390,  2390,  2390,
1079 >    2392,  2412,  2422,  2421,  2448,  2448,  2449,  2449,  2449,  2451,
1080 >    2457,  2466,  2468,  2468,  2469,  2469,  2471,  2489,  2488,  2511,
1081 >    2511,  2512,  2512,  2512,  2514,  2520,  2529,  2532,  2532,  2533,
1082 >    2534,  2535,  2536,  2537,  2538,  2539,  2540,  2541,  2542,  2543,
1083 >    2544,  2545,  2546,  2547,  2548,  2549,  2550,  2551,  2552,  2553,
1084 >    2554,  2555,  2556,  2557,  2558,  2559,  2560,  2561,  2562,  2563,
1085 >    2564,  2565,  2566,  2567,  2568,  2569,  2570,  2571,  2572,  2573,
1086 >    2574,  2575,  2576,  2577,  2578,  2579,  2580,  2581,  2582,  2585,
1087 >    2590,  2595,  2600,  2606,  2612,  2618,  2624,  2629,  2634,  2639,
1088 >    2644,  2649,  2654,  2659,  2664,  2669,  2674,  2679,  2684,  2689,
1089 >    2695,  2706,  2711,  2716,  2721,  2726,  2731,  2736,  2739,  2744,
1090 >    2747,  2752,  2757,  2762,  2767,  2772,  2777,  2782,  2787,  2792,
1091 >    2797,  2802,  2807,  2812,  2817,  2823,  2822,  2827,  2827,  2828,
1092 >    2831,  2834,  2837,  2840,  2843,  2846,  2849,  2852,  2855,  2858,
1093 >    2861,  2864,  2867,  2870,  2873,  2876,  2879,  2882,  2885,  2888,
1094 >    2891,  2897,  2896,  2901,  2901,  2902,  2905,  2908,  2911,  2914,
1095 >    2917,  2920,  2923,  2926,  2929,  2932,  2935,  2938,  2941,  2944,
1096 >    2947,  2950,  2953,  2956,  2959,  2964,  2969,  2974,  2983,  2986,
1097 >    2986,  2987,  2988,  2989,  2990,  2991,  2992,  2993,  2994,  2995,
1098 >    2996,  2997,  2998,  2999,  3000,  3001,  3003,  3008,  3013,  3018,
1099 >    3023,  3028,  3033,  3038,  3043,  3048,  3053,  3058,  3063,  3068,
1100 >    3076,  3079,  3079,  3080,  3081,  3082,  3083,  3084,  3085,  3086,
1101 >    3087,  3088,  3090,  3096,  3102,  3108,  3114,  3123,  3138,  3144
1102   };
1103   #endif
1104  
1105 < #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
1105 > #if YYDEBUG || YYERROR_VERBOSE || 0
1106   /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
1107     First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
1108   static const char *const yytname[] =
1109   {
1110 <  "$end", "error", "$undefined", "ACCEPT_PASSWORD", "ACTION", "ADMIN",
1111 <  "AFTYPE", "T_ALLOW", "ANTI_NICK_FLOOD", "ANTI_SPAM_EXIT_MESSAGE_TIME",
1112 <  "AUTOCONN", "T_BLOCK", "BURST_AWAY", "BURST_TOPICWHO", "BYTES", "KBYTES",
1113 <  "MBYTES", "GBYTES", "TBYTES", "CALLER_ID_WAIT", "CAN_FLOOD", "CAN_IDLE",
1114 <  "CHANNEL", "CIDR_BITLEN_IPV4", "CIDR_BITLEN_IPV6", "CIPHER_PREFERENCE",
1458 <  "CLASS", "COMPRESSED", "COMPRESSION_LEVEL", "CONNECT", "CONNECTFREQ",
1459 <  "CRYPTLINK", "DEFAULT_CIPHER_PREFERENCE", "DEFAULT_FLOODCOUNT",
1110 >  "$end", "error", "$undefined", "ACCEPT_PASSWORD", "ADMIN", "AFTYPE",
1111 >  "ANTI_NICK_FLOOD", "ANTI_SPAM_EXIT_MESSAGE_TIME", "AUTOCONN",
1112 >  "AWAY_COUNT", "AWAY_TIME", "BYTES", "KBYTES", "MBYTES", "CALLER_ID_WAIT",
1113 >  "CAN_FLOOD", "CHANNEL", "CIDR_BITLEN_IPV4", "CIDR_BITLEN_IPV6", "CLASS",
1114 >  "CONNECT", "CONNECTFREQ", "CYCLE_ON_HOST_CHANGE", "DEFAULT_FLOODCOUNT",
1115    "DEFAULT_SPLIT_SERVER_COUNT", "DEFAULT_SPLIT_USER_COUNT", "DENY",
1116    "DESCRIPTION", "DIE", "DISABLE_AUTH", "DISABLE_FAKE_CHANNELS",
1117 <  "DISABLE_HIDDEN", "DISABLE_LOCAL_CHANNELS", "DISABLE_REMOTE_COMMANDS",
1118 <  "DOT_IN_IP6_ADDR", "DOTS_IN_IDENT", "DURATION", "EGDPOOL_PATH", "EMAIL",
1119 <  "ENABLE", "ENCRYPTED", "EXCEED_LIMIT", "EXEMPT", "FAILED_OPER_NOTICE",
1120 <  "FAKENAME", "IRCD_FLAGS", "FLATTEN_LINKS", "FFAILED_OPERLOG", "FKILLLOG",
1121 <  "FKLINELOG", "FGLINELOG", "FIOERRLOG", "FOPERLOG", "FOPERSPYLOG",
1122 <  "FUSERLOG", "GECOS", "GENERAL", "GLINE", "GLINES", "GLINE_EXEMPT",
1123 <  "GLINE_LOG", "GLINE_TIME", "GLINE_MIN_CIDR", "GLINE_MIN_CIDR6",
1124 <  "GLOBAL_KILL", "IRCD_AUTH", "NEED_IDENT", "HAVENT_READ_CONF", "HIDDEN",
1125 <  "HIDDEN_ADMIN", "HIDDEN_NAME", "HIDDEN_OPER", "HIDE_SERVER_IPS",
1126 <  "HIDE_SERVERS", "HIDE_SPOOF_IPS", "HOST", "HUB", "HUB_MASK", "IDLETIME",
1127 <  "IGNORE_BOGUS_TS", "INVISIBLE_ON_CONNECT", "IP", "KILL",
1128 <  "KILL_CHASE_TIME_LIMIT", "KLINE", "KLINE_EXEMPT", "KLINE_REASON",
1129 <  "KLINE_WITH_REASON", "KNOCK_DELAY", "KNOCK_DELAY_CHANNEL", "LEAF_MASK",
1130 <  "LINKS_DELAY", "LISTEN", "T_LOG", "LOGGING", "LOG_LEVEL", "MAX_ACCEPT",
1131 <  "MAX_BANS", "MAX_CHANS_PER_USER", "MAX_GLOBAL", "MAX_IDENT", "MAX_LOCAL",
1132 <  "MAX_NICK_CHANGES", "MAX_NICK_TIME", "MAX_NUMBER", "MAX_TARGETS",
1133 <  "MAX_WATCH", "MESSAGE_LOCALE", "MIN_NONWILDCARD",
1134 <  "MIN_NONWILDCARD_SIMPLE", "MODULE", "MODULES", "NAME", "NEED_PASSWORD",
1480 <  "NETWORK_DESC", "NETWORK_NAME", "NICK", "NICK_CHANGES",
1117 >  "DISABLE_REMOTE_COMMANDS", "DOTS_IN_IDENT", "EGDPOOL_PATH", "EMAIL",
1118 >  "ENCRYPTED", "EXCEED_LIMIT", "EXEMPT", "FAILED_OPER_NOTICE",
1119 >  "FLATTEN_LINKS", "GECOS", "GENERAL", "GLINE", "GLINE_DURATION",
1120 >  "GLINE_ENABLE", "GLINE_EXEMPT", "GLINE_MIN_CIDR", "GLINE_MIN_CIDR6",
1121 >  "GLINE_REQUEST_DURATION", "GLOBAL_KILL", "HAVENT_READ_CONF", "HIDDEN",
1122 >  "HIDDEN_NAME", "HIDE_CHANS", "HIDE_IDLE", "HIDE_IDLE_FROM_OPERS",
1123 >  "HIDE_SERVER_IPS", "HIDE_SERVERS", "HIDE_SERVICES", "HIDE_SPOOF_IPS",
1124 >  "HOST", "HUB", "HUB_MASK", "IGNORE_BOGUS_TS", "INVISIBLE_ON_CONNECT",
1125 >  "INVITE_CLIENT_COUNT", "INVITE_CLIENT_TIME", "IP", "IRCD_AUTH",
1126 >  "IRCD_FLAGS", "IRCD_SID", "JOIN_FLOOD_COUNT", "JOIN_FLOOD_TIME", "KILL",
1127 >  "KILL_CHASE_TIME_LIMIT", "KLINE", "KLINE_EXEMPT", "KNOCK_CLIENT_COUNT",
1128 >  "KNOCK_CLIENT_TIME", "KNOCK_DELAY_CHANNEL", "LEAF_MASK", "LINKS_DELAY",
1129 >  "LISTEN", "MASK", "MAX_ACCEPT", "MAX_BANS", "MAX_CHANNELS", "MAX_GLOBAL",
1130 >  "MAX_IDENT", "MAX_IDLE", "MAX_LOCAL", "MAX_NICK_CHANGES",
1131 >  "MAX_NICK_LENGTH", "MAX_NICK_TIME", "MAX_NUMBER", "MAX_TARGETS",
1132 >  "MAX_TOPIC_LENGTH", "MAX_WATCH", "MIN_IDLE", "MIN_NONWILDCARD",
1133 >  "MIN_NONWILDCARD_SIMPLE", "MODULE", "MODULES", "MOTD", "NAME",
1134 >  "NEED_IDENT", "NEED_PASSWORD", "NETWORK_DESC", "NETWORK_NAME", "NICK",
1135    "NO_CREATE_ON_SPLIT", "NO_JOIN_ON_SPLIT", "NO_OPER_FLOOD", "NO_TILDE",
1136 <  "NOT", "NUMBER", "NUMBER_PER_IDENT", "NUMBER_PER_CIDR", "NUMBER_PER_IP",
1137 <  "NUMBER_PER_IP_GLOBAL", "OPERATOR", "OPERS_BYPASS_CALLERID", "OPER_LOG",
1138 <  "OPER_ONLY_UMODES", "OPER_PASS_RESV", "OPER_SPY_T", "OPER_UMODES",
1139 <  "JOIN_FLOOD_COUNT", "JOIN_FLOOD_TIME", "PACE_WAIT", "PACE_WAIT_SIMPLE",
1140 <  "PASSWORD", "PATH", "PING_COOKIE", "PING_TIME", "PING_WARNING", "PORT",
1141 <  "QSTRING", "QUIET_ON_BAN", "REASON", "REDIRPORT", "REDIRSERV", "REGEX_T",
1142 <  "REHASH", "TREJECT_HOLD_TIME", "REMOTE", "REMOTEBAN",
1143 <  "RESTRICT_CHANNELS", "RESTRICTED", "RSA_PRIVATE_KEY_FILE",
1144 <  "RSA_PUBLIC_KEY_FILE", "SSL_CERTIFICATE_FILE", "T_SSL_CONNECTION_METHOD",
1145 <  "T_SSLV3", "T_TLSV1", "RESV", "RESV_EXEMPT", "SECONDS", "MINUTES",
1146 <  "HOURS", "DAYS", "WEEKS", "SENDQ", "SEND_PASSWORD", "SERVERHIDE",
1147 <  "SERVERINFO", "SERVLINK_PATH", "IRCD_SID", "TKLINE_EXPIRE_NOTICES",
1148 <  "T_SHARED", "T_CLUSTER", "TYPE", "SHORT_MOTD", "SILENT", "SPOOF",
1149 <  "SPOOF_NOTICE", "STATS_E_DISABLED", "STATS_I_OPER_ONLY",
1150 <  "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY", "TBOOL",
1151 <  "TMASKED", "T_REJECT", "TS_MAX_DELTA", "TS_WARN_DELTA", "TWODOTS",
1152 <  "T_ALL", "T_BOTS", "T_SOFTCALLERID", "T_CALLERID", "T_CCONN",
1153 <  "T_CCONN_FULL", "T_CLIENT_FLOOD", "T_DEAF", "T_DEBUG", "T_DRONE",
1154 <  "T_EXTERNAL", "T_FULL", "T_INVISIBLE", "T_IPV4", "T_IPV6", "T_LOCOPS",
1155 <  "T_LOGPATH", "T_L_CRIT", "T_L_DEBUG", "T_L_ERROR", "T_L_INFO",
1156 <  "T_L_NOTICE", "T_L_TRACE", "T_L_WARN", "T_MAX_CLIENTS", "T_NCHANGE",
1157 <  "T_OPERWALL", "T_REJ", "T_SERVER", "T_SERVNOTICE", "T_SKILL", "T_SPY",
1158 <  "T_SSL", "T_UMODES", "T_UNAUTH", "T_UNRESV", "T_UNXLINE", "T_WALLOP",
1159 <  "THROTTLE_TIME", "TOPICBURST", "TRUE_NO_OPER_FLOOD", "TKLINE", "TXLINE",
1160 <  "TRESV", "UNKLINE", "USER", "USE_EGD", "USE_EXCEPT", "USE_INVEX",
1161 <  "USE_KNOCK", "USE_LOGGING", "USE_WHOIS_ACTUALLY", "VHOST", "VHOST6",
1162 <  "XLINE", "WARN", "WARN_NO_NLINE", "';'", "'}'", "'{'", "'='", "','",
1163 <  "$accept", "conf", "conf_item", "timespec_", "timespec", "sizespec_",
1164 <  "sizespec", "modules_entry", "modules_items", "modules_item",
1165 <  "modules_module", "modules_path", "serverinfo_entry", "serverinfo_items",
1166 <  "serverinfo_item", "serverinfo_ssl_connection_method", "$@1",
1167 <  "method_types", "method_type_item", "serverinfo_ssl_certificate_file",
1514 <  "serverinfo_rsa_private_key_file", "serverinfo_name", "serverinfo_sid",
1136 >  "NUMBER", "NUMBER_PER_CIDR", "NUMBER_PER_IP", "OPER_ONLY_UMODES",
1137 >  "OPER_PASS_RESV", "OPER_UMODES", "OPERATOR", "OPERS_BYPASS_CALLERID",
1138 >  "PACE_WAIT", "PACE_WAIT_SIMPLE", "PASSWORD", "PATH", "PING_COOKIE",
1139 >  "PING_TIME", "PORT", "QSTRING", "RANDOM_IDLE", "REASON", "REDIRPORT",
1140 >  "REDIRSERV", "REHASH", "REMOTE", "REMOTEBAN", "RESV", "RESV_EXEMPT",
1141 >  "RSA_PRIVATE_KEY_FILE", "RSA_PUBLIC_KEY_FILE", "SECONDS", "MINUTES",
1142 >  "HOURS", "DAYS", "WEEKS", "MONTHS", "YEARS", "SEND_PASSWORD", "SENDQ",
1143 >  "SERVERHIDE", "SERVERINFO", "SHORT_MOTD", "SPOOF", "SPOOF_NOTICE",
1144 >  "SQUIT", "SSL_CERTIFICATE_FILE", "SSL_CERTIFICATE_FINGERPRINT",
1145 >  "SSL_CONNECTION_REQUIRED", "SSL_DH_ELLIPTIC_CURVE", "SSL_DH_PARAM_FILE",
1146 >  "SSL_MESSAGE_DIGEST_ALGORITHM", "STATS_E_DISABLED", "STATS_I_OPER_ONLY",
1147 >  "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY",
1148 >  "STATS_U_OPER_ONLY", "T_ALL", "T_BOTS", "T_CALLERID", "T_CCONN",
1149 >  "T_COMMAND", "T_CLUSTER", "T_DEAF", "T_DEBUG", "T_DLINE", "T_EXTERNAL",
1150 >  "T_FARCONNECT", "T_FILE", "T_FULL", "T_GLOBOPS", "T_INVISIBLE", "T_IPV4",
1151 >  "T_IPV6", "T_LOCOPS", "T_LOG", "T_MAX_CLIENTS", "T_NCHANGE",
1152 >  "T_NONONREG", "T_PREPEND", "T_PSEUDO", "T_RECVQ", "T_REJ", "T_RESTART",
1153 >  "T_SERVER", "T_SERVICE", "T_SERVNOTICE", "T_SET", "T_SHARED", "T_SIZE",
1154 >  "T_SKILL", "T_SOFTCALLERID", "T_SPY", "T_SSL", "T_SSL_CIPHER_LIST",
1155 >  "T_TARGET", "T_UMODES", "T_UNAUTH", "T_UNDLINE", "T_UNLIMITED",
1156 >  "T_UNRESV", "T_UNXLINE", "T_WALLOP", "T_WALLOPS", "T_WEBIRC", "TBOOL",
1157 >  "THROTTLE_COUNT", "THROTTLE_TIME", "TKLINE_EXPIRE_NOTICES", "TMASKED",
1158 >  "TRUE_NO_OPER_FLOOD", "TS_MAX_DELTA", "TS_WARN_DELTA", "TWODOTS", "TYPE",
1159 >  "UNKLINE", "USE_EGD", "USE_LOGGING", "USER", "VHOST", "VHOST6",
1160 >  "WARN_NO_CONNECT_BLOCK", "XLINE", "';'", "'}'", "'{'", "'='", "','",
1161 >  "':'", "$accept", "conf", "conf_item", "timespec_", "timespec",
1162 >  "sizespec_", "sizespec", "modules_entry", "modules_items",
1163 >  "modules_item", "modules_module", "modules_path", "serverinfo_entry",
1164 >  "serverinfo_items", "serverinfo_item", "serverinfo_ssl_certificate_file",
1165 >  "serverinfo_rsa_private_key_file", "serverinfo_ssl_dh_param_file",
1166 >  "serverinfo_ssl_cipher_list", "serverinfo_ssl_message_digest_algorithm",
1167 >  "serverinfo_ssl_dh_elliptic_curve", "serverinfo_name", "serverinfo_sid",
1168    "serverinfo_description", "serverinfo_network_name",
1169    "serverinfo_network_desc", "serverinfo_vhost", "serverinfo_vhost6",
1170 <  "serverinfo_max_clients", "serverinfo_hub", "admin_entry", "admin_items",
1171 <  "admin_item", "admin_name", "admin_email", "admin_description",
1172 <  "logging_entry", "logging_items", "logging_item", "logging_path",
1173 <  "logging_oper_log", "logging_fuserlog", "logging_ffailed_operlog",
1174 <  "logging_foperlog", "logging_foperspylog", "logging_fglinelog",
1175 <  "logging_fklinelog", "logging_ioerrlog", "logging_killlog",
1176 <  "logging_log_level", "logging_use_logging", "oper_entry", "$@2",
1177 <  "oper_name_b", "oper_items", "oper_item", "oper_name", "oper_name_t",
1178 <  "oper_user", "oper_password", "oper_encrypted",
1179 <  "oper_rsa_public_key_file", "oper_class", "oper_umodes", "$@3",
1180 <  "oper_umodes_items", "oper_umodes_item", "oper_global_kill",
1181 <  "oper_remote", "oper_remoteban", "oper_kline", "oper_xline",
1182 <  "oper_unkline", "oper_gline", "oper_nick_changes", "oper_die",
1183 <  "oper_rehash", "oper_admin", "oper_hidden_admin", "oper_hidden_oper",
1184 <  "oper_operwall", "oper_flags", "$@4", "oper_flags_items",
1185 <  "oper_flags_item", "$@5", "$@6", "oper_flags_item_atom", "class_entry",
1186 <  "$@7", "class_name_b", "class_items", "class_item", "class_name",
1187 <  "class_name_t", "class_ping_time", "class_ping_warning",
1188 <  "class_number_per_ip", "class_connectfreq", "class_max_number",
1189 <  "class_max_global", "class_max_local", "class_max_ident", "class_sendq",
1170 >  "serverinfo_max_clients", "serverinfo_max_nick_length",
1171 >  "serverinfo_max_topic_length", "serverinfo_hub", "admin_entry",
1172 >  "admin_items", "admin_item", "admin_name", "admin_email",
1173 >  "admin_description", "motd_entry", "$@1", "motd_items", "motd_item",
1174 >  "motd_mask", "motd_file", "pseudo_entry", "$@2", "pseudo_items",
1175 >  "pseudo_item", "pseudo_command", "pseudo_name", "pseudo_prepend",
1176 >  "pseudo_target", "logging_entry", "logging_items", "logging_item",
1177 >  "logging_use_logging", "logging_file_entry", "$@3", "logging_file_items",
1178 >  "logging_file_item", "logging_file_name", "logging_file_size",
1179 >  "logging_file_type", "$@4", "logging_file_type_items",
1180 >  "logging_file_type_item", "oper_entry", "$@5", "oper_items", "oper_item",
1181 >  "oper_name", "oper_user", "oper_password", "oper_encrypted",
1182 >  "oper_rsa_public_key_file", "oper_ssl_certificate_fingerprint",
1183 >  "oper_ssl_connection_required", "oper_class", "oper_umodes", "$@6",
1184 >  "oper_umodes_items", "oper_umodes_item", "oper_flags", "$@7",
1185 >  "oper_flags_items", "oper_flags_item", "class_entry", "$@8",
1186 >  "class_items", "class_item", "class_name", "class_ping_time",
1187 >  "class_number_per_ip", "class_connectfreq", "class_max_channels",
1188 >  "class_max_number", "class_max_global", "class_max_local",
1189 >  "class_max_ident", "class_sendq", "class_recvq",
1190    "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6",
1191 <  "class_number_per_cidr", "listen_entry", "$@8", "listen_flags", "$@9",
1192 <  "listen_flags_items", "listen_flags_item", "listen_items", "listen_item",
1193 <  "listen_port", "$@10", "port_items", "port_item", "listen_address",
1194 <  "listen_host", "auth_entry", "$@11", "auth_items", "auth_item",
1195 <  "auth_user", "auth_passwd", "auth_spoof_notice", "auth_class",
1196 <  "auth_encrypted", "auth_flags", "$@12", "auth_flags_items",
1197 <  "auth_flags_item", "$@13", "$@14", "auth_flags_item_atom",
1198 <  "auth_kline_exempt", "auth_need_ident", "auth_exceed_limit",
1199 <  "auth_can_flood", "auth_no_tilde", "auth_gline_exempt", "auth_spoof",
1200 <  "auth_redir_serv", "auth_redir_port", "auth_need_password", "resv_entry",
1201 <  "$@15", "resv_items", "resv_item", "resv_creason", "resv_channel",
1202 <  "resv_nick", "shared_entry", "$@16", "shared_items", "shared_item",
1203 <  "shared_name", "shared_user", "shared_type", "$@17", "shared_types",
1204 <  "shared_type_item", "cluster_entry", "$@18", "cluster_items",
1205 <  "cluster_item", "cluster_name", "cluster_type", "$@19", "cluster_types",
1206 <  "cluster_type_item", "connect_entry", "$@20", "connect_name_b",
1554 <  "connect_items", "connect_item", "connect_name", "connect_name_t",
1191 >  "class_number_per_cidr", "class_min_idle", "class_max_idle",
1192 >  "class_flags", "$@9", "class_flags_items", "class_flags_item",
1193 >  "listen_entry", "$@10", "listen_flags", "$@11", "listen_flags_items",
1194 >  "listen_flags_item", "listen_items", "listen_item", "listen_port",
1195 >  "$@12", "port_items", "port_item", "listen_address", "listen_host",
1196 >  "auth_entry", "$@13", "auth_items", "auth_item", "auth_user",
1197 >  "auth_passwd", "auth_class", "auth_encrypted", "auth_flags", "$@14",
1198 >  "auth_flags_items", "auth_flags_item", "auth_spoof", "auth_redir_serv",
1199 >  "auth_redir_port", "resv_entry", "$@15", "resv_items", "resv_item",
1200 >  "resv_mask", "resv_reason", "resv_exempt", "service_entry",
1201 >  "service_items", "service_item", "service_name", "shared_entry", "$@16",
1202 >  "shared_items", "shared_item", "shared_name", "shared_user",
1203 >  "shared_type", "$@17", "shared_types", "shared_type_item",
1204 >  "cluster_entry", "$@18", "cluster_items", "cluster_item", "cluster_name",
1205 >  "cluster_type", "$@19", "cluster_types", "cluster_type_item",
1206 >  "connect_entry", "$@20", "connect_items", "connect_item", "connect_name",
1207    "connect_host", "connect_vhost", "connect_send_password",
1208 <  "connect_accept_password", "connect_port", "connect_aftype",
1209 <  "connect_fakename", "connect_flags", "$@21", "connect_flags_items",
1210 <  "connect_flags_item", "$@22", "$@23", "connect_flags_item_atom",
1559 <  "connect_rsa_public_key_file", "connect_encrypted", "connect_cryptlink",
1560 <  "connect_compressed", "connect_auto", "connect_topicburst",
1208 >  "connect_accept_password", "connect_ssl_certificate_fingerprint",
1209 >  "connect_port", "connect_aftype", "connect_flags", "$@21",
1210 >  "connect_flags_items", "connect_flags_item", "connect_encrypted",
1211    "connect_hub_mask", "connect_leaf_mask", "connect_class",
1212 <  "connect_cipher_preference", "kill_entry", "$@24", "kill_type", "$@25",
1213 <  "kill_type_items", "kill_type_item", "kill_items", "kill_item",
1214 <  "kill_user", "kill_reason", "deny_entry", "$@26", "deny_items",
1215 <  "deny_item", "deny_ip", "deny_reason", "exempt_entry", "exempt_items",
1216 <  "exempt_item", "exempt_ip", "gecos_entry", "$@27", "gecos_flags", "$@28",
1217 <  "gecos_flags_items", "gecos_flags_item", "gecos_items", "gecos_item",
1218 <  "gecos_name", "gecos_reason", "general_entry", "general_items",
1219 <  "general_item", "general_max_watch", "general_gline_min_cidr",
1220 <  "general_gline_min_cidr6", "general_burst_away",
1221 <  "general_use_whois_actually", "general_reject_hold_time",
1222 <  "general_tkline_expire_notices", "general_kill_chase_time_limit",
1223 <  "general_hide_spoof_ips", "general_ignore_bogus_ts",
1574 <  "general_disable_remote_commands", "general_failed_oper_notice",
1212 >  "connect_ssl_cipher_list", "kill_entry", "$@22", "kill_items",
1213 >  "kill_item", "kill_user", "kill_reason", "deny_entry", "$@23",
1214 >  "deny_items", "deny_item", "deny_ip", "deny_reason", "exempt_entry",
1215 >  "exempt_items", "exempt_item", "exempt_ip", "gecos_entry", "$@24",
1216 >  "gecos_items", "gecos_item", "gecos_name", "gecos_reason",
1217 >  "general_entry", "general_items", "general_item", "general_away_count",
1218 >  "general_away_time", "general_max_watch", "general_cycle_on_host_change",
1219 >  "general_gline_enable", "general_gline_duration",
1220 >  "general_gline_request_duration", "general_gline_min_cidr",
1221 >  "general_gline_min_cidr6", "general_tkline_expire_notices",
1222 >  "general_kill_chase_time_limit", "general_hide_spoof_ips",
1223 >  "general_ignore_bogus_ts", "general_failed_oper_notice",
1224    "general_anti_nick_flood", "general_max_nick_time",
1225    "general_max_nick_changes", "general_max_accept",
1226    "general_anti_spam_exit_message_time", "general_ts_warn_delta",
1227    "general_ts_max_delta", "general_havent_read_conf",
1228 <  "general_kline_with_reason", "general_kline_reason",
1580 <  "general_invisible_on_connect", "general_warn_no_nline",
1228 >  "general_invisible_on_connect", "general_warn_no_connect_block",
1229    "general_stats_e_disabled", "general_stats_o_oper_only",
1230 <  "general_stats_P_oper_only", "general_stats_k_oper_only",
1231 <  "general_stats_i_oper_only", "general_pace_wait",
1232 <  "general_caller_id_wait", "general_opers_bypass_callerid",
1233 <  "general_pace_wait_simple", "general_short_motd",
1234 <  "general_no_oper_flood", "general_true_no_oper_flood",
1235 <  "general_oper_pass_resv", "general_message_locale", "general_idletime",
1236 <  "general_dots_in_ident", "general_max_targets", "general_servlink_path",
1237 <  "general_default_cipher_preference", "general_compression_level",
1238 <  "general_use_egd", "general_egdpool_path", "general_ping_cookie",
1239 <  "general_disable_auth", "general_throttle_time", "general_oper_umodes",
1240 <  "$@29", "umode_oitems", "umode_oitem", "general_oper_only_umodes",
1593 <  "$@30", "umode_items", "umode_item", "general_min_nonwildcard",
1230 >  "general_stats_P_oper_only", "general_stats_u_oper_only",
1231 >  "general_stats_k_oper_only", "general_stats_i_oper_only",
1232 >  "general_pace_wait", "general_caller_id_wait",
1233 >  "general_opers_bypass_callerid", "general_pace_wait_simple",
1234 >  "general_short_motd", "general_no_oper_flood",
1235 >  "general_true_no_oper_flood", "general_oper_pass_resv",
1236 >  "general_dots_in_ident", "general_max_targets", "general_ping_cookie",
1237 >  "general_disable_auth", "general_throttle_count",
1238 >  "general_throttle_time", "general_oper_umodes", "$@25", "umode_oitems",
1239 >  "umode_oitem", "general_oper_only_umodes", "$@26", "umode_items",
1240 >  "umode_item", "general_min_nonwildcard",
1241    "general_min_nonwildcard_simple", "general_default_floodcount",
1242 <  "general_client_flood", "general_dot_in_ip6_addr", "gline_entry", "$@31",
1243 <  "gline_items", "gline_item", "gline_enable", "gline_duration",
1244 <  "gline_logging", "$@32", "gline_logging_types",
1245 <  "gline_logging_type_item", "gline_user", "gline_server", "gline_action",
1246 <  "$@33", "gdeny_types", "gdeny_type_item", "channel_entry",
1600 <  "channel_items", "channel_item", "channel_disable_fake_channels",
1601 <  "channel_restrict_channels", "channel_disable_local_channels",
1602 <  "channel_use_except", "channel_use_invex", "channel_use_knock",
1603 <  "channel_knock_delay", "channel_knock_delay_channel",
1604 <  "channel_max_chans_per_user", "channel_quiet_on_ban", "channel_max_bans",
1242 >  "channel_entry", "channel_items", "channel_item",
1243 >  "channel_disable_fake_channels", "channel_invite_client_count",
1244 >  "channel_invite_client_time", "channel_knock_client_count",
1245 >  "channel_knock_client_time", "channel_knock_delay_channel",
1246 >  "channel_max_channels", "channel_max_bans",
1247    "channel_default_split_user_count", "channel_default_split_server_count",
1248    "channel_no_create_on_split", "channel_no_join_on_split",
1249 <  "channel_burst_topicwho", "channel_jflood_count", "channel_jflood_time",
1250 <  "serverhide_entry", "serverhide_items", "serverhide_item",
1251 <  "serverhide_flatten_links", "serverhide_hide_servers",
1252 <  "serverhide_hidden_name", "serverhide_links_delay", "serverhide_hidden",
1253 <  "serverhide_disable_hidden", "serverhide_hide_server_ips", 0
1249 >  "channel_jflood_count", "channel_jflood_time", "serverhide_entry",
1250 >  "serverhide_items", "serverhide_item", "serverhide_flatten_links",
1251 >  "serverhide_disable_remote_commands", "serverhide_hide_servers",
1252 >  "serverhide_hide_services", "serverhide_hidden_name",
1253 >  "serverhide_links_delay", "serverhide_hidden",
1254 >  "serverhide_hide_server_ips", YY_NULLPTR
1255   };
1256   #endif
1257  
1258   # ifdef YYPRINT
1259 < /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
1260 <   token YYLEX-NUM.  */
1259 > /* YYTOKNUM[NUM] -- (External) token number corresponding to the
1260 >   (internal) symbol number NUM (which must be that of a token).  */
1261   static const yytype_uint16 yytoknum[] =
1262   {
1263         0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
# Line 1640 | Line 1283 | static const yytype_uint16 yytoknum[] =
1283       455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
1284       465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
1285       475,   476,   477,   478,   479,   480,   481,   482,   483,   484,
1286 <     485,   486,   487,   488,   489,   490,   491,   492,   493,   494,
1644 <     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
1645 <     505,   506,   507,   508,   509,   510,   511,   512,   513,   514,
1646 <     515,   516,    59,   125,   123,    61,    44
1286 >     485,   486,   487,   488,    59,   125,   123,    61,    44,    58
1287   };
1288   # endif
1289  
1290 < /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
1651 < static const yytype_uint16 yyr1[] =
1652 < {
1653 <       0,   267,   268,   268,   269,   269,   269,   269,   269,   269,
1654 <     269,   269,   269,   269,   269,   269,   269,   269,   269,   269,
1655 <     269,   269,   269,   269,   269,   269,   270,   270,   271,   271,
1656 <     271,   271,   271,   271,   272,   272,   273,   273,   273,   273,
1657 <     274,   275,   275,   276,   276,   276,   277,   278,   279,   280,
1658 <     280,   281,   281,   281,   281,   281,   281,   281,   281,   281,
1659 <     281,   281,   281,   281,   283,   282,   284,   284,   285,   285,
1660 <     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
1661 <     296,   297,   298,   298,   299,   299,   299,   299,   300,   301,
1662 <     302,   303,   304,   304,   305,   305,   305,   305,   305,   305,
1663 <     305,   305,   305,   305,   305,   305,   305,   306,   307,   308,
1664 <     309,   310,   311,   312,   313,   314,   315,   316,   316,   316,
1665 <     316,   316,   316,   316,   317,   319,   318,   320,   320,   321,
1666 <     321,   322,   322,   322,   322,   322,   322,   322,   322,   322,
1667 <     322,   322,   322,   322,   322,   322,   322,   322,   322,   322,
1668 <     322,   322,   322,   322,   323,   324,   325,   326,   327,   328,
1669 <     329,   331,   330,   332,   332,   333,   333,   333,   333,   333,
1670 <     333,   333,   333,   333,   333,   333,   333,   333,   333,   333,
1671 <     333,   333,   333,   333,   334,   335,   336,   337,   338,   339,
1672 <     340,   341,   342,   343,   344,   345,   346,   347,   349,   348,
1673 <     350,   350,   352,   351,   353,   351,   354,   354,   354,   354,
1674 <     354,   354,   354,   354,   354,   354,   354,   354,   354,   354,
1675 <     354,   354,   356,   355,   357,   357,   358,   358,   359,   359,
1676 <     359,   359,   359,   359,   359,   359,   359,   359,   359,   359,
1677 <     359,   359,   360,   361,   362,   363,   364,   365,   366,   367,
1678 <     368,   369,   370,   371,   372,   373,   375,   374,   377,   376,
1679 <     378,   378,   379,   379,   379,   380,   380,   381,   381,   381,
1680 <     381,   381,   383,   382,   384,   384,   385,   385,   386,   387,
1681 <     389,   388,   390,   390,   391,   391,   391,   391,   391,   391,
1682 <     391,   391,   391,   391,   391,   391,   391,   391,   391,   391,
1683 <     391,   392,   393,   394,   395,   396,   398,   397,   399,   399,
1684 <     401,   400,   402,   400,   403,   403,   403,   403,   403,   403,
1685 <     403,   403,   403,   403,   404,   405,   406,   407,   408,   409,
1686 <     410,   411,   412,   413,   415,   414,   416,   416,   417,   417,
1687 <     417,   417,   418,   419,   420,   422,   421,   423,   423,   424,
1688 <     424,   424,   424,   425,   426,   428,   427,   429,   429,   430,
1689 <     430,   430,   430,   430,   430,   430,   430,   430,   430,   430,
1690 <     432,   431,   433,   433,   434,   434,   434,   435,   437,   436,
1691 <     438,   438,   439,   439,   439,   439,   439,   439,   439,   439,
1692 <     439,   439,   439,   441,   440,   442,   442,   443,   443,   444,
1693 <     444,   444,   444,   444,   444,   444,   444,   444,   444,   444,
1694 <     444,   444,   444,   444,   444,   444,   444,   444,   444,   445,
1695 <     446,   447,   448,   449,   450,   451,   452,   452,   453,   455,
1696 <     454,   456,   456,   458,   457,   459,   457,   460,   460,   460,
1697 <     460,   460,   461,   462,   463,   464,   465,   466,   467,   468,
1698 <     469,   470,   472,   471,   474,   473,   475,   475,   476,   477,
1699 <     477,   478,   478,   478,   478,   479,   480,   482,   481,   483,
1700 <     483,   484,   484,   484,   485,   486,   487,   488,   488,   489,
1701 <     489,   490,   492,   491,   494,   493,   495,   495,   496,   497,
1702 <     497,   498,   498,   498,   498,   499,   500,   501,   502,   502,
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,   503,   503,   503,
1706 <     503,   503,   503,   503,   503,   503,   503,   503,   503,   503,
1707 <     503,   503,   503,   503,   503,   503,   503,   503,   503,   503,
1708 <     503,   503,   503,   503,   503,   503,   503,   504,   505,   506,
1709 <     507,   508,   509,   510,   511,   512,   513,   514,   515,   516,
1710 <     517,   518,   519,   520,   521,   522,   523,   524,   525,   526,
1711 <     527,   528,   529,   530,   531,   531,   532,   532,   533,   534,
1712 <     535,   536,   537,   538,   539,   540,   541,   542,   543,   544,
1713 <     545,   546,   547,   548,   549,   550,   551,   552,   554,   553,
1714 <     555,   555,   556,   556,   556,   556,   556,   556,   556,   556,
1715 <     556,   556,   556,   556,   556,   556,   556,   556,   556,   556,
1716 <     556,   558,   557,   559,   559,   560,   560,   560,   560,   560,
1717 <     560,   560,   560,   560,   560,   560,   560,   560,   560,   560,
1718 <     560,   560,   560,   560,   561,   562,   563,   564,   565,   567,
1719 <     566,   568,   568,   569,   569,   569,   569,   569,   569,   569,
1720 <     570,   571,   573,   572,   574,   574,   575,   575,   576,   577,
1721 <     579,   578,   580,   580,   581,   581,   582,   583,   583,   584,
1722 <     584,   584,   584,   584,   584,   584,   584,   584,   584,   584,
1723 <     584,   584,   584,   584,   584,   584,   584,   584,   585,   586,
1724 <     587,   588,   589,   590,   591,   592,   593,   594,   595,   596,
1725 <     597,   598,   599,   600,   601,   602,   603,   604,   604,   605,
1726 <     605,   605,   605,   605,   605,   605,   605,   606,   607,   608,
1727 <     609,   610,   611,   612
1728 < };
1290 > #define YYPACT_NINF -967
1291  
1292 < /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
1293 < static const yytype_uint8 yyr2[] =
1292 > #define yypact_value_is_default(Yystate) \
1293 >  (!!((Yystate) == (-967)))
1294 >
1295 > #define YYTABLE_NINF -130
1296 >
1297 > #define yytable_value_is_error(Yytable_value) \
1298 >  0
1299 >
1300 >  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
1301 >     STATE-NUM.  */
1302 > static const yytype_int16 yypact[] =
1303   {
1304 <       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
1305 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1306 <       1,     1,     1,     1,     2,     2,     0,     1,     2,     3,
1307 <       3,     3,     3,     3,     0,     1,     2,     3,     3,     3,
1308 <       5,     2,     1,     1,     1,     2,     4,     4,     5,     2,
1309 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1310 <       1,     1,     1,     2,     0,     5,     3,     1,     1,     1,
1311 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1312 <       4,     5,     2,     1,     1,     1,     1,     2,     4,     4,
1313 <       4,     5,     2,     1,     1,     1,     1,     1,     1,     1,
1314 <       1,     1,     1,     1,     1,     1,     2,     4,     4,     4,
1315 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1316 <       4,     4,     4,     4,     4,     0,     7,     0,     1,     2,
1317 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1318 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1319 <       1,     1,     1,     2,     4,     1,     4,     4,     4,     4,
1320 <       4,     0,     5,     3,     1,     1,     1,     1,     1,     1,
1321 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1322 <       1,     1,     1,     1,     4,     4,     4,     4,     4,     4,
1323 <       4,     4,     4,     4,     4,     4,     4,     4,     0,     5,
1324 <       3,     1,     0,     3,     0,     2,     1,     1,     1,     1,
1325 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1326 <       1,     1,     0,     7,     0,     1,     2,     1,     1,     1,
1327 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1328 <       1,     2,     4,     1,     4,     4,     4,     4,     4,     4,
1329 <       4,     4,     4,     4,     4,     4,     0,     6,     0,     5,
1330 <       3,     1,     1,     1,     1,     2,     1,     1,     1,     1,
1331 <       1,     2,     0,     5,     3,     1,     1,     3,     4,     4,
1332 <       0,     6,     2,     1,     1,     1,     1,     1,     1,     1,
1333 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1334 <       2,     4,     4,     4,     4,     4,     0,     5,     3,     1,
1335 <       0,     3,     0,     2,     1,     1,     1,     1,     1,     1,
1336 <       1,     1,     1,     1,     4,     4,     4,     4,     4,     4,
1337 <       4,     4,     4,     4,     0,     6,     2,     1,     1,     1,
1338 <       1,     2,     4,     4,     4,     0,     6,     2,     1,     1,
1339 <       1,     1,     2,     4,     4,     0,     5,     3,     1,     1,
1340 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1341 <       0,     6,     2,     1,     1,     1,     2,     4,     0,     5,
1342 <       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1343 <       1,     1,     1,     0,     7,     0,     1,     2,     1,     1,
1344 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1345 <       1,     1,     1,     1,     1,     1,     1,     1,     2,     4,
1346 <       1,     4,     4,     4,     4,     4,     4,     4,     4,     0,
1347 <       5,     3,     1,     0,     3,     0,     2,     1,     1,     1,
1348 <       1,     1,     4,     4,     4,     4,     4,     4,     4,     4,
1349 <       4,     4,     0,     6,     0,     5,     3,     1,     1,     2,
1350 <       1,     1,     1,     1,     1,     4,     4,     0,     6,     2,
1351 <       1,     1,     1,     1,     4,     4,     5,     2,     1,     1,
1352 <       1,     4,     0,     6,     0,     5,     3,     1,     1,     2,
1353 <       1,     1,     1,     1,     1,     4,     4,     5,     2,     1,
1354 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1355 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1356 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1357 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1358 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1359 <       1,     1,     1,     1,     1,     1,     1,     4,     4,     4,
1360 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1361 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1362 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1363 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1364 <       4,     4,     4,     4,     4,     4,     4,     4,     0,     5,
1365 <       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1366 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1367 <       1,     0,     5,     3,     1,     1,     1,     1,     1,     1,
1368 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1369 <       1,     1,     1,     1,     4,     4,     4,     4,     4,     0,
1370 <       6,     2,     1,     1,     1,     1,     1,     1,     1,     1,
1371 <       4,     4,     0,     5,     3,     1,     1,     1,     4,     4,
1372 <       0,     5,     3,     1,     1,     1,     5,     2,     1,     1,
1373 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1374 <       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
1375 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1376 <       4,     4,     4,     4,     4,     4,     5,     2,     1,     1,
1377 <       1,     1,     1,     1,     1,     1,     1,     4,     4,     4,
1378 <       4,     4,     4,     4
1304 >    -967,   692,  -967,  -194,  -218,  -205,  -967,  -967,  -967,  -202,
1305 >    -967,  -169,  -967,  -967,  -967,  -162,  -967,  -967,  -967,  -157,
1306 >    -151,  -967,  -149,  -967,  -144,  -967,  -967,  -967,  -967,  -967,
1307 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1308 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1309 >    -967,    20,   930,  -119,   -75,   -64,    14,   -41,   422,   -39,
1310 >     -19,   -11,    18,    -7,    -6,    -2,   316,   455,     5,     8,
1311 >      35,    44,    39,   -68,     3,    33,    47,    16,  -967,  -967,
1312 >    -967,  -967,  -967,    58,    60,    65,    91,    93,    95,    97,
1313 >     103,   104,   105,   114,   116,   117,   119,    12,  -967,  -967,
1314 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1315 >    -967,  -967,  -967,   698,   602,    38,  -967,   121,    34,  -967,
1316 >    -967,    92,  -967,   129,   132,   133,   134,   138,   139,   140,
1317 >     141,   142,   143,   145,   146,   150,   151,   152,   156,   158,
1318 >     159,   163,   165,   166,   167,   168,   169,   171,   181,   183,
1319 >     185,  -967,   187,  -967,   188,   189,   190,   193,   196,   200,
1320 >     201,   205,   206,   210,   211,   212,   213,   215,   224,   225,
1321 >     226,   230,   127,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1322 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1323 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1324 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1325 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1326 >    -967,  -967,  -967,   445,    23,   325,    42,   234,   236,    26,
1327 >    -967,  -967,  -967,    21,   317,   324,  -967,   239,   240,   241,
1328 >     242,   247,   250,   252,   254,     7,  -967,  -967,  -967,  -967,
1329 >    -967,  -967,  -967,  -967,  -967,    46,   256,   257,   260,   262,
1330 >     263,   265,   267,   268,   271,   272,   273,   274,   275,   281,
1331 >     283,   286,   298,   204,  -967,  -967,  -967,  -967,  -967,  -967,
1332 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1333 >    -967,  -967,    10,   269,   299,    27,  -967,  -967,  -967,    84,
1334 >     115,  -967,   301,    72,  -967,  -967,    74,  -967,   180,   378,
1335 >     413,   318,  -967,   436,   439,   339,   442,   444,   447,   444,
1336 >     450,   444,   444,   451,   453,   352,   354,   338,  -967,   341,
1337 >     336,   342,   343,  -967,   344,   345,   346,   353,   359,   363,
1338 >     364,   369,   372,   373,   375,   376,   380,    94,  -967,  -967,
1339 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1340 >    -967,  -967,  -967,  -967,  -967,  -967,   385,   383,   386,   387,
1341 >     388,   389,   392,  -967,   394,   396,   399,   401,   410,   411,
1342 >     414,   253,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1343 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,   415,   416,
1344 >      29,  -967,  -967,  -967,   493,   421,  -967,  -967,   420,   424,
1345 >      31,  -967,  -967,  -967,   360,   444,   552,   444,   444,   452,
1346 >     555,   454,   558,   457,   444,   459,   563,   564,   444,   565,
1347 >     464,   465,   467,   444,   575,   576,   444,   577,   580,   583,
1348 >     584,   485,   470,   488,   472,   497,   444,   444,   505,   506,
1349 >     509,  -200,  -187,   510,   512,   515,   620,   444,   521,   523,
1350 >     444,   444,   524,   508,  -967,   511,   507,   514,  -967,   516,
1351 >     517,   519,   520,   526,   266,  -967,  -967,  -967,  -967,  -967,
1352 >    -967,  -967,  -967,  -967,  -967,   527,   531,    85,  -967,  -967,
1353 >    -967,   513,   532,   533,  -967,   534,  -967,     2,  -967,  -967,
1354 >    -967,  -967,  -967,   617,   619,   518,  -967,   538,   536,   539,
1355 >      25,  -967,  -967,  -967,   545,   543,   544,  -967,   546,   553,
1356 >     554,   556,   561,  -967,   562,    75,  -967,  -967,  -967,  -967,
1357 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,   548,   566,   567,
1358 >     568,    24,  -967,  -967,  -967,  -967,   542,   550,   573,   632,
1359 >     585,   590,   592,   444,   586,  -967,  -967,   671,   593,   681,
1360 >     635,   697,   687,   690,   693,   694,   695,   699,   701,   702,
1361 >     707,   704,   705,   706,   603,  -967,   604,   589,  -967,    43,
1362 >    -967,  -967,  -967,  -967,   611,   605,  -967,   600,   606,   607,
1363 >     608,   609,   612,    22,  -967,  -967,  -967,  -967,  -967,   712,
1364 >     614,  -967,   616,   615,  -967,   623,    48,  -967,  -967,  -967,
1365 >    -967,   622,   629,   633,  -967,   634,   636,   637,   640,   270,
1366 >     641,   642,   645,   646,   648,   650,   655,   662,   666,   669,
1367 >    -967,  -967,   737,   743,   444,   668,   793,   794,   796,   444,
1368 >     797,   800,   444,   786,   802,   804,   444,   805,   805,   686,
1369 >    -967,  -967,   795,    30,   799,   713,   801,   807,   685,   811,
1370 >     814,   809,   816,   818,   819,   821,   717,  -967,   827,   829,
1371 >     725,  -967,   728,  -967,   834,   835,   734,  -967,   735,   736,
1372 >     739,   740,   741,   742,   744,   745,   746,   747,   748,   749,
1373 >     750,   751,   752,   753,   754,   755,   756,   757,   758,   759,
1374 >     760,   763,   765,   766,   769,   770,   684,   771,   724,   772,
1375 >     776,   777,   778,   779,   780,   783,   784,   785,   787,   788,
1376 >     789,   790,   791,   792,   798,   803,   808,   810,   812,  -967,
1377 >    -967,   842,   782,   806,   891,   913,   899,   900,   901,   813,
1378 >    -967,   902,   904,   815,  -967,  -967,   905,   906,   817,   922,
1379 >     822,  -967,   823,   824,  -967,  -967,   909,   910,   825,  -967,
1380 >    -967,   916,   832,   826,   921,   923,   924,   926,   844,   828,
1381 >     932,   830,  -967,  -967,   933,   937,   938,   836,  -967,   837,
1382 >     838,   839,   840,   841,   843,   845,   846,  -967,   847,   848,
1383 >     849,   850,   851,   852,   853,   854,   855,   856,   857,   858,
1384 >     859,   860,   861,   862,   863,  -967,  -967,   939,   864,   865,
1385 >    -967,   866,  -967,    98,  -967,   940,   947,   949,   969,   868,
1386 >    -967,   869,  -967,  -967,   975,   870,   976,   872,  -967,  -967,
1387 >    -967,  -967,  -967,  -967,  -967,  -967,   444,   444,   444,   444,
1388 >     444,   444,   444,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1389 >    -967,  -967,  -967,  -967,  -967,   874,   875,   876,   -50,   877,
1390 >     878,   879,   880,   881,   882,   883,   884,   885,   886,   887,
1391 >     326,   888,   889,  -967,   890,   892,   893,   894,   895,   896,
1392 >     897,     4,   898,   903,   907,   908,   911,   912,   914,  -967,
1393 >     915,   917,  -967,  -967,   918,   919,  -967,  -967,  -967,  -967,
1394 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1395 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1396 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1397 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1398 >    -967,  -967,  -967,  -967,  -967,  -186,  -967,  -967,  -967,  -967,
1399 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1400 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1401 >    -183,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1402 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1403 >    -967,  -967,   920,   925,   582,   927,   928,   929,   931,   934,
1404 >    -967,   935,   936,  -967,   941,   942,   -37,   943,   944,  -967,
1405 >    -967,  -967,  -967,   945,   946,  -967,   950,   951,   529,   952,
1406 >     953,   954,   955,   956,   764,   957,  -967,   958,   959,   960,
1407 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1408 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1409 >    -967,  -967,  -967,  -967,  -967,  -967,   961,   423,  -967,  -967,
1410 >     962,   963,   964,  -967,    81,  -967,  -967,  -967,  -967,   965,
1411 >     968,   970,   971,  -967,  -967,   972,   491,   973,  -967,  -967,
1412 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1413 >    -967,  -181,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1414 >    -967,  -967,  -967,  -967,   805,   805,   805,  -967,  -967,  -967,
1415 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1416 >    -178,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1417 >    -967,  -967,  -967,  -967,   684,  -967,   724,  -967,  -967,  -967,
1418 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -168,
1419 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1420 >    -967,  -967,  -967,  -166,  -967,  1011,   922,   974,  -967,  -967,
1421 >    -967,  -967,  -967,   977,  -967,  -967,   978,  -967,  -967,  -967,
1422 >    -967,   979,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1423 >    -967,  -967,  -109,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1424 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1425 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1426 >    -967,   -81,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1427 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,   -70,  -967,
1428 >    -967,  1004,  -104,   966,   980,  -967,  -967,  -967,  -967,  -967,
1429 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1430 >    -967,   -45,  -967,  -967,  -967,   -50,  -967,  -967,  -967,  -967,
1431 >       4,  -967,  -967,  -967,   582,  -967,   -37,  -967,  -967,  -967,
1432 >     999,  1000,  1001,  -967,   529,  -967,   764,  -967,   423,   981,
1433 >     985,   986,   417,  -967,  -967,   491,  -967,  -967,  -967,  -967,
1434 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1435 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,   -31,  -967,
1436 >    -967,  -967,   417,  -967
1437   };
1438  
1439 < /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
1440 <   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
1441 <   means the default is an error.  */
1439 >  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
1440 >     Performed when YYTABLE does not specify something else to do.  Zero
1441 >     means the default is an error.  */
1442   static const yytype_uint16 yydefact[] =
1443   {
1444 <       2,     0,     1,     0,     0,     0,   222,   393,   467,     0,
1445 <     482,     0,   659,   280,   452,   256,     0,     0,   125,   334,
1446 <       0,     0,   345,   370,     3,    23,    11,     4,     5,     6,
1447 <       8,     9,    10,    13,    14,    15,    16,    17,    18,    19,
1448 <      22,    20,    21,     7,    12,    24,    25,     0,     0,   224,
1449 <     395,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1821 <       0,   127,     0,     0,     0,     0,     0,     0,     0,     0,
1822 <       0,     0,    83,    84,    86,    85,   707,     0,     0,     0,
1823 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1824 <       0,     0,     0,     0,     0,     0,   688,   706,   701,   689,
1825 <     690,   691,   692,   694,   695,   696,   697,   693,   698,   699,
1826 <     700,   702,   703,   704,   705,   243,     0,   225,   420,     0,
1827 <     396,     0,   480,     0,     0,   478,   479,     0,   556,     0,
1828 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1829 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1830 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1831 <       0,     0,   631,     0,   608,     0,     0,     0,     0,     0,
1832 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1833 <       0,     0,     0,     0,     0,     0,   499,   555,   550,   551,
1834 <     548,   552,   553,   549,   510,   500,   501,   539,   502,   503,
1835 <     504,   505,   506,   507,   508,   509,   544,   511,   512,   513,
1836 <     514,   554,   516,   521,   517,   519,   518,   533,   534,   520,
1837 <     522,   523,   524,   525,   527,   526,   515,   529,   538,   540,
1838 <     541,   530,   531,   546,   547,   543,   532,   528,   536,   537,
1839 <     535,   542,   545,     0,     0,     0,     0,     0,     0,     0,
1840 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1841 <       0,    93,    94,    95,    98,   105,    99,   103,   100,   101,
1842 <     104,   102,    96,    97,     0,     0,     0,     0,    42,    43,
1843 <      44,   155,     0,   128,     0,   736,     0,     0,     0,     0,
1844 <       0,     0,     0,     0,   728,   729,   730,   734,   731,   733,
1845 <     732,   735,     0,     0,     0,     0,     0,     0,     0,     0,
1846 <      64,     0,     0,     0,     0,     0,    50,    62,    61,    58,
1847 <      51,    60,    54,    55,    56,    52,    59,    57,    53,     0,
1848 <       0,    87,     0,     0,     0,     0,    82,     0,     0,     0,
1849 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1850 <       0,     0,     0,     0,     0,     0,   687,     0,     0,   473,
1851 <       0,     0,     0,   470,   471,   472,     0,     0,   477,   494,
1852 <       0,     0,   484,   493,     0,   490,   491,   492,     0,     0,
1444 >       2,     0,     1,     0,     0,     0,   229,   394,   442,     0,
1445 >     457,     0,   297,   433,   273,     0,   100,   153,   331,     0,
1446 >       0,   372,     0,   109,     0,   348,     3,    23,    11,     4,
1447 >      24,    25,     5,     6,     8,     9,    10,    13,    14,    15,
1448 >      16,    17,    18,    19,    20,    22,    21,     7,    12,    26,
1449 >      27,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1450         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1451 +       0,     0,     0,     0,     0,     0,     0,     0,    92,    93,
1452 +      95,    94,   635,     0,     0,     0,     0,     0,     0,     0,
1453 +       0,     0,     0,     0,     0,     0,     0,     0,   620,   634,
1454 +     622,   623,   624,   625,   626,   627,   621,   628,   629,   630,
1455 +     631,   632,   633,     0,     0,     0,   455,     0,     0,   453,
1456 +     454,     0,   518,     0,     0,     0,     0,     0,     0,     0,
1457         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1458         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1459 +       0,   591,     0,   565,     0,     0,     0,     0,     0,     0,
1460         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1461 +       0,     0,     0,   468,   469,   470,   516,   517,   510,   511,
1462 +     512,   513,   514,   509,   481,   471,   472,   473,   474,   475,
1463 +     476,   477,   478,   479,   480,   506,   482,   483,   515,   485,
1464 +     490,   491,   486,   488,   487,   499,   500,   489,   492,   493,
1465 +     494,   495,   484,   497,   507,   508,   504,   505,   498,   496,
1466 +     502,   503,   501,     0,     0,     0,     0,     0,     0,     0,
1467 +      46,    47,    48,     0,     0,     0,   661,     0,     0,     0,
1468 +       0,     0,     0,     0,     0,     0,   652,   653,   654,   655,
1469 +     656,   659,   657,   658,   660,     0,     0,     0,     0,     0,
1470         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1471 <       0,     0,     0,     0,     0,   498,   669,   680,     0,     0,
1472 <     672,     0,     0,     0,   662,   663,   664,   665,   666,   667,
1473 <     668,     0,     0,     0,     0,     0,   306,     0,     0,     0,
1474 <       0,     0,     0,     0,     0,     0,     0,     0,     0,   283,
1475 <     284,   285,   294,   286,   299,   287,   288,   289,   290,   297,
1476 <     291,   292,   293,   295,   296,   298,   464,     0,   454,     0,
1477 <     463,     0,   460,   461,   462,     0,   258,     0,     0,     0,
1478 <     268,     0,   266,   267,   269,   270,   106,     0,     0,     0,
1471 >       0,     0,     0,     0,    54,    69,    66,    64,    70,    71,
1472 >      65,    55,    68,    58,    59,    60,    56,    67,    61,    62,
1473 >      63,    57,     0,     0,     0,     0,   124,   125,   126,     0,
1474 >       0,   346,     0,     0,   344,   345,     0,    96,     0,     0,
1475 >       0,     0,    91,     0,     0,     0,     0,     0,     0,     0,
1476 >       0,     0,     0,     0,     0,     0,     0,     0,   619,     0,
1477 >       0,     0,     0,   267,     0,     0,     0,     0,     0,     0,
1478 >       0,     0,     0,     0,     0,     0,     0,     0,   232,   233,
1479 >     236,   238,   239,   240,   241,   242,   243,   244,   245,   246,
1480 >     234,   235,   237,   247,   248,   249,     0,     0,     0,     0,
1481 >       0,     0,     0,   422,     0,     0,     0,     0,     0,     0,
1482 >       0,     0,   397,   398,   399,   400,   401,   402,   403,   405,
1483 >     404,   407,   411,   408,   409,   410,   406,   448,     0,     0,
1484 >       0,   445,   446,   447,     0,     0,   452,   463,     0,     0,
1485 >       0,   460,   461,   462,     0,     0,     0,     0,     0,     0,
1486         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1867      92,    45,     0,     0,     0,    41,     0,     0,     0,     0,
1868       0,     0,   337,   338,   339,   340,     0,     0,     0,     0,
1869       0,     0,     0,     0,   727,    63,     0,     0,     0,     0,
1870       0,     0,     0,     0,     0,     0,     0,     0,     0,    49,
1871       0,     0,   355,     0,     0,   348,   349,   350,   351,     0,
1872       0,   378,     0,   373,   374,   375,     0,     0,     0,    81,
1873       0,     0,     0,     0,     0,    26,     0,     0,     0,     0,
1874       0,     0,     0,     0,     0,     0,     0,     0,     0,   686,
1487         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1876       0,     0,     0,     0,     0,   227,   228,   231,   232,   234,
1877     235,   236,   237,   238,   239,   240,   229,   230,   233,     0,
1878       0,     0,     0,     0,     0,     0,     0,     0,     0,   429,
1488         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1880     398,   399,   400,   401,   402,   403,   405,   404,   406,   407,
1881     415,   412,   414,   413,   411,   417,   408,   409,   410,   416,
1882       0,     0,     0,   469,     0,   476,     0,     0,     0,     0,
1883     489,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1489         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1490 +       0,     0,     0,     0,   467,     0,     0,     0,   314,     0,
1491 +       0,     0,     0,     0,     0,   300,   301,   302,   303,   308,
1492 +     304,   305,   306,   307,   439,     0,     0,     0,   436,   437,
1493 +     438,     0,     0,     0,   275,     0,   285,     0,   283,   284,
1494 +     286,   287,    49,     0,     0,     0,    45,     0,     0,     0,
1495 +       0,   103,   104,   105,     0,     0,     0,   202,     0,     0,
1496 +       0,     0,     0,   176,     0,     0,   156,   157,   158,   159,
1497 +     162,   163,   164,   165,   161,   160,   166,     0,     0,     0,
1498 +       0,     0,   334,   335,   336,   337,     0,     0,     0,     0,
1499 +       0,     0,     0,     0,     0,   651,    72,     0,     0,     0,
1500         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1501 +       0,     0,     0,     0,     0,    53,     0,     0,   380,     0,
1502 +     375,   376,   377,   127,     0,     0,   123,     0,     0,     0,
1503 +       0,     0,     0,     0,   112,   113,   115,   114,   116,     0,
1504 +       0,   343,     0,     0,   358,     0,     0,   351,   352,   353,
1505 +     354,     0,     0,     0,    90,     0,     0,     0,     0,    28,
1506         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1507 +     618,   250,     0,     0,     0,     0,     0,     0,     0,     0,
1508         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1509 <       0,     0,     0,    34,     0,     0,     0,     0,     0,     0,
1510 <     497,     0,     0,     0,     0,     0,     0,     0,   661,   300,
1509 >     231,   412,     0,     0,     0,     0,     0,     0,     0,     0,
1510 >       0,     0,     0,     0,     0,     0,     0,   396,     0,     0,
1511 >       0,   444,     0,   451,     0,     0,     0,   459,     0,     0,
1512         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1891       0,     0,     0,     0,     0,     0,     0,   282,     0,     0,
1892       0,     0,   459,   271,     0,     0,     0,     0,     0,   265,
1513         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1894       0,     0,     0,     0,     0,     0,     0,     0,    91,     0,
1895       0,    40,     0,     0,     0,     0,     0,   198,     0,     0,
1514         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1897       0,   161,     0,     0,     0,     0,   130,   131,   132,   133,
1898     150,   151,   137,   136,   138,   139,   145,   140,   141,   142,
1899     143,   144,   146,   147,   148,   134,   135,   149,   152,   341,
1900       0,     0,     0,     0,   336,     0,     0,     0,     0,     0,
1901       0,     0,   726,     0,     0,     0,     0,     0,     0,     0,
1902       0,     0,     0,     0,     0,    48,   352,     0,     0,     0,
1903       0,   347,   376,     0,     0,     0,   372,    90,    89,    88,
1904     723,   720,   719,   708,   710,    26,    26,    26,    26,    26,
1905      28,    27,   714,   715,   718,   716,   721,   722,   724,   725,
1906     717,   709,   711,   712,   713,   241,     0,     0,     0,     0,
1515         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1516 <     226,   418,     0,     0,     0,     0,     0,     0,     0,     0,
1516 >       0,     0,     0,     0,     0,     0,     0,     0,     0,   466,
1517 >     309,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1518 >     299,     0,     0,     0,   435,   288,     0,     0,     0,     0,
1519 >       0,   282,     0,     0,    44,   106,     0,     0,     0,   102,
1520 >     167,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1521 >       0,     0,   155,   338,     0,     0,     0,     0,   333,     0,
1522 >       0,     0,     0,     0,     0,     0,     0,   650,     0,     0,
1523         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1524 <       0,     0,   397,     0,     0,   468,   481,     0,     0,     0,
1525 <     483,   569,   573,   560,   589,   602,   601,   656,   606,   567,
1526 <     658,   598,   604,   568,   558,   559,   576,   565,   597,   566,
1527 <     579,   564,   578,   577,   572,   571,   570,   599,   557,   596,
1528 <     654,   655,   593,   590,   635,   651,   652,   636,   637,   638,
1529 <     639,   646,   640,   649,   653,   642,   647,   643,   648,   641,
1916 <     645,   644,   650,     0,   634,   595,   612,   628,   629,   613,
1917 <     614,   615,   616,   623,   617,   626,   630,   619,   624,   620,
1918 <     625,   618,   622,   621,   627,     0,   611,   588,   591,   605,
1919 <     562,   600,   563,   592,   581,   586,   587,   584,   585,   582,
1920 <     583,   575,   574,    34,    34,    34,    36,    35,   657,   607,
1921 <     594,   603,   561,   580,     0,     0,     0,     0,     0,     0,
1922 <     660,     0,     0,     0,     0,   312,     0,     0,     0,     0,
1923 <       0,     0,     0,     0,     0,     0,     0,   281,     0,     0,
1924 <       0,   453,     0,     0,     0,   276,   272,   275,   257,   110,
1925 <     116,   114,   113,   115,   111,   112,   109,   117,   123,   118,
1926 <     122,   120,   121,   119,   108,   107,   124,    46,    47,   153,
1524 >       0,     0,     0,     0,     0,    52,   378,     0,     0,     0,
1525 >     374,     0,   122,     0,   117,     0,     0,     0,     0,     0,
1526 >     111,     0,   342,   355,     0,     0,     0,     0,   350,    99,
1527 >      98,    97,   645,   644,   636,   637,    28,    28,    28,    28,
1528 >      28,    28,    28,    30,    29,   638,   648,   649,   639,   640,
1529 >     641,   643,   642,   646,   647,     0,     0,     0,     0,     0,
1530         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1531 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1532 <       0,     0,     0,   129,     0,     0,     0,   335,   742,   737,
1533 <     741,   739,   743,   738,   740,    74,    80,    72,    76,    75,
1534 <      71,    70,    68,    69,     0,    67,    73,    79,    77,    78,
1535 <       0,     0,     0,   346,     0,     0,   371,    29,    30,    31,
1536 <      32,    33,     0,     0,     0,     0,     0,     0,     0,     0,
1537 <       0,     0,     0,     0,     0,   223,     0,     0,     0,     0,
1538 <       0,     0,     0,     0,     0,     0,   435,     0,     0,     0,
1539 <       0,     0,     0,     0,     0,     0,   394,   474,   475,   495,
1540 <     496,   488,     0,   487,   632,     0,   609,     0,    37,    38,
1541 <      39,   685,   684,     0,   683,   671,   670,   677,   676,     0,
1542 <     675,   679,   678,   327,   304,   305,   326,   310,     0,   309,
1543 <       0,   329,   325,   324,   333,   328,   302,   332,   331,   330,
1544 <     303,   301,   466,   458,     0,   457,   465,   263,   264,   262,
1545 <       0,   261,   279,   278,     0,     0,     0,     0,     0,     0,
1546 <       0,   204,     0,     0,     0,     0,     0,     0,     0,     0,
1547 <       0,     0,     0,     0,     0,     0,     0,     0,     0,   126,
1548 <     343,   344,   342,    65,     0,   353,   359,   365,   369,   368,
1549 <     367,   364,   360,   363,   366,   361,   362,     0,   358,   354,
1550 <     377,   382,   388,   392,   391,   390,   387,   383,   386,   389,
1551 <     384,   385,     0,   381,   253,   254,   247,   249,   251,   250,
1552 <     248,   242,   255,   246,   244,   245,   252,   424,   426,   427,
1553 <     446,   451,   450,   445,   444,   443,   428,   433,     0,   432,
1554 <       0,   421,   448,   449,   419,   425,   442,   423,   447,   422,
1555 <     485,     0,   633,   610,   681,     0,   673,     0,     0,   307,
1556 <     312,   318,   319,   315,   321,   317,   316,   323,   320,   322,
1557 <     314,   313,   455,     0,   259,     0,   277,   274,   273,   194,
1558 <     160,   192,   158,   202,     0,   201,     0,   190,   184,   195,
1559 <     196,   187,   154,   191,   157,   193,   185,   186,   159,   197,
1560 <     165,   181,   182,   166,   167,   168,   169,   176,   170,   179,
1561 <     183,   172,   177,   173,   178,   171,   175,   174,   180,     0,
1562 <     164,   189,   156,   188,    66,   356,     0,   379,     0,     0,
1563 <     430,   435,   439,   440,   437,   438,   441,   436,   486,   682,
1564 <     674,   311,   308,   456,   260,     0,   199,   204,   214,   212,
1565 <     221,   211,   206,   215,   219,   208,   216,   218,   213,   207,
1566 <     220,   217,   209,   210,   205,   162,     0,   357,   380,   434,
1567 <     431,   203,   200,   163
1568 < };
1569 <
1570 < /* YYDEFGOTO[NTERM-NUM].  */
1571 < static const yytype_int16 yydefgoto[] =
1572 < {
1573 <      -1,     1,    24,   900,   901,  1056,  1057,    25,   277,   278,
1574 <     279,   280,    26,   315,   316,   317,   553,  1164,  1165,   318,
1575 <     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
1576 <      27,    71,    72,    73,    74,    75,    28,   260,   261,   262,
1974 <     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
1975 <     273,    29,    61,   282,   825,   826,   827,   283,   828,   829,
1976 <     830,   831,   832,   833,  1138,  1439,  1440,   834,   835,   836,
1977 <     837,   838,   839,   840,   841,   842,   843,   844,   845,   846,
1978 <     847,   848,  1124,  1404,  1405,  1465,  1406,  1484,    30,    49,
1979 <     116,   614,   615,   616,   117,   617,   618,   619,   620,   621,
1980 <     622,   623,   624,   625,   626,   627,   628,    31,    58,   500,
1981 <     774,  1270,  1271,   501,   502,   503,  1276,  1096,  1097,   504,
1982 <     505,    32,    56,   468,   469,   470,   471,   472,   473,   474,
1983 <     475,   754,  1248,  1249,  1378,  1250,  1391,   476,   477,   478,
1984 <     479,   480,   481,   482,   483,   484,   485,    33,    62,   531,
1985 <     532,   533,   534,   535,    34,    65,   564,   565,   566,   567,
1986 <     568,   878,  1317,  1318,    35,    66,   572,   573,   574,   575,
1987 <     884,  1332,  1333,    36,    50,   119,   649,   650,   651,   120,
1988 <     652,   653,   654,   655,   656,   657,   658,   659,   941,  1358,
1989 <    1359,  1449,  1360,  1457,   660,   661,   662,   663,   664,   665,
1990 <     666,   667,   668,   669,    37,    57,   490,   769,  1264,  1265,
1991 <     491,   492,   493,   494,    38,    51,   362,   363,   364,   365,
1992 <      39,   124,   125,   126,    40,    53,   373,   678,  1222,  1223,
1993 <     374,   375,   376,   377,    41,   185,   186,   187,   188,   189,
1994 <     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
1995 <     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
1996 <     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
1997 <     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
1998 <     230,   231,   232,   233,   234,   235,   236,   413,  1035,  1036,
1999 <     237,   411,  1013,  1014,   238,   239,   240,   241,   242,    42,
2000 <      55,   443,   444,   445,   446,   447,   744,  1239,  1240,   448,
2001 <     449,   450,   741,  1233,  1234,    43,    95,    96,    97,    98,
2002 <      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
2003 <     109,   110,   111,   112,   113,   114,    44,   293,   294,   295,
2004 <     296,   297,   298,   299,   300,   301
1531 >      38,     0,     0,   230,     0,     0,     0,     0,     0,     0,
1532 >       0,     0,     0,     0,     0,     0,     0,     0,     0,   395,
1533 >       0,     0,   443,   456,     0,     0,   458,   533,   537,   519,
1534 >     520,   552,   522,   617,   562,   559,   532,   524,   523,   526,
1535 >     527,   525,   540,   530,   531,   541,   529,   536,   535,   534,
1536 >     560,   521,   615,   616,   556,   601,   595,   611,   596,   597,
1537 >     598,   606,   614,   599,   608,   612,   602,   613,   603,   607,
1538 >     600,   610,   605,   604,   609,     0,   594,   558,   574,   575,
1539 >     576,   569,   587,   570,   571,   572,   582,   590,   573,   584,
1540 >     588,   578,   589,   579,   583,   577,   586,   581,   580,   585,
1541 >       0,   568,   553,   551,   554,   561,   555,   543,   549,   550,
1542 >     547,   548,   544,   545,   546,   563,   564,   528,   557,   539,
1543 >     538,   542,     0,     0,     0,     0,     0,     0,     0,     0,
1544 >     298,     0,     0,   434,     0,     0,     0,   293,   289,   292,
1545 >     274,    50,    51,     0,     0,   101,     0,     0,     0,     0,
1546 >       0,     0,     0,     0,     0,     0,   154,     0,     0,     0,
1547 >     332,   663,   662,   668,   666,   669,   664,   665,   667,    81,
1548 >      89,    80,    87,    88,    79,    83,    82,    74,    73,    78,
1549 >      75,    77,    86,    76,    84,    85,     0,     0,   373,   128,
1550 >       0,     0,     0,   140,     0,   132,   133,   135,   134,     0,
1551 >       0,     0,     0,   110,   347,     0,     0,     0,   349,    31,
1552 >      32,    33,    34,    35,    36,    37,   262,   263,   254,   272,
1553 >     271,     0,   270,   255,   257,   259,   266,   258,   256,   265,
1554 >     251,   264,   253,   252,    38,    38,    38,    40,    39,   260,
1555 >     261,   417,   420,   421,   431,   428,   414,   429,   426,   427,
1556 >       0,   425,   430,   413,   419,   416,   418,   432,   415,   449,
1557 >     450,   464,   465,   592,     0,   566,     0,   312,   313,   322,
1558 >     319,   324,   320,   321,   327,   323,   325,   318,   326,     0,
1559 >     317,   311,   330,   329,   328,   310,   441,   440,   296,   295,
1560 >     280,   281,   279,     0,   278,     0,     0,     0,   107,   108,
1561 >     175,   171,   222,   209,   219,   218,   207,   212,   228,   221,
1562 >     226,   211,   214,   223,   225,   220,   227,   215,   217,   224,
1563 >     213,   216,     0,   205,   168,   170,   172,   173,   174,   185,
1564 >     186,   187,   180,   198,   181,   182,   183,   193,   201,   184,
1565 >     195,   199,   189,   200,   190,   194,   188,   197,   192,   191,
1566 >     196,     0,   179,   169,   341,   339,   340,   379,   384,   390,
1567 >     393,   386,   392,   387,   391,   389,   385,   388,     0,   383,
1568 >     136,     0,     0,     0,     0,   131,   119,   118,   120,   121,
1569 >     356,   362,   368,   371,   364,   370,   365,   369,   367,   363,
1570 >     366,     0,   361,   357,   268,     0,    41,    42,    43,   423,
1571 >       0,   593,   567,   315,     0,   276,     0,   294,   291,   290,
1572 >       0,     0,     0,   203,     0,   177,     0,   381,     0,     0,
1573 >       0,     0,     0,   130,   359,     0,   269,   424,   316,   277,
1574 >     208,   206,   210,   204,   178,   382,   137,   139,   138,   146,
1575 >     151,   150,   145,   148,   152,   149,   144,   147,     0,   143,
1576 >     360,   141,     0,   142
1577   };
1578  
1579 < /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
1580 <   STATE-NUM.  */
2009 < #define YYPACT_NINF -952
2010 < static const yytype_int16 yypact[] =
1579 >  /* YYPGOTO[NTERM-NUM].  */
1580 > static const yytype_int16 yypgoto[] =
1581   {
1582 <    -952,   888,  -952,  -233,  -260,  -258,  -952,  -952,  -952,  -255,
1583 <    -952,  -253,  -952,  -952,  -952,  -952,  -250,  -237,  -952,  -952,
1584 <    -228,  -226,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1585 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1586 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,   302,   766,  -136,
1587 <    -112,  -199,    17,  -193,   475,  -190,  -187,  -173,  -167,   702,
1588 <       2,   -46,  -149,   361,   520,  -140,  -134,  -130,  -121,  -102,
1589 <     -84,     4,  -952,  -952,  -952,  -952,  -952,   -82,   -77,   -62,
1590 <     -57,   -51,   -33,   -30,   -25,   -16,    -5,    -4,    20,    24,
1591 <      37,    40,    46,    49,    59,   286,  -952,  -952,  -952,  -952,
1592 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1593 <    -952,  -952,  -952,  -952,  -952,  -952,    36,  -952,  -952,    63,
1594 <    -952,    19,  -952,    70,     7,  -952,  -952,   159,  -952,    71,
1595 <      76,    79,    84,    91,    98,   104,   105,   107,   108,   109,
1596 <     112,   113,   114,   116,   117,   118,   121,   125,   126,   130,
1597 <     132,   136,   140,   142,   144,   146,   148,   153,   155,   157,
1598 <     161,   164,  -952,   165,  -952,   169,   170,   171,   172,   173,
1599 <     181,   184,   185,   194,   196,   198,   199,   200,   201,   204,
1600 <     206,   209,   210,   212,   213,    23,  -952,  -952,  -952,  -952,
1601 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1602 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1603 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1604 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1605 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1606 <    -952,  -952,  -952,   552,   784,    93,    88,   217,   215,   216,
1607 <     220,   224,   225,   226,   227,   231,   232,   234,   235,   239,
1608 <     133,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1609 <    -952,  -952,  -952,  -952,   243,   241,   245,    27,  -952,  -952,
1610 <    -952,  -952,   247,  -952,    25,  -952,   248,   250,   252,   259,
1611 <     260,   261,   266,    45,  -952,  -952,  -952,  -952,  -952,  -952,
2042 <    -952,  -952,   271,   269,   270,   272,   276,   278,   279,   280,
2043 <    -952,   281,   285,   289,   290,   303,  -952,  -952,  -952,  -952,
2044 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,    56,
2045 <      62,  -952,   357,   381,   396,   296,  -952,   363,   434,   436,
2046 <     374,   375,   444,   444,   449,   450,   387,   390,   462,   444,
2047 <     397,   400,   403,   404,   405,   318,  -952,   634,   703,  -952,
2048 <     342,   343,    15,  -952,  -952,  -952,   454,   348,  -952,  -952,
2049 <     346,   353,  -952,  -952,   158,  -952,  -952,  -952,   414,   444,
2050 <     421,   444,   494,   476,   497,   433,   435,   437,   500,   483,
2051 <     440,   510,   513,   514,   451,   444,   452,   453,   516,   499,
2052 <     461,   529,   530,   444,   533,   542,   512,   543,   546,   481,
2053 <     482,   417,   484,   419,   444,   444,   486,   444,   536,   489,
2054 <     493,   495,  -150,  -141,   496,   498,   444,   444,   560,   444,
2055 <     501,   503,   509,   511,   455,  -952,  -952,  -952,   446,   456,
2056 <    -952,   457,   459,    44,  -952,  -952,  -952,  -952,  -952,  -952,
2057 <    -952,   463,   467,   468,   485,   487,  -952,   490,   506,   507,
2058 <     508,   519,   524,   526,   527,   531,   532,   544,   160,  -952,
2059 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2060 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,   548,  -952,   550,
2061 <    -952,    12,  -952,  -952,  -952,   465,  -952,   551,   553,   554,
2062 <    -952,    14,  -952,  -952,  -952,  -952,  -952,   557,   559,   561,
2063 <     564,   585,   586,   591,   592,   230,   596,   613,   577,   537,
2064 <    -952,  -952,   640,   643,   549,  -952,   574,   555,   556,   562,
2065 <     563,    32,  -952,  -952,  -952,  -952,   623,   630,   631,   665,
2066 <     632,   633,   444,   575,  -952,  -952,   681,   639,   685,   688,
2067 <     689,   690,   691,   582,   693,   565,   694,   695,   589,  -952,
2068 <     590,   593,  -952,   594,     9,  -952,  -952,  -952,  -952,   601,
2069 <     607,  -952,    33,  -952,  -952,  -952,   604,   614,   615,  -952,
2070 <     616,   619,   620,   624,   625,   189,   628,   629,   635,   636,
2071 <     637,   638,   641,   642,   644,   646,   647,   651,   654,  -952,
2072 <     656,   610,   618,   627,   655,   660,   661,   662,   663,   664,
2073 <     667,   669,   670,   671,   223,  -952,  -952,  -952,  -952,  -952,
2074 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,   657,
2075 <     672,   673,   674,   676,   679,   680,   683,   684,   686,  -952,
2076 <     687,   696,   697,   699,   700,   701,   704,   705,   706,   238,
2077 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2078 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2079 <     730,   741,   659,  -952,   668,  -952,   746,   747,   707,   711,
2080 <    -952,   712,   713,   716,   717,   719,   720,   721,   722,   723,
2081 <     724,   725,   726,   727,   729,   731,   732,   733,   734,   735,
2082 <     736,   737,   738,   739,   740,   742,   743,   744,   745,   748,
2083 <     749,   750,   751,   752,   815,   753,   871,   754,   755,   767,
2084 <     771,   774,   775,   776,   777,   778,   779,   780,   781,   782,
2085 <     786,   790,   791,   315,   793,   794,   796,   797,   798,   800,
2086 <    -952,   799,   444,   756,   801,   795,   803,   805,  -952,  -952,
2087 <     760,   812,   769,   804,   807,   809,   864,   866,   869,   870,
2088 <     918,   566,   919,   927,   886,   934,   828,  -952,   937,   829,
2089 <     938,   833,  -952,  -952,   831,   942,   943,   772,   837,  -952,
2090 <     838,   842,   846,   847,   849,   850,   857,   860,   865,   867,
2091 <     868,   872,   873,   874,   875,   879,   883,   884,  -952,   887,
2092 <     889,  -952,   890,   861,   891,   892,   893,  -952,   894,   895,
2093 <     896,   897,   898,   899,   900,   901,   902,   903,   904,   905,
2094 <     906,  -952,   907,   909,   910,   149,  -952,  -952,  -952,  -952,
2095 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2096 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2097 <     976,   977,   978,   911,  -952,   914,   915,   916,   917,   920,
2098 <     921,   922,  -952,   923,   924,   925,   926,   928,   929,   930,
2099 <     -15,   931,   932,   933,   935,  -952,  -952,   993,   936,   998,
2100 <     940,  -952,  -952,   999,   939,   941,  -952,  -952,  -952,  -952,
2101 <    -952,  -952,  -952,  -952,  -952,   444,   444,   444,   444,   444,
2102 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2103 <    -952,  -952,  -952,  -952,  -952,  -952,   813,  1022,   444,  1047,
2104 <    1048,  1056,  1063,  1043,  1066,  1067,   444,   444,   560,   944,
2105 <    -952,  -952,  1050,   -13,  1008,  1053,  1054,  1011,  1012,  1013,
2106 <    1058,   949,  1060,  1061,  1062,  1064,  1085,  1065,  1068,  1023,
2107 <    1069,   959,  -952,   963,   964,  -952,  -952,   965,   966,  1070,
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,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2111 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2112 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2113 <    -952,  -952,  -952,  -245,  -952,  -952,  -952,  -952,  -952,  -952,
2114 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2115 <    -952,  -952,  -952,  -952,  -952,  -202,  -952,  -952,  -952,  -952,
2116 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2117 <    -952,  -952,  -952,   560,   560,   560,  -952,  -952,  -952,  -952,
2118 <    -952,  -952,  -952,  -952,     1,   967,   969,    11,   970,   971,
2119 <    -952,   972,   973,   974,   975,  1106,   979,   980,   981,   982,
2120 <     983,   984,   985,   986,   987,   988,   989,  -952,   990,  1079,
2121 <     991,  -952,     0,   992,   994,   650,   995,  -952,  -952,  -952,
2122 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2123 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2124 <    1041,  1100,  1059,  1071,   997,  1072,  1073,  1074,  1075,  1076,
2125 <    1102,  1077,  1104,  1078,  1080,  1081,  1105,  1082,  1000,  1083,
2126 <    1108,  1084,  1002,  -952,  1004,  1005,  1006,  -952,  -952,  -952,
2127 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2128 <    -952,  -952,  -952,  -952,  -174,  -952,  -952,  -952,  -952,  -952,
2129 <    1007,   534,  1016,  -952,  1024,   621,  -952,  -952,  -952,  -952,
2130 <    -952,  -952,  1025,  1026,  1027,  1028,  1029,  1030,  1031,  1032,
2131 <    1033,  1034,  1035,  1036,  1037,  -952,  1038,  1039,  1040,  1042,
2132 <    1044,  1045,  1046,  1049,  1051,  1052,  1152,  1055,  1057,  1086,
2133 <    1087,  1088,  1089,  1090,  1091,  1092,  -952,  -952,  -952,  -952,
2134 <    -952,  -952,  -148,  -952,  -952,   815,  -952,   871,  -952,  -952,
2135 <    -952,  -952,  -952,  -145,  -952,  -952,  -952,  -952,  -952,  -129,
2136 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -117,  -952,
2137 <     447,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2138 <    -952,  -952,  -952,  -952,   -35,  -952,  -952,  -952,  -952,  -952,
2139 <     -10,  -952,  -952,  -952,  1170,   772,  1093,  1094,  1095,  1096,
2140 <    1097,  1153,  1098,  1099,  1101,  1103,  1107,  1109,  1110,  1111,
2141 <    1112,  1113,  1114,  1115,  1116,   908,  1117,  1118,  1119,  -952,
2142 <    -952,  -952,  -952,  -952,   -15,  -952,  -952,  -952,  -952,  -952,
2143 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,    -8,  -952,  -952,
2144 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2145 <    -952,  -952,    35,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2146 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2147 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,    80,  -952,
2148 <      13,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2149 <    -952,  1070,  -952,  -952,  -952,     1,  -952,    11,   447,  -952,
2150 <    1106,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2151 <    -952,  -952,  -952,  1079,  -952,     0,  -952,  -952,  -952,  -952,
2152 <    -952,  -952,  -952,  -952,    89,  -952,   366,  -952,  -952,  -952,
2153 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2154 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2155 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,    95,
2156 <    -952,  -952,  -952,  -952,  -952,  -952,   534,  -952,   621,    13,
2157 <    -952,  1152,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2158 <    -952,  -952,  -952,  -952,  -952,   366,  -952,  1153,  -952,  -952,
2159 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2160 <    -952,  -952,  -952,  -952,  -952,  -952,   908,  -952,  -952,  -952,
2161 <    -952,  -952,  -952,  -952
1582 >    -967,  -967,  -967,  -310,  -315,  -966,  -647,  -967,  -967,   948,
1583 >    -967,  -967,  -967,  -967,   867,  -967,  -967,  -967,  -967,  -967,
1584 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1585 >    -967,  -967,  -967,  -967,  1061,  -967,  -967,  -967,  -967,  -967,
1586 >    -967,   541,  -967,  -967,  -967,  -967,  -967,   551,  -967,  -967,
1587 >    -967,  -967,  -967,  -967,   871,  -967,  -967,  -967,  -967,    79,
1588 >    -967,  -967,  -967,  -967,  -967,  -175,  -967,  -967,  -967,   625,
1589 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1590 >    -967,  -147,  -967,  -967,  -967,  -129,  -967,  -967,  -967,   831,
1591 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1592 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -108,
1593 >    -967,  -967,  -967,  -967,  -967,  -120,  -967,   661,  -967,  -967,
1594 >    -967,     6,  -967,  -967,  -967,  -967,  -967,   700,  -967,  -967,
1595 >    -967,  -967,  -967,  -967,  -967,  -114,  -967,  -967,  -967,  -967,
1596 >    -967,  -967,   630,  -967,  -967,  -967,  -967,  -967,   967,  -967,
1597 >    -967,  -967,  -967,   591,  -967,  -967,  -967,  -967,  -967,  -131,
1598 >    -967,  -967,  -967,   594,  -967,  -967,  -967,  -967,  -107,  -967,
1599 >    -967,  -967,   873,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1600 >    -967,  -967,  -967,  -967,   -87,  -967,  -967,  -967,  -967,  -967,
1601 >    -967,  -967,  -967,   711,  -967,  -967,  -967,  -967,  -967,   833,
1602 >    -967,  -967,  -967,  -967,  1091,  -967,  -967,  -967,  -967,   820,
1603 >    -967,  -967,  -967,  -967,  1038,  -967,  -967,  -967,  -967,  -967,
1604 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1605 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1606 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1607 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1608 >    -967,  -967,    76,  -967,  -967,  -967,    77,  -967,  -967,  -967,
1609 >    -967,  -967,  1116,  -967,  -967,  -967,  -967,  -967,  -967,  -967,
1610 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967,   982,
1611 >    -967,  -967,  -967,  -967,  -967,  -967,  -967,  -967
1612   };
1613  
1614 < /* YYPGOTO[NTERM-NUM].  */
1615 < static const yytype_int16 yypgoto[] =
1614 >  /* YYDEFGOTO[NTERM-NUM].  */
1615 > static const yytype_int16 yydefgoto[] =
1616   {
1617 <    -952,  -952,  -952,  -816,  -342,  -951,  -426,  -952,  -952,   578,
1618 <    -952,  -952,  -952,  -952,   541,  -952,  -952,  -952,     5,  -952,
1619 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1620 <    -952,  -952,  1234,  -952,  -952,  -952,  -952,  -952,  1122,  -952,
1621 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1622 <    -952,  -952,  -952,  -952,  -952,   491,  -952,  -952,  -952,  -952,
1623 <    -952,  -952,  -952,  -952,  -952,  -952,  -176,  -952,  -952,  -952,
1624 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1625 <    -952,  -952,  -952,  -952,  -155,  -952,  -952,  -147,  -952,  -952,
1626 <    -952,  -952,   708,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1627 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1628 <    -952,  -952,   -80,  -952,   819,  -952,  -952,  -952,    48,  -952,
1629 <    -952,  -952,  -952,  -952,   853,  -952,  -952,  -952,  -952,  -952,
1630 <    -952,  -952,  -952,   -56,  -952,  -952,   -53,  -952,  -952,  -952,
1631 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1632 <     802,  -952,  -952,  -952,  -952,  -952,  -952,   762,  -952,  -952,
1633 <    -952,  -952,  -952,  -119,  -952,  -952,  -952,   757,  -952,  -952,
1634 <    -952,  -952,  -120,  -952,  -952,  -952,  -952,   682,  -952,  -952,
1635 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1636 <    -116,  -952,  -952,  -115,  -952,  -952,  -952,  -952,  -952,  -952,
1637 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,   -63,
1638 <    -952,   841,  -952,  -952,  -952,  -952,  -952,  1021,  -952,  -952,
1639 <    -952,  -952,  1212,  -952,  -952,  -952,  -952,  -952,  -952,   -34,
1640 <    -952,   968,  -952,  -952,  -952,  -952,  1154,  -952,  -952,  -952,
1641 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1642 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1643 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1644 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
1645 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,   111,
1646 <    -952,  -952,  -952,   115,  -952,  -952,  -952,  -952,  -952,  -952,
2197 <    -952,  -952,   945,  -952,  -952,  -952,  -952,  -952,   -36,  -952,
2198 <    -952,  -952,  -952,  -952,   -32,  -952,  -952,  1249,  -952,  -952,
2199 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,
2200 <    -952,  -952,  -952,  -952,  -952,  -952,  -952,  -952,  1120,  -952,
2201 <    -952,  -952,  -952,  -952,  -952,  -952
1617 >      -1,     1,    26,   843,   844,  1107,  1108,    27,   229,   230,
1618 >     231,   232,    28,   273,   274,   275,   276,   277,   278,   279,
1619 >     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
1620 >     290,   291,    29,    77,    78,    79,    80,    81,    30,    63,
1621 >     510,   511,   512,   513,    31,    70,   593,   594,   595,   596,
1622 >     597,   598,    32,   295,   296,   297,   298,   299,  1064,  1065,
1623 >    1066,  1067,  1068,  1243,  1318,  1319,    33,    64,   525,   526,
1624 >     527,   528,   529,   530,   531,   532,   533,   534,   535,   769,
1625 >    1221,  1222,   536,   763,  1192,  1193,    34,    53,   347,   348,
1626 >     349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
1627 >     359,   360,   361,   362,   363,   364,   365,   635,  1091,  1092,
1628 >      35,    61,   496,   748,  1163,  1164,   497,   498,   499,  1167,
1629 >    1008,  1009,   500,   501,    36,    59,   474,   475,   476,   477,
1630 >     478,   479,   480,   733,  1149,  1150,   481,   482,   483,    37,
1631 >      65,   541,   542,   543,   544,   545,    38,   303,   304,   305,
1632 >      39,    72,   606,   607,   608,   609,   610,   825,  1261,  1262,
1633 >      40,    68,   579,   580,   581,   582,   808,  1238,  1239,    41,
1634 >      54,   381,   382,   383,   384,   385,   386,   387,   388,   389,
1635 >     390,   391,   658,  1120,  1121,   392,   393,   394,   395,   396,
1636 >      42,    60,   487,   488,   489,   490,    43,    55,   400,   401,
1637 >     402,   403,    44,   118,   119,   120,    45,    57,   410,   411,
1638 >     412,   413,    46,   172,   173,   174,   175,   176,   177,   178,
1639 >     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
1640 >     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
1641 >     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
1642 >     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
1643 >     444,   970,   971,   219,   442,   945,   946,   220,   221,   222,
1644 >      47,    97,    98,    99,   100,   101,   102,   103,   104,   105,
1645 >     106,   107,   108,   109,   110,   111,   112,    48,   245,   246,
1646 >     247,   248,   249,   250,   251,   252,   253,   254
1647   };
1648  
1649 < /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
1650 <   positive, shift that token.  If negative, reduce the rule which
1651 <   number is the opposite.  If zero, do what YYDEFACT says.
1652 <   If YYTABLE_NINF, syntax error.  */
2208 < #define YYTABLE_NINF -1
2209 < static const yytype_uint16 yytable[] =
1649 >  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
1650 >     positive, shift that token.  If negative, reduce the rule whose
1651 >     number is the opposite.  If YYTABLE_NINF, syntax error.  */
1652 > static const yytype_int16 yytable[] =
1653   {
1654 <     586,   587,   734,   274,    47,    67,    48,   593,   122,    52,
1655 <     560,    54,  1231,   486,    59,   495,   359,  1224,   122,   115,
1656 <     359,  1225,  1237,  1452,   128,  1453,   527,    60,   274,    45,
1657 <      46,   129,   130,   527,   569,   131,    63,   682,    64,   684,
1658 <    1454,    68,   132,   118,  1455,   436,   285,   528,   437,   725,
1659 <     726,   133,    69,   698,   528,   134,   135,   560,   727,   728,
1660 <    1226,   706,   136,   569,  1227,   121,   137,   138,   139,   496,
1661 <     140,   127,   717,   718,   243,   720,   141,   244,  1267,  1177,
1662 <    1178,  1179,  1180,  1181,   731,   732,   286,   735,  1303,   495,
1663 <     438,   245,  1304,   439,   486,   142,   143,   246,   123,   497,
1664 <     144,   287,  1228,  1229,  1230,   498,   360,   145,   123,   281,
1665 <     360,   146,   147,   148,  1370,   284,   149,  1374,  1371,   150,
1666 <     151,  1375,   275,   288,   329,   289,    70,   290,   291,   152,
1667 <     330,   561,   331,  1376,   247,   153,   154,  1377,   155,   156,
1668 <     157,   158,   159,   496,   332,  1379,   292,   275,   440,  1380,
1669 <     802,   529,   276,   160,   803,   570,  1162,  1163,   529,   369,
1670 <     369,   451,   161,   333,   162,   163,   441,   164,   499,   487,
1671 <     165,   166,   361,   497,   167,   804,   361,   276,   561,   498,
1672 <     452,   334,   530,   337,   570,   168,   453,   805,   338,   530,
1673 <     248,   249,   250,   251,   252,   253,   254,   255,   562,   806,
1674 <     861,   488,  1232,   339,   807,  1197,  1198,   169,   340,   170,
1675 <     454,   455,  1238,   171,   341,   456,   808,   172,   173,   174,
1676 <     175,   176,   571,   809,   600,   177,   178,  1392,   810,   457,
1677 <     811,  1393,   342,  1268,   179,   343,   458,  1269,   256,   629,
1678 <     344,   630,   499,   812,   631,   562,   601,   602,   632,   345,
1679 <     487,   571,  1394,   603,  1445,   459,  1395,  1456,  1446,   563,
1680 <     346,   347,   489,   633,   634,   635,   180,   335,   181,   636,
1681 <     367,   813,   880,   257,   182,   771,   814,   778,   672,   183,
1682 <     370,   370,   488,   460,   184,   348,   434,    76,   637,   349,
1683 <     524,   461,   638,   639,   442,   853,   885,  1447,   815,    77,
1684 <     357,  1448,   350,    67,   302,   351,   563,   747,   543,   462,
1685 <     816,   352,   817,   818,   353,   371,   371,   819,   463,   464,
1686 <      78,    79,   585,   640,   354,   641,    80,   358,    81,  1053,
1687 <    1054,  1055,   604,   605,   606,   366,   378,   607,   642,    68,
1688 <     303,   379,  1450,   489,   380,   608,  1451,   372,   372,   381,
1689 <      69,  1466,   465,   466,   258,  1467,   382,  1485,   609,   610,
1690 <     643,  1486,   285,   383,   895,   896,   897,   898,   899,   384,
1691 <     385,  1468,   386,   387,   388,   611,   612,   389,   390,   391,
1692 <     820,   392,   393,   394,    82,    83,   395,   821,   259,   304,
1693 <     396,   397,   644,    84,    85,   398,   519,   399,   822,   823,
1694 <    1065,   400,   286,   613,  1469,   401,   645,   402,   824,   403,
1695 <     467,   404,  1142,   405,    86,    87,  1470,   287,   406,   646,
1696 <     407,   679,   408,   766,    70,   305,   409,   306,   307,   410,
1697 <     412,    88,    89,  1471,   414,   415,   416,   417,   418,   288,
1698 <    1472,   289,    90,   290,   291,  1473,   419,  1474,   733,   420,
1699 <     421,    91,   788,   789,   790,   791,   792,   793,   794,   422,
1700 <    1475,   423,   292,   424,   425,   426,   427,  1381,  1382,   428,
1701 <     308,   429,   309,   310,   430,   431,   128,   432,   433,   506,
1702 <     507,   508,   647,   129,   130,   509,   929,   131,   311,   510,
1703 <     511,   512,   513,  1476,   132,   648,   514,   515,  1383,   516,
1704 <     517,   951,  1194,   133,   518,   521,   522,   134,   135,  1477,
1705 <     523,   526,   576,   536,   136,   537,  1384,   538,   137,   138,
1706 <     139,   302,   140,  1385,   539,   540,   541,  1478,   141,  1479,
1707 <    1480,   542,   312,   545,   546,   547,   577,   548,    92,    93,
1708 <      94,   549,  1386,   550,   551,   552,   554,   142,   143,   355,
1709 <     555,   578,   144,   436,   556,   557,   437,   303,   579,   145,
1710 <     313,   314,   580,   146,   147,   148,   558,   581,   149,   582,
1711 <    1387,   150,   151,   583,   584,   802,  1184,   585,  1388,   803,
1712 <     599,   152,   588,   589,  1192,  1193,   590,   153,   154,   591,
1713 <     155,   156,   157,   158,   159,   592,   594,  1481,   438,   595,
1714 <     804,   439,   596,   597,   598,   160,   304,   670,   671,   674,
1715 <     675,   676,   805,   681,   161,  1482,   162,   163,   677,   164,
1716 <     683,  1389,   165,   166,   806,  1483,   167,   685,  1306,   807,
1717 <     687,   686,   688,   691,   689,   600,   690,   168,   692,   693,
1718 <    1390,   808,   305,   694,   306,   307,   695,   696,   809,   701,
1719 <     697,   699,   700,   810,   702,   811,   440,   601,   602,   169,
1720 <     703,   170,   704,   705,   603,   171,   707,   709,   812,   172,
1721 <     173,   174,   175,   176,   441,   708,   710,   177,   178,   711,
1722 <     712,   713,   714,   715,   716,   719,   179,   308,   722,   309,
1723 <     310,   721,   723,   733,   724,   729,   813,   730,   872,  1082,
1724 <     736,   814,   737,   247,   629,   311,   630,  1307,   738,   631,
1725 <     739,   742,   780,   632,   781,  1321,   782,   740,   180,   783,
1726 <     181,   743,   745,   815,   746,   749,   182,   773,   633,   634,
1727 <     635,   183,   750,   751,   636,   816,   184,   817,   818,  1308,
1728 <     784,   785,   819,   604,   605,   606,   786,   787,   607,   312,
1729 <     752,   795,   753,   637,  1309,   755,   608,   638,   639,   248,
1730 <     249,   250,   251,   252,   253,   254,   255,    76,   796,   609,
1731 <     610,   756,   757,   758,  1310,  1311,   797,   313,   314,    77,
1732 <    1312,  1313,  1314,  1315,   759,   451,   611,   612,   640,   760,
1733 <     641,   761,   762,  1316,  1322,   799,   763,   764,   800,   798,
1734 <      78,    79,   442,   642,   452,   820,    80,   256,    81,   765,
1735 <     453,   801,   821,   768,   613,   770,   775,   849,   776,   777,
1736 <     858,   850,   855,   822,   823,   643,  1323,   851,   852,   856,
1737 <     857,   859,   860,   824,   454,   455,   863,   862,   864,   456,
1738 <     865,  1324,   257,   866,   867,   868,   869,   870,   871,   873,
1739 <     874,   875,   876,   457,  1274,   525,   559,   644,   877,   879,
1740 <     458,  1325,  1326,   882,    82,    83,   887,  1327,  1328,  1329,
1741 <    1330,   645,   883,    84,    85,   916,   888,   889,   890,   459,
1742 <    1331,   891,   892,   917,   646,   953,   893,   894,     2,     3,
1743 <     902,   903,   918,     4,    86,    87,   954,   904,   905,   906,
1744 <     907,   957,   958,   908,   909,  1095,   910,   460,   911,   912,
1745 <       5,    88,    89,   913,     6,   461,   914,     7,   915,   931,
1746 <     919,   955,    90,   258,     8,   920,   921,   922,   923,   924,
1747 <     956,    91,   925,   462,   926,   927,   928,   932,   933,   934,
1748 <       9,   935,   463,   464,   936,   937,  1182,   647,   938,   939,
1749 <    1068,   940,   942,    10,    11,  1066,    12,   259,  1069,  1071,
1750 <     648,   943,   944,    13,   945,   946,   947,  1072,  1073,   948,
1751 <     949,   950,   959,   960,   961,   962,   465,   466,   963,   964,
1752 <      14,   965,   966,   967,   968,   969,   970,   971,   972,   973,
1753 <      15,   974,    16,   975,   976,   977,   978,   979,   980,   981,
1754 <     982,   983,   984,  1074,   985,   986,   987,   988,  1076,    17,
1755 <     989,   990,   991,   992,   993,  1015,  1037,  1038,    92,    93,
1756 <      94,   994,   995,   996,   997,   998,    18,   999,  1000,  1039,
1757 <    1001,  1002,  1003,  1040,   467,  1004,  1041,  1042,  1043,  1044,
1758 <    1045,  1046,  1047,  1048,  1049,  1005,  1006,  1007,  1050,  1008,
1759 <    1009,  1010,  1051,  1052,  1011,  1058,  1059,  1012,  1060,  1061,
1760 <    1062,    19,  1063,  1077,  1064,  1078,  1067,  1070,  1079,  1080,
1761 <      20,    21,  1075,  1081,  1083,    22,    23,  1016,  1017,  1018,
1762 <    1019,  1020,  1084,  1021,  1022,  1085,  1023,  1024,  1025,  1086,
1763 <    1087,  1026,  1088,  1090,  1089,  1091,  1092,  1093,  1094,  1098,
1764 <    1099,  1027,  1028,  1029,  1100,  1030,  1031,  1032,  1101,  1102,
1765 <    1033,  1103,  1104,  1034,  1420,  1421,  1422,  1423,  1424,  1105,
1766 <    1425,  1426,  1106,  1427,  1428,  1429,  1120,  1107,  1430,  1108,
1767 <    1109,  1144,  1145,  1146,  1110,  1111,  1112,  1113,  1431,  1432,
1768 <    1433,  1114,  1434,  1435,  1436,  1115,  1116,  1437,  1170,  1117,
1769 <    1438,  1118,  1119,  1172,  1174,  1183,  1121,  1122,  1123,  1125,
1770 <    1126,  1127,  1128,  1129,  1130,  1131,  1132,  1133,  1134,  1135,
1771 <    1136,  1137,  1139,  1147,  1140,  1141,  1148,  1149,  1150,  1151,
1772 <    1185,  1186,  1152,  1153,  1154,  1155,  1156,  1157,  1158,  1187,
1773 <    1159,  1160,  1161,  1166,  1167,  1168,  1188,  1169,  1189,  1190,
1774 <    1191,  1171,  1173,  1176,  1175,  1196,  1195,  1199,  1200,  1201,
1775 <    1202,  1203,  1204,  1205,  1206,  1207,  1208,  1209,  1211,  1210,
1776 <    1212,  1216,  1214,  1213,  1215,  1217,  1218,  1219,  1220,  1235,
1777 <    1221,  1236,  1241,  1242,  1243,  1244,  1245,  1246,  1247,  1263,
2335 <    1277,  1251,  1252,  1253,  1254,  1255,  1256,  1257,  1258,  1259,
2336 <    1260,  1261,  1262,  1266,  1272,  1278,  1273,  1287,  1279,  1289,
2337 <    1293,  1275,  1281,  1297,  1299,  1295,  1300,  1301,  1302,  1305,
2338 <    1280,  1282,  1283,  1284,  1285,  1286,  1288,  1290,  1319,  1291,
2339 <    1292,  1294,  1296,  1298,  1357,  1403,  1320,  1334,  1335,  1336,
2340 <    1337,  1338,  1339,  1340,  1341,  1342,  1343,  1344,  1345,  1346,
2341 <    1347,  1348,  1349,  1396,  1350,   336,  1351,  1352,  1353,  1444,
2342 <    1493,  1354,  1492,  1355,  1356,  1464,  1143,  1361,  1491,  1362,
2343 <     779,   767,   930,  1397,  1462,  1461,   881,  1487,  1488,   886,
2344 <    1463,   952,   772,   854,  1489,  1490,   368,  1458,  1373,   435,
2345 <    1372,  1460,   680,  1459,   356,     0,     0,     0,  1363,  1364,
2346 <    1365,  1366,  1367,  1368,  1369,  1398,  1399,  1400,  1401,  1402,
2347 <    1407,  1408,     0,  1409,     0,  1410,     0,     0,     0,  1411,
2348 <       0,  1412,  1413,  1414,  1415,  1416,  1417,  1418,  1419,  1441,
2349 <    1442,  1443,   520,   673,     0,     0,     0,     0,   748,     0,
1654 >     871,   872,   620,   491,   622,  1089,   624,   625,   236,   293,
1655 >     870,   576,  1118,    82,  1160,   116,   715,    73,    51,   226,
1656 >     716,    73,   507,   588,   484,   537,   507,   226,   293,   717,
1657 >     397,    52,   407,   718,    56,   116,    83,    84,   237,   397,
1658 >      49,    50,    85,    74,   576,   301,   238,    74,  1133,   602,
1659 >      75,  1135,  1134,  1264,    75,  1136,  1269,  1265,   239,   240,
1660 >    1270,   538,   492,   241,   242,   243,  1273,    58,  1275,   493,
1661 >    1274,   494,  1276,   301,    62,   602,   514,    86,    87,    66,
1662 >    1090,   117,  1060,    88,    89,    67,   484,    69,   244,    90,
1663 >      91,    92,    71,   407,   515,   329,   398,    93,    94,  1060,
1664 >     679,   117,   681,   682,   508,   398,  1290,   539,   508,   688,
1665 >     516,   330,   331,   692,   577,   332,   588,   113,   697,   227,
1666 >      76,   700,    95,    96,    76,  1283,   589,   227,   122,  1284,
1667 >     495,   710,   711,   123,   124,   408,   125,   126,  1266,  1267,
1668 >    1268,   127,   723,   228,   517,   726,   727,   577,   302,   128,
1669 >     129,   228,   603,  1285,   485,   540,   130,  1286,  1161,   131,
1670 >     399,   114,   409,   333,  1287,   132,   307,  1162,  1288,   399,
1671 >     133,   134,   115,   135,   136,   137,   302,   138,   603,   518,
1672 >     334,   335,   336,   337,   338,  1061,   139,  -129,   339,  1294,
1673 >     140,   141,   340,  1295,   590,   121,   408,   223,   341,   519,
1674 >     509,   142,  1061,  1321,   509,   255,  -129,  1322,  1119,   342,
1675 >     343,   143,   591,   875,   876,   520,   485,   224,   144,   589,
1676 >     145,   344,   146,   409,   147,   225,   148,   149,   592,   233,
1677 >     234,   256,   521,   522,   235,   578,   294,   750,   786,   150,
1678 >     308,   292,   554,   345,   151,   152,   153,   327,   154,   155,
1679 >     156,   311,   486,   157,   366,   294,   367,   819,   368,   777,
1680 >     758,   505,   585,   587,   670,   257,   676,   465,   578,   405,
1681 >     309,   300,   369,   604,   258,   306,   502,   605,   809,   158,
1682 >     556,  1062,   523,   827,   310,   466,   346,   590,   370,   159,
1683 >     160,   161,   162,   163,   164,   313,   259,   314,  1062,   604,
1684 >     260,   467,   315,   605,   524,   591,  1063,   600,   261,   611,
1685 >     771,   262,   263,   371,   486,   372,  1244,   236,   514,   857,
1686 >     743,   592,   373,  1063,   862,   537,   491,   865,   316,   649,
1687 >     317,   869,   318,   374,   319,   468,   515,  1104,  1105,  1106,
1688 >     320,   321,   322,   264,   165,   166,   167,   237,   168,   169,
1689 >     170,   323,   516,   324,   325,   238,   326,   375,   404,   171,
1690 >     265,   538,   463,   266,   267,   268,   414,   239,   240,   415,
1691 >     416,   417,   241,   242,   243,   418,   419,   420,   421,   422,
1692 >     423,   376,   424,   425,   619,   492,   517,   426,   427,   428,
1693 >     469,   269,   493,   429,   494,   430,   431,   244,   470,   471,
1694 >     432,   377,   433,   434,   435,   436,   437,   539,   438,   270,
1695 >     378,   836,   837,   838,   839,   840,   841,   842,   439,   472,
1696 >     440,   518,   441,   122,   443,   445,   446,   447,   123,   124,
1697 >     448,   125,   126,   449,   271,   272,   127,   450,   451,   574,
1698 >     870,   519,   452,   453,   128,   129,   465,   454,   455,   456,
1699 >     457,   130,   458,   495,   131,   540,   255,   520,   379,  1309,
1700 >     132,   459,   460,   461,   466,   133,   134,   462,   135,   136,
1701 >     137,   503,   138,   504,   521,   522,   546,   547,   548,   549,
1702 >     467,   139,   256,   380,   550,   140,   141,   551,   666,   552,
1703 >    1310,   553,  1311,   557,   558,   473,   142,   559,  1228,   560,
1704 >     561,   739,   562,   583,   563,   564,   143,   612,   565,   566,
1705 >     567,   568,   569,   144,   468,   145,   257,   146,   570,   147,
1706 >     571,   148,   149,   572,   523,   258,  1079,  1080,  1081,  1082,
1707 >    1083,  1084,  1085,  1172,   150,   573,   584,  1312,   599,   151,
1708 >     152,   153,   613,   154,   155,   156,   524,   259,   157,  1173,
1709 >     615,   260,   614,   616,  1313,   617,   618,  1174,   619,   261,
1710 >    1229,   621,   262,   263,   623,   626,  1251,   627,   628,   469,
1711 >     629,  1175,   630,   632,   158,   631,   678,   470,   471,   633,
1712 >     634,   636,   637,   638,   159,   160,   161,   162,   163,   164,
1713 >     639,  1230,  1314,  1315,   264,  1291,   640,  1139,   472,  1231,
1714 >     641,   642,  1176,   366,  1177,   367,   643,   368,  1232,   644,
1715 >     645,   265,   646,   647,   266,   267,   268,   648,  1140,   651,
1716 >     652,   369,   672,   653,   654,   655,   656,  1141,  1252,   657,
1717 >    1178,   659,  1233,   660,  1234,  1235,   661,   370,   662,   165,
1718 >     166,   167,   269,   168,   169,   170,  1316,   663,   664,  1236,
1719 >    1317,   665,   668,   669,   171,   673,  1237,   674,  1142,  1253,
1720 >     270,   675,   371,  1179,   372,  1180,   680,  1254,   683,   684,
1721 >     685,   373,   686,   687,   473,   689,  1255,   690,   691,   693,
1722 >     694,   695,   374,   696,  1181,   271,   272,  1143,  1144,   698,
1723 >     699,   701,     2,     3,   702,  1145,     4,   703,   704,   329,
1724 >    1256,   705,  1257,  1258,   707,  1182,   375,   706,     5,   708,
1725 >    1183,     6,     7,   709,  1184,   330,   331,  1259,     8,   332,
1726 >    1146,   712,   713,  1185,  1260,   714,   719,  1186,   720,     9,
1727 >     376,   721,    10,    11,   722,   925,  1147,   724,  1187,   725,
1728 >     728,  1188,   729,  1189,   731,   730,   752,   745,   753,   791,
1729 >     377,   732,   754,   734,   735,  1190,   736,   737,   779,   378,
1730 >      12,   782,  1191,   738,   741,    13,   780,   333,   742,   746,
1731 >     747,   749,   755,   756,    14,   948,   757,   949,   950,   760,
1732 >     761,   762,   773,   764,   334,   335,   336,   337,   338,   781,
1733 >     765,   766,   339,   767,    15,    16,   340,  1148,   768,   770,
1734 >     788,   783,   341,   774,   775,   776,   784,   379,   785,   789,
1735 >     790,   792,    17,   342,   343,  1199,   793,  1200,  1201,   794,
1736 >     787,   801,   795,   796,   797,   344,   807,   811,   798,    18,
1737 >     799,   800,   380,   802,   803,   804,   813,   805,   806,   812,
1738 >     814,   821,    19,    20,   815,   816,   817,   345,   822,   818,
1739 >     823,   855,   824,   926,   927,   928,   829,   856,   929,   930,
1740 >     826,   931,   932,   830,   933,    21,   934,   831,   832,   935,
1741 >     833,   834,   936,   937,   835,   845,   846,   938,    22,   847,
1742 >     848,   939,   849,    23,   850,   940,   941,   942,    24,   851,
1743 >     346,    25,   943,   951,   952,   953,   852,   944,   954,   955,
1744 >     853,   956,   957,   854,   958,   858,   959,   859,   860,   960,
1745 >     861,   863,   961,   962,   864,   866,   867,   963,   868,   870,
1746 >     873,   964,   881,   884,   874,   965,   966,   967,   877,   878,
1747 >     879,    82,   968,  1202,  1203,  1204,   880,   969,  1205,  1206,
1748 >     882,  1207,  1208,   883,  1209,   885,  1210,   886,   887,  1211,
1749 >     888,   889,  1212,  1213,    83,    84,   890,  1214,   891,   892,
1750 >      85,  1215,   893,   894,   895,  1216,  1217,  1218,   896,   897,
1751 >     898,   992,  1219,   899,   900,   901,   902,  1220,   903,   904,
1752 >     905,   906,   907,   908,   909,   910,   911,   912,   913,   914,
1753 >     915,   916,   917,   918,   919,    86,    87,   920,   993,   921,
1754 >     922,    88,    89,   923,   924,   947,   972,    90,    91,    92,
1755 >     973,   974,   975,   976,   977,    93,    94,   978,   979,   980,
1756 >     995,   981,   982,   983,   984,   985,   986,   996,   997,   998,
1757 >     999,  1001,   987,  1002,  1004,  1005,  1007,   988,  1013,  1014,
1758 >      95,    96,   989,   994,   990,  1016,   991,  1000,  1017,  1003,
1759 >    1019,   759,  1020,  1021,  1006,  1022,  1010,  1011,  1012,  1015,
1760 >    1023,  1025,  1027,  1018,  1026,  1024,  1028,  1029,  1056,  1069,
1761 >    1030,  1031,  1032,  1033,  1034,  1035,  1070,  1036,  1071,  1037,
1762 >    1038,  1039,  1040,  1041,  1042,  1043,  1044,  1045,  1046,  1047,
1763 >    1048,  1049,  1050,  1051,  1052,  1053,  1054,  1055,  1072,  1058,
1764 >    1059,  1057,  1073,  1074,  1075,  1077,  1078,  1076,  1086,  1087,
1765 >    1088,  1093,  1094,  1095,  1096,  1097,  1098,  1099,  1100,  1101,
1766 >    1102,  1103,  1109,  1110,  1111,  1277,  1112,  1113,  1114,  1115,
1767 >    1116,  1117,  1122,  1289,  1300,  1301,  1302,  1123,   312,  1304,
1768 >     575,  1124,  1125,  1245,   820,  1126,  1127,  1323,  1128,  1129,
1769 >     772,  1130,  1131,  1132,  1137,  1303,  1299,  1296,   751,  1138,
1770 >    1298,  1151,  1152,  1153,  1320,  1154,   586,  1165,  1155,  1156,
1771 >    1157,   778,  1278,   810,   740,  1158,  1159,   506,   650,  1168,
1772 >    1169,  1305,  1166,  1297,  1170,  1171,  1194,  1195,  1196,  1197,
1773 >    1198,  1223,  1224,  1225,  1226,  1227,  1240,   828,   744,  1246,
1774 >    1241,  1242,  1247,  1292,  1248,  1249,  1250,  1263,  1279,   406,
1775 >     464,  1271,  1272,   328,  1293,  1306,  1280,  1281,  1282,  1307,
1776 >    1308,     0,     0,     0,     0,     0,     0,   555,     0,     0,
1777 >     677,     0,     0,   671,     0,     0,     0,     0,     0,     0,
1778         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1779 +       0,     0,     0,     0,   667,     0,     0,     0,     0,     0,
1780         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1781 <       0,     0,     0,   544
1781 >     601
1782   };
1783  
1784   static const yytype_int16 yycheck[] =
1785   {
1786 <     342,   343,   428,     1,   264,     1,   264,   349,     1,   264,
1787 <       1,   264,    11,     1,   264,     1,     1,   262,     1,   155,
1788 <       1,   266,    11,    10,     1,    12,     1,   264,     1,   262,
1789 <     263,     8,     9,     1,     1,    12,   264,   379,   264,   381,
1790 <      27,    37,    19,   155,    31,     1,     1,    22,     4,   199,
1791 <     200,    28,    48,   395,    22,    32,    33,     1,   199,   200,
1792 <     262,   403,    39,     1,   266,   264,    43,    44,    45,    55,
1793 <      47,   264,   414,   415,   264,   417,    53,   264,    78,   895,
1794 <     896,   897,   898,   899,   426,   427,    41,   429,   262,     1,
1795 <      46,   264,   266,    49,     1,    72,    73,   264,    91,    85,
1796 <      77,    56,  1053,  1054,  1055,    91,    91,    84,    91,   155,
1797 <      91,    88,    89,    90,   262,   264,    93,   262,   266,    96,
1798 <      97,   266,   120,    78,   264,    80,   122,    82,    83,   106,
1799 <     264,   122,   262,   262,     1,   112,   113,   266,   115,   116,
1800 <     117,   118,   119,    55,   265,   262,   101,   120,   104,   266,
1801 <       1,   126,   150,   130,     5,   122,   171,   172,   126,     1,
1802 <       1,     1,   139,   265,   141,   142,   122,   144,   154,   157,
1803 <     147,   148,   157,    85,   151,    26,   157,   150,   122,    91,
1804 <      20,   265,   157,   265,   122,   162,    26,    38,   265,   157,
1805 <      57,    58,    59,    60,    61,    62,    63,    64,   189,    50,
1806 <     542,   189,   201,   265,    55,   218,   219,   184,   265,   186,
1807 <      50,    51,   201,   190,   265,    55,    67,   194,   195,   196,
1808 <     197,   198,   189,    74,     1,   202,   203,   262,    79,    69,
1809 <      81,   266,   265,   233,   211,   265,    76,   237,   105,     1,
1810 <     265,     3,   154,    94,     6,   189,    23,    24,    10,   265,
1811 <     157,   189,   262,    30,   262,    95,   266,   244,   266,   250,
1812 <     265,   265,   250,    25,    26,    27,   243,   263,   245,    31,
1813 <     263,   122,   263,   140,   251,   263,   127,   263,   263,   256,
1814 <     122,   122,   189,   123,   261,   265,   263,     1,    50,   265,
1815 <     263,   131,    54,    55,   250,   263,   263,   262,   149,    13,
1816 <     264,   266,   265,     1,     1,   265,   250,   263,   263,   149,
1817 <     161,   265,   163,   164,   265,   157,   157,   168,   158,   159,
1818 <      34,    35,   133,    85,   265,    87,    40,   264,    42,    14,
1819 <      15,    16,   109,   110,   111,   265,   265,   114,   100,    37,
1820 <      37,   265,   262,   250,   265,   122,   266,   189,   189,   265,
1821 <      48,   262,   192,   193,   221,   266,   265,   262,   135,   136,
1822 <     122,   266,     1,   265,   175,   176,   177,   178,   179,   265,
1823 <     265,     5,   265,   265,   265,   152,   153,   265,   265,   265,
1824 <     231,   265,   265,   265,    98,    99,   265,   238,   255,    86,
1825 <     265,   265,   154,   107,   108,   265,   263,   265,   249,   250,
1826 <     742,   265,    41,   180,    38,   265,   168,   265,   259,   265,
1827 <     250,   265,   263,   265,   128,   129,    50,    56,   265,   181,
1828 <     265,   263,   265,   263,   122,   122,   265,   124,   125,   265,
1829 <     265,   145,   146,    67,   265,   265,   265,   265,   265,    78,
1830 <      74,    80,   156,    82,    83,    79,   265,    81,   133,   265,
1831 <     265,   165,   222,   223,   224,   225,   226,   227,   228,   265,
1832 <      94,   265,   101,   265,   265,   265,   265,    20,    21,   265,
1833 <     167,   265,   169,   170,   265,   265,     1,   265,   265,   262,
1834 <     265,   265,   244,     8,     9,   265,   263,    12,   185,   265,
1835 <     265,   265,   265,   127,    19,   257,   265,   265,    51,   265,
1836 <     265,   263,   928,    28,   265,   262,   265,    32,    33,   143,
1837 <     265,   264,   155,   265,    39,   265,    69,   265,    43,    44,
1838 <      45,     1,    47,    76,   265,   265,   265,   161,    53,   163,
1839 <     164,   265,   229,   262,   265,   265,   155,   265,   252,   253,
1840 <     254,   265,    95,   265,   265,   265,   265,    72,    73,   263,
1841 <     265,   155,    77,     1,   265,   265,     4,    37,   262,    84,
1842 <     257,   258,   199,    88,    89,    90,   263,   133,    93,   133,
1843 <     123,    96,    97,   199,   199,     1,   918,   133,   131,     5,
1844 <     262,   106,   133,   133,   926,   927,   199,   112,   113,   199,
1845 <     115,   116,   117,   118,   119,   133,   199,   231,    46,   199,
1846 <      26,    49,   199,   199,   199,   130,    86,   265,   265,   155,
1847 <     262,   265,    38,   199,   139,   249,   141,   142,   265,   144,
1848 <     199,   174,   147,   148,    50,   259,   151,   133,    94,    55,
1849 <     133,   155,   199,   133,   199,     1,   199,   162,   155,   199,
1850 <     193,    67,   122,   133,   124,   125,   133,   133,    74,   133,
1851 <     199,   199,   199,    79,   155,    81,   104,    23,    24,   184,
1852 <     199,   186,   133,   133,    30,   190,   133,   155,    94,   194,
1853 <     195,   196,   197,   198,   122,   133,   133,   202,   203,   133,
1854 <     199,   199,   265,   199,   265,   199,   211,   167,   199,   169,
1855 <     170,   155,   199,   133,   199,   199,   122,   199,   133,   133,
1856 <     199,   127,   199,     1,     1,   185,     3,   173,   199,     6,
1857 <     199,   265,   155,    10,   155,    94,   155,   262,   243,   155,
1858 <     245,   265,   265,   149,   265,   262,   251,   262,    25,    26,
1859 <      27,   256,   265,   265,    31,   161,   261,   163,   164,   205,
1860 <     155,   155,   168,   109,   110,   111,   155,   155,   114,   229,
1861 <     265,   155,   265,    50,   220,   265,   122,    54,    55,    57,
1862 <      58,    59,    60,    61,    62,    63,    64,     1,   155,   135,
1863 <     136,   265,   265,   265,   240,   241,   199,   257,   258,    13,
1864 <     246,   247,   248,   249,   265,     1,   152,   153,    85,   265,
1865 <      87,   265,   265,   259,   173,   155,   265,   265,   155,   262,
1866 <      34,    35,   250,   100,    20,   231,    40,   105,    42,   265,
1867 <      26,   262,   238,   265,   180,   265,   265,   262,   265,   265,
1868 <     155,   265,   199,   249,   250,   122,   205,   265,   265,   199,
1869 <     199,   199,   199,   259,    50,    51,   155,   262,   199,    55,
1870 <     155,   220,   140,   155,   155,   155,   155,   265,   155,   155,
1871 <     155,   262,   262,    69,   204,   277,   315,   154,   265,   265,
1872 <      76,   240,   241,   262,    98,    99,   262,   246,   247,   248,
1873 <     249,   168,   265,   107,   108,   265,   262,   262,   262,    95,
1874 <     259,   262,   262,   265,   181,   155,   262,   262,     0,     1,
1875 <     262,   262,   265,     5,   128,   129,   155,   262,   262,   262,
1876 <     262,   155,   155,   262,   262,   133,   262,   123,   262,   262,
1877 <      22,   145,   146,   262,    26,   131,   262,    29,   262,   262,
1878 <     265,   262,   156,   221,    36,   265,   265,   265,   265,   265,
1879 <     262,   165,   265,   149,   265,   265,   265,   265,   265,   265,
1880 <      52,   265,   158,   159,   265,   265,   133,   244,   265,   265,
1881 <     155,   265,   265,    65,    66,   199,    68,   255,   155,   199,
1882 <     257,   265,   265,    75,   265,   265,   265,   155,   199,   265,
1883 <     265,   265,   265,   262,   262,   262,   192,   193,   262,   262,
1884 <      92,   262,   262,   262,   262,   262,   262,   262,   262,   262,
1885 <     102,   262,   104,   262,   262,   262,   262,   262,   262,   262,
1886 <     262,   262,   262,   199,   262,   262,   262,   262,   199,   121,
1887 <     262,   262,   262,   262,   262,   262,   262,   262,   252,   253,
1888 <     254,   206,   207,   208,   209,   210,   138,   212,   213,   262,
1889 <     215,   216,   217,   262,   250,   220,   262,   262,   262,   262,
1890 <     262,   262,   262,   262,   262,   230,   231,   232,   262,   234,
1891 <     235,   236,   262,   262,   239,   262,   262,   242,   262,   262,
1892 <     262,   173,   262,   199,   265,   199,   265,   262,   199,   199,
1893 <     182,   183,   265,   155,   155,   187,   188,   206,   207,   208,
1894 <     209,   210,   155,   212,   213,   199,   215,   216,   217,   155,
1895 <     262,   220,   155,   155,   265,   262,   265,   155,   155,   262,
1896 <     262,   230,   231,   232,   262,   234,   235,   236,   262,   262,
1897 <     239,   262,   262,   242,   206,   207,   208,   209,   210,   262,
1898 <     212,   213,   262,   215,   216,   217,   265,   262,   220,   262,
1899 <     262,   155,   155,   155,   262,   262,   262,   262,   230,   231,
1900 <     232,   262,   234,   235,   236,   262,   262,   239,   155,   262,
1901 <     242,   262,   262,   155,   155,   133,   265,   265,   265,   265,
1902 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
1903 <     265,   265,   265,   262,   265,   265,   262,   262,   262,   262,
1904 <     133,   133,   262,   262,   262,   262,   262,   262,   262,   133,
1905 <     262,   262,   262,   262,   262,   262,   133,   262,   155,   133,
1906 <     133,   265,   262,   262,   265,   155,   262,   199,   155,   155,
1907 <     199,   199,   199,   155,   265,   155,   155,   155,   133,   155,
1908 <     155,   262,   199,   155,   155,   262,   262,   262,   262,   262,
1909 <     160,   262,   262,   262,   262,   262,   262,   262,   132,   160,
2481 <     199,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2482 <     262,   262,   262,   262,   262,   155,   262,   155,   199,   155,
2483 <     155,   266,   265,   155,   262,   265,   262,   262,   262,   262,
2484 <     199,   199,   199,   199,   199,   199,   199,   199,   262,   199,
2485 <     199,   199,   199,   199,   132,   132,   262,   262,   262,   262,
2486 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2487 <     262,   262,   262,   133,   262,    71,   262,   262,   262,  1304,
2488 <    1486,   262,  1467,   262,   262,  1395,   825,   262,  1465,   262,
2489 <     501,   468,   614,  1275,  1380,  1378,   564,  1446,  1448,   572,
2490 <    1393,   649,   491,   531,  1449,  1451,   124,  1371,  1227,   185,
2491 <    1225,  1377,   374,  1375,    95,    -1,    -1,    -1,   262,   262,
2492 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2493 <     262,   262,    -1,   262,    -1,   262,    -1,    -1,    -1,   262,
2494 <      -1,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2495 <     262,   262,   260,   362,    -1,    -1,    -1,    -1,   443,    -1,
1786 >     647,   648,   317,     1,   319,    55,   321,   322,     1,     1,
1787 >     114,     1,     8,     1,    51,     1,   216,     1,   236,     1,
1788 >     220,     1,     1,     1,     1,     1,     1,     1,     1,   216,
1789 >       1,   236,     1,   220,   236,     1,    24,    25,    31,     1,
1790 >     234,   235,    30,    27,     1,     1,    39,    27,   234,     1,
1791 >      34,   234,   238,   234,    34,   238,   234,   238,    51,    52,
1792 >     238,    37,    60,    56,    57,    58,   234,   236,   234,    67,
1793 >     238,    69,   238,     1,   236,     1,     1,    65,    66,   236,
1794 >     130,    67,     1,    71,    72,   236,     1,   236,    81,    77,
1795 >      78,    79,   236,     1,    19,     1,    67,    85,    86,     1,
1796 >     415,    67,   417,   418,    83,    67,   210,    83,    83,   424,
1797 >      35,    17,    18,   428,   104,    21,     1,   236,   433,   101,
1798 >     104,   436,   110,   111,   104,   234,   104,   101,     1,   238,
1799 >     128,   446,   447,     6,     7,   104,     9,    10,  1104,  1105,
1800 >    1106,    14,   457,   125,    69,   460,   461,   104,   104,    22,
1801 >      23,   125,   104,   234,   131,   131,    29,   238,   195,    32,
1802 >     131,   236,   131,    69,   234,    38,   234,   204,   238,   131,
1803 >      43,    44,   236,    46,    47,    48,   104,    50,   104,   104,
1804 >      86,    87,    88,    89,    90,   104,    59,   179,    94,   234,
1805 >      63,    64,    98,   238,   172,   236,   104,   236,   104,   124,
1806 >     179,    74,   104,   234,   179,     1,   179,   238,   204,   115,
1807 >     116,    84,   190,   183,   184,   140,   131,   236,    91,   104,
1808 >      93,   127,    95,   131,    97,   236,    99,   100,   206,   236,
1809 >     236,    27,   157,   158,   236,   225,   228,   235,   553,   112,
1810 >     237,   236,   235,   149,   117,   118,   119,   235,   121,   122,
1811 >     123,   235,   229,   126,     1,   228,     3,   235,     5,   235,
1812 >     235,   235,   235,   179,   235,    61,   235,     1,   225,   235,
1813 >     237,   236,    19,   225,    70,   236,   234,   229,   235,   152,
1814 >     234,   200,   207,   235,   237,    19,   192,   172,    35,   162,
1815 >     163,   164,   165,   166,   167,   237,    92,   237,   200,   225,
1816 >      96,    35,   237,   229,   229,   190,   225,   235,   104,   129,
1817 >     235,   107,   108,    60,   229,    62,   235,     1,     1,   634,
1818 >     235,   206,    69,   225,   639,     1,     1,   642,   237,   235,
1819 >     237,   646,   237,    80,   237,    69,    19,    11,    12,    13,
1820 >     237,   237,   237,   139,   217,   218,   219,    31,   221,   222,
1821 >     223,   237,    35,   237,   237,    39,   237,   104,   237,   232,
1822 >     156,    37,   235,   159,   160,   161,   237,    51,    52,   237,
1823 >     237,   237,    56,    57,    58,   237,   237,   237,   237,   237,
1824 >     237,   128,   237,   237,   114,    60,    69,   237,   237,   237,
1825 >     124,   187,    67,   237,    69,   237,   237,    81,   132,   133,
1826 >     237,   148,   237,   237,   237,   237,   237,    83,   237,   205,
1827 >     157,   141,   142,   143,   144,   145,   146,   147,   237,   153,
1828 >     237,   104,   237,     1,   237,   237,   237,   237,     6,     7,
1829 >     237,     9,    10,   237,   230,   231,    14,   237,   237,   235,
1830 >     114,   124,   237,   237,    22,    23,     1,   237,   237,   237,
1831 >     237,    29,   237,   128,    32,   131,     1,   140,   205,    42,
1832 >      38,   237,   237,   237,    19,    43,    44,   237,    46,    47,
1833 >      48,   237,    50,   237,   157,   158,   237,   237,   237,   237,
1834 >      35,    59,    27,   230,   237,    63,    64,   237,   235,   237,
1835 >      73,   237,    75,   237,   237,   229,    74,   237,    75,   237,
1836 >     237,   235,   237,   234,   237,   237,    84,   129,   237,   237,
1837 >     237,   237,   237,    91,    69,    93,    61,    95,   237,    97,
1838 >     237,    99,   100,   237,   207,    70,   836,   837,   838,   839,
1839 >     840,   841,   842,     4,   112,   237,   237,   120,   237,   117,
1840 >     118,   119,   129,   121,   122,   123,   229,    92,   126,    20,
1841 >     114,    96,   234,   114,   137,   216,   114,    28,   114,   104,
1842 >     137,   114,   107,   108,   114,   114,    75,   114,   216,   124,
1843 >     216,    42,   234,   237,   152,   234,   216,   132,   133,   237,
1844 >     237,   237,   237,   237,   162,   163,   164,   165,   166,   167,
1845 >     237,   168,   175,   176,   139,  1242,   237,    15,   153,   176,
1846 >     237,   237,    73,     1,    75,     3,   237,     5,   185,   237,
1847 >     237,   156,   237,   237,   159,   160,   161,   237,    36,   234,
1848 >     237,    19,   129,   237,   237,   237,   237,    45,   137,   237,
1849 >     101,   237,   209,   237,   211,   212,   237,    35,   237,   217,
1850 >     218,   219,   187,   221,   222,   223,   229,   237,   237,   226,
1851 >     233,   237,   237,   237,   232,   234,   233,   237,    76,   168,
1852 >     205,   237,    60,   134,    62,   136,   114,   176,   216,   114,
1853 >     216,    69,   114,   216,   229,   216,   185,   114,   114,   114,
1854 >     216,   216,    80,   216,   155,   230,   231,   105,   106,   114,
1855 >     114,   114,     0,     1,   114,   113,     4,   114,   114,     1,
1856 >     209,   216,   211,   212,   216,   176,   104,   237,    16,   237,
1857 >     181,    19,    20,   216,   185,    17,    18,   226,    26,    21,
1858 >     138,   216,   216,   194,   233,   216,   216,   198,   216,    37,
1859 >     128,   216,    40,    41,   114,    51,   154,   216,   209,   216,
1860 >     216,   212,   234,   214,   237,   234,   129,   234,   129,   114,
1861 >     148,   237,   234,   237,   237,   226,   237,   237,   216,   157,
1862 >      68,   129,   233,   237,   237,    73,   216,    69,   237,   237,
1863 >     237,   237,   234,   237,    82,    51,   237,    53,    54,   234,
1864 >     237,   237,   234,   237,    86,    87,    88,    89,    90,   216,
1865 >     237,   237,    94,   237,   102,   103,    98,   215,   237,   237,
1866 >     129,   216,   104,   237,   237,   237,   216,   205,   216,   216,
1867 >     129,   114,   120,   115,   116,    51,   129,    53,    54,   129,
1868 >     234,   114,   129,   129,   129,   127,   237,   216,   129,   137,
1869 >     129,   129,   230,   129,   129,   129,   236,   234,   234,   234,
1870 >     234,   129,   150,   151,   237,   237,   237,   149,   234,   237,
1871 >     234,   114,   237,   169,   170,   171,   234,   114,   174,   175,
1872 >     237,   177,   178,   234,   180,   173,   182,   234,   234,   185,
1873 >     234,   234,   188,   189,   234,   234,   234,   193,   186,   234,
1874 >     234,   197,   234,   191,   234,   201,   202,   203,   196,   234,
1875 >     192,   199,   208,   169,   170,   171,   234,   213,   174,   175,
1876 >     234,   177,   178,   234,   180,   237,   182,   114,   114,   185,
1877 >     114,   114,   188,   189,   114,   129,   114,   193,   114,   114,
1878 >     234,   197,   237,   114,   129,   201,   202,   203,   129,   216,
1879 >     129,     1,   208,   169,   170,   171,   129,   213,   174,   175,
1880 >     129,   177,   178,   129,   180,   129,   182,   129,   129,   185,
1881 >     129,   234,   188,   189,    24,    25,   129,   193,   129,   234,
1882 >      30,   197,   234,   129,   129,   201,   202,   203,   234,   234,
1883 >     234,   129,   208,   234,   234,   234,   234,   213,   234,   234,
1884 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1885 >     234,   234,   234,   234,   234,    65,    66,   234,   216,   234,
1886 >     234,    71,    72,   234,   234,   234,   234,    77,    78,    79,
1887 >     234,   234,   234,   234,   234,    85,    86,   234,   234,   234,
1888 >     129,   234,   234,   234,   234,   234,   234,   114,   129,   129,
1889 >     129,   129,   234,   129,   129,   129,   114,   234,   129,   129,
1890 >     110,   111,   234,   237,   234,   129,   234,   234,   216,   234,
1891 >     129,   510,   129,   129,   237,   129,   234,   234,   234,   234,
1892 >     216,   129,   129,   237,   234,   237,   129,   129,   129,   129,
1893 >     234,   234,   234,   234,   234,   234,   129,   234,   129,   234,
1894 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1895 >     234,   234,   234,   234,   234,   234,   234,   234,   129,   234,
1896 >     234,   237,   234,   234,   129,   129,   234,   237,   234,   234,
1897 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1898 >     234,   234,   234,   234,   234,   114,   234,   234,   234,   234,
1899 >     234,   234,   234,   129,   135,   135,   135,   234,    77,  1286,
1900 >     273,   234,   234,  1064,   593,   234,   234,  1322,   234,   234,
1901 >     525,   234,   234,   234,   234,  1284,  1276,  1265,   497,   234,
1902 >    1274,   234,   234,   234,  1295,   234,   295,   224,   234,   234,
1903 >     234,   541,  1166,   579,   474,   234,   234,   229,   347,   234,
1904 >     234,  1288,   238,  1270,   234,   234,   234,   234,   234,   234,
1905 >     234,   234,   234,   234,   234,   234,   234,   606,   487,   234,
1906 >     237,   237,   234,   237,   234,   234,   234,   234,   234,   118,
1907 >     172,  1134,  1136,    97,   234,   234,   239,   239,   239,   234,
1908 >     234,    -1,    -1,    -1,    -1,    -1,    -1,   245,    -1,    -1,
1909 >     410,    -1,    -1,   400,    -1,    -1,    -1,    -1,    -1,    -1,
1910        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1911 +      -1,    -1,    -1,    -1,   381,    -1,    -1,    -1,    -1,    -1,
1912        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1913 <      -1,    -1,    -1,   293
1913 >     303
1914   };
1915  
1916 < /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
1917 <   symbol of state STATE-NUM.  */
1916 >  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
1917 >     symbol of state STATE-NUM.  */
1918   static const yytype_uint16 yystos[] =
1919   {
1920 <       0,   268,     0,     1,     5,    22,    26,    29,    36,    52,
1921 <      65,    66,    68,    75,    92,   102,   104,   121,   138,   173,
1922 <     182,   183,   187,   188,   269,   274,   279,   297,   303,   318,
1923 <     355,   374,   388,   414,   421,   431,   440,   471,   481,   487,
1924 <     491,   501,   566,   582,   603,   262,   263,   264,   264,   356,
1925 <     441,   482,   264,   492,   264,   567,   389,   472,   375,   264,
1926 <     264,   319,   415,   264,   264,   422,   432,     1,    37,    48,
1927 <     122,   298,   299,   300,   301,   302,     1,    13,    34,    35,
1928 <      40,    42,    98,    99,   107,   108,   128,   129,   145,   146,
1929 <     156,   165,   252,   253,   254,   583,   584,   585,   586,   587,
1930 <     588,   589,   590,   591,   592,   593,   594,   595,   596,   597,
1931 <     598,   599,   600,   601,   602,   155,   357,   361,   155,   442,
1932 <     446,   264,     1,    91,   488,   489,   490,   264,     1,     8,
1933 <       9,    12,    19,    28,    32,    33,    39,    43,    44,    45,
1934 <      47,    53,    72,    73,    77,    84,    88,    89,    90,    93,
1935 <      96,    97,   106,   112,   113,   115,   116,   117,   118,   119,
1936 <     130,   139,   141,   142,   144,   147,   148,   151,   162,   184,
1937 <     186,   190,   194,   195,   196,   197,   198,   202,   203,   211,
2523 <     243,   245,   251,   256,   261,   502,   503,   504,   505,   506,
2524 <     507,   508,   509,   510,   511,   512,   513,   514,   515,   516,
2525 <     517,   518,   519,   520,   521,   522,   523,   524,   525,   526,
2526 <     527,   528,   529,   530,   531,   532,   533,   534,   535,   536,
2527 <     537,   538,   539,   540,   541,   542,   543,   544,   545,   546,
2528 <     547,   548,   549,   550,   551,   552,   553,   557,   561,   562,
2529 <     563,   564,   565,   264,   264,   264,   264,     1,    57,    58,
2530 <      59,    60,    61,    62,    63,    64,   105,   140,   221,   255,
2531 <     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
2532 <     314,   315,   316,   317,     1,   120,   150,   275,   276,   277,
2533 <     278,   155,   320,   324,   264,     1,    41,    56,    78,    80,
2534 <      82,    83,   101,   604,   605,   606,   607,   608,   609,   610,
2535 <     611,   612,     1,    37,    86,   122,   124,   125,   167,   169,
2536 <     170,   185,   229,   257,   258,   280,   281,   282,   286,   287,
2537 <     288,   289,   290,   291,   292,   293,   294,   295,   296,   264,
2538 <     264,   262,   265,   265,   265,   263,   299,   265,   265,   265,
2539 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
2540 <     265,   265,   265,   265,   265,   263,   584,   264,   264,     1,
2541 <      91,   157,   483,   484,   485,   486,   265,   263,   489,     1,
2542 <     122,   157,   189,   493,   497,   498,   499,   500,   265,   265,
2543 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
2544 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
2545 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
2546 <     265,   558,   265,   554,   265,   265,   265,   265,   265,   265,
2547 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
2548 <     265,   265,   265,   265,   263,   503,     1,     4,    46,    49,
2549 <     104,   122,   250,   568,   569,   570,   571,   572,   576,   577,
2550 <     578,     1,    20,    26,    50,    51,    55,    69,    76,    95,
2551 <     123,   131,   149,   158,   159,   192,   193,   250,   390,   391,
2552 <     392,   393,   394,   395,   396,   397,   404,   405,   406,   407,
2553 <     408,   409,   410,   411,   412,   413,     1,   157,   189,   250,
2554 <     473,   477,   478,   479,   480,     1,    55,    85,    91,   154,
2555 <     376,   380,   381,   382,   386,   387,   262,   265,   265,   265,
2556 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   263,
2557 <     305,   262,   265,   265,   263,   276,   264,     1,    22,   126,
2558 <     157,   416,   417,   418,   419,   420,   265,   265,   265,   265,
2559 <     265,   265,   265,   263,   605,   262,   265,   265,   265,   265,
2560 <     265,   265,   265,   283,   265,   265,   265,   265,   263,   281,
2561 <       1,   122,   189,   250,   423,   424,   425,   426,   427,     1,
2562 <     122,   189,   433,   434,   435,   436,   155,   155,   155,   262,
2563 <     199,   133,   133,   199,   199,   133,   271,   271,   133,   133,
2564 <     199,   199,   133,   271,   199,   199,   199,   199,   199,   262,
2565 <       1,    23,    24,    30,   109,   110,   111,   114,   122,   135,
2566 <     136,   152,   153,   180,   358,   359,   360,   362,   363,   364,
2567 <     365,   366,   367,   368,   369,   370,   371,   372,   373,     1,
2568 <       3,     6,    10,    25,    26,    27,    31,    50,    54,    55,
2569 <      85,    87,   100,   122,   154,   168,   181,   244,   257,   443,
2570 <     444,   445,   447,   448,   449,   450,   451,   452,   453,   454,
1920 >       0,   241,     0,     1,     4,    16,    19,    20,    26,    37,
1921 >      40,    41,    68,    73,    82,   102,   103,   120,   137,   150,
1922 >     151,   173,   186,   191,   196,   199,   242,   247,   252,   272,
1923 >     278,   284,   292,   306,   326,   350,   364,   379,   386,   390,
1924 >     400,   409,   430,   436,   442,   446,   452,   510,   527,   234,
1925 >     235,   236,   236,   327,   410,   437,   236,   447,   236,   365,
1926 >     431,   351,   236,   279,   307,   380,   236,   236,   401,   236,
1927 >     285,   236,   391,     1,    27,    34,   104,   273,   274,   275,
1928 >     276,   277,     1,    24,    25,    30,    65,    66,    71,    72,
1929 >      77,    78,    79,    85,    86,   110,   111,   511,   512,   513,
1930 >     514,   515,   516,   517,   518,   519,   520,   521,   522,   523,
1931 >     524,   525,   526,   236,   236,   236,     1,    67,   443,   444,
1932 >     445,   236,     1,     6,     7,     9,    10,    14,    22,    23,
1933 >      29,    32,    38,    43,    44,    46,    47,    48,    50,    59,
1934 >      63,    64,    74,    84,    91,    93,    95,    97,    99,   100,
1935 >     112,   117,   118,   119,   121,   122,   123,   126,   152,   162,
1936 >     163,   164,   165,   166,   167,   217,   218,   219,   221,   222,
1937 >     223,   232,   453,   454,   455,   456,   457,   458,   459,   460,
1938       461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
1939 <     265,   265,   263,   484,   155,   262,   265,   265,   494,   263,
1940 <     498,   199,   271,   199,   271,   133,   155,   133,   199,   199,
1941 <     199,   133,   155,   199,   133,   133,   133,   199,   271,   199,
1942 <     199,   133,   155,   199,   133,   133,   271,   133,   133,   155,
1943 <     133,   133,   199,   199,   265,   199,   265,   271,   271,   199,
1944 <     271,   155,   199,   199,   199,   199,   200,   199,   200,   199,
1945 <     199,   271,   271,   133,   273,   271,   199,   199,   199,   199,
1946 <     262,   579,   265,   265,   573,   265,   265,   263,   569,   262,
1947 <     265,   265,   265,   265,   398,   265,   265,   265,   265,   265,
1948 <     265,   265,   265,   265,   265,   265,   263,   391,   265,   474,
1949 <     265,   263,   478,   262,   377,   265,   265,   265,   263,   381,
1950 <     155,   155,   155,   155,   155,   155,   155,   155,   222,   223,
1951 <     224,   225,   226,   227,   228,   155,   155,   199,   262,   155,
1952 <     155,   262,     1,     5,    26,    38,    50,    55,    67,    74,
1953 <      79,    81,    94,   122,   127,   149,   161,   163,   164,   168,
1954 <     231,   238,   249,   250,   259,   321,   322,   323,   325,   326,
1955 <     327,   328,   329,   330,   334,   335,   336,   337,   338,   339,
1956 <     340,   341,   342,   343,   344,   345,   346,   347,   348,   262,
1957 <     265,   265,   265,   263,   417,   199,   199,   199,   155,   199,
1958 <     199,   271,   262,   155,   199,   155,   155,   155,   155,   155,
1959 <     265,   155,   133,   155,   155,   262,   262,   265,   428,   265,
1960 <     263,   424,   262,   265,   437,   263,   434,   262,   262,   262,
1961 <     262,   262,   262,   262,   262,   175,   176,   177,   178,   179,
1962 <     270,   271,   262,   262,   262,   262,   262,   262,   262,   262,
1963 <     262,   262,   262,   262,   262,   262,   265,   265,   265,   265,
1964 <     265,   265,   265,   265,   265,   265,   265,   265,   265,   263,
1965 <     359,   262,   265,   265,   265,   265,   265,   265,   265,   265,
1966 <     265,   455,   265,   265,   265,   265,   265,   265,   265,   265,
1967 <     265,   263,   444,   155,   155,   262,   262,   155,   155,   265,
1968 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
1969 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
1970 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
1971 <     262,   262,   262,   262,   206,   207,   208,   209,   210,   212,
1972 <     213,   215,   216,   217,   220,   230,   231,   232,   234,   235,
1973 <     236,   239,   242,   559,   560,   262,   206,   207,   208,   209,
1974 <     210,   212,   213,   215,   216,   217,   220,   230,   231,   232,
1975 <     234,   235,   236,   239,   242,   555,   556,   262,   262,   262,
1976 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
1977 <     262,   262,   262,    14,    15,    16,   272,   273,   262,   262,
1978 <     262,   262,   262,   262,   265,   271,   199,   265,   155,   155,
1979 <     262,   199,   155,   199,   199,   265,   199,   199,   199,   199,
1980 <     199,   155,   133,   155,   155,   199,   155,   262,   155,   265,
1981 <     155,   262,   265,   155,   155,   133,   384,   385,   262,   262,
1982 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
1983 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
1984 <     265,   265,   265,   265,   349,   265,   265,   265,   265,   265,
1985 <     265,   265,   265,   265,   265,   265,   265,   265,   331,   265,
1986 <     265,   265,   263,   322,   155,   155,   155,   262,   262,   262,
1987 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
1988 <     262,   262,   171,   172,   284,   285,   262,   262,   262,   262,
1989 <     155,   265,   155,   262,   155,   265,   262,   270,   270,   270,
1990 <     270,   270,   133,   133,   271,   133,   133,   133,   133,   155,
1991 <     133,   133,   271,   271,   273,   262,   155,   218,   219,   199,
1992 <     155,   155,   199,   199,   199,   155,   265,   155,   155,   155,
1993 <     155,   133,   155,   155,   199,   155,   262,   262,   262,   262,
1994 <     262,   160,   495,   496,   262,   266,   262,   266,   272,   272,
1995 <     272,    11,   201,   580,   581,   262,   262,    11,   201,   574,
1996 <     575,   262,   262,   262,   262,   262,   262,   132,   399,   400,
1997 <     402,   262,   262,   262,   262,   262,   262,   262,   262,   262,
1998 <     262,   262,   262,   160,   475,   476,   262,    78,   233,   237,
1999 <     378,   379,   262,   262,   204,   266,   383,   199,   155,   199,
2000 <     199,   265,   199,   199,   199,   199,   199,   155,   199,   155,
2001 <     199,   199,   199,   155,   199,   265,   199,   155,   199,   262,
2002 <     262,   262,   262,   262,   266,   262,    94,   173,   205,   220,
2003 <     240,   241,   246,   247,   248,   249,   259,   429,   430,   262,
2004 <     262,    94,   173,   205,   220,   240,   241,   246,   247,   248,
2005 <     249,   259,   438,   439,   262,   262,   262,   262,   262,   262,
2006 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2007 <     262,   262,   262,   262,   262,   262,   262,   132,   456,   457,
2008 <     459,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2009 <     262,   266,   560,   556,   262,   266,   262,   266,   401,   262,
2010 <     266,    20,    21,    51,    69,    76,    95,   123,   131,   174,
2011 <     193,   403,   262,   266,   262,   266,   133,   385,   262,   262,
2012 <     262,   262,   262,   132,   350,   351,   353,   262,   262,   262,
2013 <     262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
2014 <     206,   207,   208,   209,   210,   212,   213,   215,   216,   217,
2015 <     220,   230,   231,   232,   234,   235,   236,   239,   242,   332,
2016 <     333,   262,   262,   262,   285,   262,   266,   262,   266,   458,
2017 <     262,   266,    10,    12,    27,    31,   244,   460,   496,   581,
2018 <     575,   403,   400,   476,   379,   352,   262,   266,     5,    38,
2019 <      50,    67,    74,    79,    81,    94,   127,   143,   161,   163,
2020 <     164,   231,   249,   259,   354,   262,   266,   430,   439,   460,
2021 <     457,   354,   351,   333
1939 >     471,   472,   473,   474,   475,   476,   477,   478,   479,   480,
1940 >     481,   482,   483,   484,   485,   486,   487,   488,   489,   490,
1941 >     491,   492,   493,   494,   495,   496,   497,   498,   499,   503,
1942 >     507,   508,   509,   236,   236,   236,     1,   101,   125,   248,
1943 >     249,   250,   251,   236,   236,   236,     1,    31,    39,    51,
1944 >      52,    56,    57,    58,    81,   528,   529,   530,   531,   532,
1945 >     533,   534,   535,   536,   537,     1,    27,    61,    70,    92,
1946 >      96,   104,   107,   108,   139,   156,   159,   160,   161,   187,
1947 >     205,   230,   231,   253,   254,   255,   256,   257,   258,   259,
1948 >     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
1949 >     270,   271,   236,     1,   228,   293,   294,   295,   296,   297,
1950 >     236,     1,   104,   387,   388,   389,   236,   234,   237,   237,
1951 >     237,   235,   274,   237,   237,   237,   237,   237,   237,   237,
1952 >     237,   237,   237,   237,   237,   237,   237,   235,   512,     1,
1953 >      17,    18,    21,    69,    86,    87,    88,    89,    90,    94,
1954 >      98,   104,   115,   116,   127,   149,   192,   328,   329,   330,
1955 >     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
1956 >     341,   342,   343,   344,   345,   346,     1,     3,     5,    19,
1957 >      35,    60,    62,    69,    80,   104,   128,   148,   157,   205,
1958 >     230,   411,   412,   413,   414,   415,   416,   417,   418,   419,
1959 >     420,   421,   425,   426,   427,   428,   429,     1,    67,   131,
1960 >     438,   439,   440,   441,   237,   235,   444,     1,   104,   131,
1961 >     448,   449,   450,   451,   237,   237,   237,   237,   237,   237,
1962 >     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
1963 >     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
1964 >     237,   237,   504,   237,   500,   237,   237,   237,   237,   237,
1965 >     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
1966 >     237,   237,   237,   235,   454,     1,    19,    35,    69,   124,
1967 >     132,   133,   153,   229,   366,   367,   368,   369,   370,   371,
1968 >     372,   376,   377,   378,     1,   131,   229,   432,   433,   434,
1969 >     435,     1,    60,    67,    69,   128,   352,   356,   357,   358,
1970 >     362,   363,   234,   237,   237,   235,   249,     1,    83,   179,
1971 >     280,   281,   282,   283,     1,    19,    35,    69,   104,   124,
1972 >     140,   157,   158,   207,   229,   308,   309,   310,   311,   312,
1973 >     313,   314,   315,   316,   317,   318,   322,     1,    37,    83,
1974 >     131,   381,   382,   383,   384,   385,   237,   237,   237,   237,
1975 >     237,   237,   237,   237,   235,   529,   234,   237,   237,   237,
1976 >     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
1977 >     237,   237,   237,   237,   235,   254,     1,   104,   225,   402,
1978 >     403,   404,   405,   234,   237,   235,   294,   179,     1,   104,
1979 >     172,   190,   206,   286,   287,   288,   289,   290,   291,   237,
1980 >     235,   388,     1,   104,   225,   229,   392,   393,   394,   395,
1981 >     396,   129,   129,   129,   234,   114,   114,   216,   114,   114,
1982 >     244,   114,   244,   114,   244,   244,   114,   114,   216,   216,
1983 >     234,   234,   237,   237,   237,   347,   237,   237,   237,   237,
1984 >     237,   237,   237,   237,   237,   237,   237,   237,   237,   235,
1985 >     329,   234,   237,   237,   237,   237,   237,   237,   422,   237,
1986 >     237,   237,   237,   237,   237,   237,   235,   412,   237,   237,
1987 >     235,   439,   129,   234,   237,   237,   235,   449,   216,   244,
1988 >     114,   244,   244,   216,   114,   216,   114,   216,   244,   216,
1989 >     114,   114,   244,   114,   216,   216,   216,   244,   114,   114,
1990 >     244,   114,   114,   114,   114,   216,   237,   216,   237,   216,
1991 >     244,   244,   216,   216,   216,   216,   220,   216,   220,   216,
1992 >     216,   216,   114,   244,   216,   216,   244,   244,   216,   234,
1993 >     234,   237,   237,   373,   237,   237,   237,   237,   237,   235,
1994 >     367,   237,   237,   235,   433,   234,   237,   237,   353,   237,
1995 >     235,   357,   129,   129,   234,   234,   237,   237,   235,   281,
1996 >     234,   237,   237,   323,   237,   237,   237,   237,   237,   319,
1997 >     237,   235,   309,   234,   237,   237,   237,   235,   382,   216,
1998 >     216,   216,   129,   216,   216,   216,   244,   234,   129,   216,
1999 >     129,   114,   114,   129,   129,   129,   129,   129,   129,   129,
2000 >     129,   114,   129,   129,   129,   234,   234,   237,   406,   235,
2001 >     403,   216,   234,   236,   234,   237,   237,   237,   237,   235,
2002 >     287,   129,   234,   234,   237,   397,   237,   235,   393,   234,
2003 >     234,   234,   234,   234,   234,   234,   141,   142,   143,   144,
2004 >     145,   146,   147,   243,   244,   234,   234,   234,   234,   234,
2005 >     234,   234,   234,   234,   234,   114,   114,   244,   237,   114,
2006 >     114,   114,   244,   114,   114,   244,   129,   114,   114,   244,
2007 >     114,   246,   246,   234,   129,   183,   184,   129,   216,   129,
2008 >     129,   237,   129,   129,   114,   129,   129,   129,   129,   234,
2009 >     129,   129,   234,   234,   129,   129,   234,   234,   234,   234,
2010 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
2011 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
2012 >     234,   234,   234,   234,   234,    51,   169,   170,   171,   174,
2013 >     175,   177,   178,   180,   182,   185,   188,   189,   193,   197,
2014 >     201,   202,   203,   208,   213,   505,   506,   234,    51,    53,
2015 >      54,   169,   170,   171,   174,   175,   177,   178,   180,   182,
2016 >     185,   188,   189,   193,   197,   201,   202,   203,   208,   213,
2017 >     501,   502,   234,   234,   234,   234,   234,   234,   234,   234,
2018 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
2019 >     234,   234,   129,   216,   237,   129,   114,   129,   129,   129,
2020 >     234,   129,   129,   234,   129,   129,   237,   114,   360,   361,
2021 >     234,   234,   234,   129,   129,   234,   129,   216,   237,   129,
2022 >     129,   129,   129,   216,   237,   129,   234,   129,   129,   129,
2023 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
2024 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
2025 >     234,   234,   234,   234,   234,   234,   129,   237,   234,   234,
2026 >       1,   104,   200,   225,   298,   299,   300,   301,   302,   129,
2027 >     129,   129,   129,   234,   234,   129,   237,   129,   234,   243,
2028 >     243,   243,   243,   243,   243,   243,   234,   234,   234,    55,
2029 >     130,   348,   349,   234,   234,   234,   234,   234,   234,   234,
2030 >     234,   234,   234,   234,    11,    12,    13,   245,   246,   234,
2031 >     234,   234,   234,   234,   234,   234,   234,   234,     8,   204,
2032 >     423,   424,   234,   234,   234,   234,   234,   234,   234,   234,
2033 >     234,   234,   234,   234,   238,   234,   238,   234,   234,    15,
2034 >      36,    45,    76,   105,   106,   113,   138,   154,   215,   374,
2035 >     375,   234,   234,   234,   234,   234,   234,   234,   234,   234,
2036 >      51,   195,   204,   354,   355,   224,   238,   359,   234,   234,
2037 >     234,   234,     4,    20,    28,    42,    73,    75,   101,   134,
2038 >     136,   155,   176,   181,   185,   194,   198,   209,   212,   214,
2039 >     226,   233,   324,   325,   234,   234,   234,   234,   234,    51,
2040 >      53,    54,   169,   170,   171,   174,   175,   177,   178,   180,
2041 >     182,   185,   188,   189,   193,   197,   201,   202,   203,   208,
2042 >     213,   320,   321,   234,   234,   234,   234,   234,    75,   137,
2043 >     168,   176,   185,   209,   211,   212,   226,   233,   407,   408,
2044 >     234,   237,   237,   303,   235,   299,   234,   234,   234,   234,
2045 >     234,    75,   137,   168,   176,   185,   209,   211,   212,   226,
2046 >     233,   398,   399,   234,   234,   238,   245,   245,   245,   234,
2047 >     238,   506,   502,   234,   238,   234,   238,   114,   361,   234,
2048 >     239,   239,   239,   234,   238,   234,   238,   234,   238,   129,
2049 >     210,   246,   237,   234,   234,   238,   349,   424,   375,   355,
2050 >     135,   135,   135,   325,   321,   408,   234,   234,   234,    42,
2051 >      73,    75,   120,   137,   175,   176,   229,   233,   304,   305,
2052 >     399,   234,   238,   305
2053   };
2054  
2055 < #define yyerrok         (yyerrstatus = 0)
2056 < #define yyclearin       (yychar = YYEMPTY)
2057 < #define YYEMPTY         (-2)
2058 < #define YYEOF           0
2055 >  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
2056 > static const yytype_uint16 yyr1[] =
2057 > {
2058 >       0,   240,   241,   241,   242,   242,   242,   242,   242,   242,
2059 >     242,   242,   242,   242,   242,   242,   242,   242,   242,   242,
2060 >     242,   242,   242,   242,   242,   242,   242,   242,   243,   243,
2061 >     244,   244,   244,   244,   244,   244,   244,   244,   245,   245,
2062 >     246,   246,   246,   246,   247,   248,   248,   249,   249,   249,
2063 >     250,   251,   252,   253,   253,   254,   254,   254,   254,   254,
2064 >     254,   254,   254,   254,   254,   254,   254,   254,   254,   254,
2065 >     254,   254,   254,   255,   256,   257,   258,   259,   260,   261,
2066 >     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
2067 >     272,   273,   273,   274,   274,   274,   274,   275,   276,   277,
2068 >     279,   278,   280,   280,   281,   281,   281,   282,   283,   285,
2069 >     284,   286,   286,   287,   287,   287,   287,   287,   288,   289,
2070 >     290,   291,   292,   293,   293,   294,   294,   294,   295,   297,
2071 >     296,   298,   298,   299,   299,   299,   299,   300,   301,   301,
2072 >     303,   302,   304,   304,   305,   305,   305,   305,   305,   305,
2073 >     305,   305,   305,   307,   306,   308,   308,   309,   309,   309,
2074 >     309,   309,   309,   309,   309,   309,   309,   309,   310,   311,
2075 >     312,   313,   314,   315,   316,   317,   319,   318,   320,   320,
2076 >     321,   321,   321,   321,   321,   321,   321,   321,   321,   321,
2077 >     321,   321,   321,   321,   321,   321,   321,   321,   321,   321,
2078 >     321,   321,   323,   322,   324,   324,   325,   325,   325,   325,
2079 >     325,   325,   325,   325,   325,   325,   325,   325,   325,   325,
2080 >     325,   325,   325,   325,   325,   325,   325,   325,   325,   327,
2081 >     326,   328,   328,   329,   329,   329,   329,   329,   329,   329,
2082 >     329,   329,   329,   329,   329,   329,   329,   329,   329,   329,
2083 >     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
2084 >     339,   340,   341,   342,   343,   344,   345,   347,   346,   348,
2085 >     348,   349,   349,   351,   350,   353,   352,   354,   354,   355,
2086 >     355,   355,   356,   356,   357,   357,   357,   357,   357,   359,
2087 >     358,   360,   360,   361,   361,   362,   363,   365,   364,   366,
2088 >     366,   367,   367,   367,   367,   367,   367,   367,   367,   367,
2089 >     368,   369,   370,   371,   373,   372,   374,   374,   375,   375,
2090 >     375,   375,   375,   375,   375,   375,   375,   375,   376,   377,
2091 >     378,   380,   379,   381,   381,   382,   382,   382,   382,   383,
2092 >     384,   385,   386,   387,   387,   388,   388,   389,   391,   390,
2093 >     392,   392,   393,   393,   393,   393,   394,   395,   397,   396,
2094 >     398,   398,   399,   399,   399,   399,   399,   399,   399,   399,
2095 >     399,   399,   401,   400,   402,   402,   403,   403,   403,   404,
2096 >     406,   405,   407,   407,   408,   408,   408,   408,   408,   408,
2097 >     408,   408,   408,   408,   410,   409,   411,   411,   412,   412,
2098 >     412,   412,   412,   412,   412,   412,   412,   412,   412,   412,
2099 >     412,   412,   412,   413,   414,   415,   416,   417,   418,   419,
2100 >     420,   420,   422,   421,   423,   423,   424,   424,   425,   426,
2101 >     427,   428,   429,   431,   430,   432,   432,   433,   433,   433,
2102 >     434,   435,   437,   436,   438,   438,   439,   439,   439,   440,
2103 >     441,   442,   443,   443,   444,   444,   445,   447,   446,   448,
2104 >     448,   449,   449,   449,   450,   451,   452,   453,   453,   454,
2105 >     454,   454,   454,   454,   454,   454,   454,   454,   454,   454,
2106 >     454,   454,   454,   454,   454,   454,   454,   454,   454,   454,
2107 >     454,   454,   454,   454,   454,   454,   454,   454,   454,   454,
2108 >     454,   454,   454,   454,   454,   454,   454,   454,   454,   454,
2109 >     454,   454,   454,   454,   454,   454,   454,   454,   454,   455,
2110 >     456,   457,   458,   459,   460,   461,   462,   463,   464,   465,
2111 >     466,   467,   468,   469,   470,   471,   472,   473,   474,   475,
2112 >     476,   477,   478,   479,   480,   481,   482,   483,   483,   484,
2113 >     484,   485,   486,   487,   488,   489,   490,   491,   492,   493,
2114 >     494,   495,   496,   497,   498,   500,   499,   501,   501,   502,
2115 >     502,   502,   502,   502,   502,   502,   502,   502,   502,   502,
2116 >     502,   502,   502,   502,   502,   502,   502,   502,   502,   502,
2117 >     502,   504,   503,   505,   505,   506,   506,   506,   506,   506,
2118 >     506,   506,   506,   506,   506,   506,   506,   506,   506,   506,
2119 >     506,   506,   506,   506,   506,   507,   508,   509,   510,   511,
2120 >     511,   512,   512,   512,   512,   512,   512,   512,   512,   512,
2121 >     512,   512,   512,   512,   512,   512,   513,   514,   515,   516,
2122 >     517,   518,   519,   520,   521,   522,   523,   524,   525,   526,
2123 >     527,   528,   528,   529,   529,   529,   529,   529,   529,   529,
2124 >     529,   529,   530,   531,   532,   533,   534,   535,   536,   537
2125 > };
2126  
2127 < #define YYACCEPT        goto yyacceptlab
2128 < #define YYABORT         goto yyabortlab
2129 < #define YYERROR         goto yyerrorlab
2127 >  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
2128 > static const yytype_uint8 yyr2[] =
2129 > {
2130 >       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
2131 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2132 >       1,     1,     1,     1,     1,     1,     2,     2,     0,     1,
2133 >       2,     3,     3,     3,     3,     3,     3,     3,     0,     1,
2134 >       2,     3,     3,     3,     5,     2,     1,     1,     1,     2,
2135 >       4,     4,     5,     2,     1,     1,     1,     1,     1,     1,
2136 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2137 >       1,     1,     2,     4,     4,     4,     4,     4,     4,     4,
2138 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2139 >       5,     2,     1,     1,     1,     1,     2,     4,     4,     4,
2140 >       0,     6,     2,     1,     1,     1,     2,     4,     4,     0,
2141 >       6,     2,     1,     1,     1,     1,     1,     2,     4,     4,
2142 >       4,     4,     5,     2,     1,     1,     1,     2,     4,     0,
2143 >       6,     2,     1,     1,     1,     1,     2,     4,     4,     4,
2144 >       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
2145 >       1,     1,     1,     0,     6,     2,     1,     1,     1,     1,
2146 >       1,     1,     1,     1,     1,     1,     1,     2,     4,     4,
2147 >       4,     4,     4,     4,     4,     4,     0,     5,     3,     1,
2148 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2149 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2150 >       1,     1,     0,     5,     3,     1,     3,     1,     3,     1,
2151 >       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2152 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
2153 >       6,     2,     1,     1,     1,     1,     1,     1,     1,     1,
2154 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2155 >       2,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2156 >       4,     4,     4,     4,     4,     4,     4,     0,     5,     3,
2157 >       1,     1,     1,     0,     6,     0,     5,     3,     1,     1,
2158 >       1,     1,     2,     1,     1,     1,     1,     1,     2,     0,
2159 >       5,     3,     1,     1,     3,     4,     4,     0,     6,     2,
2160 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
2161 >       4,     4,     4,     4,     0,     5,     3,     1,     1,     1,
2162 >       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
2163 >       4,     0,     6,     2,     1,     1,     1,     1,     2,     4,
2164 >       4,     4,     5,     2,     1,     1,     1,     4,     0,     6,
2165 >       2,     1,     1,     1,     1,     2,     4,     4,     0,     5,
2166 >       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2167 >       1,     1,     0,     6,     2,     1,     1,     1,     2,     4,
2168 >       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
2169 >       1,     1,     1,     1,     0,     6,     2,     1,     1,     1,
2170 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2171 >       1,     1,     2,     4,     4,     4,     4,     4,     4,     4,
2172 >       4,     4,     0,     5,     3,     1,     1,     1,     4,     4,
2173 >       4,     4,     4,     0,     6,     2,     1,     1,     1,     1,
2174 >       4,     4,     0,     6,     2,     1,     1,     1,     1,     4,
2175 >       4,     5,     2,     1,     1,     1,     4,     0,     6,     2,
2176 >       1,     1,     1,     1,     4,     4,     5,     2,     1,     1,
2177 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2178 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2179 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2180 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2181 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     4,
2182 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2183 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2184 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2185 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2186 >       4,     4,     4,     4,     4,     0,     5,     3,     1,     1,
2187 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2188 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2189 >       1,     0,     5,     3,     1,     1,     1,     1,     1,     1,
2190 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2191 >       1,     1,     1,     1,     1,     4,     4,     4,     5,     2,
2192 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2193 >       1,     1,     1,     1,     1,     1,     4,     4,     4,     4,
2194 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2195 >       5,     2,     1,     1,     1,     1,     1,     1,     1,     1,
2196 >       1,     1,     4,     4,     4,     4,     4,     4,     4,     4
2197 > };
2198  
2199  
2200 < /* Like YYERROR except do call yyerror.  This remains here temporarily
2201 <   to ease the transition to the new meaning of YYERROR, for GCC.
2202 <   Once GCC version 2 has supplanted version 1, this can go.  */
2200 > #define yyerrok         (yyerrstatus = 0)
2201 > #define yyclearin       (yychar = YYEMPTY)
2202 > #define YYEMPTY         (-2)
2203 > #define YYEOF           0
2204 >
2205 > #define YYACCEPT        goto yyacceptlab
2206 > #define YYABORT         goto yyabortlab
2207 > #define YYERROR         goto yyerrorlab
2208  
2671 #define YYFAIL          goto yyerrlab
2209  
2210   #define YYRECOVERING()  (!!yyerrstatus)
2211  
2212 < #define YYBACKUP(Token, Value)                                  \
2213 < do                                                              \
2214 <  if (yychar == YYEMPTY && yylen == 1)                          \
2215 <    {                                                           \
2216 <      yychar = (Token);                                         \
2217 <      yylval = (Value);                                         \
2218 <      yytoken = YYTRANSLATE (yychar);                           \
2219 <      YYPOPSTACK (1);                                           \
2220 <      goto yybackup;                                            \
2221 <    }                                                           \
2222 <  else                                                          \
2223 <    {                                                           \
2212 > #define YYBACKUP(Token, Value)                                  \
2213 > do                                                              \
2214 >  if (yychar == YYEMPTY)                                        \
2215 >    {                                                           \
2216 >      yychar = (Token);                                         \
2217 >      yylval = (Value);                                         \
2218 >      YYPOPSTACK (yylen);                                       \
2219 >      yystate = *yyssp;                                         \
2220 >      goto yybackup;                                            \
2221 >    }                                                           \
2222 >  else                                                          \
2223 >    {                                                           \
2224        yyerror (YY_("syntax error: cannot back up")); \
2225 <      YYERROR;                                                  \
2226 <    }                                                           \
2227 < while (YYID (0))
2228 <
2229 <
2230 < #define YYTERROR        1
2231 < #define YYERRCODE       256
2695 <
2696 <
2697 < /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
2698 <   If N is 0, then set CURRENT to the empty location which ends
2699 <   the previous symbol: RHS[0] (always defined).  */
2700 <
2701 < #define YYRHSLOC(Rhs, K) ((Rhs)[K])
2702 < #ifndef YYLLOC_DEFAULT
2703 < # define YYLLOC_DEFAULT(Current, Rhs, N)                                \
2704 <    do                                                                  \
2705 <      if (YYID (N))                                                    \
2706 <        {                                                               \
2707 <          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
2708 <          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
2709 <          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
2710 <          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
2711 <        }                                                               \
2712 <      else                                                              \
2713 <        {                                                               \
2714 <          (Current).first_line   = (Current).last_line   =              \
2715 <            YYRHSLOC (Rhs, 0).last_line;                                \
2716 <          (Current).first_column = (Current).last_column =              \
2717 <            YYRHSLOC (Rhs, 0).last_column;                              \
2718 <        }                                                               \
2719 <    while (YYID (0))
2720 < #endif
2225 >      YYERROR;                                                  \
2226 >    }                                                           \
2227 > while (0)
2228 >
2229 > /* Error token number */
2230 > #define YYTERROR        1
2231 > #define YYERRCODE       256
2232  
2233  
2723 /* YY_LOCATION_PRINT -- Print the location on the stream.
2724   This macro was not mandated originally: define only if we know
2725   we won't break user code: when these are the locations we know.  */
2726
2727 #ifndef YY_LOCATION_PRINT
2728 # if YYLTYPE_IS_TRIVIAL
2729 #  define YY_LOCATION_PRINT(File, Loc)                  \
2730     fprintf (File, "%d.%d-%d.%d",                      \
2731              (Loc).first_line, (Loc).first_column,     \
2732              (Loc).last_line,  (Loc).last_column)
2733 # else
2734 #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
2735 # endif
2736 #endif
2737
2738
2739 /* YYLEX -- calling `yylex' with the right arguments.  */
2740
2741 #ifdef YYLEX_PARAM
2742 # define YYLEX yylex (YYLEX_PARAM)
2743 #else
2744 # define YYLEX yylex ()
2745 #endif
2234  
2235   /* Enable debugging if requested.  */
2236   #if YYDEBUG
# Line 2752 | Line 2240 | while (YYID (0))
2240   #  define YYFPRINTF fprintf
2241   # endif
2242  
2243 < # define YYDPRINTF(Args)                        \
2244 < do {                                            \
2245 <  if (yydebug)                                  \
2246 <    YYFPRINTF Args;                             \
2247 < } while (YYID (0))
2760 <
2761 < # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
2762 < do {                                                                      \
2763 <  if (yydebug)                                                            \
2764 <    {                                                                     \
2765 <      YYFPRINTF (stderr, "%s ", Title);                                   \
2766 <      yy_symbol_print (stderr,                                            \
2767 <                  Type, Value); \
2768 <      YYFPRINTF (stderr, "\n");                                           \
2769 <    }                                                                     \
2770 < } while (YYID (0))
2243 > # define YYDPRINTF(Args)                        \
2244 > do {                                            \
2245 >  if (yydebug)                                  \
2246 >    YYFPRINTF Args;                             \
2247 > } while (0)
2248  
2249 + /* This macro is provided for backward compatibility. */
2250 + #ifndef YY_LOCATION_PRINT
2251 + # define YY_LOCATION_PRINT(File, Loc) ((void) 0)
2252 + #endif
2253 +
2254 +
2255 + # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
2256 + do {                                                                      \
2257 +  if (yydebug)                                                            \
2258 +    {                                                                     \
2259 +      YYFPRINTF (stderr, "%s ", Title);                                   \
2260 +      yy_symbol_print (stderr,                                            \
2261 +                  Type, Value); \
2262 +      YYFPRINTF (stderr, "\n");                                           \
2263 +    }                                                                     \
2264 + } while (0)
2265  
2773 /*--------------------------------.
2774 | Print this symbol on YYOUTPUT.  |
2775 `--------------------------------*/
2266  
2267 < /*ARGSUSED*/
2268 < #if (defined __STDC__ || defined __C99__FUNC__ \
2269 <     || defined __cplusplus || defined _MSC_VER)
2267 > /*----------------------------------------.
2268 > | Print this symbol's value on YYOUTPUT.  |
2269 > `----------------------------------------*/
2270 >
2271   static void
2272   yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
2782 #else
2783 static void
2784 yy_symbol_value_print (yyoutput, yytype, yyvaluep)
2785    FILE *yyoutput;
2786    int yytype;
2787    YYSTYPE const * const yyvaluep;
2788 #endif
2273   {
2274 +  FILE *yyo = yyoutput;
2275 +  YYUSE (yyo);
2276    if (!yyvaluep)
2277      return;
2278   # ifdef YYPRINT
2279    if (yytype < YYNTOKENS)
2280      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
2795 # else
2796  YYUSE (yyoutput);
2281   # endif
2282 <  switch (yytype)
2799 <    {
2800 <      default:
2801 <        break;
2802 <    }
2282 >  YYUSE (yytype);
2283   }
2284  
2285  
# Line 2807 | Line 2287 | yy_symbol_value_print (yyoutput, yytype,
2287   | Print this symbol on YYOUTPUT.  |
2288   `--------------------------------*/
2289  
2810 #if (defined __STDC__ || defined __C99__FUNC__ \
2811     || defined __cplusplus || defined _MSC_VER)
2290   static void
2291   yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
2814 #else
2815 static void
2816 yy_symbol_print (yyoutput, yytype, yyvaluep)
2817    FILE *yyoutput;
2818    int yytype;
2819    YYSTYPE const * const yyvaluep;
2820 #endif
2292   {
2293 <  if (yytype < YYNTOKENS)
2294 <    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
2824 <  else
2825 <    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
2293 >  YYFPRINTF (yyoutput, "%s %s (",
2294 >             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
2295  
2296    yy_symbol_value_print (yyoutput, yytype, yyvaluep);
2297    YYFPRINTF (yyoutput, ")");
# Line 2833 | Line 2302 | yy_symbol_print (yyoutput, yytype, yyval
2302   | TOP (included).                                                   |
2303   `------------------------------------------------------------------*/
2304  
2836 #if (defined __STDC__ || defined __C99__FUNC__ \
2837     || defined __cplusplus || defined _MSC_VER)
2305   static void
2306   yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
2840 #else
2841 static void
2842 yy_stack_print (yybottom, yytop)
2843    yytype_int16 *yybottom;
2844    yytype_int16 *yytop;
2845 #endif
2307   {
2308    YYFPRINTF (stderr, "Stack now");
2309    for (; yybottom <= yytop; yybottom++)
# Line 2853 | Line 2314 | yy_stack_print (yybottom, yytop)
2314    YYFPRINTF (stderr, "\n");
2315   }
2316  
2317 < # define YY_STACK_PRINT(Bottom, Top)                            \
2318 < do {                                                            \
2319 <  if (yydebug)                                                  \
2320 <    yy_stack_print ((Bottom), (Top));                           \
2321 < } while (YYID (0))
2317 > # define YY_STACK_PRINT(Bottom, Top)                            \
2318 > do {                                                            \
2319 >  if (yydebug)                                                  \
2320 >    yy_stack_print ((Bottom), (Top));                           \
2321 > } while (0)
2322  
2323  
2324   /*------------------------------------------------.
2325   | Report that the YYRULE is going to be reduced.  |
2326   `------------------------------------------------*/
2327  
2867 #if (defined __STDC__ || defined __C99__FUNC__ \
2868     || defined __cplusplus || defined _MSC_VER)
2328   static void
2329 < yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
2871 < #else
2872 < static void
2873 < yy_reduce_print (yyvsp, yyrule)
2874 <    YYSTYPE *yyvsp;
2875 <    int yyrule;
2876 < #endif
2329 > yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
2330   {
2331 +  unsigned long int yylno = yyrline[yyrule];
2332    int yynrhs = yyr2[yyrule];
2333    int yyi;
2880  unsigned long int yylno = yyrline[yyrule];
2334    YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
2335 <             yyrule - 1, yylno);
2335 >             yyrule - 1, yylno);
2336    /* The symbols being reduced.  */
2337    for (yyi = 0; yyi < yynrhs; yyi++)
2338      {
2339        YYFPRINTF (stderr, "   $%d = ", yyi + 1);
2340 <      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
2341 <                       &(yyvsp[(yyi + 1) - (yynrhs)])
2342 <                                       );
2340 >      yy_symbol_print (stderr,
2341 >                       yystos[yyssp[yyi + 1 - yynrhs]],
2342 >                       &(yyvsp[(yyi + 1) - (yynrhs)])
2343 >                                              );
2344        YYFPRINTF (stderr, "\n");
2345      }
2346   }
2347  
2348 < # define YY_REDUCE_PRINT(Rule)          \
2349 < do {                                    \
2350 <  if (yydebug)                          \
2351 <    yy_reduce_print (yyvsp, Rule); \
2352 < } while (YYID (0))
2348 > # define YY_REDUCE_PRINT(Rule)          \
2349 > do {                                    \
2350 >  if (yydebug)                          \
2351 >    yy_reduce_print (yyssp, yyvsp, Rule); \
2352 > } while (0)
2353  
2354   /* Nonzero means print parse trace.  It is left uninitialized so that
2355     multiple parsers can coexist.  */
# Line 2909 | Line 2363 | int yydebug;
2363  
2364  
2365   /* YYINITDEPTH -- initial size of the parser's stacks.  */
2366 < #ifndef YYINITDEPTH
2366 > #ifndef YYINITDEPTH
2367   # define YYINITDEPTH 200
2368   #endif
2369  
# Line 2924 | Line 2378 | int yydebug;
2378   # define YYMAXDEPTH 10000
2379   #endif
2380  
2927
2381  
2382   #if YYERROR_VERBOSE
2383  
# Line 2933 | Line 2386 | int yydebug;
2386   #   define yystrlen strlen
2387   #  else
2388   /* Return the length of YYSTR.  */
2936 #if (defined __STDC__ || defined __C99__FUNC__ \
2937     || defined __cplusplus || defined _MSC_VER)
2389   static YYSIZE_T
2390   yystrlen (const char *yystr)
2940 #else
2941 static YYSIZE_T
2942 yystrlen (yystr)
2943    const char *yystr;
2944 #endif
2391   {
2392    YYSIZE_T yylen;
2393    for (yylen = 0; yystr[yylen]; yylen++)
# Line 2957 | Line 2403 | yystrlen (yystr)
2403   #  else
2404   /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
2405     YYDEST.  */
2960 #if (defined __STDC__ || defined __C99__FUNC__ \
2961     || defined __cplusplus || defined _MSC_VER)
2406   static char *
2407   yystpcpy (char *yydest, const char *yysrc)
2964 #else
2965 static char *
2966 yystpcpy (yydest, yysrc)
2967    char *yydest;
2968    const char *yysrc;
2969 #endif
2408   {
2409    char *yyd = yydest;
2410    const char *yys = yysrc;
# Line 2996 | Line 2434 | yytnamerr (char *yyres, const char *yyst
2434        char const *yyp = yystr;
2435  
2436        for (;;)
2437 <        switch (*++yyp)
2438 <          {
2439 <          case '\'':
2440 <          case ',':
2441 <            goto do_not_strip_quotes;
2442 <
2443 <          case '\\':
2444 <            if (*++yyp != '\\')
2445 <              goto do_not_strip_quotes;
2446 <            /* Fall through.  */
2447 <          default:
2448 <            if (yyres)
2449 <              yyres[yyn] = *yyp;
2450 <            yyn++;
2451 <            break;
2452 <
2453 <          case '"':
2454 <            if (yyres)
2455 <              yyres[yyn] = '\0';
2456 <            return yyn;
2457 <          }
2437 >        switch (*++yyp)
2438 >          {
2439 >          case '\'':
2440 >          case ',':
2441 >            goto do_not_strip_quotes;
2442 >
2443 >          case '\\':
2444 >            if (*++yyp != '\\')
2445 >              goto do_not_strip_quotes;
2446 >            /* Fall through.  */
2447 >          default:
2448 >            if (yyres)
2449 >              yyres[yyn] = *yyp;
2450 >            yyn++;
2451 >            break;
2452 >
2453 >          case '"':
2454 >            if (yyres)
2455 >              yyres[yyn] = '\0';
2456 >            return yyn;
2457 >          }
2458      do_not_strip_quotes: ;
2459      }
2460  
# Line 3027 | Line 2465 | yytnamerr (char *yyres, const char *yyst
2465   }
2466   # endif
2467  
2468 < /* Copy into YYRESULT an error message about the unexpected token
2469 <   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
2470 <   including the terminating null byte.  If YYRESULT is null, do not
2471 <   copy anything; just return the number of bytes that would be
2472 <   copied.  As a special case, return 0 if an ordinary "syntax error"
2473 <   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
2474 <   size calculation.  */
2475 < static YYSIZE_T
2476 < yysyntax_error (char *yyresult, int yystate, int yychar)
2468 > /* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
2469 >   about the unexpected token YYTOKEN for the state stack whose top is
2470 >   YYSSP.
2471 >
2472 >   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
2473 >   not large enough to hold the message.  In that case, also set
2474 >   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
2475 >   required number of bytes is too large to store.  */
2476 > static int
2477 > yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
2478 >                yytype_int16 *yyssp, int yytoken)
2479   {
2480 <  int yyn = yypact[yystate];
2480 >  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
2481 >  YYSIZE_T yysize = yysize0;
2482 >  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
2483 >  /* Internationalized format string. */
2484 >  const char *yyformat = YY_NULLPTR;
2485 >  /* Arguments of yyformat. */
2486 >  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
2487 >  /* Number of reported tokens (one for the "unexpected", one per
2488 >     "expected"). */
2489 >  int yycount = 0;
2490 >
2491 >  /* There are many possibilities here to consider:
2492 >     - If this state is a consistent state with a default action, then
2493 >       the only way this function was invoked is if the default action
2494 >       is an error action.  In that case, don't check for expected
2495 >       tokens because there are none.
2496 >     - The only way there can be no lookahead present (in yychar) is if
2497 >       this state is a consistent state with a default action.  Thus,
2498 >       detecting the absence of a lookahead is sufficient to determine
2499 >       that there is no unexpected or expected token to report.  In that
2500 >       case, just report a simple "syntax error".
2501 >     - Don't assume there isn't a lookahead just because this state is a
2502 >       consistent state with a default action.  There might have been a
2503 >       previous inconsistent state, consistent state with a non-default
2504 >       action, or user semantic action that manipulated yychar.
2505 >     - Of course, the expected token list depends on states to have
2506 >       correct lookahead information, and it depends on the parser not
2507 >       to perform extra reductions after fetching a lookahead from the
2508 >       scanner and before detecting a syntax error.  Thus, state merging
2509 >       (from LALR or IELR) and default reductions corrupt the expected
2510 >       token list.  However, the list is correct for canonical LR with
2511 >       one exception: it will still contain any token that will not be
2512 >       accepted due to an error action in a later state.
2513 >  */
2514 >  if (yytoken != YYEMPTY)
2515 >    {
2516 >      int yyn = yypact[*yyssp];
2517 >      yyarg[yycount++] = yytname[yytoken];
2518 >      if (!yypact_value_is_default (yyn))
2519 >        {
2520 >          /* Start YYX at -YYN if negative to avoid negative indexes in
2521 >             YYCHECK.  In other words, skip the first -YYN actions for
2522 >             this state because they are default actions.  */
2523 >          int yyxbegin = yyn < 0 ? -yyn : 0;
2524 >          /* Stay within bounds of both yycheck and yytname.  */
2525 >          int yychecklim = YYLAST - yyn + 1;
2526 >          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
2527 >          int yyx;
2528 >
2529 >          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
2530 >            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
2531 >                && !yytable_value_is_error (yytable[yyx + yyn]))
2532 >              {
2533 >                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
2534 >                  {
2535 >                    yycount = 1;
2536 >                    yysize = yysize0;
2537 >                    break;
2538 >                  }
2539 >                yyarg[yycount++] = yytname[yyx];
2540 >                {
2541 >                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
2542 >                  if (! (yysize <= yysize1
2543 >                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2544 >                    return 2;
2545 >                  yysize = yysize1;
2546 >                }
2547 >              }
2548 >        }
2549 >    }
2550  
2551 <  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
3043 <    return 0;
3044 <  else
2551 >  switch (yycount)
2552      {
2553 <      int yytype = YYTRANSLATE (yychar);
2554 <      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
2555 <      YYSIZE_T yysize = yysize0;
2556 <      YYSIZE_T yysize1;
2557 <      int yysize_overflow = 0;
2558 <      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
2559 <      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
2560 <      int yyx;
2561 <
2562 < # if 0
2563 <      /* This is so xgettext sees the translatable formats that are
3057 <         constructed on the fly.  */
3058 <      YY_("syntax error, unexpected %s");
3059 <      YY_("syntax error, unexpected %s, expecting %s");
3060 <      YY_("syntax error, unexpected %s, expecting %s or %s");
3061 <      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
3062 <      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
3063 < # endif
3064 <      char *yyfmt;
3065 <      char const *yyf;
3066 <      static char const yyunexpected[] = "syntax error, unexpected %s";
3067 <      static char const yyexpecting[] = ", expecting %s";
3068 <      static char const yyor[] = " or %s";
3069 <      char yyformat[sizeof yyunexpected
3070 <                    + sizeof yyexpecting - 1
3071 <                    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
3072 <                       * (sizeof yyor - 1))];
3073 <      char const *yyprefix = yyexpecting;
3074 <
3075 <      /* Start YYX at -YYN if negative to avoid negative indexes in
3076 <         YYCHECK.  */
3077 <      int yyxbegin = yyn < 0 ? -yyn : 0;
3078 <
3079 <      /* Stay within bounds of both yycheck and yytname.  */
3080 <      int yychecklim = YYLAST - yyn + 1;
3081 <      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
3082 <      int yycount = 1;
3083 <
3084 <      yyarg[0] = yytname[yytype];
3085 <      yyfmt = yystpcpy (yyformat, yyunexpected);
3086 <
3087 <      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
3088 <        if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
3089 <          {
3090 <            if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
3091 <              {
3092 <                yycount = 1;
3093 <                yysize = yysize0;
3094 <                yyformat[sizeof yyunexpected - 1] = '\0';
3095 <                break;
3096 <              }
3097 <            yyarg[yycount++] = yytname[yyx];
3098 <            yysize1 = yysize + yytnamerr (0, yytname[yyx]);
3099 <            yysize_overflow |= (yysize1 < yysize);
3100 <            yysize = yysize1;
3101 <            yyfmt = yystpcpy (yyfmt, yyprefix);
3102 <            yyprefix = yyor;
3103 <          }
3104 <
3105 <      yyf = YY_(yyformat);
3106 <      yysize1 = yysize + yystrlen (yyf);
3107 <      yysize_overflow |= (yysize1 < yysize);
3108 <      yysize = yysize1;
3109 <
3110 <      if (yysize_overflow)
3111 <        return YYSIZE_MAXIMUM;
3112 <
3113 <      if (yyresult)
3114 <        {
3115 <          /* Avoid sprintf, as that infringes on the user's name space.
3116 <             Don't have undefined behavior even if the translation
3117 <             produced a string with the wrong number of "%s"s.  */
3118 <          char *yyp = yyresult;
3119 <          int yyi = 0;
3120 <          while ((*yyp = *yyf) != '\0')
3121 <            {
3122 <              if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
3123 <                {
3124 <                  yyp += yytnamerr (yyp, yyarg[yyi++]);
3125 <                  yyf += 2;
3126 <                }
3127 <              else
3128 <                {
3129 <                  yyp++;
3130 <                  yyf++;
3131 <                }
3132 <            }
3133 <        }
3134 <      return yysize;
2553 > # define YYCASE_(N, S)                      \
2554 >      case N:                               \
2555 >        yyformat = S;                       \
2556 >      break
2557 >      YYCASE_(0, YY_("syntax error"));
2558 >      YYCASE_(1, YY_("syntax error, unexpected %s"));
2559 >      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
2560 >      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
2561 >      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
2562 >      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
2563 > # undef YYCASE_
2564      }
2565 +
2566 +  {
2567 +    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
2568 +    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2569 +      return 2;
2570 +    yysize = yysize1;
2571 +  }
2572 +
2573 +  if (*yymsg_alloc < yysize)
2574 +    {
2575 +      *yymsg_alloc = 2 * yysize;
2576 +      if (! (yysize <= *yymsg_alloc
2577 +             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
2578 +        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
2579 +      return 1;
2580 +    }
2581 +
2582 +  /* Avoid sprintf, as that infringes on the user's name space.
2583 +     Don't have undefined behavior even if the translation
2584 +     produced a string with the wrong number of "%s"s.  */
2585 +  {
2586 +    char *yyp = *yymsg;
2587 +    int yyi = 0;
2588 +    while ((*yyp = *yyformat) != '\0')
2589 +      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
2590 +        {
2591 +          yyp += yytnamerr (yyp, yyarg[yyi++]);
2592 +          yyformat += 2;
2593 +        }
2594 +      else
2595 +        {
2596 +          yyp++;
2597 +          yyformat++;
2598 +        }
2599 +  }
2600 +  return 0;
2601   }
2602   #endif /* YYERROR_VERBOSE */
3138
2603  
2604   /*-----------------------------------------------.
2605   | Release the memory associated to this symbol.  |
2606   `-----------------------------------------------*/
2607  
3144 /*ARGSUSED*/
3145 #if (defined __STDC__ || defined __C99__FUNC__ \
3146     || defined __cplusplus || defined _MSC_VER)
2608   static void
2609   yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
3149 #else
3150 static void
3151 yydestruct (yymsg, yytype, yyvaluep)
3152    const char *yymsg;
3153    int yytype;
3154    YYSTYPE *yyvaluep;
3155 #endif
2610   {
2611    YYUSE (yyvaluep);
3158
2612    if (!yymsg)
2613      yymsg = "Deleting";
2614    YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
2615  
2616 <  switch (yytype)
2617 <    {
2618 <
3166 <      default:
3167 <        break;
3168 <    }
2616 >  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
2617 >  YYUSE (yytype);
2618 >  YY_IGNORE_MAYBE_UNINITIALIZED_END
2619   }
2620  
2621 < /* Prevent warnings from -Wmissing-prototypes.  */
3172 < #ifdef YYPARSE_PARAM
3173 < #if defined __STDC__ || defined __cplusplus
3174 < int yyparse (void *YYPARSE_PARAM);
3175 < #else
3176 < int yyparse ();
3177 < #endif
3178 < #else /* ! YYPARSE_PARAM */
3179 < #if defined __STDC__ || defined __cplusplus
3180 < int yyparse (void);
3181 < #else
3182 < int yyparse ();
3183 < #endif
3184 < #endif /* ! YYPARSE_PARAM */
2621 >
2622  
2623  
2624   /* The lookahead symbol.  */
# Line 3189 | Line 2626 | int yychar;
2626  
2627   /* The semantic value of the lookahead symbol.  */
2628   YYSTYPE yylval;
3192
2629   /* Number of syntax errors so far.  */
2630   int yynerrs;
2631  
2632  
2633 + /*----------.
2634 + | yyparse.  |
2635 + `----------*/
2636  
3198 /*-------------------------.
3199 | yyparse or yypush_parse.  |
3200 `-------------------------*/
3201
3202 #ifdef YYPARSE_PARAM
3203 #if (defined __STDC__ || defined __C99__FUNC__ \
3204     || defined __cplusplus || defined _MSC_VER)
3205 int
3206 yyparse (void *YYPARSE_PARAM)
3207 #else
3208 int
3209 yyparse (YYPARSE_PARAM)
3210    void *YYPARSE_PARAM;
3211 #endif
3212 #else /* ! YYPARSE_PARAM */
3213 #if (defined __STDC__ || defined __C99__FUNC__ \
3214     || defined __cplusplus || defined _MSC_VER)
2637   int
2638   yyparse (void)
3217 #else
3218 int
3219 yyparse ()
3220
3221 #endif
3222 #endif
2639   {
3224
3225
2640      int yystate;
2641      /* Number of tokens to shift before error messages enabled.  */
2642      int yyerrstatus;
2643  
2644      /* The stacks and their tools:
2645 <       `yyss': related to states.
2646 <       `yyvs': related to semantic values.
2645 >       'yyss': related to states.
2646 >       'yyvs': related to semantic values.
2647  
2648 <       Refer to the stacks thru separate pointers, to allow yyoverflow
2648 >       Refer to the stacks through separate pointers, to allow yyoverflow
2649         to reallocate them elsewhere.  */
2650  
2651      /* The state stack.  */
# Line 3249 | Line 2663 | yyparse ()
2663    int yyn;
2664    int yyresult;
2665    /* Lookahead token as an internal (translated) token number.  */
2666 <  int yytoken;
2666 >  int yytoken = 0;
2667    /* The variables used to return semantic value and location from the
2668       action routines.  */
2669    YYSTYPE yyval;
# Line 3267 | Line 2681 | yyparse ()
2681       Keep to zero when no symbol should be popped.  */
2682    int yylen = 0;
2683  
2684 <  yytoken = 0;
2685 <  yyss = yyssa;
3272 <  yyvs = yyvsa;
2684 >  yyssp = yyss = yyssa;
2685 >  yyvsp = yyvs = yyvsa;
2686    yystacksize = YYINITDEPTH;
2687  
2688    YYDPRINTF ((stderr, "Starting parse\n"));
# Line 3278 | Line 2691 | yyparse ()
2691    yyerrstatus = 0;
2692    yynerrs = 0;
2693    yychar = YYEMPTY; /* Cause a token to be read.  */
3281
3282  /* Initialize stack pointers.
3283     Waste one element of value and location stack
3284     so that they stay on the same level as the state stack.
3285     The wasted elements are never initialized.  */
3286  yyssp = yyss;
3287  yyvsp = yyvs;
3288
2694    goto yysetstate;
2695  
2696   /*------------------------------------------------------------.
# Line 3306 | Line 2711 | yyparse ()
2711  
2712   #ifdef yyoverflow
2713        {
2714 <        /* Give user a chance to reallocate the stack.  Use copies of
2715 <           these so that the &'s don't force the real ones into
2716 <           memory.  */
2717 <        YYSTYPE *yyvs1 = yyvs;
2718 <        yytype_int16 *yyss1 = yyss;
2719 <
2720 <        /* Each stack pointer address is followed by the size of the
2721 <           data in use in that stack, in bytes.  This used to be a
2722 <           conditional around just the two extra args, but that might
2723 <           be undefined if yyoverflow is a macro.  */
2724 <        yyoverflow (YY_("memory exhausted"),
2725 <                    &yyss1, yysize * sizeof (*yyssp),
2726 <                    &yyvs1, yysize * sizeof (*yyvsp),
2727 <                    &yystacksize);
2714 >        /* Give user a chance to reallocate the stack.  Use copies of
2715 >           these so that the &'s don't force the real ones into
2716 >           memory.  */
2717 >        YYSTYPE *yyvs1 = yyvs;
2718 >        yytype_int16 *yyss1 = yyss;
2719 >
2720 >        /* Each stack pointer address is followed by the size of the
2721 >           data in use in that stack, in bytes.  This used to be a
2722 >           conditional around just the two extra args, but that might
2723 >           be undefined if yyoverflow is a macro.  */
2724 >        yyoverflow (YY_("memory exhausted"),
2725 >                    &yyss1, yysize * sizeof (*yyssp),
2726 >                    &yyvs1, yysize * sizeof (*yyvsp),
2727 >                    &yystacksize);
2728  
2729 <        yyss = yyss1;
2730 <        yyvs = yyvs1;
2729 >        yyss = yyss1;
2730 >        yyvs = yyvs1;
2731        }
2732   #else /* no yyoverflow */
2733   # ifndef YYSTACK_RELOCATE
# Line 3330 | Line 2735 | yyparse ()
2735   # else
2736        /* Extend the stack our own way.  */
2737        if (YYMAXDEPTH <= yystacksize)
2738 <        goto yyexhaustedlab;
2738 >        goto yyexhaustedlab;
2739        yystacksize *= 2;
2740        if (YYMAXDEPTH < yystacksize)
2741 <        yystacksize = YYMAXDEPTH;
2741 >        yystacksize = YYMAXDEPTH;
2742  
2743        {
2744 <        yytype_int16 *yyss1 = yyss;
2745 <        union yyalloc *yyptr =
2746 <          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
2747 <        if (! yyptr)
2748 <          goto yyexhaustedlab;
2749 <        YYSTACK_RELOCATE (yyss_alloc, yyss);
2750 <        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
2744 >        yytype_int16 *yyss1 = yyss;
2745 >        union yyalloc *yyptr =
2746 >          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
2747 >        if (! yyptr)
2748 >          goto yyexhaustedlab;
2749 >        YYSTACK_RELOCATE (yyss_alloc, yyss);
2750 >        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
2751   #  undef YYSTACK_RELOCATE
2752 <        if (yyss1 != yyssa)
2753 <          YYSTACK_FREE (yyss1);
2752 >        if (yyss1 != yyssa)
2753 >          YYSTACK_FREE (yyss1);
2754        }
2755   # endif
2756   #endif /* no yyoverflow */
# Line 3354 | Line 2759 | yyparse ()
2759        yyvsp = yyvs + yysize - 1;
2760  
2761        YYDPRINTF ((stderr, "Stack size increased to %lu\n",
2762 <                  (unsigned long int) yystacksize));
2762 >                  (unsigned long int) yystacksize));
2763  
2764        if (yyss + yystacksize - 1 <= yyssp)
2765 <        YYABORT;
2765 >        YYABORT;
2766      }
2767  
2768    YYDPRINTF ((stderr, "Entering state %d\n", yystate));
# Line 3377 | Line 2782 | yybackup:
2782  
2783    /* First try to decide what to do without reference to lookahead token.  */
2784    yyn = yypact[yystate];
2785 <  if (yyn == YYPACT_NINF)
2785 >  if (yypact_value_is_default (yyn))
2786      goto yydefault;
2787  
2788    /* Not known => get a lookahead token if don't already have one.  */
# Line 3386 | Line 2791 | yybackup:
2791    if (yychar == YYEMPTY)
2792      {
2793        YYDPRINTF ((stderr, "Reading a token: "));
2794 <      yychar = YYLEX;
2794 >      yychar = yylex ();
2795      }
2796  
2797    if (yychar <= YYEOF)
# Line 3408 | Line 2813 | yybackup:
2813    yyn = yytable[yyn];
2814    if (yyn <= 0)
2815      {
2816 <      if (yyn == 0 || yyn == YYTABLE_NINF)
2817 <        goto yyerrlab;
2816 >      if (yytable_value_is_error (yyn))
2817 >        goto yyerrlab;
2818        yyn = -yyn;
2819        goto yyreduce;
2820      }
# Line 3426 | Line 2831 | yybackup:
2831    yychar = YYEMPTY;
2832  
2833    yystate = yyn;
2834 +  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
2835    *++yyvsp = yylval;
2836 +  YY_IGNORE_MAYBE_UNINITIALIZED_END
2837  
2838    goto yynewstate;
2839  
# Line 3449 | Line 2856 | yyreduce:
2856    yylen = yyr2[yyn];
2857  
2858    /* If YYLEN is nonzero, implement the default value of the action:
2859 <     `$$ = $1'.
2859 >     '$$ = $1'.
2860  
2861       Otherwise, the following line sets YYVAL to garbage.
2862       This behavior is undocumented and Bison
# Line 3462 | Line 2869 | yyreduce:
2869    YY_REDUCE_PRINT (yyn);
2870    switch (yyn)
2871      {
2872 <        case 26:
2873 <
3467 < /* Line 1455 of yacc.c  */
3468 < #line 429 "ircd_parser.y"
2872 >        case 28:
2873 > #line 420 "conf_parser.y" /* yacc.c:1646  */
2874      { (yyval.number) = 0; }
2875 <    break;
3471 <
3472 <  case 28:
3473 <
3474 < /* Line 1455 of yacc.c  */
3475 < #line 431 "ircd_parser.y"
3476 <    {
3477 <                        (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number);
3478 <                }
3479 <    break;
3480 <
3481 <  case 29:
3482 <
3483 < /* Line 1455 of yacc.c  */
3484 < #line 435 "ircd_parser.y"
3485 <    {
3486 <                        (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number);
3487 <                }
2875 > #line 2876 "conf_parser.c" /* yacc.c:1646  */
2876      break;
2877  
2878    case 30:
2879 <
2880 < /* Line 1455 of yacc.c  */
2881 < #line 439 "ircd_parser.y"
3494 <    {
3495 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 + (yyvsp[(3) - (3)].number);
3496 <                }
2879 > #line 421 "conf_parser.y" /* yacc.c:1646  */
2880 >    { (yyval.number) = (yyvsp[-1].number) + (yyvsp[0].number); }
2881 > #line 2882 "conf_parser.c" /* yacc.c:1646  */
2882      break;
2883  
2884    case 31:
2885 <
2886 < /* Line 1455 of yacc.c  */
2887 < #line 443 "ircd_parser.y"
3503 <    {
3504 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 + (yyvsp[(3) - (3)].number);
3505 <                }
2885 > #line 422 "conf_parser.y" /* yacc.c:1646  */
2886 >    { (yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number); }
2887 > #line 2888 "conf_parser.c" /* yacc.c:1646  */
2888      break;
2889  
2890    case 32:
2891 <
2892 < /* Line 1455 of yacc.c  */
2893 < #line 447 "ircd_parser.y"
3512 <    {
3513 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 + (yyvsp[(3) - (3)].number);
3514 <                }
2891 > #line 423 "conf_parser.y" /* yacc.c:1646  */
2892 >    { (yyval.number) = (yyvsp[-2].number) * 60 + (yyvsp[0].number); }
2893 > #line 2894 "conf_parser.c" /* yacc.c:1646  */
2894      break;
2895  
2896    case 33:
2897 <
2898 < /* Line 1455 of yacc.c  */
2899 < #line 451 "ircd_parser.y"
3521 <    {
3522 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 + (yyvsp[(3) - (3)].number);
3523 <                }
2897 > #line 424 "conf_parser.y" /* yacc.c:1646  */
2898 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 + (yyvsp[0].number); }
2899 > #line 2900 "conf_parser.c" /* yacc.c:1646  */
2900      break;
2901  
2902    case 34:
2903 + #line 425 "conf_parser.y" /* yacc.c:1646  */
2904 +    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 + (yyvsp[0].number); }
2905 + #line 2906 "conf_parser.c" /* yacc.c:1646  */
2906 +    break;
2907  
2908 < /* Line 1455 of yacc.c  */
2909 < #line 456 "ircd_parser.y"
2910 <    { (yyval.number) = 0; }
2908 >  case 35:
2909 > #line 426 "conf_parser.y" /* yacc.c:1646  */
2910 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 7 + (yyvsp[0].number); }
2911 > #line 2912 "conf_parser.c" /* yacc.c:1646  */
2912      break;
2913  
2914    case 36:
2915 <
2916 < /* Line 1455 of yacc.c  */
2917 < #line 457 "ircd_parser.y"
3537 <    { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); }
2915 > #line 427 "conf_parser.y" /* yacc.c:1646  */
2916 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 7 * 4 + (yyvsp[0].number); }
2917 > #line 2918 "conf_parser.c" /* yacc.c:1646  */
2918      break;
2919  
2920    case 37:
2921 <
2922 < /* Line 1455 of yacc.c  */
2923 < #line 458 "ircd_parser.y"
3544 <    { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); }
2921 > #line 428 "conf_parser.y" /* yacc.c:1646  */
2922 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 365 + (yyvsp[0].number); }
2923 > #line 2924 "conf_parser.c" /* yacc.c:1646  */
2924      break;
2925  
2926    case 38:
2927 + #line 431 "conf_parser.y" /* yacc.c:1646  */
2928 +    { (yyval.number) = 0; }
2929 + #line 2930 "conf_parser.c" /* yacc.c:1646  */
2930 +    break;
2931  
2932 < /* Line 1455 of yacc.c  */
2933 < #line 459 "ircd_parser.y"
2934 <    { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 + (yyvsp[(3) - (3)].number); }
2932 >  case 40:
2933 > #line 432 "conf_parser.y" /* yacc.c:1646  */
2934 >    { (yyval.number) = (yyvsp[-1].number) + (yyvsp[0].number); }
2935 > #line 2936 "conf_parser.c" /* yacc.c:1646  */
2936      break;
2937  
2938 <  case 39:
2938 >  case 41:
2939 > #line 433 "conf_parser.y" /* yacc.c:1646  */
2940 >    { (yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number); }
2941 > #line 2942 "conf_parser.c" /* yacc.c:1646  */
2942 >    break;
2943  
2944 < /* Line 1455 of yacc.c  */
2945 < #line 460 "ircd_parser.y"
2946 <    { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 * 1024 + (yyvsp[(3) - (3)].number); }
2944 >  case 42:
2945 > #line 434 "conf_parser.y" /* yacc.c:1646  */
2946 >    { (yyval.number) = (yyvsp[-2].number) * 1024 + (yyvsp[0].number); }
2947 > #line 2948 "conf_parser.c" /* yacc.c:1646  */
2948      break;
2949  
2950 <  case 46:
2950 >  case 43:
2951 > #line 435 "conf_parser.y" /* yacc.c:1646  */
2952 >    { (yyval.number) = (yyvsp[-2].number) * 1024 * 1024 + (yyvsp[0].number); }
2953 > #line 2954 "conf_parser.c" /* yacc.c:1646  */
2954 >    break;
2955  
2956 < /* Line 1455 of yacc.c  */
2957 < #line 474 "ircd_parser.y"
2956 >  case 50:
2957 > #line 449 "conf_parser.y" /* yacc.c:1646  */
2958      {
3566 #ifndef STATIC_MODULES /* NOOP in the static case */
2959    if (conf_parser_ctx.pass == 2)
2960      add_conf_module(libio_basename(yylval.string));
3569 #endif
2961   }
2962 + #line 2963 "conf_parser.c" /* yacc.c:1646  */
2963      break;
2964  
2965 <  case 47:
2966 <
3575 < /* Line 1455 of yacc.c  */
3576 < #line 482 "ircd_parser.y"
2965 >  case 51:
2966 > #line 455 "conf_parser.y" /* yacc.c:1646  */
2967      {
3578 #ifndef STATIC_MODULES
2968    if (conf_parser_ctx.pass == 2)
2969      mod_add_path(yylval.string);
3581 #endif
2970   }
2971 + #line 2972 "conf_parser.c" /* yacc.c:1646  */
2972      break;
2973  
2974 <  case 64:
2974 >  case 73:
2975 > #line 485 "conf_parser.y" /* yacc.c:1646  */
2976 >    {
2977 > #ifdef HAVE_LIBCRYPTO
2978 >  if (conf_parser_ctx.pass == 2)
2979 >  {
2980 >    if (!ConfigServerInfo.rsa_private_key_file)
2981 >    {
2982 >      conf_error_report("No rsa_private_key_file specified, SSL disabled");
2983 >      break;
2984 >    }
2985  
2986 < /* Line 1455 of yacc.c  */
2987 < #line 504 "ircd_parser.y"
2986 >    if (SSL_CTX_use_certificate_chain_file(ConfigServerInfo.server_ctx, yylval.string) <= 0 ||
2987 >        SSL_CTX_use_certificate_chain_file(ConfigServerInfo.client_ctx, yylval.string) <= 0)
2988      {
2989 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
2990 <    ServerInfo.tls_version = 0;
2989 >      report_crypto_errors();
2990 >      conf_error_report("Could not open/read certificate file");
2991 >      break;
2992 >    }
2993 >
2994 >    if (SSL_CTX_use_PrivateKey_file(ConfigServerInfo.server_ctx, ConfigServerInfo.rsa_private_key_file,
2995 >                                    SSL_FILETYPE_PEM) <= 0 ||
2996 >        SSL_CTX_use_PrivateKey_file(ConfigServerInfo.client_ctx, ConfigServerInfo.rsa_private_key_file,
2997 >                                    SSL_FILETYPE_PEM) <= 0)
2998 >    {
2999 >      report_crypto_errors();
3000 >      conf_error_report("Could not read RSA private key");
3001 >      break;
3002 >    }
3003 >
3004 >    if (!SSL_CTX_check_private_key(ConfigServerInfo.server_ctx) ||
3005 >        !SSL_CTX_check_private_key(ConfigServerInfo.client_ctx))
3006 >    {
3007 >      report_crypto_errors();
3008 >      conf_error_report("Could not read RSA private key");
3009 >      break;
3010 >    }
3011 >  }
3012 > #endif
3013   }
3014 + #line 3015 "conf_parser.c" /* yacc.c:1646  */
3015      break;
3016  
3017 <  case 65:
3018 <
3597 < /* Line 1455 of yacc.c  */
3598 < #line 508 "ircd_parser.y"
3017 >  case 74:
3018 > #line 525 "conf_parser.y" /* yacc.c:1646  */
3019      {
3020 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3020 > #ifdef HAVE_LIBCRYPTO
3021 >  BIO *file = NULL;
3022 >
3023 >  if (conf_parser_ctx.pass != 1)
3024 >    break;
3025 >
3026 >  if (ConfigServerInfo.rsa_private_key)
3027    {
3028 <    if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_SSLV3))
3029 <      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);
3028 >    RSA_free(ConfigServerInfo.rsa_private_key);
3029 >    ConfigServerInfo.rsa_private_key = NULL;
3030    }
3031 < }
3031 >
3032 >  if (ConfigServerInfo.rsa_private_key_file)
3033 >  {
3034 >    MyFree(ConfigServerInfo.rsa_private_key_file);
3035 >    ConfigServerInfo.rsa_private_key_file = NULL;
3036 >  }
3037 >
3038 >  ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
3039 >
3040 >  if ((file = BIO_new_file(yylval.string, "r")) == NULL)
3041 >  {
3042 >    conf_error_report("File open failed, ignoring");
3043      break;
3044 +  }
3045  
3046 <  case 68:
3046 >  ConfigServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
3047  
3048 < /* Line 1455 of yacc.c  */
3049 < #line 520 "ircd_parser.y"
3050 <    {
3051 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3052 <    ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_SSLV3;
3053 < }
3048 >  BIO_set_close(file, BIO_CLOSE);
3049 >  BIO_free(file);
3050 >
3051 >  if (ConfigServerInfo.rsa_private_key == NULL)
3052 >  {
3053 >    conf_error_report("Couldn't extract key, ignoring");
3054      break;
3055 +  }
3056  
3057 <  case 69:
3057 >  if (!RSA_check_key(ConfigServerInfo.rsa_private_key))
3058 >  {
3059 >    RSA_free(ConfigServerInfo.rsa_private_key);
3060 >    ConfigServerInfo.rsa_private_key = NULL;
3061  
3062 < /* Line 1455 of yacc.c  */
3623 < #line 524 "ircd_parser.y"
3624 <    {
3625 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3626 <    ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_TLSV1;
3627 < }
3062 >    conf_error_report("Invalid key, ignoring");
3063      break;
3064 +  }
3065 +
3066 +  if (RSA_size(ConfigServerInfo.rsa_private_key) < 128)
3067 +  {
3068 +    RSA_free(ConfigServerInfo.rsa_private_key);
3069 +    ConfigServerInfo.rsa_private_key = NULL;
3070  
3071 <  case 70:
3071 >    conf_error_report("Ignoring serverinfo::rsa_private_key_file -- need at least a 1024 bit key size");
3072 >  }
3073 > #endif
3074 > }
3075 > #line 3076 "conf_parser.c" /* yacc.c:1646  */
3076 >    break;
3077  
3078 < /* Line 1455 of yacc.c  */
3079 < #line 530 "ircd_parser.y"
3078 >  case 75:
3079 > #line 583 "conf_parser.y" /* yacc.c:1646  */
3080      {
3081   #ifdef HAVE_LIBCRYPTO
3082 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
3082 >  if (conf_parser_ctx.pass == 2)
3083    {
3084 <    if (!ServerInfo.rsa_private_key_file)
3639 <    {
3640 <      yyerror("No rsa_private_key_file specified, SSL disabled");
3641 <      break;
3642 <    }
3084 >    BIO *file = BIO_new_file(yylval.string, "r");
3085  
3086 <    if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
3645 <                                     SSL_FILETYPE_PEM) <= 0)
3086 >    if (file)
3087      {
3088 <      yyerror(ERR_lib_error_string(ERR_get_error()));
3648 <      break;
3649 <    }
3088 >      DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
3089  
3090 <    if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
3652 <                                    SSL_FILETYPE_PEM) <= 0)
3653 <    {
3654 <      yyerror(ERR_lib_error_string(ERR_get_error()));
3655 <      break;
3656 <    }
3090 >      BIO_free(file);
3091  
3092 <    if (!SSL_CTX_check_private_key(ServerInfo.server_ctx))
3093 <    {
3094 <      yyerror(ERR_lib_error_string(ERR_get_error()));
3095 <      break;
3092 >      if (dh)
3093 >      {
3094 >        if (DH_size(dh) < 128)
3095 >          conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
3096 >        else
3097 >          SSL_CTX_set_tmp_dh(ConfigServerInfo.server_ctx, dh);
3098 >
3099 >        DH_free(dh);
3100 >      }
3101      }
3102 +    else
3103 +      conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- could not open/read Diffie-Hellman parameter file");
3104    }
3105   #endif
3106   }
3107 + #line 3108 "conf_parser.c" /* yacc.c:1646  */
3108      break;
3109  
3110 <  case 71:
3111 <
3670 < /* Line 1455 of yacc.c  */
3671 < #line 564 "ircd_parser.y"
3110 >  case 76:
3111 > #line 612 "conf_parser.y" /* yacc.c:1646  */
3112      {
3113   #ifdef HAVE_LIBCRYPTO
3114 <  if (conf_parser_ctx.pass == 1)
3115 <  {
3116 <    BIO *file;
3114 >  if (conf_parser_ctx.pass == 2)
3115 >    SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, yylval.string);
3116 > #endif
3117 > }
3118 > #line 3119 "conf_parser.c" /* yacc.c:1646  */
3119 >    break;
3120  
3121 <    if (ServerInfo.rsa_private_key)
3121 >  case 77:
3122 > #line 620 "conf_parser.y" /* yacc.c:1646  */
3123      {
3124 <      RSA_free(ServerInfo.rsa_private_key);
3125 <      ServerInfo.rsa_private_key = NULL;
3126 <    }
3127 <
3684 <    if (ServerInfo.rsa_private_key_file)
3124 > #ifdef HAVE_LIBCRYPTO
3125 >  if (conf_parser_ctx.pass == 2)
3126 >  {
3127 >    if ((ConfigServerInfo.message_digest_algorithm = EVP_get_digestbyname(yylval.string)) == NULL)
3128      {
3129 <      MyFree(ServerInfo.rsa_private_key_file);
3130 <      ServerInfo.rsa_private_key_file = NULL;
3129 >      ConfigServerInfo.message_digest_algorithm = EVP_sha256();
3130 >      conf_error_report("Ignoring serverinfo::ssl_message_digest_algorithm -- unknown message digest algorithm");
3131      }
3132 +  }
3133 + #endif
3134 + }
3135 + #line 3136 "conf_parser.c" /* yacc.c:1646  */
3136 +    break;
3137  
3138 <    DupString(ServerInfo.rsa_private_key_file, yylval.string);
3139 <
3692 <    if ((file = BIO_new_file(yylval.string, "r")) == NULL)
3138 >  case 78:
3139 > #line 634 "conf_parser.y" /* yacc.c:1646  */
3140      {
3141 <      yyerror("File open failed, ignoring");
3142 <      break;
3143 <    }
3144 <
3698 <    ServerInfo.rsa_private_key = (RSA *)PEM_read_bio_RSAPrivateKey(file, NULL,
3699 <      0, NULL);
3700 <
3701 <    BIO_set_close(file, BIO_CLOSE);
3702 <    BIO_free(file);
3141 > #ifdef HAVE_LIBCRYPTO
3142 > #if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
3143 >  int nid = 0;
3144 >  EC_KEY *key = NULL;
3145  
3146 <    if (ServerInfo.rsa_private_key == NULL)
3146 >  if (conf_parser_ctx.pass == 2)
3147 >  {
3148 >    if ((nid = OBJ_sn2nid(yylval.string)) == 0)
3149      {
3150 <      yyerror("Couldn't extract key, ignoring");
3151 <      break;
3150 >        conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- unknown curve name");
3151 >        break;
3152      }
3153  
3154 <    if (!RSA_check_key(ServerInfo.rsa_private_key))
3154 >    if ((key = EC_KEY_new_by_curve_name(nid)) == NULL)
3155      {
3156 <      RSA_free(ServerInfo.rsa_private_key);
3713 <      ServerInfo.rsa_private_key = NULL;
3714 <
3715 <      yyerror("Invalid key, ignoring");
3156 >      conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- could not create curve");
3157        break;
3158      }
3159  
3160 <    /* require 2048 bit (256 byte) key */
3161 <    if (RSA_size(ServerInfo.rsa_private_key) != 256)
3162 <    {
3163 <      RSA_free(ServerInfo.rsa_private_key);
3723 <      ServerInfo.rsa_private_key = NULL;
3724 <
3725 <      yyerror("Not a 2048 bit key, ignoring");
3726 <    }
3727 <  }
3160 >    SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
3161 >    EC_KEY_free(key);
3162 > }
3163 > #endif
3164   #endif
3165   }
3166 + #line 3167 "conf_parser.c" /* yacc.c:1646  */
3167      break;
3168  
3169 <  case 72:
3170 <
3734 < /* Line 1455 of yacc.c  */
3735 < #line 624 "ircd_parser.y"
3169 >  case 79:
3170 > #line 662 "conf_parser.y" /* yacc.c:1646  */
3171      {
3172    /* this isn't rehashable */
3173 <  if (conf_parser_ctx.pass == 2)
3173 >  if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.name)
3174    {
3175 <    if (ServerInfo.name == NULL)
3175 >    if (valid_servname(yylval.string))
3176 >      ConfigServerInfo.name = xstrdup(yylval.string);
3177 >    else
3178      {
3179 <      /* the ircd will exit() in main() if we dont set one */
3180 <      if (strlen(yylval.string) <= HOSTLEN)
3744 <        DupString(ServerInfo.name, yylval.string);
3179 >      conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
3180 >      exit(0);
3181      }
3182    }
3183   }
3184 + #line 3185 "conf_parser.c" /* yacc.c:1646  */
3185      break;
3186  
3187 <  case 73:
3188 <
3752 < /* Line 1455 of yacc.c  */
3753 < #line 638 "ircd_parser.y"
3187 >  case 80:
3188 > #line 677 "conf_parser.y" /* yacc.c:1646  */
3189      {
3190    /* this isn't rehashable */
3191 <  if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
3191 >  if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.sid)
3192    {
3193      if (valid_sid(yylval.string))
3194 <      DupString(ServerInfo.sid, yylval.string);
3194 >      ConfigServerInfo.sid = xstrdup(yylval.string);
3195      else
3196      {
3197 <      ilog(L_ERROR, "Ignoring config file entry SID -- invalid SID. Aborting.");
3197 >      conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
3198        exit(0);
3199      }
3200    }
3201   }
3202 + #line 3203 "conf_parser.c" /* yacc.c:1646  */
3203      break;
3204  
3205 <  case 74:
3206 <
3771 < /* Line 1455 of yacc.c  */
3772 < #line 653 "ircd_parser.y"
3205 >  case 81:
3206 > #line 692 "conf_parser.y" /* yacc.c:1646  */
3207      {
3208    if (conf_parser_ctx.pass == 2)
3209    {
3210 <    MyFree(ServerInfo.description);
3211 <    DupString(ServerInfo.description,yylval.string);
3210 >    MyFree(ConfigServerInfo.description);
3211 >    ConfigServerInfo.description = xstrdup(yylval.string);
3212 >    strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
3213    }
3214   }
3215 + #line 3216 "conf_parser.c" /* yacc.c:1646  */
3216      break;
3217  
3218 <  case 75:
3219 <
3784 < /* Line 1455 of yacc.c  */
3785 < #line 662 "ircd_parser.y"
3218 >  case 82:
3219 > #line 702 "conf_parser.y" /* yacc.c:1646  */
3220      {
3221    if (conf_parser_ctx.pass == 2)
3222    {
3223      char *p;
3224  
3225 <    if ((p = strchr(yylval.string, ' ')) != NULL)
3226 <      p = '\0';
3225 >    if ((p = strchr(yylval.string, ' ')))
3226 >      *p = '\0';
3227  
3228 <    MyFree(ServerInfo.network_name);
3229 <    DupString(ServerInfo.network_name, yylval.string);
3228 >    MyFree(ConfigServerInfo.network_name);
3229 >    ConfigServerInfo.network_name = xstrdup(yylval.string);
3230    }
3231   }
3232 + #line 3233 "conf_parser.c" /* yacc.c:1646  */
3233      break;
3234  
3235 <  case 76:
3236 <
3802 < /* Line 1455 of yacc.c  */
3803 < #line 676 "ircd_parser.y"
3235 >  case 83:
3236 > #line 716 "conf_parser.y" /* yacc.c:1646  */
3237      {
3238 <  if (conf_parser_ctx.pass == 2)
3806 <  {
3807 <    MyFree(ServerInfo.network_desc);
3808 <    DupString(ServerInfo.network_desc, yylval.string);
3809 <  }
3810 < }
3238 >  if (conf_parser_ctx.pass != 2)
3239      break;
3240  
3241 <  case 77:
3241 >  MyFree(ConfigServerInfo.network_desc);
3242 >  ConfigServerInfo.network_desc = xstrdup(yylval.string);
3243 > }
3244 > #line 3245 "conf_parser.c" /* yacc.c:1646  */
3245 >    break;
3246  
3247 < /* Line 1455 of yacc.c  */
3248 < #line 685 "ircd_parser.y"
3247 >  case 84:
3248 > #line 725 "conf_parser.y" /* yacc.c:1646  */
3249      {
3250    if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
3251    {
# Line 3825 | Line 3257 | yyreduce:
3257      hints.ai_socktype = SOCK_STREAM;
3258      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
3259  
3260 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
3261 <      ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
3260 >    if (getaddrinfo(yylval.string, NULL, &hints, &res))
3261 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
3262      else
3263      {
3264 <      assert(res != NULL);
3264 >      assert(res);
3265  
3266 <      memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
3267 <      ServerInfo.ip.ss.ss_family = res->ai_family;
3268 <      ServerInfo.ip.ss_len = res->ai_addrlen;
3269 <      irc_freeaddrinfo(res);
3266 >      memcpy(&ConfigServerInfo.ip, res->ai_addr, res->ai_addrlen);
3267 >      ConfigServerInfo.ip.ss.ss_family = res->ai_family;
3268 >      ConfigServerInfo.ip.ss_len = res->ai_addrlen;
3269 >      freeaddrinfo(res);
3270  
3271 <      ServerInfo.specific_ipv4_vhost = 1;
3271 >      ConfigServerInfo.specific_ipv4_vhost = 1;
3272      }
3273    }
3274   }
3275 + #line 3276 "conf_parser.c" /* yacc.c:1646  */
3276      break;
3277  
3278 <  case 78:
3279 <
3847 < /* Line 1455 of yacc.c  */
3848 < #line 713 "ircd_parser.y"
3278 >  case 85:
3279 > #line 753 "conf_parser.y" /* yacc.c:1646  */
3280      {
3850 #ifdef IPV6
3281    if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
3282    {
3283      struct addrinfo hints, *res;
# Line 3858 | Line 3288 | yyreduce:
3288      hints.ai_socktype = SOCK_STREAM;
3289      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
3290  
3291 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
3292 <      ilog(L_ERROR, "Invalid netmask for server vhost6(%s)", yylval.string);
3291 >    if (getaddrinfo(yylval.string, NULL, &hints, &res))
3292 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
3293      else
3294      {
3295 <      assert(res != NULL);
3295 >      assert(res);
3296  
3297 <      memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
3298 <      ServerInfo.ip6.ss.ss_family = res->ai_family;
3299 <      ServerInfo.ip6.ss_len = res->ai_addrlen;
3300 <      irc_freeaddrinfo(res);
3297 >      memcpy(&ConfigServerInfo.ip6, res->ai_addr, res->ai_addrlen);
3298 >      ConfigServerInfo.ip6.ss.ss_family = res->ai_family;
3299 >      ConfigServerInfo.ip6.ss_len = res->ai_addrlen;
3300 >      freeaddrinfo(res);
3301  
3302 <      ServerInfo.specific_ipv6_vhost = 1;
3302 >      ConfigServerInfo.specific_ipv6_vhost = 1;
3303      }
3304    }
3875 #endif
3305   }
3306 + #line 3307 "conf_parser.c" /* yacc.c:1646  */
3307      break;
3308  
3309 <  case 79:
3310 <
3881 < /* Line 1455 of yacc.c  */
3882 < #line 743 "ircd_parser.y"
3309 >  case 86:
3310 > #line 781 "conf_parser.y" /* yacc.c:1646  */
3311      {
3312 <  if (conf_parser_ctx.pass == 2)
3312 >  if (conf_parser_ctx.pass != 2)
3313 >    break;
3314 >
3315 >  if ((yyvsp[-1].number) < MAXCLIENTS_MIN)
3316    {
3317 <    recalc_fdlimit(NULL);
3317 >    char buf[IRCD_BUFSIZE] = "";
3318  
3319 <    if ((yyvsp[(3) - (4)].number) < MAXCLIENTS_MIN)
3320 <    {
3321 <      char buf[IRCD_BUFSIZE];
3891 <      ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
3892 <      yyerror(buf);
3893 <    }
3894 <    else if ((yyvsp[(3) - (4)].number) > MAXCLIENTS_MAX)
3895 <    {
3896 <      char buf[IRCD_BUFSIZE];
3897 <      ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
3898 <      yyerror(buf);
3899 <    }
3900 <    else
3901 <      ServerInfo.max_clients = (yyvsp[(3) - (4)].number);
3319 >    snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
3320 >    conf_error_report(buf);
3321 >    ConfigServerInfo.max_clients = MAXCLIENTS_MIN;
3322    }
3323 +  else if ((yyvsp[-1].number) > MAXCLIENTS_MAX)
3324 +  {
3325 +    char buf[IRCD_BUFSIZE] = "";
3326 +
3327 +    snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
3328 +    conf_error_report(buf);
3329 +    ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
3330 +  }
3331 +  else
3332 +    ConfigServerInfo.max_clients = (yyvsp[-1].number);
3333   }
3334 + #line 3335 "conf_parser.c" /* yacc.c:1646  */
3335      break;
3336  
3337 <  case 80:
3338 <
3908 < /* Line 1455 of yacc.c  */
3909 < #line 766 "ircd_parser.y"
3337 >  case 87:
3338 > #line 806 "conf_parser.y" /* yacc.c:1646  */
3339      {
3340 <  if (conf_parser_ctx.pass == 2)
3340 >  if (conf_parser_ctx.pass != 2)
3341 >    break;
3342 >
3343 >  if ((yyvsp[-1].number) < 9)
3344    {
3345 <    if (yylval.number)
3346 <    {
3347 <      ServerInfo.hub = 1;
3348 <      delete_capability("HUB");
3349 <      add_capability("HUB", CAP_HUB, 1);
3350 <    }
3919 <    else if (ServerInfo.hub)
3920 <    {
3345 >    conf_error_report("max_nick_length too low, setting to 9");
3346 >    ConfigServerInfo.max_nick_length = 9;
3347 >  }
3348 >  else if ((yyvsp[-1].number) > NICKLEN)
3349 >  {
3350 >    char buf[IRCD_BUFSIZE] = "";
3351  
3352 <      ServerInfo.hub = 0;
3353 <      delete_capability("HUB");
3354 <    }
3352 >    snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
3353 >    conf_error_report(buf);
3354 >    ConfigServerInfo.max_nick_length = NICKLEN;
3355    }
3356 +  else
3357 +    ConfigServerInfo.max_nick_length = (yyvsp[-1].number);
3358   }
3359 + #line 3360 "conf_parser.c" /* yacc.c:1646  */
3360      break;
3361  
3362    case 88:
3363 <
3931 < /* Line 1455 of yacc.c  */
3932 < #line 794 "ircd_parser.y"
3363 > #line 828 "conf_parser.y" /* yacc.c:1646  */
3364      {
3365 <  if (conf_parser_ctx.pass == 2)
3365 >  if (conf_parser_ctx.pass != 2)
3366 >    break;
3367 >
3368 >  if ((yyvsp[-1].number) < 80)
3369    {
3370 <    MyFree(AdminInfo.name);
3371 <    DupString(AdminInfo.name, yylval.string);
3370 >    conf_error_report("max_topic_length too low, setting to 80");
3371 >    ConfigServerInfo.max_topic_length = 80;
3372    }
3373 +  else if ((yyvsp[-1].number) > TOPICLEN)
3374 +  {
3375 +    char buf[IRCD_BUFSIZE] = "";
3376 +
3377 +    snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
3378 +    conf_error_report(buf);
3379 +    ConfigServerInfo.max_topic_length = TOPICLEN;
3380 +  }
3381 +  else
3382 +    ConfigServerInfo.max_topic_length = (yyvsp[-1].number);
3383   }
3384 + #line 3385 "conf_parser.c" /* yacc.c:1646  */
3385      break;
3386  
3387    case 89:
3388 <
3944 < /* Line 1455 of yacc.c  */
3945 < #line 803 "ircd_parser.y"
3388 > #line 850 "conf_parser.y" /* yacc.c:1646  */
3389      {
3390    if (conf_parser_ctx.pass == 2)
3391 <  {
3949 <    MyFree(AdminInfo.email);
3950 <    DupString(AdminInfo.email, yylval.string);
3951 <  }
3391 >    ConfigServerInfo.hub = yylval.number;
3392   }
3393 + #line 3394 "conf_parser.c" /* yacc.c:1646  */
3394      break;
3395  
3396 <  case 90:
3397 <
3957 < /* Line 1455 of yacc.c  */
3958 < #line 812 "ircd_parser.y"
3396 >  case 97:
3397 > #line 867 "conf_parser.y" /* yacc.c:1646  */
3398      {
3399 <  if (conf_parser_ctx.pass == 2)
3961 <  {
3962 <    MyFree(AdminInfo.description);
3963 <    DupString(AdminInfo.description, yylval.string);
3964 <  }
3965 < }
3399 >  if (conf_parser_ctx.pass != 2)
3400      break;
3401  
3402 <  case 107:
3402 >  MyFree(ConfigAdminInfo.name);
3403 >  ConfigAdminInfo.name = xstrdup(yylval.string);
3404 > }
3405 > #line 3406 "conf_parser.c" /* yacc.c:1646  */
3406 >    break;
3407  
3408 < /* Line 1455 of yacc.c  */
3409 < #line 839 "ircd_parser.y"
3408 >  case 98:
3409 > #line 876 "conf_parser.y" /* yacc.c:1646  */
3410      {
3411 <                        }
3411 >  if (conf_parser_ctx.pass != 2)
3412      break;
3413  
3414 <  case 108:
3414 >  MyFree(ConfigAdminInfo.email);
3415 >  ConfigAdminInfo.email = xstrdup(yylval.string);
3416 > }
3417 > #line 3418 "conf_parser.c" /* yacc.c:1646  */
3418 >    break;
3419  
3420 < /* Line 1455 of yacc.c  */
3421 < #line 843 "ircd_parser.y"
3420 >  case 99:
3421 > #line 885 "conf_parser.y" /* yacc.c:1646  */
3422      {
3423 <                        }
3423 >  if (conf_parser_ctx.pass != 2)
3424      break;
3425  
3426 <  case 109:
3427 <
3986 < /* Line 1455 of yacc.c  */
3987 < #line 847 "ircd_parser.y"
3988 <    {
3989 <  if (conf_parser_ctx.pass == 2)
3990 <    strlcpy(ConfigLoggingEntry.userlog, yylval.string,
3991 <            sizeof(ConfigLoggingEntry.userlog));
3426 >  MyFree(ConfigAdminInfo.description);
3427 >  ConfigAdminInfo.description = xstrdup(yylval.string);
3428   }
3429 + #line 3430 "conf_parser.c" /* yacc.c:1646  */
3430      break;
3431  
3432 <  case 110:
3433 <
3997 < /* Line 1455 of yacc.c  */
3998 < #line 854 "ircd_parser.y"
3432 >  case 100:
3433 > #line 897 "conf_parser.y" /* yacc.c:1646  */
3434      {
3435    if (conf_parser_ctx.pass == 2)
3436 <    strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
4002 <            sizeof(ConfigLoggingEntry.failed_operlog));
3436 >    reset_block_state();
3437   }
3438 + #line 3439 "conf_parser.c" /* yacc.c:1646  */
3439      break;
3440  
3441 <  case 111:
3442 <
4008 < /* Line 1455 of yacc.c  */
4009 < #line 861 "ircd_parser.y"
3441 >  case 101:
3442 > #line 901 "conf_parser.y" /* yacc.c:1646  */
3443      {
3444 <  if (conf_parser_ctx.pass == 2)
3445 <    strlcpy(ConfigLoggingEntry.operlog, yylval.string,
3446 <            sizeof(ConfigLoggingEntry.operlog));
4014 < }
3444 >  dlink_node *ptr = NULL;
3445 >
3446 >  if (conf_parser_ctx.pass != 2)
3447      break;
3448  
3449 <  case 112:
3449 >  if (!block_state.file.buf[0])
3450 >    break;
3451  
3452 < /* Line 1455 of yacc.c  */
3453 < #line 868 "ircd_parser.y"
4021 <    {
4022 <  if (conf_parser_ctx.pass == 2)
4023 <    strlcpy(ConfigLoggingEntry.operspylog, yylval.string,
4024 <            sizeof(ConfigLoggingEntry.operspylog));
3452 >  DLINK_FOREACH(ptr, block_state.mask.list.head)
3453 >    motd_add(ptr->data, block_state.file.buf);
3454   }
3455 + #line 3456 "conf_parser.c" /* yacc.c:1646  */
3456      break;
3457  
3458 <  case 113:
3459 <
4030 < /* Line 1455 of yacc.c  */
4031 < #line 875 "ircd_parser.y"
3458 >  case 107:
3459 > #line 918 "conf_parser.y" /* yacc.c:1646  */
3460      {
3461    if (conf_parser_ctx.pass == 2)
3462 <    strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
4035 <            sizeof(ConfigLoggingEntry.glinelog));
3462 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
3463   }
3464 + #line 3465 "conf_parser.c" /* yacc.c:1646  */
3465      break;
3466  
3467 <  case 114:
3468 <
4041 < /* Line 1455 of yacc.c  */
4042 < #line 882 "ircd_parser.y"
3467 >  case 108:
3468 > #line 924 "conf_parser.y" /* yacc.c:1646  */
3469      {
3470    if (conf_parser_ctx.pass == 2)
3471 <    strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
4046 <            sizeof(ConfigLoggingEntry.klinelog));
3471 >    strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3472   }
3473 + #line 3474 "conf_parser.c" /* yacc.c:1646  */
3474      break;
3475  
3476 <  case 115:
3477 <
4052 < /* Line 1455 of yacc.c  */
4053 < #line 889 "ircd_parser.y"
3476 >  case 109:
3477 > #line 933 "conf_parser.y" /* yacc.c:1646  */
3478      {
3479    if (conf_parser_ctx.pass == 2)
3480 <    strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
4057 <            sizeof(ConfigLoggingEntry.ioerrlog));
3480 >    reset_block_state();
3481   }
3482 + #line 3483 "conf_parser.c" /* yacc.c:1646  */
3483      break;
3484  
3485 <  case 116:
3486 <
4063 < /* Line 1455 of yacc.c  */
4064 < #line 896 "ircd_parser.y"
3485 >  case 110:
3486 > #line 937 "conf_parser.y" /* yacc.c:1646  */
3487      {
3488 <  if (conf_parser_ctx.pass == 2)
4067 <    strlcpy(ConfigLoggingEntry.killlog, yylval.string,
4068 <            sizeof(ConfigLoggingEntry.killlog));
4069 < }
3488 >  if (conf_parser_ctx.pass != 2)
3489      break;
3490  
3491 <  case 117:
3491 >  if (!block_state.command.buf[0] ||
3492 >      !block_state.name.buf[0] ||
3493 >      !block_state.nick.buf[0] ||
3494 >      !block_state.host.buf[0])
3495 >    break;
3496  
3497 < /* Line 1455 of yacc.c  */
3498 < #line 903 "ircd_parser.y"
4076 <    {
4077 <  if (conf_parser_ctx.pass == 2)
4078 <    set_log_level(L_CRIT);
3497 >  pseudo_register(block_state.name.buf, block_state.nick.buf, block_state.host.buf,
3498 >                  block_state.prepend.buf, block_state.command.buf);
3499   }
3500 + #line 3501 "conf_parser.c" /* yacc.c:1646  */
3501      break;
3502  
3503    case 118:
3504 <
4084 < /* Line 1455 of yacc.c  */
4085 < #line 907 "ircd_parser.y"
3504 > #line 955 "conf_parser.y" /* yacc.c:1646  */
3505      {
3506    if (conf_parser_ctx.pass == 2)
3507 <    set_log_level(L_ERROR);
3507 >    strlcpy(block_state.command.buf, yylval.string, sizeof(block_state.command.buf));
3508   }
3509 + #line 3510 "conf_parser.c" /* yacc.c:1646  */
3510      break;
3511  
3512    case 119:
3513 <
4094 < /* Line 1455 of yacc.c  */
4095 < #line 911 "ircd_parser.y"
3513 > #line 961 "conf_parser.y" /* yacc.c:1646  */
3514      {
3515    if (conf_parser_ctx.pass == 2)
3516 <    set_log_level(L_WARN);
3516 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
3517   }
3518 + #line 3519 "conf_parser.c" /* yacc.c:1646  */
3519      break;
3520  
3521    case 120:
3522 <
4104 < /* Line 1455 of yacc.c  */
4105 < #line 915 "ircd_parser.y"
3522 > #line 967 "conf_parser.y" /* yacc.c:1646  */
3523      {
3524    if (conf_parser_ctx.pass == 2)
3525 <    set_log_level(L_NOTICE);
3525 >    strlcpy(block_state.prepend.buf, yylval.string, sizeof(block_state.prepend.buf));
3526   }
3527 + #line 3528 "conf_parser.c" /* yacc.c:1646  */
3528      break;
3529  
3530    case 121:
3531 <
4114 < /* Line 1455 of yacc.c  */
4115 < #line 919 "ircd_parser.y"
3531 > #line 973 "conf_parser.y" /* yacc.c:1646  */
3532      {
3533    if (conf_parser_ctx.pass == 2)
3534 <    set_log_level(L_TRACE);
3535 < }
4120 <    break;
3534 >  {
3535 >    struct split_nuh_item nuh;
3536  
3537 <  case 122:
3537 >    nuh.nuhmask  = yylval.string;
3538 >    nuh.nickptr  = NULL;
3539 >    nuh.userptr  = block_state.user.buf;
3540 >    nuh.hostptr  = block_state.host.buf;
3541 >    nuh.nicksize = 0;
3542 >    nuh.usersize = sizeof(block_state.nick.buf);
3543 >    nuh.hostsize = sizeof(block_state.host.buf);
3544 >    split_nuh(&nuh);
3545  
3546 < /* Line 1455 of yacc.c  */
3547 < #line 923 "ircd_parser.y"
3548 <    {
4127 <  if (conf_parser_ctx.pass == 2)
4128 <    set_log_level(L_INFO);
3546 >    strlcpy(block_state.nick.buf, nuh.userptr, sizeof(block_state.nick.buf));
3547 >    strlcpy(block_state.host.buf, nuh.hostptr, sizeof(block_state.host.buf));
3548 >  }
3549   }
3550 + #line 3551 "conf_parser.c" /* yacc.c:1646  */
3551      break;
3552  
3553 <  case 123:
3554 <
4134 < /* Line 1455 of yacc.c  */
4135 < #line 927 "ircd_parser.y"
3553 >  case 128:
3554 > #line 1002 "conf_parser.y" /* yacc.c:1646  */
3555      {
3556    if (conf_parser_ctx.pass == 2)
3557 <    set_log_level(L_DEBUG);
3557 >    ConfigLog.use_logging = yylval.number;
3558   }
3559 + #line 3560 "conf_parser.c" /* yacc.c:1646  */
3560      break;
3561  
3562 <  case 124:
3563 <
4144 < /* Line 1455 of yacc.c  */
4145 < #line 933 "ircd_parser.y"
3562 >  case 129:
3563 > #line 1008 "conf_parser.y" /* yacc.c:1646  */
3564      {
3565    if (conf_parser_ctx.pass == 2)
3566 <    ConfigLoggingEntry.use_logging = yylval.number;
3566 >    reset_block_state();
3567   }
3568 + #line 3569 "conf_parser.c" /* yacc.c:1646  */
3569      break;
3570  
3571 <  case 125:
3572 <
4154 < /* Line 1455 of yacc.c  */
4155 < #line 942 "ircd_parser.y"
3571 >  case 130:
3572 > #line 1012 "conf_parser.y" /* yacc.c:1646  */
3573      {
3574 <  if (conf_parser_ctx.pass == 2)
4158 <  {
4159 <    yy_conf = make_conf_item(OPER_TYPE);
4160 <    yy_aconf = map_to_conf(yy_conf);
4161 <    SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
4162 <  }
4163 <  else
4164 <  {
4165 <    MyFree(class_name);
4166 <    class_name = NULL;
4167 <  }
4168 < }
3574 >  if (conf_parser_ctx.pass != 2)
3575      break;
3576  
3577 <  case 126:
3577 >  if (block_state.type.value && block_state.file.buf[0])
3578 >    log_set_file(block_state.type.value, block_state.size.value,
3579 >                 block_state.file.buf);
3580 > }
3581 > #line 3582 "conf_parser.c" /* yacc.c:1646  */
3582 >    break;
3583  
3584 < /* Line 1455 of yacc.c  */
3585 < #line 955 "ircd_parser.y"
3584 >  case 137:
3585 > #line 1028 "conf_parser.y" /* yacc.c:1646  */
3586      {
3587 <  if (conf_parser_ctx.pass == 2)
3588 <  {
4178 <    struct CollectItem *yy_tmp;
4179 <    dlink_node *ptr;
4180 <    dlink_node *next_ptr;
4181 <
4182 <    conf_add_class_to_conf(yy_conf, class_name);
3587 >  if (conf_parser_ctx.pass != 2)
3588 >    break;
3589  
3590 <    /* Now, make sure there is a copy of the "base" given oper
3591 <     * block in each of the collected copies
3592 <     */
3590 >  strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3591 > }
3592 > #line 3593 "conf_parser.c" /* yacc.c:1646  */
3593 >    break;
3594  
3595 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3595 >  case 138:
3596 > #line 1036 "conf_parser.y" /* yacc.c:1646  */
3597      {
3598 <      struct AccessItem *new_aconf;
4191 <      struct ConfItem *new_conf;
4192 <      yy_tmp = ptr->data;
4193 <
4194 <      new_conf = make_conf_item(OPER_TYPE);
4195 <      new_aconf = (struct AccessItem *)map_to_conf(new_conf);
4196 <
4197 <      new_aconf->flags = yy_aconf->flags;
4198 <
4199 <      if (yy_conf->name != NULL)
4200 <        DupString(new_conf->name, yy_conf->name);
4201 <      if (yy_tmp->user != NULL)
4202 <        DupString(new_aconf->user, yy_tmp->user);
4203 <      else
4204 <        DupString(new_aconf->user, "*");
4205 <      if (yy_tmp->host != NULL)
4206 <        DupString(new_aconf->host, yy_tmp->host);
4207 <      else
4208 <        DupString(new_aconf->host, "*");
4209 <      conf_add_class_to_conf(new_conf, class_name);
4210 <      if (yy_aconf->passwd != NULL)
4211 <        DupString(new_aconf->passwd, yy_aconf->passwd);
4212 <
4213 <      new_aconf->port = yy_aconf->port;
4214 < #ifdef HAVE_LIBCRYPTO
4215 <      if (yy_aconf->rsa_public_key_file != NULL)
4216 <      {
4217 <        BIO *file;
4218 <
4219 <        DupString(new_aconf->rsa_public_key_file,
4220 <                  yy_aconf->rsa_public_key_file);
4221 <
4222 <        file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
4223 <        new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
4224 <                                                           NULL, 0, NULL);
4225 <        BIO_set_close(file, BIO_CLOSE);
4226 <        BIO_free(file);
4227 <      }
4228 < #endif
4229 <
4230 < #ifdef HAVE_LIBCRYPTO
4231 <      if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
4232 <          && yy_tmp->host)
4233 < #else
4234 <      if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
4235 < #endif
4236 <      {
4237 <        conf_add_class_to_conf(new_conf, class_name);
4238 <        if (yy_tmp->name != NULL)
4239 <          DupString(new_conf->name, yy_tmp->name);
4240 <      }
4241 <
4242 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
4243 <      free_collect_item(yy_tmp);
4244 <    }
4245 <
4246 <    yy_conf = NULL;
4247 <    yy_aconf = NULL;
4248 <
4249 <
4250 <    MyFree(class_name);
4251 <    class_name = NULL;
4252 <  }
3598 >  block_state.size.value = (yyvsp[-1].number);
3599   }
3600 + #line 3601 "conf_parser.c" /* yacc.c:1646  */
3601      break;
3602  
3603 <  case 154:
3604 <
4258 < /* Line 1455 of yacc.c  */
4259 < #line 1047 "ircd_parser.y"
3603 >  case 139:
3604 > #line 1039 "conf_parser.y" /* yacc.c:1646  */
3605      {
3606 <  if (conf_parser_ctx.pass == 2)
4262 <  {
4263 <    if (strlen(yylval.string) > OPERNICKLEN)
4264 <      yylval.string[OPERNICKLEN] = '\0';
4265 <
4266 <    MyFree(yy_conf->name);
4267 <    DupString(yy_conf->name, yylval.string);
4268 <  }
3606 >  block_state.size.value = 0;
3607   }
3608 + #line 3609 "conf_parser.c" /* yacc.c:1646  */
3609      break;
3610  
3611 <  case 155:
3612 <
4274 < /* Line 1455 of yacc.c  */
4275 < #line 1059 "ircd_parser.y"
3611 >  case 140:
3612 > #line 1044 "conf_parser.y" /* yacc.c:1646  */
3613      {
3614    if (conf_parser_ctx.pass == 2)
3615 <  {
4279 <    if (strlen(yylval.string) > OPERNICKLEN)
4280 <      yylval.string[OPERNICKLEN] = '\0';
4281 <
4282 <    MyFree(yy_conf->name);
4283 <    DupString(yy_conf->name, yylval.string);
4284 <  }
3615 >    block_state.type.value = 0;
3616   }
3617 + #line 3618 "conf_parser.c" /* yacc.c:1646  */
3618      break;
3619  
3620 <  case 156:
3621 <
4290 < /* Line 1455 of yacc.c  */
4291 < #line 1071 "ircd_parser.y"
3620 >  case 144:
3621 > #line 1051 "conf_parser.y" /* yacc.c:1646  */
3622      {
3623    if (conf_parser_ctx.pass == 2)
3624 <  {
4295 <    struct split_nuh_item nuh;
4296 <
4297 <    nuh.nuhmask  = yylval.string;
4298 <    nuh.nickptr  = NULL;
4299 <    nuh.userptr  = userbuf;
4300 <    nuh.hostptr  = hostbuf;
4301 <
4302 <    nuh.nicksize = 0;
4303 <    nuh.usersize = sizeof(userbuf);
4304 <    nuh.hostsize = sizeof(hostbuf);
4305 <
4306 <    split_nuh(&nuh);
4307 <
4308 <    if (yy_aconf->user == NULL)
4309 <    {
4310 <      DupString(yy_aconf->user, userbuf);
4311 <      DupString(yy_aconf->host, hostbuf);
4312 <    }
4313 <    else
4314 <    {
4315 <      struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
4316 <
4317 <      DupString(yy_tmp->user, userbuf);
4318 <      DupString(yy_tmp->host, hostbuf);
4319 <
4320 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
4321 <    }
4322 <  }
3624 >    block_state.type.value = LOG_TYPE_USER;
3625   }
3626 + #line 3627 "conf_parser.c" /* yacc.c:1646  */
3627      break;
3628  
3629 <  case 157:
3630 <
4328 < /* Line 1455 of yacc.c  */
4329 < #line 1105 "ircd_parser.y"
3629 >  case 145:
3630 > #line 1055 "conf_parser.y" /* yacc.c:1646  */
3631      {
3632    if (conf_parser_ctx.pass == 2)
3633 <  {
4333 <    if (yy_aconf->passwd != NULL)
4334 <      memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
4335 <
4336 <    MyFree(yy_aconf->passwd);
4337 <    DupString(yy_aconf->passwd, yylval.string);
4338 <  }
3633 >    block_state.type.value = LOG_TYPE_OPER;
3634   }
3635 + #line 3636 "conf_parser.c" /* yacc.c:1646  */
3636      break;
3637  
3638 <  case 158:
3639 <
4344 < /* Line 1455 of yacc.c  */
4345 < #line 1117 "ircd_parser.y"
3638 >  case 146:
3639 > #line 1059 "conf_parser.y" /* yacc.c:1646  */
3640      {
3641    if (conf_parser_ctx.pass == 2)
3642 <  {
4349 <    if (yylval.number)
4350 <      SetConfEncrypted(yy_aconf);
4351 <    else
4352 <      ClearConfEncrypted(yy_aconf);
4353 <  }
3642 >    block_state.type.value = LOG_TYPE_GLINE;
3643   }
3644 + #line 3645 "conf_parser.c" /* yacc.c:1646  */
3645      break;
3646  
3647 <  case 159:
3648 <
4359 < /* Line 1455 of yacc.c  */
4360 < #line 1128 "ircd_parser.y"
3647 >  case 147:
3648 > #line 1063 "conf_parser.y" /* yacc.c:1646  */
3649      {
4362 #ifdef HAVE_LIBCRYPTO
3650    if (conf_parser_ctx.pass == 2)
3651 <  {
4365 <    BIO *file;
4366 <
4367 <    if (yy_aconf->rsa_public_key != NULL)
4368 <    {
4369 <      RSA_free(yy_aconf->rsa_public_key);
4370 <      yy_aconf->rsa_public_key = NULL;
4371 <    }
4372 <
4373 <    if (yy_aconf->rsa_public_key_file != NULL)
4374 <    {
4375 <      MyFree(yy_aconf->rsa_public_key_file);
4376 <      yy_aconf->rsa_public_key_file = NULL;
4377 <    }
4378 <
4379 <    DupString(yy_aconf->rsa_public_key_file, yylval.string);
4380 <    file = BIO_new_file(yylval.string, "r");
4381 <
4382 <    if (file == NULL)
4383 <    {
4384 <      yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
4385 <      break;
4386 <    }
4387 <
4388 <    yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
4389 <
4390 <    if (yy_aconf->rsa_public_key == NULL)
4391 <    {
4392 <      yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
4393 <      break;
4394 <    }
4395 <
4396 <    BIO_set_close(file, BIO_CLOSE);
4397 <    BIO_free(file);
4398 <  }
4399 < #endif /* HAVE_LIBCRYPTO */
3651 >    block_state.type.value = LOG_TYPE_XLINE;
3652   }
3653 + #line 3654 "conf_parser.c" /* yacc.c:1646  */
3654      break;
3655  
3656 <  case 160:
3657 <
4405 < /* Line 1455 of yacc.c  */
4406 < #line 1170 "ircd_parser.y"
3656 >  case 148:
3657 > #line 1067 "conf_parser.y" /* yacc.c:1646  */
3658      {
3659    if (conf_parser_ctx.pass == 2)
3660 <  {
4410 <    MyFree(class_name);
4411 <    DupString(class_name, yylval.string);
4412 <  }
3660 >    block_state.type.value = LOG_TYPE_RESV;
3661   }
3662 + #line 3663 "conf_parser.c" /* yacc.c:1646  */
3663      break;
3664  
3665 <  case 161:
3666 <
4418 < /* Line 1455 of yacc.c  */
4419 < #line 1179 "ircd_parser.y"
3665 >  case 149:
3666 > #line 1071 "conf_parser.y" /* yacc.c:1646  */
3667      {
3668    if (conf_parser_ctx.pass == 2)
3669 <    yy_aconf->modes = 0;
3669 >    block_state.type.value = LOG_TYPE_DLINE;
3670   }
3671 + #line 3672 "conf_parser.c" /* yacc.c:1646  */
3672      break;
3673  
3674 <  case 165:
3675 <
4428 < /* Line 1455 of yacc.c  */
4429 < #line 1186 "ircd_parser.y"
3674 >  case 150:
3675 > #line 1075 "conf_parser.y" /* yacc.c:1646  */
3676      {
3677    if (conf_parser_ctx.pass == 2)
3678 <    yy_aconf->modes |= UMODE_BOTS;
3678 >    block_state.type.value = LOG_TYPE_KLINE;
3679   }
3680 + #line 3681 "conf_parser.c" /* yacc.c:1646  */
3681      break;
3682  
3683 <  case 166:
3684 <
4438 < /* Line 1455 of yacc.c  */
4439 < #line 1190 "ircd_parser.y"
3683 >  case 151:
3684 > #line 1079 "conf_parser.y" /* yacc.c:1646  */
3685      {
3686    if (conf_parser_ctx.pass == 2)
3687 <    yy_aconf->modes |= UMODE_CCONN;
3687 >    block_state.type.value = LOG_TYPE_KILL;
3688   }
3689 + #line 3690 "conf_parser.c" /* yacc.c:1646  */
3690      break;
3691  
3692 <  case 167:
3693 <
4448 < /* Line 1455 of yacc.c  */
4449 < #line 1194 "ircd_parser.y"
3692 >  case 152:
3693 > #line 1083 "conf_parser.y" /* yacc.c:1646  */
3694      {
3695    if (conf_parser_ctx.pass == 2)
3696 <    yy_aconf->modes |= UMODE_CCONN_FULL;
3696 >    block_state.type.value = LOG_TYPE_DEBUG;
3697   }
3698 + #line 3699 "conf_parser.c" /* yacc.c:1646  */
3699      break;
3700  
3701 <  case 168:
3702 <
4458 < /* Line 1455 of yacc.c  */
4459 < #line 1198 "ircd_parser.y"
3701 >  case 153:
3702 > #line 1093 "conf_parser.y" /* yacc.c:1646  */
3703      {
3704 <  if (conf_parser_ctx.pass == 2)
4462 <    yy_aconf->modes |= UMODE_DEAF;
4463 < }
3704 >  if (conf_parser_ctx.pass != 2)
3705      break;
3706  
3707 <  case 169:
3707 >  reset_block_state();
3708 >  block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
3709 > }
3710 > #line 3711 "conf_parser.c" /* yacc.c:1646  */
3711 >    break;
3712  
3713 < /* Line 1455 of yacc.c  */
3714 < #line 1202 "ircd_parser.y"
3713 >  case 154:
3714 > #line 1100 "conf_parser.y" /* yacc.c:1646  */
3715      {
3716 <  if (conf_parser_ctx.pass == 2)
3717 <    yy_aconf->modes |= UMODE_DEBUG;
3718 < }
3716 >  dlink_node *ptr = NULL;
3717 >
3718 >  if (conf_parser_ctx.pass != 2)
3719      break;
3720  
3721 <  case 170:
3721 >  if (!block_state.name.buf[0])
3722 >    break;
3723 > #ifdef HAVE_LIBCRYPTO
3724 >  if (!block_state.file.buf[0] &&
3725 >      !block_state.rpass.buf[0])
3726 >    break;
3727 > #else
3728 >  if (!block_state.rpass.buf[0])
3729 >    break;
3730 > #endif
3731 >
3732 >  DLINK_FOREACH(ptr, block_state.mask.list.head)
3733 >  {
3734 >    struct MaskItem *conf = NULL;
3735 >    struct split_nuh_item nuh;
3736 >
3737 >    nuh.nuhmask  = ptr->data;
3738 >    nuh.nickptr  = NULL;
3739 >    nuh.userptr  = block_state.user.buf;
3740 >    nuh.hostptr  = block_state.host.buf;
3741 >    nuh.nicksize = 0;
3742 >    nuh.usersize = sizeof(block_state.user.buf);
3743 >    nuh.hostsize = sizeof(block_state.host.buf);
3744 >    split_nuh(&nuh);
3745 >
3746 >    conf         = conf_make(CONF_OPER);
3747 >    conf->name   = xstrdup(block_state.name.buf);
3748 >    conf->user   = xstrdup(block_state.user.buf);
3749 >    conf->host   = xstrdup(block_state.host.buf);
3750 >
3751 >    if (block_state.cert.buf[0])
3752 >      conf->certfp = xstrdup(block_state.cert.buf);
3753 >
3754 >    if (block_state.rpass.buf[0])
3755 >      conf->passwd = xstrdup(block_state.rpass.buf);
3756 >
3757 >    conf->flags = block_state.flags.value;
3758 >    conf->modes = block_state.modes.value;
3759 >    conf->port  = block_state.port.value;
3760 >    conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
3761  
3762 < /* Line 1455 of yacc.c  */
3763 < #line 1206 "ircd_parser.y"
3762 >    conf_add_class_to_conf(conf, block_state.class.buf);
3763 >
3764 > #ifdef HAVE_LIBCRYPTO
3765 >    if (block_state.file.buf[0])
3766      {
3767 <  if (conf_parser_ctx.pass == 2)
3768 <    yy_aconf->modes |= UMODE_FULL;
3767 >      BIO *file = NULL;
3768 >      RSA *pkey = NULL;
3769 >
3770 >      if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
3771 >      {
3772 >        ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- file doesn't exist");
3773 >        break;
3774 >      }
3775 >
3776 >      if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
3777 >        ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key invalid; check key syntax");
3778 >      else
3779 >      {
3780 >        if (RSA_size(pkey) > 128)
3781 >          ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key size must be 1024 or below");
3782 >        else
3783 >          conf->rsa_public_key = pkey;
3784 >      }
3785 >
3786 >      BIO_set_close(file, BIO_CLOSE);
3787 >      BIO_free(file);
3788 >    }
3789 > #endif /* HAVE_LIBCRYPTO */
3790 >  }
3791   }
3792 + #line 3793 "conf_parser.c" /* yacc.c:1646  */
3793      break;
3794  
3795 <  case 171:
3796 <
4488 < /* Line 1455 of yacc.c  */
4489 < #line 1210 "ircd_parser.y"
3795 >  case 168:
3796 > #line 1192 "conf_parser.y" /* yacc.c:1646  */
3797      {
3798    if (conf_parser_ctx.pass == 2)
3799 <    yy_aconf->modes |= UMODE_SKILL;
3799 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
3800   }
3801 + #line 3802 "conf_parser.c" /* yacc.c:1646  */
3802      break;
3803  
3804 <  case 172:
3805 <
4498 < /* Line 1455 of yacc.c  */
4499 < #line 1214 "ircd_parser.y"
3804 >  case 169:
3805 > #line 1198 "conf_parser.y" /* yacc.c:1646  */
3806      {
3807    if (conf_parser_ctx.pass == 2)
3808 <    yy_aconf->modes |= UMODE_NCHANGE;
3808 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
3809   }
3810 + #line 3811 "conf_parser.c" /* yacc.c:1646  */
3811      break;
3812  
3813 <  case 173:
3814 <
4508 < /* Line 1455 of yacc.c  */
4509 < #line 1218 "ircd_parser.y"
3813 >  case 170:
3814 > #line 1204 "conf_parser.y" /* yacc.c:1646  */
3815      {
3816    if (conf_parser_ctx.pass == 2)
3817 <    yy_aconf->modes |= UMODE_REJ;
3817 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
3818   }
3819 + #line 3820 "conf_parser.c" /* yacc.c:1646  */
3820      break;
3821  
3822 <  case 174:
3823 <
4518 < /* Line 1455 of yacc.c  */
4519 < #line 1222 "ircd_parser.y"
3822 >  case 171:
3823 > #line 1210 "conf_parser.y" /* yacc.c:1646  */
3824      {
3825 <  if (conf_parser_ctx.pass == 2)
4522 <    yy_aconf->modes |= UMODE_UNAUTH;
4523 < }
3825 >  if (conf_parser_ctx.pass != 2)
3826      break;
3827  
3828 <  case 175:
3828 >  if (yylval.number)
3829 >    block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
3830 >  else
3831 >    block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
3832 > }
3833 > #line 3834 "conf_parser.c" /* yacc.c:1646  */
3834 >    break;
3835  
3836 < /* Line 1455 of yacc.c  */
3837 < #line 1226 "ircd_parser.y"
3836 >  case 172:
3837 > #line 1221 "conf_parser.y" /* yacc.c:1646  */
3838      {
3839    if (conf_parser_ctx.pass == 2)
3840 <    yy_aconf->modes |= UMODE_SPY;
3840 >    strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3841   }
3842 + #line 3843 "conf_parser.c" /* yacc.c:1646  */
3843      break;
3844  
3845 <  case 176:
3846 <
4538 < /* Line 1455 of yacc.c  */
4539 < #line 1230 "ircd_parser.y"
3845 >  case 173:
3846 > #line 1227 "conf_parser.y" /* yacc.c:1646  */
3847      {
3848    if (conf_parser_ctx.pass == 2)
3849 <    yy_aconf->modes |= UMODE_EXTERNAL;
3849 >    strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
3850   }
3851 + #line 3852 "conf_parser.c" /* yacc.c:1646  */
3852      break;
3853  
3854 <  case 177:
3855 <
4548 < /* Line 1455 of yacc.c  */
4549 < #line 1234 "ircd_parser.y"
3854 >  case 174:
3855 > #line 1233 "conf_parser.y" /* yacc.c:1646  */
3856      {
3857 <  if (conf_parser_ctx.pass == 2)
4552 <    yy_aconf->modes |= UMODE_OPERWALL;
4553 < }
3857 >  if (conf_parser_ctx.pass != 2)
3858      break;
3859  
3860 <  case 178:
3860 >  if (yylval.number)
3861 >    block_state.flags.value |= CONF_FLAGS_SSL;
3862 >  else
3863 >    block_state.flags.value &= ~CONF_FLAGS_SSL;
3864 > }
3865 > #line 3866 "conf_parser.c" /* yacc.c:1646  */
3866 >    break;
3867  
3868 < /* Line 1455 of yacc.c  */
3869 < #line 1238 "ircd_parser.y"
3868 >  case 175:
3869 > #line 1244 "conf_parser.y" /* yacc.c:1646  */
3870      {
3871    if (conf_parser_ctx.pass == 2)
3872 <    yy_aconf->modes |= UMODE_SERVNOTICE;
3872 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
3873   }
3874 + #line 3875 "conf_parser.c" /* yacc.c:1646  */
3875      break;
3876  
3877 <  case 179:
3878 <
4568 < /* Line 1455 of yacc.c  */
4569 < #line 1242 "ircd_parser.y"
3877 >  case 176:
3878 > #line 1250 "conf_parser.y" /* yacc.c:1646  */
3879      {
3880    if (conf_parser_ctx.pass == 2)
3881 <    yy_aconf->modes |= UMODE_INVISIBLE;
3881 >    block_state.modes.value = 0;
3882   }
3883 + #line 3884 "conf_parser.c" /* yacc.c:1646  */
3884      break;
3885  
3886    case 180:
3887 <
4578 < /* Line 1455 of yacc.c  */
4579 < #line 1246 "ircd_parser.y"
3887 > #line 1257 "conf_parser.y" /* yacc.c:1646  */
3888      {
3889    if (conf_parser_ctx.pass == 2)
3890 <    yy_aconf->modes |= UMODE_WALLOP;
3890 >    block_state.modes.value |= UMODE_BOTS;
3891   }
3892 + #line 3893 "conf_parser.c" /* yacc.c:1646  */
3893      break;
3894  
3895    case 181:
3896 <
4588 < /* Line 1455 of yacc.c  */
4589 < #line 1250 "ircd_parser.y"
3896 > #line 1261 "conf_parser.y" /* yacc.c:1646  */
3897      {
3898    if (conf_parser_ctx.pass == 2)
3899 <    yy_aconf->modes |= UMODE_SOFTCALLERID;
3899 >    block_state.modes.value |= UMODE_CCONN;
3900   }
3901 + #line 3902 "conf_parser.c" /* yacc.c:1646  */
3902      break;
3903  
3904    case 182:
3905 <
4598 < /* Line 1455 of yacc.c  */
4599 < #line 1254 "ircd_parser.y"
3905 > #line 1265 "conf_parser.y" /* yacc.c:1646  */
3906      {
3907    if (conf_parser_ctx.pass == 2)
3908 <    yy_aconf->modes |= UMODE_CALLERID;
3908 >    block_state.modes.value |= UMODE_DEAF;
3909   }
3910 + #line 3911 "conf_parser.c" /* yacc.c:1646  */
3911      break;
3912  
3913    case 183:
3914 <
4608 < /* Line 1455 of yacc.c  */
4609 < #line 1258 "ircd_parser.y"
3914 > #line 1269 "conf_parser.y" /* yacc.c:1646  */
3915      {
3916    if (conf_parser_ctx.pass == 2)
3917 <    yy_aconf->modes |= UMODE_LOCOPS;
3917 >    block_state.modes.value |= UMODE_DEBUG;
3918   }
3919 + #line 3920 "conf_parser.c" /* yacc.c:1646  */
3920      break;
3921  
3922    case 184:
3923 <
4618 < /* Line 1455 of yacc.c  */
4619 < #line 1264 "ircd_parser.y"
3923 > #line 1273 "conf_parser.y" /* yacc.c:1646  */
3924      {
3925    if (conf_parser_ctx.pass == 2)
3926 <  {
4623 <    if (yylval.number)
4624 <      yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
4625 <    else
4626 <      yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
4627 <  }
3926 >    block_state.modes.value |= UMODE_FULL;
3927   }
3928 + #line 3929 "conf_parser.c" /* yacc.c:1646  */
3929      break;
3930  
3931    case 185:
3932 <
4633 < /* Line 1455 of yacc.c  */
4634 < #line 1275 "ircd_parser.y"
3932 > #line 1277 "conf_parser.y" /* yacc.c:1646  */
3933      {
3934    if (conf_parser_ctx.pass == 2)
3935 <  {
4638 <    if (yylval.number)
4639 <      yy_aconf->port |= OPER_FLAG_REMOTE;
4640 <    else
4641 <      yy_aconf->port &= ~OPER_FLAG_REMOTE;
4642 <  }
3935 >    block_state.modes.value |= UMODE_HIDDEN;
3936   }
3937 + #line 3938 "conf_parser.c" /* yacc.c:1646  */
3938      break;
3939  
3940    case 186:
3941 <
4648 < /* Line 1455 of yacc.c  */
4649 < #line 1286 "ircd_parser.y"
3941 > #line 1281 "conf_parser.y" /* yacc.c:1646  */
3942      {
3943    if (conf_parser_ctx.pass == 2)
3944 <  {
4653 <    if (yylval.number)
4654 <      yy_aconf->port |= OPER_FLAG_REMOTEBAN;
4655 <    else
4656 <      yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
4657 <  }
3944 >    block_state.modes.value |= UMODE_HIDECHANS;
3945   }
3946 + #line 3947 "conf_parser.c" /* yacc.c:1646  */
3947      break;
3948  
3949    case 187:
3950 <
4663 < /* Line 1455 of yacc.c  */
4664 < #line 1297 "ircd_parser.y"
3950 > #line 1285 "conf_parser.y" /* yacc.c:1646  */
3951      {
3952    if (conf_parser_ctx.pass == 2)
3953 <  {
4668 <    if (yylval.number)
4669 <      yy_aconf->port |= OPER_FLAG_K;
4670 <    else
4671 <      yy_aconf->port &= ~OPER_FLAG_K;
4672 <  }
3953 >    block_state.modes.value |= UMODE_HIDEIDLE;
3954   }
3955 + #line 3956 "conf_parser.c" /* yacc.c:1646  */
3956      break;
3957  
3958    case 188:
3959 <
4678 < /* Line 1455 of yacc.c  */
4679 < #line 1308 "ircd_parser.y"
3959 > #line 1289 "conf_parser.y" /* yacc.c:1646  */
3960      {
3961    if (conf_parser_ctx.pass == 2)
3962 <  {
4683 <    if (yylval.number)
4684 <      yy_aconf->port |= OPER_FLAG_X;
4685 <    else
4686 <      yy_aconf->port &= ~OPER_FLAG_X;
4687 <  }
3962 >    block_state.modes.value |= UMODE_SKILL;
3963   }
3964 + #line 3965 "conf_parser.c" /* yacc.c:1646  */
3965      break;
3966  
3967    case 189:
3968 <
4693 < /* Line 1455 of yacc.c  */
4694 < #line 1319 "ircd_parser.y"
3968 > #line 1293 "conf_parser.y" /* yacc.c:1646  */
3969      {
3970    if (conf_parser_ctx.pass == 2)
3971 <  {
4698 <    if (yylval.number)
4699 <      yy_aconf->port |= OPER_FLAG_UNKLINE;
4700 <    else
4701 <      yy_aconf->port &= ~OPER_FLAG_UNKLINE;
4702 <  }
3971 >    block_state.modes.value |= UMODE_NCHANGE;
3972   }
3973 + #line 3974 "conf_parser.c" /* yacc.c:1646  */
3974      break;
3975  
3976    case 190:
3977 <
4708 < /* Line 1455 of yacc.c  */
4709 < #line 1330 "ircd_parser.y"
3977 > #line 1297 "conf_parser.y" /* yacc.c:1646  */
3978      {
3979    if (conf_parser_ctx.pass == 2)
3980 <  {
4713 <    if (yylval.number)
4714 <      yy_aconf->port |= OPER_FLAG_GLINE;
4715 <    else
4716 <      yy_aconf->port &= ~OPER_FLAG_GLINE;
4717 <  }
3980 >    block_state.modes.value |= UMODE_REJ;
3981   }
3982 + #line 3983 "conf_parser.c" /* yacc.c:1646  */
3983      break;
3984  
3985    case 191:
3986 <
4723 < /* Line 1455 of yacc.c  */
4724 < #line 1341 "ircd_parser.y"
3986 > #line 1301 "conf_parser.y" /* yacc.c:1646  */
3987      {
3988    if (conf_parser_ctx.pass == 2)
3989 <  {
4728 <    if (yylval.number)
4729 <      yy_aconf->port |= OPER_FLAG_N;
4730 <    else
4731 <      yy_aconf->port &= ~OPER_FLAG_N;
4732 <  }
3989 >    block_state.modes.value |= UMODE_UNAUTH;
3990   }
3991 + #line 3992 "conf_parser.c" /* yacc.c:1646  */
3992      break;
3993  
3994    case 192:
3995 <
4738 < /* Line 1455 of yacc.c  */
4739 < #line 1352 "ircd_parser.y"
3995 > #line 1305 "conf_parser.y" /* yacc.c:1646  */
3996      {
3997    if (conf_parser_ctx.pass == 2)
3998 <  {
4743 <    if (yylval.number)
4744 <      yy_aconf->port |= OPER_FLAG_DIE;
4745 <    else
4746 <      yy_aconf->port &= ~OPER_FLAG_DIE;
4747 <  }
3998 >    block_state.modes.value |= UMODE_SPY;
3999   }
4000 + #line 4001 "conf_parser.c" /* yacc.c:1646  */
4001      break;
4002  
4003    case 193:
4004 <
4753 < /* Line 1455 of yacc.c  */
4754 < #line 1363 "ircd_parser.y"
4004 > #line 1309 "conf_parser.y" /* yacc.c:1646  */
4005      {
4006    if (conf_parser_ctx.pass == 2)
4007 <  {
4758 <    if (yylval.number)
4759 <      yy_aconf->port |= OPER_FLAG_REHASH;
4760 <    else
4761 <      yy_aconf->port &= ~OPER_FLAG_REHASH;
4762 <  }
4007 >    block_state.modes.value |= UMODE_EXTERNAL;
4008   }
4009 + #line 4010 "conf_parser.c" /* yacc.c:1646  */
4010      break;
4011  
4012    case 194:
4013 <
4768 < /* Line 1455 of yacc.c  */
4769 < #line 1374 "ircd_parser.y"
4013 > #line 1313 "conf_parser.y" /* yacc.c:1646  */
4014      {
4015    if (conf_parser_ctx.pass == 2)
4016 <  {
4773 <    if (yylval.number)
4774 <      yy_aconf->port |= OPER_FLAG_ADMIN;
4775 <    else
4776 <      yy_aconf->port &= ~OPER_FLAG_ADMIN;
4777 <  }
4016 >    block_state.modes.value |= UMODE_SERVNOTICE;
4017   }
4018 + #line 4019 "conf_parser.c" /* yacc.c:1646  */
4019      break;
4020  
4021    case 195:
4022 <
4783 < /* Line 1455 of yacc.c  */
4784 < #line 1385 "ircd_parser.y"
4022 > #line 1317 "conf_parser.y" /* yacc.c:1646  */
4023      {
4024    if (conf_parser_ctx.pass == 2)
4025 <  {
4788 <    if (yylval.number)
4789 <      yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
4790 <    else
4791 <      yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
4792 <  }
4025 >    block_state.modes.value |= UMODE_INVISIBLE;
4026   }
4027 + #line 4028 "conf_parser.c" /* yacc.c:1646  */
4028      break;
4029  
4030    case 196:
4031 <
4798 < /* Line 1455 of yacc.c  */
4799 < #line 1396 "ircd_parser.y"
4031 > #line 1321 "conf_parser.y" /* yacc.c:1646  */
4032      {
4033    if (conf_parser_ctx.pass == 2)
4034 <  {
4803 <    if (yylval.number)
4804 <      yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
4805 <    else
4806 <      yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
4807 <  }
4034 >    block_state.modes.value |= UMODE_WALLOP;
4035   }
4036 + #line 4037 "conf_parser.c" /* yacc.c:1646  */
4037      break;
4038  
4039    case 197:
4040 <
4813 < /* Line 1455 of yacc.c  */
4814 < #line 1407 "ircd_parser.y"
4040 > #line 1325 "conf_parser.y" /* yacc.c:1646  */
4041      {
4042    if (conf_parser_ctx.pass == 2)
4043 <  {
4818 <    if (yylval.number)
4819 <      yy_aconf->port |= OPER_FLAG_OPERWALL;
4820 <    else
4821 <      yy_aconf->port &= ~OPER_FLAG_OPERWALL;
4822 <  }
4043 >    block_state.modes.value |= UMODE_SOFTCALLERID;
4044   }
4045 + #line 4046 "conf_parser.c" /* yacc.c:1646  */
4046      break;
4047  
4048    case 198:
4049 <
4828 < /* Line 1455 of yacc.c  */
4829 < #line 1418 "ircd_parser.y"
4049 > #line 1329 "conf_parser.y" /* yacc.c:1646  */
4050      {
4051 +  if (conf_parser_ctx.pass == 2)
4052 +    block_state.modes.value |= UMODE_CALLERID;
4053   }
4054 + #line 4055 "conf_parser.c" /* yacc.c:1646  */
4055      break;
4056  
4057 <  case 202:
4057 >  case 199:
4058 > #line 1333 "conf_parser.y" /* yacc.c:1646  */
4059 >    {
4060 >  if (conf_parser_ctx.pass == 2)
4061 >    block_state.modes.value |= UMODE_LOCOPS;
4062 > }
4063 > #line 4064 "conf_parser.c" /* yacc.c:1646  */
4064 >    break;
4065  
4066 < /* Line 1455 of yacc.c  */
4067 < #line 1422 "ircd_parser.y"
4068 <    { not_atom = 1; }
4066 >  case 200:
4067 > #line 1337 "conf_parser.y" /* yacc.c:1646  */
4068 >    {
4069 >  if (conf_parser_ctx.pass == 2)
4070 >    block_state.modes.value |= UMODE_REGONLY;
4071 > }
4072 > #line 4073 "conf_parser.c" /* yacc.c:1646  */
4073      break;
4074  
4075 <  case 204:
4075 >  case 201:
4076 > #line 1341 "conf_parser.y" /* yacc.c:1646  */
4077 >    {
4078 >  if (conf_parser_ctx.pass == 2)
4079 >    block_state.modes.value |= UMODE_FARCONNECT;
4080 > }
4081 > #line 4082 "conf_parser.c" /* yacc.c:1646  */
4082 >    break;
4083  
4084 < /* Line 1455 of yacc.c  */
4085 < #line 1423 "ircd_parser.y"
4086 <    { not_atom = 0; }
4084 >  case 202:
4085 > #line 1347 "conf_parser.y" /* yacc.c:1646  */
4086 >    {
4087 >  if (conf_parser_ctx.pass == 2)
4088 >    block_state.port.value = 0;
4089 > }
4090 > #line 4091 "conf_parser.c" /* yacc.c:1646  */
4091      break;
4092  
4093    case 206:
4094 <
4850 < /* Line 1455 of yacc.c  */
4851 < #line 1426 "ircd_parser.y"
4094 > #line 1354 "conf_parser.y" /* yacc.c:1646  */
4095      {
4096    if (conf_parser_ctx.pass == 2)
4097 <  {
4855 <    if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
4856 <    else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
4857 <  }
4097 >    block_state.port.value |= OPER_FLAG_KILL_REMOTE;
4098   }
4099 + #line 4100 "conf_parser.c" /* yacc.c:1646  */
4100      break;
4101  
4102    case 207:
4103 <
4863 < /* Line 1455 of yacc.c  */
4864 < #line 1433 "ircd_parser.y"
4103 > #line 1358 "conf_parser.y" /* yacc.c:1646  */
4104      {
4105    if (conf_parser_ctx.pass == 2)
4106 <  {
4868 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
4869 <    else yy_aconf->port |= OPER_FLAG_REMOTE;
4870 <  }
4106 >    block_state.port.value |= OPER_FLAG_KILL;
4107   }
4108 + #line 4109 "conf_parser.c" /* yacc.c:1646  */
4109      break;
4110  
4111    case 208:
4112 <
4876 < /* Line 1455 of yacc.c  */
4877 < #line 1440 "ircd_parser.y"
4112 > #line 1362 "conf_parser.y" /* yacc.c:1646  */
4113      {
4114    if (conf_parser_ctx.pass == 2)
4115 <  {
4881 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
4882 <    else yy_aconf->port |= OPER_FLAG_K;
4883 <  }
4115 >    block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
4116   }
4117 + #line 4118 "conf_parser.c" /* yacc.c:1646  */
4118      break;
4119  
4120    case 209:
4121 <
4889 < /* Line 1455 of yacc.c  */
4890 < #line 1447 "ircd_parser.y"
4121 > #line 1366 "conf_parser.y" /* yacc.c:1646  */
4122      {
4123    if (conf_parser_ctx.pass == 2)
4124 <  {
4894 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
4895 <    else yy_aconf->port |= OPER_FLAG_UNKLINE;
4896 <  }
4124 >    block_state.port.value |= OPER_FLAG_CONNECT;
4125   }
4126 + #line 4127 "conf_parser.c" /* yacc.c:1646  */
4127      break;
4128  
4129    case 210:
4130 <
4902 < /* Line 1455 of yacc.c  */
4903 < #line 1454 "ircd_parser.y"
4130 > #line 1370 "conf_parser.y" /* yacc.c:1646  */
4131      {
4132    if (conf_parser_ctx.pass == 2)
4133 <  {
4907 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
4908 <    else yy_aconf->port |= OPER_FLAG_X;
4909 <  }
4133 >    block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
4134   }
4135 + #line 4136 "conf_parser.c" /* yacc.c:1646  */
4136      break;
4137  
4138    case 211:
4139 <
4915 < /* Line 1455 of yacc.c  */
4916 < #line 1461 "ircd_parser.y"
4139 > #line 1374 "conf_parser.y" /* yacc.c:1646  */
4140      {
4141    if (conf_parser_ctx.pass == 2)
4142 <  {
4920 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
4921 <    else yy_aconf->port |= OPER_FLAG_GLINE;
4922 <  }
4142 >    block_state.port.value |= OPER_FLAG_SQUIT;
4143   }
4144 + #line 4145 "conf_parser.c" /* yacc.c:1646  */
4145      break;
4146  
4147    case 212:
4148 <
4928 < /* Line 1455 of yacc.c  */
4929 < #line 1468 "ircd_parser.y"
4148 > #line 1378 "conf_parser.y" /* yacc.c:1646  */
4149      {
4150    if (conf_parser_ctx.pass == 2)
4151 <  {
4933 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
4934 <    else yy_aconf->port |= OPER_FLAG_DIE;
4935 <  }
4151 >    block_state.port.value |= OPER_FLAG_KLINE;
4152   }
4153 + #line 4154 "conf_parser.c" /* yacc.c:1646  */
4154      break;
4155  
4156    case 213:
4157 <
4941 < /* Line 1455 of yacc.c  */
4942 < #line 1475 "ircd_parser.y"
4157 > #line 1382 "conf_parser.y" /* yacc.c:1646  */
4158      {
4159    if (conf_parser_ctx.pass == 2)
4160 <  {
4946 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
4947 <    else yy_aconf->port |= OPER_FLAG_REHASH;
4948 <  }
4160 >    block_state.port.value |= OPER_FLAG_UNKLINE;
4161   }
4162 + #line 4163 "conf_parser.c" /* yacc.c:1646  */
4163      break;
4164  
4165    case 214:
4166 <
4954 < /* Line 1455 of yacc.c  */
4955 < #line 1482 "ircd_parser.y"
4166 > #line 1386 "conf_parser.y" /* yacc.c:1646  */
4167      {
4168    if (conf_parser_ctx.pass == 2)
4169 <  {
4959 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_ADMIN;
4960 <    else yy_aconf->port |= OPER_FLAG_ADMIN;
4961 <  }
4169 >    block_state.port.value |= OPER_FLAG_DLINE;
4170   }
4171 + #line 4172 "conf_parser.c" /* yacc.c:1646  */
4172      break;
4173  
4174    case 215:
4175 <
4967 < /* Line 1455 of yacc.c  */
4968 < #line 1489 "ircd_parser.y"
4175 > #line 1390 "conf_parser.y" /* yacc.c:1646  */
4176      {
4177    if (conf_parser_ctx.pass == 2)
4178 <  {
4972 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
4973 <    else yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
4974 <  }
4178 >    block_state.port.value |= OPER_FLAG_UNDLINE;
4179   }
4180 + #line 4181 "conf_parser.c" /* yacc.c:1646  */
4181      break;
4182  
4183    case 216:
4184 <
4980 < /* Line 1455 of yacc.c  */
4981 < #line 1496 "ircd_parser.y"
4184 > #line 1394 "conf_parser.y" /* yacc.c:1646  */
4185      {
4186    if (conf_parser_ctx.pass == 2)
4187 <  {
4985 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
4986 <    else yy_aconf->port |= OPER_FLAG_N;
4987 <  }
4187 >    block_state.port.value |= OPER_FLAG_XLINE;
4188   }
4189 + #line 4190 "conf_parser.c" /* yacc.c:1646  */
4190      break;
4191  
4192    case 217:
4193 <
4993 < /* Line 1455 of yacc.c  */
4994 < #line 1503 "ircd_parser.y"
4193 > #line 1398 "conf_parser.y" /* yacc.c:1646  */
4194      {
4195    if (conf_parser_ctx.pass == 2)
4196 <  {
4998 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
4999 <    else yy_aconf->port |= OPER_FLAG_OPERWALL;
5000 <  }
4196 >    block_state.port.value |= OPER_FLAG_UNXLINE;
4197   }
4198 + #line 4199 "conf_parser.c" /* yacc.c:1646  */
4199      break;
4200  
4201    case 218:
4202 <
5006 < /* Line 1455 of yacc.c  */
5007 < #line 1510 "ircd_parser.y"
4202 > #line 1402 "conf_parser.y" /* yacc.c:1646  */
4203      {
4204    if (conf_parser_ctx.pass == 2)
4205 <  {
5011 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
5012 <    else yy_aconf->port |= OPER_FLAG_OPER_SPY;
5013 <  }
4205 >    block_state.port.value |= OPER_FLAG_GLINE;
4206   }
4207 + #line 4208 "conf_parser.c" /* yacc.c:1646  */
4208      break;
4209  
4210    case 219:
4211 <
5019 < /* Line 1455 of yacc.c  */
5020 < #line 1517 "ircd_parser.y"
4211 > #line 1406 "conf_parser.y" /* yacc.c:1646  */
4212      {
4213    if (conf_parser_ctx.pass == 2)
4214 <  {
5024 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
5025 <    else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
5026 <  }
4214 >    block_state.port.value |= OPER_FLAG_DIE;
4215   }
4216 + #line 4217 "conf_parser.c" /* yacc.c:1646  */
4217      break;
4218  
4219    case 220:
4220 <
5032 < /* Line 1455 of yacc.c  */
5033 < #line 1524 "ircd_parser.y"
4220 > #line 1410 "conf_parser.y" /* yacc.c:1646  */
4221      {
4222    if (conf_parser_ctx.pass == 2)
4223 <  {
5037 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
5038 <    else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
5039 <  }
4223 >    block_state.port.value |= OPER_FLAG_RESTART;
4224   }
4225 + #line 4226 "conf_parser.c" /* yacc.c:1646  */
4226      break;
4227  
4228    case 221:
4229 <
5045 < /* Line 1455 of yacc.c  */
5046 < #line 1531 "ircd_parser.y"
4229 > #line 1414 "conf_parser.y" /* yacc.c:1646  */
4230      {
4231    if (conf_parser_ctx.pass == 2)
4232 <  {
5050 <    if (not_atom) ClearConfEncrypted(yy_aconf);
5051 <    else SetConfEncrypted(yy_aconf);
5052 <  }
4232 >    block_state.port.value |= OPER_FLAG_REHASH;
4233   }
4234 + #line 4235 "conf_parser.c" /* yacc.c:1646  */
4235      break;
4236  
4237    case 222:
4238 <
5058 < /* Line 1455 of yacc.c  */
5059 < #line 1544 "ircd_parser.y"
4238 > #line 1418 "conf_parser.y" /* yacc.c:1646  */
4239      {
4240 <  if (conf_parser_ctx.pass == 1)
4241 <  {
5063 <    yy_conf = make_conf_item(CLASS_TYPE);
5064 <    yy_class = map_to_conf(yy_conf);
5065 <  }
4240 >  if (conf_parser_ctx.pass == 2)
4241 >    block_state.port.value |= OPER_FLAG_ADMIN;
4242   }
4243 + #line 4244 "conf_parser.c" /* yacc.c:1646  */
4244      break;
4245  
4246    case 223:
4247 + #line 1422 "conf_parser.y" /* yacc.c:1646  */
4248 +    {
4249 +  if (conf_parser_ctx.pass == 2)
4250 +    block_state.port.value |= OPER_FLAG_GLOBOPS;
4251 + }
4252 + #line 4253 "conf_parser.c" /* yacc.c:1646  */
4253 +    break;
4254  
4255 < /* Line 1455 of yacc.c  */
4256 < #line 1551 "ircd_parser.y"
4255 >  case 224:
4256 > #line 1426 "conf_parser.y" /* yacc.c:1646  */
4257      {
4258 <  if (conf_parser_ctx.pass == 1)
4259 <  {
4260 <    struct ConfItem *cconf = NULL;
4261 <    struct ClassItem *class = NULL;
4258 >  if (conf_parser_ctx.pass == 2)
4259 >    block_state.port.value |= OPER_FLAG_WALLOPS;
4260 > }
4261 > #line 4262 "conf_parser.c" /* yacc.c:1646  */
4262 >    break;
4263  
4264 <    if (yy_class_name == NULL)
4265 <      delete_conf_item(yy_conf);
5081 <    else
4264 >  case 225:
4265 > #line 1430 "conf_parser.y" /* yacc.c:1646  */
4266      {
4267 <      cconf = find_exact_name_conf(CLASS_TYPE, yy_class_name, NULL, NULL);
4267 >  if (conf_parser_ctx.pass == 2)
4268 >    block_state.port.value |= OPER_FLAG_LOCOPS;
4269 > }
4270 > #line 4271 "conf_parser.c" /* yacc.c:1646  */
4271 >    break;
4272  
4273 <      if (cconf != NULL)                /* The class existed already */
4274 <      {
4275 <        int user_count = 0;
4273 >  case 226:
4274 > #line 1434 "conf_parser.y" /* yacc.c:1646  */
4275 >    {
4276 >  if (conf_parser_ctx.pass == 2)
4277 >    block_state.port.value |= OPER_FLAG_REMOTEBAN;
4278 > }
4279 > #line 4280 "conf_parser.c" /* yacc.c:1646  */
4280 >    break;
4281  
4282 <        rebuild_cidr_class(cconf, yy_class);
4282 >  case 227:
4283 > #line 1438 "conf_parser.y" /* yacc.c:1646  */
4284 >    {
4285 >  if (conf_parser_ctx.pass == 2)
4286 >    block_state.port.value |= OPER_FLAG_SET;
4287 > }
4288 > #line 4289 "conf_parser.c" /* yacc.c:1646  */
4289 >    break;
4290  
4291 <        class = map_to_conf(cconf);
4291 >  case 228:
4292 > #line 1442 "conf_parser.y" /* yacc.c:1646  */
4293 >    {
4294 >  if (conf_parser_ctx.pass == 2)
4295 >    block_state.port.value |= OPER_FLAG_MODULE;
4296 > }
4297 > #line 4298 "conf_parser.c" /* yacc.c:1646  */
4298 >    break;
4299  
4300 <        user_count = class->curr_user_count;
4301 <        memcpy(class, yy_class, sizeof(*class));
4302 <        class->curr_user_count = user_count;
4303 <        class->active = 1;
4300 >  case 229:
4301 > #line 1452 "conf_parser.y" /* yacc.c:1646  */
4302 >    {
4303 >  if (conf_parser_ctx.pass != 1)
4304 >    break;
4305  
4306 <        delete_conf_item(yy_conf);
4306 >  reset_block_state();
4307  
4308 <        MyFree(cconf->name);            /* Allows case change of class name */
4309 <        cconf->name = yy_class_name;
4310 <      }
4311 <      else      /* Brand new class */
4312 <      {
5105 <        MyFree(yy_conf->name);          /* just in case it was allocated */
5106 <        yy_conf->name = yy_class_name;
5107 <        yy_class->active = 1;
5108 <      }
5109 <    }
5110 <
5111 <    yy_class_name = NULL;
5112 <  }
4308 >  block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
4309 >  block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
4310 >  block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
4311 >  block_state.max_sendq.value = DEFAULT_SENDQ;
4312 >  block_state.max_recvq.value = DEFAULT_RECVQ;
4313   }
4314 + #line 4315 "conf_parser.c" /* yacc.c:1646  */
4315      break;
4316  
4317 <  case 242:
4318 <
5118 < /* Line 1455 of yacc.c  */
5119 < #line 1611 "ircd_parser.y"
4317 >  case 230:
4318 > #line 1464 "conf_parser.y" /* yacc.c:1646  */
4319      {
4320 <  if (conf_parser_ctx.pass == 1)
4321 <  {
4322 <    MyFree(yy_class_name);
5124 <    DupString(yy_class_name, yylval.string);
5125 <  }
5126 < }
4320 >  struct ClassItem *class = NULL;
4321 >
4322 >  if (conf_parser_ctx.pass != 1)
4323      break;
4324  
4325 <  case 243:
4325 >  if (!block_state.class.buf[0])
4326 >    break;
4327  
4328 < /* Line 1455 of yacc.c  */
4329 < #line 1620 "ircd_parser.y"
4330 <    {
4331 <  if (conf_parser_ctx.pass == 1)
4328 >  if (!(class = class_find(block_state.class.buf, 0)))
4329 >    class = class_make();
4330 >
4331 >  class->active = 1;
4332 >  MyFree(class->name);
4333 >  class->name = xstrdup(block_state.class.buf);
4334 >  class->ping_freq = block_state.ping_freq.value;
4335 >  class->max_perip = block_state.max_perip.value;
4336 >  class->con_freq = block_state.con_freq.value;
4337 >  class->max_total = block_state.max_total.value;
4338 >  class->max_global = block_state.max_global.value;
4339 >  class->max_local = block_state.max_local.value;
4340 >  class->max_ident = block_state.max_ident.value;
4341 >  class->max_sendq = block_state.max_sendq.value;
4342 >  class->max_recvq = block_state.max_recvq.value;
4343 >  class->max_channels = block_state.max_channels.value;
4344 >
4345 >  if (block_state.min_idle.value > block_state.max_idle.value)
4346    {
4347 <    MyFree(yy_class_name);
4348 <    DupString(yy_class_name, yylval.string);
4347 >    block_state.min_idle.value = 0;
4348 >    block_state.max_idle.value = 0;
4349 >    block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
4350    }
4351 +
4352 +  class->flags = block_state.flags.value;
4353 +  class->min_idle = block_state.min_idle.value;
4354 +  class->max_idle = block_state.max_idle.value;
4355 +
4356 +  if (class->number_per_cidr && block_state.number_per_cidr.value)
4357 +    if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
4358 +        (class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
4359 +      if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
4360 +          (class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
4361 +        rebuild_cidr_list(class);
4362 +
4363 +  class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
4364 +  class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
4365 +  class->number_per_cidr = block_state.number_per_cidr.value;
4366   }
4367 + #line 4368 "conf_parser.c" /* yacc.c:1646  */
4368      break;
4369  
4370 <  case 244:
4371 <
5144 < /* Line 1455 of yacc.c  */
5145 < #line 1629 "ircd_parser.y"
4370 >  case 251:
4371 > #line 1533 "conf_parser.y" /* yacc.c:1646  */
4372      {
4373    if (conf_parser_ctx.pass == 1)
4374 <    PingFreq(yy_class) = (yyvsp[(3) - (4)].number);
4374 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
4375   }
4376 + #line 4377 "conf_parser.c" /* yacc.c:1646  */
4377      break;
4378  
4379 <  case 245:
4380 <
5154 < /* Line 1455 of yacc.c  */
5155 < #line 1635 "ircd_parser.y"
4379 >  case 252:
4380 > #line 1539 "conf_parser.y" /* yacc.c:1646  */
4381      {
4382    if (conf_parser_ctx.pass == 1)
4383 <    PingWarning(yy_class) = (yyvsp[(3) - (4)].number);
4383 >    block_state.ping_freq.value = (yyvsp[-1].number);
4384   }
4385 + #line 4386 "conf_parser.c" /* yacc.c:1646  */
4386      break;
4387  
4388 <  case 246:
4389 <
5164 < /* Line 1455 of yacc.c  */
5165 < #line 1641 "ircd_parser.y"
4388 >  case 253:
4389 > #line 1545 "conf_parser.y" /* yacc.c:1646  */
4390      {
4391    if (conf_parser_ctx.pass == 1)
4392 <    MaxPerIp(yy_class) = (yyvsp[(3) - (4)].number);
4392 >    block_state.max_perip.value = (yyvsp[-1].number);
4393   }
4394 + #line 4395 "conf_parser.c" /* yacc.c:1646  */
4395      break;
4396  
4397 <  case 247:
4398 <
5174 < /* Line 1455 of yacc.c  */
5175 < #line 1647 "ircd_parser.y"
4397 >  case 254:
4398 > #line 1551 "conf_parser.y" /* yacc.c:1646  */
4399      {
4400    if (conf_parser_ctx.pass == 1)
4401 <    ConFreq(yy_class) = (yyvsp[(3) - (4)].number);
4401 >    block_state.con_freq.value = (yyvsp[-1].number);
4402   }
4403 + #line 4404 "conf_parser.c" /* yacc.c:1646  */
4404      break;
4405  
4406 <  case 248:
4407 <
5184 < /* Line 1455 of yacc.c  */
5185 < #line 1653 "ircd_parser.y"
4406 >  case 255:
4407 > #line 1557 "conf_parser.y" /* yacc.c:1646  */
4408      {
4409    if (conf_parser_ctx.pass == 1)
4410 <    MaxTotal(yy_class) = (yyvsp[(3) - (4)].number);
4410 >    block_state.max_channels.value = (yyvsp[-1].number);
4411   }
4412 + #line 4413 "conf_parser.c" /* yacc.c:1646  */
4413      break;
4414  
4415 <  case 249:
4416 <
5194 < /* Line 1455 of yacc.c  */
5195 < #line 1659 "ircd_parser.y"
4415 >  case 256:
4416 > #line 1563 "conf_parser.y" /* yacc.c:1646  */
4417      {
4418    if (conf_parser_ctx.pass == 1)
4419 <    MaxGlobal(yy_class) = (yyvsp[(3) - (4)].number);
4419 >    block_state.max_total.value = (yyvsp[-1].number);
4420   }
4421 + #line 4422 "conf_parser.c" /* yacc.c:1646  */
4422      break;
4423  
4424 <  case 250:
4425 <
5204 < /* Line 1455 of yacc.c  */
5205 < #line 1665 "ircd_parser.y"
4424 >  case 257:
4425 > #line 1569 "conf_parser.y" /* yacc.c:1646  */
4426      {
4427    if (conf_parser_ctx.pass == 1)
4428 <    MaxLocal(yy_class) = (yyvsp[(3) - (4)].number);
4428 >    block_state.max_global.value = (yyvsp[-1].number);
4429   }
4430 + #line 4431 "conf_parser.c" /* yacc.c:1646  */
4431      break;
4432  
4433 <  case 251:
4434 <
5214 < /* Line 1455 of yacc.c  */
5215 < #line 1671 "ircd_parser.y"
4433 >  case 258:
4434 > #line 1575 "conf_parser.y" /* yacc.c:1646  */
4435      {
4436    if (conf_parser_ctx.pass == 1)
4437 <    MaxIdent(yy_class) = (yyvsp[(3) - (4)].number);
4437 >    block_state.max_local.value = (yyvsp[-1].number);
4438   }
4439 + #line 4440 "conf_parser.c" /* yacc.c:1646  */
4440      break;
4441  
4442 <  case 252:
4443 <
5224 < /* Line 1455 of yacc.c  */
5225 < #line 1677 "ircd_parser.y"
4442 >  case 259:
4443 > #line 1581 "conf_parser.y" /* yacc.c:1646  */
4444      {
4445    if (conf_parser_ctx.pass == 1)
4446 <    MaxSendq(yy_class) = (yyvsp[(3) - (4)].number);
4446 >    block_state.max_ident.value = (yyvsp[-1].number);
4447   }
4448 + #line 4449 "conf_parser.c" /* yacc.c:1646  */
4449      break;
4450  
4451 <  case 253:
4452 <
5234 < /* Line 1455 of yacc.c  */
5235 < #line 1683 "ircd_parser.y"
4451 >  case 260:
4452 > #line 1587 "conf_parser.y" /* yacc.c:1646  */
4453      {
4454    if (conf_parser_ctx.pass == 1)
4455 <    CidrBitlenIPV4(yy_class) = (yyvsp[(3) - (4)].number);
4455 >    block_state.max_sendq.value = (yyvsp[-1].number);
4456   }
4457 + #line 4458 "conf_parser.c" /* yacc.c:1646  */
4458      break;
4459  
4460 <  case 254:
4461 <
5244 < /* Line 1455 of yacc.c  */
5245 < #line 1689 "ircd_parser.y"
4460 >  case 261:
4461 > #line 1593 "conf_parser.y" /* yacc.c:1646  */
4462      {
4463    if (conf_parser_ctx.pass == 1)
4464 <    CidrBitlenIPV6(yy_class) = (yyvsp[(3) - (4)].number);
4464 >    if ((yyvsp[-1].number) >= CLIENT_FLOOD_MIN && (yyvsp[-1].number) <= CLIENT_FLOOD_MAX)
4465 >      block_state.max_recvq.value = (yyvsp[-1].number);
4466   }
4467 + #line 4468 "conf_parser.c" /* yacc.c:1646  */
4468      break;
4469  
4470 <  case 255:
4471 <
5254 < /* Line 1455 of yacc.c  */
5255 < #line 1695 "ircd_parser.y"
4470 >  case 262:
4471 > #line 1600 "conf_parser.y" /* yacc.c:1646  */
4472      {
4473    if (conf_parser_ctx.pass == 1)
4474 <    NumberPerCidr(yy_class) = (yyvsp[(3) - (4)].number);
4474 >    block_state.cidr_bitlen_ipv4.value = (yyvsp[-1].number) > 32 ? 32 : (yyvsp[-1].number);
4475   }
4476 + #line 4477 "conf_parser.c" /* yacc.c:1646  */
4477      break;
4478  
4479 <  case 256:
4480 <
5264 < /* Line 1455 of yacc.c  */
5265 < #line 1704 "ircd_parser.y"
4479 >  case 263:
4480 > #line 1606 "conf_parser.y" /* yacc.c:1646  */
4481      {
4482 <  if (conf_parser_ctx.pass == 2)
4483 <  {
5269 <    listener_address = NULL;
5270 <    listener_flags = 0;
5271 <  }
4482 >  if (conf_parser_ctx.pass == 1)
4483 >    block_state.cidr_bitlen_ipv6.value = (yyvsp[-1].number) > 128 ? 128 : (yyvsp[-1].number);
4484   }
4485 + #line 4486 "conf_parser.c" /* yacc.c:1646  */
4486      break;
4487  
4488 <  case 257:
4489 <
5277 < /* Line 1455 of yacc.c  */
5278 < #line 1711 "ircd_parser.y"
4488 >  case 264:
4489 > #line 1612 "conf_parser.y" /* yacc.c:1646  */
4490      {
4491 <  if (conf_parser_ctx.pass == 2)
4492 <  {
5282 <    MyFree(listener_address);
5283 <    listener_address = NULL;
5284 <  }
4491 >  if (conf_parser_ctx.pass == 1)
4492 >    block_state.number_per_cidr.value = (yyvsp[-1].number);
4493   }
4494 + #line 4495 "conf_parser.c" /* yacc.c:1646  */
4495      break;
4496  
4497 <  case 258:
4498 <
5290 < /* Line 1455 of yacc.c  */
5291 < #line 1720 "ircd_parser.y"
4497 >  case 265:
4498 > #line 1618 "conf_parser.y" /* yacc.c:1646  */
4499      {
4500 <  listener_flags = 0;
5294 < }
4500 >  if (conf_parser_ctx.pass != 1)
4501      break;
4502  
4503 <  case 262:
4503 >  block_state.min_idle.value = (yyvsp[-1].number);
4504 >  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
4505 > }
4506 > #line 4507 "conf_parser.c" /* yacc.c:1646  */
4507 >    break;
4508  
4509 < /* Line 1455 of yacc.c  */
4510 < #line 1726 "ircd_parser.y"
4509 >  case 266:
4510 > #line 1627 "conf_parser.y" /* yacc.c:1646  */
4511      {
4512 <  if (conf_parser_ctx.pass == 2)
5303 <    listener_flags |= LISTENER_SSL;
5304 < }
4512 >  if (conf_parser_ctx.pass != 1)
4513      break;
4514  
4515 <  case 263:
4515 >  block_state.max_idle.value = (yyvsp[-1].number);
4516 >  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
4517 > }
4518 > #line 4519 "conf_parser.c" /* yacc.c:1646  */
4519 >    break;
4520  
4521 < /* Line 1455 of yacc.c  */
4522 < #line 1730 "ircd_parser.y"
4521 >  case 267:
4522 > #line 1636 "conf_parser.y" /* yacc.c:1646  */
4523      {
4524 <  if (conf_parser_ctx.pass == 2)
4525 <    listener_flags |= LISTENER_HIDDEN;
4524 >  if (conf_parser_ctx.pass == 1)
4525 >    block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
4526   }
4527 + #line 4528 "conf_parser.c" /* yacc.c:1646  */
4528      break;
4529  
4530 <  case 264:
4531 <
5319 < /* Line 1455 of yacc.c  */
5320 < #line 1734 "ircd_parser.y"
4530 >  case 271:
4531 > #line 1643 "conf_parser.y" /* yacc.c:1646  */
4532      {
4533 <  if (conf_parser_ctx.pass == 2)
4534 <    listener_flags |= LISTENER_SERVER;
4533 >  if (conf_parser_ctx.pass == 1)
4534 >    block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
4535   }
4536 + #line 4537 "conf_parser.c" /* yacc.c:1646  */
4537      break;
4538  
4539    case 272:
4540 <
5329 < /* Line 1455 of yacc.c  */
5330 < #line 1744 "ircd_parser.y"
5331 <    { listener_flags = 0; }
5332 <    break;
5333 <
5334 <  case 276:
5335 <
5336 < /* Line 1455 of yacc.c  */
5337 < #line 1749 "ircd_parser.y"
4540 > #line 1647 "conf_parser.y" /* yacc.c:1646  */
4541      {
4542 <  if (conf_parser_ctx.pass == 2)
4543 <  {
5341 <    if ((listener_flags & LISTENER_SSL))
5342 < #ifdef HAVE_LIBCRYPTO
5343 <      if (!ServerInfo.server_ctx)
5344 < #endif
5345 <      {
5346 <        yyerror("SSL not available - port closed");
5347 <        break;
5348 <      }
5349 <    add_listener((yyvsp[(1) - (1)].number), listener_address, listener_flags);
5350 <  }
4542 >  if (conf_parser_ctx.pass == 1)
4543 >    block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
4544   }
4545 + #line 4546 "conf_parser.c" /* yacc.c:1646  */
4546      break;
4547  
4548 <  case 277:
4549 <
5356 < /* Line 1455 of yacc.c  */
5357 < #line 1763 "ircd_parser.y"
4548 >  case 273:
4549 > #line 1657 "conf_parser.y" /* yacc.c:1646  */
4550      {
4551    if (conf_parser_ctx.pass == 2)
4552 <  {
5361 <    int i;
5362 <
5363 <    if ((listener_flags & LISTENER_SSL))
5364 < #ifdef HAVE_LIBCRYPTO
5365 <      if (!ServerInfo.server_ctx)
5366 < #endif
5367 <      {
5368 <        yyerror("SSL not available - port closed");
5369 <        break;
5370 <      }
5371 <
5372 <    for (i = (yyvsp[(1) - (3)].number); i <= (yyvsp[(3) - (3)].number); ++i)
5373 <      add_listener(i, listener_address, listener_flags);
5374 <  }
4552 >    reset_block_state();
4553   }
4554 + #line 4555 "conf_parser.c" /* yacc.c:1646  */
4555      break;
4556  
4557 <  case 278:
4558 <
5380 < /* Line 1455 of yacc.c  */
5381 < #line 1783 "ircd_parser.y"
4557 >  case 275:
4558 > #line 1663 "conf_parser.y" /* yacc.c:1646  */
4559      {
4560 <  if (conf_parser_ctx.pass == 2)
5384 <  {
5385 <    MyFree(listener_address);
5386 <    DupString(listener_address, yylval.string);
5387 <  }
4560 >  block_state.flags.value = 0;
4561   }
4562 + #line 4563 "conf_parser.c" /* yacc.c:1646  */
4563      break;
4564  
4565    case 279:
4566 <
5393 < /* Line 1455 of yacc.c  */
5394 < #line 1792 "ircd_parser.y"
4566 > #line 1669 "conf_parser.y" /* yacc.c:1646  */
4567      {
4568    if (conf_parser_ctx.pass == 2)
4569 <  {
5398 <    MyFree(listener_address);
5399 <    DupString(listener_address, yylval.string);
5400 <  }
4569 >    block_state.flags.value |= LISTENER_SSL;
4570   }
4571 + #line 4572 "conf_parser.c" /* yacc.c:1646  */
4572      break;
4573  
4574    case 280:
4575 <
5406 < /* Line 1455 of yacc.c  */
5407 < #line 1804 "ircd_parser.y"
4575 > #line 1673 "conf_parser.y" /* yacc.c:1646  */
4576      {
4577    if (conf_parser_ctx.pass == 2)
4578 <  {
5411 <    yy_conf = make_conf_item(CLIENT_TYPE);
5412 <    yy_aconf = map_to_conf(yy_conf);
5413 <  }
5414 <  else
5415 <  {
5416 <    MyFree(class_name);
5417 <    class_name = NULL;
5418 <  }
4578 >    block_state.flags.value |= LISTENER_HIDDEN;
4579   }
4580 + #line 4581 "conf_parser.c" /* yacc.c:1646  */
4581      break;
4582  
4583    case 281:
4584 <
5424 < /* Line 1455 of yacc.c  */
5425 < #line 1816 "ircd_parser.y"
4584 > #line 1677 "conf_parser.y" /* yacc.c:1646  */
4585      {
4586    if (conf_parser_ctx.pass == 2)
4587 <  {
5429 <    struct CollectItem *yy_tmp = NULL;
5430 <    dlink_node *ptr = NULL, *next_ptr = NULL;
5431 <
5432 <    if (yy_aconf->user && yy_aconf->host)
5433 <    {
5434 <      conf_add_class_to_conf(yy_conf, class_name);
5435 <      add_conf_by_address(CONF_CLIENT, yy_aconf);
5436 <    }
5437 <    else
5438 <      delete_conf_item(yy_conf);
5439 <
5440 <    /* copy over settings from first struct */
5441 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
5442 <    {
5443 <      struct AccessItem *new_aconf;
5444 <      struct ConfItem *new_conf;
5445 <
5446 <      new_conf = make_conf_item(CLIENT_TYPE);
5447 <      new_aconf = map_to_conf(new_conf);
5448 <
5449 <      yy_tmp = ptr->data;
5450 <
5451 <      assert(yy_tmp->user && yy_tmp->host);
5452 <
5453 <      if (yy_aconf->passwd != NULL)
5454 <        DupString(new_aconf->passwd, yy_aconf->passwd);
5455 <      if (yy_conf->name != NULL)
5456 <        DupString(new_conf->name, yy_conf->name);
5457 <      if (yy_aconf->passwd != NULL)
5458 <        DupString(new_aconf->passwd, yy_aconf->passwd);
5459 <
5460 <      new_aconf->flags = yy_aconf->flags;
5461 <      new_aconf->port  = yy_aconf->port;
5462 <
5463 <      DupString(new_aconf->user, yy_tmp->user);
5464 <      collapse(new_aconf->user);
5465 <
5466 <      DupString(new_aconf->host, yy_tmp->host);
5467 <      collapse(new_aconf->host);
5468 <
5469 <      conf_add_class_to_conf(new_conf, class_name);
5470 <      add_conf_by_address(CONF_CLIENT, new_aconf);
5471 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
5472 <      free_collect_item(yy_tmp);
5473 <    }
5474 <
5475 <    MyFree(class_name);
5476 <    class_name = NULL;
5477 <    yy_conf = NULL;
5478 <    yy_aconf = NULL;
5479 <  }
4587 >   block_state.flags.value |= LISTENER_SERVER;
4588   }
4589 + #line 4590 "conf_parser.c" /* yacc.c:1646  */
4590      break;
4591  
4592 <  case 301:
4592 >  case 289:
4593 > #line 1685 "conf_parser.y" /* yacc.c:1646  */
4594 >    { block_state.flags.value = 0; }
4595 > #line 4596 "conf_parser.c" /* yacc.c:1646  */
4596 >    break;
4597  
4598 < /* Line 1455 of yacc.c  */
4599 < #line 1881 "ircd_parser.y"
4598 >  case 293:
4599 > #line 1690 "conf_parser.y" /* yacc.c:1646  */
4600      {
4601    if (conf_parser_ctx.pass == 2)
4602    {
4603 <    struct CollectItem *yy_tmp = NULL;
4604 <    struct split_nuh_item nuh;
5492 <
5493 <    nuh.nuhmask  = yylval.string;
5494 <    nuh.nickptr  = NULL;
5495 <    nuh.userptr  = userbuf;
5496 <    nuh.hostptr  = hostbuf;
5497 <
5498 <    nuh.nicksize = 0;
5499 <    nuh.usersize = sizeof(userbuf);
5500 <    nuh.hostsize = sizeof(hostbuf);
5501 <
5502 <    split_nuh(&nuh);
5503 <
5504 <    if (yy_aconf->user == NULL)
5505 <    {
5506 <      DupString(yy_aconf->user, userbuf);
5507 <      DupString(yy_aconf->host, hostbuf);
5508 <    }
5509 <    else
4603 > #ifndef HAVE_LIBCRYPTO
4604 >    if (block_state.flags.value & LISTENER_SSL)
4605      {
4606 <      yy_tmp = MyMalloc(sizeof(struct CollectItem));
4607 <
5513 <      DupString(yy_tmp->user, userbuf);
5514 <      DupString(yy_tmp->host, hostbuf);
5515 <
5516 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
4606 >      conf_error_report("SSL not available - port closed");
4607 >      break;
4608      }
4609 + #endif
4610 +    add_listener((yyvsp[0].number), block_state.addr.buf, block_state.flags.value);
4611    }
4612   }
4613 + #line 4614 "conf_parser.c" /* yacc.c:1646  */
4614      break;
4615  
4616 <  case 302:
4617 <
5524 < /* Line 1455 of yacc.c  */
5525 < #line 1918 "ircd_parser.y"
4616 >  case 294:
4617 > #line 1703 "conf_parser.y" /* yacc.c:1646  */
4618      {
4619    if (conf_parser_ctx.pass == 2)
4620    {
4621 <    /* be paranoid */
4622 <    if (yy_aconf->passwd != NULL)
4623 <      memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
4621 > #ifndef HAVE_LIBCRYPTO
4622 >    if (block_state.flags.value & LISTENER_SSL)
4623 >    {
4624 >      conf_error_report("SSL not available - port closed");
4625 >      break;
4626 >    }
4627 > #endif
4628  
4629 <    MyFree(yy_aconf->passwd);
4630 <    DupString(yy_aconf->passwd, yylval.string);
4629 >    for (int i = (yyvsp[-2].number); i <= (yyvsp[0].number); ++i)
4630 >      add_listener(i, block_state.addr.buf, block_state.flags.value);
4631    }
4632   }
4633 + #line 4634 "conf_parser.c" /* yacc.c:1646  */
4634      break;
4635  
4636 <  case 303:
4637 <
5541 < /* Line 1455 of yacc.c  */
5542 < #line 1931 "ircd_parser.y"
4636 >  case 295:
4637 > #line 1720 "conf_parser.y" /* yacc.c:1646  */
4638      {
4639    if (conf_parser_ctx.pass == 2)
4640 <  {
5546 <    if (yylval.number)
5547 <      yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
5548 <    else
5549 <      yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
5550 <  }
4640 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
4641   }
4642 + #line 4643 "conf_parser.c" /* yacc.c:1646  */
4643      break;
4644  
4645 <  case 304:
4646 <
5556 < /* Line 1455 of yacc.c  */
5557 < #line 1942 "ircd_parser.y"
4645 >  case 296:
4646 > #line 1726 "conf_parser.y" /* yacc.c:1646  */
4647      {
4648    if (conf_parser_ctx.pass == 2)
4649 <  {
5561 <    MyFree(class_name);
5562 <    DupString(class_name, yylval.string);
5563 <  }
4649 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
4650   }
4651 + #line 4652 "conf_parser.c" /* yacc.c:1646  */
4652      break;
4653  
4654 <  case 305:
4655 <
5569 < /* Line 1455 of yacc.c  */
5570 < #line 1951 "ircd_parser.y"
4654 >  case 297:
4655 > #line 1735 "conf_parser.y" /* yacc.c:1646  */
4656      {
4657    if (conf_parser_ctx.pass == 2)
4658 <  {
5574 <    if (yylval.number)
5575 <      SetConfEncrypted(yy_aconf);
5576 <    else
5577 <      ClearConfEncrypted(yy_aconf);
5578 <  }
4658 >    reset_block_state();
4659   }
4660 + #line 4661 "conf_parser.c" /* yacc.c:1646  */
4661      break;
4662  
4663 <  case 306:
4664 <
5584 < /* Line 1455 of yacc.c  */
5585 < #line 1962 "ircd_parser.y"
4663 >  case 298:
4664 > #line 1739 "conf_parser.y" /* yacc.c:1646  */
4665      {
4666 < }
4666 >  dlink_node *ptr = NULL;
4667 >
4668 >  if (conf_parser_ctx.pass != 2)
4669      break;
4670  
4671 <  case 310:
4671 >  DLINK_FOREACH(ptr, block_state.mask.list.head)
4672 >  {
4673 >    struct MaskItem *conf = NULL;
4674 >    struct split_nuh_item nuh;
4675  
4676 < /* Line 1455 of yacc.c  */
4677 < #line 1966 "ircd_parser.y"
4678 <    { not_atom = 1; }
4679 <    break;
4676 >    nuh.nuhmask  = ptr->data;
4677 >    nuh.nickptr  = NULL;
4678 >    nuh.userptr  = block_state.user.buf;
4679 >    nuh.hostptr  = block_state.host.buf;
4680 >    nuh.nicksize = 0;
4681 >    nuh.usersize = sizeof(block_state.user.buf);
4682 >    nuh.hostsize = sizeof(block_state.host.buf);
4683 >    split_nuh(&nuh);
4684  
4685 <  case 312:
4685 >    conf        = conf_make(CONF_CLIENT);
4686 >    conf->user  = xstrdup(block_state.user.buf);
4687 >    conf->host  = xstrdup(block_state.host.buf);
4688  
4689 < /* Line 1455 of yacc.c  */
4690 < #line 1967 "ircd_parser.y"
4691 <    { not_atom = 0; }
4692 <    break;
4689 >    if (block_state.rpass.buf[0])
4690 >      conf->passwd = xstrdup(block_state.rpass.buf);
4691 >    if (block_state.name.buf[0])
4692 >      conf->name = xstrdup(block_state.name.buf);
4693  
4694 <  case 314:
4694 >    conf->flags = block_state.flags.value;
4695 >    conf->port  = block_state.port.value;
4696  
4697 < /* Line 1455 of yacc.c  */
4698 < #line 1970 "ircd_parser.y"
5608 <    {
5609 <  if (conf_parser_ctx.pass == 2)
5610 <  {
5611 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
5612 <    else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
4697 >    conf_add_class_to_conf(conf, block_state.class.buf);
4698 >    add_conf_by_address(CONF_CLIENT, conf);
4699    }
5614
4700   }
4701 + #line 4702 "conf_parser.c" /* yacc.c:1646  */
4702      break;
4703  
4704 <  case 315:
4705 <
5620 < /* Line 1455 of yacc.c  */
5621 < #line 1978 "ircd_parser.y"
4704 >  case 310:
4705 > #line 1788 "conf_parser.y" /* yacc.c:1646  */
4706      {
4707    if (conf_parser_ctx.pass == 2)
4708 <  {
5625 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
5626 <    else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
5627 <  }
4708 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
4709   }
4710 + #line 4711 "conf_parser.c" /* yacc.c:1646  */
4711      break;
4712  
4713 <  case 316:
4714 <
5633 < /* Line 1455 of yacc.c  */
5634 < #line 1985 "ircd_parser.y"
4713 >  case 311:
4714 > #line 1794 "conf_parser.y" /* yacc.c:1646  */
4715      {
4716    if (conf_parser_ctx.pass == 2)
4717 <  {
5638 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
5639 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
5640 <  }
4717 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
4718   }
4719 + #line 4720 "conf_parser.c" /* yacc.c:1646  */
4720      break;
4721  
4722 <  case 317:
4722 >  case 312:
4723 > #line 1800 "conf_parser.y" /* yacc.c:1646  */
4724 >    {
4725 >  if (conf_parser_ctx.pass == 2)
4726 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
4727 > }
4728 > #line 4729 "conf_parser.c" /* yacc.c:1646  */
4729 >    break;
4730  
4731 < /* Line 1455 of yacc.c  */
4732 < #line 1992 "ircd_parser.y"
4731 >  case 313:
4732 > #line 1806 "conf_parser.y" /* yacc.c:1646  */
4733      {
4734    if (conf_parser_ctx.pass == 2)
4735    {
4736 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
4737 <    else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
4736 >    if (yylval.number)
4737 >      block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
4738 >    else
4739 >      block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
4740    }
4741   }
4742 + #line 4743 "conf_parser.c" /* yacc.c:1646  */
4743      break;
4744  
4745 <  case 318:
4745 >  case 314:
4746 > #line 1817 "conf_parser.y" /* yacc.c:1646  */
4747 >    {
4748 >  if (conf_parser_ctx.pass == 2)
4749 >    block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
4750 > }
4751 > #line 4752 "conf_parser.c" /* yacc.c:1646  */
4752 >    break;
4753  
4754 < /* Line 1455 of yacc.c  */
4755 < #line 1999 "ircd_parser.y"
4754 >  case 318:
4755 > #line 1824 "conf_parser.y" /* yacc.c:1646  */
4756      {
4757    if (conf_parser_ctx.pass == 2)
4758 <  {
5664 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
5665 <    else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
5666 <  }
4758 >    block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
4759   }
4760 + #line 4761 "conf_parser.c" /* yacc.c:1646  */
4761      break;
4762  
4763    case 319:
4764 <
5672 < /* Line 1455 of yacc.c  */
5673 < #line 2006 "ircd_parser.y"
4764 > #line 1828 "conf_parser.y" /* yacc.c:1646  */
4765      {
4766    if (conf_parser_ctx.pass == 2)
4767 <  {
5677 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_IDLE_LINED;
5678 <    else yy_aconf->flags |= CONF_FLAGS_IDLE_LINED;
5679 <  }
4767 >    block_state.flags.value |= CONF_FLAGS_NOLIMIT;
4768   }
4769 + #line 4770 "conf_parser.c" /* yacc.c:1646  */
4770      break;
4771  
4772    case 320:
4773 <
5685 < /* Line 1455 of yacc.c  */
5686 < #line 2013 "ircd_parser.y"
4773 > #line 1832 "conf_parser.y" /* yacc.c:1646  */
4774      {
4775    if (conf_parser_ctx.pass == 2)
4776 <  {
5690 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
5691 <    else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
5692 <  }
4776 >    block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
4777   }
4778 + #line 4779 "conf_parser.c" /* yacc.c:1646  */
4779      break;
4780  
4781    case 321:
4782 <
5698 < /* Line 1455 of yacc.c  */
5699 < #line 2020 "ircd_parser.y"
4782 > #line 1836 "conf_parser.y" /* yacc.c:1646  */
4783      {
4784    if (conf_parser_ctx.pass == 2)
4785 <  {
5703 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
5704 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
5705 <  }
4785 >    block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
4786   }
4787 + #line 4788 "conf_parser.c" /* yacc.c:1646  */
4788      break;
4789  
4790    case 322:
4791 <
5711 < /* Line 1455 of yacc.c  */
5712 < #line 2027 "ircd_parser.y"
4791 > #line 1840 "conf_parser.y" /* yacc.c:1646  */
4792      {
4793    if (conf_parser_ctx.pass == 2)
4794 <  {
5716 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
5717 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
5718 <  }
4794 >    block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
4795   }
4796 + #line 4797 "conf_parser.c" /* yacc.c:1646  */
4797      break;
4798  
4799    case 323:
4800 <
5724 < /* Line 1455 of yacc.c  */
5725 < #line 2034 "ircd_parser.y"
4800 > #line 1844 "conf_parser.y" /* yacc.c:1646  */
4801      {
4802    if (conf_parser_ctx.pass == 2)
4803 <  {
5729 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
5730 <    else yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
5731 <  }
4803 >    block_state.flags.value |= CONF_FLAGS_NO_TILDE;
4804   }
4805 + #line 4806 "conf_parser.c" /* yacc.c:1646  */
4806      break;
4807  
4808    case 324:
4809 <
5737 < /* Line 1455 of yacc.c  */
5738 < #line 2043 "ircd_parser.y"
4809 > #line 1848 "conf_parser.y" /* yacc.c:1646  */
4810      {
4811    if (conf_parser_ctx.pass == 2)
4812 <  {
5742 <    if (yylval.number)
5743 <      yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
5744 <    else
5745 <      yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
5746 <  }
4812 >    block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
4813   }
4814 + #line 4815 "conf_parser.c" /* yacc.c:1646  */
4815      break;
4816  
4817    case 325:
4818 <
5752 < /* Line 1455 of yacc.c  */
5753 < #line 2054 "ircd_parser.y"
4818 > #line 1852 "conf_parser.y" /* yacc.c:1646  */
4819      {
4820    if (conf_parser_ctx.pass == 2)
4821 <  {
5757 <    if (yylval.number)
5758 <      yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
5759 <    else
5760 <      yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
5761 <  }
4821 >    block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
4822   }
4823 + #line 4824 "conf_parser.c" /* yacc.c:1646  */
4824      break;
4825  
4826    case 326:
4827 <
5767 < /* Line 1455 of yacc.c  */
5768 < #line 2065 "ircd_parser.y"
4827 > #line 1856 "conf_parser.y" /* yacc.c:1646  */
4828      {
4829    if (conf_parser_ctx.pass == 2)
4830 <  {
5772 <    if (yylval.number)
5773 <      yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
5774 <    else
5775 <      yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
5776 <  }
4830 >    block_state.flags.value |= CONF_FLAGS_WEBIRC;
4831   }
4832 + #line 4833 "conf_parser.c" /* yacc.c:1646  */
4833      break;
4834  
4835    case 327:
4836 <
5782 < /* Line 1455 of yacc.c  */
5783 < #line 2076 "ircd_parser.y"
4836 > #line 1860 "conf_parser.y" /* yacc.c:1646  */
4837      {
4838    if (conf_parser_ctx.pass == 2)
4839 <  {
5787 <    if (yylval.number)
5788 <      yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
5789 <    else
5790 <      yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
5791 <  }
4839 >    block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
4840   }
4841 + #line 4842 "conf_parser.c" /* yacc.c:1646  */
4842      break;
4843  
4844    case 328:
4845 <
5797 < /* Line 1455 of yacc.c  */
5798 < #line 2087 "ircd_parser.y"
4845 > #line 1866 "conf_parser.y" /* yacc.c:1646  */
4846      {
4847 <  if (conf_parser_ctx.pass == 2)
4847 >  if (conf_parser_ctx.pass != 2)
4848 >    break;
4849 >
4850 >  if (valid_hostname(yylval.string))
4851    {
4852 <    if (yylval.number)
4853 <      yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
5804 <    else
5805 <      yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
4852 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4853 >    block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
4854    }
4855 +  else
4856 +    ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
4857   }
4858 + #line 4859 "conf_parser.c" /* yacc.c:1646  */
4859      break;
4860  
4861    case 329:
4862 <
5812 < /* Line 1455 of yacc.c  */
5813 < #line 2098 "ircd_parser.y"
4862 > #line 1880 "conf_parser.y" /* yacc.c:1646  */
4863      {
4864 <  if (conf_parser_ctx.pass == 2)
4865 <  {
4866 <    if (yylval.number)
4867 <      yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
4868 <    else
5820 <      yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
5821 <  }
4864 >  if (conf_parser_ctx.pass != 2)
4865 >    break;
4866 >
4867 >  strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4868 >  block_state.flags.value |= CONF_FLAGS_REDIR;
4869   }
4870 + #line 4871 "conf_parser.c" /* yacc.c:1646  */
4871      break;
4872  
4873    case 330:
4874 <
5827 < /* Line 1455 of yacc.c  */
5828 < #line 2110 "ircd_parser.y"
4874 > #line 1889 "conf_parser.y" /* yacc.c:1646  */
4875      {
4876 <  if (conf_parser_ctx.pass == 2)
4877 <  {
5832 <    MyFree(yy_conf->name);
4876 >  if (conf_parser_ctx.pass != 2)
4877 >    break;
4878  
4879 <    if (strlen(yylval.string) < HOSTLEN)
4880 <    {    
5836 <      DupString(yy_conf->name, yylval.string);
5837 <      yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
5838 <    }
5839 <    else
5840 <    {
5841 <      ilog(L_ERROR, "Spoofs must be less than %d..ignoring it", HOSTLEN);
5842 <      yy_conf->name = NULL;
5843 <    }
5844 <  }
4879 >  block_state.flags.value |= CONF_FLAGS_REDIR;
4880 >  block_state.port.value = (yyvsp[-1].number);
4881   }
4882 + #line 4883 "conf_parser.c" /* yacc.c:1646  */
4883      break;
4884  
4885    case 331:
4886 <
5850 < /* Line 1455 of yacc.c  */
5851 < #line 2129 "ircd_parser.y"
4886 > #line 1902 "conf_parser.y" /* yacc.c:1646  */
4887      {
4888 <  if (conf_parser_ctx.pass == 2)
4889 <  {
4890 <    yy_aconf->flags |= CONF_FLAGS_REDIR;
4891 <    MyFree(yy_conf->name);
4892 <    DupString(yy_conf->name, yylval.string);
5858 <  }
4888 >  if (conf_parser_ctx.pass != 2)
4889 >    break;
4890 >
4891 >  reset_block_state();
4892 >  strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
4893   }
4894 + #line 4895 "conf_parser.c" /* yacc.c:1646  */
4895      break;
4896  
4897    case 332:
4898 <
5864 < /* Line 1455 of yacc.c  */
5865 < #line 2139 "ircd_parser.y"
4898 > #line 1909 "conf_parser.y" /* yacc.c:1646  */
4899      {
4900 <  if (conf_parser_ctx.pass == 2)
5868 <  {
5869 <    yy_aconf->flags |= CONF_FLAGS_REDIR;
5870 <    yy_aconf->port = (yyvsp[(3) - (4)].number);
5871 <  }
5872 < }
4900 >  if (conf_parser_ctx.pass != 2)
4901      break;
4902  
4903 <  case 333:
5876 <
5877 < /* Line 1455 of yacc.c  */
5878 < #line 2148 "ircd_parser.y"
5879 <    {
5880 <  if (conf_parser_ctx.pass == 2)
5881 <  {
5882 <    if (yylval.number)
5883 <      yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
5884 <    else
5885 <      yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
5886 <  }
4903 >  create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
4904   }
4905 + #line 4906 "conf_parser.c" /* yacc.c:1646  */
4906      break;
4907  
4908 <  case 334:
4909 <
5892 < /* Line 1455 of yacc.c  */
5893 < #line 2163 "ircd_parser.y"
4908 >  case 339:
4909 > #line 1920 "conf_parser.y" /* yacc.c:1646  */
4910      {
4911    if (conf_parser_ctx.pass == 2)
4912 <  {
5897 <    MyFree(resv_reason);
5898 <    resv_reason = NULL;
5899 <  }
4912 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4913   }
4914 + #line 4915 "conf_parser.c" /* yacc.c:1646  */
4915      break;
4916  
4917 <  case 335:
4918 <
5905 < /* Line 1455 of yacc.c  */
5906 < #line 2170 "ircd_parser.y"
4917 >  case 340:
4918 > #line 1926 "conf_parser.y" /* yacc.c:1646  */
4919      {
4920    if (conf_parser_ctx.pass == 2)
4921 <  {
5910 <    MyFree(resv_reason);
5911 <    resv_reason = NULL;
5912 <  }
4921 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
4922   }
4923 + #line 4924 "conf_parser.c" /* yacc.c:1646  */
4924      break;
4925  
4926 <  case 342:
4927 <
5918 < /* Line 1455 of yacc.c  */
5919 < #line 2182 "ircd_parser.y"
4926 >  case 341:
4927 > #line 1932 "conf_parser.y" /* yacc.c:1646  */
4928      {
4929    if (conf_parser_ctx.pass == 2)
4930 <  {
5923 <    MyFree(resv_reason);
5924 <    DupString(resv_reason, yylval.string);
5925 <  }
4930 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
4931   }
4932 + #line 4933 "conf_parser.c" /* yacc.c:1646  */
4933      break;
4934  
4935 <  case 343:
4936 <
5931 < /* Line 1455 of yacc.c  */
5932 < #line 2191 "ircd_parser.y"
5933 <    {
5934 <  if (conf_parser_ctx.pass == 2)
5935 <  {
5936 <    if (IsChanPrefix(*yylval.string))
4935 >  case 347:
4936 > #line 1947 "conf_parser.y" /* yacc.c:1646  */
4937      {
4938 <      char def_reason[] = "No reason";
4938 >  if (conf_parser_ctx.pass != 2)
4939 >    break;
4940  
4941 <      create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
4942 <    }
4941 >  if (valid_servname(yylval.string))
4942 >  {
4943 >    struct MaskItem *conf = conf_make(CONF_SERVICE);
4944 >    conf->name = xstrdup(yylval.string);
4945    }
5943  /* ignore it for now.. but we really should make a warning if
5944   * its an erroneous name --fl_ */
4946   }
4947 + #line 4948 "conf_parser.c" /* yacc.c:1646  */
4948      break;
4949  
4950 <  case 344:
4951 <
5950 < /* Line 1455 of yacc.c  */
5951 < #line 2206 "ircd_parser.y"
4950 >  case 348:
4951 > #line 1962 "conf_parser.y" /* yacc.c:1646  */
4952      {
4953 <  if (conf_parser_ctx.pass == 2)
5954 <  {
5955 <    char def_reason[] = "No reason";
5956 <
5957 <    create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
5958 <  }
5959 < }
4953 >  if (conf_parser_ctx.pass != 2)
4954      break;
4955  
4956 <  case 345:
4956 >  reset_block_state();
4957  
4958 < /* Line 1455 of yacc.c  */
4959 < #line 2219 "ircd_parser.y"
4960 <    {
4961 <  if (conf_parser_ctx.pass == 2)
5968 <  {
5969 <    yy_conf = make_conf_item(ULINE_TYPE);
5970 <    yy_match_item = map_to_conf(yy_conf);
5971 <    yy_match_item->action = SHARED_ALL;
5972 <  }
4958 >  strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
4959 >  strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
4960 >  strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
4961 >  block_state.flags.value = SHARED_ALL;
4962   }
4963 + #line 4964 "conf_parser.c" /* yacc.c:1646  */
4964      break;
4965  
4966 <  case 346:
4967 <
5978 < /* Line 1455 of yacc.c  */
5979 < #line 2227 "ircd_parser.y"
4966 >  case 349:
4967 > #line 1973 "conf_parser.y" /* yacc.c:1646  */
4968      {
4969 <  if (conf_parser_ctx.pass == 2)
4970 <  {
4971 <    yy_conf = NULL;
5984 <  }
5985 < }
4969 >  struct MaskItem *conf = NULL;
4970 >
4971 >  if (conf_parser_ctx.pass != 2)
4972      break;
4973  
4974 <  case 353:
4974 >  conf = conf_make(CONF_ULINE);
4975 >  conf->flags = block_state.flags.value;
4976 >  conf->name = xstrdup(block_state.name.buf);
4977 >  conf->user = xstrdup(block_state.user.buf);
4978 >  conf->host = xstrdup(block_state.host.buf);
4979 > }
4980 > #line 4981 "conf_parser.c" /* yacc.c:1646  */
4981 >    break;
4982  
4983 < /* Line 1455 of yacc.c  */
4984 < #line 2238 "ircd_parser.y"
4983 >  case 356:
4984 > #line 1990 "conf_parser.y" /* yacc.c:1646  */
4985      {
4986    if (conf_parser_ctx.pass == 2)
4987 <  {
5995 <    MyFree(yy_conf->name);
5996 <    DupString(yy_conf->name, yylval.string);
5997 <  }
4987 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4988   }
4989 + #line 4990 "conf_parser.c" /* yacc.c:1646  */
4990      break;
4991  
4992 <  case 354:
4993 <
6003 < /* Line 1455 of yacc.c  */
6004 < #line 2247 "ircd_parser.y"
4992 >  case 357:
4993 > #line 1996 "conf_parser.y" /* yacc.c:1646  */
4994      {
4995    if (conf_parser_ctx.pass == 2)
4996    {
# Line 6009 | Line 4998 | yyreduce:
4998  
4999      nuh.nuhmask  = yylval.string;
5000      nuh.nickptr  = NULL;
5001 <    nuh.userptr  = userbuf;
5002 <    nuh.hostptr  = hostbuf;
5001 >    nuh.userptr  = block_state.user.buf;
5002 >    nuh.hostptr  = block_state.host.buf;
5003  
5004      nuh.nicksize = 0;
5005 <    nuh.usersize = sizeof(userbuf);
5006 <    nuh.hostsize = sizeof(hostbuf);
5005 >    nuh.usersize = sizeof(block_state.user.buf);
5006 >    nuh.hostsize = sizeof(block_state.host.buf);
5007  
5008      split_nuh(&nuh);
6020
6021    DupString(yy_match_item->user, userbuf);
6022    DupString(yy_match_item->host, hostbuf);
5009    }
5010   }
5011 + #line 5012 "conf_parser.c" /* yacc.c:1646  */
5012      break;
5013  
5014 <  case 355:
5015 <
6029 < /* Line 1455 of yacc.c  */
6030 < #line 2269 "ircd_parser.y"
6031 <    {
6032 <  if (conf_parser_ctx.pass == 2)
6033 <    yy_match_item->action = 0;
6034 < }
6035 <    break;
6036 <
6037 <  case 359:
6038 <
6039 < /* Line 1455 of yacc.c  */
6040 < #line 2276 "ircd_parser.y"
6041 <    {
6042 <  if (conf_parser_ctx.pass == 2)
6043 <    yy_match_item->action |= SHARED_KLINE;
6044 < }
6045 <    break;
6046 <
6047 <  case 360:
6048 <
6049 < /* Line 1455 of yacc.c  */
6050 < #line 2280 "ircd_parser.y"
5014 >  case 358:
5015 > #line 2015 "conf_parser.y" /* yacc.c:1646  */
5016      {
5017    if (conf_parser_ctx.pass == 2)
5018 <    yy_match_item->action |= SHARED_TKLINE;
6054 < }
6055 <    break;
6056 <
6057 <  case 361:
6058 <
6059 < /* Line 1455 of yacc.c  */
6060 < #line 2284 "ircd_parser.y"
6061 <    {
6062 <  if (conf_parser_ctx.pass == 2)
6063 <    yy_match_item->action |= SHARED_UNKLINE;
5018 >    block_state.flags.value = 0;
5019   }
5020 + #line 5021 "conf_parser.c" /* yacc.c:1646  */
5021      break;
5022  
5023    case 362:
5024 <
6069 < /* Line 1455 of yacc.c  */
6070 < #line 2288 "ircd_parser.y"
5024 > #line 2022 "conf_parser.y" /* yacc.c:1646  */
5025      {
5026    if (conf_parser_ctx.pass == 2)
5027 <    yy_match_item->action |= SHARED_XLINE;
5027 >    block_state.flags.value |= SHARED_KLINE;
5028   }
5029 + #line 5030 "conf_parser.c" /* yacc.c:1646  */
5030      break;
5031  
5032    case 363:
5033 <
6079 < /* Line 1455 of yacc.c  */
6080 < #line 2292 "ircd_parser.y"
5033 > #line 2026 "conf_parser.y" /* yacc.c:1646  */
5034      {
5035    if (conf_parser_ctx.pass == 2)
5036 <    yy_match_item->action |= SHARED_TXLINE;
5036 >    block_state.flags.value |= SHARED_UNKLINE;
5037   }
5038 + #line 5039 "conf_parser.c" /* yacc.c:1646  */
5039      break;
5040  
5041    case 364:
5042 <
6089 < /* Line 1455 of yacc.c  */
6090 < #line 2296 "ircd_parser.y"
5042 > #line 2030 "conf_parser.y" /* yacc.c:1646  */
5043      {
5044    if (conf_parser_ctx.pass == 2)
5045 <    yy_match_item->action |= SHARED_UNXLINE;
5045 >    block_state.flags.value |= SHARED_DLINE;
5046   }
5047 + #line 5048 "conf_parser.c" /* yacc.c:1646  */
5048      break;
5049  
5050    case 365:
5051 <
6099 < /* Line 1455 of yacc.c  */
6100 < #line 2300 "ircd_parser.y"
5051 > #line 2034 "conf_parser.y" /* yacc.c:1646  */
5052      {
5053    if (conf_parser_ctx.pass == 2)
5054 <    yy_match_item->action |= SHARED_RESV;
5054 >    block_state.flags.value |= SHARED_UNDLINE;
5055   }
5056 + #line 5057 "conf_parser.c" /* yacc.c:1646  */
5057      break;
5058  
5059    case 366:
5060 <
6109 < /* Line 1455 of yacc.c  */
6110 < #line 2304 "ircd_parser.y"
5060 > #line 2038 "conf_parser.y" /* yacc.c:1646  */
5061      {
5062    if (conf_parser_ctx.pass == 2)
5063 <    yy_match_item->action |= SHARED_TRESV;
5063 >    block_state.flags.value |= SHARED_XLINE;
5064   }
5065 + #line 5066 "conf_parser.c" /* yacc.c:1646  */
5066      break;
5067  
5068    case 367:
5069 <
6119 < /* Line 1455 of yacc.c  */
6120 < #line 2308 "ircd_parser.y"
5069 > #line 2042 "conf_parser.y" /* yacc.c:1646  */
5070      {
5071    if (conf_parser_ctx.pass == 2)
5072 <    yy_match_item->action |= SHARED_UNRESV;
5072 >    block_state.flags.value |= SHARED_UNXLINE;
5073   }
5074 + #line 5075 "conf_parser.c" /* yacc.c:1646  */
5075      break;
5076  
5077    case 368:
5078 <
6129 < /* Line 1455 of yacc.c  */
6130 < #line 2312 "ircd_parser.y"
5078 > #line 2046 "conf_parser.y" /* yacc.c:1646  */
5079      {
5080    if (conf_parser_ctx.pass == 2)
5081 <    yy_match_item->action |= SHARED_LOCOPS;
5081 >    block_state.flags.value |= SHARED_RESV;
5082   }
5083 + #line 5084 "conf_parser.c" /* yacc.c:1646  */
5084      break;
5085  
5086    case 369:
5087 <
6139 < /* Line 1455 of yacc.c  */
6140 < #line 2316 "ircd_parser.y"
5087 > #line 2050 "conf_parser.y" /* yacc.c:1646  */
5088      {
5089    if (conf_parser_ctx.pass == 2)
5090 <    yy_match_item->action = SHARED_ALL;
5090 >    block_state.flags.value |= SHARED_UNRESV;
5091   }
5092 + #line 5093 "conf_parser.c" /* yacc.c:1646  */
5093      break;
5094  
5095    case 370:
5096 <
6149 < /* Line 1455 of yacc.c  */
6150 < #line 2325 "ircd_parser.y"
5096 > #line 2054 "conf_parser.y" /* yacc.c:1646  */
5097      {
5098    if (conf_parser_ctx.pass == 2)
5099 <  {
6154 <    yy_conf = make_conf_item(CLUSTER_TYPE);
6155 <    yy_conf->flags = SHARED_ALL;
6156 <  }
5099 >    block_state.flags.value |= SHARED_LOCOPS;
5100   }
5101 + #line 5102 "conf_parser.c" /* yacc.c:1646  */
5102      break;
5103  
5104    case 371:
5105 <
6162 < /* Line 1455 of yacc.c  */
6163 < #line 2332 "ircd_parser.y"
5105 > #line 2058 "conf_parser.y" /* yacc.c:1646  */
5106      {
5107    if (conf_parser_ctx.pass == 2)
5108 <  {
6167 <    if (yy_conf->name == NULL)
6168 <      DupString(yy_conf->name, "*");
6169 <    yy_conf = NULL;
6170 <  }
5108 >    block_state.flags.value = SHARED_ALL;
5109   }
5110 + #line 5111 "conf_parser.c" /* yacc.c:1646  */
5111      break;
5112  
5113 <  case 377:
5114 <
6176 < /* Line 1455 of yacc.c  */
6177 < #line 2345 "ircd_parser.y"
5113 >  case 372:
5114 > #line 2067 "conf_parser.y" /* yacc.c:1646  */
5115      {
5116 <  if (conf_parser_ctx.pass == 2)
6180 <    DupString(yy_conf->name, yylval.string);
6181 < }
5116 >  if (conf_parser_ctx.pass != 2)
5117      break;
5118  
5119 <  case 378:
5119 >  reset_block_state();
5120  
5121 < /* Line 1455 of yacc.c  */
5122 < #line 2351 "ircd_parser.y"
6188 <    {
6189 <  if (conf_parser_ctx.pass == 2)
6190 <    yy_conf->flags = 0;
5121 >  strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
5122 >  block_state.flags.value = SHARED_ALL;
5123   }
5124 + #line 5125 "conf_parser.c" /* yacc.c:1646  */
5125 +    break;
5126 +
5127 +  case 373:
5128 + #line 2076 "conf_parser.y" /* yacc.c:1646  */
5129 +    {
5130 +  struct MaskItem *conf = NULL;
5131 +
5132 +  if (conf_parser_ctx.pass != 2)
5133      break;
5134  
5135 <  case 382:
5135 >  conf = conf_make(CONF_CLUSTER);
5136 >  conf->flags = block_state.flags.value;
5137 >  conf->name = xstrdup(block_state.name.buf);
5138 > }
5139 > #line 5140 "conf_parser.c" /* yacc.c:1646  */
5140 >    break;
5141  
5142 < /* Line 1455 of yacc.c  */
5143 < #line 2358 "ircd_parser.y"
5142 >  case 379:
5143 > #line 2091 "conf_parser.y" /* yacc.c:1646  */
5144      {
5145    if (conf_parser_ctx.pass == 2)
5146 <    yy_conf->flags |= SHARED_KLINE;
5146 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5147   }
5148 + #line 5149 "conf_parser.c" /* yacc.c:1646  */
5149      break;
5150  
5151 <  case 383:
5152 <
6206 < /* Line 1455 of yacc.c  */
6207 < #line 2362 "ircd_parser.y"
5151 >  case 380:
5152 > #line 2097 "conf_parser.y" /* yacc.c:1646  */
5153      {
5154    if (conf_parser_ctx.pass == 2)
5155 <    yy_conf->flags |= SHARED_TKLINE;
5155 >    block_state.flags.value = 0;
5156   }
5157 + #line 5158 "conf_parser.c" /* yacc.c:1646  */
5158      break;
5159  
5160    case 384:
5161 <
6216 < /* Line 1455 of yacc.c  */
6217 < #line 2366 "ircd_parser.y"
5161 > #line 2104 "conf_parser.y" /* yacc.c:1646  */
5162      {
5163    if (conf_parser_ctx.pass == 2)
5164 <    yy_conf->flags |= SHARED_UNKLINE;
5164 >    block_state.flags.value |= SHARED_KLINE;
5165   }
5166 + #line 5167 "conf_parser.c" /* yacc.c:1646  */
5167      break;
5168  
5169    case 385:
5170 <
6226 < /* Line 1455 of yacc.c  */
6227 < #line 2370 "ircd_parser.y"
5170 > #line 2108 "conf_parser.y" /* yacc.c:1646  */
5171      {
5172    if (conf_parser_ctx.pass == 2)
5173 <    yy_conf->flags |= SHARED_XLINE;
5173 >    block_state.flags.value |= SHARED_UNKLINE;
5174   }
5175 + #line 5176 "conf_parser.c" /* yacc.c:1646  */
5176      break;
5177  
5178    case 386:
5179 <
6236 < /* Line 1455 of yacc.c  */
6237 < #line 2374 "ircd_parser.y"
5179 > #line 2112 "conf_parser.y" /* yacc.c:1646  */
5180      {
5181    if (conf_parser_ctx.pass == 2)
5182 <    yy_conf->flags |= SHARED_TXLINE;
5182 >    block_state.flags.value |= SHARED_DLINE;
5183   }
5184 + #line 5185 "conf_parser.c" /* yacc.c:1646  */
5185      break;
5186  
5187    case 387:
5188 <
6246 < /* Line 1455 of yacc.c  */
6247 < #line 2378 "ircd_parser.y"
5188 > #line 2116 "conf_parser.y" /* yacc.c:1646  */
5189      {
5190    if (conf_parser_ctx.pass == 2)
5191 <    yy_conf->flags |= SHARED_UNXLINE;
5191 >    block_state.flags.value |= SHARED_UNDLINE;
5192   }
5193 + #line 5194 "conf_parser.c" /* yacc.c:1646  */
5194      break;
5195  
5196    case 388:
5197 <
6256 < /* Line 1455 of yacc.c  */
6257 < #line 2382 "ircd_parser.y"
5197 > #line 2120 "conf_parser.y" /* yacc.c:1646  */
5198      {
5199    if (conf_parser_ctx.pass == 2)
5200 <    yy_conf->flags |= SHARED_RESV;
5200 >    block_state.flags.value |= SHARED_XLINE;
5201   }
5202 + #line 5203 "conf_parser.c" /* yacc.c:1646  */
5203      break;
5204  
5205    case 389:
5206 <
6266 < /* Line 1455 of yacc.c  */
6267 < #line 2386 "ircd_parser.y"
5206 > #line 2124 "conf_parser.y" /* yacc.c:1646  */
5207      {
5208    if (conf_parser_ctx.pass == 2)
5209 <    yy_conf->flags |= SHARED_TRESV;
5209 >    block_state.flags.value |= SHARED_UNXLINE;
5210   }
5211 + #line 5212 "conf_parser.c" /* yacc.c:1646  */
5212      break;
5213  
5214    case 390:
5215 <
6276 < /* Line 1455 of yacc.c  */
6277 < #line 2390 "ircd_parser.y"
5215 > #line 2128 "conf_parser.y" /* yacc.c:1646  */
5216      {
5217    if (conf_parser_ctx.pass == 2)
5218 <    yy_conf->flags |= SHARED_UNRESV;
5218 >    block_state.flags.value |= SHARED_RESV;
5219   }
5220 + #line 5221 "conf_parser.c" /* yacc.c:1646  */
5221      break;
5222  
5223    case 391:
5224 <
6286 < /* Line 1455 of yacc.c  */
6287 < #line 2394 "ircd_parser.y"
5224 > #line 2132 "conf_parser.y" /* yacc.c:1646  */
5225      {
5226    if (conf_parser_ctx.pass == 2)
5227 <    yy_conf->flags |= SHARED_LOCOPS;
5227 >    block_state.flags.value |= SHARED_UNRESV;
5228   }
5229 + #line 5230 "conf_parser.c" /* yacc.c:1646  */
5230      break;
5231  
5232    case 392:
5233 <
6296 < /* Line 1455 of yacc.c  */
6297 < #line 2398 "ircd_parser.y"
5233 > #line 2136 "conf_parser.y" /* yacc.c:1646  */
5234      {
5235    if (conf_parser_ctx.pass == 2)
5236 <    yy_conf->flags = SHARED_ALL;
5236 >    block_state.flags.value |= SHARED_LOCOPS;
5237   }
5238 + #line 5239 "conf_parser.c" /* yacc.c:1646  */
5239      break;
5240  
5241    case 393:
5242 <
6306 < /* Line 1455 of yacc.c  */
6307 < #line 2407 "ircd_parser.y"
5242 > #line 2140 "conf_parser.y" /* yacc.c:1646  */
5243      {
5244    if (conf_parser_ctx.pass == 2)
5245 <  {
6311 <    yy_conf = make_conf_item(SERVER_TYPE);
6312 <    yy_aconf = (struct AccessItem *)map_to_conf(yy_conf);
6313 <    yy_aconf->passwd = NULL;
6314 <    /* defaults */
6315 <    yy_aconf->port = PORTNUM;
6316 <
6317 <    if (ConfigFileEntry.burst_away)
6318 <      yy_aconf->flags = CONF_FLAGS_BURST_AWAY;
6319 <  }
6320 <  else
6321 <  {
6322 <    MyFree(class_name);
6323 <    class_name = NULL;
6324 <  }
5245 >    block_state.flags.value = SHARED_ALL;
5246   }
5247 + #line 5248 "conf_parser.c" /* yacc.c:1646  */
5248      break;
5249  
5250    case 394:
5251 <
6330 < /* Line 1455 of yacc.c  */
6331 < #line 2425 "ircd_parser.y"
5251 > #line 2149 "conf_parser.y" /* yacc.c:1646  */
5252      {
6333  if (conf_parser_ctx.pass == 2)
6334  {
6335    struct CollectItem *yy_hconf=NULL;
6336    struct CollectItem *yy_lconf=NULL;
6337    dlink_node *ptr;
6338    dlink_node *next_ptr;
6339 #ifdef HAVE_LIBCRYPTO
6340    if (yy_aconf->host &&
6341        ((yy_aconf->passwd && yy_aconf->spasswd) ||
6342         (yy_aconf->rsa_public_key && IsConfCryptLink(yy_aconf))))
6343 #else /* !HAVE_LIBCRYPTO */
6344      if (yy_aconf->host && !IsConfCryptLink(yy_aconf) &&
6345          yy_aconf->passwd && yy_aconf->spasswd)
6346 #endif /* !HAVE_LIBCRYPTO */
6347        {
6348          if (conf_add_server(yy_conf, class_name) == -1)
6349          {
6350            delete_conf_item(yy_conf);
6351            yy_conf = NULL;
6352            yy_aconf = NULL;
6353          }
6354        }
6355        else
6356        {
6357          /* Even if yy_conf ->name is NULL
6358           * should still unhook any hub/leaf confs still pending
6359           */
6360          unhook_hub_leaf_confs();
6361
6362          if (yy_conf->name != NULL)
6363          {
6364 #ifndef HAVE_LIBCRYPTO
6365            if (IsConfCryptLink(yy_aconf))
6366              yyerror("Ignoring connect block -- no OpenSSL support");
6367 #else
6368            if (IsConfCryptLink(yy_aconf) && !yy_aconf->rsa_public_key)
6369              yyerror("Ignoring connect block -- missing key");
6370 #endif
6371            if (yy_aconf->host == NULL)
6372              yyerror("Ignoring connect block -- missing host");
6373            else if (!IsConfCryptLink(yy_aconf) &&
6374                    (!yy_aconf->passwd || !yy_aconf->spasswd))
6375              yyerror("Ignoring connect block -- missing password");
6376          }
6377
6378
6379          /* XXX
6380           * This fixes a try_connections() core (caused by invalid class_ptr
6381           * pointers) reported by metalrock. That's an ugly fix, but there
6382           * is currently no better way. The entire config subsystem needs an
6383           * rewrite ASAP. make_conf_item() shouldn't really add things onto
6384           * a doubly linked list immediately without any sanity checks!  -Michael
6385           */
6386          delete_conf_item(yy_conf);
6387
6388          yy_aconf = NULL;
6389          yy_conf = NULL;
6390        }
6391
6392      /*
6393       * yy_conf is still pointing at the server that is having
6394       * a connect block built for it. This means, y_aconf->name
6395       * points to the actual irc name this server will be known as.
6396       * Now this new server has a set or even just one hub_mask (or leaf_mask)
6397       * given in the link list at yy_hconf. Fill in the HUB confs
6398       * from this link list now.
6399       */        
6400      DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
6401      {
6402        struct ConfItem *new_hub_conf;
6403        struct MatchItem *match_item;
6404
6405        yy_hconf = ptr->data;
6406
6407        /* yy_conf == NULL is a fatal error for this connect block! */
6408        if ((yy_conf != NULL) && (yy_conf->name != NULL))
6409        {
6410          new_hub_conf = make_conf_item(HUB_TYPE);
6411          match_item = (struct MatchItem *)map_to_conf(new_hub_conf);
6412          DupString(new_hub_conf->name, yy_conf->name);
6413          if (yy_hconf->user != NULL)
6414            DupString(match_item->user, yy_hconf->user);
6415          else
6416            DupString(match_item->user, "*");
6417          if (yy_hconf->host != NULL)
6418            DupString(match_item->host, yy_hconf->host);
6419          else
6420            DupString(match_item->host, "*");
6421        }
6422        dlinkDelete(&yy_hconf->node, &hub_conf_list);
6423        free_collect_item(yy_hconf);
6424      }
6425
6426      /* Ditto for the LEAF confs */
6427
6428      DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
6429      {
6430        struct ConfItem *new_leaf_conf;
6431        struct MatchItem *match_item;
5253  
5254 <        yy_lconf = ptr->data;
5254 >  if (conf_parser_ctx.pass != 2)
5255 >    break;
5256  
5257 <        if ((yy_conf != NULL) && (yy_conf->name != NULL))
5258 <        {
5259 <          new_leaf_conf = make_conf_item(LEAF_TYPE);
6438 <          match_item = (struct MatchItem *)map_to_conf(new_leaf_conf);
6439 <          DupString(new_leaf_conf->name, yy_conf->name);
6440 <          if (yy_lconf->user != NULL)
6441 <            DupString(match_item->user, yy_lconf->user);
6442 <          else
6443 <            DupString(match_item->user, "*");
6444 <          if (yy_lconf->host != NULL)
6445 <            DupString(match_item->host, yy_lconf->host);
6446 <          else
6447 <            DupString(match_item->host, "*");
6448 <        }
6449 <        dlinkDelete(&yy_lconf->node, &leaf_conf_list);
6450 <        free_collect_item(yy_lconf);
6451 <      }
6452 <      MyFree(class_name);
6453 <      class_name = NULL;
6454 <      yy_conf = NULL;
6455 <      yy_aconf = NULL;
6456 <  }
5257 >  reset_block_state();
5258 >  block_state.aftype.value = AF_INET;
5259 >  block_state.port.value = PORTNUM;
5260   }
5261 + #line 5262 "conf_parser.c" /* yacc.c:1646  */
5262      break;
5263  
5264 <  case 419:
5265 <
6462 < /* Line 1455 of yacc.c  */
6463 < #line 2564 "ircd_parser.y"
5264 >  case 395:
5265 > #line 2158 "conf_parser.y" /* yacc.c:1646  */
5266      {
5267 <  if (conf_parser_ctx.pass == 2)
5268 <  {
6467 <    if (yy_conf->name != NULL)
6468 <      yyerror("Multiple connect name entry");
5267 >  struct MaskItem *conf = NULL;
5268 >  struct addrinfo hints, *res;
5269  
5270 <    MyFree(yy_conf->name);
6471 <    DupString(yy_conf->name, yylval.string);
6472 <  }
6473 < }
5270 >  if (conf_parser_ctx.pass != 2)
5271      break;
5272  
5273 <  case 420:
5273 >  if (!block_state.name.buf[0] ||
5274 >      !block_state.host.buf[0])
5275 >    break;
5276  
5277 < /* Line 1455 of yacc.c  */
5278 < #line 2576 "ircd_parser.y"
5279 <    {
6481 <  if (conf_parser_ctx.pass == 2)
6482 <  {
6483 <    if (yy_conf->name != NULL)
6484 <      yyerror("Multiple connect name entry");
5277 >  if (!block_state.rpass.buf[0] ||
5278 >      !block_state.spass.buf[0])
5279 >    break;
5280  
5281 <    MyFree(yy_conf->name);
5282 <    DupString(yy_conf->name, yylval.string);
6488 <  }
6489 < }
5281 >  if (has_wildcards(block_state.name.buf) ||
5282 >      has_wildcards(block_state.host.buf))
5283      break;
5284  
5285 <  case 421:
5285 >  conf = conf_make(CONF_SERVER);
5286 >  conf->port = block_state.port.value;
5287 >  conf->flags = block_state.flags.value;
5288 >  conf->aftype = block_state.aftype.value;
5289 >  conf->host = xstrdup(block_state.host.buf);
5290 >  conf->name = xstrdup(block_state.name.buf);
5291 >  conf->passwd = xstrdup(block_state.rpass.buf);
5292 >  conf->spasswd = xstrdup(block_state.spass.buf);
5293  
5294 < /* Line 1455 of yacc.c  */
5295 < #line 2588 "ircd_parser.y"
6496 <    {
6497 <  if (conf_parser_ctx.pass == 2)
6498 <  {
6499 <    MyFree(yy_aconf->host);
6500 <    DupString(yy_aconf->host, yylval.string);
6501 <  }
6502 < }
6503 <    break;
5294 >  if (block_state.cert.buf[0])
5295 >    conf->certfp = xstrdup(block_state.cert.buf);
5296  
5297 <  case 422:
5297 >  if (block_state.ciph.buf[0])
5298 >    conf->cipher_list = xstrdup(block_state.ciph.buf);
5299  
5300 < /* Line 1455 of yacc.c  */
5301 < #line 2597 "ircd_parser.y"
6509 <    {
6510 <  if (conf_parser_ctx.pass == 2)
6511 <  {
6512 <    struct addrinfo hints, *res;
5300 >  dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
5301 >  dlinkMoveList(&block_state.hub.list, &conf->hub_list);
5302  
5303 +  if (block_state.bind.buf[0])
5304 +  {
5305      memset(&hints, 0, sizeof(hints));
5306  
5307      hints.ai_family   = AF_UNSPEC;
5308      hints.ai_socktype = SOCK_STREAM;
5309      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
5310  
5311 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
5312 <      ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
5311 >    if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
5312 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
5313      else
5314      {
5315 <      assert(res != NULL);
5315 >      assert(res);
5316  
5317 <      memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
5318 <      yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
5319 <      yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
5320 <      irc_freeaddrinfo(res);
5317 >      memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
5318 >      conf->bind.ss.ss_family = res->ai_family;
5319 >      conf->bind.ss_len = res->ai_addrlen;
5320 >      freeaddrinfo(res);
5321      }
5322    }
6532 }
6533    break;
6534
6535  case 423:
6536
6537 /* Line 1455 of yacc.c  */
6538 #line 2623 "ircd_parser.y"
6539    {
6540  if (conf_parser_ctx.pass == 2)
6541  {
6542    if ((yyvsp[(3) - (4)].string)[0] == ':')
6543      yyerror("Server passwords cannot begin with a colon");
6544    else if (strchr((yyvsp[(3) - (4)].string), ' ') != NULL)
6545      yyerror("Server passwords cannot contain spaces");
6546    else {
6547      if (yy_aconf->spasswd != NULL)
6548        memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
5323  
5324 <      MyFree(yy_aconf->spasswd);
5325 <      DupString(yy_aconf->spasswd, yylval.string);
6552 <    }
6553 <  }
5324 >  conf_add_class_to_conf(conf, block_state.class.buf);
5325 >  lookup_confhost(conf);
5326   }
5327 + #line 5328 "conf_parser.c" /* yacc.c:1646  */
5328      break;
5329  
5330 <  case 424:
5331 <
6559 < /* Line 1455 of yacc.c  */
6560 < #line 2641 "ircd_parser.y"
5330 >  case 413:
5331 > #line 2238 "conf_parser.y" /* yacc.c:1646  */
5332      {
5333    if (conf_parser_ctx.pass == 2)
5334 <  {
6564 <    if ((yyvsp[(3) - (4)].string)[0] == ':')
6565 <      yyerror("Server passwords cannot begin with a colon");
6566 <    else if (strchr((yyvsp[(3) - (4)].string), ' ') != NULL)
6567 <      yyerror("Server passwords cannot contain spaces");
6568 <    else {
6569 <      if (yy_aconf->passwd != NULL)
6570 <        memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
6571 <
6572 <      MyFree(yy_aconf->passwd);
6573 <      DupString(yy_aconf->passwd, yylval.string);
6574 <    }
6575 <  }
5334 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5335   }
5336 + #line 5337 "conf_parser.c" /* yacc.c:1646  */
5337      break;
5338  
5339 <  case 425:
5340 <
6581 < /* Line 1455 of yacc.c  */
6582 < #line 2659 "ircd_parser.y"
5339 >  case 414:
5340 > #line 2244 "conf_parser.y" /* yacc.c:1646  */
5341      {
5342    if (conf_parser_ctx.pass == 2)
5343 <    yy_aconf->port = (yyvsp[(3) - (4)].number);
5343 >    strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
5344   }
5345 + #line 5346 "conf_parser.c" /* yacc.c:1646  */
5346      break;
5347  
5348 <  case 426:
5349 <
6591 < /* Line 1455 of yacc.c  */
6592 < #line 2665 "ircd_parser.y"
6593 <    {
6594 <  if (conf_parser_ctx.pass == 2)
6595 <    yy_aconf->aftype = AF_INET;
6596 < }
6597 <    break;
6598 <
6599 <  case 427:
6600 <
6601 < /* Line 1455 of yacc.c  */
6602 < #line 2669 "ircd_parser.y"
5348 >  case 415:
5349 > #line 2250 "conf_parser.y" /* yacc.c:1646  */
5350      {
6604 #ifdef IPV6
5351    if (conf_parser_ctx.pass == 2)
5352 <    yy_aconf->aftype = AF_INET6;
6607 < #endif
5352 >    strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
5353   }
5354 + #line 5355 "conf_parser.c" /* yacc.c:1646  */
5355      break;
5356  
5357 <  case 428:
5358 <
6613 < /* Line 1455 of yacc.c  */
6614 < #line 2677 "ircd_parser.y"
5357 >  case 416:
5358 > #line 2256 "conf_parser.y" /* yacc.c:1646  */
5359      {
5360 <  if (conf_parser_ctx.pass == 2)
6617 <  {
6618 <    MyFree(yy_aconf->fakename);
6619 <    DupString(yy_aconf->fakename, yylval.string);
6620 <  }
6621 < }
5360 >  if (conf_parser_ctx.pass != 2)
5361      break;
5362  
5363 <  case 429:
5364 <
5365 < /* Line 1455 of yacc.c  */
5366 < #line 2686 "ircd_parser.y"
5367 <    {
5363 >  if ((yyvsp[-1].string)[0] == ':')
5364 >    conf_error_report("Server passwords cannot begin with a colon");
5365 >  else if (strchr((yyvsp[-1].string), ' '))
5366 >    conf_error_report("Server passwords cannot contain spaces");
5367 >  else
5368 >    strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
5369   }
5370 + #line 5371 "conf_parser.c" /* yacc.c:1646  */
5371      break;
5372  
5373 <  case 433:
5374 <
6634 < /* Line 1455 of yacc.c  */
6635 < #line 2690 "ircd_parser.y"
6636 <    { not_atom = 1; }
6637 <    break;
6638 <
6639 <  case 435:
6640 <
6641 < /* Line 1455 of yacc.c  */
6642 < #line 2691 "ircd_parser.y"
6643 <    { not_atom = 0; }
6644 <    break;
6645 <
6646 <  case 437:
6647 <
6648 < /* Line 1455 of yacc.c  */
6649 < #line 2694 "ircd_parser.y"
5373 >  case 417:
5374 > #line 2269 "conf_parser.y" /* yacc.c:1646  */
5375      {
5376 <  if (conf_parser_ctx.pass == 2)
6652 < #ifndef HAVE_LIBZ
6653 <    yyerror("Ignoring flags = compressed; -- no zlib support");
6654 < #else
6655 < {
6656 <   if (not_atom)ClearConfCompressed(yy_aconf);
6657 <   else SetConfCompressed(yy_aconf);
6658 < }
6659 < #endif
6660 < }
5376 >  if (conf_parser_ctx.pass != 2)
5377      break;
5378  
5379 <  case 438:
5380 <
5381 < /* Line 1455 of yacc.c  */
5382 < #line 2705 "ircd_parser.y"
5383 <    {
5384 <  if (conf_parser_ctx.pass == 2)
6669 <  {
6670 <    if (not_atom)ClearConfCryptLink(yy_aconf);
6671 <    else SetConfCryptLink(yy_aconf);
6672 <  }
5379 >  if ((yyvsp[-1].string)[0] == ':')
5380 >    conf_error_report("Server passwords cannot begin with a colon");
5381 >  else if (strchr((yyvsp[-1].string), ' '))
5382 >    conf_error_report("Server passwords cannot contain spaces");
5383 >  else
5384 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5385   }
5386 + #line 5387 "conf_parser.c" /* yacc.c:1646  */
5387      break;
5388  
5389 <  case 439:
5390 <
6678 < /* Line 1455 of yacc.c  */
6679 < #line 2712 "ircd_parser.y"
5389 >  case 418:
5390 > #line 2282 "conf_parser.y" /* yacc.c:1646  */
5391      {
5392    if (conf_parser_ctx.pass == 2)
5393 <  {
6683 <    if (not_atom)ClearConfAllowAutoConn(yy_aconf);
6684 <    else SetConfAllowAutoConn(yy_aconf);
6685 <  }
5393 >    strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
5394   }
5395 + #line 5396 "conf_parser.c" /* yacc.c:1646  */
5396      break;
5397  
5398 <  case 440:
5399 <
6691 < /* Line 1455 of yacc.c  */
6692 < #line 2719 "ircd_parser.y"
5398 >  case 419:
5399 > #line 2288 "conf_parser.y" /* yacc.c:1646  */
5400      {
5401    if (conf_parser_ctx.pass == 2)
5402 <  {
6696 <    if (not_atom)ClearConfAwayBurst(yy_aconf);
6697 <    else SetConfAwayBurst(yy_aconf);
6698 <  }
5402 >    block_state.port.value = (yyvsp[-1].number);
5403   }
5404 + #line 5405 "conf_parser.c" /* yacc.c:1646  */
5405      break;
5406  
5407 <  case 441:
5408 <
6704 < /* Line 1455 of yacc.c  */
6705 < #line 2726 "ircd_parser.y"
5407 >  case 420:
5408 > #line 2294 "conf_parser.y" /* yacc.c:1646  */
5409      {
5410    if (conf_parser_ctx.pass == 2)
5411 <  {
6709 <    if (not_atom)ClearConfTopicBurst(yy_aconf);
6710 <    else SetConfTopicBurst(yy_aconf);
6711 <  }
5411 >    block_state.aftype.value = AF_INET;
5412   }
5413 + #line 5414 "conf_parser.c" /* yacc.c:1646  */
5414      break;
5415  
5416 <  case 442:
5417 <
6717 < /* Line 1455 of yacc.c  */
6718 < #line 2736 "ircd_parser.y"
6719 <    {
6720 < #ifdef HAVE_LIBCRYPTO
6721 <  if (conf_parser_ctx.pass == 2)
6722 <  {
6723 <    BIO *file;
6724 <
6725 <    if (yy_aconf->rsa_public_key != NULL)
6726 <    {
6727 <      RSA_free(yy_aconf->rsa_public_key);
6728 <      yy_aconf->rsa_public_key = NULL;
6729 <    }
6730 <
6731 <    if (yy_aconf->rsa_public_key_file != NULL)
6732 <    {
6733 <      MyFree(yy_aconf->rsa_public_key_file);
6734 <      yy_aconf->rsa_public_key_file = NULL;
6735 <    }
6736 <
6737 <    DupString(yy_aconf->rsa_public_key_file, yylval.string);
6738 <
6739 <    if ((file = BIO_new_file(yylval.string, "r")) == NULL)
6740 <    {
6741 <      yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
6742 <      break;
6743 <    }
6744 <
6745 <    yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
6746 <
6747 <    if (yy_aconf->rsa_public_key == NULL)
6748 <    {
6749 <      yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
6750 <      break;
6751 <    }
6752 <      
6753 <    BIO_set_close(file, BIO_CLOSE);
6754 <    BIO_free(file);
6755 <  }
6756 < #endif /* HAVE_LIBCRYPTO */
6757 < }
6758 <    break;
6759 <
6760 <  case 443:
6761 <
6762 < /* Line 1455 of yacc.c  */
6763 < #line 2777 "ircd_parser.y"
5416 >  case 421:
5417 > #line 2298 "conf_parser.y" /* yacc.c:1646  */
5418      {
5419    if (conf_parser_ctx.pass == 2)
5420 <  {
6767 <    if (yylval.number)
6768 <      yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
6769 <    else
6770 <      yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
6771 <  }
5420 >    block_state.aftype.value = AF_INET6;
5421   }
5422 + #line 5423 "conf_parser.c" /* yacc.c:1646  */
5423      break;
5424  
5425 <  case 444:
5426 <
6777 < /* Line 1455 of yacc.c  */
6778 < #line 2788 "ircd_parser.y"
5425 >  case 422:
5426 > #line 2304 "conf_parser.y" /* yacc.c:1646  */
5427      {
5428 <  if (conf_parser_ctx.pass == 2)
6781 <  {
6782 <    if (yylval.number)
6783 <      yy_aconf->flags |= CONF_FLAGS_CRYPTLINK;
6784 <    else
6785 <      yy_aconf->flags &= ~CONF_FLAGS_CRYPTLINK;
6786 <  }
5428 >  block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
5429   }
5430 + #line 5431 "conf_parser.c" /* yacc.c:1646  */
5431      break;
5432  
5433 <  case 445:
5434 <
6792 < /* Line 1455 of yacc.c  */
6793 < #line 2799 "ircd_parser.y"
5433 >  case 426:
5434 > #line 2310 "conf_parser.y" /* yacc.c:1646  */
5435      {
5436    if (conf_parser_ctx.pass == 2)
5437 <  {
6797 <    if (yylval.number)
6798 < #ifndef HAVE_LIBZ
6799 <      yyerror("Ignoring compressed=yes; -- no zlib support");
6800 < #else
6801 <      yy_aconf->flags |= CONF_FLAGS_COMPRESSED;
6802 < #endif
6803 <    else
6804 <      yy_aconf->flags &= ~CONF_FLAGS_COMPRESSED;
6805 <  }
5437 >    block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
5438   }
5439 + #line 5440 "conf_parser.c" /* yacc.c:1646  */
5440      break;
5441  
5442 <  case 446:
5443 <
6811 < /* Line 1455 of yacc.c  */
6812 < #line 2814 "ircd_parser.y"
5442 >  case 427:
5443 > #line 2314 "conf_parser.y" /* yacc.c:1646  */
5444      {
5445    if (conf_parser_ctx.pass == 2)
5446 <  {
6816 <    if (yylval.number)
6817 <      yy_aconf->flags |= CONF_FLAGS_ALLOW_AUTO_CONN;
6818 <    else
6819 <      yy_aconf->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN;
6820 <  }
5446 >    block_state.flags.value |= CONF_FLAGS_SSL;
5447   }
5448 + #line 5449 "conf_parser.c" /* yacc.c:1646  */
5449      break;
5450  
5451 <  case 447:
5452 <
6826 < /* Line 1455 of yacc.c  */
6827 < #line 2825 "ircd_parser.y"
5451 >  case 428:
5452 > #line 2320 "conf_parser.y" /* yacc.c:1646  */
5453      {
5454    if (conf_parser_ctx.pass == 2)
5455    {
5456      if (yylval.number)
5457 <      SetConfTopicBurst(yy_aconf);
5457 >      block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
5458      else
5459 <      ClearConfTopicBurst(yy_aconf);
5459 >      block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
5460    }
5461   }
5462 + #line 5463 "conf_parser.c" /* yacc.c:1646  */
5463      break;
5464  
5465 <  case 448:
5466 <
6841 < /* Line 1455 of yacc.c  */
6842 < #line 2836 "ircd_parser.y"
5465 >  case 429:
5466 > #line 2331 "conf_parser.y" /* yacc.c:1646  */
5467      {
5468    if (conf_parser_ctx.pass == 2)
5469 <  {
6846 <    struct CollectItem *yy_tmp;
6847 <
6848 <    yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
6849 <    DupString(yy_tmp->host, yylval.string);
6850 <    DupString(yy_tmp->user, "*");
6851 <    dlinkAdd(yy_tmp, &yy_tmp->node, &hub_conf_list);
6852 <  }
5469 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
5470   }
5471 + #line 5472 "conf_parser.c" /* yacc.c:1646  */
5472      break;
5473  
5474 <  case 449:
5475 <
6858 < /* Line 1455 of yacc.c  */
6859 < #line 2849 "ircd_parser.y"
5474 >  case 430:
5475 > #line 2337 "conf_parser.y" /* yacc.c:1646  */
5476      {
5477    if (conf_parser_ctx.pass == 2)
5478 <  {
6863 <    struct CollectItem *yy_tmp;
6864 <
6865 <    yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
6866 <    DupString(yy_tmp->host, yylval.string);
6867 <    DupString(yy_tmp->user, "*");
6868 <    dlinkAdd(yy_tmp, &yy_tmp->node, &leaf_conf_list);
6869 <  }
5478 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
5479   }
5480 + #line 5481 "conf_parser.c" /* yacc.c:1646  */
5481      break;
5482  
5483 <  case 450:
5484 <
6875 < /* Line 1455 of yacc.c  */
6876 < #line 2862 "ircd_parser.y"
5483 >  case 431:
5484 > #line 2343 "conf_parser.y" /* yacc.c:1646  */
5485      {
5486    if (conf_parser_ctx.pass == 2)
5487 <  {
6880 <    MyFree(class_name);
6881 <    DupString(class_name, yylval.string);
6882 <  }
5487 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
5488   }
5489 + #line 5490 "conf_parser.c" /* yacc.c:1646  */
5490      break;
5491  
5492 <  case 451:
5493 <
6888 < /* Line 1455 of yacc.c  */
6889 < #line 2871 "ircd_parser.y"
5492 >  case 432:
5493 > #line 2349 "conf_parser.y" /* yacc.c:1646  */
5494      {
5495   #ifdef HAVE_LIBCRYPTO
5496    if (conf_parser_ctx.pass == 2)
5497 <  {
6894 <    struct EncCapability *ecap;
6895 <    const char *cipher_name;
6896 <    int found = 0;
6897 <
6898 <    yy_aconf->cipher_preference = NULL;
6899 <    cipher_name = yylval.string;
6900 <
6901 <    for (ecap = CipherTable; ecap->name; ecap++)
6902 <    {
6903 <      if ((irccmp(ecap->name, cipher_name) == 0) &&
6904 <          (ecap->cap & CAP_ENC_MASK))
6905 <      {
6906 <        yy_aconf->cipher_preference = ecap;
6907 <        found = 1;
6908 <        break;
6909 <      }
6910 <    }
6911 <
6912 <    if (!found)
6913 <      yyerror("Invalid cipher");
6914 <  }
5497 >    strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
5498   #else
5499    if (conf_parser_ctx.pass == 2)
5500 <    yyerror("Ignoring cipher_preference -- no OpenSSL support");
5500 >    conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
5501   #endif
5502   }
5503 + #line 5504 "conf_parser.c" /* yacc.c:1646  */
5504      break;
5505  
5506 <  case 452:
5507 <
6924 < /* Line 1455 of yacc.c  */
6925 < #line 2906 "ircd_parser.y"
5506 >  case 433:
5507 > #line 2364 "conf_parser.y" /* yacc.c:1646  */
5508      {
5509    if (conf_parser_ctx.pass == 2)
5510 <  {
6929 <    userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
6930 <    regex_ban = 0;
6931 <  }
5510 >    reset_block_state();
5511   }
5512 + #line 5513 "conf_parser.c" /* yacc.c:1646  */
5513      break;
5514  
5515 <  case 453:
5516 <
6937 < /* Line 1455 of yacc.c  */
6938 < #line 2913 "ircd_parser.y"
6939 <    {
6940 <  if (conf_parser_ctx.pass == 2)
6941 <  {
6942 <    if (userbuf[0] && hostbuf[0])
5515 >  case 434:
5516 > #line 2368 "conf_parser.y" /* yacc.c:1646  */
5517      {
5518 <      if (regex_ban)
6945 <      {
6946 <        pcre *exp_user = NULL;
6947 <        pcre *exp_host = NULL;
6948 <        const char *errptr = NULL;
6949 <
6950 <        if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
6951 <            !(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
6952 <        {
6953 <          ilog(L_ERROR, "Failed to add regular expression based K-Line: %s",
6954 <               errptr);
6955 <          break;
6956 <        }
6957 <
6958 <        yy_conf = make_conf_item(RKLINE_TYPE);
6959 <        yy_aconf = map_to_conf(yy_conf);
6960 <
6961 <        yy_aconf->regexuser = exp_user;
6962 <        yy_aconf->regexhost = exp_host;
6963 <
6964 <        DupString(yy_aconf->user, userbuf);
6965 <        DupString(yy_aconf->host, hostbuf);
6966 <
6967 <        if (reasonbuf[0])
6968 <          DupString(yy_aconf->reason, reasonbuf);
6969 <        else
6970 <          DupString(yy_aconf->reason, "No reason");
6971 <      }
6972 <      else
6973 <      {
6974 <        yy_conf = make_conf_item(KLINE_TYPE);
6975 <        yy_aconf = map_to_conf(yy_conf);
6976 <
6977 <        DupString(yy_aconf->user, userbuf);
6978 <        DupString(yy_aconf->host, hostbuf);
6979 <
6980 <        if (reasonbuf[0])
6981 <          DupString(yy_aconf->reason, reasonbuf);
6982 <        else
6983 <          DupString(yy_aconf->reason, "No reason");
6984 <        add_conf_by_address(CONF_KILL, yy_aconf);
6985 <      }
6986 <    }
6987 <    else
6988 <      delete_conf_item(yy_conf);
5518 >  struct MaskItem *conf = NULL;
5519  
5520 <    yy_conf = NULL;
6991 <    yy_aconf = NULL;
6992 <  }
6993 < }
5520 >  if (conf_parser_ctx.pass != 2)
5521      break;
5522  
5523 <  case 454:
5524 <
6998 < /* Line 1455 of yacc.c  */
6999 < #line 2970 "ircd_parser.y"
7000 <    {
7001 < }
5523 >  if (!block_state.user.buf[0] ||
5524 >      !block_state.host.buf[0])
5525      break;
5526  
5527 <  case 458:
5527 >  conf = conf_make(CONF_KLINE);
5528 >  conf->user = xstrdup(block_state.user.buf);
5529 >  conf->host = xstrdup(block_state.host.buf);
5530  
5531 < /* Line 1455 of yacc.c  */
5532 < #line 2975 "ircd_parser.y"
5533 <    {
5534 <  if (conf_parser_ctx.pass == 2)
5535 <    regex_ban = 1;
5531 >  if (block_state.rpass.buf[0])
5532 >    conf->reason = xstrdup(block_state.rpass.buf);
5533 >  else
5534 >    conf->reason = xstrdup(CONF_NOREASON);
5535 >  add_conf_by_address(CONF_KLINE, conf);
5536   }
5537 + #line 5538 "conf_parser.c" /* yacc.c:1646  */
5538      break;
5539  
5540 <  case 465:
5541 <
7016 < /* Line 1455 of yacc.c  */
7017 < #line 2984 "ircd_parser.y"
5540 >  case 440:
5541 > #line 2393 "conf_parser.y" /* yacc.c:1646  */
5542      {
5543 +
5544    if (conf_parser_ctx.pass == 2)
5545    {
5546      struct split_nuh_item nuh;
5547  
5548      nuh.nuhmask  = yylval.string;
5549      nuh.nickptr  = NULL;
5550 <    nuh.userptr  = userbuf;
5551 <    nuh.hostptr  = hostbuf;
5550 >    nuh.userptr  = block_state.user.buf;
5551 >    nuh.hostptr  = block_state.host.buf;
5552  
5553      nuh.nicksize = 0;
5554 <    nuh.usersize = sizeof(userbuf);
5555 <    nuh.hostsize = sizeof(hostbuf);
5554 >    nuh.usersize = sizeof(block_state.user.buf);
5555 >    nuh.hostsize = sizeof(block_state.host.buf);
5556  
5557      split_nuh(&nuh);
5558    }
5559   }
5560 + #line 5561 "conf_parser.c" /* yacc.c:1646  */
5561      break;
5562  
5563 <  case 466:
5564 <
7039 < /* Line 1455 of yacc.c  */
7040 < #line 3003 "ircd_parser.y"
5563 >  case 441:
5564 > #line 2413 "conf_parser.y" /* yacc.c:1646  */
5565      {
5566    if (conf_parser_ctx.pass == 2)
5567 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5567 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5568   }
5569 + #line 5570 "conf_parser.c" /* yacc.c:1646  */
5570      break;
5571  
5572 <  case 467:
5573 <
7049 < /* Line 1455 of yacc.c  */
7050 < #line 3012 "ircd_parser.y"
5572 >  case 442:
5573 > #line 2422 "conf_parser.y" /* yacc.c:1646  */
5574      {
5575    if (conf_parser_ctx.pass == 2)
5576 <  {
7054 <    yy_conf = make_conf_item(DLINE_TYPE);
7055 <    yy_aconf = map_to_conf(yy_conf);
7056 <    /* default reason */
7057 <    DupString(yy_aconf->reason, "No reason");
7058 <  }
5576 >    reset_block_state();
5577   }
5578 + #line 5579 "conf_parser.c" /* yacc.c:1646  */
5579      break;
5580  
5581 <  case 468:
5582 <
7064 < /* Line 1455 of yacc.c  */
7065 < #line 3021 "ircd_parser.y"
5581 >  case 443:
5582 > #line 2426 "conf_parser.y" /* yacc.c:1646  */
5583      {
5584 <  if (conf_parser_ctx.pass == 2)
7068 <  {
7069 <    if (yy_aconf->host && parse_netmask(yy_aconf->host, NULL, NULL) != HM_HOST)
7070 <      add_conf_by_address(CONF_DLINE, yy_aconf);
7071 <    else
7072 <      delete_conf_item(yy_conf);
7073 <    yy_conf = NULL;
7074 <    yy_aconf = NULL;
7075 <  }
7076 < }
7077 <    break;
7078 <
7079 <  case 474:
5584 >  struct MaskItem *conf = NULL;
5585  
5586 < /* Line 1455 of yacc.c  */
7082 < #line 3037 "ircd_parser.y"
7083 <    {
7084 <  if (conf_parser_ctx.pass == 2)
7085 <  {
7086 <    MyFree(yy_aconf->host);
7087 <    DupString(yy_aconf->host, yylval.string);
7088 <  }
7089 < }
5586 >  if (conf_parser_ctx.pass != 2)
5587      break;
5588  
5589 <  case 475:
5589 >  if (!block_state.addr.buf[0])
5590 >    break;
5591  
5592 < /* Line 1455 of yacc.c  */
7095 < #line 3046 "ircd_parser.y"
7096 <    {
7097 <  if (conf_parser_ctx.pass == 2)
5592 >  if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
5593    {
5594 <    MyFree(yy_aconf->reason);
5595 <    DupString(yy_aconf->reason, yylval.string);
5594 >    conf = conf_make(CONF_DLINE);
5595 >    conf->host = xstrdup(block_state.addr.buf);
5596 >
5597 >    if (block_state.rpass.buf[0])
5598 >      conf->reason = xstrdup(block_state.rpass.buf);
5599 >    else
5600 >      conf->reason = xstrdup(CONF_NOREASON);
5601 >    add_conf_by_address(CONF_DLINE, conf);
5602    }
5603   }
5604 + #line 5605 "conf_parser.c" /* yacc.c:1646  */
5605      break;
5606  
5607 <  case 481:
5608 <
7107 < /* Line 1455 of yacc.c  */
7108 < #line 3063 "ircd_parser.y"
5607 >  case 449:
5608 > #line 2452 "conf_parser.y" /* yacc.c:1646  */
5609      {
5610    if (conf_parser_ctx.pass == 2)
5611 <  {
7112 <    if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
7113 <    {
7114 <      yy_conf = make_conf_item(EXEMPTDLINE_TYPE);
7115 <      yy_aconf = map_to_conf(yy_conf);
7116 <      DupString(yy_aconf->host, yylval.string);
7117 <
7118 <      add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
7119 <
7120 <      yy_conf = NULL;
7121 <      yy_aconf = NULL;
7122 <    }
7123 <  }
5611 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
5612   }
5613 + #line 5614 "conf_parser.c" /* yacc.c:1646  */
5614      break;
5615  
5616 <  case 482:
5617 <
7129 < /* Line 1455 of yacc.c  */
7130 < #line 3084 "ircd_parser.y"
5616 >  case 450:
5617 > #line 2458 "conf_parser.y" /* yacc.c:1646  */
5618      {
5619    if (conf_parser_ctx.pass == 2)
5620 <  {
7134 <    regex_ban = 0;
7135 <    reasonbuf[0] = gecos_name[0] = '\0';
7136 <  }
5620 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5621   }
5622 + #line 5623 "conf_parser.c" /* yacc.c:1646  */
5623      break;
5624  
5625 <  case 483:
5626 <
7142 < /* Line 1455 of yacc.c  */
7143 < #line 3091 "ircd_parser.y"
5625 >  case 456:
5626 > #line 2472 "conf_parser.y" /* yacc.c:1646  */
5627      {
5628    if (conf_parser_ctx.pass == 2)
5629    {
5630 <    if (gecos_name[0])
5630 >    if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
5631      {
5632 <      if (regex_ban)
5633 <      {
7151 <        pcre *exp_p = NULL;
7152 <        const char *errptr = NULL;
7153 <
7154 <        if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
7155 <        {
7156 <          ilog(L_ERROR, "Failed to add regular expression based X-Line: %s",
7157 <               errptr);
7158 <          break;
7159 <        }
7160 <
7161 <        yy_conf = make_conf_item(RXLINE_TYPE);
7162 <        yy_conf->regexpname = exp_p;
7163 <      }
7164 <      else
7165 <        yy_conf = make_conf_item(XLINE_TYPE);
5632 >      struct MaskItem *conf = conf_make(CONF_EXEMPT);
5633 >      conf->host = xstrdup(yylval.string);
5634  
5635 <      yy_match_item = map_to_conf(yy_conf);
7168 <      DupString(yy_conf->name, gecos_name);
7169 <
7170 <      if (reasonbuf[0])
7171 <        DupString(yy_match_item->reason, reasonbuf);
7172 <      else
7173 <        DupString(yy_match_item->reason, "No reason");
5635 >      add_conf_by_address(CONF_EXEMPT, conf);
5636      }
5637    }
5638   }
5639 + #line 5640 "conf_parser.c" /* yacc.c:1646  */
5640      break;
5641  
5642 <  case 484:
5643 <
7181 < /* Line 1455 of yacc.c  */
7182 < #line 3126 "ircd_parser.y"
7183 <    {
7184 < }
7185 <    break;
7186 <
7187 <  case 488:
7188 <
7189 < /* Line 1455 of yacc.c  */
7190 < #line 3131 "ircd_parser.y"
7191 <    {
7192 <  if (conf_parser_ctx.pass == 2)
7193 <    regex_ban = 1;
7194 < }
7195 <    break;
7196 <
7197 <  case 495:
7198 <
7199 < /* Line 1455 of yacc.c  */
7200 < #line 3140 "ircd_parser.y"
5642 >  case 457:
5643 > #line 2489 "conf_parser.y" /* yacc.c:1646  */
5644      {
5645    if (conf_parser_ctx.pass == 2)
5646 <    strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
5646 >    reset_block_state();
5647   }
5648 + #line 5649 "conf_parser.c" /* yacc.c:1646  */
5649      break;
5650  
5651 <  case 496:
5652 <
7209 < /* Line 1455 of yacc.c  */
7210 < #line 3146 "ircd_parser.y"
7211 <    {
7212 <  if (conf_parser_ctx.pass == 2)
7213 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
7214 < }
7215 <    break;
7216 <
7217 <  case 557:
7218 <
7219 < /* Line 1455 of yacc.c  */
7220 < #line 3191 "ircd_parser.y"
7221 <    {
7222 <  ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number);
7223 < }
7224 <    break;
7225 <
7226 <  case 558:
7227 <
7228 < /* Line 1455 of yacc.c  */
7229 < #line 3196 "ircd_parser.y"
7230 <    {
7231 <  ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number);
7232 < }
7233 <    break;
7234 <
7235 <  case 559:
7236 <
7237 < /* Line 1455 of yacc.c  */
7238 < #line 3201 "ircd_parser.y"
7239 <    {
7240 <  ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number);
7241 < }
7242 <    break;
7243 <
7244 <  case 560:
7245 <
7246 < /* Line 1455 of yacc.c  */
7247 < #line 3206 "ircd_parser.y"
7248 <    {
7249 <  ConfigFileEntry.burst_away = yylval.number;
7250 < }
7251 <    break;
7252 <
7253 <  case 561:
7254 <
7255 < /* Line 1455 of yacc.c  */
7256 < #line 3211 "ircd_parser.y"
7257 <    {
7258 <  ConfigFileEntry.use_whois_actually = yylval.number;
7259 < }
7260 <    break;
7261 <
7262 <  case 562:
7263 <
7264 < /* Line 1455 of yacc.c  */
7265 < #line 3216 "ircd_parser.y"
7266 <    {
7267 <  GlobalSetOptions.rejecttime = yylval.number;
7268 < }
7269 <    break;
7270 <
7271 <  case 563:
7272 <
7273 < /* Line 1455 of yacc.c  */
7274 < #line 3221 "ircd_parser.y"
7275 <    {
7276 <  ConfigFileEntry.tkline_expire_notices = yylval.number;
7277 < }
7278 <    break;
7279 <
7280 <  case 564:
7281 <
7282 < /* Line 1455 of yacc.c  */
7283 < #line 3226 "ircd_parser.y"
5651 >  case 458:
5652 > #line 2493 "conf_parser.y" /* yacc.c:1646  */
5653      {
5654 <  ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number);
7286 < }
7287 <    break;
7288 <
7289 <  case 565:
5654 >  struct MaskItem *conf = NULL;
5655  
5656 < /* Line 1455 of yacc.c  */
7292 < #line 3231 "ircd_parser.y"
7293 <    {
7294 <  ConfigFileEntry.hide_spoof_ips = yylval.number;
7295 < }
5656 >  if (conf_parser_ctx.pass != 2)
5657      break;
5658  
5659 <  case 566:
7299 <
7300 < /* Line 1455 of yacc.c  */
7301 < #line 3236 "ircd_parser.y"
7302 <    {
7303 <  ConfigFileEntry.ignore_bogus_ts = yylval.number;
7304 < }
5659 >  if (!block_state.name.buf[0])
5660      break;
5661  
5662 <  case 567:
5663 <
7309 < /* Line 1455 of yacc.c  */
7310 < #line 3241 "ircd_parser.y"
7311 <    {
7312 <  ConfigFileEntry.disable_remote = yylval.number;
7313 < }
7314 <    break;
5662 >  conf = conf_make(CONF_XLINE);
5663 >  conf->name = xstrdup(block_state.name.buf);
5664  
5665 <  case 568:
5666 <
5667 < /* Line 1455 of yacc.c  */
5668 < #line 3246 "ircd_parser.y"
7320 <    {
7321 <  ConfigFileEntry.failed_oper_notice = yylval.number;
7322 < }
7323 <    break;
7324 <
7325 <  case 569:
7326 <
7327 < /* Line 1455 of yacc.c  */
7328 < #line 3251 "ircd_parser.y"
7329 <    {
7330 <  ConfigFileEntry.anti_nick_flood = yylval.number;
5665 >  if (block_state.rpass.buf[0])
5666 >    conf->reason = xstrdup(block_state.rpass.buf);
5667 >  else
5668 >    conf->reason = xstrdup(CONF_NOREASON);
5669   }
5670 + #line 5671 "conf_parser.c" /* yacc.c:1646  */
5671      break;
5672  
5673 <  case 570:
5674 <
7336 < /* Line 1455 of yacc.c  */
7337 < #line 3256 "ircd_parser.y"
5673 >  case 464:
5674 > #line 2515 "conf_parser.y" /* yacc.c:1646  */
5675      {
5676 <  ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number);
5676 >  if (conf_parser_ctx.pass == 2)
5677 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5678   }
5679 + #line 5680 "conf_parser.c" /* yacc.c:1646  */
5680      break;
5681  
5682 <  case 571:
5683 <
7345 < /* Line 1455 of yacc.c  */
7346 < #line 3261 "ircd_parser.y"
5682 >  case 465:
5683 > #line 2521 "conf_parser.y" /* yacc.c:1646  */
5684      {
5685 <  ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number);
5685 >  if (conf_parser_ctx.pass == 2)
5686 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5687   }
5688 + #line 5689 "conf_parser.c" /* yacc.c:1646  */
5689      break;
5690  
5691 <  case 572:
5692 <
7354 < /* Line 1455 of yacc.c  */
7355 < #line 3266 "ircd_parser.y"
5691 >  case 519:
5692 > #line 2586 "conf_parser.y" /* yacc.c:1646  */
5693      {
5694 <  ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number);
5694 >  ConfigGeneral.away_count = (yyvsp[-1].number);
5695   }
5696 + #line 5697 "conf_parser.c" /* yacc.c:1646  */
5697      break;
5698  
5699 <  case 573:
5700 <
7363 < /* Line 1455 of yacc.c  */
7364 < #line 3271 "ircd_parser.y"
5699 >  case 520:
5700 > #line 2591 "conf_parser.y" /* yacc.c:1646  */
5701      {
5702 <  ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number);
5702 >  ConfigGeneral.away_time = (yyvsp[-1].number);
5703   }
5704 + #line 5705 "conf_parser.c" /* yacc.c:1646  */
5705      break;
5706  
5707 <  case 574:
5708 <
7372 < /* Line 1455 of yacc.c  */
7373 < #line 3276 "ircd_parser.y"
5707 >  case 521:
5708 > #line 2596 "conf_parser.y" /* yacc.c:1646  */
5709      {
5710 <  ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number);
5710 >  ConfigGeneral.max_watch = (yyvsp[-1].number);
5711   }
5712 + #line 5713 "conf_parser.c" /* yacc.c:1646  */
5713      break;
5714  
5715 <  case 575:
5716 <
7381 < /* Line 1455 of yacc.c  */
7382 < #line 3281 "ircd_parser.y"
5715 >  case 522:
5716 > #line 2601 "conf_parser.y" /* yacc.c:1646  */
5717      {
5718    if (conf_parser_ctx.pass == 2)
5719 <    ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number);
7386 < }
7387 <    break;
7388 <
7389 <  case 576:
7390 <
7391 < /* Line 1455 of yacc.c  */
7392 < #line 3287 "ircd_parser.y"
7393 <    {
7394 <  if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1)
7395 <  {
7396 <    ilog(L_CRIT, "You haven't read your config file properly.");
7397 <    ilog(L_CRIT, "There is a line in the example conf that will kill your server if not removed.");
7398 <    ilog(L_CRIT, "Consider actually reading/editing the conf file, and removing this line.");
7399 <    exit(0);
7400 <  }
5719 >    ConfigGeneral.cycle_on_host_change = yylval.number;
5720   }
5721 + #line 5722 "conf_parser.c" /* yacc.c:1646  */
5722      break;
5723  
5724 <  case 577:
5725 <
7406 < /* Line 1455 of yacc.c  */
7407 < #line 3298 "ircd_parser.y"
5724 >  case 523:
5725 > #line 2607 "conf_parser.y" /* yacc.c:1646  */
5726      {
5727 <  ConfigFileEntry.kline_with_reason = yylval.number;
5727 >  if (conf_parser_ctx.pass == 2)
5728 >    ConfigGeneral.glines = yylval.number;
5729   }
5730 + #line 5731 "conf_parser.c" /* yacc.c:1646  */
5731      break;
5732  
5733 <  case 578:
5734 <
7415 < /* Line 1455 of yacc.c  */
7416 < #line 3303 "ircd_parser.y"
5733 >  case 524:
5734 > #line 2613 "conf_parser.y" /* yacc.c:1646  */
5735      {
5736    if (conf_parser_ctx.pass == 2)
5737 <  {
7420 <    MyFree(ConfigFileEntry.kline_reason);
7421 <    DupString(ConfigFileEntry.kline_reason, yylval.string);
7422 <  }
5737 >    ConfigGeneral.gline_time = (yyvsp[-1].number);
5738   }
5739 + #line 5740 "conf_parser.c" /* yacc.c:1646  */
5740      break;
5741  
5742 <  case 579:
5743 <
7428 < /* Line 1455 of yacc.c  */
7429 < #line 3312 "ircd_parser.y"
5742 >  case 525:
5743 > #line 2619 "conf_parser.y" /* yacc.c:1646  */
5744      {
5745 <  ConfigFileEntry.invisible_on_connect = yylval.number;
5746 < }
7433 <    break;
7434 <
7435 <  case 580:
7436 <
7437 < /* Line 1455 of yacc.c  */
7438 < #line 3317 "ircd_parser.y"
7439 <    {
7440 <  ConfigFileEntry.warn_no_nline = yylval.number;
5745 >  if (conf_parser_ctx.pass == 2)
5746 >    ConfigGeneral.gline_request_time = (yyvsp[-1].number);
5747   }
5748 + #line 5749 "conf_parser.c" /* yacc.c:1646  */
5749      break;
5750  
5751 <  case 581:
5752 <
7446 < /* Line 1455 of yacc.c  */
7447 < #line 3322 "ircd_parser.y"
5751 >  case 526:
5752 > #line 2625 "conf_parser.y" /* yacc.c:1646  */
5753      {
5754 <  ConfigFileEntry.stats_e_disabled = yylval.number;
5754 >  ConfigGeneral.gline_min_cidr = (yyvsp[-1].number);
5755   }
5756 + #line 5757 "conf_parser.c" /* yacc.c:1646  */
5757      break;
5758  
5759 <  case 582:
5760 <
7455 < /* Line 1455 of yacc.c  */
7456 < #line 3327 "ircd_parser.y"
5759 >  case 527:
5760 > #line 2630 "conf_parser.y" /* yacc.c:1646  */
5761      {
5762 <  ConfigFileEntry.stats_o_oper_only = yylval.number;
5762 >  ConfigGeneral.gline_min_cidr6 = (yyvsp[-1].number);
5763   }
5764 + #line 5765 "conf_parser.c" /* yacc.c:1646  */
5765      break;
5766  
5767 <  case 583:
5768 <
7464 < /* Line 1455 of yacc.c  */
7465 < #line 3332 "ircd_parser.y"
5767 >  case 528:
5768 > #line 2635 "conf_parser.y" /* yacc.c:1646  */
5769      {
5770 <  ConfigFileEntry.stats_P_oper_only = yylval.number;
5770 >  ConfigGeneral.tkline_expire_notices = yylval.number;
5771   }
5772 + #line 5773 "conf_parser.c" /* yacc.c:1646  */
5773      break;
5774  
5775 <  case 584:
5776 <
7473 < /* Line 1455 of yacc.c  */
7474 < #line 3337 "ircd_parser.y"
5775 >  case 529:
5776 > #line 2640 "conf_parser.y" /* yacc.c:1646  */
5777      {
5778 <  ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
5778 >  ConfigGeneral.kill_chase_time_limit = (yyvsp[-1].number);
5779   }
5780 + #line 5781 "conf_parser.c" /* yacc.c:1646  */
5781      break;
5782  
5783 <  case 585:
5784 <
7482 < /* Line 1455 of yacc.c  */
7483 < #line 3340 "ircd_parser.y"
5783 >  case 530:
5784 > #line 2645 "conf_parser.y" /* yacc.c:1646  */
5785      {
5786 <  ConfigFileEntry.stats_k_oper_only = 1;
5786 >  ConfigGeneral.hide_spoof_ips = yylval.number;
5787   }
5788 + #line 5789 "conf_parser.c" /* yacc.c:1646  */
5789      break;
5790  
5791 <  case 586:
5792 <
7491 < /* Line 1455 of yacc.c  */
7492 < #line 3345 "ircd_parser.y"
5791 >  case 531:
5792 > #line 2650 "conf_parser.y" /* yacc.c:1646  */
5793      {
5794 <  ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
5794 >  ConfigGeneral.ignore_bogus_ts = yylval.number;
5795   }
5796 + #line 5797 "conf_parser.c" /* yacc.c:1646  */
5797      break;
5798  
5799 <  case 587:
5800 <
7500 < /* Line 1455 of yacc.c  */
7501 < #line 3348 "ircd_parser.y"
5799 >  case 532:
5800 > #line 2655 "conf_parser.y" /* yacc.c:1646  */
5801      {
5802 <  ConfigFileEntry.stats_i_oper_only = 1;
5802 >  ConfigGeneral.failed_oper_notice = yylval.number;
5803   }
5804 + #line 5805 "conf_parser.c" /* yacc.c:1646  */
5805      break;
5806  
5807 <  case 588:
5808 <
7509 < /* Line 1455 of yacc.c  */
7510 < #line 3353 "ircd_parser.y"
5807 >  case 533:
5808 > #line 2660 "conf_parser.y" /* yacc.c:1646  */
5809      {
5810 <  ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number);
5810 >  ConfigGeneral.anti_nick_flood = yylval.number;
5811   }
5812 + #line 5813 "conf_parser.c" /* yacc.c:1646  */
5813      break;
5814  
5815 <  case 589:
5816 <
7518 < /* Line 1455 of yacc.c  */
7519 < #line 3358 "ircd_parser.y"
5815 >  case 534:
5816 > #line 2665 "conf_parser.y" /* yacc.c:1646  */
5817      {
5818 <  ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number);
5818 >  ConfigGeneral.max_nick_time = (yyvsp[-1].number);
5819   }
5820 + #line 5821 "conf_parser.c" /* yacc.c:1646  */
5821      break;
5822  
5823 <  case 590:
5824 <
7527 < /* Line 1455 of yacc.c  */
7528 < #line 3363 "ircd_parser.y"
5823 >  case 535:
5824 > #line 2670 "conf_parser.y" /* yacc.c:1646  */
5825      {
5826 <  ConfigFileEntry.opers_bypass_callerid = yylval.number;
5826 >  ConfigGeneral.max_nick_changes = (yyvsp[-1].number);
5827   }
5828 + #line 5829 "conf_parser.c" /* yacc.c:1646  */
5829      break;
5830  
5831 <  case 591:
5832 <
7536 < /* Line 1455 of yacc.c  */
7537 < #line 3368 "ircd_parser.y"
5831 >  case 536:
5832 > #line 2675 "conf_parser.y" /* yacc.c:1646  */
5833      {
5834 <  ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number);
5834 >  ConfigGeneral.max_accept = (yyvsp[-1].number);
5835   }
5836 + #line 5837 "conf_parser.c" /* yacc.c:1646  */
5837      break;
5838  
5839 <  case 592:
5840 <
7545 < /* Line 1455 of yacc.c  */
7546 < #line 3373 "ircd_parser.y"
5839 >  case 537:
5840 > #line 2680 "conf_parser.y" /* yacc.c:1646  */
5841      {
5842 <  ConfigFileEntry.short_motd = yylval.number;
5842 >  ConfigGeneral.anti_spam_exit_message_time = (yyvsp[-1].number);
5843   }
5844 + #line 5845 "conf_parser.c" /* yacc.c:1646  */
5845      break;
5846  
5847 <  case 593:
5848 <
7554 < /* Line 1455 of yacc.c  */
7555 < #line 3378 "ircd_parser.y"
5847 >  case 538:
5848 > #line 2685 "conf_parser.y" /* yacc.c:1646  */
5849      {
5850 <  ConfigFileEntry.no_oper_flood = yylval.number;
5850 >  ConfigGeneral.ts_warn_delta = (yyvsp[-1].number);
5851   }
5852 + #line 5853 "conf_parser.c" /* yacc.c:1646  */
5853      break;
5854  
5855 <  case 594:
5856 <
7563 < /* Line 1455 of yacc.c  */
7564 < #line 3383 "ircd_parser.y"
5855 >  case 539:
5856 > #line 2690 "conf_parser.y" /* yacc.c:1646  */
5857      {
5858 <  ConfigFileEntry.true_no_oper_flood = yylval.number;
5859 < }
7568 <    break;
7569 <
7570 <  case 595:
7571 <
7572 < /* Line 1455 of yacc.c  */
7573 < #line 3388 "ircd_parser.y"
7574 <    {
7575 <  ConfigFileEntry.oper_pass_resv = yylval.number;
5858 >  if (conf_parser_ctx.pass == 2)
5859 >    ConfigGeneral.ts_max_delta = (yyvsp[-1].number);
5860   }
5861 + #line 5862 "conf_parser.c" /* yacc.c:1646  */
5862      break;
5863  
5864 <  case 596:
5865 <
7581 < /* Line 1455 of yacc.c  */
7582 < #line 3393 "ircd_parser.y"
5864 >  case 540:
5865 > #line 2696 "conf_parser.y" /* yacc.c:1646  */
5866      {
5867 <  if (conf_parser_ctx.pass == 2)
5867 >  if (((yyvsp[-1].number) > 0) && conf_parser_ctx.pass == 1)
5868    {
5869 <    if (strlen(yylval.string) > LOCALE_LENGTH-2)
5870 <      yylval.string[LOCALE_LENGTH-1] = '\0';
5871 <
5872 <    set_locale(yylval.string);
5869 >    ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
5870 >    ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
5871 >    ilog(LOG_TYPE_IRCD, "Consider actually reading/editing the conf file, and removing this line.");
5872 >    exit(0);
5873    }
5874   }
5875 + #line 5876 "conf_parser.c" /* yacc.c:1646  */
5876      break;
5877  
5878 <  case 597:
5879 <
7596 < /* Line 1455 of yacc.c  */
7597 < #line 3404 "ircd_parser.y"
5878 >  case 541:
5879 > #line 2707 "conf_parser.y" /* yacc.c:1646  */
5880      {
5881 <  ConfigFileEntry.idletime = (yyvsp[(3) - (4)].number);
5881 >  ConfigGeneral.invisible_on_connect = yylval.number;
5882   }
5883 + #line 5884 "conf_parser.c" /* yacc.c:1646  */
5884      break;
5885  
5886 <  case 598:
5887 <
7605 < /* Line 1455 of yacc.c  */
7606 < #line 3409 "ircd_parser.y"
5886 >  case 542:
5887 > #line 2712 "conf_parser.y" /* yacc.c:1646  */
5888      {
5889 <  ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number);
5889 >  ConfigGeneral.warn_no_connect_block = yylval.number;
5890   }
5891 + #line 5892 "conf_parser.c" /* yacc.c:1646  */
5892      break;
5893  
5894 <  case 599:
5895 <
7614 < /* Line 1455 of yacc.c  */
7615 < #line 3414 "ircd_parser.y"
5894 >  case 543:
5895 > #line 2717 "conf_parser.y" /* yacc.c:1646  */
5896      {
5897 <  ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number);
5897 >  ConfigGeneral.stats_e_disabled = yylval.number;
5898   }
5899 + #line 5900 "conf_parser.c" /* yacc.c:1646  */
5900      break;
5901  
5902 <  case 600:
5903 <
7623 < /* Line 1455 of yacc.c  */
7624 < #line 3419 "ircd_parser.y"
5902 >  case 544:
5903 > #line 2722 "conf_parser.y" /* yacc.c:1646  */
5904      {
5905 <  if (conf_parser_ctx.pass == 2)
7627 <  {
7628 <    MyFree(ConfigFileEntry.servlink_path);
7629 <    DupString(ConfigFileEntry.servlink_path, yylval.string);
7630 <  }
5905 >  ConfigGeneral.stats_o_oper_only = yylval.number;
5906   }
5907 + #line 5908 "conf_parser.c" /* yacc.c:1646  */
5908      break;
5909  
5910 <  case 601:
5911 <
7636 < /* Line 1455 of yacc.c  */
7637 < #line 3428 "ircd_parser.y"
5910 >  case 545:
5911 > #line 2727 "conf_parser.y" /* yacc.c:1646  */
5912      {
5913 < #ifdef HAVE_LIBCRYPTO
7640 <  if (conf_parser_ctx.pass == 2)
7641 <  {
7642 <    struct EncCapability *ecap;
7643 <    const char *cipher_name;
7644 <    int found = 0;
7645 <
7646 <    ConfigFileEntry.default_cipher_preference = NULL;
7647 <    cipher_name = yylval.string;
7648 <
7649 <    for (ecap = CipherTable; ecap->name; ecap++)
7650 <    {
7651 <      if ((irccmp(ecap->name, cipher_name) == 0) &&
7652 <          (ecap->cap & CAP_ENC_MASK))
7653 <      {
7654 <        ConfigFileEntry.default_cipher_preference = ecap;
7655 <        found = 1;
7656 <        break;
7657 <      }
7658 <    }
7659 <
7660 <    if (!found)
7661 <      yyerror("Invalid cipher");
7662 <  }
7663 < #else
7664 <  if (conf_parser_ctx.pass == 2)
7665 <    yyerror("Ignoring default_cipher_preference -- no OpenSSL support");
7666 < #endif
5913 >  ConfigGeneral.stats_P_oper_only = yylval.number;
5914   }
5915 + #line 5916 "conf_parser.c" /* yacc.c:1646  */
5916      break;
5917  
5918 <  case 602:
5919 <
7672 < /* Line 1455 of yacc.c  */
7673 < #line 3460 "ircd_parser.y"
7674 <    {
7675 <  if (conf_parser_ctx.pass == 2)
7676 <  {
7677 <    ConfigFileEntry.compression_level = (yyvsp[(3) - (4)].number);
7678 < #ifndef HAVE_LIBZ
7679 <    yyerror("Ignoring compression_level -- no zlib support");
7680 < #else
7681 <    if ((ConfigFileEntry.compression_level < 1) ||
7682 <        (ConfigFileEntry.compression_level > 9))
5918 >  case 546:
5919 > #line 2732 "conf_parser.y" /* yacc.c:1646  */
5920      {
5921 <      yyerror("Ignoring invalid compression_level, using default");
7685 <      ConfigFileEntry.compression_level = 0;
7686 <    }
7687 < #endif
7688 <  }
5921 >  ConfigGeneral.stats_u_oper_only = yylval.number;
5922   }
5923 + #line 5924 "conf_parser.c" /* yacc.c:1646  */
5924      break;
5925  
5926 <  case 603:
5927 <
7694 < /* Line 1455 of yacc.c  */
7695 < #line 3478 "ircd_parser.y"
5926 >  case 547:
5927 > #line 2737 "conf_parser.y" /* yacc.c:1646  */
5928      {
5929 <  ConfigFileEntry.use_egd = yylval.number;
5929 >  ConfigGeneral.stats_k_oper_only = 2 * yylval.number;
5930   }
5931 + #line 5932 "conf_parser.c" /* yacc.c:1646  */
5932      break;
5933  
5934 <  case 604:
5935 <
7703 < /* Line 1455 of yacc.c  */
7704 < #line 3483 "ircd_parser.y"
5934 >  case 548:
5935 > #line 2740 "conf_parser.y" /* yacc.c:1646  */
5936      {
5937 <  if (conf_parser_ctx.pass == 2)
7707 <  {
7708 <    MyFree(ConfigFileEntry.egdpool_path);
7709 <    DupString(ConfigFileEntry.egdpool_path, yylval.string);
7710 <  }
5937 >  ConfigGeneral.stats_k_oper_only = 1;
5938   }
5939 + #line 5940 "conf_parser.c" /* yacc.c:1646  */
5940      break;
5941  
5942 <  case 605:
5943 <
7716 < /* Line 1455 of yacc.c  */
7717 < #line 3492 "ircd_parser.y"
5942 >  case 549:
5943 > #line 2745 "conf_parser.y" /* yacc.c:1646  */
5944      {
5945 <  ConfigFileEntry.ping_cookie = yylval.number;
5945 >  ConfigGeneral.stats_i_oper_only = 2 * yylval.number;
5946   }
5947 + #line 5948 "conf_parser.c" /* yacc.c:1646  */
5948      break;
5949  
5950 <  case 606:
5951 <
7725 < /* Line 1455 of yacc.c  */
7726 < #line 3497 "ircd_parser.y"
5950 >  case 550:
5951 > #line 2748 "conf_parser.y" /* yacc.c:1646  */
5952      {
5953 <  ConfigFileEntry.disable_auth = yylval.number;
5953 >  ConfigGeneral.stats_i_oper_only = 1;
5954   }
5955 + #line 5956 "conf_parser.c" /* yacc.c:1646  */
5956      break;
5957  
5958 <  case 607:
5959 <
7734 < /* Line 1455 of yacc.c  */
7735 < #line 3502 "ircd_parser.y"
5958 >  case 551:
5959 > #line 2753 "conf_parser.y" /* yacc.c:1646  */
5960      {
5961 <  ConfigFileEntry.throttle_time = yylval.number;
5961 >  ConfigGeneral.pace_wait = (yyvsp[-1].number);
5962   }
5963 + #line 5964 "conf_parser.c" /* yacc.c:1646  */
5964      break;
5965  
5966 <  case 608:
5967 <
7743 < /* Line 1455 of yacc.c  */
7744 < #line 3507 "ircd_parser.y"
5966 >  case 552:
5967 > #line 2758 "conf_parser.y" /* yacc.c:1646  */
5968      {
5969 <  ConfigFileEntry.oper_umodes = 0;
5969 >  ConfigGeneral.caller_id_wait = (yyvsp[-1].number);
5970   }
5971 + #line 5972 "conf_parser.c" /* yacc.c:1646  */
5972      break;
5973  
5974 <  case 612:
5975 <
7752 < /* Line 1455 of yacc.c  */
7753 < #line 3513 "ircd_parser.y"
5974 >  case 553:
5975 > #line 2763 "conf_parser.y" /* yacc.c:1646  */
5976      {
5977 <  ConfigFileEntry.oper_umodes |= UMODE_BOTS;
5977 >  ConfigGeneral.opers_bypass_callerid = yylval.number;
5978   }
5979 + #line 5980 "conf_parser.c" /* yacc.c:1646  */
5980      break;
5981  
5982 <  case 613:
5983 <
7761 < /* Line 1455 of yacc.c  */
7762 < #line 3516 "ircd_parser.y"
5982 >  case 554:
5983 > #line 2768 "conf_parser.y" /* yacc.c:1646  */
5984      {
5985 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN;
5985 >  ConfigGeneral.pace_wait_simple = (yyvsp[-1].number);
5986   }
5987 + #line 5988 "conf_parser.c" /* yacc.c:1646  */
5988      break;
5989  
5990 <  case 614:
5991 <
7770 < /* Line 1455 of yacc.c  */
7771 < #line 3519 "ircd_parser.y"
5990 >  case 555:
5991 > #line 2773 "conf_parser.y" /* yacc.c:1646  */
5992      {
5993 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
5993 >  ConfigGeneral.short_motd = yylval.number;
5994   }
5995 + #line 5996 "conf_parser.c" /* yacc.c:1646  */
5996      break;
5997  
5998 <  case 615:
5999 <
7779 < /* Line 1455 of yacc.c  */
7780 < #line 3522 "ircd_parser.y"
5998 >  case 556:
5999 > #line 2778 "conf_parser.y" /* yacc.c:1646  */
6000      {
6001 <  ConfigFileEntry.oper_umodes |= UMODE_DEAF;
6001 >  ConfigGeneral.no_oper_flood = yylval.number;
6002   }
6003 + #line 6004 "conf_parser.c" /* yacc.c:1646  */
6004      break;
6005  
6006 <  case 616:
6007 <
7788 < /* Line 1455 of yacc.c  */
7789 < #line 3525 "ircd_parser.y"
6006 >  case 557:
6007 > #line 2783 "conf_parser.y" /* yacc.c:1646  */
6008      {
6009 <  ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
6009 >  ConfigGeneral.true_no_oper_flood = yylval.number;
6010   }
6011 + #line 6012 "conf_parser.c" /* yacc.c:1646  */
6012      break;
6013  
6014 <  case 617:
6015 <
7797 < /* Line 1455 of yacc.c  */
7798 < #line 3528 "ircd_parser.y"
6014 >  case 558:
6015 > #line 2788 "conf_parser.y" /* yacc.c:1646  */
6016      {
6017 <  ConfigFileEntry.oper_umodes |= UMODE_FULL;
6017 >  ConfigGeneral.oper_pass_resv = yylval.number;
6018   }
6019 + #line 6020 "conf_parser.c" /* yacc.c:1646  */
6020      break;
6021  
6022 <  case 618:
6023 <
7806 < /* Line 1455 of yacc.c  */
7807 < #line 3531 "ircd_parser.y"
6022 >  case 559:
6023 > #line 2793 "conf_parser.y" /* yacc.c:1646  */
6024      {
6025 <  ConfigFileEntry.oper_umodes |= UMODE_SKILL;
6025 >  ConfigGeneral.dots_in_ident = (yyvsp[-1].number);
6026   }
6027 + #line 6028 "conf_parser.c" /* yacc.c:1646  */
6028      break;
6029  
6030 <  case 619:
6031 <
7815 < /* Line 1455 of yacc.c  */
7816 < #line 3534 "ircd_parser.y"
6030 >  case 560:
6031 > #line 2798 "conf_parser.y" /* yacc.c:1646  */
6032      {
6033 <  ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
6033 >  ConfigGeneral.max_targets = (yyvsp[-1].number);
6034   }
6035 + #line 6036 "conf_parser.c" /* yacc.c:1646  */
6036      break;
6037  
6038 <  case 620:
6039 <
7824 < /* Line 1455 of yacc.c  */
7825 < #line 3537 "ircd_parser.y"
6038 >  case 561:
6039 > #line 2803 "conf_parser.y" /* yacc.c:1646  */
6040      {
6041 <  ConfigFileEntry.oper_umodes |= UMODE_REJ;
6041 >  ConfigGeneral.ping_cookie = yylval.number;
6042   }
6043 + #line 6044 "conf_parser.c" /* yacc.c:1646  */
6044      break;
6045  
6046 <  case 621:
6047 <
7833 < /* Line 1455 of yacc.c  */
7834 < #line 3540 "ircd_parser.y"
6046 >  case 562:
6047 > #line 2808 "conf_parser.y" /* yacc.c:1646  */
6048      {
6049 <  ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
6049 >  ConfigGeneral.disable_auth = yylval.number;
6050   }
6051 + #line 6052 "conf_parser.c" /* yacc.c:1646  */
6052      break;
6053  
6054 <  case 622:
6055 <
7842 < /* Line 1455 of yacc.c  */
7843 < #line 3543 "ircd_parser.y"
6054 >  case 563:
6055 > #line 2813 "conf_parser.y" /* yacc.c:1646  */
6056      {
6057 <  ConfigFileEntry.oper_umodes |= UMODE_SPY;
6057 >  ConfigGeneral.throttle_count = (yyvsp[-1].number);
6058   }
6059 + #line 6060 "conf_parser.c" /* yacc.c:1646  */
6060      break;
6061  
6062 <  case 623:
6063 <
7851 < /* Line 1455 of yacc.c  */
7852 < #line 3546 "ircd_parser.y"
6062 >  case 564:
6063 > #line 2818 "conf_parser.y" /* yacc.c:1646  */
6064      {
6065 <  ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
6065 >  ConfigGeneral.throttle_time = (yyvsp[-1].number);
6066   }
6067 + #line 6068 "conf_parser.c" /* yacc.c:1646  */
6068      break;
6069  
6070 <  case 624:
6071 <
7860 < /* Line 1455 of yacc.c  */
7861 < #line 3549 "ircd_parser.y"
6070 >  case 565:
6071 > #line 2823 "conf_parser.y" /* yacc.c:1646  */
6072      {
6073 <  ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
6073 >  ConfigGeneral.oper_umodes = 0;
6074   }
6075 + #line 6076 "conf_parser.c" /* yacc.c:1646  */
6076      break;
6077  
6078 <  case 625:
6079 <
7869 < /* Line 1455 of yacc.c  */
7870 < #line 3552 "ircd_parser.y"
6078 >  case 569:
6079 > #line 2829 "conf_parser.y" /* yacc.c:1646  */
6080      {
6081 <  ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
6081 >  ConfigGeneral.oper_umodes |= UMODE_BOTS;
6082   }
6083 + #line 6084 "conf_parser.c" /* yacc.c:1646  */
6084      break;
6085  
6086 <  case 626:
6087 <
7878 < /* Line 1455 of yacc.c  */
7879 < #line 3555 "ircd_parser.y"
6086 >  case 570:
6087 > #line 2832 "conf_parser.y" /* yacc.c:1646  */
6088      {
6089 <  ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
6089 >  ConfigGeneral.oper_umodes |= UMODE_CCONN;
6090   }
6091 + #line 6092 "conf_parser.c" /* yacc.c:1646  */
6092      break;
6093  
6094 <  case 627:
6095 <
7887 < /* Line 1455 of yacc.c  */
7888 < #line 3558 "ircd_parser.y"
6094 >  case 571:
6095 > #line 2835 "conf_parser.y" /* yacc.c:1646  */
6096      {
6097 <  ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
6097 >  ConfigGeneral.oper_umodes |= UMODE_DEAF;
6098   }
6099 + #line 6100 "conf_parser.c" /* yacc.c:1646  */
6100      break;
6101  
6102 <  case 628:
6103 <
7896 < /* Line 1455 of yacc.c  */
7897 < #line 3561 "ircd_parser.y"
6102 >  case 572:
6103 > #line 2838 "conf_parser.y" /* yacc.c:1646  */
6104      {
6105 <  ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
6105 >  ConfigGeneral.oper_umodes |= UMODE_DEBUG;
6106   }
6107 + #line 6108 "conf_parser.c" /* yacc.c:1646  */
6108      break;
6109  
6110 <  case 629:
6111 <
7905 < /* Line 1455 of yacc.c  */
7906 < #line 3564 "ircd_parser.y"
6110 >  case 573:
6111 > #line 2841 "conf_parser.y" /* yacc.c:1646  */
6112      {
6113 <  ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
6113 >  ConfigGeneral.oper_umodes |= UMODE_FULL;
6114   }
6115 + #line 6116 "conf_parser.c" /* yacc.c:1646  */
6116      break;
6117  
6118 <  case 630:
6119 <
7914 < /* Line 1455 of yacc.c  */
7915 < #line 3567 "ircd_parser.y"
6118 >  case 574:
6119 > #line 2844 "conf_parser.y" /* yacc.c:1646  */
6120      {
6121 <  ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
6121 >  ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
6122   }
6123 + #line 6124 "conf_parser.c" /* yacc.c:1646  */
6124      break;
6125  
6126 <  case 631:
6127 <
7923 < /* Line 1455 of yacc.c  */
7924 < #line 3572 "ircd_parser.y"
6126 >  case 575:
6127 > #line 2847 "conf_parser.y" /* yacc.c:1646  */
6128      {
6129 <  ConfigFileEntry.oper_only_umodes = 0;
6129 >  ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
6130   }
6131 + #line 6132 "conf_parser.c" /* yacc.c:1646  */
6132      break;
6133  
6134 <  case 635:
6135 <
7932 < /* Line 1455 of yacc.c  */
7933 < #line 3578 "ircd_parser.y"
6134 >  case 576:
6135 > #line 2850 "conf_parser.y" /* yacc.c:1646  */
6136      {
6137 <  ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
6137 >  ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
6138   }
6139 + #line 6140 "conf_parser.c" /* yacc.c:1646  */
6140      break;
6141  
6142 <  case 636:
6143 <
7941 < /* Line 1455 of yacc.c  */
7942 < #line 3581 "ircd_parser.y"
6142 >  case 577:
6143 > #line 2853 "conf_parser.y" /* yacc.c:1646  */
6144      {
6145 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
6145 >  ConfigGeneral.oper_umodes |= UMODE_SKILL;
6146   }
6147 + #line 6148 "conf_parser.c" /* yacc.c:1646  */
6148      break;
6149  
6150 <  case 637:
6151 <
7950 < /* Line 1455 of yacc.c  */
7951 < #line 3584 "ircd_parser.y"
6150 >  case 578:
6151 > #line 2856 "conf_parser.y" /* yacc.c:1646  */
6152      {
6153 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
6153 >  ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
6154   }
6155 + #line 6156 "conf_parser.c" /* yacc.c:1646  */
6156      break;
6157  
6158 <  case 638:
6159 <
7959 < /* Line 1455 of yacc.c  */
7960 < #line 3587 "ircd_parser.y"
6158 >  case 579:
6159 > #line 2859 "conf_parser.y" /* yacc.c:1646  */
6160      {
6161 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
6161 >  ConfigGeneral.oper_umodes |= UMODE_REJ;
6162   }
6163 + #line 6164 "conf_parser.c" /* yacc.c:1646  */
6164      break;
6165  
6166 <  case 639:
6167 <
7968 < /* Line 1455 of yacc.c  */
7969 < #line 3590 "ircd_parser.y"
6166 >  case 580:
6167 > #line 2862 "conf_parser.y" /* yacc.c:1646  */
6168      {
6169 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
6169 >  ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
6170   }
6171 + #line 6172 "conf_parser.c" /* yacc.c:1646  */
6172      break;
6173  
6174 <  case 640:
6175 <
7977 < /* Line 1455 of yacc.c  */
7978 < #line 3593 "ircd_parser.y"
7979 <    {
7980 <  ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
7981 < }
7982 <    break;
7983 <
7984 <  case 641:
7985 <
7986 < /* Line 1455 of yacc.c  */
7987 < #line 3596 "ircd_parser.y"
6174 >  case 581:
6175 > #line 2865 "conf_parser.y" /* yacc.c:1646  */
6176      {
6177 <  ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
6177 >  ConfigGeneral.oper_umodes |= UMODE_SPY;
6178   }
6179 + #line 6180 "conf_parser.c" /* yacc.c:1646  */
6180      break;
6181  
6182 <  case 642:
6183 <
7995 < /* Line 1455 of yacc.c  */
7996 < #line 3599 "ircd_parser.y"
6182 >  case 582:
6183 > #line 2868 "conf_parser.y" /* yacc.c:1646  */
6184      {
6185 <  ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
6185 >  ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
6186   }
6187 + #line 6188 "conf_parser.c" /* yacc.c:1646  */
6188      break;
6189  
6190 <  case 643:
6191 <
8004 < /* Line 1455 of yacc.c  */
8005 < #line 3602 "ircd_parser.y"
6190 >  case 583:
6191 > #line 2871 "conf_parser.y" /* yacc.c:1646  */
6192      {
6193 <  ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
6193 >  ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
6194   }
6195 + #line 6196 "conf_parser.c" /* yacc.c:1646  */
6196      break;
6197  
6198 <  case 644:
6199 <
8013 < /* Line 1455 of yacc.c  */
8014 < #line 3605 "ircd_parser.y"
6198 >  case 584:
6199 > #line 2874 "conf_parser.y" /* yacc.c:1646  */
6200      {
6201 <  ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
6201 >  ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
6202   }
6203 + #line 6204 "conf_parser.c" /* yacc.c:1646  */
6204      break;
6205  
6206 <  case 645:
6207 <
8022 < /* Line 1455 of yacc.c  */
8023 < #line 3608 "ircd_parser.y"
6206 >  case 585:
6207 > #line 2877 "conf_parser.y" /* yacc.c:1646  */
6208      {
6209 <  ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
6209 >  ConfigGeneral.oper_umodes |= UMODE_WALLOP;
6210   }
6211 + #line 6212 "conf_parser.c" /* yacc.c:1646  */
6212      break;
6213  
6214 <  case 646:
6215 <
8031 < /* Line 1455 of yacc.c  */
8032 < #line 3611 "ircd_parser.y"
6214 >  case 586:
6215 > #line 2880 "conf_parser.y" /* yacc.c:1646  */
6216      {
6217 <  ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
6217 >  ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
6218   }
6219 + #line 6220 "conf_parser.c" /* yacc.c:1646  */
6220      break;
6221  
6222 <  case 647:
6223 <
8040 < /* Line 1455 of yacc.c  */
8041 < #line 3614 "ircd_parser.y"
6222 >  case 587:
6223 > #line 2883 "conf_parser.y" /* yacc.c:1646  */
6224      {
6225 <  ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
6225 >  ConfigGeneral.oper_umodes |= UMODE_CALLERID;
6226   }
6227 + #line 6228 "conf_parser.c" /* yacc.c:1646  */
6228      break;
6229  
6230 <  case 648:
6231 <
8049 < /* Line 1455 of yacc.c  */
8050 < #line 3617 "ircd_parser.y"
6230 >  case 588:
6231 > #line 2886 "conf_parser.y" /* yacc.c:1646  */
6232      {
6233 <  ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
6233 >  ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
6234   }
6235 + #line 6236 "conf_parser.c" /* yacc.c:1646  */
6236      break;
6237  
6238 <  case 649:
6239 <
8058 < /* Line 1455 of yacc.c  */
8059 < #line 3620 "ircd_parser.y"
6238 >  case 589:
6239 > #line 2889 "conf_parser.y" /* yacc.c:1646  */
6240      {
6241 <  ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
6241 >  ConfigGeneral.oper_umodes |= UMODE_REGONLY;
6242   }
6243 + #line 6244 "conf_parser.c" /* yacc.c:1646  */
6244      break;
6245  
6246 <  case 650:
6247 <
8067 < /* Line 1455 of yacc.c  */
8068 < #line 3623 "ircd_parser.y"
6246 >  case 590:
6247 > #line 2892 "conf_parser.y" /* yacc.c:1646  */
6248      {
6249 <  ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
6249 >  ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
6250   }
6251 + #line 6252 "conf_parser.c" /* yacc.c:1646  */
6252      break;
6253  
6254 <  case 651:
6255 <
8076 < /* Line 1455 of yacc.c  */
8077 < #line 3626 "ircd_parser.y"
6254 >  case 591:
6255 > #line 2897 "conf_parser.y" /* yacc.c:1646  */
6256      {
6257 <  ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
6257 >  ConfigGeneral.oper_only_umodes = 0;
6258   }
6259 + #line 6260 "conf_parser.c" /* yacc.c:1646  */
6260      break;
6261  
6262 <  case 652:
6263 <
8085 < /* Line 1455 of yacc.c  */
8086 < #line 3629 "ircd_parser.y"
6262 >  case 595:
6263 > #line 2903 "conf_parser.y" /* yacc.c:1646  */
6264      {
6265 <  ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
6265 >  ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
6266   }
6267 + #line 6268 "conf_parser.c" /* yacc.c:1646  */
6268      break;
6269  
6270 <  case 653:
6271 <
8094 < /* Line 1455 of yacc.c  */
8095 < #line 3632 "ircd_parser.y"
6270 >  case 596:
6271 > #line 2906 "conf_parser.y" /* yacc.c:1646  */
6272      {
6273 <  ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
6273 >  ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
6274   }
6275 + #line 6276 "conf_parser.c" /* yacc.c:1646  */
6276      break;
6277  
6278 <  case 654:
6279 <
8103 < /* Line 1455 of yacc.c  */
8104 < #line 3637 "ircd_parser.y"
6278 >  case 597:
6279 > #line 2909 "conf_parser.y" /* yacc.c:1646  */
6280      {
6281 <  ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number);
6281 >  ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
6282   }
6283 + #line 6284 "conf_parser.c" /* yacc.c:1646  */
6284      break;
6285  
6286 <  case 655:
6287 <
8112 < /* Line 1455 of yacc.c  */
8113 < #line 3642 "ircd_parser.y"
6286 >  case 598:
6287 > #line 2912 "conf_parser.y" /* yacc.c:1646  */
6288      {
6289 <  ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number);
6289 >  ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
6290   }
6291 + #line 6292 "conf_parser.c" /* yacc.c:1646  */
6292      break;
6293  
6294 <  case 656:
6295 <
8121 < /* Line 1455 of yacc.c  */
8122 < #line 3647 "ircd_parser.y"
6294 >  case 599:
6295 > #line 2915 "conf_parser.y" /* yacc.c:1646  */
6296      {
6297 <  ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number);
6297 >  ConfigGeneral.oper_only_umodes |= UMODE_FULL;
6298   }
6299 + #line 6300 "conf_parser.c" /* yacc.c:1646  */
6300      break;
6301  
6302 <  case 657:
6303 <
8130 < /* Line 1455 of yacc.c  */
8131 < #line 3652 "ircd_parser.y"
6302 >  case 600:
6303 > #line 2918 "conf_parser.y" /* yacc.c:1646  */
6304      {
6305 <  ConfigFileEntry.client_flood = (yyvsp[(3) - (4)].number);
6305 >  ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
6306   }
6307 + #line 6308 "conf_parser.c" /* yacc.c:1646  */
6308      break;
6309  
6310 <  case 658:
6311 <
8139 < /* Line 1455 of yacc.c  */
8140 < #line 3657 "ircd_parser.y"
6310 >  case 601:
6311 > #line 2921 "conf_parser.y" /* yacc.c:1646  */
6312      {
6313 <  ConfigFileEntry.dot_in_ip6_addr = yylval.number;
6313 >  ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
6314   }
6315 + #line 6316 "conf_parser.c" /* yacc.c:1646  */
6316      break;
6317  
6318 <  case 659:
6319 <
8148 < /* Line 1455 of yacc.c  */
8149 < #line 3665 "ircd_parser.y"
6318 >  case 602:
6319 > #line 2924 "conf_parser.y" /* yacc.c:1646  */
6320      {
6321 <  if (conf_parser_ctx.pass == 2)
8152 <  {
8153 <    yy_conf = make_conf_item(GDENY_TYPE);
8154 <    yy_aconf = map_to_conf(yy_conf);
8155 <  }
6321 >  ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
6322   }
6323 + #line 6324 "conf_parser.c" /* yacc.c:1646  */
6324      break;
6325  
6326 <  case 660:
6327 <
8161 < /* Line 1455 of yacc.c  */
8162 < #line 3672 "ircd_parser.y"
8163 <    {
8164 <  if (conf_parser_ctx.pass == 2)
8165 <  {
8166 <    /*
8167 <     * since we re-allocate yy_conf/yy_aconf after the end of action=, at the
8168 <     * end we will have one extra, so we should free it.
8169 <     */
8170 <    if (yy_conf->name == NULL || yy_aconf->user == NULL)
6326 >  case 603:
6327 > #line 2927 "conf_parser.y" /* yacc.c:1646  */
6328      {
6329 <      delete_conf_item(yy_conf);
8173 <      yy_conf = NULL;
8174 <      yy_aconf = NULL;
8175 <    }
8176 <  }
6329 >  ConfigGeneral.oper_only_umodes |= UMODE_REJ;
6330   }
6331 + #line 6332 "conf_parser.c" /* yacc.c:1646  */
6332      break;
6333  
6334 <  case 670:
6335 <
8182 < /* Line 1455 of yacc.c  */
8183 < #line 3698 "ircd_parser.y"
6334 >  case 604:
6335 > #line 2930 "conf_parser.y" /* yacc.c:1646  */
6336      {
6337 <  if (conf_parser_ctx.pass == 2)
8186 <    ConfigFileEntry.glines = yylval.number;
6337 >  ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
6338   }
6339 + #line 6340 "conf_parser.c" /* yacc.c:1646  */
6340      break;
6341  
6342 <  case 671:
6343 <
8192 < /* Line 1455 of yacc.c  */
8193 < #line 3704 "ircd_parser.y"
6342 >  case 605:
6343 > #line 2933 "conf_parser.y" /* yacc.c:1646  */
6344      {
6345 <  if (conf_parser_ctx.pass == 2)
8196 <    ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number);
6345 >  ConfigGeneral.oper_only_umodes |= UMODE_SPY;
6346   }
6347 + #line 6348 "conf_parser.c" /* yacc.c:1646  */
6348      break;
6349  
6350 <  case 672:
6351 <
8202 < /* Line 1455 of yacc.c  */
8203 < #line 3710 "ircd_parser.y"
6350 >  case 606:
6351 > #line 2936 "conf_parser.y" /* yacc.c:1646  */
6352      {
6353 <  if (conf_parser_ctx.pass == 2)
8206 <    ConfigFileEntry.gline_logging = 0;
6353 >  ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
6354   }
6355 + #line 6356 "conf_parser.c" /* yacc.c:1646  */
6356      break;
6357  
6358 <  case 676:
6359 <
8212 < /* Line 1455 of yacc.c  */
8213 < #line 3716 "ircd_parser.y"
6358 >  case 607:
6359 > #line 2939 "conf_parser.y" /* yacc.c:1646  */
6360      {
6361 <  if (conf_parser_ctx.pass == 2)
8216 <    ConfigFileEntry.gline_logging |= GDENY_REJECT;
6361 >  ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
6362   }
6363 + #line 6364 "conf_parser.c" /* yacc.c:1646  */
6364      break;
6365  
6366 <  case 677:
6367 <
8222 < /* Line 1455 of yacc.c  */
8223 < #line 3720 "ircd_parser.y"
6366 >  case 608:
6367 > #line 2942 "conf_parser.y" /* yacc.c:1646  */
6368      {
6369 <  if (conf_parser_ctx.pass == 2)
8226 <    ConfigFileEntry.gline_logging |= GDENY_BLOCK;
6369 >  ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
6370   }
6371 + #line 6372 "conf_parser.c" /* yacc.c:1646  */
6372      break;
6373  
6374 <  case 678:
6375 <
8232 < /* Line 1455 of yacc.c  */
8233 < #line 3726 "ircd_parser.y"
6374 >  case 609:
6375 > #line 2945 "conf_parser.y" /* yacc.c:1646  */
6376      {
6377 <  if (conf_parser_ctx.pass == 2)
8236 <  {
8237 <    struct split_nuh_item nuh;
8238 <
8239 <    nuh.nuhmask  = yylval.string;
8240 <    nuh.nickptr  = NULL;
8241 <    nuh.userptr  = userbuf;
8242 <    nuh.hostptr  = hostbuf;
8243 <
8244 <    nuh.nicksize = 0;
8245 <    nuh.usersize = sizeof(userbuf);
8246 <    nuh.hostsize = sizeof(hostbuf);
8247 <
8248 <    split_nuh(&nuh);
8249 <
8250 <    if (yy_aconf->user == NULL)
8251 <    {
8252 <      DupString(yy_aconf->user, userbuf);
8253 <      DupString(yy_aconf->host, hostbuf);
8254 <    }
8255 <    else
8256 <    {
8257 <      struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
8258 <
8259 <      DupString(yy_tmp->user, userbuf);
8260 <      DupString(yy_tmp->host, hostbuf);
8261 <
8262 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
8263 <    }
8264 <  }
6377 >  ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
6378   }
6379 + #line 6380 "conf_parser.c" /* yacc.c:1646  */
6380      break;
6381  
6382 <  case 679:
6383 <
8270 < /* Line 1455 of yacc.c  */
8271 < #line 3760 "ircd_parser.y"
6382 >  case 610:
6383 > #line 2948 "conf_parser.y" /* yacc.c:1646  */
6384      {
6385 <  if (conf_parser_ctx.pass == 2)  
8274 <  {
8275 <    MyFree(yy_conf->name);
8276 <    DupString(yy_conf->name, yylval.string);
8277 <  }
6385 >  ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
6386   }
6387 + #line 6388 "conf_parser.c" /* yacc.c:1646  */
6388      break;
6389  
6390 <  case 680:
6391 <
8283 < /* Line 1455 of yacc.c  */
8284 < #line 3769 "ircd_parser.y"
6390 >  case 611:
6391 > #line 2951 "conf_parser.y" /* yacc.c:1646  */
6392      {
6393 <  if (conf_parser_ctx.pass == 2)
8287 <    yy_aconf->flags = 0;
6393 >  ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
6394   }
6395 + #line 6396 "conf_parser.c" /* yacc.c:1646  */
6396      break;
6397  
6398 <  case 681:
6399 <
8293 < /* Line 1455 of yacc.c  */
8294 < #line 3773 "ircd_parser.y"
8295 <    {
8296 <  if (conf_parser_ctx.pass == 2)
8297 <  {
8298 <    struct CollectItem *yy_tmp = NULL;
8299 <    dlink_node *ptr, *next_ptr;
8300 <
8301 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
6398 >  case 612:
6399 > #line 2954 "conf_parser.y" /* yacc.c:1646  */
6400      {
6401 <      struct AccessItem *new_aconf;
8304 <      struct ConfItem *new_conf;
8305 <
8306 <      yy_tmp = ptr->data;
8307 <      new_conf = make_conf_item(GDENY_TYPE);
8308 <      new_aconf = map_to_conf(new_conf);
8309 <
8310 <      new_aconf->flags = yy_aconf->flags;
8311 <
8312 <      if (yy_conf->name != NULL)
8313 <        DupString(new_conf->name, yy_conf->name);
8314 <      else
8315 <        DupString(new_conf->name, "*");
8316 <      if (yy_aconf->user != NULL)
8317 <         DupString(new_aconf->user, yy_tmp->user);
8318 <      else  
8319 <        DupString(new_aconf->user, "*");
8320 <      if (yy_aconf->host != NULL)
8321 <        DupString(new_aconf->host, yy_tmp->host);
8322 <      else
8323 <        DupString(new_aconf->host, "*");
8324 <
8325 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
8326 <    }
8327 <
8328 <    /*
8329 <     * In case someone has fed us with more than one action= after user/name
8330 <     * which would leak memory  -Michael
8331 <     */
8332 <    if (yy_conf->name == NULL || yy_aconf->user == NULL)
8333 <      delete_conf_item(yy_conf);
8334 <
8335 <    yy_conf = make_conf_item(GDENY_TYPE);
8336 <    yy_aconf = map_to_conf(yy_conf);
8337 <  }
6401 >  ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
6402   }
6403 + #line 6404 "conf_parser.c" /* yacc.c:1646  */
6404      break;
6405  
6406 <  case 684:
6407 <
8343 < /* Line 1455 of yacc.c  */
8344 < #line 3820 "ircd_parser.y"
6406 >  case 613:
6407 > #line 2957 "conf_parser.y" /* yacc.c:1646  */
6408      {
6409 <  if (conf_parser_ctx.pass == 2)
8347 <    yy_aconf->flags |= GDENY_REJECT;
6409 >  ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
6410   }
6411 + #line 6412 "conf_parser.c" /* yacc.c:1646  */
6412      break;
6413  
6414 <  case 685:
6415 <
8353 < /* Line 1455 of yacc.c  */
8354 < #line 3824 "ircd_parser.y"
6414 >  case 614:
6415 > #line 2960 "conf_parser.y" /* yacc.c:1646  */
6416      {
6417 <  if (conf_parser_ctx.pass == 2)
8357 <    yy_aconf->flags |= GDENY_BLOCK;
6417 >  ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
6418   }
6419 + #line 6420 "conf_parser.c" /* yacc.c:1646  */
6420      break;
6421  
6422 <  case 708:
6423 <
8363 < /* Line 1455 of yacc.c  */
8364 < #line 3848 "ircd_parser.y"
6422 >  case 615:
6423 > #line 2965 "conf_parser.y" /* yacc.c:1646  */
6424      {
6425 <  ConfigChannel.disable_fake_channels = yylval.number;
6425 >  ConfigGeneral.min_nonwildcard = (yyvsp[-1].number);
6426   }
6427 + #line 6428 "conf_parser.c" /* yacc.c:1646  */
6428      break;
6429  
6430 <  case 709:
6431 <
8372 < /* Line 1455 of yacc.c  */
8373 < #line 3853 "ircd_parser.y"
6430 >  case 616:
6431 > #line 2970 "conf_parser.y" /* yacc.c:1646  */
6432      {
6433 <  ConfigChannel.restrict_channels = yylval.number;
6433 >  ConfigGeneral.min_nonwildcard_simple = (yyvsp[-1].number);
6434   }
6435 + #line 6436 "conf_parser.c" /* yacc.c:1646  */
6436      break;
6437  
6438 <  case 710:
6439 <
8381 < /* Line 1455 of yacc.c  */
8382 < #line 3858 "ircd_parser.y"
6438 >  case 617:
6439 > #line 2975 "conf_parser.y" /* yacc.c:1646  */
6440      {
6441 <  ConfigChannel.disable_local_channels = yylval.number;
6441 >  ConfigGeneral.default_floodcount = (yyvsp[-1].number);
6442   }
6443 + #line 6444 "conf_parser.c" /* yacc.c:1646  */
6444      break;
6445  
6446 <  case 711:
6447 <
8390 < /* Line 1455 of yacc.c  */
8391 < #line 3863 "ircd_parser.y"
6446 >  case 636:
6447 > #line 3004 "conf_parser.y" /* yacc.c:1646  */
6448      {
6449 <  ConfigChannel.use_except = yylval.number;
6449 >  ConfigChannel.disable_fake_channels = yylval.number;
6450   }
6451 + #line 6452 "conf_parser.c" /* yacc.c:1646  */
6452      break;
6453  
6454 <  case 712:
6455 <
8399 < /* Line 1455 of yacc.c  */
8400 < #line 3868 "ircd_parser.y"
6454 >  case 637:
6455 > #line 3009 "conf_parser.y" /* yacc.c:1646  */
6456      {
6457 <  ConfigChannel.use_invex = yylval.number;
6457 >  ConfigChannel.invite_client_count = (yyvsp[-1].number);
6458   }
6459 + #line 6460 "conf_parser.c" /* yacc.c:1646  */
6460      break;
6461  
6462 <  case 713:
6463 <
8408 < /* Line 1455 of yacc.c  */
8409 < #line 3873 "ircd_parser.y"
6462 >  case 638:
6463 > #line 3014 "conf_parser.y" /* yacc.c:1646  */
6464      {
6465 <  ConfigChannel.use_knock = yylval.number;
6465 >  ConfigChannel.invite_client_time = (yyvsp[-1].number);
6466   }
6467 + #line 6468 "conf_parser.c" /* yacc.c:1646  */
6468      break;
6469  
6470 <  case 714:
6471 <
8417 < /* Line 1455 of yacc.c  */
8418 < #line 3878 "ircd_parser.y"
6470 >  case 639:
6471 > #line 3019 "conf_parser.y" /* yacc.c:1646  */
6472      {
6473 <  ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number);
6473 >  ConfigChannel.knock_client_count = (yyvsp[-1].number);
6474   }
6475 + #line 6476 "conf_parser.c" /* yacc.c:1646  */
6476      break;
6477  
6478 <  case 715:
6479 <
8426 < /* Line 1455 of yacc.c  */
8427 < #line 3883 "ircd_parser.y"
6478 >  case 640:
6479 > #line 3024 "conf_parser.y" /* yacc.c:1646  */
6480      {
6481 <  ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number);
6481 >  ConfigChannel.knock_client_time = (yyvsp[-1].number);
6482   }
6483 + #line 6484 "conf_parser.c" /* yacc.c:1646  */
6484      break;
6485  
6486 <  case 716:
6487 <
8435 < /* Line 1455 of yacc.c  */
8436 < #line 3888 "ircd_parser.y"
6486 >  case 641:
6487 > #line 3029 "conf_parser.y" /* yacc.c:1646  */
6488      {
6489 <  ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number);
6489 >  ConfigChannel.knock_delay_channel = (yyvsp[-1].number);
6490   }
6491 + #line 6492 "conf_parser.c" /* yacc.c:1646  */
6492      break;
6493  
6494 <  case 717:
6495 <
8444 < /* Line 1455 of yacc.c  */
8445 < #line 3893 "ircd_parser.y"
6494 >  case 642:
6495 > #line 3034 "conf_parser.y" /* yacc.c:1646  */
6496      {
6497 <  ConfigChannel.quiet_on_ban = yylval.number;
6497 >  ConfigChannel.max_channels = (yyvsp[-1].number);
6498   }
6499 + #line 6500 "conf_parser.c" /* yacc.c:1646  */
6500      break;
6501  
6502 <  case 718:
6503 <
8453 < /* Line 1455 of yacc.c  */
8454 < #line 3898 "ircd_parser.y"
6502 >  case 643:
6503 > #line 3039 "conf_parser.y" /* yacc.c:1646  */
6504      {
6505 <  ConfigChannel.max_bans = (yyvsp[(3) - (4)].number);
6505 >  ConfigChannel.max_bans = (yyvsp[-1].number);
6506   }
6507 + #line 6508 "conf_parser.c" /* yacc.c:1646  */
6508      break;
6509  
6510 <  case 719:
6511 <
8462 < /* Line 1455 of yacc.c  */
8463 < #line 3903 "ircd_parser.y"
6510 >  case 644:
6511 > #line 3044 "conf_parser.y" /* yacc.c:1646  */
6512      {
6513 <  ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number);
6513 >  ConfigChannel.default_split_user_count = (yyvsp[-1].number);
6514   }
6515 + #line 6516 "conf_parser.c" /* yacc.c:1646  */
6516      break;
6517  
6518 <  case 720:
6519 <
8471 < /* Line 1455 of yacc.c  */
8472 < #line 3908 "ircd_parser.y"
6518 >  case 645:
6519 > #line 3049 "conf_parser.y" /* yacc.c:1646  */
6520      {
6521 <  ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number);
6521 >  ConfigChannel.default_split_server_count = (yyvsp[-1].number);
6522   }
6523 + #line 6524 "conf_parser.c" /* yacc.c:1646  */
6524      break;
6525  
6526 <  case 721:
6527 <
8480 < /* Line 1455 of yacc.c  */
8481 < #line 3913 "ircd_parser.y"
6526 >  case 646:
6527 > #line 3054 "conf_parser.y" /* yacc.c:1646  */
6528      {
6529    ConfigChannel.no_create_on_split = yylval.number;
6530   }
6531 + #line 6532 "conf_parser.c" /* yacc.c:1646  */
6532      break;
6533  
6534 <  case 722:
6535 <
8489 < /* Line 1455 of yacc.c  */
8490 < #line 3918 "ircd_parser.y"
6534 >  case 647:
6535 > #line 3059 "conf_parser.y" /* yacc.c:1646  */
6536      {
6537    ConfigChannel.no_join_on_split = yylval.number;
6538   }
6539 + #line 6540 "conf_parser.c" /* yacc.c:1646  */
6540      break;
6541  
6542 <  case 723:
6543 <
8498 < /* Line 1455 of yacc.c  */
8499 < #line 3923 "ircd_parser.y"
6542 >  case 648:
6543 > #line 3064 "conf_parser.y" /* yacc.c:1646  */
6544      {
6545 <  ConfigChannel.burst_topicwho = yylval.number;
6545 >  GlobalSetOptions.joinfloodcount = yylval.number;
6546   }
6547 + #line 6548 "conf_parser.c" /* yacc.c:1646  */
6548      break;
6549  
6550 <  case 724:
6551 <
8507 < /* Line 1455 of yacc.c  */
8508 < #line 3928 "ircd_parser.y"
6550 >  case 649:
6551 > #line 3069 "conf_parser.y" /* yacc.c:1646  */
6552      {
6553 <  GlobalSetOptions.joinfloodcount = yylval.number;
6553 >  GlobalSetOptions.joinfloodtime = (yyvsp[-1].number);
6554   }
6555 + #line 6556 "conf_parser.c" /* yacc.c:1646  */
6556      break;
6557  
6558 <  case 725:
6559 <
8516 < /* Line 1455 of yacc.c  */
8517 < #line 3933 "ircd_parser.y"
6558 >  case 662:
6559 > #line 3091 "conf_parser.y" /* yacc.c:1646  */
6560      {
6561 <  GlobalSetOptions.joinfloodtime = yylval.number;
6561 >  if (conf_parser_ctx.pass == 2)
6562 >    ConfigServerHide.flatten_links = yylval.number;
6563   }
6564 + #line 6565 "conf_parser.c" /* yacc.c:1646  */
6565      break;
6566  
6567 <  case 737:
6568 <
8525 < /* Line 1455 of yacc.c  */
8526 < #line 3952 "ircd_parser.y"
6567 >  case 663:
6568 > #line 3097 "conf_parser.y" /* yacc.c:1646  */
6569      {
6570    if (conf_parser_ctx.pass == 2)
6571 <    ConfigServerHide.flatten_links = yylval.number;
6571 >    ConfigServerHide.disable_remote_commands = yylval.number;
6572   }
6573 + #line 6574 "conf_parser.c" /* yacc.c:1646  */
6574      break;
6575  
6576 <  case 738:
6577 <
8535 < /* Line 1455 of yacc.c  */
8536 < #line 3958 "ircd_parser.y"
6576 >  case 664:
6577 > #line 3103 "conf_parser.y" /* yacc.c:1646  */
6578      {
6579    if (conf_parser_ctx.pass == 2)
6580      ConfigServerHide.hide_servers = yylval.number;
6581   }
6582 + #line 6583 "conf_parser.c" /* yacc.c:1646  */
6583      break;
6584  
6585 <  case 739:
6585 >  case 665:
6586 > #line 3109 "conf_parser.y" /* yacc.c:1646  */
6587 >    {
6588 >  if (conf_parser_ctx.pass == 2)
6589 >    ConfigServerHide.hide_services = yylval.number;
6590 > }
6591 > #line 6592 "conf_parser.c" /* yacc.c:1646  */
6592 >    break;
6593  
6594 < /* Line 1455 of yacc.c  */
6595 < #line 3964 "ircd_parser.y"
6594 >  case 666:
6595 > #line 3115 "conf_parser.y" /* yacc.c:1646  */
6596      {
6597    if (conf_parser_ctx.pass == 2)
6598    {
6599      MyFree(ConfigServerHide.hidden_name);
6600 <    DupString(ConfigServerHide.hidden_name, yylval.string);
6600 >    ConfigServerHide.hidden_name = xstrdup(yylval.string);
6601    }
6602   }
6603 + #line 6604 "conf_parser.c" /* yacc.c:1646  */
6604      break;
6605  
6606 <  case 740:
6607 <
8558 < /* Line 1455 of yacc.c  */
8559 < #line 3973 "ircd_parser.y"
6606 >  case 667:
6607 > #line 3124 "conf_parser.y" /* yacc.c:1646  */
6608      {
6609    if (conf_parser_ctx.pass == 2)
6610    {
6611 <    if (((yyvsp[(3) - (4)].number) > 0) && ConfigServerHide.links_disabled == 1)
6611 >    if (((yyvsp[-1].number) > 0) && ConfigServerHide.links_disabled == 1)
6612      {
6613 <      eventAddIsh("write_links_file", write_links_file, NULL, (yyvsp[(3) - (4)].number));
6613 >      event_write_links_file.when = (yyvsp[-1].number);
6614 >      event_addish(&event_write_links_file, NULL);
6615        ConfigServerHide.links_disabled = 0;
6616      }
6617  
6618 <    ConfigServerHide.links_delay = (yyvsp[(3) - (4)].number);
6618 >    ConfigServerHide.links_delay = (yyvsp[-1].number);
6619    }
6620   }
6621 + #line 6622 "conf_parser.c" /* yacc.c:1646  */
6622      break;
6623  
6624 <  case 741:
6625 <
8576 < /* Line 1455 of yacc.c  */
8577 < #line 3987 "ircd_parser.y"
6624 >  case 668:
6625 > #line 3139 "conf_parser.y" /* yacc.c:1646  */
6626      {
6627    if (conf_parser_ctx.pass == 2)
6628      ConfigServerHide.hidden = yylval.number;
6629   }
6630 + #line 6631 "conf_parser.c" /* yacc.c:1646  */
6631      break;
6632  
6633 <  case 742:
6634 <
8586 < /* Line 1455 of yacc.c  */
8587 < #line 3993 "ircd_parser.y"
8588 <    {
8589 <  if (conf_parser_ctx.pass == 2)
8590 <    ConfigServerHide.disable_hidden = yylval.number;
8591 < }
8592 <    break;
8593 <
8594 <  case 743:
8595 <
8596 < /* Line 1455 of yacc.c  */
8597 < #line 3999 "ircd_parser.y"
6633 >  case 669:
6634 > #line 3145 "conf_parser.y" /* yacc.c:1646  */
6635      {
6636    if (conf_parser_ctx.pass == 2)
6637      ConfigServerHide.hide_server_ips = yylval.number;
6638   }
6639 + #line 6640 "conf_parser.c" /* yacc.c:1646  */
6640      break;
6641  
6642  
6643 <
8606 < /* Line 1455 of yacc.c  */
8607 < #line 8608 "ircd_parser.c"
6643 > #line 6644 "conf_parser.c" /* yacc.c:1646  */
6644        default: break;
6645      }
6646 +  /* User semantic actions sometimes alter yychar, and that requires
6647 +     that yytoken be updated with the new translation.  We take the
6648 +     approach of translating immediately before every use of yytoken.
6649 +     One alternative is translating here after every semantic action,
6650 +     but that translation would be missed if the semantic action invokes
6651 +     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
6652 +     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
6653 +     incorrect destructor might then be invoked immediately.  In the
6654 +     case of YYERROR or YYBACKUP, subsequent parser actions might lead
6655 +     to an incorrect destructor call or verbose syntax error message
6656 +     before the lookahead is translated.  */
6657    YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
6658  
6659    YYPOPSTACK (yylen);
# Line 8615 | Line 6662 | yyreduce:
6662  
6663    *++yyvsp = yyval;
6664  
6665 <  /* Now `shift' the result of the reduction.  Determine what state
6665 >  /* Now 'shift' the result of the reduction.  Determine what state
6666       that goes to, based on the state we popped back to and the rule
6667       number reduced by.  */
6668  
# Line 8630 | Line 6677 | yyreduce:
6677    goto yynewstate;
6678  
6679  
6680 < /*------------------------------------.
6681 < | yyerrlab -- here on detecting error |
6682 < `------------------------------------*/
6680 > /*--------------------------------------.
6681 > | yyerrlab -- here on detecting error.  |
6682 > `--------------------------------------*/
6683   yyerrlab:
6684 +  /* Make sure we have latest lookahead translation.  See comments at
6685 +     user semantic actions for why this is necessary.  */
6686 +  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
6687 +
6688    /* If not already recovering from an error, report this error.  */
6689    if (!yyerrstatus)
6690      {
# Line 8641 | Line 6692 | yyerrlab:
6692   #if ! YYERROR_VERBOSE
6693        yyerror (YY_("syntax error"));
6694   #else
6695 + # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
6696 +                                        yyssp, yytoken)
6697        {
6698 <        YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
6699 <        if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
6700 <          {
6701 <            YYSIZE_T yyalloc = 2 * yysize;
6702 <            if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
6703 <              yyalloc = YYSTACK_ALLOC_MAXIMUM;
6704 <            if (yymsg != yymsgbuf)
6705 <              YYSTACK_FREE (yymsg);
6706 <            yymsg = (char *) YYSTACK_ALLOC (yyalloc);
6707 <            if (yymsg)
6708 <              yymsg_alloc = yyalloc;
6709 <            else
6710 <              {
6711 <                yymsg = yymsgbuf;
6712 <                yymsg_alloc = sizeof yymsgbuf;
6713 <              }
6714 <          }
6715 <
6716 <        if (0 < yysize && yysize <= yymsg_alloc)
6717 <          {
6718 <            (void) yysyntax_error (yymsg, yystate, yychar);
6719 <            yyerror (yymsg);
6720 <          }
6721 <        else
6722 <          {
8670 <            yyerror (YY_("syntax error"));
8671 <            if (yysize != 0)
8672 <              goto yyexhaustedlab;
8673 <          }
6698 >        char const *yymsgp = YY_("syntax error");
6699 >        int yysyntax_error_status;
6700 >        yysyntax_error_status = YYSYNTAX_ERROR;
6701 >        if (yysyntax_error_status == 0)
6702 >          yymsgp = yymsg;
6703 >        else if (yysyntax_error_status == 1)
6704 >          {
6705 >            if (yymsg != yymsgbuf)
6706 >              YYSTACK_FREE (yymsg);
6707 >            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
6708 >            if (!yymsg)
6709 >              {
6710 >                yymsg = yymsgbuf;
6711 >                yymsg_alloc = sizeof yymsgbuf;
6712 >                yysyntax_error_status = 2;
6713 >              }
6714 >            else
6715 >              {
6716 >                yysyntax_error_status = YYSYNTAX_ERROR;
6717 >                yymsgp = yymsg;
6718 >              }
6719 >          }
6720 >        yyerror (yymsgp);
6721 >        if (yysyntax_error_status == 2)
6722 >          goto yyexhaustedlab;
6723        }
6724 + # undef YYSYNTAX_ERROR
6725   #endif
6726      }
6727  
# Line 8680 | Line 6730 | yyerrlab:
6730    if (yyerrstatus == 3)
6731      {
6732        /* If just tried and failed to reuse lookahead token after an
6733 <         error, discard it.  */
6733 >         error, discard it.  */
6734  
6735        if (yychar <= YYEOF)
6736 <        {
6737 <          /* Return failure if at end of input.  */
6738 <          if (yychar == YYEOF)
6739 <            YYABORT;
6740 <        }
6736 >        {
6737 >          /* Return failure if at end of input.  */
6738 >          if (yychar == YYEOF)
6739 >            YYABORT;
6740 >        }
6741        else
6742 <        {
6743 <          yydestruct ("Error: discarding",
6744 <                      yytoken, &yylval);
6745 <          yychar = YYEMPTY;
6746 <        }
6742 >        {
6743 >          yydestruct ("Error: discarding",
6744 >                      yytoken, &yylval);
6745 >          yychar = YYEMPTY;
6746 >        }
6747      }
6748  
6749    /* Else will try to reuse lookahead token after shifting the error
# Line 8712 | Line 6762 | yyerrorlab:
6762    if (/*CONSTCOND*/ 0)
6763       goto yyerrorlab;
6764  
6765 <  /* Do not reclaim the symbols of the rule which action triggered
6765 >  /* Do not reclaim the symbols of the rule whose action triggered
6766       this YYERROR.  */
6767    YYPOPSTACK (yylen);
6768    yylen = 0;
# Line 8725 | Line 6775 | yyerrorlab:
6775   | yyerrlab1 -- common code for both syntax error and YYERROR.  |
6776   `-------------------------------------------------------------*/
6777   yyerrlab1:
6778 <  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
6778 >  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
6779  
6780    for (;;)
6781      {
6782        yyn = yypact[yystate];
6783 <      if (yyn != YYPACT_NINF)
6784 <        {
6785 <          yyn += YYTERROR;
6786 <          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
6787 <            {
6788 <              yyn = yytable[yyn];
6789 <              if (0 < yyn)
6790 <                break;
6791 <            }
6792 <        }
6783 >      if (!yypact_value_is_default (yyn))
6784 >        {
6785 >          yyn += YYTERROR;
6786 >          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
6787 >            {
6788 >              yyn = yytable[yyn];
6789 >              if (0 < yyn)
6790 >                break;
6791 >            }
6792 >        }
6793  
6794        /* Pop the current state because it cannot handle the error token.  */
6795        if (yyssp == yyss)
6796 <        YYABORT;
6796 >        YYABORT;
6797  
6798  
6799        yydestruct ("Error: popping",
6800 <                  yystos[yystate], yyvsp);
6800 >                  yystos[yystate], yyvsp);
6801        YYPOPSTACK (1);
6802        yystate = *yyssp;
6803        YY_STACK_PRINT (yyss, yyssp);
6804      }
6805  
6806 +  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
6807    *++yyvsp = yylval;
6808 +  YY_IGNORE_MAYBE_UNINITIALIZED_END
6809  
6810  
6811    /* Shift the error token.  */
# Line 8777 | Line 6829 | yyabortlab:
6829    yyresult = 1;
6830    goto yyreturn;
6831  
6832 < #if !defined(yyoverflow) || YYERROR_VERBOSE
6832 > #if !defined yyoverflow || YYERROR_VERBOSE
6833   /*-------------------------------------------------.
6834   | yyexhaustedlab -- memory exhaustion comes here.  |
6835   `-------------------------------------------------*/
# Line 8789 | Line 6841 | yyexhaustedlab:
6841  
6842   yyreturn:
6843    if (yychar != YYEMPTY)
6844 <     yydestruct ("Cleanup: discarding lookahead",
6845 <                 yytoken, &yylval);
6846 <  /* Do not reclaim the symbols of the rule which action triggered
6844 >    {
6845 >      /* Make sure we have latest lookahead translation.  See comments at
6846 >         user semantic actions for why this is necessary.  */
6847 >      yytoken = YYTRANSLATE (yychar);
6848 >      yydestruct ("Cleanup: discarding lookahead",
6849 >                  yytoken, &yylval);
6850 >    }
6851 >  /* Do not reclaim the symbols of the rule whose action triggered
6852       this YYABORT or YYACCEPT.  */
6853    YYPOPSTACK (yylen);
6854    YY_STACK_PRINT (yyss, yyssp);
6855    while (yyssp != yyss)
6856      {
6857        yydestruct ("Cleanup: popping",
6858 <                  yystos[*yyssp], yyvsp);
6858 >                  yystos[*yyssp], yyvsp);
6859        YYPOPSTACK (1);
6860      }
6861   #ifndef yyoverflow
# Line 8809 | Line 6866 | yyreturn:
6866    if (yymsg != yymsgbuf)
6867      YYSTACK_FREE (yymsg);
6868   #endif
6869 <  /* Make sure YYID is used.  */
8813 <  return YYID (yyresult);
6869 >  return yyresult;
6870   }
8815
8816
8817

Comparing:
ircd-hybrid-7.2/src/ircd_parser.c (property svn:keywords), Revision 978 by michael, Sun Aug 9 09:47:58 2009 UTC vs.
ircd-hybrid/trunk/src/conf_parser.c (property svn:keywords), Revision 4744 by michael, Thu Oct 16 11:46:19 2014 UTC

# Line 0 | Line 1
1 + Id Revision

Diff Legend

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