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

Comparing ircd-hybrid/trunk/src/conf_parser.y (property svn:keywords):
Revision 2228 by michael, Thu Jun 13 19:46:30 2013 UTC vs.
Revision 9234 by michael, Fri Jan 31 17:38:34 2020 UTC

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

Diff Legend

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