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 4256 by michael, Fri Jul 18 20:37:01 2014 UTC vs.
Revision 9857 by michael, Fri Jan 1 04:43:22 2021 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 2000-2014 ircd-hybrid development team
4	>	*  Copyright (c) 2000-2021 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 15 | 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
20		*/
21
#	Line 27 | Line 27
27
28		%{
29
30	–	#define YY_NO_UNPUT
31	–	#include <sys/types.h>
32	–	#include <string.h>
33	–
30		#include "config.h"
31		#include "stdinc.h"
32		#include "ircd.h"
33		#include "list.h"
34	+	#include "parse.h"
35		#include "conf.h"
36		#include "conf_class.h"
37	+	#include "conf_cluster.h"
38	+	#include "conf_gecos.h"
39	+	#include "conf_pseudo.h"
40	+	#include "conf_resv.h"
41	+	#include "conf_service.h"
42	+	#include "conf_shared.h"
43		#include "event.h"
44	+	#include "id.h"
45		#include "log.h"
42	–	#include "client.h"     /* for UMODE_ALL only */
46		#include "irc_string.h"
47		#include "memory.h"
48		#include "modules.h"
49		#include "server.h"
50		#include "hostmask.h"
48	–	#include "send.h"
51		#include "listener.h"
50	–	#include "resv.h"
51	–	#include "numeric.h"
52		#include "user.h"
53		#include "motd.h"
54
55	–	#ifdef HAVE_LIBCRYPTO
56	–	#include <openssl/rsa.h>
57	–	#include <openssl/bio.h>
58	–	#include <openssl/pem.h>
59	–	#include <openssl/dh.h>
60	–	#endif
61	–
62	–	#include "rsa.h"
63	–
55		int yylex(void);
56
57		static struct
#	Line 76 | Line 67 | static struct
67		{
68		char buf[IRCD_BUFSIZE];
69		} name,
70	+	nick,
71		user,
72		host,
73		addr,
#	Line 85 | Line 77 | static struct
77		cert,
78		rpass,
79		spass,
80	<	class;
80	>	whois,
81	>	class,
82	>	target,
83	>	prepend,
84	>	command;
85
86		struct
87		{
#	Line 95 | Line 91 | static struct
91		size,
92		type,
93		port,
94	+	timeout,
95		aftype,
96		ping_freq,
97	<	max_perip,
97	>	max_perip_local,
98	>	max_perip_global,
99		con_freq,
100		min_idle,
101		max_idle,
102		max_total,
105	–	max_global,
106	–	max_local,
107	–	max_ident,
103		max_sendq,
104		max_recvq,
105		max_channels,
#	Line 116 | Line 111 | static struct
111		static void
112		reset_block_state(void)
113		{
114	<	dlink_node *ptr = NULL, *ptr_next = NULL;
115	<
116	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.mask.list.head)
122	<	{
123	<	MyFree(ptr->data);
124	<	dlinkDelete(ptr, &block_state.mask.list);
125	<	free_dlink_node(ptr);
126	<	}
114	>	dlink_node *node, *node_next;
115	>	dlink_list *tab[] = { &block_state.mask.list,
116	>	&block_state.leaf.list, &block_state.hub.list, NULL };
117
118	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
118	>	for (dlink_list **list = tab; *list; ++list)
119		{
120	<	MyFree(ptr->data);
121	<	dlinkDelete(ptr, &block_state.leaf.list);
122	<	free_dlink_node(ptr);
123	<	}
124	<
125	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.hub.list.head)
136	<	{
137	<	MyFree(ptr->data);
138	<	dlinkDelete(ptr, &block_state.hub.list);
139	<	free_dlink_node(ptr);
120	>	DLINK_FOREACH_SAFE(node, node_next, (*list)->head)
121	>	{
122	>	xfree(node->data);
123	>	dlinkDelete(node, *list);
124	>	free_dlink_node(node);
125	>	}
126		}
127
128		memset(&block_state, 0, sizeof(block_state));
#	Line 155 | Line 141 | reset_block_state(void)
141		%token  ANTI_NICK_FLOOD
142		%token  ANTI_SPAM_EXIT_MESSAGE_TIME
143		%token  AUTOCONN
144	+	%token  AWAY_COUNT
145	+	%token  AWAY_TIME
146	+	%token  BOT
147		%token  BYTES KBYTES MBYTES
148		%token  CALLER_ID_WAIT
149		%token  CAN_FLOOD
#	Line 162 | Line 151 | reset_block_state(void)
151		%token  CIDR_BITLEN_IPV4
152		%token  CIDR_BITLEN_IPV6
153		%token  CLASS
154	+	%token  CLIENT
155	+	%token  CLOSE
156		%token  CONNECT
157		%token  CONNECTFREQ
158		%token  CYCLE_ON_HOST_CHANGE
159		%token  DEFAULT_FLOODCOUNT
160	<	%token  DEFAULT_SPLIT_SERVER_COUNT
161	<	%token  DEFAULT_SPLIT_USER_COUNT
160	>	%token  DEFAULT_FLOODTIME
161	>	%token  DEFAULT_JOIN_FLOOD_COUNT
162	>	%token  DEFAULT_JOIN_FLOOD_TIME
163	>	%token  DEFAULT_MAX_CLIENTS
164	>	%token  DEFER
165		%token  DENY
166		%token  DESCRIPTION
167		%token  DIE
168		%token  DISABLE_AUTH
169		%token  DISABLE_FAKE_CHANNELS
170		%token  DISABLE_REMOTE_COMMANDS
171	+	%token  DLINE_MIN_CIDR
172	+	%token  DLINE_MIN_CIDR6
173		%token  DOTS_IN_IDENT
178	–	%token  EGDPOOL_PATH
174		%token  EMAIL
175	+	%token  ENABLE_EXTBANS
176		%token  ENCRYPTED
177		%token  EXCEED_LIMIT
178		%token  EXEMPT
179	+	%token  EXPIRATION
180		%token  FAILED_OPER_NOTICE
181		%token  FLATTEN_LINKS
182	+	%token  FLATTEN_LINKS_DELAY
183	+	%token  FLATTEN_LINKS_FILE
184		%token  GECOS
185		%token  GENERAL
187	–	%token  GLINE
188	–	%token  GLINE_DURATION
189	–	%token  GLINE_ENABLE
190	–	%token  GLINE_EXEMPT
191	–	%token  GLINE_MIN_CIDR
192	–	%token  GLINE_MIN_CIDR6
193	–	%token  GLINE_REQUEST_DURATION
194	–	%token  GLOBAL_KILL
195	–	%token  HAVENT_READ_CONF
186		%token  HIDDEN
187		%token  HIDDEN_NAME
188		%token  HIDE_CHANS
#	Line 201 | Line 191 | reset_block_state(void)
191		%token  HIDE_SERVER_IPS
192		%token  HIDE_SERVERS
193		%token  HIDE_SERVICES
204	–	%token  HIDE_SPOOF_IPS
194		%token  HOST
195		%token  HUB
196		%token  HUB_MASK
208	–	%token  IGNORE_BOGUS_TS
197		%token  INVISIBLE_ON_CONNECT
198		%token  INVITE_CLIENT_COUNT
199		%token  INVITE_CLIENT_TIME
200	+	%token  INVITE_DELAY_CHANNEL
201	+	%token  INVITE_EXPIRE_TIME
202		%token  IP
203		%token  IRCD_AUTH
204		%token  IRCD_FLAGS
205		%token  IRCD_SID
206	<	%token  JOIN_FLOOD_COUNT
217	<	%token  JOIN_FLOOD_TIME
206	>	%token  JOIN
207		%token  KILL
208		%token  KILL_CHASE_TIME_LIMIT
209		%token  KLINE
210		%token  KLINE_EXEMPT
211	+	%token  KLINE_MIN_CIDR
212	+	%token  KLINE_MIN_CIDR6
213		%token  KNOCK_CLIENT_COUNT
214		%token  KNOCK_CLIENT_TIME
215		%token  KNOCK_DELAY_CHANNEL
216		%token  LEAF_MASK
226	–	%token  LINKS_DELAY
217		%token  LISTEN
218		%token  MASK
219		%token  MAX_ACCEPT
220		%token  MAX_BANS
221	+	%token  MAX_BANS_LARGE
222		%token  MAX_CHANNELS
232	–	%token  MAX_GLOBAL
233	–	%token  MAX_IDENT
223		%token  MAX_IDLE
224	<	%token  MAX_LOCAL
224	>	%token  MAX_INVITES
225	>	%token  MAX_MONITOR
226		%token  MAX_NICK_CHANGES
227		%token  MAX_NICK_LENGTH
228		%token  MAX_NICK_TIME
229		%token  MAX_NUMBER
230		%token  MAX_TARGETS
231		%token  MAX_TOPIC_LENGTH
242	–	%token  MAX_WATCH
232		%token  MIN_IDLE
233		%token  MIN_NONWILDCARD
234		%token  MIN_NONWILDCARD_SIMPLE
#	Line 249 | Line 238 | reset_block_state(void)
238		%token  NAME
239		%token  NEED_IDENT
240		%token  NEED_PASSWORD
241	<	%token  NETWORK_DESC
241	>	%token  NETWORK_DESCRIPTION
242		%token  NETWORK_NAME
243		%token  NICK
255	–	%token  NO_CREATE_ON_SPLIT
256	–	%token  NO_JOIN_ON_SPLIT
244		%token  NO_OPER_FLOOD
245		%token  NO_TILDE
259	–	%token  NUMBER
246		%token  NUMBER_PER_CIDR
247	<	%token  NUMBER_PER_IP
247	>	%token  NUMBER_PER_IP_GLOBAL
248	>	%token  NUMBER_PER_IP_LOCAL
249		%token  OPER_ONLY_UMODES
263	–	%token  OPER_PASS_RESV
250		%token  OPER_UMODES
251		%token  OPERATOR
252		%token  OPERS_BYPASS_CALLERID
#	Line 271 | Line 257 | reset_block_state(void)
257		%token  PING_COOKIE
258		%token  PING_TIME
259		%token  PORT
274	–	%token  QSTRING
260		%token  RANDOM_IDLE
261		%token  REASON
262		%token  REDIRPORT
#	Line 282 | Line 267 | reset_block_state(void)
267		%token  RESV
268		%token  RESV_EXEMPT
269		%token  RSA_PRIVATE_KEY_FILE
285	–	%token  RSA_PUBLIC_KEY_FILE
270		%token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
271		%token  SEND_PASSWORD
272		%token  SENDQ
#	Line 290 | Line 274 | reset_block_state(void)
274		%token  SERVERINFO
275		%token  SHORT_MOTD
276		%token  SPOOF
293	–	%token  SPOOF_NOTICE
277		%token  SQUIT
295	–	%token  SSL_CERTIFICATE_FILE
296	–	%token  SSL_CERTIFICATE_FINGERPRINT
297	–	%token  SSL_CONNECTION_REQUIRED
298	–	%token  SSL_DH_ELLIPTIC_CURVE
299	–	%token  SSL_DH_PARAM_FILE
300	–	%token  SSL_MESSAGE_DIGEST_ALGORITHM
278		%token  STATS_E_DISABLED
279		%token  STATS_I_OPER_ONLY
280		%token  STATS_K_OPER_ONLY
281	+	%token  STATS_M_OPER_ONLY
282		%token  STATS_O_OPER_ONLY
283		%token  STATS_P_OPER_ONLY
284		%token  STATS_U_OPER_ONLY
285		%token  T_ALL
286	<	%token  T_BOTS
286	>	%token  T_BIND
287		%token  T_CALLERID
288		%token  T_CCONN
289	+	%token  T_COMMAND
290		%token  T_CLUSTER
291		%token  T_DEAF
292		%token  T_DEBUG
#	Line 315 | Line 294 | reset_block_state(void)
294		%token  T_EXTERNAL
295		%token  T_FARCONNECT
296		%token  T_FILE
297	<	%token  T_FULL
297	>	%token  T_FLOOD
298		%token  T_GLOBOPS
299		%token  T_INVISIBLE
300		%token  T_IPV4
301		%token  T_IPV6
302		%token  T_LOCOPS
303		%token  T_LOG
325	–	%token  T_MAX_CLIENTS
304		%token  T_NCHANGE
305		%token  T_NONONREG
306	+	%token  T_OPME
307	+	%token  T_PREPEND
308	+	%token  T_PSEUDO
309		%token  T_RECVQ
310		%token  T_REJ
311		%token  T_RESTART
312		%token  T_SERVER
313		%token  T_SERVICE
333	–	%token  T_SERVICES_NAME
314		%token  T_SERVNOTICE
315		%token  T_SET
316		%token  T_SHARED
#	Line 338 | Line 318 | reset_block_state(void)
318		%token  T_SKILL
319		%token  T_SOFTCALLERID
320		%token  T_SPY
321	<	%token  T_SSL
322	<	%token  T_SSL_CIPHER_LIST
321	>	%token  T_TARGET
322	>	%token  T_TLS
323		%token  T_UMODES
344	–	%token  T_UNAUTH
324		%token  T_UNDLINE
325		%token  T_UNLIMITED
326		%token  T_UNRESV
#	Line 352 | Line 331 | reset_block_state(void)
331		%token  TBOOL
332		%token  THROTTLE_COUNT
333		%token  THROTTLE_TIME
334	<	%token  TKLINE_EXPIRE_NOTICES
335	<	%token  TMASKED
336	<	%token  TRUE_NO_OPER_FLOOD
334	>	%token  TIMEOUT
335	>	%token  TLS_CERTIFICATE_FILE
336	>	%token  TLS_CERTIFICATE_FINGERPRINT
337	>	%token  TLS_CIPHER_LIST
338	>	%token  TLS_CIPHER_SUITES
339	>	%token  TLS_CONNECTION_REQUIRED
340	>	%token  TLS_DH_PARAM_FILE
341	>	%token  TLS_MESSAGE_DIGEST_ALGORITHM
342	>	%token  TLS_SUPPORTED_GROUPS
343		%token  TS_MAX_DELTA
344		%token  TS_WARN_DELTA
345		%token  TWODOTS
346		%token  TYPE
347		%token  UNKLINE
363	–	%token  USE_EGD
348		%token  USE_LOGGING
349		%token  USER
350		%token  VHOST
351		%token  VHOST6
352		%token  WARN_NO_CONNECT_BLOCK
353	+	%token  WHOIS
354	+	%token  WHOWAS_HISTORY_LENGTH
355		%token  XLINE
356	+	%token  XLINE_EXEMPT
357
358	<	%type  <string> QSTRING
359	<	%type  <number> NUMBER
358	>	%token  <string> QSTRING
359	>	%token  <number> NUMBER
360		%type  <number> timespec
361		%type  <number> timespec_
362		%type  <number> sizespec
#	Line 401 | Line 388 | conf_item:        admin_entry
388		| gecos_entry
389		| modules_entry
390		| motd_entry
391	+	| pseudo_entry
392		| error ';'
393		| error '}'
394		;
#	Line 426 | Line 414 | sizespec:   NUMBER sizespec_ { $$ = $1 +
414
415
416		/***************************************************************************
417	<	*  section modules
417	>	* modules {} section
418		***************************************************************************/
419	<	modules_entry: MODULES
432	<	'{' modules_items '}' ';';
419	>	modules_entry: MODULES '{' modules_items '}' ';';
420
421		modules_items:  modules_items modules_item | modules_item;
422		modules_item:   modules_module | modules_path | error ';' ;
#	Line 447 | Line 434 | modules_path: PATH '=' QSTRING ';'
434		};
435
436
437	+	/***************************************************************************
438	+	* serverinfo {} section
439	+	***************************************************************************/
440		serverinfo_entry: SERVERINFO '{' serverinfo_items '}' ';';
441
442		serverinfo_items:       serverinfo_items serverinfo_item | serverinfo_item ;
443		serverinfo_item:        serverinfo_name |
454	–	serverinfo_vhost |
444		serverinfo_hub |
445		serverinfo_description |
446		serverinfo_network_name |
447	<	serverinfo_network_desc |
448	<	serverinfo_max_clients |
447	>	serverinfo_network_description |
448	>	serverinfo_default_max_clients |
449		serverinfo_max_nick_length |
450		serverinfo_max_topic_length |
451	<	serverinfo_ssl_dh_param_file |
452	<	serverinfo_ssl_dh_elliptic_curve |
451	>	serverinfo_tls_dh_param_file |
452	>	serverinfo_tls_supported_groups |
453		serverinfo_rsa_private_key_file |
465	–	serverinfo_vhost6 |
454		serverinfo_sid |
455	<	serverinfo_ssl_certificate_file |
456	<	serverinfo_ssl_cipher_list |
457	<	serverinfo_ssl_message_digest_algorithm |
455	>	serverinfo_tls_certificate_file |
456	>	serverinfo_tls_cipher_list |
457	>	serverinfo_tls_cipher_suites |
458	>	serverinfo_tls_message_digest_algorithm |
459		error ';' ;
460
461
462	<	serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
462	>	serverinfo_tls_certificate_file: TLS_CERTIFICATE_FILE '=' QSTRING ';'
463		{
464	<	#ifdef HAVE_LIBCRYPTO
476	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
464	>	if (conf_parser_ctx.pass == 2)
465		{
466	<	if (!ServerInfo.rsa_private_key_file)
467	<	{
480	<	conf_error_report("No rsa_private_key_file specified, SSL disabled");
481	<	break;
482	<	}
483	<
484	<	if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
485	<	SSL_FILETYPE_PEM) <= 0 ||
486	<	SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
487	<	SSL_FILETYPE_PEM) <= 0)
488	<	{
489	<	report_crypto_errors();
490	<	conf_error_report("Could not open/read certificate file");
491	<	break;
492	<	}
493	<
494	<	if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
495	<	SSL_FILETYPE_PEM) <= 0 ||
496	<	SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
497	<	SSL_FILETYPE_PEM) <= 0)
498	<	{
499	<	report_crypto_errors();
500	<	conf_error_report("Could not read RSA private key");
501	<	break;
502	<	}
503	<
504	<	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
505	<	!SSL_CTX_check_private_key(ServerInfo.client_ctx))
506	<	{
507	<	report_crypto_errors();
508	<	conf_error_report("Could not read RSA private key");
509	<	break;
510	<	}
466	>	xfree(ConfigServerInfo.tls_certificate_file);
467	>	ConfigServerInfo.tls_certificate_file = xstrdup(yylval.string);
468		}
512	–	#endif
469		};
470
471		serverinfo_rsa_private_key_file: RSA_PRIVATE_KEY_FILE '=' QSTRING ';'
472		{
473	<	#ifdef HAVE_LIBCRYPTO
518	<	BIO *file = NULL;
519	<
520	<	if (conf_parser_ctx.pass != 1)
521	<	break;
522	<
523	<	if (ServerInfo.rsa_private_key)
524	<	{
525	<	RSA_free(ServerInfo.rsa_private_key);
526	<	ServerInfo.rsa_private_key = NULL;
527	<	}
528	<
529	<	if (ServerInfo.rsa_private_key_file)
530	<	{
531	<	MyFree(ServerInfo.rsa_private_key_file);
532	<	ServerInfo.rsa_private_key_file = NULL;
533	<	}
534	<
535	<	ServerInfo.rsa_private_key_file = xstrdup(yylval.string);
536	<
537	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
538	<	{
539	<	conf_error_report("File open failed, ignoring");
540	<	break;
541	<	}
542	<
543	<	ServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
544	<
545	<	BIO_set_close(file, BIO_CLOSE);
546	<	BIO_free(file);
547	<
548	<	if (ServerInfo.rsa_private_key == NULL)
549	<	{
550	<	conf_error_report("Couldn't extract key, ignoring");
551	<	break;
552	<	}
553	<
554	<	if (!RSA_check_key(ServerInfo.rsa_private_key))
473	>	if (conf_parser_ctx.pass == 2)
474		{
475	<	RSA_free(ServerInfo.rsa_private_key);
476	<	ServerInfo.rsa_private_key = NULL;
558	<
559	<	conf_error_report("Invalid key, ignoring");
560	<	break;
475	>	xfree(ConfigServerInfo.rsa_private_key_file);
476	>	ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
477		}
478	+	};
479
480	<	if (RSA_size(ServerInfo.rsa_private_key) < 128)
480	>	serverinfo_tls_dh_param_file: TLS_DH_PARAM_FILE '=' QSTRING ';'
481	>	{
482	>	if (conf_parser_ctx.pass == 2)
483		{
484	<	RSA_free(ServerInfo.rsa_private_key);
485	<	ServerInfo.rsa_private_key = NULL;
567	<
568	<	conf_error_report("Ignoring serverinfo::rsa_private_key_file -- need at least a 1024 bit key size");
484	>	xfree(ConfigServerInfo.tls_dh_param_file);
485	>	ConfigServerInfo.tls_dh_param_file = xstrdup(yylval.string);
486		}
570	–	#endif
487		};
488
489	<	serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
489	>	serverinfo_tls_cipher_list: TLS_CIPHER_LIST '=' QSTRING ';'
490		{
491	<	/* TBD - XXX: error reporting */
576	<	#ifdef HAVE_LIBCRYPTO
577	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
491	>	if (conf_parser_ctx.pass == 2)
492		{
493	<	BIO *file = BIO_new_file(yylval.string, "r");
494	<
581	<	if (file)
582	<	{
583	<	DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
584	<
585	<	BIO_free(file);
586	<
587	<	if (dh)
588	<	{
589	<	if (DH_size(dh) < 128)
590	<	conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
591	<	else
592	<	SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
593	<
594	<	DH_free(dh);
595	<	}
596	<	}
493	>	xfree(ConfigServerInfo.tls_cipher_list);
494	>	ConfigServerInfo.tls_cipher_list = xstrdup(yylval.string);
495		}
598	–	#endif
496		};
497
498	<	serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
498	>	serverinfo_tls_cipher_suites: TLS_CIPHER_SUITES '=' QSTRING ';'
499		{
500	<	#ifdef HAVE_LIBCRYPTO
501	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
502	<	SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
503	<	#endif
500	>	if (conf_parser_ctx.pass == 2)
501	>	{
502	>	xfree(ConfigServerInfo.tls_cipher_suites);
503	>	ConfigServerInfo.tls_cipher_suites = xstrdup(yylval.string);
504	>	}
505		};
506
507	<	serverinfo_ssl_message_digest_algorithm: SSL_MESSAGE_DIGEST_ALGORITHM '=' QSTRING ';'
507	>	serverinfo_tls_message_digest_algorithm: TLS_MESSAGE_DIGEST_ALGORITHM '=' QSTRING ';'
508		{
509	<	#ifdef HAVE_LIBCRYPTO
612	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
509	>	if (conf_parser_ctx.pass == 2)
510		{
511	<	if ((ServerInfo.message_digest_algorithm = EVP_get_digestbyname(yylval.string)) == NULL)
512	<	{
616	<	ServerInfo.message_digest_algorithm = EVP_sha256();
617	<	conf_error_report("Ignoring serverinfo::ssl_message_digest_algorithm -- unknown message digest algorithm");
618	<	}
511	>	xfree(ConfigServerInfo.tls_message_digest_algorithm);
512	>	ConfigServerInfo.tls_message_digest_algorithm = xstrdup(yylval.string);
513		}
620	–	#endif
514		}
515
516	<	serverinfo_ssl_dh_elliptic_curve: SSL_DH_ELLIPTIC_CURVE '=' QSTRING ';'
516	>	serverinfo_tls_supported_groups: TLS_SUPPORTED_GROUPS '=' QSTRING ';'
517		{
518	<	#ifdef HAVE_LIBCRYPTO
626	<	#if OPENSSL_VERSION_NUMBER >= 0x1000005FL && !defined(OPENSSL_NO_ECDH)
627	<	int nid = 0;
628	<	EC_KEY *key = NULL;
629	<
630	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
518	>	if (conf_parser_ctx.pass == 2)
519		{
520	<	if ((nid = OBJ_sn2nid(yylval.string)) == 0)
521	<	{
522	<	conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- unknown curve name");
635	<	break;
636	<	}
637	<
638	<	if ((key = EC_KEY_new_by_curve_name(nid)) == NULL)
639	<	{
640	<	conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- could not create curve");
641	<	break;
642	<	}
643	<
644	<	SSL_CTX_set_tmp_ecdh(ServerInfo.server_ctx, key);
645	<	EC_KEY_free(key);
646	<	}
647	<	#endif
648	<	#endif
520	>	xfree(ConfigServerInfo.tls_supported_groups);
521	>	ConfigServerInfo.tls_supported_groups = xstrdup(yylval.string);
522	>	}
523		};
524
525		serverinfo_name: NAME '=' QSTRING ';'
526		{
527	<	/* this isn't rehashable */
528	<	if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
527	>	/* This isn't rehashable */
528	>	if (conf_parser_ctx.pass == 2 && ConfigServerInfo.name == NULL)
529		{
530	<	if (valid_servname(yylval.string))
531	<	ServerInfo.name = xstrdup(yylval.string);
530	>	if (server_valid_name(yylval.string) == true)
531	>	ConfigServerInfo.name = xstrdup(yylval.string);
532		else
533		{
534		conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
535	<	exit(0);
535	>	exit(EXIT_FAILURE);
536		}
537		}
538		};
539
540		serverinfo_sid: IRCD_SID '=' QSTRING ';'
541		{
542	<	/* this isn't rehashable */
543	<	if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
542	>	/* This isn't rehashable */
543	>	if (conf_parser_ctx.pass == 2 && ConfigServerInfo.sid == NULL)
544		{
545		if (valid_sid(yylval.string))
546	<	ServerInfo.sid = xstrdup(yylval.string);
546	>	ConfigServerInfo.sid = xstrdup(yylval.string);
547		else
548		{
549		conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
550	<	exit(0);
550	>	exit(EXIT_FAILURE);
551		}
552		}
553		};
#	Line 682 | Line 556 | serverinfo_description: DESCRIPTION '='
556		{
557		if (conf_parser_ctx.pass == 2)
558		{
559	<	MyFree(ServerInfo.description);
560	<	ServerInfo.description = xstrdup(yylval.string);
559	>	xfree(ConfigServerInfo.description);
560	>	ConfigServerInfo.description = xstrdup(yylval.string);
561	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
562		}
563		};
564
#	Line 691 | Line 566 | serverinfo_network_name: NETWORK_NAME '=
566		{
567		if (conf_parser_ctx.pass == 2)
568		{
569	<	char *p;
569	>	char *p = strchr(yylval.string, ' ');
570
571	<	if ((p = strchr(yylval.string, ' ')))
571	>	if (p)
572		*p = '\0';
573
574	<	MyFree(ServerInfo.network_name);
575	<	ServerInfo.network_name = xstrdup(yylval.string);
574	>	xfree(ConfigServerInfo.network_name);
575	>	ConfigServerInfo.network_name = xstrdup(yylval.string);
576		}
577		};
578
579	<	serverinfo_network_desc: NETWORK_DESC '=' QSTRING ';'
579	>	serverinfo_network_description: NETWORK_DESCRIPTION '=' QSTRING ';'
580		{
581		if (conf_parser_ctx.pass != 2)
582		break;
583
584	<	MyFree(ServerInfo.network_desc);
585	<	ServerInfo.network_desc = xstrdup(yylval.string);
584	>	xfree(ConfigServerInfo.network_description);
585	>	ConfigServerInfo.network_description = xstrdup(yylval.string);
586		};
587
588	<	serverinfo_vhost: VHOST '=' QSTRING ';'
714	<	{
715	<	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
716	<	{
717	<	struct addrinfo hints, *res;
718	<
719	<	memset(&hints, 0, sizeof(hints));
720	<
721	<	hints.ai_family   = AF_UNSPEC;
722	<	hints.ai_socktype = SOCK_STREAM;
723	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
724	<
725	<	if (getaddrinfo(yylval.string, NULL, &hints, &res))
726	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
727	<	else
728	<	{
729	<	assert(res);
730	<
731	<	memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
732	<	ServerInfo.ip.ss.ss_family = res->ai_family;
733	<	ServerInfo.ip.ss_len = res->ai_addrlen;
734	<	freeaddrinfo(res);
735	<
736	<	ServerInfo.specific_ipv4_vhost = 1;
737	<	}
738	<	}
739	<	};
740	<
741	<	serverinfo_vhost6: VHOST6 '=' QSTRING ';'
742	<	{
743	<	#ifdef IPV6
744	<	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
745	<	{
746	<	struct addrinfo hints, *res;
747	<
748	<	memset(&hints, 0, sizeof(hints));
749	<
750	<	hints.ai_family   = AF_UNSPEC;
751	<	hints.ai_socktype = SOCK_STREAM;
752	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
753	<
754	<	if (getaddrinfo(yylval.string, NULL, &hints, &res))
755	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
756	<	else
757	<	{
758	<	assert(res);
759	<
760	<	memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
761	<	ServerInfo.ip6.ss.ss_family = res->ai_family;
762	<	ServerInfo.ip6.ss_len = res->ai_addrlen;
763	<	freeaddrinfo(res);
764	<
765	<	ServerInfo.specific_ipv6_vhost = 1;
766	<	}
767	<	}
768	<	#endif
769	<	};
770	<
771	<	serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
588	>	serverinfo_default_max_clients: DEFAULT_MAX_CLIENTS '=' NUMBER ';'
589		{
590		if (conf_parser_ctx.pass != 2)
591		break;
592
593	<	if ($3 < MAXCLIENTS_MIN)
593	>	if ($3 < 1)
594		{
595	<	char buf[IRCD_BUFSIZE] = "";
596	<
780	<	snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
781	<	conf_error_report(buf);
782	<	ServerInfo.max_clients = MAXCLIENTS_MIN;
595	>	conf_error_report("default_max_clients too low, setting to 1");
596	>	ConfigServerInfo.default_max_clients = 1;
597		}
598		else if ($3 > MAXCLIENTS_MAX)
599		{
600	<	char buf[IRCD_BUFSIZE] = "";
600	>	char buf[IRCD_BUFSIZE];
601
602	<	snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
602	>	snprintf(buf, sizeof(buf), "default_max_clients too high, setting to %d", MAXCLIENTS_MAX);
603		conf_error_report(buf);
604	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
604	>
605	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
606		}
607		else
608	<	ServerInfo.max_clients = $3;
608	>	ConfigServerInfo.default_max_clients = $3;
609		};
610
611		serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
#	Line 801 | Line 616 | serverinfo_max_nick_length: MAX_NICK_LEN
616		if ($3 < 9)
617		{
618		conf_error_report("max_nick_length too low, setting to 9");
619	<	ServerInfo.max_nick_length = 9;
619	>	ConfigServerInfo.max_nick_length = 9;
620		}
621		else if ($3 > NICKLEN)
622		{
623	<	char buf[IRCD_BUFSIZE] = "";
623	>	char buf[IRCD_BUFSIZE];
624
625		snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
626		conf_error_report(buf);
627	<	ServerInfo.max_nick_length = NICKLEN;
627	>
628	>	ConfigServerInfo.max_nick_length = NICKLEN;
629		}
630		else
631	<	ServerInfo.max_nick_length = $3;
631	>	ConfigServerInfo.max_nick_length = $3;
632		};
633
634		serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
#	Line 823 | Line 639 | serverinfo_max_topic_length: MAX_TOPIC_L
639		if ($3 < 80)
640		{
641		conf_error_report("max_topic_length too low, setting to 80");
642	<	ServerInfo.max_topic_length = 80;
642	>	ConfigServerInfo.max_topic_length = 80;
643		}
644		else if ($3 > TOPICLEN)
645		{
646	<	char buf[IRCD_BUFSIZE] = "";
646	>	char buf[IRCD_BUFSIZE];
647
648		snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
649		conf_error_report(buf);
650	<	ServerInfo.max_topic_length = TOPICLEN;
650	>
651	>	ConfigServerInfo.max_topic_length = TOPICLEN;
652		}
653		else
654	<	ServerInfo.max_topic_length = $3;
654	>	ConfigServerInfo.max_topic_length = $3;
655		};
656
657		serverinfo_hub: HUB '=' TBOOL ';'
658		{
659		if (conf_parser_ctx.pass == 2)
660	<	ServerInfo.hub = yylval.number;
660	>	ConfigServerInfo.hub = yylval.number;
661		};
662
663	+
664		/***************************************************************************
665	<	* admin section
665	>	* admin {} section
666		***************************************************************************/
667	<	admin_entry: ADMIN  '{' admin_items '}' ';' ;
667	>	admin_entry: ADMIN '{' admin_items '}' ';' ;
668
669		admin_items: admin_items admin_item | admin_item;
670		admin_item:  admin_name |
#	Line 859 | Line 677 | admin_name: NAME '=' QSTRING ';'
677		if (conf_parser_ctx.pass != 2)
678		break;
679
680	<	MyFree(AdminInfo.name);
681	<	AdminInfo.name = xstrdup(yylval.string);
680	>	xfree(ConfigAdminInfo.name);
681	>	ConfigAdminInfo.name = xstrdup(yylval.string);
682		};
683
684		admin_email: EMAIL '=' QSTRING ';'
#	Line 868 | Line 686 | admin_email: EMAIL '=' QSTRING ';'
686		if (conf_parser_ctx.pass != 2)
687		break;
688
689	<	MyFree(AdminInfo.email);
690	<	AdminInfo.email = xstrdup(yylval.string);
689	>	xfree(ConfigAdminInfo.email);
690	>	ConfigAdminInfo.email = xstrdup(yylval.string);
691		};
692
693		admin_description: DESCRIPTION '=' QSTRING ';'
#	Line 877 | Line 695 | admin_description: DESCRIPTION '=' QSTRI
695		if (conf_parser_ctx.pass != 2)
696		break;
697
698	<	MyFree(AdminInfo.description);
699	<	AdminInfo.description = xstrdup(yylval.string);
698	>	xfree(ConfigAdminInfo.description);
699	>	ConfigAdminInfo.description = xstrdup(yylval.string);
700		};
701
702	+
703		/***************************************************************************
704	<	* motd section
704	>	* motd {} section
705		***************************************************************************/
706		motd_entry: MOTD
707		{
#	Line 890 | Line 709 | motd_entry: MOTD
709		reset_block_state();
710		} '{' motd_items '}' ';'
711		{
712	<	dlink_node *ptr = NULL;
712	>	dlink_node *node;
713
714		if (conf_parser_ctx.pass != 2)
715		break;
#	Line 898 | Line 717 | motd_entry: MOTD
717		if (!block_state.file.buf[0])
718		break;
719
720	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
721	<	motd_add(ptr->data, block_state.file.buf);
720	>	DLINK_FOREACH(node, block_state.mask.list.head)
721	>	motd_add(node->data, block_state.file.buf);
722		};
723
724		motd_items: motd_items motd_item | motd_item;
#	Line 917 | Line 736 | motd_file: T_FILE '=' QSTRING ';'
736		strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
737		};
738
739	+
740	+	/***************************************************************************
741	+	* pseudo {} section
742	+	***************************************************************************/
743	+	pseudo_entry: T_PSEUDO
744	+	{
745	+	if (conf_parser_ctx.pass == 2)
746	+	reset_block_state();
747	+	} '{' pseudo_items '}' ';'
748	+	{
749	+	if (conf_parser_ctx.pass != 2)
750	+	break;
751	+
752	+	if (!block_state.command.buf[0] ||
753	+	!block_state.name.buf[0] ||
754	+	!block_state.nick.buf[0] ||
755	+	!block_state.host.buf[0])
756	+	break;
757	+
758	+	pseudo_register(block_state.name.buf, block_state.nick.buf, block_state.host.buf,
759	+	block_state.prepend.buf, block_state.command.buf);
760	+	};
761	+
762	+	pseudo_items: pseudo_items pseudo_item | pseudo_item;
763	+	pseudo_item:  pseudo_command | pseudo_prepend | pseudo_name | pseudo_target | error ';' ;
764	+
765	+	pseudo_command: T_COMMAND '=' QSTRING ';'
766	+	{
767	+	if (conf_parser_ctx.pass == 2)
768	+	strlcpy(block_state.command.buf, yylval.string, sizeof(block_state.command.buf));
769	+	};
770	+
771	+	pseudo_name: NAME '=' QSTRING ';'
772	+	{
773	+	if (conf_parser_ctx.pass == 2)
774	+	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
775	+	};
776	+
777	+	pseudo_prepend: T_PREPEND '=' QSTRING ';'
778	+	{
779	+	if (conf_parser_ctx.pass == 2)
780	+	strlcpy(block_state.prepend.buf, yylval.string, sizeof(block_state.prepend.buf));
781	+	};
782	+
783	+	pseudo_target: T_TARGET '=' QSTRING ';'
784	+	{
785	+	if (conf_parser_ctx.pass == 2)
786	+	{
787	+	struct split_nuh_item nuh;
788	+
789	+	nuh.nuhmask  = yylval.string;
790	+	nuh.nickptr  = NULL;
791	+	nuh.userptr  = block_state.nick.buf;
792	+	nuh.hostptr  = block_state.host.buf;
793	+	nuh.nicksize = 0;
794	+	nuh.usersize = sizeof(block_state.nick.buf);
795	+	nuh.hostsize = sizeof(block_state.host.buf);
796	+
797	+	split_nuh(&nuh);
798	+	}
799	+	};
800	+
801	+
802		/***************************************************************************
803	<	*  section logging
803	>	* log {} section
804		***************************************************************************/
805	<	logging_entry:          T_LOG  '{' logging_items '}' ';' ;
805	>	logging_entry:          T_LOG '{' logging_items '}' ';' ;
806		logging_items:          logging_items logging_item | logging_item ;
807
808		logging_item:           logging_use_logging | logging_file_entry |
#	Line 929 | Line 811 | logging_item:           logging_use_logg
811		logging_use_logging: USE_LOGGING '=' TBOOL ';'
812		{
813		if (conf_parser_ctx.pass == 2)
814	<	ConfigLoggingEntry.use_logging = yylval.number;
814	>	ConfigLog.use_logging = yylval.number;
815		};
816
817		logging_file_entry:
#	Line 972 | Line 854 | logging_file_type: TYPE
854		{
855		if (conf_parser_ctx.pass == 2)
856		block_state.type.value = 0;
857	<	} '='  logging_file_type_items ';' ;
857	>	} '=' logging_file_type_items ';' ;
858
859		logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
860		logging_file_type_item:  USER
#	Line 983 | Line 865 | logging_file_type_item:  USER
865		{
866		if (conf_parser_ctx.pass == 2)
867		block_state.type.value = LOG_TYPE_OPER;
986	–	} | GLINE
987	–	{
988	–	if (conf_parser_ctx.pass == 2)
989	–	block_state.type.value = LOG_TYPE_GLINE;
868		} | XLINE
869		{
870		if (conf_parser_ctx.pass == 2)
#	Line 1015 | Line 893 | logging_file_type_item:  USER
893
894
895		/***************************************************************************
896	<	* section oper
896	>	* operator {} section
897		***************************************************************************/
898		oper_entry: OPERATOR
899		{
#	Line 1026 | Line 904 | oper_entry: OPERATOR
904		block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
905		} '{' oper_items '}' ';'
906		{
907	<	dlink_node *ptr = NULL;
907	>	dlink_node *node;
908
909		if (conf_parser_ctx.pass != 2)
910		break;
911
912		if (!block_state.name.buf[0])
913		break;
914	<	#ifdef HAVE_LIBCRYPTO
1037	<	if (!block_state.file.buf[0] &&
1038	<	!block_state.rpass.buf[0])
1039	<	break;
1040	<	#else
914	>
915		if (!block_state.rpass.buf[0])
916		break;
1043	–	#endif
917
918	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
918	>	DLINK_FOREACH(node, block_state.mask.list.head)
919		{
1047	–	struct MaskItem *conf = NULL;
920		struct split_nuh_item nuh;
921	+	char *s = node->data;
922
923	<	nuh.nuhmask  = ptr->data;
923	>	if (EmptyString(s))
924	>	continue;
925	>
926	>	nuh.nuhmask  = s;
927		nuh.nickptr  = NULL;
928		nuh.userptr  = block_state.user.buf;
929		nuh.hostptr  = block_state.host.buf;
930	+
931		nuh.nicksize = 0;
932		nuh.usersize = sizeof(block_state.user.buf);
933		nuh.hostsize = sizeof(block_state.host.buf);
934	+
935		split_nuh(&nuh);
936
937	<	conf         = conf_make(CONF_OPER);
938	<	conf->name   = xstrdup(block_state.name.buf);
939	<	conf->user   = xstrdup(block_state.user.buf);
940	<	conf->host   = xstrdup(block_state.host.buf);
937	>	struct MaskItem *conf = conf_make(CONF_OPER);
938	>	conf->addr = xcalloc(sizeof(*conf->addr));
939	>	conf->name = xstrdup(block_state.name.buf);
940	>	conf->user = xstrdup(block_state.user.buf);
941	>	conf->host = xstrdup(block_state.host.buf);
942
943		if (block_state.cert.buf[0])
944		conf->certfp = xstrdup(block_state.cert.buf);
#	Line 1067 | Line 946 | oper_entry: OPERATOR
946		if (block_state.rpass.buf[0])
947		conf->passwd = xstrdup(block_state.rpass.buf);
948
949	+	if (block_state.whois.buf[0])
950	+	conf->whois = xstrdup(block_state.whois.buf);
951	+
952		conf->flags = block_state.flags.value;
953		conf->modes = block_state.modes.value;
954		conf->port  = block_state.port.value;
955	<	conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
955	>	conf->htype = parse_netmask(conf->host, conf->addr, &conf->bits);
956
957		conf_add_class_to_conf(conf, block_state.class.buf);
1076	–
1077	–	#ifdef HAVE_LIBCRYPTO
1078	–	if (block_state.file.buf[0])
1079	–	{
1080	–	BIO *file = NULL;
1081	–	RSA *pkey = NULL;
1082	–
1083	–	if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
1084	–	{
1085	–	ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- file doesn't exist");
1086	–	break;
1087	–	}
1088	–
1089	–	if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
1090	–	ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key invalid; check key syntax");
1091	–
1092	–	if (RSA_size(pkey) > 128)
1093	–	ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key size must be 1024 or below");
1094	–	else
1095	–	conf->rsa_public_key = pkey;
1096	–
1097	–	BIO_set_close(file, BIO_CLOSE);
1098	–	BIO_free(file);
1099	–	}
1100	–	#endif /* HAVE_LIBCRYPTO */
958		}
959		};
960
#	Line 1105 | Line 962 | oper_items:     oper_items oper_item | o
962		oper_item:      oper_name |
963		oper_user |
964		oper_password |
965	+	oper_whois |
966		oper_umodes |
967		oper_class |
968		oper_encrypted |
969	<	oper_rsa_public_key_file |
970	<	oper_ssl_certificate_fingerprint |
1113	<	oper_ssl_connection_required |
969	>	oper_tls_certificate_fingerprint |
970	>	oper_tls_connection_required |
971		oper_flags |
972		error ';' ;
973
#	Line 1132 | Line 989 | oper_password: PASSWORD '=' QSTRING ';'
989		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
990		};
991
992	+	oper_whois: WHOIS '=' QSTRING ';'
993	+	{
994	+	if (conf_parser_ctx.pass == 2)
995	+	strlcpy(block_state.whois.buf, yylval.string, sizeof(block_state.whois.buf));
996	+	};
997	+
998		oper_encrypted: ENCRYPTED '=' TBOOL ';'
999		{
1000		if (conf_parser_ctx.pass != 2)
#	Line 1143 | Line 1006 | oper_encrypted: ENCRYPTED '=' TBOOL ';'
1006		block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1007		};
1008
1009	<	oper_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
1147	<	{
1148	<	if (conf_parser_ctx.pass == 2)
1149	<	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
1150	<	};
1151	<
1152	<	oper_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
1009	>	oper_tls_certificate_fingerprint: TLS_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
1010		{
1011		if (conf_parser_ctx.pass == 2)
1012		strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
1013		};
1014
1015	<	oper_ssl_connection_required: SSL_CONNECTION_REQUIRED '=' TBOOL ';'
1015	>	oper_tls_connection_required: TLS_CONNECTION_REQUIRED '=' TBOOL ';'
1016		{
1017		if (conf_parser_ctx.pass != 2)
1018		break;
1019
1020		if (yylval.number)
1021	<	block_state.flags.value |= CONF_FLAGS_SSL;
1021	>	block_state.flags.value |= CONF_FLAGS_TLS;
1022		else
1023	<	block_state.flags.value &= ~CONF_FLAGS_SSL;
1023	>	block_state.flags.value &= ~CONF_FLAGS_TLS;
1024		};
1025
1026		oper_class: CLASS '=' QSTRING ';'
#	Line 1176 | Line 1033 | oper_umodes: T_UMODES
1033		{
1034		if (conf_parser_ctx.pass == 2)
1035		block_state.modes.value = 0;
1036	<	} '='  oper_umodes_items ';' ;
1036	>	} '=' oper_umodes_items ';' ;
1037
1038		oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1039	<	oper_umodes_item:  T_BOTS
1039	>	oper_umodes_item: BOT
1040		{
1041		if (conf_parser_ctx.pass == 2)
1042	<	block_state.modes.value |= UMODE_BOTS;
1042	>	block_state.modes.value |= UMODE_BOT;
1043		} | T_CCONN
1044		{
1045		if (conf_parser_ctx.pass == 2)
#	Line 1195 | Line 1052 | oper_umodes_item:  T_BOTS
1052		{
1053		if (conf_parser_ctx.pass == 2)
1054		block_state.modes.value |= UMODE_DEBUG;
1055	<	} | T_FULL
1055	>	} | T_FLOOD
1056		{
1057		if (conf_parser_ctx.pass == 2)
1058	<	block_state.modes.value |= UMODE_FULL;
1058	>	block_state.modes.value |= UMODE_FLOOD;
1059		} | HIDDEN
1060		{
1061		if (conf_parser_ctx.pass == 2)
#	Line 1223 | Line 1080 | oper_umodes_item:  T_BOTS
1080		{
1081		if (conf_parser_ctx.pass == 2)
1082		block_state.modes.value |= UMODE_REJ;
1226	–	} | T_UNAUTH
1227	–	{
1228	–	if (conf_parser_ctx.pass == 2)
1229	–	block_state.modes.value |= UMODE_UNAUTH;
1083		} | T_SPY
1084		{
1085		if (conf_parser_ctx.pass == 2)
#	Line 1267 | Line 1120 | oper_umodes_item:  T_BOTS
1120		{
1121		if (conf_parser_ctx.pass == 2)
1122		block_state.modes.value |= UMODE_FARCONNECT;
1123	+	} | EXPIRATION
1124	+	{
1125	+	if (conf_parser_ctx.pass == 2)
1126	+	block_state.modes.value |= UMODE_EXPIRATION;
1127		};
1128
1129		oper_flags: IRCD_FLAGS
1130		{
1131		if (conf_parser_ctx.pass == 2)
1132		block_state.port.value = 0;
1133	<	} '='  oper_flags_items ';';
1133	>	} '=' oper_flags_items ';';
1134
1135		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1136		oper_flags_item: KILL ':' REMOTE
#	Line 1324 | Line 1181 | oper_flags_item: KILL ':' REMOTE
1181		{
1182		if (conf_parser_ctx.pass == 2)
1183		block_state.port.value |= OPER_FLAG_UNXLINE;
1327	–	} | GLINE
1328	–	{
1329	–	if (conf_parser_ctx.pass == 2)
1330	–	block_state.port.value |= OPER_FLAG_GLINE;
1184		} | DIE
1185		{
1186		if (conf_parser_ctx.pass == 2)
#	Line 1336 | Line 1189 | oper_flags_item: KILL ':' REMOTE
1189		{
1190		if (conf_parser_ctx.pass == 2)
1191		block_state.port.value |= OPER_FLAG_RESTART;
1192	+	} | REHASH ':' REMOTE
1193	+	{
1194	+	if (conf_parser_ctx.pass == 2)
1195	+	block_state.port.value |= OPER_FLAG_REHASH_REMOTE;
1196		} | REHASH
1197		{
1198		if (conf_parser_ctx.pass == 2)
#	Line 1368 | Line 1225 | oper_flags_item: KILL ':' REMOTE
1225		{
1226		if (conf_parser_ctx.pass == 2)
1227		block_state.port.value |= OPER_FLAG_MODULE;
1228	+	} | T_OPME
1229	+	{
1230	+	if (conf_parser_ctx.pass == 2)
1231	+	block_state.port.value |= OPER_FLAG_OPME;
1232	+	} | NICK ':' RESV
1233	+	{
1234	+	if (conf_parser_ctx.pass == 2)
1235	+	block_state.port.value |= OPER_FLAG_NICK_RESV;
1236	+	} | JOIN ':' RESV
1237	+	{
1238	+	if (conf_parser_ctx.pass == 2)
1239	+	block_state.port.value |= OPER_FLAG_JOIN_RESV;
1240	+	} | RESV
1241	+	{
1242	+	if (conf_parser_ctx.pass == 2)
1243	+	block_state.port.value |= OPER_FLAG_RESV;
1244	+	} | T_UNRESV
1245	+	{
1246	+	if (conf_parser_ctx.pass == 2)
1247	+	block_state.port.value |= OPER_FLAG_UNRESV;
1248	+	} | CLOSE
1249	+	{
1250	+	if (conf_parser_ctx.pass == 2)
1251	+	block_state.port.value |= OPER_FLAG_CLOSE;
1252		};
1253
1254
1255		/***************************************************************************
1256	<	*  section class
1256	>	* class {} section
1257		***************************************************************************/
1258		class_entry: CLASS
1259		{
#	Line 1383 | Line 1264 | class_entry: CLASS
1264
1265		block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1266		block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1386	–	block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1267		block_state.max_sendq.value = DEFAULT_SENDQ;
1268		block_state.max_recvq.value = DEFAULT_RECVQ;
1269		} '{' class_items '}' ';'
1270		{
1391	–	struct ClassItem *class = NULL;
1392	–
1271		if (conf_parser_ctx.pass != 1)
1272		break;
1273
1274		if (!block_state.class.buf[0])
1275		break;
1276
1277	<	if (!(class = class_find(block_state.class.buf, 0)))
1277	>	struct ClassItem *class = class_find(block_state.class.buf, false);
1278	>	if (class == NULL)
1279		class = class_make();
1280
1281	<	class->active = 1;
1282	<	MyFree(class->name);
1281	>	class->active = true;
1282	>	xfree(class->name);
1283		class->name = xstrdup(block_state.class.buf);
1284		class->ping_freq = block_state.ping_freq.value;
1285	<	class->max_perip = block_state.max_perip.value;
1285	>	class->max_perip_local = block_state.max_perip_local.value;
1286	>	class->max_perip_global = block_state.max_perip_global.value;
1287		class->con_freq = block_state.con_freq.value;
1288		class->max_total = block_state.max_total.value;
1409	–	class->max_global = block_state.max_global.value;
1410	–	class->max_local = block_state.max_local.value;
1411	–	class->max_ident = block_state.max_ident.value;
1289		class->max_sendq = block_state.max_sendq.value;
1290		class->max_recvq = block_state.max_recvq.value;
1291		class->max_channels = block_state.max_channels.value;
#	Line 1424 | Line 1301 | class_entry: CLASS
1301		class->min_idle = block_state.min_idle.value;
1302		class->max_idle = block_state.max_idle.value;
1303
1304	<	if (class->number_per_cidr && block_state.number_per_cidr.value)
1305	<	if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
1429	<	(class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
1430	<	if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
1431	<	(class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
1432	<	rebuild_cidr_list(class);
1433	<
1304	>	bool diff = (class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value ||
1305	>	class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value);
1306		class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1307		class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1308		class->number_per_cidr = block_state.number_per_cidr.value;
1309	+
1310	+	if (diff)
1311	+	class_ip_limit_rebuild(class);
1312		};
1313
1314		class_items:    class_items class_item | class_item;
#	Line 1442 | Line 1317 | class_item:     class_name |
1317		class_cidr_bitlen_ipv6 |
1318		class_ping_time |
1319		class_number_per_cidr |
1320	<	class_number_per_ip |
1320	>	class_number_per_ip_local |
1321	>	class_number_per_ip_global |
1322		class_connectfreq |
1323		class_max_channels |
1324		class_max_number |
1325	<	class_max_global |
1326	<	class_max_local |
1451	<	class_max_ident |
1452	<	class_sendq | class_recvq |
1325	>	class_sendq |
1326	>	class_recvq |
1327		class_min_idle |
1328		class_max_idle |
1329		class_flags |
#	Line 1467 | Line 1341 | class_ping_time: PING_TIME '=' timespec
1341		block_state.ping_freq.value = $3;
1342		};
1343
1344	<	class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1344	>	class_number_per_ip_local: NUMBER_PER_IP_LOCAL '=' NUMBER ';'
1345		{
1346		if (conf_parser_ctx.pass == 1)
1347	<	block_state.max_perip.value = $3;
1347	>	block_state.max_perip_local.value = $3;
1348	>	};
1349	>
1350	>	class_number_per_ip_global: NUMBER_PER_IP_GLOBAL '=' NUMBER ';'
1351	>	{
1352	>	if (conf_parser_ctx.pass == 1)
1353	>	block_state.max_perip_global.value = $3;
1354		};
1355
1356		class_connectfreq: CONNECTFREQ '=' timespec ';'
#	Line 1491 | Line 1371 | class_max_number: MAX_NUMBER '=' NUMBER
1371		block_state.max_total.value = $3;
1372		};
1373
1494	–	class_max_global: MAX_GLOBAL '=' NUMBER ';'
1495	–	{
1496	–	if (conf_parser_ctx.pass == 1)
1497	–	block_state.max_global.value = $3;
1498	–	};
1499	–
1500	–	class_max_local: MAX_LOCAL '=' NUMBER ';'
1501	–	{
1502	–	if (conf_parser_ctx.pass == 1)
1503	–	block_state.max_local.value = $3;
1504	–	};
1505	–
1506	–	class_max_ident: MAX_IDENT '=' NUMBER ';'
1507	–	{
1508	–	if (conf_parser_ctx.pass == 1)
1509	–	block_state.max_ident.value = $3;
1510	–	};
1511	–
1374		class_sendq: SENDQ '=' sizespec ';'
1375		{
1376		if (conf_parser_ctx.pass == 1)
#	Line 1562 | Line 1424 | class_flags: IRCD_FLAGS
1424		{
1425		if (conf_parser_ctx.pass == 1)
1426		block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1427	<	} '='  class_flags_items ';';
1427	>	} '=' class_flags_items ';';
1428
1429		class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1430		class_flags_item: RANDOM_IDLE
#	Line 1577 | Line 1439 | class_flags_item: RANDOM_IDLE
1439
1440
1441		/***************************************************************************
1442	<	*  section listen
1442	>	* listen {} section
1443		***************************************************************************/
1444		listen_entry: LISTEN
1445		{
#	Line 1588 | Line 1450 | listen_entry: LISTEN
1450		listen_flags: IRCD_FLAGS
1451		{
1452		block_state.flags.value = 0;
1453	<	} '='  listen_flags_items ';';
1453	>	} '=' listen_flags_items ';';
1454
1455		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1456	<	listen_flags_item: T_SSL
1456	>	listen_flags_item: T_TLS
1457		{
1458		if (conf_parser_ctx.pass == 2)
1459	<	block_state.flags.value |= LISTENER_SSL;
1459	>	block_state.flags.value |= LISTENER_TLS;
1460		} | HIDDEN
1461		{
1462		if (conf_parser_ctx.pass == 2)
#	Line 1603 | Line 1465 | listen_flags_item: T_SSL
1465		{
1466		if (conf_parser_ctx.pass == 2)
1467		block_state.flags.value |= LISTENER_SERVER;
1468	+	} | CLIENT
1469	+	{
1470	+	if (conf_parser_ctx.pass == 2)
1471	+	block_state.flags.value |= LISTENER_CLIENT;
1472	+	} | DEFER
1473	+	{
1474	+	if (conf_parser_ctx.pass == 2)
1475	+	block_state.flags.value |= LISTENER_DEFER;
1476		};
1477
1478		listen_items:   listen_items listen_item | listen_item;
#	Line 1616 | Line 1486 | port_item: NUMBER
1486		{
1487		if (conf_parser_ctx.pass == 2)
1488		{
1489	<	if (block_state.flags.value & LISTENER_SSL)
1490	<	#ifdef HAVE_LIBCRYPTO
1491	<	if (!ServerInfo.server_ctx)
1489	>	#ifndef HAVE_TLS
1490	>	if (block_state.flags.value & LISTENER_TLS)
1491	>	{
1492	>	conf_error_report("TLS not available - port closed");
1493	>	break;
1494	>	}
1495		#endif
1496	<	{
1624	<	conf_error_report("SSL not available - port closed");
1625	<	break;
1626	<	}
1627	<	add_listener($1, block_state.addr.buf, block_state.flags.value);
1496	>	listener_add($1, block_state.addr.buf, block_state.flags.value);
1497		}
1498		} | NUMBER TWODOTS NUMBER
1499		{
1500		if (conf_parser_ctx.pass == 2)
1501		{
1502	<	if (block_state.flags.value & LISTENER_SSL)
1503	<	#ifdef HAVE_LIBCRYPTO
1504	<	if (!ServerInfo.server_ctx)
1502	>	#ifndef HAVE_TLS
1503	>	if (block_state.flags.value & LISTENER_TLS)
1504	>	{
1505	>	conf_error_report("TLS not available - port closed");
1506	>	break;
1507	>	}
1508		#endif
1637	–	{
1638	–	conf_error_report("SSL not available - port closed");
1639	–	break;
1640	–	}
1509
1510		for (int i = $1; i <= $3; ++i)
1511	<	add_listener(i, block_state.addr.buf, block_state.flags.value);
1511	>	listener_add(i, block_state.addr.buf, block_state.flags.value);
1512		}
1513		};
1514
#	Line 1656 | Line 1524 | listen_host: HOST '=' QSTRING ';'
1524		strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1525		};
1526
1527	+
1528		/***************************************************************************
1529	<	*  section auth
1529	>	* auth {} section
1530		***************************************************************************/
1531		auth_entry: IRCD_AUTH
1532		{
#	Line 1665 | Line 1534 | auth_entry: IRCD_AUTH
1534		reset_block_state();
1535		} '{' auth_items '}' ';'
1536		{
1537	<	dlink_node *ptr = NULL;
1537	>	dlink_node *node;
1538
1539		if (conf_parser_ctx.pass != 2)
1540		break;
1541
1542	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
1542	>	DLINK_FOREACH(node, block_state.mask.list.head)
1543		{
1675	–	struct MaskItem *conf = NULL;
1544		struct split_nuh_item nuh;
1545	+	char *s = node->data;
1546	+
1547	+	if (EmptyString(s))
1548	+	continue;
1549
1550	<	nuh.nuhmask  = ptr->data;
1550	>	nuh.nuhmask  = s;
1551		nuh.nickptr  = NULL;
1552		nuh.userptr  = block_state.user.buf;
1553		nuh.hostptr  = block_state.host.buf;
1554	+
1555		nuh.nicksize = 0;
1556		nuh.usersize = sizeof(block_state.user.buf);
1557		nuh.hostsize = sizeof(block_state.host.buf);
1558	+
1559		split_nuh(&nuh);
1560
1561	<	conf        = conf_make(CONF_CLIENT);
1562	<	conf->user  = xstrdup(block_state.user.buf);
1563	<	conf->host  = xstrdup(block_state.host.buf);
1561	>	struct MaskItem *conf = conf_make(CONF_CLIENT);
1562	>	conf->user = xstrdup(block_state.user.buf);
1563	>	conf->host = xstrdup(block_state.host.buf);
1564
1565		if (block_state.rpass.buf[0])
1566		conf->passwd = xstrdup(block_state.rpass.buf);
#	Line 1694 | Line 1568 | auth_entry: IRCD_AUTH
1568		conf->name = xstrdup(block_state.name.buf);
1569
1570		conf->flags = block_state.flags.value;
1571	<	conf->port  = block_state.port.value;
1571	>	conf->port = block_state.port.value;
1572
1573		conf_add_class_to_conf(conf, block_state.class.buf);
1574		add_conf_by_address(CONF_CLIENT, conf);
#	Line 1745 | Line 1619 | auth_flags: IRCD_FLAGS
1619		{
1620		if (conf_parser_ctx.pass == 2)
1621		block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
1622	<	} '='  auth_flags_items ';';
1622	>	} '=' auth_flags_items ';';
1623
1624		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1625	<	auth_flags_item: SPOOF_NOTICE
1752	<	{
1753	<	if (conf_parser_ctx.pass == 2)
1754	<	block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1755	<	} | EXCEED_LIMIT
1625	>	auth_flags_item: EXCEED_LIMIT
1626		{
1627		if (conf_parser_ctx.pass == 2)
1628		block_state.flags.value |= CONF_FLAGS_NOLIMIT;
#	Line 1760 | Line 1630 | auth_flags_item: SPOOF_NOTICE
1630		{
1631		if (conf_parser_ctx.pass == 2)
1632		block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1633	+	} | XLINE_EXEMPT
1634	+	{
1635	+	if (conf_parser_ctx.pass == 2)
1636	+	block_state.flags.value |= CONF_FLAGS_EXEMPTXLINE;
1637		} | NEED_IDENT
1638		{
1639		if (conf_parser_ctx.pass == 2)
#	Line 1772 | Line 1646 | auth_flags_item: SPOOF_NOTICE
1646		{
1647		if (conf_parser_ctx.pass == 2)
1648		block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1775	–	} | GLINE_EXEMPT
1776	–	{
1777	–	if (conf_parser_ctx.pass == 2)
1778	–	block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
1649		} | RESV_EXEMPT
1650		{
1651		if (conf_parser_ctx.pass == 2)
#	Line 1824 | Line 1694 | auth_redir_port: REDIRPORT '=' NUMBER ';
1694
1695
1696		/***************************************************************************
1697	<	*  section resv
1697	>	* resv {} section
1698		***************************************************************************/
1699		resv_entry: RESV
1700		{
#	Line 1838 | Line 1708 | resv_entry: RESV
1708		if (conf_parser_ctx.pass != 2)
1709		break;
1710
1711	<	create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1711	>	resv_make(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1712		};
1713
1714		resv_items:     resv_items resv_item | resv_item;
#	Line 1864 | Line 1734 | resv_exempt: EXEMPT '=' QSTRING ';'
1734
1735
1736		/***************************************************************************
1737	<	*  section service
1737	>	* service {} section
1738		***************************************************************************/
1739		service_entry: T_SERVICE '{' service_items '}' ';';
1740
#	Line 1876 | Line 1746 | service_name: NAME '=' QSTRING ';'
1746		if (conf_parser_ctx.pass != 2)
1747		break;
1748
1749	<	if (valid_servname(yylval.string))
1749	>	if (server_valid_name(yylval.string) == true)
1750		{
1751	<	struct MaskItem *conf = conf_make(CONF_SERVICE);
1752	<	conf->name = xstrdup(yylval.string);
1751	>	struct ServiceItem *service = service_make();
1752	>	service->name = xstrdup(yylval.string);
1753		}
1754		};
1755
1756	+
1757		/***************************************************************************
1758	<	*  section shared, for sharing remote klines etc.
1758	>	* shared {} section, for sharing remote klines etc.
1759		***************************************************************************/
1760		shared_entry: T_SHARED
1761		{
#	Line 1899 | Line 1770 | shared_entry: T_SHARED
1770		block_state.flags.value = SHARED_ALL;
1771		} '{' shared_items '}' ';'
1772		{
1902	–	struct MaskItem *conf = NULL;
1903	–
1773		if (conf_parser_ctx.pass != 2)
1774		break;
1775
1776	<	conf = conf_make(CONF_ULINE);
1777	<	conf->flags = block_state.flags.value;
1778	<	conf->name = xstrdup(block_state.name.buf);
1779	<	conf->user = xstrdup(block_state.user.buf);
1780	<	conf->host = xstrdup(block_state.host.buf);
1776	>	struct SharedItem *shared = shared_make();
1777	>	shared->type = block_state.flags.value;
1778	>	shared->server = xstrdup(block_state.name.buf);
1779	>	shared->user = xstrdup(block_state.user.buf);
1780	>	shared->host = xstrdup(block_state.host.buf);
1781		};
1782
1783		shared_items: shared_items shared_item | shared_item;
#	Line 1988 | Line 1857 | shared_type_item: KLINE
1857		block_state.flags.value = SHARED_ALL;
1858		};
1859
1860	+
1861		/***************************************************************************
1862	<	*  section cluster
1862	>	* cluster {} section
1863		***************************************************************************/
1864		cluster_entry: T_CLUSTER
1865		{
#	Line 1999 | Line 1869 | cluster_entry: T_CLUSTER
1869		reset_block_state();
1870
1871		strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1872	<	block_state.flags.value = SHARED_ALL;
1872	>	block_state.flags.value = CLUSTER_ALL;
1873		} '{' cluster_items '}' ';'
1874		{
2005	–	struct MaskItem *conf = NULL;
2006	–
1875		if (conf_parser_ctx.pass != 2)
1876		break;
1877
1878	<	conf = conf_make(CONF_CLUSTER);
1879	<	conf->flags = block_state.flags.value;
1880	<	conf->name = xstrdup(block_state.name.buf);
1878	>	struct ClusterItem *cluster = cluster_make();
1879	>	cluster->type = block_state.flags.value;
1880	>	cluster->server = xstrdup(block_state.name.buf);
1881		};
1882
1883		cluster_items:  cluster_items cluster_item | cluster_item;
#	Line 2031 | Line 1899 | cluster_types:  cluster_types ',' cluste
1899		cluster_type_item: KLINE
1900		{
1901		if (conf_parser_ctx.pass == 2)
1902	<	block_state.flags.value |= SHARED_KLINE;
1902	>	block_state.flags.value |= CLUSTER_KLINE;
1903		} | UNKLINE
1904		{
1905		if (conf_parser_ctx.pass == 2)
1906	<	block_state.flags.value |= SHARED_UNKLINE;
1906	>	block_state.flags.value |= CLUSTER_UNKLINE;
1907		} | T_DLINE
1908		{
1909		if (conf_parser_ctx.pass == 2)
1910	<	block_state.flags.value |= SHARED_DLINE;
1910	>	block_state.flags.value |= CLUSTER_DLINE;
1911		} | T_UNDLINE
1912		{
1913		if (conf_parser_ctx.pass == 2)
1914	<	block_state.flags.value |= SHARED_UNDLINE;
1914	>	block_state.flags.value |= CLUSTER_UNDLINE;
1915		} | XLINE
1916		{
1917		if (conf_parser_ctx.pass == 2)
1918	<	block_state.flags.value |= SHARED_XLINE;
1918	>	block_state.flags.value |= CLUSTER_XLINE;
1919		} | T_UNXLINE
1920		{
1921		if (conf_parser_ctx.pass == 2)
1922	<	block_state.flags.value |= SHARED_UNXLINE;
1922	>	block_state.flags.value |= CLUSTER_UNXLINE;
1923		} | RESV
1924		{
1925		if (conf_parser_ctx.pass == 2)
1926	<	block_state.flags.value |= SHARED_RESV;
1926	>	block_state.flags.value |= CLUSTER_RESV;
1927		} | T_UNRESV
1928		{
1929		if (conf_parser_ctx.pass == 2)
1930	<	block_state.flags.value |= SHARED_UNRESV;
1930	>	block_state.flags.value |= CLUSTER_UNRESV;
1931		} | T_LOCOPS
1932		{
1933		if (conf_parser_ctx.pass == 2)
1934	<	block_state.flags.value |= SHARED_LOCOPS;
1934	>	block_state.flags.value |= CLUSTER_LOCOPS;
1935		} | T_ALL
1936		{
1937		if (conf_parser_ctx.pass == 2)
1938	<	block_state.flags.value = SHARED_ALL;
1938	>	block_state.flags.value = CLUSTER_ALL;
1939		};
1940
1941	+
1942		/***************************************************************************
1943	<	*  section connect
1943	>	* connect {}  section
1944		***************************************************************************/
1945		connect_entry: CONNECT
1946		{
#	Line 2082 | Line 1951 | connect_entry: CONNECT
1951		reset_block_state();
1952		block_state.aftype.value = AF_INET;
1953		block_state.port.value = PORTNUM;
1954	+	block_state.timeout.value = CONNECTTIMEOUT;
1955		} '{' connect_items '}' ';'
1956		{
2087	–	struct MaskItem *conf = NULL;
1957		struct addrinfo hints, *res;
1958
1959		if (conf_parser_ctx.pass != 2)
#	Line 2098 | Line 1967 | connect_entry: CONNECT
1967		!block_state.spass.buf[0])
1968		break;
1969
1970	+	if (server_valid_name(block_state.name.buf) == false)
1971	+	break;
1972	+
1973		if (has_wildcards(block_state.name.buf) ||
1974		has_wildcards(block_state.host.buf))
1975		break;
1976
1977	<	conf = conf_make(CONF_SERVER);
1977	>	struct MaskItem *conf = conf_make(CONF_SERVER);
1978	>	conf->addr = xcalloc(sizeof(*conf->addr));
1979		conf->port = block_state.port.value;
1980	+	conf->timeout = block_state.timeout.value;
1981		conf->flags = block_state.flags.value;
1982		conf->aftype = block_state.aftype.value;
1983		conf->host = xstrdup(block_state.host.buf);
#	Line 2129 | Line 2003 | connect_entry: CONNECT
2003		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2004
2005		if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2006	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2006	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server bind(%s)", block_state.bind.buf);
2007		else
2008		{
2009		assert(res);
2010
2011	<	memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2012	<	conf->bind.ss.ss_family = res->ai_family;
2013	<	conf->bind.ss_len = res->ai_addrlen;
2011	>	conf->bind = xcalloc(sizeof(*conf->bind));
2012	>
2013	>	memcpy(conf->bind, res->ai_addr, res->ai_addrlen);
2014	>	conf->bind->ss_len = res->ai_addrlen;
2015		freeaddrinfo(res);
2016		}
2017		}
2018
2019		conf_add_class_to_conf(conf, block_state.class.buf);
2020	<	lookup_confhost(conf);
2020	>	conf_dns_lookup(conf);
2021		};
2022
2023		connect_items:  connect_items connect_item | connect_item;
2024		connect_item:   connect_name |
2025		connect_host |
2026	<	connect_vhost |
2026	>	connect_timeout |
2027	>	connect_bind |
2028		connect_send_password |
2029		connect_accept_password |
2030	<	connect_ssl_certificate_fingerprint |
2030	>	connect_tls_certificate_fingerprint |
2031		connect_aftype |
2032		connect_port |
2033	<	connect_ssl_cipher_list |
2033	>	connect_tls_cipher_list |
2034		connect_flags |
2035		connect_hub_mask |
2036		connect_leaf_mask |
#	Line 2174 | Line 2050 | connect_host: HOST '=' QSTRING ';'
2050		strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2051		};
2052
2053	<	connect_vhost: VHOST '=' QSTRING ';'
2053	>	connect_timeout: TIMEOUT '=' timespec ';'
2054	>	{
2055	>	if (conf_parser_ctx.pass == 2)
2056	>	block_state.timeout.value = $3;
2057	>	};
2058	>
2059	>	connect_bind: T_BIND '=' QSTRING ';'
2060		{
2061		if (conf_parser_ctx.pass == 2)
2062		strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
#	Line 2185 | Line 2067 | connect_send_password: SEND_PASSWORD '='
2067		if (conf_parser_ctx.pass != 2)
2068		break;
2069
2070	<	if ($3[0] == ':')
2070	>	if (*yylval.string == ':')
2071		conf_error_report("Server passwords cannot begin with a colon");
2072	<	else if (strchr($3, ' '))
2072	>	else if (strchr(yylval.string, ' '))
2073		conf_error_report("Server passwords cannot contain spaces");
2074		else
2075		strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
#	Line 2198 | Line 2080 | connect_accept_password: ACCEPT_PASSWORD
2080		if (conf_parser_ctx.pass != 2)
2081		break;
2082
2083	<	if ($3[0] == ':')
2083	>	if (*yylval.string == ':')
2084		conf_error_report("Server passwords cannot begin with a colon");
2085	<	else if (strchr($3, ' '))
2085	>	else if (strchr(yylval.string, ' '))
2086		conf_error_report("Server passwords cannot contain spaces");
2087		else
2088		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2089		};
2090
2091	<	connect_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
2091	>	connect_tls_certificate_fingerprint: TLS_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
2092		{
2093		if (conf_parser_ctx.pass == 2)
2094		strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
#	Line 2224 | Line 2106 | connect_aftype: AFTYPE '=' T_IPV4 ';'
2106		block_state.aftype.value = AF_INET;
2107		} | AFTYPE '=' T_IPV6 ';'
2108		{
2227	–	#ifdef IPV6
2109		if (conf_parser_ctx.pass == 2)
2110		block_state.aftype.value = AF_INET6;
2230	–	#endif
2111		};
2112
2113		connect_flags: IRCD_FLAGS
2114		{
2115		block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2116	<	} '='  connect_flags_items ';';
2116	>	} '=' connect_flags_items ';';
2117
2118		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2119		connect_flags_item: AUTOCONN
2120		{
2121		if (conf_parser_ctx.pass == 2)
2122		block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2123	<	} | T_SSL
2123	>	} | T_TLS
2124		{
2125		if (conf_parser_ctx.pass == 2)
2126	<	block_state.flags.value |= CONF_FLAGS_SSL;
2126	>	block_state.flags.value |= CONF_FLAGS_TLS;
2127		};
2128
2129		connect_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 2275 | Line 2155 | connect_class: CLASS '=' QSTRING ';'
2155		strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2156		};
2157
2158	<	connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2158	>	connect_tls_cipher_list: TLS_CIPHER_LIST '=' QSTRING ';'
2159		{
2160	<	#ifdef HAVE_LIBCRYPTO
2160	>	#ifdef HAVE_TLS
2161		if (conf_parser_ctx.pass == 2)
2162		strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2163		#else
2164		if (conf_parser_ctx.pass == 2)
2165	<	conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
2165	>	conf_error_report("Ignoring connect::tls_cipher_list -- no TLS support");
2166		#endif
2167		};
2168
2169
2170		/***************************************************************************
2171	<	*  section kill
2171	>	* kill {} section
2172		***************************************************************************/
2173		kill_entry: KILL
2174		{
#	Line 2296 | Line 2176 | kill_entry: KILL
2176		reset_block_state();
2177		} '{' kill_items '}' ';'
2178		{
2299	–	struct MaskItem *conf = NULL;
2300	–
2179		if (conf_parser_ctx.pass != 2)
2180		break;
2181
#	Line 2305 | Line 2183 | kill_entry: KILL
2183		!block_state.host.buf[0])
2184		break;
2185
2186	<	conf = conf_make(CONF_KLINE);
2186	>	struct MaskItem *conf = conf_make(CONF_KLINE);
2187		conf->user = xstrdup(block_state.user.buf);
2188		conf->host = xstrdup(block_state.host.buf);
2189
#	Line 2345 | Line 2223 | kill_reason: REASON '=' QSTRING ';'
2223		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2224		};
2225
2226	+
2227		/***************************************************************************
2228	<	*  section deny
2228	>	* deny {} section
2229		***************************************************************************/
2230		deny_entry: DENY
2231		{
#	Line 2354 | Line 2233 | deny_entry: DENY
2233		reset_block_state();
2234		} '{' deny_items '}' ';'
2235		{
2357	–	struct MaskItem *conf = NULL;
2358	–
2236		if (conf_parser_ctx.pass != 2)
2237		break;
2238
#	Line 2364 | Line 2241 | deny_entry: DENY
2241
2242		if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2243		{
2244	<	conf = conf_make(CONF_DLINE);
2244	>	struct MaskItem *conf = conf_make(CONF_DLINE);
2245		conf->host = xstrdup(block_state.addr.buf);
2246
2247		if (block_state.rpass.buf[0])
#	Line 2390 | Line 2267 | deny_reason: REASON '=' QSTRING ';'
2267		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2268		};
2269
2270	+
2271		/***************************************************************************
2272	<	*  section exempt
2272	>	* exempt {} section
2273		***************************************************************************/
2274		exempt_entry: EXEMPT '{' exempt_items '}' ';';
2275
2276	<	exempt_items:     exempt_items exempt_item | exempt_item;
2277	<	exempt_item:      exempt_ip | error;
2276	>	exempt_items: exempt_items exempt_item | exempt_item;
2277	>	exempt_item:  exempt_ip | error;
2278
2279		exempt_ip: IP '=' QSTRING ';'
2280		{
2281		if (conf_parser_ctx.pass == 2)
2282		{
2283	<	if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2283	>	if (*yylval.string && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2284		{
2285		struct MaskItem *conf = conf_make(CONF_EXEMPT);
2286		conf->host = xstrdup(yylval.string);
#	Line 2413 | Line 2291 | exempt_ip: IP '=' QSTRING ';'
2291		};
2292
2293		/***************************************************************************
2294	<	*  section gecos
2294	>	* gecos {} section
2295		***************************************************************************/
2296		gecos_entry: GECOS
2297		{
#	Line 2421 | Line 2299 | gecos_entry: GECOS
2299		reset_block_state();
2300		} '{' gecos_items '}' ';'
2301		{
2424	–	struct MaskItem *conf = NULL;
2425	–
2302		if (conf_parser_ctx.pass != 2)
2303		break;
2304
2305		if (!block_state.name.buf[0])
2306		break;
2307
2308	<	conf = conf_make(CONF_XLINE);
2309	<	conf->name = xstrdup(block_state.name.buf);
2308	>	struct GecosItem *gecos = gecos_make();
2309	>	gecos->mask = xstrdup(block_state.name.buf);
2310
2311		if (block_state.rpass.buf[0])
2312	<	conf->reason = xstrdup(block_state.rpass.buf);
2312	>	gecos->reason = xstrdup(block_state.rpass.buf);
2313		else
2314	<	conf->reason = xstrdup(CONF_NOREASON);
2314	>	gecos->reason = xstrdup(CONF_NOREASON);
2315		};
2316
2317		gecos_items: gecos_items gecos_item | gecos_item;
#	Line 2453 | Line 2329 | gecos_reason: REASON '=' QSTRING ';'
2329		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2330		};
2331
2332	+
2333		/***************************************************************************
2334	<	*  section general
2334	>	* general {} section
2335		***************************************************************************/
2336	<	general_entry: GENERAL
2460	<	'{' general_items '}' ';';
2336	>	general_entry: GENERAL '{' general_items '}' ';';
2337
2338		general_items:      general_items general_item | general_item;
2339	<	general_item:       general_hide_spoof_ips |
2340	<	general_ignore_bogus_ts |
2339	>	general_item:       general_away_count |
2340	>	general_away_time |
2341		general_failed_oper_notice |
2342		general_anti_nick_flood |
2343		general_max_nick_time |
2344		general_max_nick_changes |
2345		general_max_accept |
2346	+	general_whowas_history_length |
2347		general_anti_spam_exit_message_time |
2348		general_ts_warn_delta |
2349		general_ts_max_delta |
#	Line 2474 | Line 2351 | general_item:       general_hide_spoof_i
2351		general_invisible_on_connect |
2352		general_warn_no_connect_block |
2353		general_dots_in_ident |
2477	–	general_stats_o_oper_only |
2478	–	general_stats_k_oper_only |
2479	–	general_pace_wait |
2354		general_stats_i_oper_only |
2355	<	general_pace_wait_simple |
2355	>	general_stats_k_oper_only |
2356	>	general_stats_m_oper_only |
2357	>	general_stats_o_oper_only |
2358		general_stats_P_oper_only |
2359		general_stats_u_oper_only |
2360	+	general_pace_wait |
2361	+	general_pace_wait_simple |
2362		general_short_motd |
2363		general_no_oper_flood |
2486	–	general_true_no_oper_flood |
2487	–	general_oper_pass_resv |
2364		general_oper_only_umodes |
2365		general_max_targets |
2366		general_oper_umodes |
2367		general_caller_id_wait |
2368		general_opers_bypass_callerid |
2369		general_default_floodcount |
2370	+	general_default_floodtime |
2371		general_min_nonwildcard |
2372		general_min_nonwildcard_simple |
2373		general_throttle_count |
2374		general_throttle_time |
2498	–	general_havent_read_conf |
2375		general_ping_cookie |
2376		general_disable_auth |
2377	<	general_tkline_expire_notices |
2378	<	general_gline_enable |
2379	<	general_gline_duration |
2380	<	general_gline_request_duration |
2505	<	general_gline_min_cidr |
2506	<	general_gline_min_cidr6 |
2377	>	general_dline_min_cidr |
2378	>	general_dline_min_cidr6 |
2379	>	general_kline_min_cidr |
2380	>	general_kline_min_cidr6 |
2381		general_stats_e_disabled |
2382	<	general_max_watch |
2509	<	general_services_name |
2382	>	general_max_monitor |
2383		general_cycle_on_host_change |
2384		error;
2385
2386
2387	<	general_max_watch: MAX_WATCH '=' NUMBER ';'
2515	<	{
2516	<	ConfigFileEntry.max_watch = $3;
2517	<	};
2518	<
2519	<	general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2387	>	general_away_count: AWAY_COUNT '=' NUMBER ';'
2388		{
2389	<	if (conf_parser_ctx.pass == 2)
2522	<	ConfigFileEntry.cycle_on_host_change = yylval.number;
2389	>	ConfigGeneral.away_count = $3;
2390		};
2391
2392	<	general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2392	>	general_away_time: AWAY_TIME '=' timespec ';'
2393		{
2394	<	if (conf_parser_ctx.pass == 2)
2528	<	ConfigFileEntry.glines = yylval.number;
2394	>	ConfigGeneral.away_time = $3;
2395		};
2396
2397	<	general_gline_duration: GLINE_DURATION '=' timespec ';'
2397	>	general_max_monitor: MAX_MONITOR '=' NUMBER ';'
2398		{
2399	<	if (conf_parser_ctx.pass == 2)
2534	<	ConfigFileEntry.gline_time = $3;
2399	>	ConfigGeneral.max_monitor = $3;
2400		};
2401
2402	<	general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2402	>	general_whowas_history_length: WHOWAS_HISTORY_LENGTH '=' NUMBER ';'
2403		{
2404	<	if (conf_parser_ctx.pass == 2)
2540	<	ConfigFileEntry.gline_request_time = $3;
2404	>	ConfigGeneral.whowas_history_length = $3;
2405		};
2406
2407	<	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2407	>	general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2408		{
2409	<	ConfigFileEntry.gline_min_cidr = $3;
2409	>	ConfigGeneral.cycle_on_host_change = yylval.number;
2410		};
2411
2412	<	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2412	>	general_dline_min_cidr: DLINE_MIN_CIDR '=' NUMBER ';'
2413		{
2414	<	ConfigFileEntry.gline_min_cidr6 = $3;
2414	>	ConfigGeneral.dline_min_cidr = $3;
2415		};
2416
2417	<	general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2417	>	general_dline_min_cidr6: DLINE_MIN_CIDR6 '=' NUMBER ';'
2418		{
2419	<	ConfigFileEntry.tkline_expire_notices = yylval.number;
2419	>	ConfigGeneral.dline_min_cidr6 = $3;
2420		};
2421
2422	<	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2422	>	general_kline_min_cidr: KLINE_MIN_CIDR '=' NUMBER ';'
2423		{
2424	<	ConfigFileEntry.kill_chase_time_limit = $3;
2424	>	ConfigGeneral.kline_min_cidr = $3;
2425		};
2426
2427	<	general_hide_spoof_ips: HIDE_SPOOF_IPS '=' TBOOL ';'
2427	>	general_kline_min_cidr6: KLINE_MIN_CIDR6 '=' NUMBER ';'
2428		{
2429	<	ConfigFileEntry.hide_spoof_ips = yylval.number;
2429	>	ConfigGeneral.kline_min_cidr6 = $3;
2430		};
2431
2432	<	general_ignore_bogus_ts: IGNORE_BOGUS_TS '=' TBOOL ';'
2432	>	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2433		{
2434	<	ConfigFileEntry.ignore_bogus_ts = yylval.number;
2434	>	ConfigGeneral.kill_chase_time_limit = $3;
2435		};
2436
2437		general_failed_oper_notice: FAILED_OPER_NOTICE '=' TBOOL ';'
2438		{
2439	<	ConfigFileEntry.failed_oper_notice = yylval.number;
2439	>	ConfigGeneral.failed_oper_notice = yylval.number;
2440		};
2441
2442		general_anti_nick_flood: ANTI_NICK_FLOOD '=' TBOOL ';'
2443		{
2444	<	ConfigFileEntry.anti_nick_flood = yylval.number;
2444	>	ConfigGeneral.anti_nick_flood = yylval.number;
2445		};
2446
2447		general_max_nick_time: MAX_NICK_TIME '=' timespec ';'
2448		{
2449	<	ConfigFileEntry.max_nick_time = $3;
2449	>	ConfigGeneral.max_nick_time = $3;
2450		};
2451
2452		general_max_nick_changes: MAX_NICK_CHANGES '=' NUMBER ';'
2453		{
2454	<	ConfigFileEntry.max_nick_changes = $3;
2454	>	ConfigGeneral.max_nick_changes = $3;
2455		};
2456
2457		general_max_accept: MAX_ACCEPT '=' NUMBER ';'
2458		{
2459	<	ConfigFileEntry.max_accept = $3;
2459	>	ConfigGeneral.max_accept = $3;
2460		};
2461
2462		general_anti_spam_exit_message_time: ANTI_SPAM_EXIT_MESSAGE_TIME '=' timespec ';'
2463		{
2464	<	ConfigFileEntry.anti_spam_exit_message_time = $3;
2464	>	ConfigGeneral.anti_spam_exit_message_time = $3;
2465		};
2466
2467		general_ts_warn_delta: TS_WARN_DELTA '=' timespec ';'
2468		{
2469	<	ConfigFileEntry.ts_warn_delta = $3;
2469	>	ConfigGeneral.ts_warn_delta = $3;
2470		};
2471
2472		general_ts_max_delta: TS_MAX_DELTA '=' timespec ';'
2473		{
2474	<	if (conf_parser_ctx.pass == 2)
2611	<	ConfigFileEntry.ts_max_delta = $3;
2612	<	};
2613	<
2614	<	general_havent_read_conf: HAVENT_READ_CONF '=' NUMBER ';'
2615	<	{
2616	<	if (($3 > 0) && conf_parser_ctx.pass == 1)
2617	<	{
2618	<	ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
2619	<	ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
2620	<	ilog(LOG_TYPE_IRCD, "Consider actually reading/editing the conf file, and removing this line.");
2621	<	exit(0);
2622	<	}
2474	>	ConfigGeneral.ts_max_delta = $3;
2475		};
2476
2477		general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2478		{
2479	<	ConfigFileEntry.invisible_on_connect = yylval.number;
2479	>	ConfigGeneral.invisible_on_connect = yylval.number;
2480		};
2481
2482		general_warn_no_connect_block: WARN_NO_CONNECT_BLOCK '=' TBOOL ';'
2483		{
2484	<	ConfigFileEntry.warn_no_connect_block = yylval.number;
2484	>	ConfigGeneral.warn_no_connect_block = yylval.number;
2485		};
2486
2487		general_stats_e_disabled: STATS_E_DISABLED '=' TBOOL ';'
2488		{
2489	<	ConfigFileEntry.stats_e_disabled = yylval.number;
2489	>	ConfigGeneral.stats_e_disabled = yylval.number;
2490	>	};
2491	>
2492	>	general_stats_m_oper_only: STATS_M_OPER_ONLY '=' TBOOL ';'
2493	>	{
2494	>	ConfigGeneral.stats_m_oper_only = yylval.number;
2495		};
2496
2497		general_stats_o_oper_only: STATS_O_OPER_ONLY '=' TBOOL ';'
2498		{
2499	<	ConfigFileEntry.stats_o_oper_only = yylval.number;
2499	>	ConfigGeneral.stats_o_oper_only = yylval.number;
2500		};
2501
2502		general_stats_P_oper_only: STATS_P_OPER_ONLY '=' TBOOL ';'
2503		{
2504	<	ConfigFileEntry.stats_P_oper_only = yylval.number;
2504	>	ConfigGeneral.stats_P_oper_only = yylval.number;
2505		};
2506
2507		general_stats_u_oper_only: STATS_U_OPER_ONLY '=' TBOOL ';'
2508		{
2509	<	ConfigFileEntry.stats_u_oper_only = yylval.number;
2509	>	ConfigGeneral.stats_u_oper_only = yylval.number;
2510		};
2511
2512		general_stats_k_oper_only: STATS_K_OPER_ONLY '=' TBOOL ';'
2513		{
2514	<	ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
2658	<	} | STATS_K_OPER_ONLY '=' TMASKED ';'
2659	<	{
2660	<	ConfigFileEntry.stats_k_oper_only = 1;
2514	>	ConfigGeneral.stats_k_oper_only = yylval.number;
2515		};
2516
2517		general_stats_i_oper_only: STATS_I_OPER_ONLY '=' TBOOL ';'
2518		{
2519	<	ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
2666	<	} | STATS_I_OPER_ONLY '=' TMASKED ';'
2667	<	{
2668	<	ConfigFileEntry.stats_i_oper_only = 1;
2519	>	ConfigGeneral.stats_i_oper_only = yylval.number;
2520		};
2521
2522		general_pace_wait: PACE_WAIT '=' timespec ';'
2523		{
2524	<	ConfigFileEntry.pace_wait = $3;
2524	>	ConfigGeneral.pace_wait = $3;
2525		};
2526
2527		general_caller_id_wait: CALLER_ID_WAIT '=' timespec ';'
2528		{
2529	<	ConfigFileEntry.caller_id_wait = $3;
2529	>	ConfigGeneral.caller_id_wait = $3;
2530		};
2531
2532		general_opers_bypass_callerid: OPERS_BYPASS_CALLERID '=' TBOOL ';'
2533		{
2534	<	ConfigFileEntry.opers_bypass_callerid = yylval.number;
2534	>	ConfigGeneral.opers_bypass_callerid = yylval.number;
2535		};
2536
2537		general_pace_wait_simple: PACE_WAIT_SIMPLE '=' timespec ';'
2538		{
2539	<	ConfigFileEntry.pace_wait_simple = $3;
2539	>	ConfigGeneral.pace_wait_simple = $3;
2540		};
2541
2542		general_short_motd: SHORT_MOTD '=' TBOOL ';'
2543		{
2544	<	ConfigFileEntry.short_motd = yylval.number;
2544	>	ConfigGeneral.short_motd = yylval.number;
2545		};
2546
2547		general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
2548		{
2549	<	ConfigFileEntry.no_oper_flood = yylval.number;
2699	<	};
2700	<
2701	<	general_true_no_oper_flood: TRUE_NO_OPER_FLOOD '=' TBOOL ';'
2702	<	{
2703	<	ConfigFileEntry.true_no_oper_flood = yylval.number;
2704	<	};
2705	<
2706	<	general_oper_pass_resv: OPER_PASS_RESV '=' TBOOL ';'
2707	<	{
2708	<	ConfigFileEntry.oper_pass_resv = yylval.number;
2549	>	ConfigGeneral.no_oper_flood = yylval.number;
2550		};
2551
2552		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2553		{
2554	<	ConfigFileEntry.dots_in_ident = $3;
2554	>	ConfigGeneral.dots_in_ident = $3;
2555		};
2556
2557		general_max_targets: MAX_TARGETS '=' NUMBER ';'
2558		{
2559	<	ConfigFileEntry.max_targets = $3;
2719	<	};
2720	<
2721	<	general_services_name: T_SERVICES_NAME '=' QSTRING ';'
2722	<	{
2723	<	if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2724	<	{
2725	<	MyFree(ConfigFileEntry.service_name);
2726	<	ConfigFileEntry.service_name = xstrdup(yylval.string);
2727	<	}
2559	>	ConfigGeneral.max_targets = $3;
2560		};
2561
2562		general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2563		{
2564	<	ConfigFileEntry.ping_cookie = yylval.number;
2564	>	ConfigGeneral.ping_cookie = yylval.number;
2565		};
2566
2567		general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2568		{
2569	<	ConfigFileEntry.disable_auth = yylval.number;
2569	>	ConfigGeneral.disable_auth = yylval.number;
2570		};
2571
2572		general_throttle_count: THROTTLE_COUNT '=' NUMBER ';'
2573		{
2574	<	ConfigFileEntry.throttle_count = $3;
2574	>	ConfigGeneral.throttle_count = $3;
2575		};
2576
2577		general_throttle_time: THROTTLE_TIME '=' timespec ';'
2578		{
2579	<	ConfigFileEntry.throttle_time = $3;
2579	>	ConfigGeneral.throttle_time = $3;
2580		};
2581
2582		general_oper_umodes: OPER_UMODES
2583		{
2584	<	ConfigFileEntry.oper_umodes = 0;
2585	<	} '='  umode_oitems ';' ;
2584	>	ConfigGeneral.oper_umodes = 0;
2585	>	} '=' umode_oitems ';' ;
2586
2587		umode_oitems:    umode_oitems ',' umode_oitem | umode_oitem;
2588	<	umode_oitem:     T_BOTS
2588	>	umode_oitem: BOT
2589		{
2590	<	ConfigFileEntry.oper_umodes |= UMODE_BOTS;
2590	>	ConfigGeneral.oper_umodes |= UMODE_BOT;
2591		} | T_CCONN
2592		{
2593	<	ConfigFileEntry.oper_umodes |= UMODE_CCONN;
2593	>	ConfigGeneral.oper_umodes |= UMODE_CCONN;
2594		} | T_DEAF
2595		{
2596	<	ConfigFileEntry.oper_umodes |= UMODE_DEAF;
2596	>	ConfigGeneral.oper_umodes |= UMODE_DEAF;
2597		} | T_DEBUG
2598		{
2599	<	ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
2600	<	} | T_FULL
2599	>	ConfigGeneral.oper_umodes |= UMODE_DEBUG;
2600	>	} | T_FLOOD
2601		{
2602	<	ConfigFileEntry.oper_umodes |= UMODE_FULL;
2602	>	ConfigGeneral.oper_umodes |= UMODE_FLOOD;
2603		} | HIDDEN
2604		{
2605	<	ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
2605	>	ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
2606		} | HIDE_CHANS
2607		{
2608	<	ConfigFileEntry.oper_umodes |= UMODE_HIDECHANS;
2608	>	ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
2609		} | HIDE_IDLE
2610		{
2611	<	ConfigFileEntry.oper_umodes |= UMODE_HIDEIDLE;
2611	>	ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
2612		} | T_SKILL
2613		{
2614	<	ConfigFileEntry.oper_umodes |= UMODE_SKILL;
2614	>	ConfigGeneral.oper_umodes |= UMODE_SKILL;
2615		} | T_NCHANGE
2616		{
2617	<	ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
2617	>	ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
2618		} | T_REJ
2619		{
2620	<	ConfigFileEntry.oper_umodes |= UMODE_REJ;
2789	<	} | T_UNAUTH
2790	<	{
2791	<	ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
2620	>	ConfigGeneral.oper_umodes |= UMODE_REJ;
2621		} | T_SPY
2622		{
2623	<	ConfigFileEntry.oper_umodes |= UMODE_SPY;
2623	>	ConfigGeneral.oper_umodes |= UMODE_SPY;
2624		} | T_EXTERNAL
2625		{
2626	<	ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
2626	>	ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
2627		} | T_SERVNOTICE
2628		{
2629	<	ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
2629	>	ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
2630		} | T_INVISIBLE
2631		{
2632	<	ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
2632	>	ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
2633		} | T_WALLOP
2634		{
2635	<	ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
2635	>	ConfigGeneral.oper_umodes |= UMODE_WALLOP;
2636		} | T_SOFTCALLERID
2637		{
2638	<	ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
2638	>	ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
2639		} | T_CALLERID
2640		{
2641	<	ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
2641	>	ConfigGeneral.oper_umodes |= UMODE_CALLERID;
2642		} | T_LOCOPS
2643		{
2644	<	ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
2644	>	ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
2645		} | T_NONONREG
2646		{
2647	<	ConfigFileEntry.oper_umodes |= UMODE_REGONLY;
2647	>	ConfigGeneral.oper_umodes |= UMODE_REGONLY;
2648		} | T_FARCONNECT
2649		{
2650	<	ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT;
2650	>	ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
2651	>	} | EXPIRATION
2652	>	{
2653	>	ConfigGeneral.oper_umodes |= UMODE_EXPIRATION;
2654		};
2655
2656		general_oper_only_umodes: OPER_ONLY_UMODES
2657		{
2658	<	ConfigFileEntry.oper_only_umodes = 0;
2659	<	} '='  umode_items ';' ;
2658	>	ConfigGeneral.oper_only_umodes = 0;
2659	>	} '=' umode_items ';' ;
2660
2661		umode_items:  umode_items ',' umode_item | umode_item;
2662	<	umode_item:   T_BOTS
2662	>	umode_item: BOT
2663		{
2664	<	ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
2664	>	ConfigGeneral.oper_only_umodes |= UMODE_BOT;
2665		} | T_CCONN
2666		{
2667	<	ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
2667	>	ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
2668		} | T_DEAF
2669		{
2670	<	ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
2670	>	ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
2671		} | T_DEBUG
2672		{
2673	<	ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
2674	<	} | T_FULL
2673	>	ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
2674	>	} | T_FLOOD
2675		{
2676	<	ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
2676	>	ConfigGeneral.oper_only_umodes |= UMODE_FLOOD;
2677		} | T_SKILL
2678		{
2679	<	ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
2679	>	ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
2680		} | HIDDEN
2681		{
2682	<	ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
2682	>	ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
2683		} | T_NCHANGE
2684		{
2685	<	ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
2685	>	ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
2686		} | T_REJ
2687		{
2688	<	ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
2857	<	} | T_UNAUTH
2858	<	{
2859	<	ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
2688	>	ConfigGeneral.oper_only_umodes |= UMODE_REJ;
2689		} | T_SPY
2690		{
2691	<	ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
2691	>	ConfigGeneral.oper_only_umodes |= UMODE_SPY;
2692		} | T_EXTERNAL
2693		{
2694	<	ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
2694	>	ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
2695		} | T_SERVNOTICE
2696		{
2697	<	ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
2697	>	ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
2698		} | T_INVISIBLE
2699		{
2700	<	ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
2700	>	ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
2701		} | T_WALLOP
2702		{
2703	<	ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
2703	>	ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
2704		} | T_SOFTCALLERID
2705		{
2706	<	ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
2706	>	ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
2707		} | T_CALLERID
2708		{
2709	<	ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
2709	>	ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
2710		} | T_LOCOPS
2711		{
2712	<	ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
2712	>	ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
2713		} | T_NONONREG
2714		{
2715	<	ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
2715	>	ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
2716		} | T_FARCONNECT
2717		{
2718	<	ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT;
2718	>	ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
2719	>	} | EXPIRATION
2720	>	{
2721	>	ConfigGeneral.oper_only_umodes |= UMODE_EXPIRATION;
2722		};
2723
2724		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
2725		{
2726	<	ConfigFileEntry.min_nonwildcard = $3;
2726	>	ConfigGeneral.min_nonwildcard = $3;
2727		};
2728
2729		general_min_nonwildcard_simple: MIN_NONWILDCARD_SIMPLE '=' NUMBER ';'
2730		{
2731	<	ConfigFileEntry.min_nonwildcard_simple = $3;
2731	>	ConfigGeneral.min_nonwildcard_simple = $3;
2732		};
2733
2734		general_default_floodcount: DEFAULT_FLOODCOUNT '=' NUMBER ';'
2735		{
2736	<	ConfigFileEntry.default_floodcount = $3;
2736	>	ConfigGeneral.default_floodcount = $3;
2737	>	};
2738	>
2739	>	general_default_floodtime: DEFAULT_FLOODTIME '=' timespec ';'
2740	>	{
2741	>	ConfigGeneral.default_floodtime = $3;
2742		};
2743
2744
2745		/***************************************************************************
2746	<	*  section channel
2746	>	* channel {} section
2747		***************************************************************************/
2748	<	channel_entry: CHANNEL
2912	<	'{' channel_items '}' ';';
2748	>	channel_entry: CHANNEL '{' channel_items '}' ';';
2749
2750		channel_items:      channel_items channel_item | channel_item;
2751		channel_item:       channel_max_bans |
2752	+	channel_max_bans_large |
2753		channel_invite_client_count |
2754		channel_invite_client_time |
2755	+	channel_invite_delay_channel |
2756	+	channel_invite_expire_time |
2757		channel_knock_client_count |
2758		channel_knock_client_time |
2759		channel_knock_delay_channel |
2760		channel_max_channels |
2761	<	channel_default_split_user_count |
2762	<	channel_default_split_server_count |
2763	<	channel_no_create_on_split |
2925	<	channel_no_join_on_split |
2926	<	channel_jflood_count |
2927	<	channel_jflood_time |
2761	>	channel_max_invites |
2762	>	channel_default_join_flood_count |
2763	>	channel_default_join_flood_time |
2764		channel_disable_fake_channels |
2765	+	channel_enable_extbans |
2766		error;
2767
2768	+	channel_enable_extbans: ENABLE_EXTBANS '=' TBOOL ';'
2769	+	{
2770	+	ConfigChannel.enable_extbans = yylval.number;
2771	+	};
2772	+
2773		channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
2774		{
2775		ConfigChannel.disable_fake_channels = yylval.number;
#	Line 2943 | Line 2785 | channel_invite_client_time: INVITE_CLIEN
2785		ConfigChannel.invite_client_time = $3;
2786		};
2787
2788	+	channel_invite_delay_channel: INVITE_DELAY_CHANNEL '=' timespec ';'
2789	+	{
2790	+	ConfigChannel.invite_delay_channel = $3;
2791	+	};
2792	+
2793	+	channel_invite_expire_time: INVITE_EXPIRE_TIME '=' timespec ';'
2794	+	{
2795	+	ConfigChannel.invite_expire_time = $3;
2796	+	};
2797	+
2798		channel_knock_client_count: KNOCK_CLIENT_COUNT '=' NUMBER ';'
2799		{
2800		ConfigChannel.knock_client_count = $3;
#	Line 2963 | Line 2815 | channel_max_channels: MAX_CHANNELS '=' N
2815		ConfigChannel.max_channels = $3;
2816		};
2817
2818	<	channel_max_bans: MAX_BANS '=' NUMBER ';'
2967	<	{
2968	<	ConfigChannel.max_bans = $3;
2969	<	};
2970	<
2971	<	channel_default_split_user_count: DEFAULT_SPLIT_USER_COUNT '=' NUMBER ';'
2818	>	channel_max_invites: MAX_INVITES '=' NUMBER ';'
2819		{
2820	<	ConfigChannel.default_split_user_count = $3;
2820	>	ConfigChannel.max_invites = $3;
2821		};
2822
2823	<	channel_default_split_server_count: DEFAULT_SPLIT_SERVER_COUNT '=' NUMBER ';'
2823	>	channel_max_bans: MAX_BANS '=' NUMBER ';'
2824		{
2825	<	ConfigChannel.default_split_server_count = $3;
2825	>	ConfigChannel.max_bans = $3;
2826		};
2827
2828	<	channel_no_create_on_split: NO_CREATE_ON_SPLIT '=' TBOOL ';'
2828	>	channel_max_bans_large: MAX_BANS_LARGE '=' NUMBER ';'
2829		{
2830	<	ConfigChannel.no_create_on_split = yylval.number;
2830	>	ConfigChannel.max_bans_large = $3;
2831		};
2832
2833	<	channel_no_join_on_split: NO_JOIN_ON_SPLIT '=' TBOOL ';'
2833	>	channel_default_join_flood_count: DEFAULT_JOIN_FLOOD_COUNT '=' NUMBER ';'
2834		{
2835	<	ConfigChannel.no_join_on_split = yylval.number;
2835	>	ConfigChannel.default_join_flood_count = yylval.number;
2836		};
2837
2838	<	channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
2838	>	channel_default_join_flood_time: DEFAULT_JOIN_FLOOD_TIME '=' timespec ';'
2839		{
2840	<	GlobalSetOptions.joinfloodcount = yylval.number;
2840	>	ConfigChannel.default_join_flood_time = $3;
2841		};
2842
2996	–	channel_jflood_time: JOIN_FLOOD_TIME '=' timespec ';'
2997	–	{
2998	–	GlobalSetOptions.joinfloodtime = $3;
2999	–	};
2843
2844		/***************************************************************************
2845	<	*  section serverhide
2845	>	* serverhide {} section
2846		***************************************************************************/
2847	<	serverhide_entry: SERVERHIDE
3005	<	'{' serverhide_items '}' ';';
2847	>	serverhide_entry: SERVERHIDE '{' serverhide_items '}' ';';
2848
2849		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
2850		serverhide_item:    serverhide_flatten_links |
2851	+	serverhide_flatten_links_delay |
2852	+	serverhide_flatten_links_file |
2853		serverhide_disable_remote_commands |
2854		serverhide_hide_servers |
2855		serverhide_hide_services |
3012	–	serverhide_links_delay |
2856		serverhide_hidden |
2857		serverhide_hidden_name |
2858		serverhide_hide_server_ips |
#	Line 3021 | Line 2864 | serverhide_flatten_links: FLATTEN_LINKS
2864		ConfigServerHide.flatten_links = yylval.number;
2865		};
2866
2867	+	serverhide_flatten_links_delay: FLATTEN_LINKS_DELAY '=' timespec ';'
2868	+	{
2869	+	if (conf_parser_ctx.pass == 2)
2870	+	{
2871	+	if ($3 > 0)
2872	+	{
2873	+	event_write_links_file.when = $3;
2874	+	event_add(&event_write_links_file, NULL);
2875	+	}
2876	+	else
2877	+	event_delete(&event_write_links_file);
2878	+
2879	+	ConfigServerHide.flatten_links_delay = $3;
2880	+	}
2881	+	};
2882	+
2883	+	serverhide_flatten_links_file: FLATTEN_LINKS_FILE '=' QSTRING ';'
2884	+	{
2885	+	if (conf_parser_ctx.pass == 2)
2886	+	{
2887	+	xfree(ConfigServerHide.flatten_links_file);
2888	+	ConfigServerHide.flatten_links_file = xstrdup(yylval.string);
2889	+	}
2890	+	};
2891	+
2892		serverhide_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
2893		{
2894		if (conf_parser_ctx.pass == 2)
#	Line 3043 | Line 2911 | serverhide_hidden_name: HIDDEN_NAME '='
2911		{
2912		if (conf_parser_ctx.pass == 2)
2913		{
2914	<	MyFree(ConfigServerHide.hidden_name);
2914	>	xfree(ConfigServerHide.hidden_name);
2915		ConfigServerHide.hidden_name = xstrdup(yylval.string);
2916		}
2917		};
2918
3051	–	serverhide_links_delay: LINKS_DELAY '=' timespec ';'
3052	–	{
3053	–	if (conf_parser_ctx.pass == 2)
3054	–	{
3055	–	if (($3 > 0) && ConfigServerHide.links_disabled == 1)
3056	–	{
3057	–	event_write_links_file.when = $3;
3058	–	event_addish(&event_write_links_file, NULL);
3059	–	ConfigServerHide.links_disabled = 0;
3060	–	}
3061	–
3062	–	ConfigServerHide.links_delay = $3;
3063	–	}
3064	–	};
3065	–
2919		serverhide_hidden: HIDDEN '=' TBOOL ';'
2920		{
2921		if (conf_parser_ctx.pass == 2)

Comparing ircd-hybrid/trunk/src/conf_parser.y (property svn:keywords):
Revision 4256 by michael, Fri Jul 18 20:37:01 2014 UTC vs.
Revision 9857 by michael, Fri Jan 1 04:43:22 2021 UTC

#	Line 1 | Line 1
1	<	Id Revision
1	>	Id

Diff Legend

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