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 3435 by michael, Thu May 1 13:57:39 2014 UTC vs.
Revision 8607 by michael, Mon Oct 29 21:26:54 2018 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 2000-2014 ircd-hybrid development team
4	>	*  Copyright (c) 2000-2018 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 15 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20		*/
21
#	Line 27 | Line 27
27
28		%{
29
30	–	#define YY_NO_UNPUT
31	–	#include <sys/types.h>
32	–	#include <string.h>
33	–
30		#include "config.h"
31		#include "stdinc.h"
32		#include "ircd.h"
33		#include "list.h"
34	+	#include "parse.h"
35		#include "conf.h"
36		#include "conf_class.h"
37	+	#include "conf_cluster.h"
38	+	#include "conf_gecos.h"
39	+	#include "conf_pseudo.h"
40	+	#include "conf_resv.h"
41	+	#include "conf_service.h"
42	+	#include "conf_shared.h"
43		#include "event.h"
44	+	#include "id.h"
45		#include "log.h"
42	–	#include "client.h"     /* for UMODE_ALL only */
46		#include "irc_string.h"
47		#include "memory.h"
48		#include "modules.h"
49		#include "server.h"
50		#include "hostmask.h"
48	–	#include "send.h"
51		#include "listener.h"
50	–	#include "resv.h"
51	–	#include "numeric.h"
52		#include "user.h"
53		#include "motd.h"
54
55	–	#ifdef HAVE_LIBCRYPTO
56	–	#include <openssl/rsa.h>
57	–	#include <openssl/bio.h>
58	–	#include <openssl/pem.h>
59	–	#include <openssl/dh.h>
60	–	#endif
61	–
62	–	#include "rsa.h"
63	–
55		int yylex(void);
56
57		static struct
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 83 | 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,
#	Line 94 | Line 93 | static struct
93		port,
94		aftype,
95		ping_freq,
96	<	max_perip,
96	>	max_perip_local,
97	>	max_perip_global,
98		con_freq,
99		min_idle,
100		max_idle,
101		max_total,
102	–	max_global,
103	–	max_local,
104	–	max_ident,
102		max_sendq,
103		max_recvq,
104	+	max_channels,
105		cidr_bitlen_ipv4,
106		cidr_bitlen_ipv6,
107		number_per_cidr;
#	Line 112 | Line 110 | static struct
110		static void
111		reset_block_state(void)
112		{
113	<	dlink_node *ptr = NULL, *ptr_next = NULL;
113	>	dlink_node *node = NULL, *node_next = NULL;
114
115	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.mask.list.head)
115	>	DLINK_FOREACH_SAFE(node, node_next, block_state.mask.list.head)
116		{
117	<	MyFree(ptr->data);
118	<	dlinkDelete(ptr, &block_state.mask.list);
119	<	free_dlink_node(ptr);
117	>	xfree(node->data);
118	>	dlinkDelete(node, &block_state.mask.list);
119	>	free_dlink_node(node);
120		}
121
122	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
122	>	DLINK_FOREACH_SAFE(node, node_next, block_state.leaf.list.head)
123		{
124	<	MyFree(ptr->data);
125	<	dlinkDelete(ptr, &block_state.leaf.list);
126	<	free_dlink_node(ptr);
124	>	xfree(node->data);
125	>	dlinkDelete(node, &block_state.leaf.list);
126	>	free_dlink_node(node);
127		}
128
129	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.hub.list.head)
129	>	DLINK_FOREACH_SAFE(node, node_next, block_state.hub.list.head)
130		{
131	<	MyFree(ptr->data);
132	<	dlinkDelete(ptr, &block_state.hub.list);
133	<	free_dlink_node(ptr);
131	>	xfree(node->data);
132	>	dlinkDelete(node, &block_state.hub.list);
133	>	free_dlink_node(node);
134		}
135
136		memset(&block_state, 0, sizeof(block_state));
#	Line 151 | Line 149 | reset_block_state(void)
149		%token  ANTI_NICK_FLOOD
150		%token  ANTI_SPAM_EXIT_MESSAGE_TIME
151		%token  AUTOCONN
152	+	%token  AWAY_COUNT
153	+	%token  AWAY_TIME
154		%token  BYTES KBYTES MBYTES
155		%token  CALLER_ID_WAIT
156		%token  CAN_FLOOD
#	Line 158 | Line 158 | reset_block_state(void)
158		%token  CIDR_BITLEN_IPV4
159		%token  CIDR_BITLEN_IPV6
160		%token  CLASS
161	+	%token  CLOSE
162		%token  CONNECT
163		%token  CONNECTFREQ
164		%token  CYCLE_ON_HOST_CHANGE
165		%token  DEFAULT_FLOODCOUNT
166	<	%token  DEFAULT_SPLIT_SERVER_COUNT
167	<	%token  DEFAULT_SPLIT_USER_COUNT
166	>	%token  DEFAULT_FLOODTIME
167	>	%token  DEFAULT_JOIN_FLOOD_COUNT
168	>	%token  DEFAULT_JOIN_FLOOD_TIME
169	>	%token  DEFAULT_MAX_CLIENTS
170		%token  DENY
171		%token  DESCRIPTION
172		%token  DIE
173		%token  DISABLE_AUTH
174		%token  DISABLE_FAKE_CHANNELS
175		%token  DISABLE_REMOTE_COMMANDS
176	+	%token  DLINE_MIN_CIDR
177	+	%token  DLINE_MIN_CIDR6
178		%token  DOTS_IN_IDENT
174	–	%token  EGDPOOL_PATH
179		%token  EMAIL
180		%token  ENCRYPTED
181		%token  EXCEED_LIMIT
182		%token  EXEMPT
183		%token  FAILED_OPER_NOTICE
184		%token  FLATTEN_LINKS
185	+	%token  FLATTEN_LINKS_DELAY
186	+	%token  FLATTEN_LINKS_FILE
187		%token  GECOS
188		%token  GENERAL
183	–	%token  GLINE
184	–	%token  GLINE_DURATION
185	–	%token  GLINE_ENABLE
186	–	%token  GLINE_EXEMPT
187	–	%token  GLINE_MIN_CIDR
188	–	%token  GLINE_MIN_CIDR6
189	–	%token  GLINE_REQUEST_DURATION
190	–	%token  GLOBAL_KILL
191	–	%token  HAVENT_READ_CONF
189		%token  HIDDEN
190		%token  HIDDEN_NAME
191	+	%token  HIDE_CHANS
192	+	%token  HIDE_IDLE
193		%token  HIDE_IDLE_FROM_OPERS
194		%token  HIDE_SERVER_IPS
195		%token  HIDE_SERVERS
196		%token  HIDE_SERVICES
198	–	%token  HIDE_SPOOF_IPS
197		%token  HOST
198		%token  HUB
199		%token  HUB_MASK
200		%token  IGNORE_BOGUS_TS
201		%token  INVISIBLE_ON_CONNECT
202	+	%token  INVITE_CLIENT_COUNT
203	+	%token  INVITE_CLIENT_TIME
204	+	%token  INVITE_DELAY_CHANNEL
205	+	%token  INVITE_EXPIRE_TIME
206		%token  IP
207		%token  IRCD_AUTH
208		%token  IRCD_FLAGS
209		%token  IRCD_SID
210	<	%token  JOIN_FLOOD_COUNT
209	<	%token  JOIN_FLOOD_TIME
210	>	%token  JOIN
211		%token  KILL
212		%token  KILL_CHASE_TIME_LIMIT
213		%token  KLINE
214		%token  KLINE_EXEMPT
215	<	%token  KNOCK_DELAY
215	>	%token  KLINE_MIN_CIDR
216	>	%token  KLINE_MIN_CIDR6
217	>	%token  KNOCK_CLIENT_COUNT
218	>	%token  KNOCK_CLIENT_TIME
219		%token  KNOCK_DELAY_CHANNEL
220		%token  LEAF_MASK
217	–	%token  LINKS_DELAY
221		%token  LISTEN
222		%token  MASK
223		%token  MAX_ACCEPT
224		%token  MAX_BANS
225	<	%token  MAX_CHANS_PER_OPER
226	<	%token  MAX_CHANS_PER_USER
224	<	%token  MAX_GLOBAL
225	<	%token  MAX_IDENT
225	>	%token  MAX_BANS_LARGE
226	>	%token  MAX_CHANNELS
227		%token  MAX_IDLE
228	<	%token  MAX_LOCAL
228	>	%token  MAX_INVITES
229		%token  MAX_NICK_CHANGES
230		%token  MAX_NICK_LENGTH
231		%token  MAX_NICK_TIME
#	Line 244 | Line 245 | reset_block_state(void)
245		%token  NETWORK_DESC
246		%token  NETWORK_NAME
247		%token  NICK
247	–	%token  NO_CREATE_ON_SPLIT
248	–	%token  NO_JOIN_ON_SPLIT
248		%token  NO_OPER_FLOOD
249		%token  NO_TILDE
250		%token  NUMBER
251		%token  NUMBER_PER_CIDR
252	<	%token  NUMBER_PER_IP
252	>	%token  NUMBER_PER_IP_GLOBAL
253	>	%token  NUMBER_PER_IP_LOCAL
254		%token  OPER_ONLY_UMODES
255	–	%token  OPER_PASS_RESV
255		%token  OPER_UMODES
256		%token  OPERATOR
257		%token  OPERS_BYPASS_CALLERID
#	Line 274 | Line 273 | reset_block_state(void)
273		%token  RESV
274		%token  RESV_EXEMPT
275		%token  RSA_PRIVATE_KEY_FILE
277	–	%token  RSA_PUBLIC_KEY_FILE
276		%token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
277		%token  SEND_PASSWORD
278		%token  SENDQ
#	Line 287 | Line 285 | reset_block_state(void)
285		%token  SSL_CERTIFICATE_FILE
286		%token  SSL_CERTIFICATE_FINGERPRINT
287		%token  SSL_CONNECTION_REQUIRED
288	+	%token  SSL_DH_ELLIPTIC_CURVE
289		%token  SSL_DH_PARAM_FILE
290	+	%token  SSL_MESSAGE_DIGEST_ALGORITHM
291		%token  STATS_E_DISABLED
292		%token  STATS_I_OPER_ONLY
293		%token  STATS_K_OPER_ONLY
294	+	%token  STATS_M_OPER_ONLY
295		%token  STATS_O_OPER_ONLY
296		%token  STATS_P_OPER_ONLY
297		%token  STATS_U_OPER_ONLY
#	Line 298 | Line 299 | reset_block_state(void)
299		%token  T_BOTS
300		%token  T_CALLERID
301		%token  T_CCONN
302	+	%token  T_COMMAND
303		%token  T_CLUSTER
304		%token  T_DEAF
305		%token  T_DEBUG
#	Line 312 | Line 314 | reset_block_state(void)
314		%token  T_IPV6
315		%token  T_LOCOPS
316		%token  T_LOG
315	–	%token  T_MAX_CLIENTS
317		%token  T_NCHANGE
318		%token  T_NONONREG
319	<	%token  T_OPERWALL
319	>	%token  T_OPME
320	>	%token  T_PREPEND
321	>	%token  T_PSEUDO
322		%token  T_RECVQ
323		%token  T_REJ
324		%token  T_RESTART
325		%token  T_SERVER
326		%token  T_SERVICE
324	–	%token  T_SERVICES_NAME
327		%token  T_SERVNOTICE
328		%token  T_SET
329		%token  T_SHARED
#	Line 331 | Line 333 | reset_block_state(void)
333		%token  T_SPY
334		%token  T_SSL
335		%token  T_SSL_CIPHER_LIST
336	<	%token  T_SSL_CLIENT_METHOD
335	<	%token  T_SSL_SERVER_METHOD
336	<	%token  T_SSLV3
337	<	%token  T_TLSV1
336	>	%token  T_TARGET
337		%token  T_UMODES
338		%token  T_UNAUTH
339		%token  T_UNDLINE
#	Line 345 | Line 344 | reset_block_state(void)
344		%token  T_WALLOPS
345		%token  T_WEBIRC
346		%token  TBOOL
347	+	%token  THROTTLE_COUNT
348		%token  THROTTLE_TIME
349		%token  TKLINE_EXPIRE_NOTICES
350		%token  TMASKED
351	–	%token  TRUE_NO_OPER_FLOOD
351		%token  TS_MAX_DELTA
352		%token  TS_WARN_DELTA
353		%token  TWODOTS
354		%token  TYPE
355		%token  UNKLINE
357	–	%token  USE_EGD
356		%token  USE_LOGGING
357		%token  USER
358		%token  VHOST
359		%token  VHOST6
360	<	%token  WARN_NO_NLINE
360	>	%token  WARN_NO_CONNECT_BLOCK
361	>	%token  WHOIS
362	>	%token  WHOWAS_HISTORY_LENGTH
363		%token  XLINE
364	+	%token  XLINE_EXEMPT
365
366		%type  <string> QSTRING
367		%type  <number> NUMBER
#	Line 377 | Line 378 | conf:
378		conf_item:        admin_entry
379		| logging_entry
380		| oper_entry
381	<	| channel_entry
381	>	| channel_entry
382		| class_entry
383		| listen_entry
384		| auth_entry
385		| serverinfo_entry
386	<	| serverhide_entry
386	>	| serverhide_entry
387		| resv_entry
388		| service_entry
389		| shared_entry
390	<	| cluster_entry
390	>	| cluster_entry
391		| connect_entry
392		| kill_entry
393		| deny_entry
394	<	| exempt_entry
395	<	| general_entry
394	>	| exempt_entry
395	>	| general_entry
396		| gecos_entry
397		| modules_entry
398		| motd_entry
399	+	| pseudo_entry
400		| error ';'
401		| error '}'
402		;
403
404
405		timespec_: { $$ = 0; } | timespec;
406	<	timespec:       NUMBER timespec_
407	<	{
408	<	$$ = $1 + $2;
409	<	}
410	<	| NUMBER SECONDS timespec_
411	<	{
412	<	$$ = $1 + $3;
413	<	}
414	<	| NUMBER MINUTES timespec_
415	<	{
416	<	$$ = $1 * 60 + $3;
417	<	}
418	<	| NUMBER HOURS timespec_
419	<	{
420	<	$$ = $1 * 60 * 60 + $3;
421	<	}
420	<	| NUMBER DAYS timespec_
421	<	{
422	<	$$ = $1 * 60 * 60 * 24 + $3;
423	<	}
424	<	| NUMBER WEEKS timespec_
425	<	{
426	<	$$ = $1 * 60 * 60 * 24 * 7 + $3;
427	<	}
428	<	| NUMBER MONTHS timespec_
429	<	{
430	<	$$ = $1 * 60 * 60 * 24 * 7 * 4 + $3;
431	<	}
432	<	| NUMBER YEARS timespec_
433	<	{
434	<	$$ = $1 * 60 * 60 * 24 * 365 + $3;
435	<	}
436	<	;
437	<
438	<	sizespec_:      { $$ = 0; } | sizespec;
439	<	sizespec:       NUMBER sizespec_ { $$ = $1 + $2; }
440	<	| NUMBER BYTES sizespec_ { $$ = $1 + $3; }
441	<	| NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; }
442	<	| NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
443	<	;
406	>	timespec:  NUMBER timespec_         { $$ = $1 + $2; } |
407	>	NUMBER SECONDS timespec_ { $$ = $1 + $3; } |
408	>	NUMBER MINUTES timespec_ { $$ = $1 * 60 + $3; } |
409	>	NUMBER HOURS timespec_   { $$ = $1 * 60 * 60 + $3; } |
410	>	NUMBER DAYS timespec_    { $$ = $1 * 60 * 60 * 24 + $3; } |
411	>	NUMBER WEEKS timespec_   { $$ = $1 * 60 * 60 * 24 * 7 + $3; } |
412	>	NUMBER MONTHS timespec_  { $$ = $1 * 60 * 60 * 24 * 7 * 4 + $3; } |
413	>	NUMBER YEARS timespec_   { $$ = $1 * 60 * 60 * 24 * 365 + $3; }
414	>	;
415	>
416	>	sizespec_:  { $$ = 0; } | sizespec;
417	>	sizespec:   NUMBER sizespec_ { $$ = $1 + $2; } |
418	>	NUMBER BYTES sizespec_ { $$ = $1 + $3; } |
419	>	NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; } |
420	>	NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
421	>	;
422
423
424		/***************************************************************************
425	<	*  section modules
425	>	* modules {} section
426		***************************************************************************/
427	<	modules_entry: MODULES
450	<	'{' modules_items '}' ';';
427	>	modules_entry: MODULES '{' modules_items '}' ';';
428
429		modules_items:  modules_items modules_item | modules_item;
430		modules_item:   modules_module | modules_path | error ';' ;
#	Line 465 | Line 442 | modules_path: PATH '=' QSTRING ';'
442		};
443
444
445	+	/***************************************************************************
446	+	* serverinfo {}  section
447	+	***************************************************************************/
448		serverinfo_entry: SERVERINFO '{' serverinfo_items '}' ';';
449
450		serverinfo_items:       serverinfo_items serverinfo_item | serverinfo_item ;
451	<	serverinfo_item:        serverinfo_name | serverinfo_vhost |
452	<	serverinfo_hub | serverinfo_description |
453	<	serverinfo_network_name | serverinfo_network_desc |
454	<	serverinfo_max_clients | serverinfo_max_nick_length |
455	<	serverinfo_max_topic_length | serverinfo_ssl_dh_param_file |
456	<	serverinfo_rsa_private_key_file | serverinfo_vhost6 |
457	<	serverinfo_sid | serverinfo_ssl_certificate_file |
458	<	serverinfo_ssl_client_method | serverinfo_ssl_server_method |
451	>	serverinfo_item:        serverinfo_name |
452	>	serverinfo_vhost |
453	>	serverinfo_hub |
454	>	serverinfo_description |
455	>	serverinfo_network_name |
456	>	serverinfo_network_desc |
457	>	serverinfo_default_max_clients |
458	>	serverinfo_max_nick_length |
459	>	serverinfo_max_topic_length |
460	>	serverinfo_ssl_dh_param_file |
461	>	serverinfo_ssl_dh_elliptic_curve |
462	>	serverinfo_rsa_private_key_file |
463	>	serverinfo_vhost6 |
464	>	serverinfo_sid |
465	>	serverinfo_ssl_certificate_file |
466		serverinfo_ssl_cipher_list |
467	<	error ';' ;
468	<
482	<
483	<	serverinfo_ssl_client_method: T_SSL_CLIENT_METHOD '=' client_method_types ';' ;
484	<	serverinfo_ssl_server_method: T_SSL_SERVER_METHOD '=' server_method_types ';' ;
467	>	serverinfo_ssl_message_digest_algorithm |
468	>	error ';' ;
469
486	–	client_method_types: client_method_types ',' client_method_type_item | client_method_type_item;
487	–	client_method_type_item: T_SSLV3
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_SSLv3);
492	–	#endif
493	–	} | T_TLSV1
494	–	{
495	–	#ifdef HAVE_LIBCRYPTO
496	–	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
497	–	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_TLSv1);
498	–	#endif
499	–	};
500	–
501	–	server_method_types: server_method_types ',' server_method_type_item | server_method_type_item;
502	–	server_method_type_item: T_SSLV3
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_SSLv3);
507	–	#endif
508	–	} | T_TLSV1
509	–	{
510	–	#ifdef HAVE_LIBCRYPTO
511	–	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
512	–	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
513	–	#endif
514	–	};
470
471		serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
472		{
473	<	#ifdef HAVE_LIBCRYPTO
519	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
473	>	if (conf_parser_ctx.pass == 2)
474		{
475	<	if (!ServerInfo.rsa_private_key_file)
476	<	{
523	<	conf_error_report("No rsa_private_key_file specified, SSL disabled");
524	<	break;
525	<	}
526	<
527	<	if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
528	<	SSL_FILETYPE_PEM) <= 0 ||
529	<	SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
530	<	SSL_FILETYPE_PEM) <= 0)
531	<	{
532	<	report_crypto_errors();
533	<	conf_error_report("Could not open/read certificate file");
534	<	break;
535	<	}
536	<
537	<	if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
538	<	SSL_FILETYPE_PEM) <= 0 ||
539	<	SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
540	<	SSL_FILETYPE_PEM) <= 0)
541	<	{
542	<	report_crypto_errors();
543	<	conf_error_report("Could not read RSA private key");
544	<	break;
545	<	}
546	<
547	<	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
548	<	!SSL_CTX_check_private_key(ServerInfo.client_ctx))
549	<	{
550	<	report_crypto_errors();
551	<	conf_error_report("Could not read RSA private key");
552	<	break;
553	<	}
475	>	xfree(ConfigServerInfo.ssl_certificate_file);
476	>	ConfigServerInfo.ssl_certificate_file = xstrdup(yylval.string);
477		}
555	–	#endif
478		};
479
480		serverinfo_rsa_private_key_file: RSA_PRIVATE_KEY_FILE '=' QSTRING ';'
481		{
482	<	#ifdef HAVE_LIBCRYPTO
561	<	BIO *file = NULL;
562	<
563	<	if (conf_parser_ctx.pass != 1)
564	<	break;
565	<
566	<	if (ServerInfo.rsa_private_key)
567	<	{
568	<	RSA_free(ServerInfo.rsa_private_key);
569	<	ServerInfo.rsa_private_key = NULL;
570	<	}
571	<
572	<	if (ServerInfo.rsa_private_key_file)
573	<	{
574	<	MyFree(ServerInfo.rsa_private_key_file);
575	<	ServerInfo.rsa_private_key_file = NULL;
576	<	}
577	<
578	<	ServerInfo.rsa_private_key_file = xstrdup(yylval.string);
579	<
580	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
581	<	{
582	<	conf_error_report("File open failed, ignoring");
583	<	break;
584	<	}
585	<
586	<	ServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
587	<
588	<	BIO_set_close(file, BIO_CLOSE);
589	<	BIO_free(file);
590	<
591	<	if (ServerInfo.rsa_private_key == NULL)
482	>	if (conf_parser_ctx.pass == 2)
483		{
484	<	conf_error_report("Couldn't extract key, ignoring");
485	<	break;
484	>	xfree(ConfigServerInfo.rsa_private_key_file);
485	>	ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
486		}
487	+	};
488
489	<	if (!RSA_check_key(ServerInfo.rsa_private_key))
489	>	serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
490	>	{
491	>	if (conf_parser_ctx.pass == 2)
492		{
493	<	RSA_free(ServerInfo.rsa_private_key);
494	<	ServerInfo.rsa_private_key = NULL;
601	<
602	<	conf_error_report("Invalid key, ignoring");
603	<	break;
493	>	xfree(ConfigServerInfo.ssl_dh_param_file);
494	>	ConfigServerInfo.ssl_dh_param_file = xstrdup(yylval.string);
495		}
496	+	};
497
498	<	if (RSA_size(ServerInfo.rsa_private_key) < 128)
498	>	serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
499	>	{
500	>	if (conf_parser_ctx.pass == 2)
501		{
502	<	RSA_free(ServerInfo.rsa_private_key);
503	<	ServerInfo.rsa_private_key = NULL;
610	<
611	<	conf_error_report("Ignoring serverinfo::rsa_private_key_file -- need at least a 1024 bit key size");
502	>	xfree(ConfigServerInfo.ssl_cipher_list);
503	>	ConfigServerInfo.ssl_cipher_list = xstrdup(yylval.string);
504		}
613	–	#endif
505		};
506
507	<	serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
507	>	serverinfo_ssl_message_digest_algorithm: SSL_MESSAGE_DIGEST_ALGORITHM '=' QSTRING ';'
508		{
509	<	/* TBD - XXX: error reporting */
619	<	#ifdef HAVE_LIBCRYPTO
620	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
509	>	if (conf_parser_ctx.pass == 2)
510		{
511	<	BIO *file = BIO_new_file(yylval.string, "r");
512	<
624	<	if (file)
625	<	{
626	<	DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
627	<
628	<	BIO_free(file);
629	<
630	<	if (dh)
631	<	{
632	<	if (DH_size(dh) < 128)
633	<	conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
634	<	else
635	<	SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
636	<
637	<	DH_free(dh);
638	<	}
639	<	}
511	>	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
512	>	ConfigServerInfo.ssl_message_digest_algorithm = xstrdup(yylval.string);
513		}
514	<	#endif
642	<	};
514	>	}
515
516	<	serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
516	>	serverinfo_ssl_dh_elliptic_curve: SSL_DH_ELLIPTIC_CURVE '=' QSTRING ';'
517		{
518	<	#ifdef HAVE_LIBCRYPTO
519	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
520	<	SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
521	<	#endif
518	>	if (conf_parser_ctx.pass == 2)
519	>	{
520	>	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
521	>	ConfigServerInfo.ssl_dh_elliptic_curve = xstrdup(yylval.string);
522	>	}
523		};
524
525		serverinfo_name: NAME '=' QSTRING ';'
526		{
527	<	/* this isn't rehashable */
528	<	if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
527	>	/* This isn't rehashable */
528	>	if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.name)
529		{
530	<	if (valid_servname(yylval.string))
531	<	ServerInfo.name = xstrdup(yylval.string);
530	>	if (server_valid_name(yylval.string))
531	>	ConfigServerInfo.name = xstrdup(yylval.string);
532		else
533		{
534		conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
535	<	exit(0);
535	>	exit(EXIT_FAILURE);
536		}
537		}
538		};
539
540		serverinfo_sid: IRCD_SID '=' QSTRING ';'
541		{
542	<	/* this isn't rehashable */
543	<	if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
542	>	/* This isn't rehashable */
543	>	if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.sid)
544		{
545		if (valid_sid(yylval.string))
546	<	ServerInfo.sid = xstrdup(yylval.string);
546	>	ConfigServerInfo.sid = xstrdup(yylval.string);
547		else
548		{
549		conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
550	<	exit(0);
550	>	exit(EXIT_FAILURE);
551		}
552		}
553		};
#	Line 683 | Line 556 | serverinfo_description: DESCRIPTION '='
556		{
557		if (conf_parser_ctx.pass == 2)
558		{
559	<	MyFree(ServerInfo.description);
560	<	ServerInfo.description = xstrdup(yylval.string);
559	>	xfree(ConfigServerInfo.description);
560	>	ConfigServerInfo.description = xstrdup(yylval.string);
561	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
562		}
563		};
564
#	Line 694 | Line 568 | serverinfo_network_name: NETWORK_NAME '=
568		{
569		char *p;
570
571	<	if ((p = strchr(yylval.string, ' ')) != NULL)
572	<	p = '\0';
571	>	if ((p = strchr(yylval.string, ' ')))
572	>	*p = '\0';
573
574	<	MyFree(ServerInfo.network_name);
575	<	ServerInfo.network_name = xstrdup(yylval.string);
574	>	xfree(ConfigServerInfo.network_name);
575	>	ConfigServerInfo.network_name = xstrdup(yylval.string);
576		}
577		};
578
#	Line 707 | Line 581 | serverinfo_network_desc: NETWORK_DESC '=
581		if (conf_parser_ctx.pass != 2)
582		break;
583
584	<	MyFree(ServerInfo.network_desc);
585	<	ServerInfo.network_desc = xstrdup(yylval.string);
584	>	xfree(ConfigServerInfo.network_desc);
585	>	ConfigServerInfo.network_desc = xstrdup(yylval.string);
586		};
587
588		serverinfo_vhost: VHOST '=' QSTRING ';'
#	Line 727 | Line 601 | serverinfo_vhost: VHOST '=' QSTRING ';'
601		ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
602		else
603		{
604	<	assert(res != NULL);
604	>	assert(res);
605
606	<	memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
607	<	ServerInfo.ip.ss.ss_family = res->ai_family;
608	<	ServerInfo.ip.ss_len = res->ai_addrlen;
606	>	memcpy(&ConfigServerInfo.ip, res->ai_addr, res->ai_addrlen);
607	>	ConfigServerInfo.ip.ss.ss_family = res->ai_family;
608	>	ConfigServerInfo.ip.ss_len = res->ai_addrlen;
609		freeaddrinfo(res);
610
611	<	ServerInfo.specific_ipv4_vhost = 1;
611	>	ConfigServerInfo.specific_ipv4_vhost = 1;
612		}
613		}
614		};
615
616		serverinfo_vhost6: VHOST6 '=' QSTRING ';'
617		{
744	–	#ifdef IPV6
618		if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
619		{
620		struct addrinfo hints, *res;
#	Line 756 | Line 629 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
629		ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
630		else
631		{
632	<	assert(res != NULL);
632	>	assert(res);
633
634	<	memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
635	<	ServerInfo.ip6.ss.ss_family = res->ai_family;
636	<	ServerInfo.ip6.ss_len = res->ai_addrlen;
634	>	memcpy(&ConfigServerInfo.ip6, res->ai_addr, res->ai_addrlen);
635	>	ConfigServerInfo.ip6.ss.ss_family = res->ai_family;
636	>	ConfigServerInfo.ip6.ss_len = res->ai_addrlen;
637		freeaddrinfo(res);
638
639	<	ServerInfo.specific_ipv6_vhost = 1;
639	>	ConfigServerInfo.specific_ipv6_vhost = 1;
640		}
641		}
769	–	#endif
642		};
643
644	<	serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
644	>	serverinfo_default_max_clients: DEFAULT_MAX_CLIENTS '=' NUMBER ';'
645		{
646		if (conf_parser_ctx.pass != 2)
647		break;
648
649		if ($3 < MAXCLIENTS_MIN)
650		{
651	<	char buf[IRCD_BUFSIZE];
651	>	char buf[IRCD_BUFSIZE] = "";
652
653		snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
654		conf_error_report(buf);
655	<	ServerInfo.max_clients = MAXCLIENTS_MIN;
655	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MIN;
656		}
657		else if ($3 > MAXCLIENTS_MAX)
658		{
659	<	char buf[IRCD_BUFSIZE];
659	>	char buf[IRCD_BUFSIZE] = "";
660
661		snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
662		conf_error_report(buf);
663	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
663	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
664		}
665		else
666	<	ServerInfo.max_clients = $3;
666	>	ConfigServerInfo.default_max_clients = $3;
667		};
668
669		serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
#	Line 802 | Line 674 | serverinfo_max_nick_length: MAX_NICK_LEN
674		if ($3 < 9)
675		{
676		conf_error_report("max_nick_length too low, setting to 9");
677	<	ServerInfo.max_nick_length = 9;
677	>	ConfigServerInfo.max_nick_length = 9;
678		}
679		else if ($3 > NICKLEN)
680		{
681	<	char buf[IRCD_BUFSIZE];
681	>	char buf[IRCD_BUFSIZE] = "";
682
683		snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
684		conf_error_report(buf);
685	<	ServerInfo.max_nick_length = NICKLEN;
685	>	ConfigServerInfo.max_nick_length = NICKLEN;
686		}
687		else
688	<	ServerInfo.max_nick_length = $3;
688	>	ConfigServerInfo.max_nick_length = $3;
689		};
690
691		serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
#	Line 824 | Line 696 | serverinfo_max_topic_length: MAX_TOPIC_L
696		if ($3 < 80)
697		{
698		conf_error_report("max_topic_length too low, setting to 80");
699	<	ServerInfo.max_topic_length = 80;
699	>	ConfigServerInfo.max_topic_length = 80;
700		}
701		else if ($3 > TOPICLEN)
702		{
703	<	char buf[IRCD_BUFSIZE];
703	>	char buf[IRCD_BUFSIZE] = "";
704
705		snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
706		conf_error_report(buf);
707	<	ServerInfo.max_topic_length = TOPICLEN;
707	>	ConfigServerInfo.max_topic_length = TOPICLEN;
708		}
709		else
710	<	ServerInfo.max_topic_length = $3;
710	>	ConfigServerInfo.max_topic_length = $3;
711		};
712
713		serverinfo_hub: HUB '=' TBOOL ';'
714		{
715		if (conf_parser_ctx.pass == 2)
716	<	ServerInfo.hub = yylval.number;
716	>	ConfigServerInfo.hub = yylval.number;
717		};
718
719	+
720		/***************************************************************************
721	<	* admin section
721	>	* admin {} section
722		***************************************************************************/
723		admin_entry: ADMIN  '{' admin_items '}' ';' ;
724
725		admin_items: admin_items admin_item | admin_item;
726	<	admin_item:  admin_name | admin_description |
727	<	admin_email | error ';' ;
726	>	admin_item:  admin_name |
727	>	admin_description |
728	>	admin_email |
729	>	error ';' ;
730
731		admin_name: NAME '=' QSTRING ';'
732		{
733		if (conf_parser_ctx.pass != 2)
734		break;
735
736	<	MyFree(AdminInfo.name);
737	<	AdminInfo.name = xstrdup(yylval.string);
736	>	xfree(ConfigAdminInfo.name);
737	>	ConfigAdminInfo.name = xstrdup(yylval.string);
738		};
739
740		admin_email: EMAIL '=' QSTRING ';'
#	Line 867 | Line 742 | admin_email: EMAIL '=' QSTRING ';'
742		if (conf_parser_ctx.pass != 2)
743		break;
744
745	<	MyFree(AdminInfo.email);
746	<	AdminInfo.email = xstrdup(yylval.string);
745	>	xfree(ConfigAdminInfo.email);
746	>	ConfigAdminInfo.email = xstrdup(yylval.string);
747		};
748
749		admin_description: DESCRIPTION '=' QSTRING ';'
#	Line 876 | Line 751 | admin_description: DESCRIPTION '=' QSTRI
751		if (conf_parser_ctx.pass != 2)
752		break;
753
754	<	MyFree(AdminInfo.description);
755	<	AdminInfo.description = xstrdup(yylval.string);
754	>	xfree(ConfigAdminInfo.description);
755	>	ConfigAdminInfo.description = xstrdup(yylval.string);
756		};
757
758	+
759		/***************************************************************************
760	<	* motd section
760	>	* motd {} section
761		***************************************************************************/
762		motd_entry: MOTD
763		{
#	Line 889 | Line 765 | motd_entry: MOTD
765		reset_block_state();
766		} '{' motd_items '}' ';'
767		{
768	<	dlink_node *ptr = NULL;
768	>	dlink_node *node = NULL;
769
770		if (conf_parser_ctx.pass != 2)
771		break;
#	Line 897 | Line 773 | motd_entry: MOTD
773		if (!block_state.file.buf[0])
774		break;
775
776	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
777	<	motd_add(ptr->data, block_state.file.buf);
776	>	DLINK_FOREACH(node, block_state.mask.list.head)
777	>	motd_add(node->data, block_state.file.buf);
778		};
779
780		motd_items: motd_items motd_item | motd_item;
#	Line 916 | Line 792 | motd_file: T_FILE '=' QSTRING ';'
792		strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
793		};
794
795	+
796	+	/***************************************************************************
797	+	* pseudo {} section
798	+	***************************************************************************/
799	+	pseudo_entry: T_PSEUDO
800	+	{
801	+	if (conf_parser_ctx.pass == 2)
802	+	reset_block_state();
803	+	} '{' pseudo_items '}' ';'
804	+	{
805	+	if (conf_parser_ctx.pass != 2)
806	+	break;
807	+
808	+	if (!block_state.command.buf[0] ||
809	+	!block_state.name.buf[0] ||
810	+	!block_state.nick.buf[0] ||
811	+	!block_state.host.buf[0])
812	+	break;
813	+
814	+	pseudo_register(block_state.name.buf, block_state.nick.buf, block_state.host.buf,
815	+	block_state.prepend.buf, block_state.command.buf);
816	+	};
817	+
818	+	pseudo_items: pseudo_items pseudo_item | pseudo_item;
819	+	pseudo_item:  pseudo_command | pseudo_prepend | pseudo_name | pseudo_target | error ';' ;
820	+
821	+	pseudo_command: T_COMMAND '=' QSTRING ';'
822	+	{
823	+	if (conf_parser_ctx.pass == 2)
824	+	strlcpy(block_state.command.buf, yylval.string, sizeof(block_state.command.buf));
825	+	};
826	+
827	+	pseudo_name: NAME '=' QSTRING ';'
828	+	{
829	+	if (conf_parser_ctx.pass == 2)
830	+	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
831	+	};
832	+
833	+	pseudo_prepend: T_PREPEND '=' QSTRING ';'
834	+	{
835	+	if (conf_parser_ctx.pass == 2)
836	+	strlcpy(block_state.prepend.buf, yylval.string, sizeof(block_state.prepend.buf));
837	+	};
838	+
839	+	pseudo_target: T_TARGET '=' QSTRING ';'
840	+	{
841	+	if (conf_parser_ctx.pass == 2)
842	+	{
843	+	struct split_nuh_item nuh;
844	+
845	+	nuh.nuhmask  = yylval.string;
846	+	nuh.nickptr  = NULL;
847	+	nuh.userptr  = block_state.nick.buf;
848	+	nuh.hostptr  = block_state.host.buf;
849	+	nuh.nicksize = 0;
850	+	nuh.usersize = sizeof(block_state.nick.buf);
851	+	nuh.hostsize = sizeof(block_state.host.buf);
852	+
853	+	split_nuh(&nuh);
854	+	}
855	+	};
856	+
857	+
858		/***************************************************************************
859	<	*  section logging
859	>	* log {} section
860		***************************************************************************/
861		logging_entry:          T_LOG  '{' logging_items '}' ';' ;
862		logging_items:          logging_items logging_item | logging_item ;
863
864	<	logging_item:           logging_use_logging | logging_file_entry |
865	<	error ';' ;
864	>	logging_item:           logging_use_logging | logging_file_entry |
865	>	error ';' ;
866
867		logging_use_logging: USE_LOGGING '=' TBOOL ';'
868		{
869		if (conf_parser_ctx.pass == 2)
870	<	ConfigLoggingEntry.use_logging = yylval.number;
870	>	ConfigLog.use_logging = yylval.number;
871		};
872
873		logging_file_entry:
#	Line 982 | Line 921 | logging_file_type_item:  USER
921		{
922		if (conf_parser_ctx.pass == 2)
923		block_state.type.value = LOG_TYPE_OPER;
985	–	} | GLINE
986	–	{
987	–	if (conf_parser_ctx.pass == 2)
988	–	block_state.type.value = LOG_TYPE_GLINE;
924		} | XLINE
925		{
926		if (conf_parser_ctx.pass == 2)
#	Line 1014 | Line 949 | logging_file_type_item:  USER
949
950
951		/***************************************************************************
952	<	* section oper
952	>	* operator {} section
953		***************************************************************************/
954		oper_entry: OPERATOR
955		{
#	Line 1025 | Line 960 | oper_entry: OPERATOR
960		block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
961		} '{' oper_items '}' ';'
962		{
963	<	dlink_node *ptr = NULL;
963	>	dlink_node *node = NULL;
964
965		if (conf_parser_ctx.pass != 2)
966		break;
967
968		if (!block_state.name.buf[0])
969		break;
970	<	#ifdef HAVE_LIBCRYPTO
1036	<	if (!block_state.file.buf[0] &&
1037	<	!block_state.rpass.buf[0])
1038	<	break;
1039	<	#else
970	>
971		if (!block_state.rpass.buf[0])
972		break;
1042	–	#endif
973
974	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
974	>	DLINK_FOREACH(node, block_state.mask.list.head)
975		{
976		struct MaskItem *conf = NULL;
977		struct split_nuh_item nuh;
978	+	char *s = node->data;
979	+
980	+	if (EmptyString(s))
981	+	continue;
982
983	<	nuh.nuhmask  = ptr->data;
983	>	nuh.nuhmask  = s;
984		nuh.nickptr  = NULL;
985		nuh.userptr  = block_state.user.buf;
986		nuh.hostptr  = block_state.host.buf;
#	Line 1066 | Line 1000 | oper_entry: OPERATOR
1000		if (block_state.rpass.buf[0])
1001		conf->passwd = xstrdup(block_state.rpass.buf);
1002
1003	+	if (block_state.whois.buf[0])
1004	+	conf->whois = xstrdup(block_state.whois.buf);
1005	+
1006		conf->flags = block_state.flags.value;
1007		conf->modes = block_state.modes.value;
1008		conf->port  = block_state.port.value;
1009		conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
1010
1011		conf_add_class_to_conf(conf, block_state.class.buf);
1075	–
1076	–	#ifdef HAVE_LIBCRYPTO
1077	–	if (block_state.file.buf[0])
1078	–	{
1079	–	BIO *file = NULL;
1080	–	RSA *pkey = NULL;
1081	–
1082	–	if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
1083	–	{
1084	–	conf_error_report("Ignoring rsa_public_key_file -- file doesn't exist");
1085	–	break;
1086	–	}
1087	–
1088	–	if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
1089	–	conf_error_report("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1090	–
1091	–	conf->rsa_public_key = pkey;
1092	–	BIO_set_close(file, BIO_CLOSE);
1093	–	BIO_free(file);
1094	–	}
1095	–	#endif /* HAVE_LIBCRYPTO */
1012		}
1013		};
1014
1015		oper_items:     oper_items oper_item | oper_item;
1016	<	oper_item:      oper_name | oper_user | oper_password |
1017	<	oper_umodes | oper_class | oper_encrypted |
1018	<	oper_rsa_public_key_file | oper_ssl_certificate_fingerprint |
1019	<	oper_ssl_connection_required |
1020	<	oper_flags | error ';' ;
1016	>	oper_item:      oper_name |
1017	>	oper_user |
1018	>	oper_password |
1019	>	oper_whois |
1020	>	oper_umodes |
1021	>	oper_class |
1022	>	oper_encrypted |
1023	>	oper_ssl_certificate_fingerprint |
1024	>	oper_ssl_connection_required |
1025	>	oper_flags |
1026	>	error ';' ;
1027
1028		oper_name: NAME '=' QSTRING ';'
1029		{
#	Line 1121 | Line 1043 | oper_password: PASSWORD '=' QSTRING ';'
1043		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1044		};
1045
1046	+	oper_whois: WHOIS '=' QSTRING ';'
1047	+	{
1048	+	if (conf_parser_ctx.pass == 2)
1049	+	strlcpy(block_state.whois.buf, yylval.string, sizeof(block_state.whois.buf));
1050	+	};
1051	+
1052		oper_encrypted: ENCRYPTED '=' TBOOL ';'
1053		{
1054		if (conf_parser_ctx.pass != 2)
#	Line 1132 | Line 1060 | oper_encrypted: ENCRYPTED '=' TBOOL ';'
1060		block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1061		};
1062
1135	–	oper_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
1136	–	{
1137	–	if (conf_parser_ctx.pass == 2)
1138	–	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
1139	–	};
1140	–
1063		oper_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
1064		{
1065		if (conf_parser_ctx.pass == 2)
#	Line 1192 | Line 1114 | oper_umodes_item:  T_BOTS
1114		{
1115		if (conf_parser_ctx.pass == 2)
1116		block_state.modes.value |= UMODE_HIDDEN;
1117	+	} | HIDE_CHANS
1118	+	{
1119	+	if (conf_parser_ctx.pass == 2)
1120	+	block_state.modes.value |= UMODE_HIDECHANS;
1121	+	} | HIDE_IDLE
1122	+	{
1123	+	if (conf_parser_ctx.pass == 2)
1124	+	block_state.modes.value |= UMODE_HIDEIDLE;
1125		} | T_SKILL
1126		{
1127		if (conf_parser_ctx.pass == 2)
#	Line 1216 | Line 1146 | oper_umodes_item:  T_BOTS
1146		{
1147		if (conf_parser_ctx.pass == 2)
1148		block_state.modes.value |= UMODE_EXTERNAL;
1219	–	} | T_OPERWALL
1220	–	{
1221	–	if (conf_parser_ctx.pass == 2)
1222	–	block_state.modes.value |= UMODE_OPERWALL;
1149		} | T_SERVNOTICE
1150		{
1151		if (conf_parser_ctx.pass == 2)
#	Line 1288 | Line 1214 | oper_flags_item: KILL ':' REMOTE
1214		} | KLINE
1215		{
1216		if (conf_parser_ctx.pass == 2)
1217	<	block_state.port.value |= OPER_FLAG_K;
1217	>	block_state.port.value |= OPER_FLAG_KLINE;
1218		} | UNKLINE
1219		{
1220		if (conf_parser_ctx.pass == 2)
#	Line 1309 | Line 1235 | oper_flags_item: KILL ':' REMOTE
1235		{
1236		if (conf_parser_ctx.pass == 2)
1237		block_state.port.value |= OPER_FLAG_UNXLINE;
1312	–	} | GLINE
1313	–	{
1314	–	if (conf_parser_ctx.pass == 2)
1315	–	block_state.port.value |= OPER_FLAG_GLINE;
1238		} | DIE
1239		{
1240		if (conf_parser_ctx.pass == 2)
#	Line 1321 | Line 1243 | oper_flags_item: KILL ':' REMOTE
1243		{
1244		if (conf_parser_ctx.pass == 2)
1245		block_state.port.value |= OPER_FLAG_RESTART;
1246	+	} | REHASH ':' REMOTE
1247	+	{
1248	+	if (conf_parser_ctx.pass == 2)
1249	+	block_state.port.value |= OPER_FLAG_REHASH_REMOTE;
1250		} | REHASH
1251		{
1252		if (conf_parser_ctx.pass == 2)
#	Line 1329 | Line 1255 | oper_flags_item: KILL ':' REMOTE
1255		{
1256		if (conf_parser_ctx.pass == 2)
1257		block_state.port.value |= OPER_FLAG_ADMIN;
1332	–	} | T_OPERWALL
1333	–	{
1334	–	if (conf_parser_ctx.pass == 2)
1335	–	block_state.port.value |= OPER_FLAG_OPERWALL;
1258		} | T_GLOBOPS
1259		{
1260		if (conf_parser_ctx.pass == 2)
#	Line 1357 | Line 1279 | oper_flags_item: KILL ':' REMOTE
1279		{
1280		if (conf_parser_ctx.pass == 2)
1281		block_state.port.value |= OPER_FLAG_MODULE;
1282	+	} | T_OPME
1283	+	{
1284	+	if (conf_parser_ctx.pass == 2)
1285	+	block_state.port.value |= OPER_FLAG_OPME;
1286	+	} | NICK ':' RESV
1287	+	{
1288	+	if (conf_parser_ctx.pass == 2)
1289	+	block_state.port.value |= OPER_FLAG_NICK_RESV;
1290	+	} | JOIN ':' RESV
1291	+	{
1292	+	if (conf_parser_ctx.pass == 2)
1293	+	block_state.port.value |= OPER_FLAG_JOIN_RESV;
1294	+	} | RESV
1295	+	{
1296	+	if (conf_parser_ctx.pass == 2)
1297	+	block_state.port.value |= OPER_FLAG_RESV;
1298	+	} | T_UNRESV
1299	+	{
1300	+	if (conf_parser_ctx.pass == 2)
1301	+	block_state.port.value |= OPER_FLAG_UNRESV;
1302	+	} | CLOSE
1303	+	{
1304	+	if (conf_parser_ctx.pass == 2)
1305	+	block_state.port.value |= OPER_FLAG_CLOSE;
1306		};
1307
1308
1309		/***************************************************************************
1310	<	*  section class
1310	>	* class {} section
1311		***************************************************************************/
1312		class_entry: CLASS
1313		{
#	Line 1389 | Line 1335 | class_entry: CLASS
1335		class = class_make();
1336
1337		class->active = 1;
1338	<	MyFree(class->name);
1338	>	xfree(class->name);
1339		class->name = xstrdup(block_state.class.buf);
1340		class->ping_freq = block_state.ping_freq.value;
1341	<	class->max_perip = block_state.max_perip.value;
1341	>	class->max_perip_local = block_state.max_perip_local.value;
1342	>	class->max_perip_global = block_state.max_perip_global.value;
1343		class->con_freq = block_state.con_freq.value;
1344		class->max_total = block_state.max_total.value;
1398	–	class->max_global = block_state.max_global.value;
1399	–	class->max_local = block_state.max_local.value;
1400	–	class->max_ident = block_state.max_ident.value;
1345		class->max_sendq = block_state.max_sendq.value;
1346		class->max_recvq = block_state.max_recvq.value;
1347	+	class->max_channels = block_state.max_channels.value;
1348
1349		if (block_state.min_idle.value > block_state.max_idle.value)
1350		{
#	Line 1412 | Line 1357 | class_entry: CLASS
1357		class->min_idle = block_state.min_idle.value;
1358		class->max_idle = block_state.max_idle.value;
1359
1415	–	if (class->number_per_cidr && block_state.number_per_cidr.value)
1416	–	if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
1417	–	(class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
1418	–	if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
1419	–	(class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
1420	–	rebuild_cidr_list(class);
1421	–
1360		class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1361		class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1362		class->number_per_cidr = block_state.number_per_cidr.value;
1363	+
1364	+	class_ip_limit_rebuild(class);
1365		};
1366
1367		class_items:    class_items class_item | class_item;
1368		class_item:     class_name |
1369	<	class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1369	>	class_cidr_bitlen_ipv4 |
1370	>	class_cidr_bitlen_ipv6 |
1371		class_ping_time |
1372	<	class_number_per_cidr |
1373	<	class_number_per_ip |
1372	>	class_number_per_cidr |
1373	>	class_number_per_ip_local |
1374	>	class_number_per_ip_global |
1375		class_connectfreq |
1376	+	class_max_channels |
1377		class_max_number |
1378	<	class_max_global |
1379	<	class_max_local |
1437	<	class_max_ident |
1438	<	class_sendq | class_recvq |
1378	>	class_sendq |
1379	>	class_recvq |
1380		class_min_idle |
1381		class_max_idle |
1382		class_flags |
1383	<	error ';' ;
1383	>	error ';' ;
1384
1385		class_name: NAME '=' QSTRING ';'
1386		{
#	Line 1453 | Line 1394 | class_ping_time: PING_TIME '=' timespec
1394		block_state.ping_freq.value = $3;
1395		};
1396
1397	<	class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1397	>	class_number_per_ip_local: NUMBER_PER_IP_LOCAL '=' NUMBER ';'
1398		{
1399		if (conf_parser_ctx.pass == 1)
1400	<	block_state.max_perip.value = $3;
1400	>	block_state.max_perip_local.value = $3;
1401		};
1402
1403	<	class_connectfreq: CONNECTFREQ '=' timespec ';'
1403	>	class_number_per_ip_global: NUMBER_PER_IP_GLOBAL '=' NUMBER ';'
1404		{
1405		if (conf_parser_ctx.pass == 1)
1406	<	block_state.con_freq.value = $3;
1406	>	block_state.max_perip_global.value = $3;
1407		};
1408
1409	<	class_max_number: MAX_NUMBER '=' NUMBER ';'
1469	<	{
1470	<	if (conf_parser_ctx.pass == 1)
1471	<	block_state.max_total.value = $3;
1472	<	};
1473	<
1474	<	class_max_global: MAX_GLOBAL '=' NUMBER ';'
1409	>	class_connectfreq: CONNECTFREQ '=' timespec ';'
1410		{
1411		if (conf_parser_ctx.pass == 1)
1412	<	block_state.max_global.value = $3;
1412	>	block_state.con_freq.value = $3;
1413		};
1414
1415	<	class_max_local: MAX_LOCAL '=' NUMBER ';'
1415	>	class_max_channels: MAX_CHANNELS '=' NUMBER ';'
1416		{
1417		if (conf_parser_ctx.pass == 1)
1418	<	block_state.max_local.value = $3;
1418	>	block_state.max_channels.value = $3;
1419		};
1420
1421	<	class_max_ident: MAX_IDENT '=' NUMBER ';'
1421	>	class_max_number: MAX_NUMBER '=' NUMBER ';'
1422		{
1423		if (conf_parser_ctx.pass == 1)
1424	<	block_state.max_ident.value = $3;
1424	>	block_state.max_total.value = $3;
1425		};
1426
1427		class_sendq: SENDQ '=' sizespec ';'
#	Line 1557 | Line 1492 | class_flags_item: RANDOM_IDLE
1492
1493
1494		/***************************************************************************
1495	<	*  section listen
1495	>	* listen {} section
1496		***************************************************************************/
1497		listen_entry: LISTEN
1498		{
#	Line 1596 | Line 1531 | port_item: NUMBER
1531		{
1532		if (conf_parser_ctx.pass == 2)
1533		{
1534	+	#ifndef HAVE_TLS
1535		if (block_state.flags.value & LISTENER_SSL)
1536	<	#ifdef HAVE_LIBCRYPTO
1537	<	if (!ServerInfo.server_ctx)
1536	>	{
1537	>	conf_error_report("TLS not available - port closed");
1538	>	break;
1539	>	}
1540		#endif
1541	<	{
1604	<	conf_error_report("SSL not available - port closed");
1605	<	break;
1606	<	}
1607	<	add_listener($1, block_state.addr.buf, block_state.flags.value);
1541	>	listener_add($1, block_state.addr.buf, block_state.flags.value);
1542		}
1543		} | NUMBER TWODOTS NUMBER
1544		{
1545		if (conf_parser_ctx.pass == 2)
1546		{
1547	<	int i;
1614	<
1547	>	#ifndef HAVE_TLS
1548		if (block_state.flags.value & LISTENER_SSL)
1549	<	#ifdef HAVE_LIBCRYPTO
1550	<	if (!ServerInfo.server_ctx)
1549	>	{
1550	>	conf_error_report("TLS not available - port closed");
1551	>	break;
1552	>	}
1553		#endif
1619	–	{
1620	–	conf_error_report("SSL not available - port closed");
1621	–	break;
1622	–	}
1554
1555	<	for (i = $1; i <= $3; ++i)
1556	<	add_listener(i, block_state.addr.buf, block_state.flags.value);
1555	>	for (int i = $1; i <= $3; ++i)
1556	>	listener_add(i, block_state.addr.buf, block_state.flags.value);
1557		}
1558		};
1559
#	Line 1638 | Line 1569 | listen_host: HOST '=' QSTRING ';'
1569		strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1570		};
1571
1572	+
1573		/***************************************************************************
1574	<	*  section auth
1574	>	* auth {} section
1575		***************************************************************************/
1576		auth_entry: IRCD_AUTH
1577		{
#	Line 1647 | Line 1579 | auth_entry: IRCD_AUTH
1579		reset_block_state();
1580		} '{' auth_items '}' ';'
1581		{
1582	<	dlink_node *ptr = NULL;
1582	>	dlink_node *node = NULL;
1583
1584		if (conf_parser_ctx.pass != 2)
1585		break;
1586
1587	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
1587	>	DLINK_FOREACH(node, block_state.mask.list.head)
1588		{
1589		struct MaskItem *conf = NULL;
1590		struct split_nuh_item nuh;
1591	+	char *s = node->data;
1592	+
1593	+	if (EmptyString(s))
1594	+	continue;
1595
1596	<	nuh.nuhmask  = ptr->data;
1596	>	nuh.nuhmask  = s;
1597		nuh.nickptr  = NULL;
1598		nuh.userptr  = block_state.user.buf;
1599		nuh.hostptr  = block_state.host.buf;
#	Line 1684 | Line 1620 | auth_entry: IRCD_AUTH
1620		};
1621
1622		auth_items:     auth_items auth_item | auth_item;
1623	<	auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1624	<	auth_spoof | auth_redir_serv | auth_redir_port |
1625	<	auth_encrypted | error ';' ;
1623	>	auth_item:      auth_user |
1624	>	auth_passwd |
1625	>	auth_class |
1626	>	auth_flags |
1627	>	auth_spoof |
1628	>	auth_redir_serv |
1629	>	auth_redir_port |
1630	>	auth_encrypted |
1631	>	error ';' ;
1632
1633		auth_user: USER '=' QSTRING ';'
1634		{
#	Line 1736 | Line 1678 | auth_flags_item: SPOOF_NOTICE
1678		{
1679		if (conf_parser_ctx.pass == 2)
1680		block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1681	+	} | XLINE_EXEMPT
1682	+	{
1683	+	if (conf_parser_ctx.pass == 2)
1684	+	block_state.flags.value |= CONF_FLAGS_EXEMPTXLINE;
1685		} | NEED_IDENT
1686		{
1687		if (conf_parser_ctx.pass == 2)
#	Line 1748 | Line 1694 | auth_flags_item: SPOOF_NOTICE
1694		{
1695		if (conf_parser_ctx.pass == 2)
1696		block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1751	–	} | GLINE_EXEMPT
1752	–	{
1753	–	if (conf_parser_ctx.pass == 2)
1754	–	block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
1697		} | RESV_EXEMPT
1698		{
1699		if (conf_parser_ctx.pass == 2)
#	Line 1771 | Line 1713 | auth_spoof: SPOOF '=' QSTRING ';'
1713		if (conf_parser_ctx.pass != 2)
1714		break;
1715
1716	<	if (strlen(yylval.string) <= HOSTLEN && valid_hostname(yylval.string))
1716	>	if (valid_hostname(yylval.string))
1717		{
1718		strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1719		block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
#	Line 1800 | Line 1742 | auth_redir_port: REDIRPORT '=' NUMBER ';
1742
1743
1744		/***************************************************************************
1745	<	*  section resv
1745	>	* resv {} section
1746		***************************************************************************/
1747		resv_entry: RESV
1748		{
#	Line 1814 | Line 1756 | resv_entry: RESV
1756		if (conf_parser_ctx.pass != 2)
1757		break;
1758
1759	<	create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1759	>	resv_make(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1760		};
1761
1762	<	resv_items:     resv_items resv_item | resv_item;
1763	<	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1762	>	resv_items:     resv_items resv_item | resv_item;
1763	>	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1764
1765		resv_mask: MASK '=' QSTRING ';'
1766		{
#	Line 1840 | Line 1782 | resv_exempt: EXEMPT '=' QSTRING ';'
1782
1783
1784		/***************************************************************************
1785	<	*  section service
1785	>	* service {} section
1786		***************************************************************************/
1787		service_entry: T_SERVICE '{' service_items '}' ';';
1788
#	Line 1852 | Line 1794 | service_name: NAME '=' QSTRING ';'
1794		if (conf_parser_ctx.pass != 2)
1795		break;
1796
1797	<	if (valid_servname(yylval.string))
1797	>	if (server_valid_name(yylval.string))
1798		{
1799	<	struct MaskItem *conf = conf_make(CONF_SERVICE);
1800	<	conf->name = xstrdup(yylval.string);
1799	>	struct ServiceItem *service = service_make();
1800	>	service->name = xstrdup(yylval.string);
1801		}
1802		};
1803
1804	+
1805		/***************************************************************************
1806	<	*  section shared, for sharing remote klines etc.
1806	>	* shared {} section, for sharing remote klines etc.
1807		***************************************************************************/
1808		shared_entry: T_SHARED
1809		{
#	Line 1875 | Line 1818 | shared_entry: T_SHARED
1818		block_state.flags.value = SHARED_ALL;
1819		} '{' shared_items '}' ';'
1820		{
1878	–	struct MaskItem *conf = NULL;
1879	–
1821		if (conf_parser_ctx.pass != 2)
1822		break;
1823
1824	<	conf = conf_make(CONF_ULINE);
1825	<	conf->flags = block_state.flags.value;
1826	<	conf->name = xstrdup(block_state.name.buf);
1827	<	conf->user = xstrdup(block_state.user.buf);
1828	<	conf->host = xstrdup(block_state.host.buf);
1824	>	struct SharedItem *shared = shared_make();
1825	>	shared->type = block_state.flags.value;
1826	>	shared->server = xstrdup(block_state.name.buf);
1827	>	shared->user = xstrdup(block_state.user.buf);
1828	>	shared->host = xstrdup(block_state.host.buf);
1829		};
1830
1831		shared_items: shared_items shared_item | shared_item;
#	Line 1964 | Line 1905 | shared_type_item: KLINE
1905		block_state.flags.value = SHARED_ALL;
1906		};
1907
1908	+
1909		/***************************************************************************
1910	<	*  section cluster
1910	>	* cluster {} section
1911		***************************************************************************/
1912		cluster_entry: T_CLUSTER
1913		{
#	Line 1975 | Line 1917 | cluster_entry: T_CLUSTER
1917		reset_block_state();
1918
1919		strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1920	<	block_state.flags.value = SHARED_ALL;
1920	>	block_state.flags.value = CLUSTER_ALL;
1921		} '{' cluster_items '}' ';'
1922		{
1981	–	struct MaskItem *conf = NULL;
1982	–
1923		if (conf_parser_ctx.pass != 2)
1924		break;
1925
1926	<	conf = conf_make(CONF_CLUSTER);
1927	<	conf->flags = block_state.flags.value;
1928	<	conf->name = xstrdup(block_state.name.buf);
1926	>	struct ClusterItem *cluster = cluster_make();
1927	>	cluster->type = block_state.flags.value;
1928	>	cluster->server = xstrdup(block_state.name.buf);
1929		};
1930
1931	<	cluster_items:  cluster_items cluster_item | cluster_item;
1932	<	cluster_item:   cluster_name | cluster_type | error ';' ;
1931	>	cluster_items:  cluster_items cluster_item | cluster_item;
1932	>	cluster_item:   cluster_name | cluster_type | error ';' ;
1933
1934		cluster_name: NAME '=' QSTRING ';'
1935		{
#	Line 2003 | Line 1943 | cluster_type: TYPE
1943		block_state.flags.value = 0;
1944		} '=' cluster_types ';' ;
1945
1946	<	cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1946	>	cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1947		cluster_type_item: KLINE
1948		{
1949		if (conf_parser_ctx.pass == 2)
1950	<	block_state.flags.value |= SHARED_KLINE;
1950	>	block_state.flags.value |= CLUSTER_KLINE;
1951		} | UNKLINE
1952		{
1953		if (conf_parser_ctx.pass == 2)
1954	<	block_state.flags.value |= SHARED_UNKLINE;
1954	>	block_state.flags.value |= CLUSTER_UNKLINE;
1955		} | T_DLINE
1956		{
1957		if (conf_parser_ctx.pass == 2)
1958	<	block_state.flags.value |= SHARED_DLINE;
1958	>	block_state.flags.value |= CLUSTER_DLINE;
1959		} | T_UNDLINE
1960		{
1961		if (conf_parser_ctx.pass == 2)
1962	<	block_state.flags.value |= SHARED_UNDLINE;
1962	>	block_state.flags.value |= CLUSTER_UNDLINE;
1963		} | XLINE
1964		{
1965		if (conf_parser_ctx.pass == 2)
1966	<	block_state.flags.value |= SHARED_XLINE;
1966	>	block_state.flags.value |= CLUSTER_XLINE;
1967		} | T_UNXLINE
1968		{
1969		if (conf_parser_ctx.pass == 2)
1970	<	block_state.flags.value |= SHARED_UNXLINE;
1970	>	block_state.flags.value |= CLUSTER_UNXLINE;
1971		} | RESV
1972		{
1973		if (conf_parser_ctx.pass == 2)
1974	<	block_state.flags.value |= SHARED_RESV;
1974	>	block_state.flags.value |= CLUSTER_RESV;
1975		} | T_UNRESV
1976		{
1977		if (conf_parser_ctx.pass == 2)
1978	<	block_state.flags.value |= SHARED_UNRESV;
1978	>	block_state.flags.value |= CLUSTER_UNRESV;
1979		} | T_LOCOPS
1980		{
1981		if (conf_parser_ctx.pass == 2)
1982	<	block_state.flags.value |= SHARED_LOCOPS;
1982	>	block_state.flags.value |= CLUSTER_LOCOPS;
1983		} | T_ALL
1984		{
1985		if (conf_parser_ctx.pass == 2)
1986	<	block_state.flags.value = SHARED_ALL;
1986	>	block_state.flags.value = CLUSTER_ALL;
1987		};
1988
1989	+
1990		/***************************************************************************
1991	<	*  section connect
1991	>	* connect {}  section
1992		***************************************************************************/
1993		connect_entry: CONNECT
1994		{
#	Line 2108 | Line 2049 | connect_entry: CONNECT
2049		ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2050		else
2051		{
2052	<	assert(res != NULL);
2052	>	assert(res);
2053
2054		memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2055		conf->bind.ss.ss_family = res->ai_family;
#	Line 2122 | Line 2063 | connect_entry: CONNECT
2063		};
2064
2065		connect_items:  connect_items connect_item | connect_item;
2066	<	connect_item:   connect_name | connect_host | connect_vhost |
2067	<	connect_send_password | connect_accept_password |
2068	<	connect_ssl_certificate_fingerprint |
2069	<	connect_aftype | connect_port | connect_ssl_cipher_list |
2070	<	connect_flags | connect_hub_mask | connect_leaf_mask |
2071	<	connect_class | connect_encrypted |
2066	>	connect_item:   connect_name |
2067	>	connect_host |
2068	>	connect_vhost |
2069	>	connect_send_password |
2070	>	connect_accept_password |
2071	>	connect_ssl_certificate_fingerprint |
2072	>	connect_aftype |
2073	>	connect_port |
2074	>	connect_ssl_cipher_list |
2075	>	connect_flags |
2076	>	connect_hub_mask |
2077	>	connect_leaf_mask |
2078	>	connect_class |
2079	>	connect_encrypted |
2080		error ';' ;
2081
2082		connect_name: NAME '=' QSTRING ';'
#	Line 2155 | Line 2104 | connect_send_password: SEND_PASSWORD '='
2104
2105		if ($3[0] == ':')
2106		conf_error_report("Server passwords cannot begin with a colon");
2107	<	else if (strchr($3, ' ') != NULL)
2107	>	else if (strchr($3, ' '))
2108		conf_error_report("Server passwords cannot contain spaces");
2109		else
2110		strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
#	Line 2168 | Line 2117 | connect_accept_password: ACCEPT_PASSWORD
2117
2118		if ($3[0] == ':')
2119		conf_error_report("Server passwords cannot begin with a colon");
2120	<	else if (strchr($3, ' ') != NULL)
2120	>	else if (strchr($3, ' '))
2121		conf_error_report("Server passwords cannot contain spaces");
2122		else
2123		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
#	Line 2192 | Line 2141 | connect_aftype: AFTYPE '=' T_IPV4 ';'
2141		block_state.aftype.value = AF_INET;
2142		} | AFTYPE '=' T_IPV6 ';'
2143		{
2195	–	#ifdef IPV6
2144		if (conf_parser_ctx.pass == 2)
2145		block_state.aftype.value = AF_INET6;
2198	–	#endif
2146		};
2147
2148		connect_flags: IRCD_FLAGS
#	Line 2245 | Line 2192 | connect_class: CLASS '=' QSTRING ';'
2192
2193		connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2194		{
2195	<	#ifdef HAVE_LIBCRYPTO
2195	>	#ifdef HAVE_TLS
2196		if (conf_parser_ctx.pass == 2)
2197		strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2198		#else
2199		if (conf_parser_ctx.pass == 2)
2200	<	conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
2200	>	conf_error_report("Ignoring connect::ciphers -- no TLS support");
2201		#endif
2202		};
2203
2204
2205		/***************************************************************************
2206	<	*  section kill
2206	>	* kill {} section
2207		***************************************************************************/
2208		kill_entry: KILL
2209		{
#	Line 2313 | Line 2260 | kill_reason: REASON '=' QSTRING ';'
2260		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2261		};
2262
2263	+
2264		/***************************************************************************
2265	<	*  section deny
2265	>	* deny {} section
2266		***************************************************************************/
2267		deny_entry: DENY
2268		{
#	Line 2358 | Line 2306 | deny_reason: REASON '=' QSTRING ';'
2306		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2307		};
2308
2309	+
2310		/***************************************************************************
2311	<	*  section exempt
2311	>	* exempt {} section
2312		***************************************************************************/
2313		exempt_entry: EXEMPT '{' exempt_items '}' ';';
2314
2315	<	exempt_items:     exempt_items exempt_item | exempt_item;
2316	<	exempt_item:      exempt_ip | error;
2315	>	exempt_items: exempt_items exempt_item | exempt_item;
2316	>	exempt_item:  exempt_ip | error;
2317
2318		exempt_ip: IP '=' QSTRING ';'
2319		{
2320		if (conf_parser_ctx.pass == 2)
2321		{
2322	<	if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2322	>	if (*yylval.string && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2323		{
2324		struct MaskItem *conf = conf_make(CONF_EXEMPT);
2325		conf->host = xstrdup(yylval.string);
#	Line 2381 | Line 2330 | exempt_ip: IP '=' QSTRING ';'
2330		};
2331
2332		/***************************************************************************
2333	<	*  section gecos
2333	>	* gecos {} section
2334		***************************************************************************/
2335		gecos_entry: GECOS
2336		{
#	Line 2389 | Line 2338 | gecos_entry: GECOS
2338		reset_block_state();
2339		} '{' gecos_items '}' ';'
2340		{
2392	–	struct MaskItem *conf = NULL;
2393	–
2341		if (conf_parser_ctx.pass != 2)
2342		break;
2343
2344		if (!block_state.name.buf[0])
2345		break;
2346
2347	<	conf = conf_make(CONF_XLINE);
2348	<	conf->name = xstrdup(block_state.name.buf);
2347	>	struct GecosItem *gecos = gecos_make();
2348	>	gecos->mask = xstrdup(block_state.name.buf);
2349
2350		if (block_state.rpass.buf[0])
2351	<	conf->reason = xstrdup(block_state.rpass.buf);
2351	>	gecos->reason = xstrdup(block_state.rpass.buf);
2352		else
2353	<	conf->reason = xstrdup(CONF_NOREASON);
2353	>	gecos->reason = xstrdup(CONF_NOREASON);
2354		};
2355
2356		gecos_items: gecos_items gecos_item | gecos_item;
#	Line 2421 | Line 2368 | gecos_reason: REASON '=' QSTRING ';'
2368		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2369		};
2370
2371	+
2372		/***************************************************************************
2373	<	*  section general
2373	>	* general {} section
2374		***************************************************************************/
2375	<	general_entry: GENERAL
2428	<	'{' general_items '}' ';';
2375	>	general_entry: GENERAL '{' general_items '}' ';';
2376
2377		general_items:      general_items general_item | general_item;
2378	<	general_item:       general_hide_spoof_ips | general_ignore_bogus_ts |
2379	<	general_failed_oper_notice | general_anti_nick_flood |
2380	<	general_max_nick_time | general_max_nick_changes |
2381	<	general_max_accept | general_anti_spam_exit_message_time |
2382	<	general_ts_warn_delta | general_ts_max_delta |
2378	>	general_item:       general_away_count |
2379	>	general_away_time |
2380	>	general_ignore_bogus_ts |
2381	>	general_failed_oper_notice |
2382	>	general_anti_nick_flood |
2383	>	general_max_nick_time |
2384	>	general_max_nick_changes |
2385	>	general_max_accept |
2386	>	general_whowas_history_length |
2387	>	general_anti_spam_exit_message_time |
2388	>	general_ts_warn_delta |
2389	>	general_ts_max_delta |
2390		general_kill_chase_time_limit |
2391		general_invisible_on_connect |
2392	<	general_warn_no_nline | general_dots_in_ident |
2393	<	general_stats_o_oper_only | general_stats_k_oper_only |
2394	<	general_pace_wait | general_stats_i_oper_only |
2395	<	general_pace_wait_simple | general_stats_P_oper_only |
2392	>	general_warn_no_connect_block |
2393	>	general_dots_in_ident |
2394	>	general_stats_i_oper_only |
2395	>	general_stats_k_oper_only |
2396	>	general_stats_m_oper_only |
2397	>	general_stats_o_oper_only |
2398	>	general_stats_P_oper_only |
2399		general_stats_u_oper_only |
2400	<	general_short_motd | general_no_oper_flood |
2401	<	general_true_no_oper_flood | general_oper_pass_resv |
2402	<	general_oper_only_umodes | general_max_targets |
2403	<	general_use_egd | general_egdpool_path |
2404	<	general_oper_umodes | general_caller_id_wait |
2405	<	general_opers_bypass_callerid | general_default_floodcount |
2406	<	general_min_nonwildcard | general_min_nonwildcard_simple |
2407	<	general_throttle_time | general_havent_read_conf |
2400	>	general_pace_wait |
2401	>	general_pace_wait_simple |
2402	>	general_short_motd |
2403	>	general_no_oper_flood |
2404	>	general_oper_only_umodes |
2405	>	general_max_targets |
2406	>	general_oper_umodes |
2407	>	general_caller_id_wait |
2408	>	general_opers_bypass_callerid |
2409	>	general_default_floodcount |
2410	>	general_default_floodtime |
2411	>	general_min_nonwildcard |
2412	>	general_min_nonwildcard_simple |
2413	>	general_throttle_count |
2414	>	general_throttle_time |
2415		general_ping_cookie |
2416		general_disable_auth |
2417	<	general_tkline_expire_notices | general_gline_enable |
2418	<	general_gline_duration | general_gline_request_duration |
2419	<	general_gline_min_cidr |
2420	<	general_gline_min_cidr6 |
2421	<	general_stats_e_disabled |
2422	<	general_max_watch | general_services_name |
2423	<	general_cycle_on_host_change |
2424	<	error;
2417	>	general_tkline_expire_notices |
2418	>	general_dline_min_cidr |
2419	>	general_dline_min_cidr6 |
2420	>	general_kline_min_cidr |
2421	>	general_kline_min_cidr6 |
2422	>	general_stats_e_disabled |
2423	>	general_max_watch |
2424	>	general_cycle_on_host_change |
2425	>	error;
2426
2427
2428	<	general_max_watch: MAX_WATCH '=' NUMBER ';'
2428	>	general_away_count: AWAY_COUNT '=' NUMBER ';'
2429		{
2430	<	ConfigFileEntry.max_watch = $3;
2430	>	ConfigGeneral.away_count = $3;
2431		};
2432
2433	<	general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2433	>	general_away_time: AWAY_TIME '=' timespec ';'
2434		{
2435	<	if (conf_parser_ctx.pass == 2)
2471	<	ConfigFileEntry.cycle_on_host_change = yylval.number;
2435	>	ConfigGeneral.away_time = $3;
2436		};
2437
2438	<	general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2438	>	general_max_watch: MAX_WATCH '=' NUMBER ';'
2439		{
2440	<	if (conf_parser_ctx.pass == 2)
2477	<	ConfigFileEntry.glines = yylval.number;
2440	>	ConfigGeneral.max_watch = $3;
2441		};
2442
2443	<	general_gline_duration: GLINE_DURATION '=' timespec ';'
2443	>	general_whowas_history_length: WHOWAS_HISTORY_LENGTH '=' NUMBER ';'
2444		{
2445	<	if (conf_parser_ctx.pass == 2)
2483	<	ConfigFileEntry.gline_time = $3;
2445	>	ConfigGeneral.whowas_history_length = $3;
2446		};
2447
2448	<	general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2448	>	general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2449		{
2450		if (conf_parser_ctx.pass == 2)
2451	<	ConfigFileEntry.gline_request_time = $3;
2451	>	ConfigGeneral.cycle_on_host_change = yylval.number;
2452		};
2453
2454	<	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2454	>	general_dline_min_cidr: DLINE_MIN_CIDR '=' NUMBER ';'
2455		{
2456	<	ConfigFileEntry.gline_min_cidr = $3;
2456	>	ConfigGeneral.dline_min_cidr = $3;
2457		};
2458
2459	<	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2459	>	general_dline_min_cidr6: DLINE_MIN_CIDR6 '=' NUMBER ';'
2460		{
2461	<	ConfigFileEntry.gline_min_cidr6 = $3;
2461	>	ConfigGeneral.dline_min_cidr6 = $3;
2462		};
2463
2464	<	general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2464	>	general_kline_min_cidr: KLINE_MIN_CIDR '=' NUMBER ';'
2465		{
2466	<	ConfigFileEntry.tkline_expire_notices = yylval.number;
2466	>	ConfigGeneral.kline_min_cidr = $3;
2467		};
2468
2469	<	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2469	>	general_kline_min_cidr6: KLINE_MIN_CIDR6 '=' NUMBER ';'
2470		{
2471	<	ConfigFileEntry.kill_chase_time_limit = $3;
2471	>	ConfigGeneral.kline_min_cidr6 = $3;
2472		};
2473
2474	<	general_hide_spoof_ips: HIDE_SPOOF_IPS '=' TBOOL ';'
2474	>	general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2475		{
2476	<	ConfigFileEntry.hide_spoof_ips = yylval.number;
2476	>	ConfigGeneral.tkline_expire_notices = yylval.number;
2477	>	};
2478	>
2479	>	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2480	>	{
2481	>	ConfigGeneral.kill_chase_time_limit = $3;
2482		};
2483
2484		general_ignore_bogus_ts: IGNORE_BOGUS_TS '=' TBOOL ';'
2485		{
2486	<	ConfigFileEntry.ignore_bogus_ts = yylval.number;
2486	>	ConfigGeneral.ignore_bogus_ts = yylval.number;
2487		};
2488
2489		general_failed_oper_notice: FAILED_OPER_NOTICE '=' TBOOL ';'
2490		{
2491	<	ConfigFileEntry.failed_oper_notice = yylval.number;
2491	>	ConfigGeneral.failed_oper_notice = yylval.number;
2492		};
2493
2494		general_anti_nick_flood: ANTI_NICK_FLOOD '=' TBOOL ';'
2495		{
2496	<	ConfigFileEntry.anti_nick_flood = yylval.number;
2496	>	ConfigGeneral.anti_nick_flood = yylval.number;
2497		};
2498
2499		general_max_nick_time: MAX_NICK_TIME '=' timespec ';'
2500		{
2501	<	ConfigFileEntry.max_nick_time = $3;
2501	>	ConfigGeneral.max_nick_time = $3;
2502		};
2503
2504		general_max_nick_changes: MAX_NICK_CHANGES '=' NUMBER ';'
2505		{
2506	<	ConfigFileEntry.max_nick_changes = $3;
2506	>	ConfigGeneral.max_nick_changes = $3;
2507		};
2508
2509		general_max_accept: MAX_ACCEPT '=' NUMBER ';'
2510		{
2511	<	ConfigFileEntry.max_accept = $3;
2511	>	ConfigGeneral.max_accept = $3;
2512		};
2513
2514		general_anti_spam_exit_message_time: ANTI_SPAM_EXIT_MESSAGE_TIME '=' timespec ';'
2515		{
2516	<	ConfigFileEntry.anti_spam_exit_message_time = $3;
2516	>	ConfigGeneral.anti_spam_exit_message_time = $3;
2517		};
2518
2519		general_ts_warn_delta: TS_WARN_DELTA '=' timespec ';'
2520		{
2521	<	ConfigFileEntry.ts_warn_delta = $3;
2521	>	ConfigGeneral.ts_warn_delta = $3;
2522		};
2523
2524		general_ts_max_delta: TS_MAX_DELTA '=' timespec ';'
2525		{
2526		if (conf_parser_ctx.pass == 2)
2527	<	ConfigFileEntry.ts_max_delta = $3;
2527	>	ConfigGeneral.ts_max_delta = $3;
2528		};
2529
2530	<	general_havent_read_conf: HAVENT_READ_CONF '=' NUMBER ';'
2530	>	general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2531		{
2532	<	if (($3 > 0) && conf_parser_ctx.pass == 1)
2566	<	{
2567	<	ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
2568	<	ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
2569	<	ilog(LOG_TYPE_IRCD, "Consider actually reading/editing the conf file, and removing this line.");
2570	<	exit(0);
2571	<	}
2532	>	ConfigGeneral.invisible_on_connect = yylval.number;
2533		};
2534
2535	<	general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2535	>	general_warn_no_connect_block: WARN_NO_CONNECT_BLOCK '=' TBOOL ';'
2536		{
2537	<	ConfigFileEntry.invisible_on_connect = yylval.number;
2537	>	ConfigGeneral.warn_no_connect_block = yylval.number;
2538		};
2539
2540	<	general_warn_no_nline: WARN_NO_NLINE '=' TBOOL ';'
2540	>	general_stats_e_disabled: STATS_E_DISABLED '=' TBOOL ';'
2541		{
2542	<	ConfigFileEntry.warn_no_nline = yylval.number;
2542	>	ConfigGeneral.stats_e_disabled = yylval.number;
2543		};
2544
2545	<	general_stats_e_disabled: STATS_E_DISABLED '=' TBOOL ';'
2545	>	general_stats_m_oper_only: STATS_M_OPER_ONLY '=' TBOOL ';'
2546		{
2547	<	ConfigFileEntry.stats_e_disabled = yylval.number;
2547	>	ConfigGeneral.stats_m_oper_only = yylval.number;
2548		};
2549
2550		general_stats_o_oper_only: STATS_O_OPER_ONLY '=' TBOOL ';'
2551		{
2552	<	ConfigFileEntry.stats_o_oper_only = yylval.number;
2552	>	ConfigGeneral.stats_o_oper_only = yylval.number;
2553		};
2554
2555		general_stats_P_oper_only: STATS_P_OPER_ONLY '=' TBOOL ';'
2556		{
2557	<	ConfigFileEntry.stats_P_oper_only = yylval.number;
2557	>	ConfigGeneral.stats_P_oper_only = yylval.number;
2558		};
2559
2560		general_stats_u_oper_only: STATS_U_OPER_ONLY '=' TBOOL ';'
2561		{
2562	<	ConfigFileEntry.stats_u_oper_only = yylval.number;
2562	>	ConfigGeneral.stats_u_oper_only = yylval.number;
2563		};
2564
2565		general_stats_k_oper_only: STATS_K_OPER_ONLY '=' TBOOL ';'
2566		{
2567	<	ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
2567	>	ConfigGeneral.stats_k_oper_only = 2 * yylval.number;
2568		} | STATS_K_OPER_ONLY '=' TMASKED ';'
2569		{
2570	<	ConfigFileEntry.stats_k_oper_only = 1;
2570	>	ConfigGeneral.stats_k_oper_only = 1;
2571		};
2572
2573		general_stats_i_oper_only: STATS_I_OPER_ONLY '=' TBOOL ';'
2574		{
2575	<	ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
2575	>	ConfigGeneral.stats_i_oper_only = 2 * yylval.number;
2576		} | STATS_I_OPER_ONLY '=' TMASKED ';'
2577		{
2578	<	ConfigFileEntry.stats_i_oper_only = 1;
2578	>	ConfigGeneral.stats_i_oper_only = 1;
2579		};
2580
2581		general_pace_wait: PACE_WAIT '=' timespec ';'
2582		{
2583	<	ConfigFileEntry.pace_wait = $3;
2583	>	ConfigGeneral.pace_wait = $3;
2584		};
2585
2586		general_caller_id_wait: CALLER_ID_WAIT '=' timespec ';'
2587		{
2588	<	ConfigFileEntry.caller_id_wait = $3;
2588	>	ConfigGeneral.caller_id_wait = $3;
2589		};
2590
2591		general_opers_bypass_callerid: OPERS_BYPASS_CALLERID '=' TBOOL ';'
2592		{
2593	<	ConfigFileEntry.opers_bypass_callerid = yylval.number;
2593	>	ConfigGeneral.opers_bypass_callerid = yylval.number;
2594		};
2595
2596		general_pace_wait_simple: PACE_WAIT_SIMPLE '=' timespec ';'
2597		{
2598	<	ConfigFileEntry.pace_wait_simple = $3;
2598	>	ConfigGeneral.pace_wait_simple = $3;
2599		};
2600
2601		general_short_motd: SHORT_MOTD '=' TBOOL ';'
2602		{
2603	<	ConfigFileEntry.short_motd = yylval.number;
2603	>	ConfigGeneral.short_motd = yylval.number;
2604		};
2605
2606		general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
2607		{
2608	<	ConfigFileEntry.no_oper_flood = yylval.number;
2648	<	};
2649	<
2650	<	general_true_no_oper_flood: TRUE_NO_OPER_FLOOD '=' TBOOL ';'
2651	<	{
2652	<	ConfigFileEntry.true_no_oper_flood = yylval.number;
2653	<	};
2654	<
2655	<	general_oper_pass_resv: OPER_PASS_RESV '=' TBOOL ';'
2656	<	{
2657	<	ConfigFileEntry.oper_pass_resv = yylval.number;
2608	>	ConfigGeneral.no_oper_flood = yylval.number;
2609		};
2610
2611		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2612		{
2613	<	ConfigFileEntry.dots_in_ident = $3;
2613	>	ConfigGeneral.dots_in_ident = $3;
2614		};
2615
2616		general_max_targets: MAX_TARGETS '=' NUMBER ';'
2617		{
2618	<	ConfigFileEntry.max_targets = $3;
2618	>	ConfigGeneral.max_targets = $3;
2619		};
2620
2621	<	general_use_egd: USE_EGD '=' TBOOL ';'
2621	>	general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2622		{
2623	<	ConfigFileEntry.use_egd = yylval.number;
2623	>	ConfigGeneral.ping_cookie = yylval.number;
2624		};
2625
2626	<	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
2676	<	{
2677	<	if (conf_parser_ctx.pass == 2)
2678	<	{
2679	<	MyFree(ConfigFileEntry.egdpool_path);
2680	<	ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
2681	<	}
2682	<	};
2683	<
2684	<	general_services_name: T_SERVICES_NAME '=' QSTRING ';'
2685	<	{
2686	<	if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2687	<	{
2688	<	MyFree(ConfigFileEntry.service_name);
2689	<	ConfigFileEntry.service_name = xstrdup(yylval.string);
2690	<	}
2691	<	};
2692	<
2693	<	general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2626	>	general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2627		{
2628	<	ConfigFileEntry.ping_cookie = yylval.number;
2628	>	ConfigGeneral.disable_auth = yylval.number;
2629		};
2630
2631	<	general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2631	>	general_throttle_count: THROTTLE_COUNT '=' NUMBER ';'
2632		{
2633	<	ConfigFileEntry.disable_auth = yylval.number;
2633	>	ConfigGeneral.throttle_count = $3;
2634		};
2635
2636		general_throttle_time: THROTTLE_TIME '=' timespec ';'
2637		{
2638	<	ConfigFileEntry.throttle_time = $3;
2638	>	ConfigGeneral.throttle_time = $3;
2639		};
2640
2641		general_oper_umodes: OPER_UMODES
2642		{
2643	<	ConfigFileEntry.oper_umodes = 0;
2643	>	ConfigGeneral.oper_umodes = 0;
2644		} '='  umode_oitems ';' ;
2645
2646		umode_oitems:    umode_oitems ',' umode_oitem | umode_oitem;
2647		umode_oitem:     T_BOTS
2648		{
2649	<	ConfigFileEntry.oper_umodes |= UMODE_BOTS;
2649	>	ConfigGeneral.oper_umodes |= UMODE_BOTS;
2650		} | T_CCONN
2651		{
2652	<	ConfigFileEntry.oper_umodes |= UMODE_CCONN;
2652	>	ConfigGeneral.oper_umodes |= UMODE_CCONN;
2653		} | T_DEAF
2654		{
2655	<	ConfigFileEntry.oper_umodes |= UMODE_DEAF;
2655	>	ConfigGeneral.oper_umodes |= UMODE_DEAF;
2656		} | T_DEBUG
2657		{
2658	<	ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
2658	>	ConfigGeneral.oper_umodes |= UMODE_DEBUG;
2659		} | T_FULL
2660		{
2661	<	ConfigFileEntry.oper_umodes |= UMODE_FULL;
2661	>	ConfigGeneral.oper_umodes |= UMODE_FULL;
2662		} | HIDDEN
2663		{
2664	<	ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
2664	>	ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
2665	>	} | HIDE_CHANS
2666	>	{
2667	>	ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
2668	>	} | HIDE_IDLE
2669	>	{
2670	>	ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
2671		} | T_SKILL
2672		{
2673	<	ConfigFileEntry.oper_umodes |= UMODE_SKILL;
2673	>	ConfigGeneral.oper_umodes |= UMODE_SKILL;
2674		} | T_NCHANGE
2675		{
2676	<	ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
2676	>	ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
2677		} | T_REJ
2678		{
2679	<	ConfigFileEntry.oper_umodes |= UMODE_REJ;
2679	>	ConfigGeneral.oper_umodes |= UMODE_REJ;
2680		} | T_UNAUTH
2681		{
2682	<	ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
2682	>	ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
2683		} | T_SPY
2684		{
2685	<	ConfigFileEntry.oper_umodes |= UMODE_SPY;
2685	>	ConfigGeneral.oper_umodes |= UMODE_SPY;
2686		} | T_EXTERNAL
2687		{
2688	<	ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
2750	<	} | T_OPERWALL
2751	<	{
2752	<	ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
2688	>	ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
2689		} | T_SERVNOTICE
2690		{
2691	<	ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
2691	>	ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
2692		} | T_INVISIBLE
2693		{
2694	<	ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
2694	>	ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
2695		} | T_WALLOP
2696		{
2697	<	ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
2697	>	ConfigGeneral.oper_umodes |= UMODE_WALLOP;
2698		} | T_SOFTCALLERID
2699		{
2700	<	ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
2700	>	ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
2701		} | T_CALLERID
2702		{
2703	<	ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
2703	>	ConfigGeneral.oper_umodes |= UMODE_CALLERID;
2704		} | T_LOCOPS
2705		{
2706	<	ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
2706	>	ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
2707		} | T_NONONREG
2708		{
2709	<	ConfigFileEntry.oper_umodes |= UMODE_REGONLY;
2709	>	ConfigGeneral.oper_umodes |= UMODE_REGONLY;
2710		} | T_FARCONNECT
2711		{
2712	<	ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT;
2712	>	ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
2713		};
2714
2715		general_oper_only_umodes: OPER_ONLY_UMODES
2716		{
2717	<	ConfigFileEntry.oper_only_umodes = 0;
2717	>	ConfigGeneral.oper_only_umodes = 0;
2718		} '='  umode_items ';' ;
2719
2720	<	umode_items:    umode_items ',' umode_item | umode_item;
2721	<	umode_item:     T_BOTS
2720	>	umode_items:  umode_items ',' umode_item | umode_item;
2721	>	umode_item:   T_BOTS
2722		{
2723	<	ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
2723	>	ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
2724		} | T_CCONN
2725		{
2726	<	ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
2726	>	ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
2727		} | T_DEAF
2728		{
2729	<	ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
2729	>	ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
2730		} | T_DEBUG
2731		{
2732	<	ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
2732	>	ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
2733		} | T_FULL
2734		{
2735	<	ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
2735	>	ConfigGeneral.oper_only_umodes |= UMODE_FULL;
2736		} | T_SKILL
2737		{
2738	<	ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
2738	>	ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
2739		} | HIDDEN
2740		{
2741	<	ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
2741	>	ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
2742		} | T_NCHANGE
2743		{
2744	<	ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
2744	>	ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
2745		} | T_REJ
2746		{
2747	<	ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
2747	>	ConfigGeneral.oper_only_umodes |= UMODE_REJ;
2748		} | T_UNAUTH
2749		{
2750	<	ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
2750	>	ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
2751		} | T_SPY
2752		{
2753	<	ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
2753	>	ConfigGeneral.oper_only_umodes |= UMODE_SPY;
2754		} | T_EXTERNAL
2755		{
2756	<	ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
2821	<	} | T_OPERWALL
2822	<	{
2823	<	ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
2756	>	ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
2757		} | T_SERVNOTICE
2758		{
2759	<	ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
2759	>	ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
2760		} | T_INVISIBLE
2761		{
2762	<	ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
2762	>	ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
2763		} | T_WALLOP
2764		{
2765	<	ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
2765	>	ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
2766		} | T_SOFTCALLERID
2767		{
2768	<	ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
2768	>	ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
2769		} | T_CALLERID
2770		{
2771	<	ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
2771	>	ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
2772		} | T_LOCOPS
2773		{
2774	<	ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
2774	>	ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
2775		} | T_NONONREG
2776		{
2777	<	ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
2777	>	ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
2778		} | T_FARCONNECT
2779		{
2780	<	ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT;
2780	>	ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
2781		};
2782
2783		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
2784		{
2785	<	ConfigFileEntry.min_nonwildcard = $3;
2785	>	ConfigGeneral.min_nonwildcard = $3;
2786		};
2787
2788		general_min_nonwildcard_simple: MIN_NONWILDCARD_SIMPLE '=' NUMBER ';'
2789		{
2790	<	ConfigFileEntry.min_nonwildcard_simple = $3;
2790	>	ConfigGeneral.min_nonwildcard_simple = $3;
2791		};
2792
2793		general_default_floodcount: DEFAULT_FLOODCOUNT '=' NUMBER ';'
2794		{
2795	<	ConfigFileEntry.default_floodcount = $3;
2795	>	ConfigGeneral.default_floodcount = $3;
2796	>	};
2797	>
2798	>	general_default_floodtime: DEFAULT_FLOODTIME '=' timespec ';'
2799	>	{
2800	>	ConfigGeneral.default_floodtime = $3;
2801		};
2802
2803
2804		/***************************************************************************
2805	<	*  section channel
2805	>	* channel {} section
2806		***************************************************************************/
2807	<	channel_entry: CHANNEL
2870	<	'{' channel_items '}' ';';
2807	>	channel_entry: CHANNEL '{' channel_items '}' ';';
2808
2809		channel_items:      channel_items channel_item | channel_item;
2810		channel_item:       channel_max_bans |
2811	<	channel_knock_delay | channel_knock_delay_channel |
2812	<	channel_max_chans_per_user | channel_max_chans_per_oper |
2813	<	channel_default_split_user_count |
2814	<	channel_default_split_server_count |
2815	<	channel_no_create_on_split |
2816	<	channel_no_join_on_split |
2817	<	channel_jflood_count | channel_jflood_time |
2818	<	channel_disable_fake_channels | error;
2811	>	channel_max_bans_large |
2812	>	channel_invite_client_count |
2813	>	channel_invite_client_time |
2814	>	channel_invite_delay_channel |
2815	>	channel_invite_expire_time |
2816	>	channel_knock_client_count |
2817	>	channel_knock_client_time |
2818	>	channel_knock_delay_channel |
2819	>	channel_max_channels |
2820	>	channel_max_invites |
2821	>	channel_default_join_flood_count |
2822	>	channel_default_join_flood_time |
2823	>	channel_disable_fake_channels |
2824	>	error;
2825
2826		channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
2827		{
2828		ConfigChannel.disable_fake_channels = yylval.number;
2829		};
2830
2831	<	channel_knock_delay: KNOCK_DELAY '=' timespec ';'
2831	>	channel_invite_client_count: INVITE_CLIENT_COUNT '=' NUMBER ';'
2832		{
2833	<	ConfigChannel.knock_delay = $3;
2833	>	ConfigChannel.invite_client_count = $3;
2834		};
2835
2836	<	channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
2836	>	channel_invite_client_time: INVITE_CLIENT_TIME '=' timespec ';'
2837		{
2838	<	ConfigChannel.knock_delay_channel = $3;
2838	>	ConfigChannel.invite_client_time = $3;
2839		};
2840
2841	<	channel_max_chans_per_user: MAX_CHANS_PER_USER '=' NUMBER ';'
2841	>	channel_invite_delay_channel: INVITE_DELAY_CHANNEL '=' timespec ';'
2842		{
2843	<	ConfigChannel.max_chans_per_user = $3;
2843	>	ConfigChannel.invite_delay_channel = $3;
2844		};
2845
2846	<	channel_max_chans_per_oper: MAX_CHANS_PER_OPER '=' NUMBER ';'
2846	>	channel_invite_expire_time: INVITE_EXPIRE_TIME '=' timespec ';'
2847		{
2848	<	ConfigChannel.max_chans_per_oper = $3;
2848	>	ConfigChannel.invite_expire_time = $3;
2849		};
2850
2851	<	channel_max_bans: MAX_BANS '=' NUMBER ';'
2851	>	channel_knock_client_count: KNOCK_CLIENT_COUNT '=' NUMBER ';'
2852		{
2853	<	ConfigChannel.max_bans = $3;
2853	>	ConfigChannel.knock_client_count = $3;
2854		};
2855
2856	<	channel_default_split_user_count: DEFAULT_SPLIT_USER_COUNT '=' NUMBER ';'
2856	>	channel_knock_client_time: KNOCK_CLIENT_TIME '=' timespec ';'
2857		{
2858	<	ConfigChannel.default_split_user_count = $3;
2858	>	ConfigChannel.knock_client_time = $3;
2859		};
2860
2861	<	channel_default_split_server_count: DEFAULT_SPLIT_SERVER_COUNT '=' NUMBER ';'
2861	>	channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
2862		{
2863	<	ConfigChannel.default_split_server_count = $3;
2863	>	ConfigChannel.knock_delay_channel = $3;
2864		};
2865
2866	<	channel_no_create_on_split: NO_CREATE_ON_SPLIT '=' TBOOL ';'
2866	>	channel_max_channels: MAX_CHANNELS '=' NUMBER ';'
2867		{
2868	<	ConfigChannel.no_create_on_split = yylval.number;
2868	>	ConfigChannel.max_channels = $3;
2869		};
2870
2871	<	channel_no_join_on_split: NO_JOIN_ON_SPLIT '=' TBOOL ';'
2871	>	channel_max_invites: MAX_INVITES '=' NUMBER ';'
2872		{
2873	<	ConfigChannel.no_join_on_split = yylval.number;
2873	>	ConfigChannel.max_invites = $3;
2874		};
2875
2876	<	channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
2876	>	channel_max_bans: MAX_BANS '=' NUMBER ';'
2877		{
2878	<	GlobalSetOptions.joinfloodcount = yylval.number;
2878	>	ConfigChannel.max_bans = $3;
2879		};
2880
2881	<	channel_jflood_time: JOIN_FLOOD_TIME '=' timespec ';'
2881	>	channel_max_bans_large: MAX_BANS_LARGE '=' NUMBER ';'
2882		{
2883	<	GlobalSetOptions.joinfloodtime = $3;
2883	>	ConfigChannel.max_bans_large = $3;
2884		};
2885
2886	+	channel_default_join_flood_count: DEFAULT_JOIN_FLOOD_COUNT '=' NUMBER ';'
2887	+	{
2888	+	ConfigChannel.default_join_flood_count = yylval.number;
2889	+	};
2890	+
2891	+	channel_default_join_flood_time: DEFAULT_JOIN_FLOOD_TIME '=' timespec ';'
2892	+	{
2893	+	ConfigChannel.default_join_flood_time = $3;
2894	+	};
2895	+
2896	+
2897		/***************************************************************************
2898	<	*  section serverhide
2898	>	* serverhide {} section
2899		***************************************************************************/
2900	<	serverhide_entry: SERVERHIDE
2947	<	'{' serverhide_items '}' ';';
2900	>	serverhide_entry: SERVERHIDE '{' serverhide_items '}' ';';
2901
2902		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
2903	<	serverhide_item:    serverhide_flatten_links | serverhide_disable_remote_commands |
2903	>	serverhide_item:    serverhide_flatten_links |
2904	>	serverhide_flatten_links_delay |
2905	>	serverhide_flatten_links_file |
2906	>	serverhide_disable_remote_commands |
2907		serverhide_hide_servers |
2908	<	serverhide_hide_services |
2909	<	serverhide_links_delay |
2910	<	serverhide_hidden | serverhide_hidden_name |
2911	<	serverhide_hide_server_ips |
2908	>	serverhide_hide_services |
2909	>	serverhide_hidden |
2910	>	serverhide_hidden_name |
2911	>	serverhide_hide_server_ips |
2912		error;
2913
2914		serverhide_flatten_links: FLATTEN_LINKS '=' TBOOL ';'
#	Line 2961 | Line 2917 | serverhide_flatten_links: FLATTEN_LINKS
2917		ConfigServerHide.flatten_links = yylval.number;
2918		};
2919
2920	+	serverhide_flatten_links_delay: FLATTEN_LINKS_DELAY '=' timespec ';'
2921	+	{
2922	+	if (conf_parser_ctx.pass == 2)
2923	+	{
2924	+	if ($3 > 0)
2925	+	{
2926	+	event_write_links_file.when = $3;
2927	+	event_add(&event_write_links_file, NULL);
2928	+	}
2929	+	else
2930	+	event_delete(&event_write_links_file);
2931	+
2932	+	ConfigServerHide.flatten_links_delay = $3;
2933	+	}
2934	+	};
2935	+
2936	+	serverhide_flatten_links_file: FLATTEN_LINKS_FILE '=' QSTRING ';'
2937	+	{
2938	+	if (conf_parser_ctx.pass == 2)
2939	+	{
2940	+	xfree(ConfigServerHide.flatten_links_file);
2941	+	ConfigServerHide.flatten_links_file = xstrdup(yylval.string);
2942	+	}
2943	+	};
2944	+
2945		serverhide_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
2946		{
2947		if (conf_parser_ctx.pass == 2)
#	Line 2983 | Line 2964 | serverhide_hidden_name: HIDDEN_NAME '='
2964		{
2965		if (conf_parser_ctx.pass == 2)
2966		{
2967	<	MyFree(ConfigServerHide.hidden_name);
2967	>	xfree(ConfigServerHide.hidden_name);
2968		ConfigServerHide.hidden_name = xstrdup(yylval.string);
2969		}
2970		};
2971
2991	–	serverhide_links_delay: LINKS_DELAY '=' timespec ';'
2992	–	{
2993	–	if (conf_parser_ctx.pass == 2)
2994	–	{
2995	–	if (($3 > 0) && ConfigServerHide.links_disabled == 1)
2996	–	{
2997	–	eventAddIsh("write_links_file", write_links_file, NULL, $3);
2998	–	ConfigServerHide.links_disabled = 0;
2999	–	}
3000	–
3001	–	ConfigServerHide.links_delay = $3;
3002	–	}
3003	–	};
3004	–
2972		serverhide_hidden: HIDDEN '=' TBOOL ';'
2973		{
2974		if (conf_parser_ctx.pass == 2)

Comparing ircd-hybrid/trunk/src/conf_parser.y (property svn:keywords):
Revision 3435 by michael, Thu May 1 13:57:39 2014 UTC vs.
Revision 8607 by michael, Mon Oct 29 21:26:54 2018 UTC

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

Diff Legend

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