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 1783 by michael, Thu Jan 24 19:26:51 2013 UTC vs.
Revision 9692 by michael, Sat Oct 31 19:05:15 2020 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf_parser.y: Parses the ircd configuration file.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2005 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 2000-2020 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
21	–	*
22	–	*  $Id$
20		*/
21
22	<	%{
22	>	/*! \file conf_parser.y
23	>	* \brief Parses the ircd configuration file.
24	>	* \version $Id$
25	>	*/
26
27	<	#define YY_NO_UNPUT
28	<	#include <sys/types.h>
29	<	#include <string.h>
27	>
28	>	%{
29
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"
39	–	#include "client.h"     /* for UMODE_ALL only */
46		#include "irc_string.h"
41	–	#include "sprintf_irc.h"
47		#include "memory.h"
48		#include "modules.h"
49	<	#include "s_serv.h"
49	>	#include "server.h"
50		#include "hostmask.h"
46	–	#include "send.h"
51		#include "listener.h"
52	<	#include "resv.h"
53	<	#include "numeric.h"
50	<	#include "s_user.h"
51	<
52	<	#ifdef HAVE_LIBCRYPTO
53	<	#include <openssl/rsa.h>
54	<	#include <openssl/bio.h>
55	<	#include <openssl/pem.h>
56	<	#include <openssl/dh.h>
57	<	#endif
58	<
59	<	#include "rsa.h"
52	>	#include "user.h"
53	>	#include "motd.h"
54
55		int yylex(void);
56
57		static struct
58		{
59	<	struct {
59	>	struct
60	>	{
61		dlink_list list;
62		} mask,
63		leaf,
64		hub;
65
66	<	struct {
66	>	struct
67	>	{
68		char buf[IRCD_BUFSIZE];
69		} name,
70	+	nick,
71		user,
72		host,
73		addr,
74		bind,
75		file,
76		ciph,
77	+	cert,
78		rpass,
79		spass,
80	<	class;
80	>	whois,
81	>	class,
82	>	target,
83	>	prepend,
84	>	command;
85
86	<	struct {
86	>	struct
87	>	{
88		unsigned int value;
89		} flags,
90		modes,
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,
98	–	max_global,
99	–	max_local,
100	–	max_ident,
103		max_sendq,
104		max_recvq,
105	+	max_channels,
106		cidr_bitlen_ipv4,
107		cidr_bitlen_ipv6,
108		number_per_cidr;
#	Line 108 | 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)
114	<	{
115	<	MyFree(ptr->data);
116	<	dlinkDelete(ptr, &block_state.mask.list);
117	<	free_dlink_node(ptr);
118	<	}
119	<
120	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
121	<	{
122	<	MyFree(ptr->data);
123	<	dlinkDelete(ptr, &block_state.leaf.list);
124	<	free_dlink_node(ptr);
125	<	}
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.hub.list.head)
118	>	for (dlink_list **list = tab; *list; ++list)
119		{
120	<	MyFree(ptr->data);
121	<	dlinkDelete(ptr, &block_state.hub.list);
122	<	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 147 | 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  BYTES KBYTES MBYTES
147		%token  CALLER_ID_WAIT
148		%token  CAN_FLOOD
149		%token  CHANNEL
150	<	%token  CIDR_BITLEN_IPV4
151	<	%token  CIDR_BITLEN_IPV6
150	>	%token  CIDR_BITLEN_IPV4
151	>	%token  CIDR_BITLEN_IPV6
152		%token  CLASS
153	+	%token  CLIENT
154	+	%token  CLOSE
155		%token  CONNECT
156		%token  CONNECTFREQ
157	+	%token  CYCLE_ON_HOST_CHANGE
158		%token  DEFAULT_FLOODCOUNT
159	<	%token  DEFAULT_SPLIT_SERVER_COUNT
160	<	%token  DEFAULT_SPLIT_USER_COUNT
159	>	%token  DEFAULT_FLOODTIME
160	>	%token  DEFAULT_JOIN_FLOOD_COUNT
161	>	%token  DEFAULT_JOIN_FLOOD_TIME
162	>	%token  DEFAULT_MAX_CLIENTS
163	>	%token  DEFER
164		%token  DENY
165		%token  DESCRIPTION
166		%token  DIE
167		%token  DISABLE_AUTH
168		%token  DISABLE_FAKE_CHANNELS
169		%token  DISABLE_REMOTE_COMMANDS
170	+	%token  DLINE_MIN_CIDR
171	+	%token  DLINE_MIN_CIDR6
172		%token  DOTS_IN_IDENT
169	–	%token  EGDPOOL_PATH
173		%token  EMAIL
174	+	%token  ENABLE_EXTBANS
175		%token  ENCRYPTED
176		%token  EXCEED_LIMIT
177		%token  EXEMPT
178	+	%token  EXPIRATION
179		%token  FAILED_OPER_NOTICE
175	–	%token  IRCD_FLAGS
180		%token  FLATTEN_LINKS
181	+	%token  FLATTEN_LINKS_DELAY
182	+	%token  FLATTEN_LINKS_FILE
183		%token  GECOS
184		%token  GENERAL
179	–	%token  GLINE
180	–	%token  GLINE_DURATION
181	–	%token  GLINE_ENABLE
182	–	%token  GLINE_EXEMPT
183	–	%token  GLINE_REQUEST_DURATION
184	–	%token  GLINE_MIN_CIDR
185	–	%token  GLINE_MIN_CIDR6
186	–	%token  GLOBAL_KILL
187	–	%token  IRCD_AUTH
188	–	%token  NEED_IDENT
189	–	%token  HAVENT_READ_CONF
185		%token  HIDDEN
186	<	%token  HIDDEN_NAME
186	>	%token  HIDDEN_NAME
187	>	%token  HIDE_CHANS
188	>	%token  HIDE_IDLE
189	>	%token  HIDE_IDLE_FROM_OPERS
190		%token  HIDE_SERVER_IPS
191		%token  HIDE_SERVERS
192	<	%token  HIDE_SPOOF_IPS
192	>	%token  HIDE_SERVICES
193		%token  HOST
194		%token  HUB
195		%token  HUB_MASK
198	–	%token  IGNORE_BOGUS_TS
196		%token  INVISIBLE_ON_CONNECT
197	+	%token  INVITE_CLIENT_COUNT
198	+	%token  INVITE_CLIENT_TIME
199	+	%token  INVITE_DELAY_CHANNEL
200	+	%token  INVITE_EXPIRE_TIME
201		%token  IP
202	+	%token  IRCD_AUTH
203	+	%token  IRCD_FLAGS
204	+	%token  IRCD_SID
205	+	%token  JOIN
206		%token  KILL
207	<	%token  KILL_CHASE_TIME_LIMIT
207	>	%token  KILL_CHASE_TIME_LIMIT
208		%token  KLINE
209		%token  KLINE_EXEMPT
210	<	%token  KNOCK_DELAY
210	>	%token  KLINE_MIN_CIDR
211	>	%token  KLINE_MIN_CIDR6
212	>	%token  KNOCK_CLIENT_COUNT
213	>	%token  KNOCK_CLIENT_TIME
214		%token  KNOCK_DELAY_CHANNEL
215		%token  LEAF_MASK
208	–	%token  LINKS_DELAY
216		%token  LISTEN
217	<	%token  T_LOG
217	>	%token  MASK
218		%token  MAX_ACCEPT
219		%token  MAX_BANS
220	<	%token  MAX_CHANS_PER_OPER
221	<	%token  MAX_CHANS_PER_USER
222	<	%token  MAX_GLOBAL
223	<	%token  MAX_IDENT
217	<	%token  MAX_LOCAL
220	>	%token  MAX_BANS_LARGE
221	>	%token  MAX_CHANNELS
222	>	%token  MAX_IDLE
223	>	%token  MAX_INVITES
224		%token  MAX_NICK_CHANGES
225		%token  MAX_NICK_LENGTH
226		%token  MAX_NICK_TIME
#	Line 222 | Line 228 | reset_block_state(void)
228		%token  MAX_TARGETS
229		%token  MAX_TOPIC_LENGTH
230		%token  MAX_WATCH
231	<	%token  MESSAGE_LOCALE
231	>	%token  MIN_IDLE
232		%token  MIN_NONWILDCARD
233		%token  MIN_NONWILDCARD_SIMPLE
228	–	%token  MIN_IDLE
229	–	%token  MAX_IDLE
230	–	%token  RANDOM_IDLE
231	–	%token  HIDE_IDLE_FROM_OPERS
234		%token  MODULE
235		%token  MODULES
236	+	%token  MOTD
237		%token  NAME
238	+	%token  NEED_IDENT
239		%token  NEED_PASSWORD
240	<	%token  NETWORK_DESC
240	>	%token  NETWORK_DESCRIPTION
241		%token  NETWORK_NAME
242		%token  NICK
239	–	%token  NICK_CHANGES
240	–	%token  NO_CREATE_ON_SPLIT
241	–	%token  NO_JOIN_ON_SPLIT
243		%token  NO_OPER_FLOOD
244		%token  NO_TILDE
245		%token  NUMBER
246		%token  NUMBER_PER_CIDR
247	<	%token  NUMBER_PER_IP
248	<	%token  OPERATOR
248	<	%token  OPERS_BYPASS_CALLERID
247	>	%token  NUMBER_PER_IP_GLOBAL
248	>	%token  NUMBER_PER_IP_LOCAL
249		%token  OPER_ONLY_UMODES
250	–	%token  OPER_PASS_RESV
251	–	%token  OPER_SPY_T
250		%token  OPER_UMODES
251	<	%token  JOIN_FLOOD_COUNT
252	<	%token  JOIN_FLOOD_TIME
251	>	%token  OPERATOR
252	>	%token  OPERS_BYPASS_CALLERID
253		%token  PACE_WAIT
254		%token  PACE_WAIT_SIMPLE
255		%token  PASSWORD
#	Line 260 | Line 258 | reset_block_state(void)
258		%token  PING_TIME
259		%token  PORT
260		%token  QSTRING
261	<	%token  QUIET_ON_BAN
261	>	%token  RANDOM_IDLE
262		%token  REASON
263		%token  REDIRPORT
264		%token  REDIRSERV
267	–	%token  REGEX_T
265		%token  REHASH
266		%token  REMOTE
267		%token  REMOTEBAN
271	–	%token  RESTRICT_CHANNELS
272	–	%token  RSA_PRIVATE_KEY_FILE
273	–	%token  RSA_PUBLIC_KEY_FILE
274	–	%token  SSL_CERTIFICATE_FILE
275	–	%token  SSL_DH_PARAM_FILE
276	–	%token  T_SSL_CLIENT_METHOD
277	–	%token  T_SSL_SERVER_METHOD
278	–	%token  T_SSLV3
279	–	%token  T_TLSV1
268		%token  RESV
269		%token  RESV_EXEMPT
270	+	%token  RSA_PRIVATE_KEY_FILE
271		%token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
283	–	%token  SENDQ
272		%token  SEND_PASSWORD
273	+	%token  SENDQ
274		%token  SERVERHIDE
275		%token  SERVERINFO
287	–	%token  IRCD_SID
288	–	%token  TKLINE_EXPIRE_NOTICES
289	–	%token  T_SHARED
290	–	%token  T_CLUSTER
291	–	%token  TYPE
276		%token  SHORT_MOTD
277		%token  SPOOF
278	<	%token  SPOOF_NOTICE
278	>	%token  SQUIT
279		%token  STATS_E_DISABLED
280		%token  STATS_I_OPER_ONLY
281		%token  STATS_K_OPER_ONLY
282	+	%token  STATS_M_OPER_ONLY
283		%token  STATS_O_OPER_ONLY
284		%token  STATS_P_OPER_ONLY
285	<	%token  TBOOL
301	<	%token  TMASKED
302	<	%token  TS_MAX_DELTA
303	<	%token  TS_WARN_DELTA
304	<	%token  TWODOTS
285	>	%token  STATS_U_OPER_ONLY
286		%token  T_ALL
287	<	%token  T_BOTS
307	<	%token  T_SOFTCALLERID
287	>	%token  T_BIND
288		%token  T_CALLERID
289		%token  T_CCONN
290	<	%token  T_CCONN_FULL
291	<	%token  T_SSL_CIPHER_LIST
290	>	%token  T_COMMAND
291	>	%token  T_CLUSTER
292		%token  T_DEAF
293		%token  T_DEBUG
294		%token  T_DLINE
295		%token  T_EXTERNAL
296	<	%token  T_FULL
296	>	%token  T_FARCONNECT
297	>	%token  T_FILE
298	>	%token  T_FLOOD
299	>	%token  T_GLOBOPS
300		%token  T_INVISIBLE
301		%token  T_IPV4
302		%token  T_IPV6
303		%token  T_LOCOPS
304	<	%token  T_MAX_CLIENTS
304	>	%token  T_LOG
305		%token  T_NCHANGE
306	<	%token  T_OPERWALL
306	>	%token  T_NONONREG
307	>	%token  T_OPME
308	>	%token  T_PREPEND
309	>	%token  T_PSEUDO
310		%token  T_RECVQ
311		%token  T_REJ
312	+	%token  T_RESTART
313		%token  T_SERVER
314	+	%token  T_SERVICE
315		%token  T_SERVNOTICE
316		%token  T_SET
317	+	%token  T_SHARED
318	+	%token  T_SIZE
319		%token  T_SKILL
320	+	%token  T_SOFTCALLERID
321		%token  T_SPY
322	<	%token  T_SSL
322	>	%token  T_TARGET
323	>	%token  T_TLS
324		%token  T_UMODES
333	–	%token  T_UNAUTH
325		%token  T_UNDLINE
326		%token  T_UNLIMITED
327		%token  T_UNRESV
328		%token  T_UNXLINE
338	–	%token  T_GLOBOPS
329		%token  T_WALLOP
330	+	%token  T_WALLOPS
331		%token  T_WEBIRC
332	<	%token  T_RESTART
333	<	%token  T_SERVICE
343	<	%token  T_SERVICES_NAME
332	>	%token  TBOOL
333	>	%token  THROTTLE_COUNT
334		%token  THROTTLE_TIME
335	<	%token  TRUE_NO_OPER_FLOOD
335	>	%token  TIMEOUT
336	>	%token  TLS_CERTIFICATE_FILE
337	>	%token  TLS_CERTIFICATE_FINGERPRINT
338	>	%token  TLS_CIPHER_LIST
339	>	%token  TLS_CIPHER_SUITES
340	>	%token  TLS_CONNECTION_REQUIRED
341	>	%token  TLS_DH_PARAM_FILE
342	>	%token  TLS_MESSAGE_DIGEST_ALGORITHM
343	>	%token  TLS_SUPPORTED_GROUPS
344	>	%token  TS_MAX_DELTA
345	>	%token  TS_WARN_DELTA
346	>	%token  TWODOTS
347	>	%token  TYPE
348		%token  UNKLINE
347	–	%token  USER
348	–	%token  USE_EGD
349		%token  USE_LOGGING
350	+	%token  USER
351		%token  VHOST
352		%token  VHOST6
353	+	%token  WARN_NO_CONNECT_BLOCK
354	+	%token  WHOIS
355	+	%token  WHOWAS_HISTORY_LENGTH
356		%token  XLINE
357	<	%token  WARN_NO_NLINE
354	<	%token  T_SIZE
355	<	%token  T_FILE
357	>	%token  XLINE_EXEMPT
358
359	<	%type <string> QSTRING
360	<	%type <number> NUMBER
361	<	%type <number> timespec
362	<	%type <number> timespec_
363	<	%type <number> sizespec
364	<	%type <number> sizespec_
359	>	%type  <string> QSTRING
360	>	%type  <number> NUMBER
361	>	%type  <number> timespec
362	>	%type  <number> timespec_
363	>	%type  <number> sizespec
364	>	%type  <number> sizespec_
365
366		%%
367	<	conf:
367	>	conf:
368		| conf conf_item
369		;
370
371		conf_item:        admin_entry
372		| logging_entry
373		| oper_entry
374	<	| channel_entry
375	<	| class_entry
374	>	| channel_entry
375	>	| class_entry
376		| listen_entry
377		| auth_entry
378		| serverinfo_entry
379	<	| serverhide_entry
379	>	| serverhide_entry
380		| resv_entry
381		| service_entry
382		| shared_entry
383	<	| cluster_entry
383	>	| cluster_entry
384		| connect_entry
385		| kill_entry
386		| deny_entry
387	<	| exempt_entry
388	<	| general_entry
387	>	| exempt_entry
388	>	| general_entry
389		| gecos_entry
390		| modules_entry
391	+	| motd_entry
392	+	| pseudo_entry
393		| error ';'
394		| error '}'
395		;
396
397
398		timespec_: { $$ = 0; } | timespec;
399	<	timespec:       NUMBER timespec_
400	<	{
401	<	$$ = $1 + $2;
402	<	}
403	<	| NUMBER SECONDS timespec_
404	<	{
405	<	$$ = $1 + $3;
406	<	}
407	<	| NUMBER MINUTES timespec_
408	<	{
409	<	$$ = $1 * 60 + $3;
410	<	}
411	<	| NUMBER HOURS timespec_
412	<	{
413	<	$$ = $1 * 60 * 60 + $3;
414	<	}
411	<	| NUMBER DAYS timespec_
412	<	{
413	<	$$ = $1 * 60 * 60 * 24 + $3;
414	<	}
415	<	| NUMBER WEEKS timespec_
416	<	{
417	<	$$ = $1 * 60 * 60 * 24 * 7 + $3;
418	<	}
419	<	| NUMBER MONTHS timespec_
420	<	{
421	<	$$ = $1 * 60 * 60 * 24 * 7 * 4 + $3;
422	<	}
423	<	| NUMBER YEARS timespec_
424	<	{
425	<	$$ = $1 * 60 * 60 * 24 * 365 + $3;
426	<	}
427	<	;
428	<
429	<	sizespec_:      { $$ = 0; } | sizespec;
430	<	sizespec:       NUMBER sizespec_ { $$ = $1 + $2; }
431	<	| NUMBER BYTES sizespec_ { $$ = $1 + $3; }
432	<	| NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; }
433	<	| NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
434	<	;
399	>	timespec:  NUMBER timespec_         { $$ = $1 + $2; } |
400	>	NUMBER SECONDS timespec_ { $$ = $1 + $3; } |
401	>	NUMBER MINUTES timespec_ { $$ = $1 * 60 + $3; } |
402	>	NUMBER HOURS timespec_   { $$ = $1 * 60 * 60 + $3; } |
403	>	NUMBER DAYS timespec_    { $$ = $1 * 60 * 60 * 24 + $3; } |
404	>	NUMBER WEEKS timespec_   { $$ = $1 * 60 * 60 * 24 * 7 + $3; } |
405	>	NUMBER MONTHS timespec_  { $$ = $1 * 60 * 60 * 24 * 7 * 4 + $3; } |
406	>	NUMBER YEARS timespec_   { $$ = $1 * 60 * 60 * 24 * 365 + $3; }
407	>	;
408	>
409	>	sizespec_:  { $$ = 0; } | sizespec;
410	>	sizespec:   NUMBER sizespec_ { $$ = $1 + $2; } |
411	>	NUMBER BYTES sizespec_ { $$ = $1 + $3; } |
412	>	NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; } |
413	>	NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
414	>	;
415
416
417		/***************************************************************************
418	<	*  section modules
418	>	* modules {} section
419		***************************************************************************/
420	<	modules_entry: MODULES
441	<	'{' modules_items '}' ';';
420	>	modules_entry: MODULES '{' modules_items '}' ';';
421
422		modules_items:  modules_items modules_item | modules_item;
423		modules_item:   modules_module | modules_path | error ';' ;
#	Line 456 | Line 435 | modules_path: PATH '=' QSTRING ';'
435		};
436
437
438	+	/***************************************************************************
439	+	* serverinfo {} section
440	+	***************************************************************************/
441		serverinfo_entry: SERVERINFO '{' serverinfo_items '}' ';';
442
443		serverinfo_items:       serverinfo_items serverinfo_item | serverinfo_item ;
444	<	serverinfo_item:        serverinfo_name | serverinfo_vhost |
445	<	serverinfo_hub | serverinfo_description |
446	<	serverinfo_network_name | serverinfo_network_desc |
447	<	serverinfo_max_clients | serverinfo_max_nick_length |
448	<	serverinfo_max_topic_length | serverinfo_ssl_dh_param_file |
449	<	serverinfo_rsa_private_key_file | serverinfo_vhost6 |
450	<	serverinfo_sid | serverinfo_ssl_certificate_file |
451	<	serverinfo_ssl_client_method | serverinfo_ssl_server_method |
452	<	serverinfo_ssl_cipher_list |
453	<	error ';' ;
454	<
455	<
456	<	serverinfo_ssl_client_method: T_SSL_CLIENT_METHOD '=' client_method_types ';' ;
457	<	serverinfo_ssl_server_method: T_SSL_SERVER_METHOD '=' server_method_types ';' ;
458	<
459	<	client_method_types: client_method_types ',' client_method_type_item | client_method_type_item;
460	<	client_method_type_item: T_SSLV3
461	<	{
462	<	#ifdef HAVE_LIBCRYPTO
463	<	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
482	<	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv3);
483	<	#endif
484	<	} | T_TLSV1
444	>	serverinfo_item:        serverinfo_name |
445	>	serverinfo_hub |
446	>	serverinfo_description |
447	>	serverinfo_network_name |
448	>	serverinfo_network_description |
449	>	serverinfo_default_max_clients |
450	>	serverinfo_max_nick_length |
451	>	serverinfo_max_topic_length |
452	>	serverinfo_tls_dh_param_file |
453	>	serverinfo_tls_supported_groups |
454	>	serverinfo_rsa_private_key_file |
455	>	serverinfo_sid |
456	>	serverinfo_tls_certificate_file |
457	>	serverinfo_tls_cipher_list |
458	>	serverinfo_tls_cipher_suites |
459	>	serverinfo_tls_message_digest_algorithm |
460	>	error ';' ;
461	>
462	>
463	>	serverinfo_tls_certificate_file: TLS_CERTIFICATE_FILE '=' QSTRING ';'
464		{
465	<	#ifdef HAVE_LIBCRYPTO
466	<	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
467	<	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_TLSv1);
468	<	#endif
465	>	if (conf_parser_ctx.pass == 2)
466	>	{
467	>	xfree(ConfigServerInfo.tls_certificate_file);
468	>	ConfigServerInfo.tls_certificate_file = xstrdup(yylval.string);
469	>	}
470		};
471
472	<	server_method_types: server_method_types ',' server_method_type_item | server_method_type_item;
493	<	server_method_type_item: T_SSLV3
494	<	{
495	<	#ifdef HAVE_LIBCRYPTO
496	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
497	<	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
498	<	#endif
499	<	} | T_TLSV1
472	>	serverinfo_rsa_private_key_file: RSA_PRIVATE_KEY_FILE '=' QSTRING ';'
473		{
474	<	#ifdef HAVE_LIBCRYPTO
475	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
476	<	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
477	<	#endif
474	>	if (conf_parser_ctx.pass == 2)
475	>	{
476	>	xfree(ConfigServerInfo.rsa_private_key_file);
477	>	ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
478	>	}
479		};
480
481	<	serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
481	>	serverinfo_tls_dh_param_file: TLS_DH_PARAM_FILE '=' QSTRING ';'
482		{
483	<	#ifdef HAVE_LIBCRYPTO
510	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
483	>	if (conf_parser_ctx.pass == 2)
484		{
485	<	if (!ServerInfo.rsa_private_key_file)
486	<	{
514	<	conf_error_report("No rsa_private_key_file specified, SSL disabled");
515	<	break;
516	<	}
517	<
518	<	if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
519	<	SSL_FILETYPE_PEM) <= 0 ||
520	<	SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
521	<	SSL_FILETYPE_PEM) <= 0)
522	<	{
523	<	report_crypto_errors();
524	<	conf_error_report("Could not open/read certificate file");
525	<	break;
526	<	}
527	<
528	<	if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
529	<	SSL_FILETYPE_PEM) <= 0 ||
530	<	SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
531	<	SSL_FILETYPE_PEM) <= 0)
532	<	{
533	<	report_crypto_errors();
534	<	conf_error_report("Could not read RSA private key");
535	<	break;
536	<	}
537	<
538	<	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
539	<	!SSL_CTX_check_private_key(ServerInfo.client_ctx))
540	<	{
541	<	report_crypto_errors();
542	<	conf_error_report("Could not read RSA private key");
543	<	break;
544	<	}
485	>	xfree(ConfigServerInfo.tls_dh_param_file);
486	>	ConfigServerInfo.tls_dh_param_file = xstrdup(yylval.string);
487		}
546	–	#endif
488		};
489
490	<	serverinfo_rsa_private_key_file: RSA_PRIVATE_KEY_FILE '=' QSTRING ';'
490	>	serverinfo_tls_cipher_list: TLS_CIPHER_LIST '=' QSTRING ';'
491		{
492	<	#ifdef HAVE_LIBCRYPTO
552	<	if (conf_parser_ctx.pass == 1)
492	>	if (conf_parser_ctx.pass == 2)
493		{
494	<	BIO *file;
495	<
556	<	if (ServerInfo.rsa_private_key)
557	<	{
558	<	RSA_free(ServerInfo.rsa_private_key);
559	<	ServerInfo.rsa_private_key = NULL;
560	<	}
561	<
562	<	if (ServerInfo.rsa_private_key_file)
563	<	{
564	<	MyFree(ServerInfo.rsa_private_key_file);
565	<	ServerInfo.rsa_private_key_file = NULL;
566	<	}
567	<
568	<	ServerInfo.rsa_private_key_file = xstrdup(yylval.string);
569	<
570	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
571	<	{
572	<	conf_error_report("File open failed, ignoring");
573	<	break;
574	<	}
575	<
576	<	ServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
577	<
578	<	BIO_set_close(file, BIO_CLOSE);
579	<	BIO_free(file);
580	<
581	<	if (ServerInfo.rsa_private_key == NULL)
582	<	{
583	<	conf_error_report("Couldn't extract key, ignoring");
584	<	break;
585	<	}
586	<
587	<	if (!RSA_check_key(ServerInfo.rsa_private_key))
588	<	{
589	<	RSA_free(ServerInfo.rsa_private_key);
590	<	ServerInfo.rsa_private_key = NULL;
591	<
592	<	conf_error_report("Invalid key, ignoring");
593	<	break;
594	<	}
595	<
596	<	/* require 2048 bit (256 byte) key */
597	<	if (RSA_size(ServerInfo.rsa_private_key) != 256)
598	<	{
599	<	RSA_free(ServerInfo.rsa_private_key);
600	<	ServerInfo.rsa_private_key = NULL;
601	<
602	<	conf_error_report("Not a 2048 bit key, ignoring");
603	<	}
494	>	xfree(ConfigServerInfo.tls_cipher_list);
495	>	ConfigServerInfo.tls_cipher_list = xstrdup(yylval.string);
496		}
605	–	#endif
497		};
498
499	<	serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
499	>	serverinfo_tls_cipher_suites: TLS_CIPHER_SUITES '=' QSTRING ';'
500		{
501	<	/* TBD - XXX: error reporting */
611	<	#ifdef HAVE_LIBCRYPTO
612	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
501	>	if (conf_parser_ctx.pass == 2)
502		{
503	<	BIO *file = BIO_new_file(yylval.string, "r");
504	<
616	<	if (file)
617	<	{
618	<	DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
619	<
620	<	BIO_free(file);
621	<
622	<	if (dh)
623	<	{
624	<	if (DH_size(dh) < 128)
625	<	conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
626	<	else
627	<	SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
628	<
629	<	DH_free(dh);
630	<	}
631	<	}
503	>	xfree(ConfigServerInfo.tls_cipher_suites);
504	>	ConfigServerInfo.tls_cipher_suites = xstrdup(yylval.string);
505		}
633	–	#endif
506		};
507
508	<	serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
508	>	serverinfo_tls_message_digest_algorithm: TLS_MESSAGE_DIGEST_ALGORITHM '=' QSTRING ';'
509		{
510	<	#ifdef HAVE_LIBCRYPTO
511	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
512	<	SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
513	<	#endif
510	>	if (conf_parser_ctx.pass == 2)
511	>	{
512	>	xfree(ConfigServerInfo.tls_message_digest_algorithm);
513	>	ConfigServerInfo.tls_message_digest_algorithm = xstrdup(yylval.string);
514	>	}
515	>	}
516	>
517	>	serverinfo_tls_supported_groups: TLS_SUPPORTED_GROUPS '=' QSTRING ';'
518	>	{
519	>	if (conf_parser_ctx.pass == 2)
520	>	{
521	>	xfree(ConfigServerInfo.tls_supported_groups);
522	>	ConfigServerInfo.tls_supported_groups = xstrdup(yylval.string);
523	>	}
524		};
525
526	<	serverinfo_name: NAME '=' QSTRING ';'
526	>	serverinfo_name: NAME '=' QSTRING ';'
527		{
528	<	/* this isn't rehashable */
529	<	if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
528	>	/* This isn't rehashable */
529	>	if (conf_parser_ctx.pass == 2 && ConfigServerInfo.name == NULL)
530		{
531	<	if (valid_servname(yylval.string))
532	<	ServerInfo.name = xstrdup(yylval.string);
531	>	if (server_valid_name(yylval.string) == true)
532	>	ConfigServerInfo.name = xstrdup(yylval.string);
533		else
534		{
535		conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
536	<	exit(0);
536	>	exit(EXIT_FAILURE);
537		}
538		}
539		};
540
541	<	serverinfo_sid: IRCD_SID '=' QSTRING ';'
541	>	serverinfo_sid: IRCD_SID '=' QSTRING ';'
542		{
543	<	/* this isn't rehashable */
544	<	if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
543	>	/* This isn't rehashable */
544	>	if (conf_parser_ctx.pass == 2 && ConfigServerInfo.sid == NULL)
545		{
546		if (valid_sid(yylval.string))
547	<	ServerInfo.sid = xstrdup(yylval.string);
547	>	ConfigServerInfo.sid = xstrdup(yylval.string);
548		else
549		{
550		conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
551	<	exit(0);
551	>	exit(EXIT_FAILURE);
552		}
553		}
554		};
#	Line 675 | Line 557 | serverinfo_description: DESCRIPTION '='
557		{
558		if (conf_parser_ctx.pass == 2)
559		{
560	<	MyFree(ServerInfo.description);
561	<	ServerInfo.description = xstrdup(yylval.string);
560	>	xfree(ConfigServerInfo.description);
561	>	ConfigServerInfo.description = xstrdup(yylval.string);
562	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
563		}
564		};
565
#	Line 684 | Line 567 | serverinfo_network_name: NETWORK_NAME '=
567		{
568		if (conf_parser_ctx.pass == 2)
569		{
570	<	char *p;
688	<
689	<	if ((p = strchr(yylval.string, ' ')) != NULL)
690	<	p = '\0';
691	<
692	<	MyFree(ServerInfo.network_name);
693	<	ServerInfo.network_name = xstrdup(yylval.string);
694	<	}
695	<	};
696	<
697	<	serverinfo_network_desc: NETWORK_DESC '=' QSTRING ';'
698	<	{
699	<	if (conf_parser_ctx.pass == 2)
700	<	{
701	<	MyFree(ServerInfo.network_desc);
702	<	ServerInfo.network_desc = xstrdup(yylval.string);
703	<	}
704	<	};
705	<
706	<	serverinfo_vhost: VHOST '=' QSTRING ';'
707	<	{
708	<	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
709	<	{
710	<	struct addrinfo hints, *res;
711	<
712	<	memset(&hints, 0, sizeof(hints));
713	<
714	<	hints.ai_family   = AF_UNSPEC;
715	<	hints.ai_socktype = SOCK_STREAM;
716	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
570	>	char *p = strchr(yylval.string, ' ');
571
572	<	if (getaddrinfo(yylval.string, NULL, &hints, &res))
573	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
720	<	else
721	<	{
722	<	assert(res != NULL);
572	>	if (p)
573	>	*p = '\0';
574
575	<	memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
576	<	ServerInfo.ip.ss.ss_family = res->ai_family;
726	<	ServerInfo.ip.ss_len = res->ai_addrlen;
727	<	freeaddrinfo(res);
728	<
729	<	ServerInfo.specific_ipv4_vhost = 1;
730	<	}
575	>	xfree(ConfigServerInfo.network_name);
576	>	ConfigServerInfo.network_name = xstrdup(yylval.string);
577		}
578		};
579
580	<	serverinfo_vhost6: VHOST6 '=' QSTRING ';'
580	>	serverinfo_network_description: NETWORK_DESCRIPTION '=' QSTRING ';'
581		{
582	<	#ifdef IPV6
583	<	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
738	<	{
739	<	struct addrinfo hints, *res;
740	<
741	<	memset(&hints, 0, sizeof(hints));
742	<
743	<	hints.ai_family   = AF_UNSPEC;
744	<	hints.ai_socktype = SOCK_STREAM;
745	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
746	<
747	<	if (getaddrinfo(yylval.string, NULL, &hints, &res))
748	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
749	<	else
750	<	{
751	<	assert(res != NULL);
752	<
753	<	memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
754	<	ServerInfo.ip6.ss.ss_family = res->ai_family;
755	<	ServerInfo.ip6.ss_len = res->ai_addrlen;
756	<	freeaddrinfo(res);
582	>	if (conf_parser_ctx.pass != 2)
583	>	break;
584
585	<	ServerInfo.specific_ipv6_vhost = 1;
586	<	}
760	<	}
761	<	#endif
585	>	xfree(ConfigServerInfo.network_description);
586	>	ConfigServerInfo.network_description = xstrdup(yylval.string);
587		};
588
589	<	serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
589	>	serverinfo_default_max_clients: DEFAULT_MAX_CLIENTS '=' NUMBER ';'
590		{
591		if (conf_parser_ctx.pass != 2)
592		break;
593
594	<	if ($3 < MAXCLIENTS_MIN)
594	>	if ($3 < 1)
595		{
596	<	char buf[IRCD_BUFSIZE];
597	<
773	<	snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
774	<	conf_error_report(buf);
775	<	ServerInfo.max_clients = MAXCLIENTS_MIN;
596	>	conf_error_report("default_max_clients too low, setting to 1");
597	>	ConfigServerInfo.default_max_clients = 1;
598		}
599		else if ($3 > MAXCLIENTS_MAX)
600		{
601		char buf[IRCD_BUFSIZE];
602
603	<	snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
603	>	snprintf(buf, sizeof(buf), "default_max_clients too high, setting to %d", MAXCLIENTS_MAX);
604		conf_error_report(buf);
605	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
605	>
606	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
607		}
608		else
609	<	ServerInfo.max_clients = $3;
609	>	ConfigServerInfo.default_max_clients = $3;
610		};
611
612		serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
#	Line 794 | Line 617 | serverinfo_max_nick_length: MAX_NICK_LEN
617		if ($3 < 9)
618		{
619		conf_error_report("max_nick_length too low, setting to 9");
620	<	ServerInfo.max_nick_length = 9;
620	>	ConfigServerInfo.max_nick_length = 9;
621		}
622		else if ($3 > NICKLEN)
623		{
#	Line 802 | Line 625 | serverinfo_max_nick_length: MAX_NICK_LEN
625
626		snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
627		conf_error_report(buf);
628	<	ServerInfo.max_nick_length = NICKLEN;
628	>
629	>	ConfigServerInfo.max_nick_length = NICKLEN;
630		}
631		else
632	<	ServerInfo.max_nick_length = $3;
632	>	ConfigServerInfo.max_nick_length = $3;
633		};
634
635		serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
#	Line 816 | Line 640 | serverinfo_max_topic_length: MAX_TOPIC_L
640		if ($3 < 80)
641		{
642		conf_error_report("max_topic_length too low, setting to 80");
643	<	ServerInfo.max_topic_length = 80;
643	>	ConfigServerInfo.max_topic_length = 80;
644		}
645		else if ($3 > TOPICLEN)
646		{
#	Line 824 | Line 648 | serverinfo_max_topic_length: MAX_TOPIC_L
648
649		snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
650		conf_error_report(buf);
651	<	ServerInfo.max_topic_length = TOPICLEN;
651	>
652	>	ConfigServerInfo.max_topic_length = TOPICLEN;
653		}
654		else
655	<	ServerInfo.max_topic_length = $3;
655	>	ConfigServerInfo.max_topic_length = $3;
656		};
657
658	<	serverinfo_hub: HUB '=' TBOOL ';'
658	>	serverinfo_hub: HUB '=' TBOOL ';'
659		{
660		if (conf_parser_ctx.pass == 2)
661	<	ServerInfo.hub = yylval.number;
661	>	ConfigServerInfo.hub = yylval.number;
662		};
663
664	+
665		/***************************************************************************
666	<	* admin section
666	>	* admin {} section
667		***************************************************************************/
668	<	admin_entry: ADMIN  '{' admin_items '}' ';' ;
668	>	admin_entry: ADMIN '{' admin_items '}' ';' ;
669
670		admin_items: admin_items admin_item | admin_item;
671	<	admin_item:  admin_name | admin_description |
672	<	admin_email | error ';' ;
671	>	admin_item:  admin_name |
672	>	admin_description |
673	>	admin_email |
674	>	error ';' ;
675
676	<	admin_name: NAME '=' QSTRING ';'
676	>	admin_name: NAME '=' QSTRING ';'
677		{
678	<	if (conf_parser_ctx.pass == 2)
679	<	{
680	<	MyFree(AdminInfo.name);
681	<	AdminInfo.name = xstrdup(yylval.string);
682	<	}
678	>	if (conf_parser_ctx.pass != 2)
679	>	break;
680	>
681	>	xfree(ConfigAdminInfo.name);
682	>	ConfigAdminInfo.name = xstrdup(yylval.string);
683		};
684
685		admin_email: EMAIL '=' QSTRING ';'
686		{
687	<	if (conf_parser_ctx.pass == 2)
688	<	{
689	<	MyFree(AdminInfo.email);
690	<	AdminInfo.email = xstrdup(yylval.string);
691	<	}
687	>	if (conf_parser_ctx.pass != 2)
688	>	break;
689	>
690	>	xfree(ConfigAdminInfo.email);
691	>	ConfigAdminInfo.email = xstrdup(yylval.string);
692		};
693
694		admin_description: DESCRIPTION '=' QSTRING ';'
695		{
696	+	if (conf_parser_ctx.pass != 2)
697	+	break;
698	+
699	+	xfree(ConfigAdminInfo.description);
700	+	ConfigAdminInfo.description = xstrdup(yylval.string);
701	+	};
702	+
703	+
704	+	/***************************************************************************
705	+	* motd {} section
706	+	***************************************************************************/
707	+	motd_entry: MOTD
708	+	{
709	+	if (conf_parser_ctx.pass == 2)
710	+	reset_block_state();
711	+	} '{' motd_items '}' ';'
712	+	{
713	+	dlink_node *node;
714	+
715	+	if (conf_parser_ctx.pass != 2)
716	+	break;
717	+
718	+	if (!block_state.file.buf[0])
719	+	break;
720	+
721	+	DLINK_FOREACH(node, block_state.mask.list.head)
722	+	motd_add(node->data, block_state.file.buf);
723	+	};
724	+
725	+	motd_items: motd_items motd_item | motd_item;
726	+	motd_item:  motd_mask | motd_file | error ';' ;
727	+
728	+	motd_mask: MASK '=' QSTRING ';'
729	+	{
730	+	if (conf_parser_ctx.pass == 2)
731	+	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
732	+	};
733	+
734	+	motd_file: T_FILE '=' QSTRING ';'
735	+	{
736	+	if (conf_parser_ctx.pass == 2)
737	+	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
738	+	};
739	+
740	+
741	+	/***************************************************************************
742	+	* pseudo {} section
743	+	***************************************************************************/
744	+	pseudo_entry: T_PSEUDO
745	+	{
746	+	if (conf_parser_ctx.pass == 2)
747	+	reset_block_state();
748	+	} '{' pseudo_items '}' ';'
749	+	{
750	+	if (conf_parser_ctx.pass != 2)
751	+	break;
752	+
753	+	if (!block_state.command.buf[0] ||
754	+	!block_state.name.buf[0] ||
755	+	!block_state.nick.buf[0] ||
756	+	!block_state.host.buf[0])
757	+	break;
758	+
759	+	pseudo_register(block_state.name.buf, block_state.nick.buf, block_state.host.buf,
760	+	block_state.prepend.buf, block_state.command.buf);
761	+	};
762	+
763	+	pseudo_items: pseudo_items pseudo_item | pseudo_item;
764	+	pseudo_item:  pseudo_command | pseudo_prepend | pseudo_name | pseudo_target | error ';' ;
765	+
766	+	pseudo_command: T_COMMAND '=' QSTRING ';'
767	+	{
768	+	if (conf_parser_ctx.pass == 2)
769	+	strlcpy(block_state.command.buf, yylval.string, sizeof(block_state.command.buf));
770	+	};
771	+
772	+	pseudo_name: NAME '=' QSTRING ';'
773	+	{
774	+	if (conf_parser_ctx.pass == 2)
775	+	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
776	+	};
777	+
778	+	pseudo_prepend: T_PREPEND '=' QSTRING ';'
779	+	{
780	+	if (conf_parser_ctx.pass == 2)
781	+	strlcpy(block_state.prepend.buf, yylval.string, sizeof(block_state.prepend.buf));
782	+	};
783	+
784	+	pseudo_target: T_TARGET '=' QSTRING ';'
785	+	{
786		if (conf_parser_ctx.pass == 2)
787		{
788	<	MyFree(AdminInfo.description);
789	<	AdminInfo.description = xstrdup(yylval.string);
788	>	struct split_nuh_item nuh;
789	>
790	>	nuh.nuhmask  = yylval.string;
791	>	nuh.nickptr  = NULL;
792	>	nuh.userptr  = block_state.nick.buf;
793	>	nuh.hostptr  = block_state.host.buf;
794	>	nuh.nicksize = 0;
795	>	nuh.usersize = sizeof(block_state.nick.buf);
796	>	nuh.hostsize = sizeof(block_state.host.buf);
797	>
798	>	split_nuh(&nuh);
799		}
800		};
801
802	+
803		/***************************************************************************
804	<	*  section logging
804	>	* log {} section
805		***************************************************************************/
806	<	logging_entry:          T_LOG  '{' logging_items '}' ';' ;
806	>	logging_entry:          T_LOG '{' logging_items '}' ';' ;
807		logging_items:          logging_items logging_item | logging_item ;
808
809	<	logging_item:           logging_use_logging | logging_file_entry |
810	<	error ';' ;
809	>	logging_item:           logging_use_logging | logging_file_entry |
810	>	error ';' ;
811
812		logging_use_logging: USE_LOGGING '=' TBOOL ';'
813		{
814		if (conf_parser_ctx.pass == 2)
815	<	ConfigLoggingEntry.use_logging = yylval.number;
815	>	ConfigLog.use_logging = yylval.number;
816		};
817
818		logging_file_entry:
#	Line 897 | Line 825 | logging_file_entry:
825		break;
826
827		if (block_state.type.value && block_state.file.buf[0])
828	<	log_add_file(block_state.type.value, block_state.size.value,
828	>	log_set_file(block_state.type.value, block_state.size.value,
829		block_state.file.buf);
830		};
831
#	Line 927 | Line 855 | logging_file_type: TYPE
855		{
856		if (conf_parser_ctx.pass == 2)
857		block_state.type.value = 0;
858	<	} '='  logging_file_type_items ';' ;
858	>	} '=' logging_file_type_items ';' ;
859
860		logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
861		logging_file_type_item:  USER
#	Line 938 | Line 866 | logging_file_type_item:  USER
866		{
867		if (conf_parser_ctx.pass == 2)
868		block_state.type.value = LOG_TYPE_OPER;
869	<	} | GLINE
869	>	} | XLINE
870		{
871		if (conf_parser_ctx.pass == 2)
872	<	block_state.type.value = LOG_TYPE_GLINE;
872	>	block_state.type.value = LOG_TYPE_XLINE;
873	>	} | RESV
874	>	{
875	>	if (conf_parser_ctx.pass == 2)
876	>	block_state.type.value = LOG_TYPE_RESV;
877		} | T_DLINE
878		{
879		if (conf_parser_ctx.pass == 2)
#	Line 962 | Line 894 | logging_file_type_item:  USER
894
895
896		/***************************************************************************
897	<	* section oper
897	>	* operator {} section
898		***************************************************************************/
899	<	oper_entry: OPERATOR
899	>	oper_entry: OPERATOR
900		{
901		if (conf_parser_ctx.pass != 2)
902		break;
#	Line 973 | Line 905 | oper_entry: OPERATOR
905		block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
906		} '{' oper_items '}' ';'
907		{
908	<	dlink_node *ptr = NULL;
908	>	dlink_node *node;
909
910		if (conf_parser_ctx.pass != 2)
911		break;
912
913		if (!block_state.name.buf[0])
914		break;
915	<	#ifdef HAVE_LIBCRYPTO
984	<	if (!(block_state.file.buf[0] ||
985	<	block_state.rpass.buf[0]))
986	<	break;
987	<	#else
915	>
916		if (!block_state.rpass.buf[0])
917		break;
990	–	#endif
918
919	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
919	>	DLINK_FOREACH(node, block_state.mask.list.head)
920		{
994	–	struct MaskItem *conf = NULL;
921		struct split_nuh_item nuh;
922	+	char *s = node->data;
923	+
924	+	if (EmptyString(s))
925	+	continue;
926
927	<	nuh.nuhmask  = ptr->data;
927	>	nuh.nuhmask  = s;
928		nuh.nickptr  = NULL;
929		nuh.userptr  = block_state.user.buf;
930		nuh.hostptr  = block_state.host.buf;
931	+
932		nuh.nicksize = 0;
933		nuh.usersize = sizeof(block_state.user.buf);
934		nuh.hostsize = sizeof(block_state.host.buf);
935	+
936		split_nuh(&nuh);
937
938	<	conf        = conf_make(CONF_OPER);
939	<	conf->name  = xstrdup(block_state.name.buf);
940	<	conf->user  = xstrdup(block_state.user.buf);
941	<	conf->host  = xstrdup(block_state.host.buf);
938	>	struct MaskItem *conf = conf_make(CONF_OPER);
939	>	conf->addr = xcalloc(sizeof(*conf->addr));
940	>	conf->name = xstrdup(block_state.name.buf);
941	>	conf->user = xstrdup(block_state.user.buf);
942	>	conf->host = xstrdup(block_state.host.buf);
943	>
944	>	if (block_state.cert.buf[0])
945	>	conf->certfp = xstrdup(block_state.cert.buf);
946
947		if (block_state.rpass.buf[0])
948		conf->passwd = xstrdup(block_state.rpass.buf);
949
950	+	if (block_state.whois.buf[0])
951	+	conf->whois = xstrdup(block_state.whois.buf);
952	+
953		conf->flags = block_state.flags.value;
954		conf->modes = block_state.modes.value;
955		conf->port  = block_state.port.value;
956	<	conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
956	>	conf->htype = parse_netmask(conf->host, conf->addr, &conf->bits);
957
958		conf_add_class_to_conf(conf, block_state.class.buf);
1020	–
1021	–	#ifdef HAVE_LIBCRYPTO
1022	–	if (block_state.file.buf[0])
1023	–	{
1024	–	BIO *file = NULL;
1025	–	RSA *pkey = NULL;
1026	–
1027	–	if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
1028	–	{
1029	–	conf_error_report("Ignoring rsa_public_key_file -- file doesn't exist");
1030	–	break;
1031	–	}
1032	–
1033	–	if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
1034	–	conf_error_report("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1035	–
1036	–	conf->rsa_public_key = pkey;
1037	–	BIO_set_close(file, BIO_CLOSE);
1038	–	BIO_free(file);
1039	–	}
1040	–	#endif /* HAVE_LIBCRYPTO */
959		}
960		};
961
962		oper_items:     oper_items oper_item | oper_item;
963	<	oper_item:      oper_name | oper_user | oper_password |
964	<	oper_umodes | oper_class | oper_encrypted |
965	<	oper_rsa_public_key_file | oper_flags | error ';' ;
963	>	oper_item:      oper_name |
964	>	oper_user |
965	>	oper_password |
966	>	oper_whois |
967	>	oper_umodes |
968	>	oper_class |
969	>	oper_encrypted |
970	>	oper_tls_certificate_fingerprint |
971	>	oper_tls_connection_required |
972	>	oper_flags |
973	>	error ';' ;
974
975		oper_name: NAME '=' QSTRING ';'
976		{
#	Line 1064 | Line 990 | oper_password: PASSWORD '=' QSTRING ';'
990		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
991		};
992
993	<	oper_encrypted: ENCRYPTED '=' TBOOL ';'
993	>	oper_whois: WHOIS '=' QSTRING ';'
994		{
995		if (conf_parser_ctx.pass == 2)
996	<	{
997	<	if (yylval.number)
998	<	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
999	<	else
1000	<	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1001	<	}
996	>	strlcpy(block_state.whois.buf, yylval.string, sizeof(block_state.whois.buf));
997	>	};
998	>
999	>	oper_encrypted: ENCRYPTED '=' TBOOL ';'
1000	>	{
1001	>	if (conf_parser_ctx.pass != 2)
1002	>	break;
1003	>
1004	>	if (yylval.number)
1005	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1006	>	else
1007	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1008		};
1009
1010	<	oper_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
1010	>	oper_tls_certificate_fingerprint: TLS_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
1011		{
1012		if (conf_parser_ctx.pass == 2)
1013	<	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
1013	>	strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
1014	>	};
1015	>
1016	>	oper_tls_connection_required: TLS_CONNECTION_REQUIRED '=' TBOOL ';'
1017	>	{
1018	>	if (conf_parser_ctx.pass != 2)
1019	>	break;
1020	>
1021	>	if (yylval.number)
1022	>	block_state.flags.value |= CONF_FLAGS_TLS;
1023	>	else
1024	>	block_state.flags.value &= ~CONF_FLAGS_TLS;
1025		};
1026
1027		oper_class: CLASS '=' QSTRING ';'
#	Line 1091 | Line 1034 | oper_umodes: T_UMODES
1034		{
1035		if (conf_parser_ctx.pass == 2)
1036		block_state.modes.value = 0;
1037	<	} '='  oper_umodes_items ';' ;
1037	>	} '=' oper_umodes_items ';' ;
1038
1039		oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1040	<	oper_umodes_item:  T_BOTS
1098	<	{
1099	<	if (conf_parser_ctx.pass == 2)
1100	<	block_state.modes.value |= UMODE_BOTS;
1101	<	} | T_CCONN
1040	>	oper_umodes_item:  T_CCONN
1041		{
1042		if (conf_parser_ctx.pass == 2)
1043		block_state.modes.value |= UMODE_CCONN;
1105	–	} | T_CCONN_FULL
1106	–	{
1107	–	if (conf_parser_ctx.pass == 2)
1108	–	block_state.modes.value |= UMODE_CCONN_FULL;
1044		} | T_DEAF
1045		{
1046		if (conf_parser_ctx.pass == 2)
#	Line 1114 | Line 1049 | oper_umodes_item:  T_BOTS
1049		{
1050		if (conf_parser_ctx.pass == 2)
1051		block_state.modes.value |= UMODE_DEBUG;
1052	<	} | T_FULL
1052	>	} | T_FLOOD
1053		{
1054		if (conf_parser_ctx.pass == 2)
1055	<	block_state.modes.value |= UMODE_FULL;
1055	>	block_state.modes.value |= UMODE_FLOOD;
1056		} | HIDDEN
1057		{
1058		if (conf_parser_ctx.pass == 2)
1059		block_state.modes.value |= UMODE_HIDDEN;
1060	+	} | HIDE_CHANS
1061	+	{
1062	+	if (conf_parser_ctx.pass == 2)
1063	+	block_state.modes.value |= UMODE_HIDECHANS;
1064	+	} | HIDE_IDLE
1065	+	{
1066	+	if (conf_parser_ctx.pass == 2)
1067	+	block_state.modes.value |= UMODE_HIDEIDLE;
1068		} | T_SKILL
1069		{
1070		if (conf_parser_ctx.pass == 2)
#	Line 1134 | Line 1077 | oper_umodes_item:  T_BOTS
1077		{
1078		if (conf_parser_ctx.pass == 2)
1079		block_state.modes.value |= UMODE_REJ;
1137	–	} | T_UNAUTH
1138	–	{
1139	–	if (conf_parser_ctx.pass == 2)
1140	–	block_state.modes.value |= UMODE_UNAUTH;
1080		} | T_SPY
1081		{
1082		if (conf_parser_ctx.pass == 2)
#	Line 1146 | Line 1085 | oper_umodes_item:  T_BOTS
1085		{
1086		if (conf_parser_ctx.pass == 2)
1087		block_state.modes.value |= UMODE_EXTERNAL;
1149	–	} | T_OPERWALL
1150	–	{
1151	–	if (conf_parser_ctx.pass == 2)
1152	–	block_state.modes.value |= UMODE_OPERWALL;
1088		} | T_SERVNOTICE
1089		{
1090		if (conf_parser_ctx.pass == 2)
#	Line 1174 | Line 1109 | oper_umodes_item:  T_BOTS
1109		{
1110		if (conf_parser_ctx.pass == 2)
1111		block_state.modes.value |= UMODE_LOCOPS;
1112	+	} | T_NONONREG
1113	+	{
1114	+	if (conf_parser_ctx.pass == 2)
1115	+	block_state.modes.value |= UMODE_REGONLY;
1116	+	} | T_FARCONNECT
1117	+	{
1118	+	if (conf_parser_ctx.pass == 2)
1119	+	block_state.modes.value |= UMODE_FARCONNECT;
1120	+	} | EXPIRATION
1121	+	{
1122	+	if (conf_parser_ctx.pass == 2)
1123	+	block_state.modes.value |= UMODE_EXPIRATION;
1124		};
1125
1126		oper_flags: IRCD_FLAGS
1127		{
1128		if (conf_parser_ctx.pass == 2)
1129		block_state.port.value = 0;
1130	<	} '='  oper_flags_items ';';
1130	>	} '=' oper_flags_items ';';
1131
1132		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1133	<	oper_flags_item: GLOBAL_KILL
1133	>	oper_flags_item: KILL ':' REMOTE
1134	>	{
1135	>	if (conf_parser_ctx.pass == 2)
1136	>	block_state.port.value |= OPER_FLAG_KILL_REMOTE;
1137	>	} | KILL
1138	>	{
1139	>	if (conf_parser_ctx.pass == 2)
1140	>	block_state.port.value |= OPER_FLAG_KILL;
1141	>	} | CONNECT ':' REMOTE
1142	>	{
1143	>	if (conf_parser_ctx.pass == 2)
1144	>	block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
1145	>	} | CONNECT
1146		{
1147		if (conf_parser_ctx.pass == 2)
1148	<	block_state.port.value |= OPER_FLAG_GLOBAL_KILL;
1149	<	} | REMOTE
1148	>	block_state.port.value |= OPER_FLAG_CONNECT;
1149	>	} | SQUIT ':' REMOTE
1150		{
1151		if (conf_parser_ctx.pass == 2)
1152	<	block_state.port.value |= OPER_FLAG_REMOTE;
1152	>	block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
1153	>	} | SQUIT
1154	>	{
1155	>	if (conf_parser_ctx.pass == 2)
1156	>	block_state.port.value |= OPER_FLAG_SQUIT;
1157		} | KLINE
1158		{
1159		if (conf_parser_ctx.pass == 2)
1160	<	block_state.port.value |= OPER_FLAG_K;
1160	>	block_state.port.value |= OPER_FLAG_KLINE;
1161		} | UNKLINE
1162		{
1163		if (conf_parser_ctx.pass == 2)
#	Line 1210 | Line 1173 | oper_flags_item: GLOBAL_KILL
1173		} | XLINE
1174		{
1175		if (conf_parser_ctx.pass == 2)
1176	<	block_state.port.value |= OPER_FLAG_X;
1177	<	} | GLINE
1176	>	block_state.port.value |= OPER_FLAG_XLINE;
1177	>	} | T_UNXLINE
1178		{
1179		if (conf_parser_ctx.pass == 2)
1180	<	block_state.port.value |= OPER_FLAG_GLINE;
1180	>	block_state.port.value |= OPER_FLAG_UNXLINE;
1181		} | DIE
1182		{
1183		if (conf_parser_ctx.pass == 2)
#	Line 1223 | Line 1186 | oper_flags_item: GLOBAL_KILL
1186		{
1187		if (conf_parser_ctx.pass == 2)
1188		block_state.port.value |= OPER_FLAG_RESTART;
1189	+	} | REHASH ':' REMOTE
1190	+	{
1191	+	if (conf_parser_ctx.pass == 2)
1192	+	block_state.port.value |= OPER_FLAG_REHASH_REMOTE;
1193		} | REHASH
1194		{
1195		if (conf_parser_ctx.pass == 2)
#	Line 1231 | Line 1198 | oper_flags_item: GLOBAL_KILL
1198		{
1199		if (conf_parser_ctx.pass == 2)
1200		block_state.port.value |= OPER_FLAG_ADMIN;
1234	–	} | NICK_CHANGES
1235	–	{
1236	–	if (conf_parser_ctx.pass == 2)
1237	–	block_state.port.value |= OPER_FLAG_N;
1238	–	} | T_OPERWALL
1239	–	{
1240	–	if (conf_parser_ctx.pass == 2)
1241	–	block_state.port.value |= OPER_FLAG_OPERWALL;
1201		} | T_GLOBOPS
1202		{
1203		if (conf_parser_ctx.pass == 2)
1204		block_state.port.value |= OPER_FLAG_GLOBOPS;
1205	<	} | OPER_SPY_T
1205	>	} | T_WALLOPS
1206	>	{
1207	>	if (conf_parser_ctx.pass == 2)
1208	>	block_state.port.value |= OPER_FLAG_WALLOPS;
1209	>	} | T_LOCOPS
1210		{
1211		if (conf_parser_ctx.pass == 2)
1212	<	block_state.port.value |= OPER_FLAG_OPER_SPY;
1212	>	block_state.port.value |= OPER_FLAG_LOCOPS;
1213		} | REMOTEBAN
1214		{
1215		if (conf_parser_ctx.pass == 2)
#	Line 1259 | Line 1222 | oper_flags_item: GLOBAL_KILL
1222		{
1223		if (conf_parser_ctx.pass == 2)
1224		block_state.port.value |= OPER_FLAG_MODULE;
1225	+	} | T_OPME
1226	+	{
1227	+	if (conf_parser_ctx.pass == 2)
1228	+	block_state.port.value |= OPER_FLAG_OPME;
1229	+	} | NICK ':' RESV
1230	+	{
1231	+	if (conf_parser_ctx.pass == 2)
1232	+	block_state.port.value |= OPER_FLAG_NICK_RESV;
1233	+	} | JOIN ':' RESV
1234	+	{
1235	+	if (conf_parser_ctx.pass == 2)
1236	+	block_state.port.value |= OPER_FLAG_JOIN_RESV;
1237	+	} | RESV
1238	+	{
1239	+	if (conf_parser_ctx.pass == 2)
1240	+	block_state.port.value |= OPER_FLAG_RESV;
1241	+	} | T_UNRESV
1242	+	{
1243	+	if (conf_parser_ctx.pass == 2)
1244	+	block_state.port.value |= OPER_FLAG_UNRESV;
1245	+	} | CLOSE
1246	+	{
1247	+	if (conf_parser_ctx.pass == 2)
1248	+	block_state.port.value |= OPER_FLAG_CLOSE;
1249		};
1250
1251
1252		/***************************************************************************
1253	<	*  section class
1253	>	* class {} section
1254		***************************************************************************/
1255		class_entry: CLASS
1256		{
#	Line 1274 | Line 1261 | class_entry: CLASS
1261
1262		block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1263		block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1277	–	block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1264		block_state.max_sendq.value = DEFAULT_SENDQ;
1265		block_state.max_recvq.value = DEFAULT_RECVQ;
1266		} '{' class_items '}' ';'
1267		{
1282	–	struct ClassItem *class = NULL;
1283	–
1268		if (conf_parser_ctx.pass != 1)
1269		break;
1270
1271		if (!block_state.class.buf[0])
1272		break;
1273
1274	<	if (!(class = class_find(block_state.class.buf, 0)))
1274	>	struct ClassItem *class = class_find(block_state.class.buf, false);
1275	>	if (class == NULL)
1276		class = class_make();
1277
1278	<	class->active = 1;
1279	<	MyFree(class->name);
1278	>	class->active = true;
1279	>	xfree(class->name);
1280		class->name = xstrdup(block_state.class.buf);
1296	–	class->flags = block_state.flags.value;
1281		class->ping_freq = block_state.ping_freq.value;
1282	<	class->max_perip = block_state.max_perip.value;
1282	>	class->max_perip_local = block_state.max_perip_local.value;
1283	>	class->max_perip_global = block_state.max_perip_global.value;
1284		class->con_freq = block_state.con_freq.value;
1300	–	class->min_idle = block_state.min_idle.value;
1301	–	class->max_idle = block_state.max_idle.value;
1285		class->max_total = block_state.max_total.value;
1303	–	class->max_global = block_state.max_global.value;
1304	–	class->max_local = block_state.max_local.value;
1305	–	class->max_ident = block_state.max_ident.value;
1286		class->max_sendq = block_state.max_sendq.value;
1287		class->max_recvq = block_state.max_recvq.value;
1288	+	class->max_channels = block_state.max_channels.value;
1289
1290	<	if (class->number_per_cidr && block_state.number_per_cidr.value)
1291	<	if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
1292	<	(class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
1293	<	if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
1294	<	(class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
1295	<	rebuild_cidr_list(class);
1290	>	if (block_state.min_idle.value > block_state.max_idle.value)
1291	>	{
1292	>	block_state.min_idle.value = 0;
1293	>	block_state.max_idle.value = 0;
1294	>	block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
1295	>	}
1296
1297	+	class->flags = block_state.flags.value;
1298	+	class->min_idle = block_state.min_idle.value;
1299	+	class->max_idle = block_state.max_idle.value;
1300	+
1301	+	bool diff = (class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value ||
1302	+	class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value);
1303		class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1304		class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1305		class->number_per_cidr = block_state.number_per_cidr.value;
1306	+
1307	+	if (diff)
1308	+	class_ip_limit_rebuild(class);
1309		};
1310
1311		class_items:    class_items class_item | class_item;
1312		class_item:     class_name |
1313	<	class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1313	>	class_cidr_bitlen_ipv4 |
1314	>	class_cidr_bitlen_ipv6 |
1315		class_ping_time |
1316	<	class_number_per_cidr |
1317	<	class_number_per_ip |
1316	>	class_number_per_cidr |
1317	>	class_number_per_ip_local |
1318	>	class_number_per_ip_global |
1319		class_connectfreq |
1320	+	class_max_channels |
1321		class_max_number |
1322	<	class_max_global |
1323	<	class_max_local |
1331	<	class_max_ident |
1332	<	class_sendq | class_recvq |
1322	>	class_sendq |
1323	>	class_recvq |
1324		class_min_idle |
1325		class_max_idle |
1326		class_flags |
1327	<	error ';' ;
1327	>	error ';' ;
1328
1329	<	class_name: NAME '=' QSTRING ';'
1329	>	class_name: NAME '=' QSTRING ';'
1330		{
1331		if (conf_parser_ctx.pass == 1)
1332		strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
#	Line 1347 | Line 1338 | class_ping_time: PING_TIME '=' timespec
1338		block_state.ping_freq.value = $3;
1339		};
1340
1341	<	class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1341	>	class_number_per_ip_local: NUMBER_PER_IP_LOCAL '=' NUMBER ';'
1342		{
1343		if (conf_parser_ctx.pass == 1)
1344	<	block_state.max_perip.value = $3;
1344	>	block_state.max_perip_local.value = $3;
1345		};
1346
1347	<	class_connectfreq: CONNECTFREQ '=' timespec ';'
1347	>	class_number_per_ip_global: NUMBER_PER_IP_GLOBAL '=' NUMBER ';'
1348		{
1349		if (conf_parser_ctx.pass == 1)
1350	<	block_state.con_freq.value = $3;
1350	>	block_state.max_perip_global.value = $3;
1351		};
1352
1353	<	class_max_number: MAX_NUMBER '=' NUMBER ';'
1363	<	{
1364	<	if (conf_parser_ctx.pass == 1)
1365	<	block_state.max_total.value = $3;
1366	<	};
1367	<
1368	<	class_max_global: MAX_GLOBAL '=' NUMBER ';'
1353	>	class_connectfreq: CONNECTFREQ '=' timespec ';'
1354		{
1355		if (conf_parser_ctx.pass == 1)
1356	<	block_state.max_global.value = $3;
1356	>	block_state.con_freq.value = $3;
1357		};
1358
1359	<	class_max_local: MAX_LOCAL '=' NUMBER ';'
1359	>	class_max_channels: MAX_CHANNELS '=' NUMBER ';'
1360		{
1361		if (conf_parser_ctx.pass == 1)
1362	<	block_state.max_local.value = $3;
1362	>	block_state.max_channels.value = $3;
1363		};
1364
1365	<	class_max_ident: MAX_IDENT '=' NUMBER ';'
1365	>	class_max_number: MAX_NUMBER '=' NUMBER ';'
1366		{
1367		if (conf_parser_ctx.pass == 1)
1368	<	block_state.max_ident.value = $3;
1368	>	block_state.max_total.value = $3;
1369		};
1370
1371		class_sendq: SENDQ '=' sizespec ';'
#	Line 1416 | Line 1401 | class_number_per_cidr: NUMBER_PER_CIDR '
1401
1402		class_min_idle: MIN_IDLE '=' timespec ';'
1403		{
1404	<	if (conf_parser_ctx.pass == 1)
1405	<	block_state.min_idle.value = $3;
1404	>	if (conf_parser_ctx.pass != 1)
1405	>	break;
1406	>
1407	>	block_state.min_idle.value = $3;
1408	>	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1409		};
1410
1411		class_max_idle: MAX_IDLE '=' timespec ';'
1412		{
1413	<	if (conf_parser_ctx.pass == 1)
1414	<	block_state.max_idle.value = $3;
1413	>	if (conf_parser_ctx.pass != 1)
1414	>	break;
1415	>
1416	>	block_state.max_idle.value = $3;
1417	>	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1418		};
1419
1420		class_flags: IRCD_FLAGS
1421		{
1422		if (conf_parser_ctx.pass == 1)
1423	<	block_state.flags.value = 0;
1424	<	} '='  class_flags_items ';';
1423	>	block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1424	>	} '=' class_flags_items ';';
1425
1426		class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1427		class_flags_item: RANDOM_IDLE
#	Line 1445 | Line 1436 | class_flags_item: RANDOM_IDLE
1436
1437
1438		/***************************************************************************
1439	<	*  section listen
1439	>	* listen {} section
1440		***************************************************************************/
1441		listen_entry: LISTEN
1442		{
#	Line 1456 | Line 1447 | listen_entry: LISTEN
1447		listen_flags: IRCD_FLAGS
1448		{
1449		block_state.flags.value = 0;
1450	<	} '='  listen_flags_items ';';
1450	>	} '=' listen_flags_items ';';
1451
1452		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1453	<	listen_flags_item: T_SSL
1453	>	listen_flags_item: T_TLS
1454		{
1455		if (conf_parser_ctx.pass == 2)
1456	<	block_state.flags.value |= LISTENER_SSL;
1456	>	block_state.flags.value |= LISTENER_TLS;
1457		} | HIDDEN
1458		{
1459		if (conf_parser_ctx.pass == 2)
#	Line 1471 | Line 1462 | listen_flags_item: T_SSL
1462		{
1463		if (conf_parser_ctx.pass == 2)
1464		block_state.flags.value |= LISTENER_SERVER;
1465	+	} | CLIENT
1466	+	{
1467	+	if (conf_parser_ctx.pass == 2)
1468	+	block_state.flags.value |= LISTENER_CLIENT;
1469	+	} | DEFER
1470	+	{
1471	+	if (conf_parser_ctx.pass == 2)
1472	+	block_state.flags.value |= LISTENER_DEFER;
1473		};
1474
1475		listen_items:   listen_items listen_item | listen_item;
#	Line 1484 | Line 1483 | port_item: NUMBER
1483		{
1484		if (conf_parser_ctx.pass == 2)
1485		{
1486	<	if (block_state.flags.value & LISTENER_SSL)
1487	<	#ifdef HAVE_LIBCRYPTO
1488	<	if (!ServerInfo.server_ctx)
1486	>	#ifndef HAVE_TLS
1487	>	if (block_state.flags.value & LISTENER_TLS)
1488	>	{
1489	>	conf_error_report("TLS not available - port closed");
1490	>	break;
1491	>	}
1492		#endif
1493	<	{
1492	<	conf_error_report("SSL not available - port closed");
1493	<	break;
1494	<	}
1495	<	add_listener($1, block_state.addr.buf, block_state.flags.value);
1493	>	listener_add($1, block_state.addr.buf, block_state.flags.value);
1494		}
1495		} | NUMBER TWODOTS NUMBER
1496		{
1497		if (conf_parser_ctx.pass == 2)
1498		{
1499	<	int i;
1500	<
1501	<	if (block_state.flags.value & LISTENER_SSL)
1502	<	#ifdef HAVE_LIBCRYPTO
1503	<	if (!ServerInfo.server_ctx)
1499	>	#ifndef HAVE_TLS
1500	>	if (block_state.flags.value & LISTENER_TLS)
1501	>	{
1502	>	conf_error_report("TLS not available - port closed");
1503	>	break;
1504	>	}
1505		#endif
1507	–	{
1508	–	conf_error_report("SSL not available - port closed");
1509	–	break;
1510	–	}
1506
1507	<	for (i = $1; i <= $3; ++i)
1508	<	add_listener(i, block_state.addr.buf, block_state.flags.value);
1507	>	for (int i = $1; i <= $3; ++i)
1508	>	listener_add(i, block_state.addr.buf, block_state.flags.value);
1509		}
1510		};
1511
#	Line 1526 | Line 1521 | listen_host: HOST '=' QSTRING ';'
1521		strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1522		};
1523
1524	+
1525		/***************************************************************************
1526	<	*  section auth
1526	>	* auth {} section
1527		***************************************************************************/
1528		auth_entry: IRCD_AUTH
1529		{
#	Line 1535 | Line 1531 | auth_entry: IRCD_AUTH
1531		reset_block_state();
1532		} '{' auth_items '}' ';'
1533		{
1534	<	dlink_node *ptr = NULL;
1534	>	dlink_node *node;
1535
1536		if (conf_parser_ctx.pass != 2)
1537		break;
1538
1539	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
1539	>	DLINK_FOREACH(node, block_state.mask.list.head)
1540		{
1545	–	struct MaskItem *conf = NULL;
1541		struct split_nuh_item nuh;
1542	+	char *s = node->data;
1543
1544	<	nuh.nuhmask  = ptr->data;
1544	>	if (EmptyString(s))
1545	>	continue;
1546	>
1547	>	nuh.nuhmask  = s;
1548		nuh.nickptr  = NULL;
1549		nuh.userptr  = block_state.user.buf;
1550		nuh.hostptr  = block_state.host.buf;
1551	+
1552		nuh.nicksize = 0;
1553		nuh.usersize = sizeof(block_state.user.buf);
1554		nuh.hostsize = sizeof(block_state.host.buf);
1555	+
1556		split_nuh(&nuh);
1557
1558	<	conf        = conf_make(CONF_CLIENT);
1559	<	conf->user  = xstrdup(collapse(block_state.user.buf));
1560	<	conf->host  = xstrdup(collapse(block_state.host.buf));
1558	>	struct MaskItem *conf = conf_make(CONF_CLIENT);
1559	>	conf->user = xstrdup(block_state.user.buf);
1560	>	conf->host = xstrdup(block_state.host.buf);
1561
1562		if (block_state.rpass.buf[0])
1563		conf->passwd = xstrdup(block_state.rpass.buf);
1564		if (block_state.name.buf[0])
1565	<	conf->passwd = xstrdup(block_state.name.buf);
1565	>	conf->name = xstrdup(block_state.name.buf);
1566
1567		conf->flags = block_state.flags.value;
1568	<	conf->port  = block_state.port.value;
1568	>	conf->port = block_state.port.value;
1569
1570		conf_add_class_to_conf(conf, block_state.class.buf);
1571		add_conf_by_address(CONF_CLIENT, conf);
1572		}
1573	<	};
1573	>	};
1574
1575		auth_items:     auth_items auth_item | auth_item;
1576	<	auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1577	<	auth_spoof | auth_redir_serv | auth_redir_port |
1578	<	auth_encrypted | error ';' ;
1576	>	auth_item:      auth_user |
1577	>	auth_passwd |
1578	>	auth_class |
1579	>	auth_flags |
1580	>	auth_spoof |
1581	>	auth_redir_serv |
1582	>	auth_redir_port |
1583	>	auth_encrypted |
1584	>	error ';' ;
1585
1586		auth_user: USER '=' QSTRING ';'
1587		{
#	Line 1608 | Line 1615 | auth_encrypted: ENCRYPTED '=' TBOOL ';'
1615		auth_flags: IRCD_FLAGS
1616		{
1617		if (conf_parser_ctx.pass == 2)
1618	<	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
1619	<	} '='  auth_flags_items ';';
1618	>	block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
1619	>	} '=' auth_flags_items ';';
1620
1621		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1622	<	auth_flags_item: SPOOF_NOTICE
1616	<	{
1617	<	if (conf_parser_ctx.pass == 2)
1618	<	block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1619	<	} | EXCEED_LIMIT
1622	>	auth_flags_item: EXCEED_LIMIT
1623		{
1624		if (conf_parser_ctx.pass == 2)
1625		block_state.flags.value |= CONF_FLAGS_NOLIMIT;
#	Line 1624 | Line 1627 | auth_flags_item: SPOOF_NOTICE
1627		{
1628		if (conf_parser_ctx.pass == 2)
1629		block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1630	+	} | XLINE_EXEMPT
1631	+	{
1632	+	if (conf_parser_ctx.pass == 2)
1633	+	block_state.flags.value |= CONF_FLAGS_EXEMPTXLINE;
1634		} | NEED_IDENT
1635		{
1636		if (conf_parser_ctx.pass == 2)
#	Line 1636 | Line 1643 | auth_flags_item: SPOOF_NOTICE
1643		{
1644		if (conf_parser_ctx.pass == 2)
1645		block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1639	–	} | GLINE_EXEMPT
1640	–	{
1641	–	if (conf_parser_ctx.pass == 2)
1642	–	block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
1646		} | RESV_EXEMPT
1647		{
1648		if (conf_parser_ctx.pass == 2)
#	Line 1654 | Line 1657 | auth_flags_item: SPOOF_NOTICE
1657		block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1658		};
1659
1660	<	auth_spoof: SPOOF '=' QSTRING ';'
1660	>	auth_spoof: SPOOF '=' QSTRING ';'
1661		{
1662		if (conf_parser_ctx.pass != 2)
1663		break;
1664
1665	<	if (strlen(yylval.string) <= HOSTLEN && valid_hostname(yylval.string))
1665	>	if (valid_hostname(yylval.string))
1666		{
1667		strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1668		block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
#	Line 1688 | Line 1691 | auth_redir_port: REDIRPORT '=' NUMBER ';
1691
1692
1693		/***************************************************************************
1694	<	*  section resv
1694	>	* resv {} section
1695		***************************************************************************/
1696		resv_entry: RESV
1697		{
#	Line 1697 | Line 1700 | resv_entry: RESV
1700
1701		reset_block_state();
1702		strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
1703	<	} '{' resv_items '}' ';';
1703	>	} '{' resv_items '}' ';'
1704	>	{
1705	>	if (conf_parser_ctx.pass != 2)
1706	>	break;
1707	>
1708	>	resv_make(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1709	>	};
1710
1711	<	resv_items:     resv_items resv_item | resv_item;
1712	<	resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
1711	>	resv_items:     resv_items resv_item | resv_item;
1712	>	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1713
1714	<	resv_creason: REASON '=' QSTRING ';'
1714	>	resv_mask: MASK '=' QSTRING ';'
1715		{
1716		if (conf_parser_ctx.pass == 2)
1717	<	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1717	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1718		};
1719
1720	<	resv_channel: CHANNEL '=' QSTRING ';'
1720	>	resv_reason: REASON '=' QSTRING ';'
1721		{
1722	<	if (conf_parser_ctx.pass != 2)
1723	<	break;
1715	<
1716	<	if (IsChanPrefix(*yylval.string))
1717	<	create_channel_resv(yylval.string, block_state.rpass.buf, 1);
1722	>	if (conf_parser_ctx.pass == 2)
1723	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1724		};
1725
1726	<	resv_nick: NICK '=' QSTRING ';'
1726	>	resv_exempt: EXEMPT '=' QSTRING ';'
1727		{
1728		if (conf_parser_ctx.pass == 2)
1729	<	create_nick_resv(yylval.string, block_state.rpass.buf, 1);
1729	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1730		};
1731
1732	+
1733		/***************************************************************************
1734	<	*  section service
1734	>	* service {} section
1735		***************************************************************************/
1736		service_entry: T_SERVICE '{' service_items '}' ';';
1737
#	Line 1733 | Line 1740 | service_item:      service_name | error;
1740
1741		service_name: NAME '=' QSTRING ';'
1742		{
1743	<	if (conf_parser_ctx.pass == 2)
1743	>	if (conf_parser_ctx.pass != 2)
1744	>	break;
1745	>
1746	>	if (server_valid_name(yylval.string) == true)
1747		{
1748	<	if (valid_servname(yylval.string))
1749	<	{
1740	<	struct MaskItem *conf = conf_make(CONF_SERVICE);
1741	<	conf->name = xstrdup(yylval.string);
1742	<	}
1748	>	struct ServiceItem *service = service_make();
1749	>	service->name = xstrdup(yylval.string);
1750		}
1751		};
1752
1753	+
1754		/***************************************************************************
1755	<	*  section shared, for sharing remote klines etc.
1755	>	* shared {} section, for sharing remote klines etc.
1756		***************************************************************************/
1757		shared_entry: T_SHARED
1758		{
#	Line 1759 | Line 1767 | shared_entry: T_SHARED
1767		block_state.flags.value = SHARED_ALL;
1768		} '{' shared_items '}' ';'
1769		{
1762	–	struct MaskItem *conf = NULL;
1763	–
1770		if (conf_parser_ctx.pass != 2)
1771		break;
1772
1773	<	conf = conf_make(CONF_ULINE);
1774	<	conf->flags = block_state.flags.value;
1775	<	conf->name = xstrdup(block_state.name.buf);
1776	<	conf->user = xstrdup(block_state.user.buf);
1777	<	conf->user = xstrdup(block_state.host.buf);
1773	>	struct SharedItem *shared = shared_make();
1774	>	shared->type = block_state.flags.value;
1775	>	shared->server = xstrdup(block_state.name.buf);
1776	>	shared->user = xstrdup(block_state.user.buf);
1777	>	shared->host = xstrdup(block_state.host.buf);
1778		};
1779
1780		shared_items: shared_items shared_item | shared_item;
#	Line 1848 | Line 1854 | shared_type_item: KLINE
1854		block_state.flags.value = SHARED_ALL;
1855		};
1856
1857	+
1858		/***************************************************************************
1859	<	*  section cluster
1859	>	* cluster {} section
1860		***************************************************************************/
1861		cluster_entry: T_CLUSTER
1862		{
#	Line 1859 | Line 1866 | cluster_entry: T_CLUSTER
1866		reset_block_state();
1867
1868		strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1869	<	block_state.flags.value = SHARED_ALL;
1869	>	block_state.flags.value = CLUSTER_ALL;
1870		} '{' cluster_items '}' ';'
1871		{
1865	–	struct MaskItem *conf = NULL;
1866	–
1872		if (conf_parser_ctx.pass != 2)
1873		break;
1874
1875	<	conf = conf_make(CONF_CLUSTER);
1876	<	conf->flags = block_state.flags.value;
1877	<	conf->name = xstrdup(block_state.name.buf);
1875	>	struct ClusterItem *cluster = cluster_make();
1876	>	cluster->type = block_state.flags.value;
1877	>	cluster->server = xstrdup(block_state.name.buf);
1878		};
1879
1880	<	cluster_items:  cluster_items cluster_item | cluster_item;
1881	<	cluster_item:   cluster_name | cluster_type | error ';' ;
1880	>	cluster_items:  cluster_items cluster_item | cluster_item;
1881	>	cluster_item:   cluster_name | cluster_type | error ';' ;
1882
1883		cluster_name: NAME '=' QSTRING ';'
1884		{
#	Line 1887 | Line 1892 | cluster_type: TYPE
1892		block_state.flags.value = 0;
1893		} '=' cluster_types ';' ;
1894
1895	<	cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1895	>	cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1896		cluster_type_item: KLINE
1897		{
1898		if (conf_parser_ctx.pass == 2)
1899	<	block_state.flags.value |= SHARED_KLINE;
1899	>	block_state.flags.value |= CLUSTER_KLINE;
1900		} | UNKLINE
1901		{
1902		if (conf_parser_ctx.pass == 2)
1903	<	block_state.flags.value |= SHARED_UNKLINE;
1903	>	block_state.flags.value |= CLUSTER_UNKLINE;
1904		} | T_DLINE
1905		{
1906		if (conf_parser_ctx.pass == 2)
1907	<	block_state.flags.value |= SHARED_DLINE;
1907	>	block_state.flags.value |= CLUSTER_DLINE;
1908		} | T_UNDLINE
1909		{
1910		if (conf_parser_ctx.pass == 2)
1911	<	block_state.flags.value |= SHARED_UNDLINE;
1911	>	block_state.flags.value |= CLUSTER_UNDLINE;
1912		} | XLINE
1913		{
1914		if (conf_parser_ctx.pass == 2)
1915	<	block_state.flags.value |= SHARED_XLINE;
1915	>	block_state.flags.value |= CLUSTER_XLINE;
1916		} | T_UNXLINE
1917		{
1918		if (conf_parser_ctx.pass == 2)
1919	<	block_state.flags.value |= SHARED_UNXLINE;
1919	>	block_state.flags.value |= CLUSTER_UNXLINE;
1920		} | RESV
1921		{
1922		if (conf_parser_ctx.pass == 2)
1923	<	block_state.flags.value |= SHARED_RESV;
1923	>	block_state.flags.value |= CLUSTER_RESV;
1924		} | T_UNRESV
1925		{
1926		if (conf_parser_ctx.pass == 2)
1927	<	block_state.flags.value |= SHARED_UNRESV;
1927	>	block_state.flags.value |= CLUSTER_UNRESV;
1928		} | T_LOCOPS
1929		{
1930		if (conf_parser_ctx.pass == 2)
1931	<	block_state.flags.value |= SHARED_LOCOPS;
1931	>	block_state.flags.value |= CLUSTER_LOCOPS;
1932		} | T_ALL
1933		{
1934		if (conf_parser_ctx.pass == 2)
1935	<	block_state.flags.value = SHARED_ALL;
1935	>	block_state.flags.value = CLUSTER_ALL;
1936		};
1937
1938	+
1939		/***************************************************************************
1940	<	*  section connect
1940	>	* connect {}  section
1941		***************************************************************************/
1942	<	connect_entry: CONNECT
1942	>	connect_entry: CONNECT
1943		{
1944
1945		if (conf_parser_ctx.pass != 2)
1946		break;
1947
1948		reset_block_state();
1949	+	block_state.aftype.value = AF_INET;
1950		block_state.port.value = PORTNUM;
1951	+	block_state.timeout.value = CONNECTTIMEOUT;
1952		} '{' connect_items '}' ';'
1953		{
1946	–	struct MaskItem *conf = NULL;
1954		struct addrinfo hints, *res;
1955
1956		if (conf_parser_ctx.pass != 2)
#	Line 1953 | Line 1960 | connect_entry: CONNECT
1960		!block_state.host.buf[0])
1961		break;
1962
1963	<	if (!(block_state.rpass.buf[0] ||
1964	<	block_state.spass.buf[0]))
1963	>	if (!block_state.rpass.buf[0] ||
1964	>	!block_state.spass.buf[0])
1965	>	break;
1966	>
1967	>	if (server_valid_name(block_state.name.buf) == false)
1968		break;
1969
1970		if (has_wildcards(block_state.name.buf) ||
1971		has_wildcards(block_state.host.buf))
1972		break;
1973
1974	<	conf = conf_make(CONF_SERVER);
1974	>	struct MaskItem *conf = conf_make(CONF_SERVER);
1975	>	conf->addr = xcalloc(sizeof(*conf->addr));
1976		conf->port = block_state.port.value;
1977	+	conf->timeout = block_state.timeout.value;
1978		conf->flags = block_state.flags.value;
1979		conf->aftype = block_state.aftype.value;
1980		conf->host = xstrdup(block_state.host.buf);
1981		conf->name = xstrdup(block_state.name.buf);
1982		conf->passwd = xstrdup(block_state.rpass.buf);
1983		conf->spasswd = xstrdup(block_state.spass.buf);
1984	<	conf->cipher_list = xstrdup(block_state.ciph.buf);
1984	>
1985	>	if (block_state.cert.buf[0])
1986	>	conf->certfp = xstrdup(block_state.cert.buf);
1987	>
1988	>	if (block_state.ciph.buf[0])
1989	>	conf->cipher_list = xstrdup(block_state.ciph.buf);
1990
1991		dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
1992		dlinkMoveList(&block_state.hub.list, &conf->hub_list);
#	Line 1983 | Line 2000 | connect_entry: CONNECT
2000		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2001
2002		if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2003	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2003	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server bind(%s)", block_state.bind.buf);
2004		else
2005		{
2006	<	assert(res != NULL);
2006	>	assert(res);
2007	>
2008	>	conf->bind = xcalloc(sizeof(*conf->bind));
2009
2010	<	memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2011	<	conf->bind.ss.ss_family = res->ai_family;
1993	<	conf->bind.ss_len = res->ai_addrlen;
2010	>	memcpy(conf->bind, res->ai_addr, res->ai_addrlen);
2011	>	conf->bind->ss_len = res->ai_addrlen;
2012		freeaddrinfo(res);
2013		}
2014		}
2015
2016		conf_add_class_to_conf(conf, block_state.class.buf);
2017	<	lookup_confhost(conf);
2017	>	conf_dns_lookup(conf);
2018		};
2019
2020		connect_items:  connect_items connect_item | connect_item;
2021	<	connect_item:   connect_name | connect_host | connect_vhost |
2022	<	connect_send_password | connect_accept_password |
2023	<	connect_aftype | connect_port | connect_ssl_cipher_list |
2024	<	connect_flags | connect_hub_mask | connect_leaf_mask |
2025	<	connect_class | connect_encrypted |
2021	>	connect_item:   connect_name |
2022	>	connect_host |
2023	>	connect_timeout |
2024	>	connect_bind |
2025	>	connect_send_password |
2026	>	connect_accept_password |
2027	>	connect_tls_certificate_fingerprint |
2028	>	connect_aftype |
2029	>	connect_port |
2030	>	connect_tls_cipher_list |
2031	>	connect_flags |
2032	>	connect_hub_mask |
2033	>	connect_leaf_mask |
2034	>	connect_class |
2035	>	connect_encrypted |
2036		error ';' ;
2037
2038		connect_name: NAME '=' QSTRING ';'
#	Line 2013 | Line 2041 | connect_name: NAME '=' QSTRING ';'
2041		strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2042		};
2043
2044	<	connect_host: HOST '=' QSTRING ';'
2044	>	connect_host: HOST '=' QSTRING ';'
2045		{
2046		if (conf_parser_ctx.pass == 2)
2047		strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2048		};
2049
2050	<	connect_vhost: VHOST '=' QSTRING ';'
2050	>	connect_timeout: TIMEOUT '=' timespec ';'
2051	>	{
2052	>	if (conf_parser_ctx.pass == 2)
2053	>	block_state.timeout.value = $3;
2054	>	};
2055	>
2056	>	connect_bind: T_BIND '=' QSTRING ';'
2057		{
2058		if (conf_parser_ctx.pass == 2)
2059		strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2060		};
2061	<
2061	>
2062		connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2063		{
2064		if (conf_parser_ctx.pass != 2)
2065		break;
2066
2067	<	if ($3[0] == ':')
2067	>	if (*yylval.string == ':')
2068		conf_error_report("Server passwords cannot begin with a colon");
2069	<	else if (strchr($3, ' ') != NULL)
2069	>	else if (strchr(yylval.string, ' '))
2070		conf_error_report("Server passwords cannot contain spaces");
2071		else
2072		strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
#	Line 2043 | Line 2077 | connect_accept_password: ACCEPT_PASSWORD
2077		if (conf_parser_ctx.pass != 2)
2078		break;
2079
2080	<	if ($3[0] == ':')
2080	>	if (*yylval.string == ':')
2081		conf_error_report("Server passwords cannot begin with a colon");
2082	<	else if (strchr($3, ' ') != NULL)
2082	>	else if (strchr(yylval.string, ' '))
2083		conf_error_report("Server passwords cannot contain spaces");
2084		else
2085		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2086		};
2087
2088	+	connect_tls_certificate_fingerprint: TLS_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
2089	+	{
2090	+	if (conf_parser_ctx.pass == 2)
2091	+	strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
2092	+	};
2093	+
2094		connect_port: PORT '=' NUMBER ';'
2095		{
2096		if (conf_parser_ctx.pass == 2)
#	Line 2063 | Line 2103 | connect_aftype: AFTYPE '=' T_IPV4 ';'
2103		block_state.aftype.value = AF_INET;
2104		} | AFTYPE '=' T_IPV6 ';'
2105		{
2066	–	#ifdef IPV6
2106		if (conf_parser_ctx.pass == 2)
2107		block_state.aftype.value = AF_INET6;
2069	–	#endif
2108		};
2109
2110		connect_flags: IRCD_FLAGS
2111		{
2112		block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2113	<	} '='  connect_flags_items ';';
2113	>	} '=' connect_flags_items ';';
2114
2115		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2116		connect_flags_item: AUTOCONN
2117		{
2118		if (conf_parser_ctx.pass == 2)
2119		block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2120	<	} | T_SSL
2120	>	} | T_TLS
2121		{
2122		if (conf_parser_ctx.pass == 2)
2123	<	block_state.flags.value |= CONF_FLAGS_SSL;
2123	>	block_state.flags.value |= CONF_FLAGS_TLS;
2124		};
2125
2126		connect_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 2096 | Line 2134 | connect_encrypted: ENCRYPTED '=' TBOOL '
2134		}
2135		};
2136
2137	<	connect_hub_mask: HUB_MASK '=' QSTRING ';'
2137	>	connect_hub_mask: HUB_MASK '=' QSTRING ';'
2138		{
2139		if (conf_parser_ctx.pass == 2)
2140		dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2141		};
2142
2143	<	connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2143	>	connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2144		{
2145		if (conf_parser_ctx.pass == 2)
2146		dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
#	Line 2114 | Line 2152 | connect_class: CLASS '=' QSTRING ';'
2152		strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2153		};
2154
2155	<	connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2155	>	connect_tls_cipher_list: TLS_CIPHER_LIST '=' QSTRING ';'
2156		{
2157	<	#ifdef HAVE_LIBCRYPTO
2157	>	#ifdef HAVE_TLS
2158		if (conf_parser_ctx.pass == 2)
2159		strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2160		#else
2161		if (conf_parser_ctx.pass == 2)
2162	<	conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
2162	>	conf_error_report("Ignoring connect::tls_cipher_list -- no TLS support");
2163		#endif
2164		};
2165
2166
2167		/***************************************************************************
2168	<	*  section kill
2168	>	* kill {} section
2169		***************************************************************************/
2170		kill_entry: KILL
2171		{
#	Line 2135 | Line 2173 | kill_entry: KILL
2173		reset_block_state();
2174		} '{' kill_items '}' ';'
2175		{
2138	–	struct MaskItem *conf = NULL;
2139	–
2176		if (conf_parser_ctx.pass != 2)
2177		break;
2178
#	Line 2144 | Line 2180 | kill_entry: KILL
2180		!block_state.host.buf[0])
2181		break;
2182
2183	+	struct MaskItem *conf = conf_make(CONF_KLINE);
2184	+	conf->user = xstrdup(block_state.user.buf);
2185	+	conf->host = xstrdup(block_state.host.buf);
2186
2187	<	if (block_state.port.value == 1)
2188	<	{
2150	<	#ifdef HAVE_LIBPCRE
2151	<	void *exp_user = NULL;
2152	<	void *exp_host = NULL;
2153	<	const char *errptr = NULL;
2154	<
2155	<	if (!(exp_user = ircd_pcre_compile(block_state.user.buf, &errptr)) ||
2156	<	!(exp_host = ircd_pcre_compile(block_state.host.buf, &errptr)))
2157	<	{
2158	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: %s",
2159	<	errptr);
2160	<	break;
2161	<	}
2162	<
2163	<	conf = conf_make(CONF_RKLINE);
2164	<	conf->regexuser = exp_user;
2165	<	conf->regexhost = exp_host;
2166	<
2167	<	conf->user = xstrdup(block_state.user.buf);
2168	<	conf->host = xstrdup(block_state.host.buf);
2169	<
2170	<	if (block_state.rpass.buf[0])
2171	<	conf->reason = xstrdup(block_state.rpass.buf);
2172	<	else
2173	<	conf->reason = xstrdup(CONF_NOREASON);
2174	<	#else
2175	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: no PCRE support");
2176	<	break;
2177	<	#endif
2178	<	}
2187	>	if (block_state.rpass.buf[0])
2188	>	conf->reason = xstrdup(block_state.rpass.buf);
2189		else
2190	<	{
2191	<	conf = conf_make(CONF_KLINE);
2182	<
2183	<	conf->user = xstrdup(block_state.user.buf);
2184	<	conf->host = xstrdup(block_state.host.buf);
2185	<
2186	<	if (block_state.rpass.buf[0])
2187	<	conf->reason = xstrdup(block_state.rpass.buf);
2188	<	else
2189	<	conf->reason = xstrdup(CONF_NOREASON);
2190	<	add_conf_by_address(CONF_KLINE, conf);
2191	<	}
2192	<	};
2193	<
2194	<	kill_type: TYPE
2195	<	{
2196	<	if (conf_parser_ctx.pass == 2)
2197	<	block_state.port.value = 0;
2198	<	} '='  kill_type_items ';';
2199	<
2200	<	kill_type_items: kill_type_items ',' kill_type_item | kill_type_item;
2201	<	kill_type_item: REGEX_T
2202	<	{
2203	<	if (conf_parser_ctx.pass == 2)
2204	<	block_state.port.value = 1;
2190	>	conf->reason = xstrdup(CONF_NOREASON);
2191	>	add_conf_by_address(CONF_KLINE, conf);
2192		};
2193
2194		kill_items:     kill_items kill_item | kill_item;
2195	<	kill_item:      kill_user | kill_reason | kill_type | error;
2195	>	kill_item:      kill_user | kill_reason | error;
2196
2197		kill_user: USER '=' QSTRING ';'
2198		{
#	Line 2227 | Line 2214 | kill_user: USER '=' QSTRING ';'
2214		}
2215		};
2216
2217	<	kill_reason: REASON '=' QSTRING ';'
2217	>	kill_reason: REASON '=' QSTRING ';'
2218		{
2219		if (conf_parser_ctx.pass == 2)
2220		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2221		};
2222
2223	+
2224		/***************************************************************************
2225	<	*  section deny
2225	>	* deny {} section
2226		***************************************************************************/
2227	<	deny_entry: DENY
2227	>	deny_entry: DENY
2228		{
2229		if (conf_parser_ctx.pass == 2)
2230		reset_block_state();
2231		} '{' deny_items '}' ';'
2232		{
2245	–	struct MaskItem *conf = NULL;
2246	–
2233		if (conf_parser_ctx.pass != 2)
2234		break;
2235
#	Line 2252 | Line 2238 | deny_entry: DENY
2238
2239		if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2240		{
2241	<	conf = conf_make(CONF_DLINE);
2241	>	struct MaskItem *conf = conf_make(CONF_DLINE);
2242		conf->host = xstrdup(block_state.addr.buf);
2243
2244		if (block_state.rpass.buf[0])
#	Line 2261 | Line 2247 | deny_entry: DENY
2247		conf->reason = xstrdup(CONF_NOREASON);
2248		add_conf_by_address(CONF_DLINE, conf);
2249		}
2250	<	};
2250	>	};
2251
2252		deny_items:     deny_items deny_item | deny_item;
2253		deny_item:      deny_ip | deny_reason | error;
#	Line 2272 | Line 2258 | deny_ip: IP '=' QSTRING ';'
2258		strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2259		};
2260
2261	<	deny_reason: REASON '=' QSTRING ';'
2261	>	deny_reason: REASON '=' QSTRING ';'
2262		{
2263		if (conf_parser_ctx.pass == 2)
2264		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2265		};
2266
2267	+
2268		/***************************************************************************
2269	<	*  section exempt
2269	>	* exempt {} section
2270		***************************************************************************/
2271		exempt_entry: EXEMPT '{' exempt_items '}' ';';
2272
2273	<	exempt_items:     exempt_items exempt_item | exempt_item;
2274	<	exempt_item:      exempt_ip | error;
2273	>	exempt_items: exempt_items exempt_item | exempt_item;
2274	>	exempt_item:  exempt_ip | error;
2275
2276		exempt_ip: IP '=' QSTRING ';'
2277		{
2278		if (conf_parser_ctx.pass == 2)
2279		{
2280	<	if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2280	>	if (*yylval.string && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2281		{
2282		struct MaskItem *conf = conf_make(CONF_EXEMPT);
2283		conf->host = xstrdup(yylval.string);
#	Line 2301 | Line 2288 | exempt_ip: IP '=' QSTRING ';'
2288		};
2289
2290		/***************************************************************************
2291	<	*  section gecos
2291	>	* gecos {} section
2292		***************************************************************************/
2293		gecos_entry: GECOS
2294		{
#	Line 2309 | Line 2296 | gecos_entry: GECOS
2296		reset_block_state();
2297		} '{' gecos_items '}' ';'
2298		{
2312	–	struct MaskItem *conf = NULL;
2313	–
2299		if (conf_parser_ctx.pass != 2)
2300		break;
2301
2302		if (!block_state.name.buf[0])
2303		break;
2304
2305	<	if (block_state.port.value == 1)
2306	<	{
2322	<	#ifdef HAVE_LIBPCRE
2323	<	void *exp_p = NULL;
2324	<	const char *errptr = NULL;
2325	<
2326	<	if (!(exp_p = ircd_pcre_compile(block_state.name.buf, &errptr)))
2327	<	{
2328	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: %s",
2329	<	errptr);
2330	<	break;
2331	<	}
2332	<
2333	<	conf = conf_make(CONF_RXLINE);
2334	<	conf->regexuser = exp_p;
2335	<	#else
2336	<	conf_error_report("Failed to add regular expression based X-Line: no PCRE support");
2337	<	break;
2338	<	#endif
2339	<	}
2340	<	else
2341	<	conf = conf_make(CONF_XLINE);
2342	<
2343	<	conf->name = xstrdup(block_state.name.buf);
2305	>	struct GecosItem *gecos = gecos_make();
2306	>	gecos->mask = xstrdup(block_state.name.buf);
2307
2308		if (block_state.rpass.buf[0])
2309	<	conf->reason = xstrdup(block_state.rpass.buf);
2309	>	gecos->reason = xstrdup(block_state.rpass.buf);
2310		else
2311	<	conf->reason = xstrdup(CONF_NOREASON);
2349	<	};
2350	<
2351	<	gecos_flags: TYPE
2352	<	{
2353	<	if (conf_parser_ctx.pass == 2)
2354	<	block_state.port.value = 0;
2355	<	} '='  gecos_flags_items ';';
2356	<
2357	<	gecos_flags_items: gecos_flags_items ',' gecos_flags_item | gecos_flags_item;
2358	<	gecos_flags_item: REGEX_T
2359	<	{
2360	<	if (conf_parser_ctx.pass == 2)
2361	<	block_state.port.value = 1;
2311	>	gecos->reason = xstrdup(CONF_NOREASON);
2312		};
2313
2314		gecos_items: gecos_items gecos_item | gecos_item;
2315	<	gecos_item:  gecos_name | gecos_reason | gecos_flags | error;
2315	>	gecos_item:  gecos_name | gecos_reason | error;
2316
2317	<	gecos_name: NAME '=' QSTRING ';'
2317	>	gecos_name: NAME '=' QSTRING ';'
2318		{
2319		if (conf_parser_ctx.pass == 2)
2320		strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2321		};
2322
2323	<	gecos_reason: REASON '=' QSTRING ';'
2323	>	gecos_reason: REASON '=' QSTRING ';'
2324		{
2325		if (conf_parser_ctx.pass == 2)
2326		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2327		};
2328
2329	+
2330		/***************************************************************************
2331	<	*  section general
2331	>	* general {} section
2332		***************************************************************************/
2333	<	general_entry: GENERAL
2383	<	'{' general_items '}' ';';
2333	>	general_entry: GENERAL '{' general_items '}' ';';
2334
2335		general_items:      general_items general_item | general_item;
2336	<	general_item:       general_hide_spoof_ips | general_ignore_bogus_ts |
2337	<	general_failed_oper_notice | general_anti_nick_flood |
2338	<	general_max_nick_time | general_max_nick_changes |
2339	<	general_max_accept | general_anti_spam_exit_message_time |
2340	<	general_ts_warn_delta | general_ts_max_delta |
2336	>	general_item:       general_away_count |
2337	>	general_away_time |
2338	>	general_failed_oper_notice |
2339	>	general_anti_nick_flood |
2340	>	general_max_nick_time |
2341	>	general_max_nick_changes |
2342	>	general_max_accept |
2343	>	general_whowas_history_length |
2344	>	general_anti_spam_exit_message_time |
2345	>	general_ts_warn_delta |
2346	>	general_ts_max_delta |
2347		general_kill_chase_time_limit |
2348		general_invisible_on_connect |
2349	<	general_warn_no_nline | general_dots_in_ident |
2350	<	general_stats_o_oper_only | general_stats_k_oper_only |
2351	<	general_pace_wait | general_stats_i_oper_only |
2352	<	general_pace_wait_simple | general_stats_P_oper_only |
2353	<	general_short_motd | general_no_oper_flood |
2354	<	general_true_no_oper_flood | general_oper_pass_resv |
2355	<	general_message_locale |
2356	<	general_oper_only_umodes | general_max_targets |
2357	<	general_use_egd | general_egdpool_path |
2358	<	general_oper_umodes | general_caller_id_wait |
2359	<	general_opers_bypass_callerid | general_default_floodcount |
2360	<	general_min_nonwildcard | general_min_nonwildcard_simple |
2361	<	general_disable_remote_commands |
2362	<	general_throttle_time | general_havent_read_conf |
2349	>	general_warn_no_connect_block |
2350	>	general_dots_in_ident |
2351	>	general_stats_i_oper_only |
2352	>	general_stats_k_oper_only |
2353	>	general_stats_m_oper_only |
2354	>	general_stats_o_oper_only |
2355	>	general_stats_P_oper_only |
2356	>	general_stats_u_oper_only |
2357	>	general_pace_wait |
2358	>	general_pace_wait_simple |
2359	>	general_short_motd |
2360	>	general_no_oper_flood |
2361	>	general_oper_only_umodes |
2362	>	general_max_targets |
2363	>	general_oper_umodes |
2364	>	general_caller_id_wait |
2365	>	general_opers_bypass_callerid |
2366	>	general_default_floodcount |
2367	>	general_default_floodtime |
2368	>	general_min_nonwildcard |
2369	>	general_min_nonwildcard_simple |
2370	>	general_throttle_count |
2371	>	general_throttle_time |
2372		general_ping_cookie |
2373	<	general_disable_auth |
2374	<	general_tkline_expire_notices | general_gline_enable |
2375	<	general_gline_duration | general_gline_request_duration |
2376	<	general_gline_min_cidr |
2377	<	general_gline_min_cidr6 |
2378	<	general_stats_e_disabled |
2379	<	general_max_watch | general_services_name |
2380	<	error;
2381	<
2373	>	general_disable_auth |
2374	>	general_dline_min_cidr |
2375	>	general_dline_min_cidr6 |
2376	>	general_kline_min_cidr |
2377	>	general_kline_min_cidr6 |
2378	>	general_stats_e_disabled |
2379	>	general_max_watch |
2380	>	general_cycle_on_host_change |
2381	>	error;
2382
2418	–	general_max_watch: MAX_WATCH '=' NUMBER ';'
2419	–	{
2420	–	ConfigFileEntry.max_watch = $3;
2421	–	};
2383
2384	<	general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2384	>	general_away_count: AWAY_COUNT '=' NUMBER ';'
2385		{
2386	<	if (conf_parser_ctx.pass == 2)
2426	<	ConfigFileEntry.glines = yylval.number;
2386	>	ConfigGeneral.away_count = $3;
2387		};
2388
2389	<	general_gline_duration: GLINE_DURATION '=' timespec ';'
2389	>	general_away_time: AWAY_TIME '=' timespec ';'
2390		{
2391	<	if (conf_parser_ctx.pass == 2)
2432	<	ConfigFileEntry.gline_time = $3;
2391	>	ConfigGeneral.away_time = $3;
2392		};
2393
2394	<	general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2394	>	general_max_watch: MAX_WATCH '=' NUMBER ';'
2395		{
2396	<	if (conf_parser_ctx.pass == 2)
2438	<	ConfigFileEntry.gline_request_time = $3;
2396	>	ConfigGeneral.max_watch = $3;
2397		};
2398
2399	<	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2399	>	general_whowas_history_length: WHOWAS_HISTORY_LENGTH '=' NUMBER ';'
2400		{
2401	<	ConfigFileEntry.gline_min_cidr = $3;
2401	>	ConfigGeneral.whowas_history_length = $3;
2402		};
2403
2404	<	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2404	>	general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2405		{
2406	<	ConfigFileEntry.gline_min_cidr6 = $3;
2406	>	ConfigGeneral.cycle_on_host_change = yylval.number;
2407		};
2408
2409	<	general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2409	>	general_dline_min_cidr: DLINE_MIN_CIDR '=' NUMBER ';'
2410		{
2411	<	ConfigFileEntry.tkline_expire_notices = yylval.number;
2411	>	ConfigGeneral.dline_min_cidr = $3;
2412		};
2413
2414	<	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2414	>	general_dline_min_cidr6: DLINE_MIN_CIDR6 '=' NUMBER ';'
2415		{
2416	<	ConfigFileEntry.kill_chase_time_limit = $3;
2416	>	ConfigGeneral.dline_min_cidr6 = $3;
2417		};
2418
2419	<	general_hide_spoof_ips: HIDE_SPOOF_IPS '=' TBOOL ';'
2419	>	general_kline_min_cidr: KLINE_MIN_CIDR '=' NUMBER ';'
2420		{
2421	<	ConfigFileEntry.hide_spoof_ips = yylval.number;
2421	>	ConfigGeneral.kline_min_cidr = $3;
2422		};
2423
2424	<	general_ignore_bogus_ts: IGNORE_BOGUS_TS '=' TBOOL ';'
2424	>	general_kline_min_cidr6: KLINE_MIN_CIDR6 '=' NUMBER ';'
2425		{
2426	<	ConfigFileEntry.ignore_bogus_ts = yylval.number;
2426	>	ConfigGeneral.kline_min_cidr6 = $3;
2427		};
2428
2429	<	general_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
2429	>	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2430		{
2431	<	ConfigFileEntry.disable_remote = yylval.number;
2431	>	ConfigGeneral.kill_chase_time_limit = $3;
2432		};
2433
2434		general_failed_oper_notice: FAILED_OPER_NOTICE '=' TBOOL ';'
2435		{
2436	<	ConfigFileEntry.failed_oper_notice = yylval.number;
2436	>	ConfigGeneral.failed_oper_notice = yylval.number;
2437		};
2438
2439		general_anti_nick_flood: ANTI_NICK_FLOOD '=' TBOOL ';'
2440		{
2441	<	ConfigFileEntry.anti_nick_flood = yylval.number;
2441	>	ConfigGeneral.anti_nick_flood = yylval.number;
2442		};
2443
2444		general_max_nick_time: MAX_NICK_TIME '=' timespec ';'
2445		{
2446	<	ConfigFileEntry.max_nick_time = $3;
2446	>	ConfigGeneral.max_nick_time = $3;
2447		};
2448
2449		general_max_nick_changes: MAX_NICK_CHANGES '=' NUMBER ';'
2450		{
2451	<	ConfigFileEntry.max_nick_changes = $3;
2451	>	ConfigGeneral.max_nick_changes = $3;
2452		};
2453
2454		general_max_accept: MAX_ACCEPT '=' NUMBER ';'
2455		{
2456	<	ConfigFileEntry.max_accept = $3;
2456	>	ConfigGeneral.max_accept = $3;
2457		};
2458
2459		general_anti_spam_exit_message_time: ANTI_SPAM_EXIT_MESSAGE_TIME '=' timespec ';'
2460		{
2461	<	ConfigFileEntry.anti_spam_exit_message_time = $3;
2461	>	ConfigGeneral.anti_spam_exit_message_time = $3;
2462		};
2463
2464		general_ts_warn_delta: TS_WARN_DELTA '=' timespec ';'
2465		{
2466	<	ConfigFileEntry.ts_warn_delta = $3;
2466	>	ConfigGeneral.ts_warn_delta = $3;
2467		};
2468
2469		general_ts_max_delta: TS_MAX_DELTA '=' timespec ';'
2470		{
2471	<	if (conf_parser_ctx.pass == 2)
2514	<	ConfigFileEntry.ts_max_delta = $3;
2471	>	ConfigGeneral.ts_max_delta = $3;
2472		};
2473
2474	<	general_havent_read_conf: HAVENT_READ_CONF '=' NUMBER ';'
2474	>	general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2475		{
2476	<	if (($3 > 0) && conf_parser_ctx.pass == 1)
2520	<	{
2521	<	ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
2522	<	ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
2523	<	ilog(LOG_TYPE_IRCD, "Consider actually reading/editing the conf file, and removing this line.");
2524	<	exit(0);
2525	<	}
2476	>	ConfigGeneral.invisible_on_connect = yylval.number;
2477		};
2478
2479	<	general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2479	>	general_warn_no_connect_block: WARN_NO_CONNECT_BLOCK '=' TBOOL ';'
2480		{
2481	<	ConfigFileEntry.invisible_on_connect = yylval.number;
2481	>	ConfigGeneral.warn_no_connect_block = yylval.number;
2482		};
2483
2484	<	general_warn_no_nline: WARN_NO_NLINE '=' TBOOL ';'
2484	>	general_stats_e_disabled: STATS_E_DISABLED '=' TBOOL ';'
2485		{
2486	<	ConfigFileEntry.warn_no_nline = yylval.number;
2486	>	ConfigGeneral.stats_e_disabled = yylval.number;
2487		};
2488
2489	<	general_stats_e_disabled: STATS_E_DISABLED '=' TBOOL ';'
2489	>	general_stats_m_oper_only: STATS_M_OPER_ONLY '=' TBOOL ';'
2490		{
2491	<	ConfigFileEntry.stats_e_disabled = yylval.number;
2491	>	ConfigGeneral.stats_m_oper_only = yylval.number;
2492		};
2493
2494		general_stats_o_oper_only: STATS_O_OPER_ONLY '=' TBOOL ';'
2495		{
2496	<	ConfigFileEntry.stats_o_oper_only = yylval.number;
2496	>	ConfigGeneral.stats_o_oper_only = yylval.number;
2497		};
2498
2499		general_stats_P_oper_only: STATS_P_OPER_ONLY '=' TBOOL ';'
2500		{
2501	<	ConfigFileEntry.stats_P_oper_only = yylval.number;
2501	>	ConfigGeneral.stats_P_oper_only = yylval.number;
2502		};
2503
2504	<	general_stats_k_oper_only: STATS_K_OPER_ONLY '=' TBOOL ';'
2504	>	general_stats_u_oper_only: STATS_U_OPER_ONLY '=' TBOOL ';'
2505		{
2506	<	ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
2507	<	} | STATS_K_OPER_ONLY '=' TMASKED ';'
2506	>	ConfigGeneral.stats_u_oper_only = yylval.number;
2507	>	};
2508	>
2509	>	general_stats_k_oper_only: STATS_K_OPER_ONLY '=' TBOOL ';'
2510		{
2511	<	ConfigFileEntry.stats_k_oper_only = 1;
2511	>	ConfigGeneral.stats_k_oper_only = yylval.number;
2512		};
2513
2514		general_stats_i_oper_only: STATS_I_OPER_ONLY '=' TBOOL ';'
2515		{
2516	<	ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
2564	<	} | STATS_I_OPER_ONLY '=' TMASKED ';'
2565	<	{
2566	<	ConfigFileEntry.stats_i_oper_only = 1;
2516	>	ConfigGeneral.stats_i_oper_only = yylval.number;
2517		};
2518
2519		general_pace_wait: PACE_WAIT '=' timespec ';'
2520		{
2521	<	ConfigFileEntry.pace_wait = $3;
2521	>	ConfigGeneral.pace_wait = $3;
2522		};
2523
2524		general_caller_id_wait: CALLER_ID_WAIT '=' timespec ';'
2525		{
2526	<	ConfigFileEntry.caller_id_wait = $3;
2526	>	ConfigGeneral.caller_id_wait = $3;
2527		};
2528
2529		general_opers_bypass_callerid: OPERS_BYPASS_CALLERID '=' TBOOL ';'
2530		{
2531	<	ConfigFileEntry.opers_bypass_callerid = yylval.number;
2531	>	ConfigGeneral.opers_bypass_callerid = yylval.number;
2532		};
2533
2534		general_pace_wait_simple: PACE_WAIT_SIMPLE '=' timespec ';'
2535		{
2536	<	ConfigFileEntry.pace_wait_simple = $3;
2536	>	ConfigGeneral.pace_wait_simple = $3;
2537		};
2538
2539		general_short_motd: SHORT_MOTD '=' TBOOL ';'
2540		{
2541	<	ConfigFileEntry.short_motd = yylval.number;
2592	<	};
2593	<
2594	<	general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
2595	<	{
2596	<	ConfigFileEntry.no_oper_flood = yylval.number;
2541	>	ConfigGeneral.short_motd = yylval.number;
2542		};
2543
2544	<	general_true_no_oper_flood: TRUE_NO_OPER_FLOOD '=' TBOOL ';'
2600	<	{
2601	<	ConfigFileEntry.true_no_oper_flood = yylval.number;
2602	<	};
2603	<
2604	<	general_oper_pass_resv: OPER_PASS_RESV '=' TBOOL ';'
2605	<	{
2606	<	ConfigFileEntry.oper_pass_resv = yylval.number;
2607	<	};
2608	<
2609	<	general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
2544	>	general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
2545		{
2546	<	if (conf_parser_ctx.pass == 2)
2612	<	{
2613	<	if (strlen(yylval.string) > LOCALE_LENGTH-2)
2614	<	yylval.string[LOCALE_LENGTH-1] = '\0';
2615	<
2616	<	set_locale(yylval.string);
2617	<	}
2546	>	ConfigGeneral.no_oper_flood = yylval.number;
2547		};
2548
2549		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2550		{
2551	<	ConfigFileEntry.dots_in_ident = $3;
2551	>	ConfigGeneral.dots_in_ident = $3;
2552		};
2553
2554		general_max_targets: MAX_TARGETS '=' NUMBER ';'
2555		{
2556	<	ConfigFileEntry.max_targets = $3;
2556	>	ConfigGeneral.max_targets = $3;
2557		};
2558
2559	<	general_use_egd: USE_EGD '=' TBOOL ';'
2631	<	{
2632	<	ConfigFileEntry.use_egd = yylval.number;
2633	<	};
2634	<
2635	<	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
2636	<	{
2637	<	if (conf_parser_ctx.pass == 2)
2638	<	{
2639	<	MyFree(ConfigFileEntry.egdpool_path);
2640	<	ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
2641	<	}
2642	<	};
2643	<
2644	<	general_services_name: T_SERVICES_NAME '=' QSTRING ';'
2559	>	general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2560		{
2561	<	if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2647	<	{
2648	<	MyFree(ConfigFileEntry.service_name);
2649	<	ConfigFileEntry.service_name = xstrdup(yylval.string);
2650	<	}
2561	>	ConfigGeneral.ping_cookie = yylval.number;
2562		};
2563
2564	<	general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2564	>	general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2565		{
2566	<	ConfigFileEntry.ping_cookie = yylval.number;
2566	>	ConfigGeneral.disable_auth = yylval.number;
2567		};
2568
2569	<	general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2569	>	general_throttle_count: THROTTLE_COUNT '=' NUMBER ';'
2570		{
2571	<	ConfigFileEntry.disable_auth = yylval.number;
2571	>	ConfigGeneral.throttle_count = $3;
2572		};
2573
2574		general_throttle_time: THROTTLE_TIME '=' timespec ';'
2575		{
2576	<	ConfigFileEntry.throttle_time = yylval.number;
2576	>	ConfigGeneral.throttle_time = $3;
2577		};
2578
2579		general_oper_umodes: OPER_UMODES
2580		{
2581	<	ConfigFileEntry.oper_umodes = 0;
2582	<	} '='  umode_oitems ';' ;
2581	>	ConfigGeneral.oper_umodes = 0;
2582	>	} '=' umode_oitems ';' ;
2583
2584		umode_oitems:    umode_oitems ',' umode_oitem | umode_oitem;
2585	<	umode_oitem:     T_BOTS
2675	<	{
2676	<	ConfigFileEntry.oper_umodes |= UMODE_BOTS;
2677	<	} | T_CCONN
2678	<	{
2679	<	ConfigFileEntry.oper_umodes |= UMODE_CCONN;
2680	<	} | T_CCONN_FULL
2585	>	umode_oitem: T_CCONN
2586		{
2587	<	ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
2587	>	ConfigGeneral.oper_umodes |= UMODE_CCONN;
2588		} | T_DEAF
2589		{
2590	<	ConfigFileEntry.oper_umodes |= UMODE_DEAF;
2590	>	ConfigGeneral.oper_umodes |= UMODE_DEAF;
2591		} | T_DEBUG
2592		{
2593	<	ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
2594	<	} | T_FULL
2593	>	ConfigGeneral.oper_umodes |= UMODE_DEBUG;
2594	>	} | T_FLOOD
2595		{
2596	<	ConfigFileEntry.oper_umodes |= UMODE_FULL;
2596	>	ConfigGeneral.oper_umodes |= UMODE_FLOOD;
2597		} | HIDDEN
2598		{
2599	<	ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
2599	>	ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
2600	>	} | HIDE_CHANS
2601	>	{
2602	>	ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
2603	>	} | HIDE_IDLE
2604	>	{
2605	>	ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
2606		} | T_SKILL
2607		{
2608	<	ConfigFileEntry.oper_umodes |= UMODE_SKILL;
2608	>	ConfigGeneral.oper_umodes |= UMODE_SKILL;
2609		} | T_NCHANGE
2610		{
2611	<	ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
2611	>	ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
2612		} | T_REJ
2613		{
2614	<	ConfigFileEntry.oper_umodes |= UMODE_REJ;
2704	<	} | T_UNAUTH
2705	<	{
2706	<	ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
2614	>	ConfigGeneral.oper_umodes |= UMODE_REJ;
2615		} | T_SPY
2616		{
2617	<	ConfigFileEntry.oper_umodes |= UMODE_SPY;
2617	>	ConfigGeneral.oper_umodes |= UMODE_SPY;
2618		} | T_EXTERNAL
2619		{
2620	<	ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
2713	<	} | T_OPERWALL
2714	<	{
2715	<	ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
2620	>	ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
2621		} | T_SERVNOTICE
2622		{
2623	<	ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
2623	>	ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
2624		} | T_INVISIBLE
2625		{
2626	<	ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
2626	>	ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
2627		} | T_WALLOP
2628		{
2629	<	ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
2629	>	ConfigGeneral.oper_umodes |= UMODE_WALLOP;
2630		} | T_SOFTCALLERID
2631		{
2632	<	ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
2632	>	ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
2633		} | T_CALLERID
2634		{
2635	<	ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
2635	>	ConfigGeneral.oper_umodes |= UMODE_CALLERID;
2636		} | T_LOCOPS
2637		{
2638	<	ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
2638	>	ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
2639	>	} | T_NONONREG
2640	>	{
2641	>	ConfigGeneral.oper_umodes |= UMODE_REGONLY;
2642	>	} | T_FARCONNECT
2643	>	{
2644	>	ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
2645	>	} | EXPIRATION
2646	>	{
2647	>	ConfigGeneral.oper_umodes |= UMODE_EXPIRATION;
2648		};
2649
2650	<	general_oper_only_umodes: OPER_ONLY_UMODES
2650	>	general_oper_only_umodes: OPER_ONLY_UMODES
2651		{
2652	<	ConfigFileEntry.oper_only_umodes = 0;
2653	<	} '='  umode_items ';' ;
2652	>	ConfigGeneral.oper_only_umodes = 0;
2653	>	} '=' umode_items ';' ;
2654
2655	<	umode_items:    umode_items ',' umode_item | umode_item;
2656	<	umode_item:     T_BOTS
2743	<	{
2744	<	ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
2745	<	} | T_CCONN
2655	>	umode_items:  umode_items ',' umode_item | umode_item;
2656	>	umode_item: T_CCONN
2657		{
2658	<	ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
2748	<	} | T_CCONN_FULL
2749	<	{
2750	<	ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
2658	>	ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
2659		} | T_DEAF
2660		{
2661	<	ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
2661	>	ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
2662		} | T_DEBUG
2663		{
2664	<	ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
2665	<	} | T_FULL
2666	<	{
2667	<	ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
2664	>	ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
2665	>	} | T_FLOOD
2666	>	{
2667	>	ConfigGeneral.oper_only_umodes |= UMODE_FLOOD;
2668		} | T_SKILL
2669		{
2670	<	ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
2670	>	ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
2671		} | HIDDEN
2672		{
2673	<	ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
2673	>	ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
2674		} | T_NCHANGE
2675		{
2676	<	ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
2676	>	ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
2677		} | T_REJ
2678		{
2679	<	ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
2772	<	} | T_UNAUTH
2773	<	{
2774	<	ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
2679	>	ConfigGeneral.oper_only_umodes |= UMODE_REJ;
2680		} | T_SPY
2681		{
2682	<	ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
2682	>	ConfigGeneral.oper_only_umodes |= UMODE_SPY;
2683		} | T_EXTERNAL
2684		{
2685	<	ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
2781	<	} | T_OPERWALL
2782	<	{
2783	<	ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
2685	>	ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
2686		} | T_SERVNOTICE
2687		{
2688	<	ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
2688	>	ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
2689		} | T_INVISIBLE
2690		{
2691	<	ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
2691	>	ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
2692		} | T_WALLOP
2693		{
2694	<	ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
2694	>	ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
2695		} | T_SOFTCALLERID
2696		{
2697	<	ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
2697	>	ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
2698		} | T_CALLERID
2699		{
2700	<	ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
2700	>	ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
2701		} | T_LOCOPS
2702		{
2703	<	ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
2703	>	ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
2704	>	} | T_NONONREG
2705	>	{
2706	>	ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
2707	>	} | T_FARCONNECT
2708	>	{
2709	>	ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
2710	>	} | EXPIRATION
2711	>	{
2712	>	ConfigGeneral.oper_only_umodes |= UMODE_EXPIRATION;
2713		};
2714
2715		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
2716		{
2717	<	ConfigFileEntry.min_nonwildcard = $3;
2717	>	ConfigGeneral.min_nonwildcard = $3;
2718		};
2719
2720		general_min_nonwildcard_simple: MIN_NONWILDCARD_SIMPLE '=' NUMBER ';'
2721		{
2722	<	ConfigFileEntry.min_nonwildcard_simple = $3;
2722	>	ConfigGeneral.min_nonwildcard_simple = $3;
2723		};
2724
2725		general_default_floodcount: DEFAULT_FLOODCOUNT '=' NUMBER ';'
2726		{
2727	<	ConfigFileEntry.default_floodcount = $3;
2727	>	ConfigGeneral.default_floodcount = $3;
2728	>	};
2729	>
2730	>	general_default_floodtime: DEFAULT_FLOODTIME '=' timespec ';'
2731	>	{
2732	>	ConfigGeneral.default_floodtime = $3;
2733		};
2734
2735
2736		/***************************************************************************
2737	<	*  section channel
2737	>	* channel {} section
2738		***************************************************************************/
2739	<	channel_entry: CHANNEL
2824	<	'{' channel_items '}' ';';
2739	>	channel_entry: CHANNEL '{' channel_items '}' ';';
2740
2741		channel_items:      channel_items channel_item | channel_item;
2742		channel_item:       channel_max_bans |
2743	<	channel_knock_delay | channel_knock_delay_channel |
2744	<	channel_max_chans_per_user | channel_max_chans_per_oper |
2745	<	channel_quiet_on_ban | channel_default_split_user_count |
2746	<	channel_default_split_server_count |
2747	<	channel_no_create_on_split | channel_restrict_channels |
2748	<	channel_no_join_on_split |
2749	<	channel_jflood_count | channel_jflood_time |
2750	<	channel_disable_fake_channels | error;
2743	>	channel_max_bans_large |
2744	>	channel_invite_client_count |
2745	>	channel_invite_client_time |
2746	>	channel_invite_delay_channel |
2747	>	channel_invite_expire_time |
2748	>	channel_knock_client_count |
2749	>	channel_knock_client_time |
2750	>	channel_knock_delay_channel |
2751	>	channel_max_channels |
2752	>	channel_max_invites |
2753	>	channel_default_join_flood_count |
2754	>	channel_default_join_flood_time |
2755	>	channel_disable_fake_channels |
2756	>	channel_enable_extbans |
2757	>	error;
2758	>
2759	>	channel_enable_extbans: ENABLE_EXTBANS '=' TBOOL ';'
2760	>	{
2761	>	ConfigChannel.enable_extbans = yylval.number;
2762	>	};
2763
2764		channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
2765		{
2766		ConfigChannel.disable_fake_channels = yylval.number;
2767		};
2768
2769	<	channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
2769	>	channel_invite_client_count: INVITE_CLIENT_COUNT '=' NUMBER ';'
2770		{
2771	<	ConfigChannel.restrict_channels = yylval.number;
2771	>	ConfigChannel.invite_client_count = $3;
2772		};
2773
2774	<	channel_knock_delay: KNOCK_DELAY '=' timespec ';'
2774	>	channel_invite_client_time: INVITE_CLIENT_TIME '=' timespec ';'
2775		{
2776	<	ConfigChannel.knock_delay = $3;
2776	>	ConfigChannel.invite_client_time = $3;
2777		};
2778
2779	<	channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
2779	>	channel_invite_delay_channel: INVITE_DELAY_CHANNEL '=' timespec ';'
2780		{
2781	<	ConfigChannel.knock_delay_channel = $3;
2781	>	ConfigChannel.invite_delay_channel = $3;
2782		};
2783
2784	<	channel_max_chans_per_user: MAX_CHANS_PER_USER '=' NUMBER ';'
2784	>	channel_invite_expire_time: INVITE_EXPIRE_TIME '=' timespec ';'
2785		{
2786	<	ConfigChannel.max_chans_per_user = $3;
2786	>	ConfigChannel.invite_expire_time = $3;
2787		};
2788
2789	<	channel_max_chans_per_oper: MAX_CHANS_PER_OPER '=' NUMBER ';'
2789	>	channel_knock_client_count: KNOCK_CLIENT_COUNT '=' NUMBER ';'
2790		{
2791	<	ConfigChannel.max_chans_per_oper = $3;
2791	>	ConfigChannel.knock_client_count = $3;
2792		};
2793
2794	<	channel_quiet_on_ban: QUIET_ON_BAN '=' TBOOL ';'
2794	>	channel_knock_client_time: KNOCK_CLIENT_TIME '=' timespec ';'
2795		{
2796	<	ConfigChannel.quiet_on_ban = yylval.number;
2796	>	ConfigChannel.knock_client_time = $3;
2797		};
2798
2799	<	channel_max_bans: MAX_BANS '=' NUMBER ';'
2799	>	channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
2800		{
2801	<	ConfigChannel.max_bans = $3;
2801	>	ConfigChannel.knock_delay_channel = $3;
2802		};
2803
2804	<	channel_default_split_user_count: DEFAULT_SPLIT_USER_COUNT '=' NUMBER ';'
2804	>	channel_max_channels: MAX_CHANNELS '=' NUMBER ';'
2805		{
2806	<	ConfigChannel.default_split_user_count = $3;
2806	>	ConfigChannel.max_channels = $3;
2807		};
2808
2809	<	channel_default_split_server_count: DEFAULT_SPLIT_SERVER_COUNT '=' NUMBER ';'
2809	>	channel_max_invites: MAX_INVITES '=' NUMBER ';'
2810		{
2811	<	ConfigChannel.default_split_server_count = $3;
2811	>	ConfigChannel.max_invites = $3;
2812		};
2813
2814	<	channel_no_create_on_split: NO_CREATE_ON_SPLIT '=' TBOOL ';'
2814	>	channel_max_bans: MAX_BANS '=' NUMBER ';'
2815		{
2816	<	ConfigChannel.no_create_on_split = yylval.number;
2816	>	ConfigChannel.max_bans = $3;
2817		};
2818
2819	<	channel_no_join_on_split: NO_JOIN_ON_SPLIT '=' TBOOL ';'
2819	>	channel_max_bans_large: MAX_BANS_LARGE '=' NUMBER ';'
2820		{
2821	<	ConfigChannel.no_join_on_split = yylval.number;
2821	>	ConfigChannel.max_bans_large = $3;
2822		};
2823
2824	<	channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
2824	>	channel_default_join_flood_count: DEFAULT_JOIN_FLOOD_COUNT '=' NUMBER ';'
2825		{
2826	<	GlobalSetOptions.joinfloodcount = yylval.number;
2826	>	ConfigChannel.default_join_flood_count = yylval.number;
2827		};
2828
2829	<	channel_jflood_time: JOIN_FLOOD_TIME '=' timespec ';'
2829	>	channel_default_join_flood_time: DEFAULT_JOIN_FLOOD_TIME '=' timespec ';'
2830		{
2831	<	GlobalSetOptions.joinfloodtime = yylval.number;
2831	>	ConfigChannel.default_join_flood_time = $3;
2832		};
2833
2834	+
2835		/***************************************************************************
2836	<	*  section serverhide
2836	>	* serverhide {} section
2837		***************************************************************************/
2838	<	serverhide_entry: SERVERHIDE
2911	<	'{' serverhide_items '}' ';';
2838	>	serverhide_entry: SERVERHIDE '{' serverhide_items '}' ';';
2839
2840		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
2841	<	serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
2842	<	serverhide_links_delay |
2843	<	serverhide_hidden | serverhide_hidden_name |
2844	<	serverhide_hide_server_ips |
2841	>	serverhide_item:    serverhide_flatten_links |
2842	>	serverhide_flatten_links_delay |
2843	>	serverhide_flatten_links_file |
2844	>	serverhide_disable_remote_commands |
2845	>	serverhide_hide_servers |
2846	>	serverhide_hide_services |
2847	>	serverhide_hidden |
2848	>	serverhide_hidden_name |
2849	>	serverhide_hide_server_ips |
2850		error;
2851
2852		serverhide_flatten_links: FLATTEN_LINKS '=' TBOOL ';'
#	Line 2923 | Line 2855 | serverhide_flatten_links: FLATTEN_LINKS
2855		ConfigServerHide.flatten_links = yylval.number;
2856		};
2857
2858	<	serverhide_hide_servers: HIDE_SERVERS '=' TBOOL ';'
2858	>	serverhide_flatten_links_delay: FLATTEN_LINKS_DELAY '=' timespec ';'
2859		{
2860		if (conf_parser_ctx.pass == 2)
2861	<	ConfigServerHide.hide_servers = yylval.number;
2861	>	{
2862	>	if ($3 > 0)
2863	>	{
2864	>	event_write_links_file.when = $3;
2865	>	event_add(&event_write_links_file, NULL);
2866	>	}
2867	>	else
2868	>	event_delete(&event_write_links_file);
2869	>
2870	>	ConfigServerHide.flatten_links_delay = $3;
2871	>	}
2872		};
2873
2874	<	serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2874	>	serverhide_flatten_links_file: FLATTEN_LINKS_FILE '=' QSTRING ';'
2875		{
2876		if (conf_parser_ctx.pass == 2)
2877		{
2878	<	MyFree(ConfigServerHide.hidden_name);
2879	<	ConfigServerHide.hidden_name = xstrdup(yylval.string);
2878	>	xfree(ConfigServerHide.flatten_links_file);
2879	>	ConfigServerHide.flatten_links_file = xstrdup(yylval.string);
2880		}
2881		};
2882
2883	<	serverhide_links_delay: LINKS_DELAY '=' timespec ';'
2883	>	serverhide_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
2884		{
2885		if (conf_parser_ctx.pass == 2)
2886	<	{
2887	<	if (($3 > 0) && ConfigServerHide.links_disabled == 1)
2946	<	{
2947	<	eventAddIsh("write_links_file", write_links_file, NULL, $3);
2948	<	ConfigServerHide.links_disabled = 0;
2949	<	}
2886	>	ConfigServerHide.disable_remote_commands = yylval.number;
2887	>	};
2888
2889	<	ConfigServerHide.links_delay = $3;
2889	>	serverhide_hide_servers: HIDE_SERVERS '=' TBOOL ';'
2890	>	{
2891	>	if (conf_parser_ctx.pass == 2)
2892	>	ConfigServerHide.hide_servers = yylval.number;
2893	>	};
2894	>
2895	>	serverhide_hide_services: HIDE_SERVICES '=' TBOOL ';'
2896	>	{
2897	>	if (conf_parser_ctx.pass == 2)
2898	>	ConfigServerHide.hide_services = yylval.number;
2899	>	};
2900	>
2901	>	serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2902	>	{
2903	>	if (conf_parser_ctx.pass == 2)
2904	>	{
2905	>	xfree(ConfigServerHide.hidden_name);
2906	>	ConfigServerHide.hidden_name = xstrdup(yylval.string);
2907		}
2908		};
2909

Comparing ircd-hybrid/trunk/src/conf_parser.y (property svn:keywords):
Revision 1783 by michael, Thu Jan 24 19:26:51 2013 UTC vs.
Revision 9692 by michael, Sat Oct 31 19:05:15 2020 UTC

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

Diff Legend

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