ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/conf_parser.y

Comparing ircd-hybrid/trunk/src/conf_parser.y (file contents):
Revision 2252 by michael, Sun Jun 16 13:29:13 2013 UTC vs.
Revision 5693 by michael, Sat Mar 14 20:40:29 2015 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf_parser.y: Parses the ircd configuration file.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2005 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 2000-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
21	–	*
22	–	*  $Id$
20		*/
21
22	+	/*! \file conf_parser.y
23	+	* \brief Parses the ircd configuration file.
24	+	* \version $Id$
25	+	*/
26	+
27	+
28		%{
29
27	–	#define YY_NO_UNPUT
30		#include <sys/types.h>
31		#include <string.h>
32
#	Line 34 | Line 36
36		#include "list.h"
37		#include "conf.h"
38		#include "conf_class.h"
39	+	#include "conf_pseudo.h"
40		#include "event.h"
41		#include "log.h"
42		#include "client.h"     /* for UMODE_ALL only */
43		#include "irc_string.h"
44		#include "memory.h"
45		#include "modules.h"
46	<	#include "s_serv.h"
46	>	#include "server.h"
47		#include "hostmask.h"
48		#include "send.h"
49		#include "listener.h"
50		#include "resv.h"
51		#include "numeric.h"
52	<	#include "s_user.h"
52	>	#include "user.h"
53		#include "motd.h"
54
55		#ifdef HAVE_LIBCRYPTO
#	Line 62 | Line 65 | int yylex(void);
65
66		static struct
67		{
68	<	struct {
68	>	struct
69	>	{
70		dlink_list list;
71		} mask,
72		leaf,
73		hub;
74
75	<	struct {
75	>	struct
76	>	{
77		char buf[IRCD_BUFSIZE];
78		} name,
79	+	nick,
80		user,
81		host,
82		addr,
#	Line 80 | Line 86 | static struct
86		cert,
87		rpass,
88		spass,
89	<	class;
89	>	whois,
90	>	class,
91	>	target,
92	>	prepend,
93	>	command;
94
95	<	struct {
95	>	struct
96	>	{
97		unsigned int value;
98		} flags,
99		modes,
#	Line 101 | Line 112 | static struct
112		max_ident,
113		max_sendq,
114		max_recvq,
115	+	max_channels,
116		cidr_bitlen_ipv4,
117		cidr_bitlen_ipv6,
118		number_per_cidr;
#	Line 109 | Line 121 | static struct
121		static void
122		reset_block_state(void)
123		{
124	<	dlink_node *ptr = NULL, *ptr_next = NULL;
124	>	dlink_node *node = NULL, *node_next = NULL;
125
126	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.mask.list.head)
126	>	DLINK_FOREACH_SAFE(node, node_next, block_state.mask.list.head)
127		{
128	<	MyFree(ptr->data);
129	<	dlinkDelete(ptr, &block_state.mask.list);
130	<	free_dlink_node(ptr);
128	>	MyFree(node->data);
129	>	dlinkDelete(node, &block_state.mask.list);
130	>	free_dlink_node(node);
131		}
132
133	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
133	>	DLINK_FOREACH_SAFE(node, node_next, block_state.leaf.list.head)
134		{
135	<	MyFree(ptr->data);
136	<	dlinkDelete(ptr, &block_state.leaf.list);
137	<	free_dlink_node(ptr);
135	>	MyFree(node->data);
136	>	dlinkDelete(node, &block_state.leaf.list);
137	>	free_dlink_node(node);
138		}
139
140	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.hub.list.head)
140	>	DLINK_FOREACH_SAFE(node, node_next, block_state.hub.list.head)
141		{
142	<	MyFree(ptr->data);
143	<	dlinkDelete(ptr, &block_state.hub.list);
144	<	free_dlink_node(ptr);
142	>	MyFree(node->data);
143	>	dlinkDelete(node, &block_state.hub.list);
144	>	free_dlink_node(node);
145		}
146
147		memset(&block_state, 0, sizeof(block_state));
#	Line 148 | Line 160 | reset_block_state(void)
160		%token  ANTI_NICK_FLOOD
161		%token  ANTI_SPAM_EXIT_MESSAGE_TIME
162		%token  AUTOCONN
163	+	%token  AWAY_COUNT
164	+	%token  AWAY_TIME
165		%token  BYTES KBYTES MBYTES
166		%token  CALLER_ID_WAIT
167		%token  CAN_FLOOD
#	Line 157 | Line 171 | reset_block_state(void)
171		%token  CLASS
172		%token  CONNECT
173		%token  CONNECTFREQ
174	+	%token  CYCLE_ON_HOST_CHANGE
175		%token  DEFAULT_FLOODCOUNT
176	+	%token  DEFAULT_JOIN_FLOOD_COUNT
177	+	%token  DEFAULT_JOIN_FLOOD_TIME
178	+	%token  DEFAULT_MAX_CLIENTS
179		%token  DEFAULT_SPLIT_SERVER_COUNT
180		%token  DEFAULT_SPLIT_USER_COUNT
181		%token  DENY
#	Line 167 | Line 185 | reset_block_state(void)
185		%token  DISABLE_FAKE_CHANNELS
186		%token  DISABLE_REMOTE_COMMANDS
187		%token  DOTS_IN_IDENT
170	–	%token  EGDPOOL_PATH
188		%token  EMAIL
189		%token  ENCRYPTED
190		%token  EXCEED_LIMIT
#	Line 187 | Line 204 | reset_block_state(void)
204		%token  HAVENT_READ_CONF
205		%token  HIDDEN
206		%token  HIDDEN_NAME
207	+	%token  HIDE_CHANS
208	+	%token  HIDE_IDLE
209		%token  HIDE_IDLE_FROM_OPERS
210		%token  HIDE_SERVER_IPS
211		%token  HIDE_SERVERS
#	Line 197 | Line 216 | reset_block_state(void)
216		%token  HUB_MASK
217		%token  IGNORE_BOGUS_TS
218		%token  INVISIBLE_ON_CONNECT
219	+	%token  INVITE_CLIENT_COUNT
220	+	%token  INVITE_CLIENT_TIME
221		%token  IP
222		%token  IRCD_AUTH
223		%token  IRCD_FLAGS
224		%token  IRCD_SID
204	–	%token  JOIN_FLOOD_COUNT
205	–	%token  JOIN_FLOOD_TIME
225		%token  KILL
226		%token  KILL_CHASE_TIME_LIMIT
227		%token  KLINE
228		%token  KLINE_EXEMPT
229	<	%token  KNOCK_DELAY
229	>	%token  KNOCK_CLIENT_COUNT
230	>	%token  KNOCK_CLIENT_TIME
231		%token  KNOCK_DELAY_CHANNEL
232		%token  LEAF_MASK
233		%token  LINKS_DELAY
#	Line 215 | Line 235 | reset_block_state(void)
235		%token  MASK
236		%token  MAX_ACCEPT
237		%token  MAX_BANS
238	<	%token  MAX_CHANS_PER_OPER
219	<	%token  MAX_CHANS_PER_USER
238	>	%token  MAX_CHANNELS
239		%token  MAX_GLOBAL
240		%token  MAX_IDENT
241		%token  MAX_IDLE
#	Line 283 | Line 302 | reset_block_state(void)
302		%token  SSL_CERTIFICATE_FILE
303		%token  SSL_CERTIFICATE_FINGERPRINT
304		%token  SSL_CONNECTION_REQUIRED
305	+	%token  SSL_DH_ELLIPTIC_CURVE
306		%token  SSL_DH_PARAM_FILE
307	+	%token  SSL_MESSAGE_DIGEST_ALGORITHM
308		%token  STATS_E_DISABLED
309		%token  STATS_I_OPER_ONLY
310		%token  STATS_K_OPER_ONLY
311	+	%token  STATS_M_OPER_ONLY
312		%token  STATS_O_OPER_ONLY
313		%token  STATS_P_OPER_ONLY
314	+	%token  STATS_U_OPER_ONLY
315		%token  T_ALL
316		%token  T_BOTS
317		%token  T_CALLERID
318		%token  T_CCONN
319	+	%token  T_COMMAND
320		%token  T_CLUSTER
321		%token  T_DEAF
322		%token  T_DEBUG
#	Line 307 | Line 331 | reset_block_state(void)
331		%token  T_IPV6
332		%token  T_LOCOPS
333		%token  T_LOG
310	–	%token  T_MAX_CLIENTS
334		%token  T_NCHANGE
335		%token  T_NONONREG
336	<	%token  T_OPERWALL
336	>	%token  T_OPME
337	>	%token  T_PREPEND
338	>	%token  T_PSEUDO
339		%token  T_RECVQ
340		%token  T_REJ
341		%token  T_RESTART
342		%token  T_SERVER
343		%token  T_SERVICE
319	–	%token  T_SERVICES_NAME
344		%token  T_SERVNOTICE
345		%token  T_SET
346		%token  T_SHARED
#	Line 326 | Line 350 | reset_block_state(void)
350		%token  T_SPY
351		%token  T_SSL
352		%token  T_SSL_CIPHER_LIST
353	<	%token  T_SSL_CLIENT_METHOD
330	<	%token  T_SSL_SERVER_METHOD
331	<	%token  T_SSLV3
332	<	%token  T_TLSV1
353	>	%token  T_TARGET
354		%token  T_UMODES
355		%token  T_UNAUTH
356		%token  T_UNDLINE
#	Line 340 | Line 361 | reset_block_state(void)
361		%token  T_WALLOPS
362		%token  T_WEBIRC
363		%token  TBOOL
364	+	%token  THROTTLE_COUNT
365		%token  THROTTLE_TIME
366		%token  TKLINE_EXPIRE_NOTICES
367		%token  TMASKED
346	–	%token  TRUE_NO_OPER_FLOOD
368		%token  TS_MAX_DELTA
369		%token  TS_WARN_DELTA
370		%token  TWODOTS
371		%token  TYPE
372		%token  UNKLINE
352	–	%token  USE_EGD
373		%token  USE_LOGGING
374		%token  USER
375		%token  VHOST
376		%token  VHOST6
377	<	%token  WARN_NO_NLINE
377	>	%token  WARN_NO_CONNECT_BLOCK
378	>	%token  WHOIS
379		%token  XLINE
380
381		%type  <string> QSTRING
#	Line 365 | Line 386 | reset_block_state(void)
386		%type  <number> sizespec_
387
388		%%
389	<	conf:
389	>	conf:
390		| conf conf_item
391		;
392
393		conf_item:        admin_entry
394		| logging_entry
395		| oper_entry
396	<	| channel_entry
397	<	| class_entry
396	>	| channel_entry
397	>	| class_entry
398		| listen_entry
399		| auth_entry
400		| serverinfo_entry
401	<	| serverhide_entry
401	>	| serverhide_entry
402		| resv_entry
403		| service_entry
404		| shared_entry
405	<	| cluster_entry
405	>	| cluster_entry
406		| connect_entry
407		| kill_entry
408		| deny_entry
409	<	| exempt_entry
410	<	| general_entry
409	>	| exempt_entry
410	>	| general_entry
411		| gecos_entry
412		| modules_entry
413		| motd_entry
414	+	| pseudo_entry
415		| error ';'
416		| error '}'
417		;
418
419
420		timespec_: { $$ = 0; } | timespec;
421	<	timespec:       NUMBER timespec_
422	<	{
423	<	$$ = $1 + $2;
424	<	}
425	<	| NUMBER SECONDS timespec_
426	<	{
427	<	$$ = $1 + $3;
428	<	}
429	<	| NUMBER MINUTES timespec_
430	<	{
431	<	$$ = $1 * 60 + $3;
432	<	}
433	<	| NUMBER HOURS timespec_
434	<	{
435	<	$$ = $1 * 60 * 60 + $3;
436	<	}
415	<	| NUMBER DAYS timespec_
416	<	{
417	<	$$ = $1 * 60 * 60 * 24 + $3;
418	<	}
419	<	| NUMBER WEEKS timespec_
420	<	{
421	<	$$ = $1 * 60 * 60 * 24 * 7 + $3;
422	<	}
423	<	| NUMBER MONTHS timespec_
424	<	{
425	<	$$ = $1 * 60 * 60 * 24 * 7 * 4 + $3;
426	<	}
427	<	| NUMBER YEARS timespec_
428	<	{
429	<	$$ = $1 * 60 * 60 * 24 * 365 + $3;
430	<	}
431	<	;
432	<
433	<	sizespec_:      { $$ = 0; } | sizespec;
434	<	sizespec:       NUMBER sizespec_ { $$ = $1 + $2; }
435	<	| NUMBER BYTES sizespec_ { $$ = $1 + $3; }
436	<	| NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; }
437	<	| NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
438	<	;
421	>	timespec:  NUMBER timespec_         { $$ = $1 + $2; } |
422	>	NUMBER SECONDS timespec_ { $$ = $1 + $3; } |
423	>	NUMBER MINUTES timespec_ { $$ = $1 * 60 + $3; } |
424	>	NUMBER HOURS timespec_   { $$ = $1 * 60 * 60 + $3; } |
425	>	NUMBER DAYS timespec_    { $$ = $1 * 60 * 60 * 24 + $3; } |
426	>	NUMBER WEEKS timespec_   { $$ = $1 * 60 * 60 * 24 * 7 + $3; } |
427	>	NUMBER MONTHS timespec_  { $$ = $1 * 60 * 60 * 24 * 7 * 4 + $3; } |
428	>	NUMBER YEARS timespec_   { $$ = $1 * 60 * 60 * 24 * 365 + $3; }
429	>	;
430	>
431	>	sizespec_:  { $$ = 0; } | sizespec;
432	>	sizespec:   NUMBER sizespec_ { $$ = $1 + $2; } |
433	>	NUMBER BYTES sizespec_ { $$ = $1 + $3; } |
434	>	NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; } |
435	>	NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
436	>	;
437
438
439		/***************************************************************************
#	Line 463 | Line 461 | modules_path: PATH '=' QSTRING ';'
461		serverinfo_entry: SERVERINFO '{' serverinfo_items '}' ';';
462
463		serverinfo_items:       serverinfo_items serverinfo_item | serverinfo_item ;
464	<	serverinfo_item:        serverinfo_name | serverinfo_vhost |
465	<	serverinfo_hub | serverinfo_description |
466	<	serverinfo_network_name | serverinfo_network_desc |
467	<	serverinfo_max_clients | serverinfo_max_nick_length |
468	<	serverinfo_max_topic_length | serverinfo_ssl_dh_param_file |
469	<	serverinfo_rsa_private_key_file | serverinfo_vhost6 |
470	<	serverinfo_sid | serverinfo_ssl_certificate_file |
471	<	serverinfo_ssl_client_method | serverinfo_ssl_server_method |
464	>	serverinfo_item:        serverinfo_name |
465	>	serverinfo_vhost |
466	>	serverinfo_hub |
467	>	serverinfo_description |
468	>	serverinfo_network_name |
469	>	serverinfo_network_desc |
470	>	serverinfo_default_max_clients |
471	>	serverinfo_max_nick_length |
472	>	serverinfo_max_topic_length |
473	>	serverinfo_ssl_dh_param_file |
474	>	serverinfo_ssl_dh_elliptic_curve |
475	>	serverinfo_rsa_private_key_file |
476	>	serverinfo_vhost6 |
477	>	serverinfo_sid |
478	>	serverinfo_ssl_certificate_file |
479		serverinfo_ssl_cipher_list |
480	<	error ';' ;
480	>	serverinfo_ssl_message_digest_algorithm |
481	>	error ';' ;
482
483
478	–	serverinfo_ssl_client_method: T_SSL_CLIENT_METHOD '=' client_method_types ';' ;
479	–	serverinfo_ssl_server_method: T_SSL_SERVER_METHOD '=' server_method_types ';' ;
480	–
481	–	client_method_types: client_method_types ',' client_method_type_item | client_method_type_item;
482	–	client_method_type_item: T_SSLV3
483	–	{
484	–	#ifdef HAVE_LIBCRYPTO
485	–	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
486	–	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv3);
487	–	#endif
488	–	} | T_TLSV1
489	–	{
490	–	#ifdef HAVE_LIBCRYPTO
491	–	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
492	–	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_TLSv1);
493	–	#endif
494	–	};
495	–
496	–	server_method_types: server_method_types ',' server_method_type_item | server_method_type_item;
497	–	server_method_type_item: T_SSLV3
498	–	{
499	–	#ifdef HAVE_LIBCRYPTO
500	–	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
501	–	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
502	–	#endif
503	–	} | T_TLSV1
504	–	{
505	–	#ifdef HAVE_LIBCRYPTO
506	–	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
507	–	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
508	–	#endif
509	–	};
510	–
484		serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
485		{
486		#ifdef HAVE_LIBCRYPTO
487	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
487	>	if (conf_parser_ctx.pass == 2)
488		{
489	<	if (!ServerInfo.rsa_private_key_file)
489	>	if (!ConfigServerInfo.rsa_private_key_file)
490		{
491		conf_error_report("No rsa_private_key_file specified, SSL disabled");
492		break;
493		}
494
495	<	if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
496	<	SSL_FILETYPE_PEM) <= 0 ||
524	<	SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
525	<	SSL_FILETYPE_PEM) <= 0)
495	>	if (SSL_CTX_use_certificate_chain_file(ConfigServerInfo.server_ctx, yylval.string) <= 0 ||
496	>	SSL_CTX_use_certificate_chain_file(ConfigServerInfo.client_ctx, yylval.string) <= 0)
497		{
498		report_crypto_errors();
499		conf_error_report("Could not open/read certificate file");
500		break;
501		}
502
503	<	if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
503	>	if (SSL_CTX_use_PrivateKey_file(ConfigServerInfo.server_ctx, ConfigServerInfo.rsa_private_key_file,
504		SSL_FILETYPE_PEM) <= 0 ||
505	<	SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
505	>	SSL_CTX_use_PrivateKey_file(ConfigServerInfo.client_ctx, ConfigServerInfo.rsa_private_key_file,
506		SSL_FILETYPE_PEM) <= 0)
507		{
508		report_crypto_errors();
#	Line 539 | Line 510 | serverinfo_ssl_certificate_file: SSL_CER
510		break;
511		}
512
513	<	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
514	<	!SSL_CTX_check_private_key(ServerInfo.client_ctx))
513	>	if (!SSL_CTX_check_private_key(ConfigServerInfo.server_ctx) ||
514	>	!SSL_CTX_check_private_key(ConfigServerInfo.client_ctx))
515		{
516		report_crypto_errors();
517		conf_error_report("Could not read RSA private key");
#	Line 558 | Line 529 | serverinfo_rsa_private_key_file: RSA_PRI
529		if (conf_parser_ctx.pass != 1)
530		break;
531
532	<	if (ServerInfo.rsa_private_key)
532	>	if (ConfigServerInfo.rsa_private_key)
533		{
534	<	RSA_free(ServerInfo.rsa_private_key);
535	<	ServerInfo.rsa_private_key = NULL;
534	>	RSA_free(ConfigServerInfo.rsa_private_key);
535	>	ConfigServerInfo.rsa_private_key = NULL;
536		}
537
538	<	if (ServerInfo.rsa_private_key_file)
538	>	if (ConfigServerInfo.rsa_private_key_file)
539		{
540	<	MyFree(ServerInfo.rsa_private_key_file);
541	<	ServerInfo.rsa_private_key_file = NULL;
540	>	MyFree(ConfigServerInfo.rsa_private_key_file);
541	>	ConfigServerInfo.rsa_private_key_file = NULL;
542		}
543
544	<	ServerInfo.rsa_private_key_file = xstrdup(yylval.string);
544	>	ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
545
546		if ((file = BIO_new_file(yylval.string, "r")) == NULL)
547		{
#	Line 578 | Line 549 | serverinfo_rsa_private_key_file: RSA_PRI
549		break;
550		}
551
552	<	ServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
552	>	ConfigServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
553
554		BIO_set_close(file, BIO_CLOSE);
555		BIO_free(file);
556
557	<	if (ServerInfo.rsa_private_key == NULL)
557	>	if (ConfigServerInfo.rsa_private_key == NULL)
558		{
559		conf_error_report("Couldn't extract key, ignoring");
560		break;
561		}
562
563	<	if (!RSA_check_key(ServerInfo.rsa_private_key))
563	>	if (!RSA_check_key(ConfigServerInfo.rsa_private_key))
564		{
565	<	RSA_free(ServerInfo.rsa_private_key);
566	<	ServerInfo.rsa_private_key = NULL;
565	>	RSA_free(ConfigServerInfo.rsa_private_key);
566	>	ConfigServerInfo.rsa_private_key = NULL;
567
568		conf_error_report("Invalid key, ignoring");
569		break;
570		}
571
572	<	/* require 2048 bit (256 byte) key */
602	<	if (RSA_size(ServerInfo.rsa_private_key) != 256)
572	>	if (RSA_size(ConfigServerInfo.rsa_private_key) < 128)
573		{
574	<	RSA_free(ServerInfo.rsa_private_key);
575	<	ServerInfo.rsa_private_key = NULL;
574	>	RSA_free(ConfigServerInfo.rsa_private_key);
575	>	ConfigServerInfo.rsa_private_key = NULL;
576
577	<	conf_error_report("Not a 2048 bit key, ignoring");
577	>	conf_error_report("Ignoring serverinfo::rsa_private_key_file -- need at least a 1024 bit key size");
578		}
579		#endif
580		};
581
582		serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
583		{
614	–	/* TBD - XXX: error reporting */
584		#ifdef HAVE_LIBCRYPTO
585	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
585	>	if (conf_parser_ctx.pass == 2)
586		{
587		BIO *file = BIO_new_file(yylval.string, "r");
588
#	Line 628 | Line 597 | serverinfo_ssl_dh_param_file: SSL_DH_PAR
597		if (DH_size(dh) < 128)
598		conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
599		else
600	<	SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
600	>	SSL_CTX_set_tmp_dh(ConfigServerInfo.server_ctx, dh);
601
602		DH_free(dh);
603		}
604		}
605	+	else
606	+	conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- could not open/read Diffie-Hellman parameter file");
607		}
608		#endif
609		};
#	Line 640 | Line 611 | serverinfo_ssl_dh_param_file: SSL_DH_PAR
611		serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
612		{
613		#ifdef HAVE_LIBCRYPTO
614	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
615	<	SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
614	>	if (conf_parser_ctx.pass == 2)
615	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, yylval.string);
616	>	#endif
617	>	};
618	>
619	>	serverinfo_ssl_message_digest_algorithm: SSL_MESSAGE_DIGEST_ALGORITHM '=' QSTRING ';'
620	>	{
621	>	#ifdef HAVE_LIBCRYPTO
622	>	if (conf_parser_ctx.pass == 2)
623	>	{
624	>	if ((ConfigServerInfo.message_digest_algorithm = EVP_get_digestbyname(yylval.string)) == NULL)
625	>	{
626	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
627	>	conf_error_report("Ignoring serverinfo::ssl_message_digest_algorithm -- unknown message digest algorithm");
628	>	}
629	>	}
630	>	#endif
631	>	}
632	>
633	>	serverinfo_ssl_dh_elliptic_curve: SSL_DH_ELLIPTIC_CURVE '=' QSTRING ';'
634	>	{
635	>	#ifdef HAVE_LIBCRYPTO
636	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
637	>	int nid = 0;
638	>	EC_KEY *key = NULL;
639	>
640	>	if (conf_parser_ctx.pass == 2)
641	>	{
642	>	if ((nid = OBJ_sn2nid(yylval.string)) == 0)
643	>	{
644	>	conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- unknown curve name");
645	>	break;
646	>	}
647	>
648	>	if ((key = EC_KEY_new_by_curve_name(nid)) == NULL)
649	>	{
650	>	conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- could not create curve");
651	>	break;
652	>	}
653	>
654	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
655	>	EC_KEY_free(key);
656	>	}
657	>	#endif
658		#endif
659		};
660
661	<	serverinfo_name: NAME '=' QSTRING ';'
661	>	serverinfo_name: NAME '=' QSTRING ';'
662		{
663		/* this isn't rehashable */
664	<	if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
664	>	if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.name)
665		{
666		if (valid_servname(yylval.string))
667	<	ServerInfo.name = xstrdup(yylval.string);
667	>	ConfigServerInfo.name = xstrdup(yylval.string);
668		else
669		{
670		conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
#	Line 660 | Line 673 | serverinfo_name: NAME '=' QSTRING ';'
673		}
674		};
675
676	<	serverinfo_sid: IRCD_SID '=' QSTRING ';'
676	>	serverinfo_sid: IRCD_SID '=' QSTRING ';'
677		{
678		/* this isn't rehashable */
679	<	if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
679	>	if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.sid)
680		{
681		if (valid_sid(yylval.string))
682	<	ServerInfo.sid = xstrdup(yylval.string);
682	>	ConfigServerInfo.sid = xstrdup(yylval.string);
683		else
684		{
685		conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
#	Line 679 | Line 692 | serverinfo_description: DESCRIPTION '='
692		{
693		if (conf_parser_ctx.pass == 2)
694		{
695	<	MyFree(ServerInfo.description);
696	<	ServerInfo.description = xstrdup(yylval.string);
695	>	MyFree(ConfigServerInfo.description);
696	>	ConfigServerInfo.description = xstrdup(yylval.string);
697	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
698		}
699		};
700
#	Line 690 | Line 704 | serverinfo_network_name: NETWORK_NAME '=
704		{
705		char *p;
706
707	<	if ((p = strchr(yylval.string, ' ')) != NULL)
708	<	p = '\0';
707	>	if ((p = strchr(yylval.string, ' ')))
708	>	*p = '\0';
709
710	<	MyFree(ServerInfo.network_name);
711	<	ServerInfo.network_name = xstrdup(yylval.string);
710	>	MyFree(ConfigServerInfo.network_name);
711	>	ConfigServerInfo.network_name = xstrdup(yylval.string);
712		}
713		};
714
#	Line 703 | Line 717 | serverinfo_network_desc: NETWORK_DESC '=
717		if (conf_parser_ctx.pass != 2)
718		break;
719
720	<	MyFree(ServerInfo.network_desc);
721	<	ServerInfo.network_desc = xstrdup(yylval.string);
720	>	MyFree(ConfigServerInfo.network_desc);
721	>	ConfigServerInfo.network_desc = xstrdup(yylval.string);
722		};
723
724		serverinfo_vhost: VHOST '=' QSTRING ';'
#	Line 723 | Line 737 | serverinfo_vhost: VHOST '=' QSTRING ';'
737		ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
738		else
739		{
740	<	assert(res != NULL);
740	>	assert(res);
741
742	<	memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
743	<	ServerInfo.ip.ss.ss_family = res->ai_family;
744	<	ServerInfo.ip.ss_len = res->ai_addrlen;
742	>	memcpy(&ConfigServerInfo.ip, res->ai_addr, res->ai_addrlen);
743	>	ConfigServerInfo.ip.ss.ss_family = res->ai_family;
744	>	ConfigServerInfo.ip.ss_len = res->ai_addrlen;
745		freeaddrinfo(res);
746
747	<	ServerInfo.specific_ipv4_vhost = 1;
747	>	ConfigServerInfo.specific_ipv4_vhost = 1;
748		}
749		}
750		};
751
752		serverinfo_vhost6: VHOST6 '=' QSTRING ';'
753		{
740	–	#ifdef IPV6
754		if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
755		{
756		struct addrinfo hints, *res;
#	Line 752 | Line 765 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
765		ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
766		else
767		{
768	<	assert(res != NULL);
768	>	assert(res);
769
770	<	memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
771	<	ServerInfo.ip6.ss.ss_family = res->ai_family;
772	<	ServerInfo.ip6.ss_len = res->ai_addrlen;
770	>	memcpy(&ConfigServerInfo.ip6, res->ai_addr, res->ai_addrlen);
771	>	ConfigServerInfo.ip6.ss.ss_family = res->ai_family;
772	>	ConfigServerInfo.ip6.ss_len = res->ai_addrlen;
773		freeaddrinfo(res);
774
775	<	ServerInfo.specific_ipv6_vhost = 1;
775	>	ConfigServerInfo.specific_ipv6_vhost = 1;
776		}
777		}
765	–	#endif
778		};
779
780	<	serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
780	>	serverinfo_default_max_clients: DEFAULT_MAX_CLIENTS '=' NUMBER ';'
781		{
782		if (conf_parser_ctx.pass != 2)
783		break;
784
785		if ($3 < MAXCLIENTS_MIN)
786		{
787	<	char buf[IRCD_BUFSIZE];
787	>	char buf[IRCD_BUFSIZE] = "";
788
789		snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
790		conf_error_report(buf);
791	<	ServerInfo.max_clients = MAXCLIENTS_MIN;
791	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MIN;
792		}
793		else if ($3 > MAXCLIENTS_MAX)
794		{
795	<	char buf[IRCD_BUFSIZE];
795	>	char buf[IRCD_BUFSIZE] = "";
796
797		snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
798		conf_error_report(buf);
799	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
799	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
800		}
801		else
802	<	ServerInfo.max_clients = $3;
802	>	ConfigServerInfo.default_max_clients = $3;
803		};
804
805		serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
#	Line 798 | Line 810 | serverinfo_max_nick_length: MAX_NICK_LEN
810		if ($3 < 9)
811		{
812		conf_error_report("max_nick_length too low, setting to 9");
813	<	ServerInfo.max_nick_length = 9;
813	>	ConfigServerInfo.max_nick_length = 9;
814		}
815		else if ($3 > NICKLEN)
816		{
817	<	char buf[IRCD_BUFSIZE];
817	>	char buf[IRCD_BUFSIZE] = "";
818
819		snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
820		conf_error_report(buf);
821	<	ServerInfo.max_nick_length = NICKLEN;
821	>	ConfigServerInfo.max_nick_length = NICKLEN;
822		}
823		else
824	<	ServerInfo.max_nick_length = $3;
824	>	ConfigServerInfo.max_nick_length = $3;
825		};
826
827		serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
#	Line 820 | Line 832 | serverinfo_max_topic_length: MAX_TOPIC_L
832		if ($3 < 80)
833		{
834		conf_error_report("max_topic_length too low, setting to 80");
835	<	ServerInfo.max_topic_length = 80;
835	>	ConfigServerInfo.max_topic_length = 80;
836		}
837		else if ($3 > TOPICLEN)
838		{
839	<	char buf[IRCD_BUFSIZE];
839	>	char buf[IRCD_BUFSIZE] = "";
840
841		snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
842		conf_error_report(buf);
843	<	ServerInfo.max_topic_length = TOPICLEN;
843	>	ConfigServerInfo.max_topic_length = TOPICLEN;
844		}
845		else
846	<	ServerInfo.max_topic_length = $3;
846	>	ConfigServerInfo.max_topic_length = $3;
847		};
848
849	<	serverinfo_hub: HUB '=' TBOOL ';'
849	>	serverinfo_hub: HUB '=' TBOOL ';'
850		{
851		if (conf_parser_ctx.pass == 2)
852	<	ServerInfo.hub = yylval.number;
852	>	ConfigServerInfo.hub = yylval.number;
853		};
854
855		/***************************************************************************
#	Line 846 | Line 858 | serverinfo_hub: HUB '=' TBOOL ';'
858		admin_entry: ADMIN  '{' admin_items '}' ';' ;
859
860		admin_items: admin_items admin_item | admin_item;
861	<	admin_item:  admin_name | admin_description |
862	<	admin_email | error ';' ;
861	>	admin_item:  admin_name |
862	>	admin_description |
863	>	admin_email |
864	>	error ';' ;
865
866	<	admin_name: NAME '=' QSTRING ';'
866	>	admin_name: NAME '=' QSTRING ';'
867		{
868		if (conf_parser_ctx.pass != 2)
869		break;
870
871	<	MyFree(AdminInfo.name);
872	<	AdminInfo.name = xstrdup(yylval.string);
871	>	MyFree(ConfigAdminInfo.name);
872	>	ConfigAdminInfo.name = xstrdup(yylval.string);
873		};
874
875		admin_email: EMAIL '=' QSTRING ';'
#	Line 863 | Line 877 | admin_email: EMAIL '=' QSTRING ';'
877		if (conf_parser_ctx.pass != 2)
878		break;
879
880	<	MyFree(AdminInfo.email);
881	<	AdminInfo.email = xstrdup(yylval.string);
880	>	MyFree(ConfigAdminInfo.email);
881	>	ConfigAdminInfo.email = xstrdup(yylval.string);
882		};
883
884		admin_description: DESCRIPTION '=' QSTRING ';'
#	Line 872 | Line 886 | admin_description: DESCRIPTION '=' QSTRI
886		if (conf_parser_ctx.pass != 2)
887		break;
888
889	<	MyFree(AdminInfo.description);
890	<	AdminInfo.description = xstrdup(yylval.string);
889	>	MyFree(ConfigAdminInfo.description);
890	>	ConfigAdminInfo.description = xstrdup(yylval.string);
891		};
892
893		/***************************************************************************
894		* motd section
895		***************************************************************************/
896	<	motd_entry: MOTD
896	>	motd_entry: MOTD
897		{
898		if (conf_parser_ctx.pass == 2)
899		reset_block_state();
900		} '{' motd_items '}' ';'
901		{
902	<	dlink_node *ptr = NULL;
902	>	dlink_node *node = NULL;
903
904		if (conf_parser_ctx.pass != 2)
905		break;
#	Line 893 | Line 907 | motd_entry: MOTD
907		if (!block_state.file.buf[0])
908		break;
909
910	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
911	<	motd_add(ptr->data, block_state.file.buf);
910	>	DLINK_FOREACH(node, block_state.mask.list.head)
911	>	motd_add(node->data, block_state.file.buf);
912		};
913
914		motd_items: motd_items motd_item | motd_item;
915		motd_item:  motd_mask | motd_file | error ';' ;
916
917	<	motd_mask: MASK '=' QSTRING ';'
917	>	motd_mask: MASK '=' QSTRING ';'
918		{
919		if (conf_parser_ctx.pass == 2)
920		dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
#	Line 913 | Line 927 | motd_file: T_FILE '=' QSTRING ';'
927		};
928
929		/***************************************************************************
930	+	* pseudo section
931	+	***************************************************************************/
932	+	pseudo_entry: T_PSEUDO
933	+	{
934	+	if (conf_parser_ctx.pass == 2)
935	+	reset_block_state();
936	+	} '{' pseudo_items '}' ';'
937	+	{
938	+	if (conf_parser_ctx.pass != 2)
939	+	break;
940	+
941	+	if (!block_state.command.buf[0] ||
942	+	!block_state.name.buf[0] ||
943	+	!block_state.nick.buf[0] ||
944	+	!block_state.host.buf[0])
945	+	break;
946	+
947	+	pseudo_register(block_state.name.buf, block_state.nick.buf, block_state.host.buf,
948	+	block_state.prepend.buf, block_state.command.buf);
949	+	};
950	+
951	+	pseudo_items: pseudo_items pseudo_item | pseudo_item;
952	+	pseudo_item:  pseudo_command | pseudo_prepend | pseudo_name | pseudo_target | error ';' ;
953	+
954	+	pseudo_command: T_COMMAND '=' QSTRING ';'
955	+	{
956	+	if (conf_parser_ctx.pass == 2)
957	+	strlcpy(block_state.command.buf, yylval.string, sizeof(block_state.command.buf));
958	+	};
959	+
960	+	pseudo_name: NAME '=' QSTRING ';'
961	+	{
962	+	if (conf_parser_ctx.pass == 2)
963	+	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
964	+	};
965	+
966	+	pseudo_prepend: T_PREPEND '=' QSTRING ';'
967	+	{
968	+	if (conf_parser_ctx.pass == 2)
969	+	strlcpy(block_state.prepend.buf, yylval.string, sizeof(block_state.prepend.buf));
970	+	};
971	+
972	+	pseudo_target: T_TARGET '=' QSTRING ';'
973	+	{
974	+	if (conf_parser_ctx.pass == 2)
975	+	{
976	+	struct split_nuh_item nuh;
977	+
978	+	nuh.nuhmask  = yylval.string;
979	+	nuh.nickptr  = NULL;
980	+	nuh.userptr  = block_state.nick.buf;
981	+	nuh.hostptr  = block_state.host.buf;
982	+	nuh.nicksize = 0;
983	+	nuh.usersize = sizeof(block_state.nick.buf);
984	+	nuh.hostsize = sizeof(block_state.host.buf);
985	+
986	+	split_nuh(&nuh);
987	+	}
988	+	};
989	+
990	+	/***************************************************************************
991		*  section logging
992		***************************************************************************/
993		logging_entry:          T_LOG  '{' logging_items '}' ';' ;
994		logging_items:          logging_items logging_item | logging_item ;
995
996	<	logging_item:           logging_use_logging | logging_file_entry |
997	<	error ';' ;
996	>	logging_item:           logging_use_logging | logging_file_entry |
997	>	error ';' ;
998
999		logging_use_logging: USE_LOGGING '=' TBOOL ';'
1000		{
1001		if (conf_parser_ctx.pass == 2)
1002	<	ConfigLoggingEntry.use_logging = yylval.number;
1002	>	ConfigLog.use_logging = yylval.number;
1003		};
1004
1005		logging_file_entry:
#	Line 982 | Line 1057 | logging_file_type_item:  USER
1057		{
1058		if (conf_parser_ctx.pass == 2)
1059		block_state.type.value = LOG_TYPE_GLINE;
1060	+	} | XLINE
1061	+	{
1062	+	if (conf_parser_ctx.pass == 2)
1063	+	block_state.type.value = LOG_TYPE_XLINE;
1064	+	} | RESV
1065	+	{
1066	+	if (conf_parser_ctx.pass == 2)
1067	+	block_state.type.value = LOG_TYPE_RESV;
1068		} | T_DLINE
1069		{
1070		if (conf_parser_ctx.pass == 2)
#	Line 1004 | Line 1087 | logging_file_type_item:  USER
1087		/***************************************************************************
1088		* section oper
1089		***************************************************************************/
1090	<	oper_entry: OPERATOR
1090	>	oper_entry: OPERATOR
1091		{
1092		if (conf_parser_ctx.pass != 2)
1093		break;
#	Line 1013 | Line 1096 | oper_entry: OPERATOR
1096		block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1097		} '{' oper_items '}' ';'
1098		{
1099	<	dlink_node *ptr = NULL;
1099	>	dlink_node *node = NULL;
1100
1101		if (conf_parser_ctx.pass != 2)
1102		break;
#	Line 1029 | Line 1112 | oper_entry: OPERATOR
1112		break;
1113		#endif
1114
1115	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
1115	>	DLINK_FOREACH(node, block_state.mask.list.head)
1116		{
1117		struct MaskItem *conf = NULL;
1118		struct split_nuh_item nuh;
1119
1120	<	nuh.nuhmask  = ptr->data;
1120	>	nuh.nuhmask  = node->data;
1121		nuh.nickptr  = NULL;
1122		nuh.userptr  = block_state.user.buf;
1123		nuh.hostptr  = block_state.host.buf;
#	Line 1054 | Line 1137 | oper_entry: OPERATOR
1137		if (block_state.rpass.buf[0])
1138		conf->passwd = xstrdup(block_state.rpass.buf);
1139
1140	+	if (block_state.whois.buf[0])
1141	+	conf->whois = xstrdup(block_state.whois.buf);
1142	+
1143		conf->flags = block_state.flags.value;
1144		conf->modes = block_state.modes.value;
1145		conf->port  = block_state.port.value;
#	Line 1069 | Line 1155 | oper_entry: OPERATOR
1155
1156		if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
1157		{
1158	<	conf_error_report("Ignoring rsa_public_key_file -- file doesn't exist");
1158	>	ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- file doesn't exist");
1159		break;
1160		}
1161
1162		if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
1163	<	conf_error_report("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1163	>	ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key invalid; check key syntax");
1164	>	else
1165	>	{
1166	>	if (RSA_size(pkey) > 128)
1167	>	ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key size must be 1024 or below");
1168	>	else
1169	>	conf->rsa_public_key = pkey;
1170	>	}
1171
1079	–	conf->rsa_public_key = pkey;
1172		BIO_set_close(file, BIO_CLOSE);
1173		BIO_free(file);
1174		}
#	Line 1085 | Line 1177 | oper_entry: OPERATOR
1177		};
1178
1179		oper_items:     oper_items oper_item | oper_item;
1180	<	oper_item:      oper_name | oper_user | oper_password |
1181	<	oper_umodes | oper_class | oper_encrypted |
1182	<	oper_rsa_public_key_file | oper_ssl_certificate_fingerprint |
1183	<	oper_ssl_connection_required |
1184	<	oper_flags | error ';' ;
1180	>	oper_item:      oper_name |
1181	>	oper_user |
1182	>	oper_password |
1183	>	oper_whois |
1184	>	oper_umodes |
1185	>	oper_class |
1186	>	oper_encrypted |
1187	>	oper_rsa_public_key_file |
1188	>	oper_ssl_certificate_fingerprint |
1189	>	oper_ssl_connection_required |
1190	>	oper_flags |
1191	>	error ';' ;
1192
1193		oper_name: NAME '=' QSTRING ';'
1194		{
#	Line 1109 | Line 1208 | oper_password: PASSWORD '=' QSTRING ';'
1208		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1209		};
1210
1211	+	oper_whois: WHOIS '=' QSTRING ';'
1212	+	{
1213	+	if (conf_parser_ctx.pass == 2)
1214	+	strlcpy(block_state.whois.buf, yylval.string, sizeof(block_state.whois.buf));
1215	+	};
1216	+
1217		oper_encrypted: ENCRYPTED '=' TBOOL ';'
1218		{
1219		if (conf_parser_ctx.pass != 2)
#	Line 1180 | Line 1285 | oper_umodes_item:  T_BOTS
1285		{
1286		if (conf_parser_ctx.pass == 2)
1287		block_state.modes.value |= UMODE_HIDDEN;
1288	+	} | HIDE_CHANS
1289	+	{
1290	+	if (conf_parser_ctx.pass == 2)
1291	+	block_state.modes.value |= UMODE_HIDECHANS;
1292	+	} | HIDE_IDLE
1293	+	{
1294	+	if (conf_parser_ctx.pass == 2)
1295	+	block_state.modes.value |= UMODE_HIDEIDLE;
1296		} | T_SKILL
1297		{
1298		if (conf_parser_ctx.pass == 2)
#	Line 1204 | Line 1317 | oper_umodes_item:  T_BOTS
1317		{
1318		if (conf_parser_ctx.pass == 2)
1319		block_state.modes.value |= UMODE_EXTERNAL;
1207	–	} | T_OPERWALL
1208	–	{
1209	–	if (conf_parser_ctx.pass == 2)
1210	–	block_state.modes.value |= UMODE_OPERWALL;
1320		} | T_SERVNOTICE
1321		{
1322		if (conf_parser_ctx.pass == 2)
#	Line 1276 | Line 1385 | oper_flags_item: KILL ':' REMOTE
1385		} | KLINE
1386		{
1387		if (conf_parser_ctx.pass == 2)
1388	<	block_state.port.value |= OPER_FLAG_K;
1388	>	block_state.port.value |= OPER_FLAG_KLINE;
1389		} | UNKLINE
1390		{
1391		if (conf_parser_ctx.pass == 2)
#	Line 1292 | Line 1401 | oper_flags_item: KILL ':' REMOTE
1401		} | XLINE
1402		{
1403		if (conf_parser_ctx.pass == 2)
1404	<	block_state.port.value |= OPER_FLAG_X;
1404	>	block_state.port.value |= OPER_FLAG_XLINE;
1405	>	} | T_UNXLINE
1406	>	{
1407	>	if (conf_parser_ctx.pass == 2)
1408	>	block_state.port.value |= OPER_FLAG_UNXLINE;
1409		} | GLINE
1410		{
1411		if (conf_parser_ctx.pass == 2)
#	Line 1313 | Line 1426 | oper_flags_item: KILL ':' REMOTE
1426		{
1427		if (conf_parser_ctx.pass == 2)
1428		block_state.port.value |= OPER_FLAG_ADMIN;
1316	–	} | T_OPERWALL
1317	–	{
1318	–	if (conf_parser_ctx.pass == 2)
1319	–	block_state.port.value |= OPER_FLAG_OPERWALL;
1429		} | T_GLOBOPS
1430		{
1431		if (conf_parser_ctx.pass == 2)
#	Line 1341 | Line 1450 | oper_flags_item: KILL ':' REMOTE
1450		{
1451		if (conf_parser_ctx.pass == 2)
1452		block_state.port.value |= OPER_FLAG_MODULE;
1453	+	} | T_OPME
1454	+	{
1455	+	if (conf_parser_ctx.pass == 2)
1456	+	block_state.port.value |= OPER_FLAG_OPME;
1457		};
1458
1459
#	Line 1384 | Line 1497 | class_entry: CLASS
1497		class->max_ident = block_state.max_ident.value;
1498		class->max_sendq = block_state.max_sendq.value;
1499		class->max_recvq = block_state.max_recvq.value;
1500	+	class->max_channels = block_state.max_channels.value;
1501
1502		if (block_state.min_idle.value > block_state.max_idle.value)
1503		{
#	Line 1410 | Line 1524 | class_entry: CLASS
1524
1525		class_items:    class_items class_item | class_item;
1526		class_item:     class_name |
1527	<	class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1527	>	class_cidr_bitlen_ipv4 |
1528	>	class_cidr_bitlen_ipv6 |
1529		class_ping_time |
1530	<	class_number_per_cidr |
1530	>	class_number_per_cidr |
1531		class_number_per_ip |
1532		class_connectfreq |
1533	+	class_max_channels |
1534		class_max_number |
1535	<	class_max_global |
1536	<	class_max_local |
1537	<	class_max_ident |
1535	>	class_max_global |
1536	>	class_max_local |
1537	>	class_max_ident |
1538		class_sendq | class_recvq |
1539		class_min_idle |
1540		class_max_idle |
1541		class_flags |
1542	<	error ';' ;
1542	>	error ';' ;
1543
1544	<	class_name: NAME '=' QSTRING ';'
1544	>	class_name: NAME '=' QSTRING ';'
1545		{
1546		if (conf_parser_ctx.pass == 1)
1547		strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
#	Line 1449 | Line 1565 | class_connectfreq: CONNECTFREQ '=' times
1565		block_state.con_freq.value = $3;
1566		};
1567
1568	+	class_max_channels: MAX_CHANNELS '=' NUMBER ';'
1569	+	{
1570	+	if (conf_parser_ctx.pass == 1)
1571	+	block_state.max_channels.value = $3;
1572	+	};
1573	+
1574		class_max_number: MAX_NUMBER '=' NUMBER ';'
1575		{
1576		if (conf_parser_ctx.pass == 1)
#	Line 1580 | Line 1702 | port_item: NUMBER
1702		{
1703		if (conf_parser_ctx.pass == 2)
1704		{
1705	+	#ifndef HAVE_LIBCRYPTO
1706		if (block_state.flags.value & LISTENER_SSL)
1707	<	#ifdef HAVE_LIBCRYPTO
1708	<	if (!ServerInfo.server_ctx)
1707	>	{
1708	>	conf_error_report("SSL not available - port closed");
1709	>	break;
1710	>	}
1711		#endif
1587	–	{
1588	–	conf_error_report("SSL not available - port closed");
1589	–	break;
1590	–	}
1712		add_listener($1, block_state.addr.buf, block_state.flags.value);
1713		}
1714		} | NUMBER TWODOTS NUMBER
1715		{
1716		if (conf_parser_ctx.pass == 2)
1717		{
1718	<	int i;
1598	<
1718	>	#ifndef HAVE_LIBCRYPTO
1719		if (block_state.flags.value & LISTENER_SSL)
1720	<	#ifdef HAVE_LIBCRYPTO
1721	<	if (!ServerInfo.server_ctx)
1720	>	{
1721	>	conf_error_report("SSL not available - port closed");
1722	>	break;
1723	>	}
1724		#endif
1603	–	{
1604	–	conf_error_report("SSL not available - port closed");
1605	–	break;
1606	–	}
1725
1726	<	for (i = $1; i <= $3; ++i)
1726	>	for (int i = $1; i <= $3; ++i)
1727		add_listener(i, block_state.addr.buf, block_state.flags.value);
1728		}
1729		};
#	Line 1631 | Line 1749 | auth_entry: IRCD_AUTH
1749		reset_block_state();
1750		} '{' auth_items '}' ';'
1751		{
1752	<	dlink_node *ptr = NULL;
1752	>	dlink_node *node = NULL;
1753
1754		if (conf_parser_ctx.pass != 2)
1755		break;
1756
1757	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
1757	>	DLINK_FOREACH(node, block_state.mask.list.head)
1758		{
1759		struct MaskItem *conf = NULL;
1760		struct split_nuh_item nuh;
1761
1762	<	nuh.nuhmask  = ptr->data;
1762	>	nuh.nuhmask  = node->data;
1763		nuh.nickptr  = NULL;
1764		nuh.userptr  = block_state.user.buf;
1765		nuh.hostptr  = block_state.host.buf;
#	Line 1665 | Line 1783 | auth_entry: IRCD_AUTH
1783		conf_add_class_to_conf(conf, block_state.class.buf);
1784		add_conf_by_address(CONF_CLIENT, conf);
1785		}
1786	<	};
1786	>	};
1787
1788		auth_items:     auth_items auth_item | auth_item;
1789	<	auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1790	<	auth_spoof | auth_redir_serv | auth_redir_port |
1791	<	auth_encrypted | error ';' ;
1789	>	auth_item:      auth_user |
1790	>	auth_passwd |
1791	>	auth_class |
1792	>	auth_flags |
1793	>	auth_spoof |
1794	>	auth_redir_serv |
1795	>	auth_redir_port |
1796	>	auth_encrypted |
1797	>	error ';' ;
1798
1799		auth_user: USER '=' QSTRING ';'
1800		{
#	Line 1750 | Line 1874 | auth_flags_item: SPOOF_NOTICE
1874		block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1875		};
1876
1877	<	auth_spoof: SPOOF '=' QSTRING ';'
1877	>	auth_spoof: SPOOF '=' QSTRING ';'
1878		{
1879		if (conf_parser_ctx.pass != 2)
1880		break;
1881
1882	<	if (strlen(yylval.string) <= HOSTLEN && valid_hostname(yylval.string))
1882	>	if (valid_hostname(yylval.string))
1883		{
1884		strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1885		block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
#	Line 1801 | Line 1925 | resv_entry: RESV
1925		create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1926		};
1927
1928	<	resv_items:     resv_items resv_item | resv_item;
1929	<	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1928	>	resv_items:     resv_items resv_item | resv_item;
1929	>	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1930
1931		resv_mask: MASK '=' QSTRING ';'
1932		{
#	Line 1972 | Line 2096 | cluster_entry: T_CLUSTER
2096		conf->name = xstrdup(block_state.name.buf);
2097		};
2098
2099	<	cluster_items:  cluster_items cluster_item | cluster_item;
2100	<	cluster_item:   cluster_name | cluster_type | error ';' ;
2099	>	cluster_items:  cluster_items cluster_item | cluster_item;
2100	>	cluster_item:   cluster_name | cluster_type | error ';' ;
2101
2102		cluster_name: NAME '=' QSTRING ';'
2103		{
#	Line 1987 | Line 2111 | cluster_type: TYPE
2111		block_state.flags.value = 0;
2112		} '=' cluster_types ';' ;
2113
2114	<	cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
2114	>	cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
2115		cluster_type_item: KLINE
2116		{
2117		if (conf_parser_ctx.pass == 2)
#	Line 2033 | Line 2157 | cluster_type_item: KLINE
2157		/***************************************************************************
2158		*  section connect
2159		***************************************************************************/
2160	<	connect_entry: CONNECT
2160	>	connect_entry: CONNECT
2161		{
2162
2163		if (conf_parser_ctx.pass != 2)
2164		break;
2165
2166		reset_block_state();
2167	+	block_state.aftype.value = AF_INET;
2168		block_state.port.value = PORTNUM;
2169		} '{' connect_items '}' ';'
2170		{
#	Line 2091 | Line 2216 | connect_entry: CONNECT
2216		ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2217		else
2218		{
2219	<	assert(res != NULL);
2219	>	assert(res);
2220
2221		memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2222		conf->bind.ss.ss_family = res->ai_family;
#	Line 2105 | Line 2230 | connect_entry: CONNECT
2230		};
2231
2232		connect_items:  connect_items connect_item | connect_item;
2233	<	connect_item:   connect_name | connect_host | connect_vhost |
2234	<	connect_send_password | connect_accept_password |
2235	<	connect_ssl_certificate_fingerprint |
2236	<	connect_aftype | connect_port | connect_ssl_cipher_list |
2237	<	connect_flags | connect_hub_mask | connect_leaf_mask |
2238	<	connect_class | connect_encrypted |
2233	>	connect_item:   connect_name |
2234	>	connect_host |
2235	>	connect_vhost |
2236	>	connect_send_password |
2237	>	connect_accept_password |
2238	>	connect_ssl_certificate_fingerprint |
2239	>	connect_aftype |
2240	>	connect_port |
2241	>	connect_ssl_cipher_list |
2242	>	connect_flags |
2243	>	connect_hub_mask |
2244	>	connect_leaf_mask |
2245	>	connect_class |
2246	>	connect_encrypted |
2247		error ';' ;
2248
2249		connect_name: NAME '=' QSTRING ';'
#	Line 2119 | Line 2252 | connect_name: NAME '=' QSTRING ';'
2252		strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2253		};
2254
2255	<	connect_host: HOST '=' QSTRING ';'
2255	>	connect_host: HOST '=' QSTRING ';'
2256		{
2257		if (conf_parser_ctx.pass == 2)
2258		strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2259		};
2260
2261	<	connect_vhost: VHOST '=' QSTRING ';'
2261	>	connect_vhost: VHOST '=' QSTRING ';'
2262		{
2263		if (conf_parser_ctx.pass == 2)
2264		strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2265		};
2266	<
2266	>
2267		connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2268		{
2269		if (conf_parser_ctx.pass != 2)
#	Line 2138 | Line 2271 | connect_send_password: SEND_PASSWORD '='
2271
2272		if ($3[0] == ':')
2273		conf_error_report("Server passwords cannot begin with a colon");
2274	<	else if (strchr($3, ' ') != NULL)
2274	>	else if (strchr($3, ' '))
2275		conf_error_report("Server passwords cannot contain spaces");
2276		else
2277		strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
#	Line 2151 | Line 2284 | connect_accept_password: ACCEPT_PASSWORD
2284
2285		if ($3[0] == ':')
2286		conf_error_report("Server passwords cannot begin with a colon");
2287	<	else if (strchr($3, ' ') != NULL)
2287	>	else if (strchr($3, ' '))
2288		conf_error_report("Server passwords cannot contain spaces");
2289		else
2290		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
#	Line 2175 | Line 2308 | connect_aftype: AFTYPE '=' T_IPV4 ';'
2308		block_state.aftype.value = AF_INET;
2309		} | AFTYPE '=' T_IPV6 ';'
2310		{
2178	–	#ifdef IPV6
2311		if (conf_parser_ctx.pass == 2)
2312		block_state.aftype.value = AF_INET6;
2181	–	#endif
2313		};
2314
2315		connect_flags: IRCD_FLAGS
#	Line 2208 | Line 2339 | connect_encrypted: ENCRYPTED '=' TBOOL '
2339		}
2340		};
2341
2342	<	connect_hub_mask: HUB_MASK '=' QSTRING ';'
2342	>	connect_hub_mask: HUB_MASK '=' QSTRING ';'
2343		{
2344		if (conf_parser_ctx.pass == 2)
2345		dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2346		};
2347
2348	<	connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2348	>	connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2349		{
2350		if (conf_parser_ctx.pass == 2)
2351		dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
#	Line 2265 | Line 2396 | kill_entry: KILL
2396		else
2397		conf->reason = xstrdup(CONF_NOREASON);
2398		add_conf_by_address(CONF_KLINE, conf);
2399	<	};
2399	>	};
2400
2401		kill_items:     kill_items kill_item | kill_item;
2402		kill_item:      kill_user | kill_reason | error;
#	Line 2290 | Line 2421 | kill_user: USER '=' QSTRING ';'
2421		}
2422		};
2423
2424	<	kill_reason: REASON '=' QSTRING ';'
2424	>	kill_reason: REASON '=' QSTRING ';'
2425		{
2426		if (conf_parser_ctx.pass == 2)
2427		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
#	Line 2299 | Line 2430 | kill_reason: REASON '=' QSTRING ';'
2430		/***************************************************************************
2431		*  section deny
2432		***************************************************************************/
2433	<	deny_entry: DENY
2433	>	deny_entry: DENY
2434		{
2435		if (conf_parser_ctx.pass == 2)
2436		reset_block_state();
#	Line 2324 | Line 2455 | deny_entry: DENY
2455		conf->reason = xstrdup(CONF_NOREASON);
2456		add_conf_by_address(CONF_DLINE, conf);
2457		}
2458	<	};
2458	>	};
2459
2460		deny_items:     deny_items deny_item | deny_item;
2461		deny_item:      deny_ip | deny_reason | error;
#	Line 2335 | Line 2466 | deny_ip: IP '=' QSTRING ';'
2466		strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2467		};
2468
2469	<	deny_reason: REASON '=' QSTRING ';'
2469	>	deny_reason: REASON '=' QSTRING ';'
2470		{
2471		if (conf_parser_ctx.pass == 2)
2472		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
#	Line 2392 | Line 2523 | gecos_entry: GECOS
2523		gecos_items: gecos_items gecos_item | gecos_item;
2524		gecos_item:  gecos_name | gecos_reason | error;
2525
2526	<	gecos_name: NAME '=' QSTRING ';'
2526	>	gecos_name: NAME '=' QSTRING ';'
2527		{
2528		if (conf_parser_ctx.pass == 2)
2529		strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2530		};
2531
2532	<	gecos_reason: REASON '=' QSTRING ';'
2532	>	gecos_reason: REASON '=' QSTRING ';'
2533		{
2534		if (conf_parser_ctx.pass == 2)
2535		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
#	Line 2411 | Line 2542 | general_entry: GENERAL
2542		'{' general_items '}' ';';
2543
2544		general_items:      general_items general_item | general_item;
2545	<	general_item:       general_hide_spoof_ips | general_ignore_bogus_ts |
2546	<	general_failed_oper_notice | general_anti_nick_flood |
2547	<	general_max_nick_time | general_max_nick_changes |
2548	<	general_max_accept | general_anti_spam_exit_message_time |
2549	<	general_ts_warn_delta | general_ts_max_delta |
2545	>	general_item:       general_away_count |
2546	>	general_away_time |
2547	>	general_ignore_bogus_ts |
2548	>	general_failed_oper_notice |
2549	>	general_anti_nick_flood |
2550	>	general_max_nick_time |
2551	>	general_max_nick_changes |
2552	>	general_max_accept |
2553	>	general_anti_spam_exit_message_time |
2554	>	general_ts_warn_delta |
2555	>	general_ts_max_delta |
2556		general_kill_chase_time_limit |
2557		general_invisible_on_connect |
2558	<	general_warn_no_nline | general_dots_in_ident |
2559	<	general_stats_o_oper_only | general_stats_k_oper_only |
2560	<	general_pace_wait | general_stats_i_oper_only |
2561	<	general_pace_wait_simple | general_stats_P_oper_only |
2562	<	general_short_motd | general_no_oper_flood |
2563	<	general_true_no_oper_flood | general_oper_pass_resv |
2564	<	general_oper_only_umodes | general_max_targets |
2565	<	general_use_egd | general_egdpool_path |
2566	<	general_oper_umodes | general_caller_id_wait |
2567	<	general_opers_bypass_callerid | general_default_floodcount |
2568	<	general_min_nonwildcard | general_min_nonwildcard_simple |
2569	<	general_throttle_time | general_havent_read_conf |
2558	>	general_warn_no_connect_block |
2559	>	general_dots_in_ident |
2560	>	general_stats_i_oper_only |
2561	>	general_stats_k_oper_only |
2562	>	general_stats_m_oper_only |
2563	>	general_stats_o_oper_only |
2564	>	general_stats_P_oper_only |
2565	>	general_stats_u_oper_only |
2566	>	general_pace_wait |
2567	>	general_pace_wait_simple |
2568	>	general_short_motd |
2569	>	general_no_oper_flood |
2570	>	general_oper_pass_resv |
2571	>	general_oper_only_umodes |
2572	>	general_max_targets |
2573	>	general_oper_umodes |
2574	>	general_caller_id_wait |
2575	>	general_opers_bypass_callerid |
2576	>	general_default_floodcount |
2577	>	general_min_nonwildcard |
2578	>	general_min_nonwildcard_simple |
2579	>	general_throttle_count |
2580	>	general_throttle_time |
2581	>	general_havent_read_conf |
2582		general_ping_cookie |
2583	<	general_disable_auth |
2584	<	general_tkline_expire_notices | general_gline_enable |
2585	<	general_gline_duration | general_gline_request_duration |
2583	>	general_disable_auth |
2584	>	general_tkline_expire_notices |
2585	>	general_gline_enable |
2586	>	general_gline_duration |
2587	>	general_gline_request_duration |
2588		general_gline_min_cidr |
2589		general_gline_min_cidr6 |
2590	<	general_stats_e_disabled |
2591	<	general_max_watch | general_services_name |
2592	<	error;
2590	>	general_stats_e_disabled |
2591	>	general_max_watch |
2592	>	general_cycle_on_host_change |
2593	>	error;
2594
2595
2596	+	general_away_count: AWAY_COUNT '=' NUMBER ';'
2597	+	{
2598	+	ConfigGeneral.away_count = $3;
2599	+	};
2600	+
2601	+	general_away_time: AWAY_TIME '=' timespec ';'
2602	+	{
2603	+	ConfigGeneral.away_time = $3;
2604	+	};
2605	+
2606		general_max_watch: MAX_WATCH '=' NUMBER ';'
2607		{
2608	<	ConfigFileEntry.max_watch = $3;
2608	>	ConfigGeneral.max_watch = $3;
2609	>	};
2610	>
2611	>	general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2612	>	{
2613	>	if (conf_parser_ctx.pass == 2)
2614	>	ConfigGeneral.cycle_on_host_change = yylval.number;
2615		};
2616
2617		general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2618		{
2619		if (conf_parser_ctx.pass == 2)
2620	<	ConfigFileEntry.glines = yylval.number;
2620	>	ConfigGeneral.glines = yylval.number;
2621		};
2622
2623		general_gline_duration: GLINE_DURATION '=' timespec ';'
2624		{
2625		if (conf_parser_ctx.pass == 2)
2626	<	ConfigFileEntry.gline_time = $3;
2626	>	ConfigGeneral.gline_time = $3;
2627		};
2628
2629		general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2630		{
2631		if (conf_parser_ctx.pass == 2)
2632	<	ConfigFileEntry.gline_request_time = $3;
2632	>	ConfigGeneral.gline_request_time = $3;
2633		};
2634
2635		general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2636		{
2637	<	ConfigFileEntry.gline_min_cidr = $3;
2637	>	ConfigGeneral.gline_min_cidr = $3;
2638		};
2639
2640		general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2641		{
2642	<	ConfigFileEntry.gline_min_cidr6 = $3;
2642	>	ConfigGeneral.gline_min_cidr6 = $3;
2643		};
2644
2645		general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2646		{
2647	<	ConfigFileEntry.tkline_expire_notices = yylval.number;
2647	>	ConfigGeneral.tkline_expire_notices = yylval.number;
2648		};
2649
2650		general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2651		{
2652	<	ConfigFileEntry.kill_chase_time_limit = $3;
2485	<	};
2486	<
2487	<	general_hide_spoof_ips: HIDE_SPOOF_IPS '=' TBOOL ';'
2488	<	{
2489	<	ConfigFileEntry.hide_spoof_ips = yylval.number;
2652	>	ConfigGeneral.kill_chase_time_limit = $3;
2653		};
2654
2655		general_ignore_bogus_ts: IGNORE_BOGUS_TS '=' TBOOL ';'
2656		{
2657	<	ConfigFileEntry.ignore_bogus_ts = yylval.number;
2657	>	ConfigGeneral.ignore_bogus_ts = yylval.number;
2658		};
2659
2660		general_failed_oper_notice: FAILED_OPER_NOTICE '=' TBOOL ';'
2661		{
2662	<	ConfigFileEntry.failed_oper_notice = yylval.number;
2662	>	ConfigGeneral.failed_oper_notice = yylval.number;
2663		};
2664
2665		general_anti_nick_flood: ANTI_NICK_FLOOD '=' TBOOL ';'
2666		{
2667	<	ConfigFileEntry.anti_nick_flood = yylval.number;
2667	>	ConfigGeneral.anti_nick_flood = yylval.number;
2668		};
2669
2670		general_max_nick_time: MAX_NICK_TIME '=' timespec ';'
2671		{
2672	<	ConfigFileEntry.max_nick_time = $3;
2672	>	ConfigGeneral.max_nick_time = $3;
2673		};
2674
2675		general_max_nick_changes: MAX_NICK_CHANGES '=' NUMBER ';'
2676		{
2677	<	ConfigFileEntry.max_nick_changes = $3;
2677	>	ConfigGeneral.max_nick_changes = $3;
2678		};
2679
2680		general_max_accept: MAX_ACCEPT '=' NUMBER ';'
2681		{
2682	<	ConfigFileEntry.max_accept = $3;
2682	>	ConfigGeneral.max_accept = $3;
2683		};
2684
2685		general_anti_spam_exit_message_time: ANTI_SPAM_EXIT_MESSAGE_TIME '=' timespec ';'
2686		{
2687	<	ConfigFileEntry.anti_spam_exit_message_time = $3;
2687	>	ConfigGeneral.anti_spam_exit_message_time = $3;
2688		};
2689
2690		general_ts_warn_delta: TS_WARN_DELTA '=' timespec ';'
2691		{
2692	<	ConfigFileEntry.ts_warn_delta = $3;
2692	>	ConfigGeneral.ts_warn_delta = $3;
2693		};
2694
2695		general_ts_max_delta: TS_MAX_DELTA '=' timespec ';'
2696		{
2697		if (conf_parser_ctx.pass == 2)
2698	<	ConfigFileEntry.ts_max_delta = $3;
2698	>	ConfigGeneral.ts_max_delta = $3;
2699		};
2700
2701		general_havent_read_conf: HAVENT_READ_CONF '=' NUMBER ';'
#	Line 2548 | Line 2711 | general_havent_read_conf: HAVENT_READ_CO
2711
2712		general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2713		{
2714	<	ConfigFileEntry.invisible_on_connect = yylval.number;
2714	>	ConfigGeneral.invisible_on_connect = yylval.number;
2715		};
2716
2717	<	general_warn_no_nline: WARN_NO_NLINE '=' TBOOL ';'
2717	>	general_warn_no_connect_block: WARN_NO_CONNECT_BLOCK '=' TBOOL ';'
2718		{
2719	<	ConfigFileEntry.warn_no_nline = yylval.number;
2719	>	ConfigGeneral.warn_no_connect_block = yylval.number;
2720		};
2721
2722		general_stats_e_disabled: STATS_E_DISABLED '=' TBOOL ';'
2723		{
2724	<	ConfigFileEntry.stats_e_disabled = yylval.number;
2724	>	ConfigGeneral.stats_e_disabled = yylval.number;
2725	>	};
2726	>
2727	>	general_stats_m_oper_only: STATS_M_OPER_ONLY '=' TBOOL ';'
2728	>	{
2729	>	ConfigGeneral.stats_m_oper_only = yylval.number;
2730		};
2731
2732		general_stats_o_oper_only: STATS_O_OPER_ONLY '=' TBOOL ';'
2733		{
2734	<	ConfigFileEntry.stats_o_oper_only = yylval.number;
2734	>	ConfigGeneral.stats_o_oper_only = yylval.number;
2735		};
2736
2737		general_stats_P_oper_only: STATS_P_OPER_ONLY '=' TBOOL ';'
2738		{
2739	<	ConfigFileEntry.stats_P_oper_only = yylval.number;
2739	>	ConfigGeneral.stats_P_oper_only = yylval.number;
2740	>	};
2741	>
2742	>	general_stats_u_oper_only: STATS_U_OPER_ONLY '=' TBOOL ';'
2743	>	{
2744	>	ConfigGeneral.stats_u_oper_only = yylval.number;
2745		};
2746
2747		general_stats_k_oper_only: STATS_K_OPER_ONLY '=' TBOOL ';'
2748		{
2749	<	ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
2749	>	ConfigGeneral.stats_k_oper_only = 2 * yylval.number;
2750		} | STATS_K_OPER_ONLY '=' TMASKED ';'
2751		{
2752	<	ConfigFileEntry.stats_k_oper_only = 1;
2752	>	ConfigGeneral.stats_k_oper_only = 1;
2753		};
2754
2755		general_stats_i_oper_only: STATS_I_OPER_ONLY '=' TBOOL ';'
2756		{
2757	<	ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
2757	>	ConfigGeneral.stats_i_oper_only = 2 * yylval.number;
2758		} | STATS_I_OPER_ONLY '=' TMASKED ';'
2759		{
2760	<	ConfigFileEntry.stats_i_oper_only = 1;
2760	>	ConfigGeneral.stats_i_oper_only = 1;
2761		};
2762
2763		general_pace_wait: PACE_WAIT '=' timespec ';'
2764		{
2765	<	ConfigFileEntry.pace_wait = $3;
2765	>	ConfigGeneral.pace_wait = $3;
2766		};
2767
2768		general_caller_id_wait: CALLER_ID_WAIT '=' timespec ';'
2769		{
2770	<	ConfigFileEntry.caller_id_wait = $3;
2770	>	ConfigGeneral.caller_id_wait = $3;
2771		};
2772
2773		general_opers_bypass_callerid: OPERS_BYPASS_CALLERID '=' TBOOL ';'
2774		{
2775	<	ConfigFileEntry.opers_bypass_callerid = yylval.number;
2775	>	ConfigGeneral.opers_bypass_callerid = yylval.number;
2776		};
2777
2778		general_pace_wait_simple: PACE_WAIT_SIMPLE '=' timespec ';'
2779		{
2780	<	ConfigFileEntry.pace_wait_simple = $3;
2780	>	ConfigGeneral.pace_wait_simple = $3;
2781		};
2782
2783		general_short_motd: SHORT_MOTD '=' TBOOL ';'
2784		{
2785	<	ConfigFileEntry.short_motd = yylval.number;
2613	<	};
2614	<
2615	<	general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
2616	<	{
2617	<	ConfigFileEntry.no_oper_flood = yylval.number;
2785	>	ConfigGeneral.short_motd = yylval.number;
2786		};
2787
2788	<	general_true_no_oper_flood: TRUE_NO_OPER_FLOOD '=' TBOOL ';'
2788	>	general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
2789		{
2790	<	ConfigFileEntry.true_no_oper_flood = yylval.number;
2790	>	ConfigGeneral.no_oper_flood = yylval.number;
2791		};
2792
2793		general_oper_pass_resv: OPER_PASS_RESV '=' TBOOL ';'
2794		{
2795	<	ConfigFileEntry.oper_pass_resv = yylval.number;
2795	>	ConfigGeneral.oper_pass_resv = yylval.number;
2796		};
2797
2798		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2799		{
2800	<	ConfigFileEntry.dots_in_ident = $3;
2800	>	ConfigGeneral.dots_in_ident = $3;
2801		};
2802
2803		general_max_targets: MAX_TARGETS '=' NUMBER ';'
2804		{
2805	<	ConfigFileEntry.max_targets = $3;
2638	<	};
2639	<
2640	<	general_use_egd: USE_EGD '=' TBOOL ';'
2641	<	{
2642	<	ConfigFileEntry.use_egd = yylval.number;
2643	<	};
2644	<
2645	<	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
2646	<	{
2647	<	if (conf_parser_ctx.pass == 2)
2648	<	{
2649	<	MyFree(ConfigFileEntry.egdpool_path);
2650	<	ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
2651	<	}
2805	>	ConfigGeneral.max_targets = $3;
2806		};
2807
2808	<	general_services_name: T_SERVICES_NAME '=' QSTRING ';'
2808	>	general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2809		{
2810	<	if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2657	<	{
2658	<	MyFree(ConfigFileEntry.service_name);
2659	<	ConfigFileEntry.service_name = xstrdup(yylval.string);
2660	<	}
2810	>	ConfigGeneral.ping_cookie = yylval.number;
2811		};
2812
2813	<	general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2813	>	general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2814		{
2815	<	ConfigFileEntry.ping_cookie = yylval.number;
2815	>	ConfigGeneral.disable_auth = yylval.number;
2816		};
2817
2818	<	general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2818	>	general_throttle_count: THROTTLE_COUNT '=' NUMBER ';'
2819		{
2820	<	ConfigFileEntry.disable_auth = yylval.number;
2820	>	ConfigGeneral.throttle_count = $3;
2821		};
2822
2823		general_throttle_time: THROTTLE_TIME '=' timespec ';'
2824		{
2825	<	ConfigFileEntry.throttle_time = yylval.number;
2825	>	ConfigGeneral.throttle_time = $3;
2826		};
2827
2828		general_oper_umodes: OPER_UMODES
2829		{
2830	<	ConfigFileEntry.oper_umodes = 0;
2830	>	ConfigGeneral.oper_umodes = 0;
2831		} '='  umode_oitems ';' ;
2832
2833		umode_oitems:    umode_oitems ',' umode_oitem | umode_oitem;
2834		umode_oitem:     T_BOTS
2835		{
2836	<	ConfigFileEntry.oper_umodes |= UMODE_BOTS;
2836	>	ConfigGeneral.oper_umodes |= UMODE_BOTS;
2837		} | T_CCONN
2838		{
2839	<	ConfigFileEntry.oper_umodes |= UMODE_CCONN;
2839	>	ConfigGeneral.oper_umodes |= UMODE_CCONN;
2840		} | T_DEAF
2841		{
2842	<	ConfigFileEntry.oper_umodes |= UMODE_DEAF;
2842	>	ConfigGeneral.oper_umodes |= UMODE_DEAF;
2843		} | T_DEBUG
2844		{
2845	<	ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
2845	>	ConfigGeneral.oper_umodes |= UMODE_DEBUG;
2846		} | T_FULL
2847		{
2848	<	ConfigFileEntry.oper_umodes |= UMODE_FULL;
2848	>	ConfigGeneral.oper_umodes |= UMODE_FULL;
2849		} | HIDDEN
2850		{
2851	<	ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
2851	>	ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
2852	>	} | HIDE_CHANS
2853	>	{
2854	>	ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
2855	>	} | HIDE_IDLE
2856	>	{
2857	>	ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
2858		} | T_SKILL
2859		{
2860	<	ConfigFileEntry.oper_umodes |= UMODE_SKILL;
2860	>	ConfigGeneral.oper_umodes |= UMODE_SKILL;
2861		} | T_NCHANGE
2862		{
2863	<	ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
2863	>	ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
2864		} | T_REJ
2865		{
2866	<	ConfigFileEntry.oper_umodes |= UMODE_REJ;
2866	>	ConfigGeneral.oper_umodes |= UMODE_REJ;
2867		} | T_UNAUTH
2868		{
2869	<	ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
2869	>	ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
2870		} | T_SPY
2871		{
2872	<	ConfigFileEntry.oper_umodes |= UMODE_SPY;
2872	>	ConfigGeneral.oper_umodes |= UMODE_SPY;
2873		} | T_EXTERNAL
2874		{
2875	<	ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
2720	<	} | T_OPERWALL
2721	<	{
2722	<	ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
2875	>	ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
2876		} | T_SERVNOTICE
2877		{
2878	<	ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
2878	>	ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
2879		} | T_INVISIBLE
2880		{
2881	<	ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
2881	>	ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
2882		} | T_WALLOP
2883		{
2884	<	ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
2884	>	ConfigGeneral.oper_umodes |= UMODE_WALLOP;
2885		} | T_SOFTCALLERID
2886		{
2887	<	ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
2887	>	ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
2888		} | T_CALLERID
2889		{
2890	<	ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
2890	>	ConfigGeneral.oper_umodes |= UMODE_CALLERID;
2891		} | T_LOCOPS
2892		{
2893	<	ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
2893	>	ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
2894		} | T_NONONREG
2895		{
2896	<	ConfigFileEntry.oper_umodes |= UMODE_REGONLY;
2896	>	ConfigGeneral.oper_umodes |= UMODE_REGONLY;
2897		} | T_FARCONNECT
2898		{
2899	<	ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT;
2899	>	ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
2900		};
2901
2902	<	general_oper_only_umodes: OPER_ONLY_UMODES
2902	>	general_oper_only_umodes: OPER_ONLY_UMODES
2903		{
2904	<	ConfigFileEntry.oper_only_umodes = 0;
2904	>	ConfigGeneral.oper_only_umodes = 0;
2905		} '='  umode_items ';' ;
2906
2907	<	umode_items:    umode_items ',' umode_item | umode_item;
2908	<	umode_item:     T_BOTS
2907	>	umode_items:  umode_items ',' umode_item | umode_item;
2908	>	umode_item:   T_BOTS
2909		{
2910	<	ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
2910	>	ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
2911		} | T_CCONN
2912		{
2913	<	ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
2913	>	ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
2914		} | T_DEAF
2915		{
2916	<	ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
2916	>	ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
2917		} | T_DEBUG
2918		{
2919	<	ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
2919	>	ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
2920		} | T_FULL
2921	<	{
2922	<	ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
2921	>	{
2922	>	ConfigGeneral.oper_only_umodes |= UMODE_FULL;
2923		} | T_SKILL
2924		{
2925	<	ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
2925	>	ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
2926		} | HIDDEN
2927		{
2928	<	ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
2928	>	ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
2929		} | T_NCHANGE
2930		{
2931	<	ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
2931	>	ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
2932		} | T_REJ
2933		{
2934	<	ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
2934	>	ConfigGeneral.oper_only_umodes |= UMODE_REJ;
2935		} | T_UNAUTH
2936		{
2937	<	ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
2937	>	ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
2938		} | T_SPY
2939		{
2940	<	ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
2940	>	ConfigGeneral.oper_only_umodes |= UMODE_SPY;
2941		} | T_EXTERNAL
2942		{
2943	<	ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
2791	<	} | T_OPERWALL
2792	<	{
2793	<	ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
2943	>	ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
2944		} | T_SERVNOTICE
2945		{
2946	<	ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
2946	>	ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
2947		} | T_INVISIBLE
2948		{
2949	<	ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
2949	>	ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
2950		} | T_WALLOP
2951		{
2952	<	ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
2952	>	ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
2953		} | T_SOFTCALLERID
2954		{
2955	<	ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
2955	>	ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
2956		} | T_CALLERID
2957		{
2958	<	ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
2958	>	ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
2959		} | T_LOCOPS
2960		{
2961	<	ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
2961	>	ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
2962		} | T_NONONREG
2963		{
2964	<	ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
2964	>	ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
2965		} | T_FARCONNECT
2966		{
2967	<	ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT;
2967	>	ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
2968		};
2969
2970		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
2971		{
2972	<	ConfigFileEntry.min_nonwildcard = $3;
2972	>	ConfigGeneral.min_nonwildcard = $3;
2973		};
2974
2975		general_min_nonwildcard_simple: MIN_NONWILDCARD_SIMPLE '=' NUMBER ';'
2976		{
2977	<	ConfigFileEntry.min_nonwildcard_simple = $3;
2977	>	ConfigGeneral.min_nonwildcard_simple = $3;
2978		};
2979
2980		general_default_floodcount: DEFAULT_FLOODCOUNT '=' NUMBER ';'
2981		{
2982	<	ConfigFileEntry.default_floodcount = $3;
2982	>	ConfigGeneral.default_floodcount = $3;
2983		};
2984
2985
#	Line 2841 | Line 2991 | channel_entry: CHANNEL
2991
2992		channel_items:      channel_items channel_item | channel_item;
2993		channel_item:       channel_max_bans |
2994	<	channel_knock_delay | channel_knock_delay_channel |
2995	<	channel_max_chans_per_user | channel_max_chans_per_oper |
2994	>	channel_invite_client_count |
2995	>	channel_invite_client_time |
2996	>	channel_knock_client_count |
2997	>	channel_knock_client_time |
2998	>	channel_knock_delay_channel |
2999	>	channel_max_channels |
3000		channel_default_split_user_count |
3001		channel_default_split_server_count |
3002		channel_no_create_on_split |
3003		channel_no_join_on_split |
3004	<	channel_jflood_count | channel_jflood_time |
3005	<	channel_disable_fake_channels | error;
3004	>	channel_default_join_flood_count |
3005	>	channel_default_join_flood_time |
3006	>	channel_disable_fake_channels |
3007	>	error;
3008
3009		channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
3010		{
3011		ConfigChannel.disable_fake_channels = yylval.number;
3012		};
3013
3014	<	channel_knock_delay: KNOCK_DELAY '=' timespec ';'
3014	>	channel_invite_client_count: INVITE_CLIENT_COUNT '=' NUMBER ';'
3015		{
3016	<	ConfigChannel.knock_delay = $3;
3016	>	ConfigChannel.invite_client_count = $3;
3017		};
3018
3019	<	channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
3019	>	channel_invite_client_time: INVITE_CLIENT_TIME '=' timespec ';'
3020		{
3021	<	ConfigChannel.knock_delay_channel = $3;
3021	>	ConfigChannel.invite_client_time = $3;
3022		};
3023
3024	<	channel_max_chans_per_user: MAX_CHANS_PER_USER '=' NUMBER ';'
3024	>	channel_knock_client_count: KNOCK_CLIENT_COUNT '=' NUMBER ';'
3025		{
3026	<	ConfigChannel.max_chans_per_user = $3;
3026	>	ConfigChannel.knock_client_count = $3;
3027	>	};
3028	>
3029	>	channel_knock_client_time: KNOCK_CLIENT_TIME '=' timespec ';'
3030	>	{
3031	>	ConfigChannel.knock_client_time = $3;
3032	>	};
3033	>
3034	>	channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
3035	>	{
3036	>	ConfigChannel.knock_delay_channel = $3;
3037		};
3038
3039	<	channel_max_chans_per_oper: MAX_CHANS_PER_OPER '=' NUMBER ';'
3039	>	channel_max_channels: MAX_CHANNELS '=' NUMBER ';'
3040		{
3041	<	ConfigChannel.max_chans_per_oper = $3;
3041	>	ConfigChannel.max_channels = $3;
3042		};
3043
3044		channel_max_bans: MAX_BANS '=' NUMBER ';'
#	Line 2900 | Line 3066 | channel_no_join_on_split: NO_JOIN_ON_SPL
3066		ConfigChannel.no_join_on_split = yylval.number;
3067		};
3068
3069	<	channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
3069	>	channel_default_join_flood_count: DEFAULT_JOIN_FLOOD_COUNT '=' NUMBER ';'
3070		{
3071	<	GlobalSetOptions.joinfloodcount = yylval.number;
3071	>	ConfigChannel.default_join_flood_count = yylval.number;
3072		};
3073
3074	<	channel_jflood_time: JOIN_FLOOD_TIME '=' timespec ';'
3074	>	channel_default_join_flood_time: DEFAULT_JOIN_FLOOD_TIME '=' timespec ';'
3075		{
3076	<	GlobalSetOptions.joinfloodtime = yylval.number;
3076	>	ConfigChannel.default_join_flood_time = $3;
3077		};
3078
3079		/***************************************************************************
#	Line 2917 | Line 3083 | serverhide_entry: SERVERHIDE
3083		'{' serverhide_items '}' ';';
3084
3085		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
3086	<	serverhide_item:    serverhide_flatten_links | serverhide_disable_remote_commands |
3086	>	serverhide_item:    serverhide_flatten_links |
3087	>	serverhide_disable_remote_commands |
3088		serverhide_hide_servers |
3089	<	serverhide_hide_services |
3090	<	serverhide_links_delay |
3091	<	serverhide_hidden | serverhide_hidden_name |
3092	<	serverhide_hide_server_ips |
3089	>	serverhide_hide_services |
3090	>	serverhide_links_delay |
3091	>	serverhide_hidden |
3092	>	serverhide_hidden_name |
3093	>	serverhide_hide_server_ips |
3094		error;
3095
3096		serverhide_flatten_links: FLATTEN_LINKS '=' TBOOL ';'
#	Line 2964 | Line 3132 | serverhide_links_delay: LINKS_DELAY '='
3132		{
3133		if (($3 > 0) && ConfigServerHide.links_disabled == 1)
3134		{
3135	<	eventAddIsh("write_links_file", write_links_file, NULL, $3);
3135	>	event_write_links_file.when = $3;
3136	>	event_addish(&event_write_links_file, NULL);
3137		ConfigServerHide.links_disabled = 0;
3138		}
3139

Diff Legend

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