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 1976 by michael, Wed May 8 19:33:06 2013 UTC vs.
Revision 4967 by michael, Mon Dec 1 14:34:29 2014 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-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
21	–	*
22	–	*  $Id$
20		*/
21
22	+	/*! \file conf_parser.y
23	+	* \brief Parses the ircd configuration file.
24	+	* \version $Id$
25	+	*/
26	+
27	+
28		%{
29
30		#define YY_NO_UNPUT
#	Line 34 | Line 37
37		#include "list.h"
38		#include "conf.h"
39		#include "conf_class.h"
40	+	#include "conf_pseudo.h"
41		#include "event.h"
42		#include "log.h"
43		#include "client.h"     /* for UMODE_ALL only */
44		#include "irc_string.h"
45		#include "memory.h"
46		#include "modules.h"
47	<	#include "s_serv.h"
47	>	#include "server.h"
48		#include "hostmask.h"
49		#include "send.h"
50		#include "listener.h"
51		#include "resv.h"
52		#include "numeric.h"
53	<	#include "s_user.h"
53	>	#include "user.h"
54	>	#include "motd.h"
55
56		#ifdef HAVE_LIBCRYPTO
57		#include <openssl/rsa.h>
#	Line 61 | Line 66 | int yylex(void);
66
67		static struct
68		{
69	<	struct {
69	>	struct
70	>	{
71		dlink_list list;
72		} mask,
73		leaf,
74		hub;
75
76	<	struct {
76	>	struct
77	>	{
78		char buf[IRCD_BUFSIZE];
79		} name,
80	+	nick,
81		user,
82		host,
83		addr,
84		bind,
85		file,
86		ciph,
87	+	cert,
88		rpass,
89		spass,
90	<	class;
90	>	class,
91	>	target,
92	>	prepend,
93	>	command;
94
95	<	struct {
95	>	struct
96	>	{
97		unsigned int value;
98		} flags,
99		modes,
#	Line 99 | Line 112 | static struct
112		max_ident,
113		max_sendq,
114		max_recvq,
115	+	max_channels,
116		cidr_bitlen_ipv4,
117		cidr_bitlen_ipv6,
118		number_per_cidr;
#	Line 107 | Line 121 | static struct
121		static void
122		reset_block_state(void)
123		{
124	<	dlink_node *ptr = NULL, *ptr_next = NULL;
124	>	dlink_node *node = NULL, *node_next = NULL;
125
126	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.mask.list.head)
126	>	DLINK_FOREACH_SAFE(node, node_next, block_state.mask.list.head)
127		{
128	<	MyFree(ptr->data);
129	<	dlinkDelete(ptr, &block_state.mask.list);
130	<	free_dlink_node(ptr);
128	>	MyFree(node->data);
129	>	dlinkDelete(node, &block_state.mask.list);
130	>	free_dlink_node(node);
131		}
132
133	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
133	>	DLINK_FOREACH_SAFE(node, node_next, block_state.leaf.list.head)
134		{
135	<	MyFree(ptr->data);
136	<	dlinkDelete(ptr, &block_state.leaf.list);
137	<	free_dlink_node(ptr);
135	>	MyFree(node->data);
136	>	dlinkDelete(node, &block_state.leaf.list);
137	>	free_dlink_node(node);
138		}
139
140	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.hub.list.head)
140	>	DLINK_FOREACH_SAFE(node, node_next, block_state.hub.list.head)
141		{
142	<	MyFree(ptr->data);
143	<	dlinkDelete(ptr, &block_state.hub.list);
144	<	free_dlink_node(ptr);
142	>	MyFree(node->data);
143	>	dlinkDelete(node, &block_state.hub.list);
144	>	free_dlink_node(node);
145		}
146
147		memset(&block_state, 0, sizeof(block_state));
#	Line 146 | Line 160 | reset_block_state(void)
160		%token  ANTI_NICK_FLOOD
161		%token  ANTI_SPAM_EXIT_MESSAGE_TIME
162		%token  AUTOCONN
163	+	%token  AWAY_COUNT
164	+	%token  AWAY_TIME
165		%token  BYTES KBYTES MBYTES
166		%token  CALLER_ID_WAIT
167		%token  CAN_FLOOD
168		%token  CHANNEL
169	<	%token  CIDR_BITLEN_IPV4
170	<	%token  CIDR_BITLEN_IPV6
169	>	%token  CIDR_BITLEN_IPV4
170	>	%token  CIDR_BITLEN_IPV6
171		%token  CLASS
172		%token  CONNECT
173		%token  CONNECTFREQ
174	+	%token  CYCLE_ON_HOST_CHANGE
175		%token  DEFAULT_FLOODCOUNT
176		%token  DEFAULT_SPLIT_SERVER_COUNT
177		%token  DEFAULT_SPLIT_USER_COUNT
#	Line 171 | Line 188 | reset_block_state(void)
188		%token  EXCEED_LIMIT
189		%token  EXEMPT
190		%token  FAILED_OPER_NOTICE
174	–	%token  IRCD_FLAGS
191		%token  FLATTEN_LINKS
192		%token  GECOS
193		%token  GENERAL
#	Line 179 | Line 195 | reset_block_state(void)
195		%token  GLINE_DURATION
196		%token  GLINE_ENABLE
197		%token  GLINE_EXEMPT
182	–	%token  GLINE_REQUEST_DURATION
198		%token  GLINE_MIN_CIDR
199		%token  GLINE_MIN_CIDR6
200	+	%token  GLINE_REQUEST_DURATION
201		%token  GLOBAL_KILL
186	–	%token  IRCD_AUTH
187	–	%token  NEED_IDENT
202		%token  HAVENT_READ_CONF
203		%token  HIDDEN
204	<	%token  HIDDEN_NAME
204	>	%token  HIDDEN_NAME
205	>	%token  HIDE_CHANS
206	>	%token  HIDE_IDLE
207	>	%token  HIDE_IDLE_FROM_OPERS
208		%token  HIDE_SERVER_IPS
209		%token  HIDE_SERVERS
210		%token  HIDE_SERVICES
211	<	%token  HIDE_SPOOF_IPS
211	>	%token  HIDE_SPOOF_IPS
212		%token  HOST
213		%token  HUB
214		%token  HUB_MASK
215		%token  IGNORE_BOGUS_TS
216		%token  INVISIBLE_ON_CONNECT
217	+	%token  INVITE_CLIENT_COUNT
218	+	%token  INVITE_CLIENT_TIME
219		%token  IP
220	+	%token  IRCD_AUTH
221	+	%token  IRCD_FLAGS
222	+	%token  IRCD_SID
223	+	%token  JOIN_FLOOD_COUNT
224	+	%token  JOIN_FLOOD_TIME
225		%token  KILL
226	<	%token  KILL_CHASE_TIME_LIMIT
226	>	%token  KILL_CHASE_TIME_LIMIT
227		%token  KLINE
228		%token  KLINE_EXEMPT
229	<	%token  KNOCK_DELAY
229	>	%token  KNOCK_CLIENT_COUNT
230	>	%token  KNOCK_CLIENT_TIME
231		%token  KNOCK_DELAY_CHANNEL
232		%token  LEAF_MASK
233		%token  LINKS_DELAY
234		%token  LISTEN
210	–	%token  T_LOG
235		%token  MASK
236		%token  MAX_ACCEPT
237		%token  MAX_BANS
238	<	%token  MAX_CHANS_PER_OPER
215	<	%token  MAX_CHANS_PER_USER
238	>	%token  MAX_CHANNELS
239		%token  MAX_GLOBAL
240		%token  MAX_IDENT
241	+	%token  MAX_IDLE
242		%token  MAX_LOCAL
243		%token  MAX_NICK_CHANGES
244		%token  MAX_NICK_LENGTH
#	Line 223 | Line 247 | reset_block_state(void)
247		%token  MAX_TARGETS
248		%token  MAX_TOPIC_LENGTH
249		%token  MAX_WATCH
250	+	%token  MIN_IDLE
251		%token  MIN_NONWILDCARD
252		%token  MIN_NONWILDCARD_SIMPLE
228	–	%token  MIN_IDLE
229	–	%token  MAX_IDLE
230	–	%token  RANDOM_IDLE
231	–	%token  HIDE_IDLE_FROM_OPERS
253		%token  MODULE
254		%token  MODULES
255	+	%token  MOTD
256		%token  NAME
257	+	%token  NEED_IDENT
258		%token  NEED_PASSWORD
259		%token  NETWORK_DESC
260		%token  NETWORK_NAME
#	Line 243 | Line 266 | reset_block_state(void)
266		%token  NUMBER
267		%token  NUMBER_PER_CIDR
268		%token  NUMBER_PER_IP
246	–	%token  OPERATOR
247	–	%token  OPERS_BYPASS_CALLERID
269		%token  OPER_ONLY_UMODES
270		%token  OPER_PASS_RESV
250	–	%token  OPER_SPY_T
271		%token  OPER_UMODES
272	<	%token  JOIN_FLOOD_COUNT
273	<	%token  JOIN_FLOOD_TIME
272	>	%token  OPERATOR
273	>	%token  OPERS_BYPASS_CALLERID
274		%token  PACE_WAIT
275		%token  PACE_WAIT_SIMPLE
276		%token  PASSWORD
#	Line 259 | Line 279 | reset_block_state(void)
279		%token  PING_TIME
280		%token  PORT
281		%token  QSTRING
282	+	%token  RANDOM_IDLE
283		%token  REASON
284		%token  REDIRPORT
285		%token  REDIRSERV
286		%token  REHASH
287		%token  REMOTE
288		%token  REMOTEBAN
268	–	%token  RSA_PRIVATE_KEY_FILE
269	–	%token  RSA_PUBLIC_KEY_FILE
270	–	%token  SSL_CERTIFICATE_FILE
271	–	%token  SSL_DH_PARAM_FILE
272	–	%token  T_SSL_CLIENT_METHOD
273	–	%token  T_SSL_SERVER_METHOD
274	–	%token  T_SSLV3
275	–	%token  T_TLSV1
289		%token  RESV
290		%token  RESV_EXEMPT
291	+	%token  RSA_PRIVATE_KEY_FILE
292	+	%token  RSA_PUBLIC_KEY_FILE
293		%token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
279	–	%token  SENDQ
294		%token  SEND_PASSWORD
295	+	%token  SENDQ
296		%token  SERVERHIDE
297		%token  SERVERINFO
283	–	%token  IRCD_SID
284	–	%token  TKLINE_EXPIRE_NOTICES
285	–	%token  T_SHARED
286	–	%token  T_CLUSTER
287	–	%token  TYPE
298		%token  SHORT_MOTD
299		%token  SPOOF
300		%token  SPOOF_NOTICE
301	+	%token  SQUIT
302	+	%token  SSL_CERTIFICATE_FILE
303	+	%token  SSL_CERTIFICATE_FINGERPRINT
304	+	%token  SSL_CONNECTION_REQUIRED
305	+	%token  SSL_DH_ELLIPTIC_CURVE
306	+	%token  SSL_DH_PARAM_FILE
307	+	%token  SSL_MESSAGE_DIGEST_ALGORITHM
308		%token  STATS_E_DISABLED
309		%token  STATS_I_OPER_ONLY
310		%token  STATS_K_OPER_ONLY
311		%token  STATS_O_OPER_ONLY
312		%token  STATS_P_OPER_ONLY
313	<	%token  TBOOL
297	<	%token  TMASKED
298	<	%token  TS_MAX_DELTA
299	<	%token  TS_WARN_DELTA
300	<	%token  TWODOTS
313	>	%token  STATS_U_OPER_ONLY
314		%token  T_ALL
315		%token  T_BOTS
303	–	%token  T_SOFTCALLERID
316		%token  T_CALLERID
317		%token  T_CCONN
318	<	%token  T_CCONN_FULL
319	<	%token  T_SSL_CIPHER_LIST
318	>	%token  T_COMMAND
319	>	%token  T_CLUSTER
320		%token  T_DEAF
321		%token  T_DEBUG
322		%token  T_DLINE
323		%token  T_EXTERNAL
324		%token  T_FARCONNECT
325	+	%token  T_FILE
326		%token  T_FULL
327	+	%token  T_GLOBOPS
328		%token  T_INVISIBLE
329		%token  T_IPV4
330		%token  T_IPV6
331		%token  T_LOCOPS
332	+	%token  T_LOG
333		%token  T_MAX_CLIENTS
334		%token  T_NCHANGE
335		%token  T_NONONREG
336	<	%token  T_OPERWALL
336	>	%token  T_PREPEND
337	>	%token  T_PSEUDO
338		%token  T_RECVQ
339		%token  T_REJ
340	+	%token  T_RESTART
341		%token  T_SERVER
342	+	%token  T_SERVICE
343		%token  T_SERVNOTICE
344		%token  T_SET
345	+	%token  T_SHARED
346	+	%token  T_SIZE
347		%token  T_SKILL
348	+	%token  T_SOFTCALLERID
349		%token  T_SPY
350		%token  T_SSL
351	+	%token  T_SSL_CIPHER_LIST
352	+	%token  T_TARGET
353		%token  T_UMODES
354		%token  T_UNAUTH
355		%token  T_UNDLINE
356		%token  T_UNLIMITED
357		%token  T_UNRESV
358		%token  T_UNXLINE
336	–	%token  T_GLOBOPS
359		%token  T_WALLOP
360	+	%token  T_WALLOPS
361		%token  T_WEBIRC
362	<	%token  T_RESTART
363	<	%token  T_SERVICE
341	<	%token  T_SERVICES_NAME
362	>	%token  TBOOL
363	>	%token  THROTTLE_COUNT
364		%token  THROTTLE_TIME
365	+	%token  TKLINE_EXPIRE_NOTICES
366	+	%token  TMASKED
367		%token  TRUE_NO_OPER_FLOOD
368	+	%token  TS_MAX_DELTA
369	+	%token  TS_WARN_DELTA
370	+	%token  TWODOTS
371	+	%token  TYPE
372		%token  UNKLINE
345	–	%token  USER
373		%token  USE_EGD
374		%token  USE_LOGGING
375	+	%token  USER
376		%token  VHOST
377		%token  VHOST6
378	+	%token  WARN_NO_CONNECT_BLOCK
379		%token  XLINE
351	–	%token  WARN_NO_NLINE
352	–	%token  T_SIZE
353	–	%token  T_FILE
380
381	<	%type <string> QSTRING
382	<	%type <number> NUMBER
383	<	%type <number> timespec
384	<	%type <number> timespec_
385	<	%type <number> sizespec
386	<	%type <number> sizespec_
381	>	%type  <string> QSTRING
382	>	%type  <number> NUMBER
383	>	%type  <number> timespec
384	>	%type  <number> timespec_
385	>	%type  <number> sizespec
386	>	%type  <number> sizespec_
387
388		%%
389	<	conf:
389	>	conf:
390		| conf conf_item
391		;
392
393		conf_item:        admin_entry
394		| logging_entry
395		| oper_entry
396	<	| channel_entry
397	<	| class_entry
396	>	| channel_entry
397	>	| class_entry
398		| listen_entry
399		| auth_entry
400		| serverinfo_entry
401	<	| serverhide_entry
401	>	| serverhide_entry
402		| resv_entry
403		| service_entry
404		| shared_entry
405	<	| cluster_entry
405	>	| cluster_entry
406		| connect_entry
407		| kill_entry
408		| deny_entry
409	<	| exempt_entry
410	<	| general_entry
409	>	| exempt_entry
410	>	| general_entry
411		| gecos_entry
412		| modules_entry
413	+	| motd_entry
414	+	| pseudo_entry
415		| error ';'
416		| error '}'
417		;
418
419
420		timespec_: { $$ = 0; } | timespec;
421	<	timespec:       NUMBER timespec_
422	<	{
423	<	$$ = $1 + $2;
424	<	}
425	<	| NUMBER SECONDS timespec_
426	<	{
427	<	$$ = $1 + $3;
428	<	}
429	<	| NUMBER MINUTES timespec_
430	<	{
431	<	$$ = $1 * 60 + $3;
432	<	}
433	<	| NUMBER HOURS timespec_
434	<	{
435	<	$$ = $1 * 60 * 60 + $3;
436	<	}
409	<	| NUMBER DAYS timespec_
410	<	{
411	<	$$ = $1 * 60 * 60 * 24 + $3;
412	<	}
413	<	| NUMBER WEEKS timespec_
414	<	{
415	<	$$ = $1 * 60 * 60 * 24 * 7 + $3;
416	<	}
417	<	| NUMBER MONTHS timespec_
418	<	{
419	<	$$ = $1 * 60 * 60 * 24 * 7 * 4 + $3;
420	<	}
421	<	| NUMBER YEARS timespec_
422	<	{
423	<	$$ = $1 * 60 * 60 * 24 * 365 + $3;
424	<	}
425	<	;
426	<
427	<	sizespec_:      { $$ = 0; } | sizespec;
428	<	sizespec:       NUMBER sizespec_ { $$ = $1 + $2; }
429	<	| NUMBER BYTES sizespec_ { $$ = $1 + $3; }
430	<	| NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; }
431	<	| NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
432	<	;
421	>	timespec:  NUMBER timespec_         { $$ = $1 + $2; } |
422	>	NUMBER SECONDS timespec_ { $$ = $1 + $3; } |
423	>	NUMBER MINUTES timespec_ { $$ = $1 * 60 + $3; } |
424	>	NUMBER HOURS timespec_   { $$ = $1 * 60 * 60 + $3; } |
425	>	NUMBER DAYS timespec_    { $$ = $1 * 60 * 60 * 24 + $3; } |
426	>	NUMBER WEEKS timespec_   { $$ = $1 * 60 * 60 * 24 * 7 + $3; } |
427	>	NUMBER MONTHS timespec_  { $$ = $1 * 60 * 60 * 24 * 7 * 4 + $3; } |
428	>	NUMBER YEARS timespec_   { $$ = $1 * 60 * 60 * 24 * 365 + $3; }
429	>	;
430	>
431	>	sizespec_:  { $$ = 0; } | sizespec;
432	>	sizespec:   NUMBER sizespec_ { $$ = $1 + $2; } |
433	>	NUMBER BYTES sizespec_ { $$ = $1 + $3; } |
434	>	NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; } |
435	>	NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
436	>	;
437
438
439		/***************************************************************************
#	Line 457 | Line 461 | modules_path: PATH '=' QSTRING ';'
461		serverinfo_entry: SERVERINFO '{' serverinfo_items '}' ';';
462
463		serverinfo_items:       serverinfo_items serverinfo_item | serverinfo_item ;
464	<	serverinfo_item:        serverinfo_name | serverinfo_vhost |
465	<	serverinfo_hub | serverinfo_description |
466	<	serverinfo_network_name | serverinfo_network_desc |
467	<	serverinfo_max_clients | serverinfo_max_nick_length |
468	<	serverinfo_max_topic_length | serverinfo_ssl_dh_param_file |
469	<	serverinfo_rsa_private_key_file | serverinfo_vhost6 |
470	<	serverinfo_sid | serverinfo_ssl_certificate_file |
471	<	serverinfo_ssl_client_method | serverinfo_ssl_server_method |
464	>	serverinfo_item:        serverinfo_name |
465	>	serverinfo_vhost |
466	>	serverinfo_hub |
467	>	serverinfo_description |
468	>	serverinfo_network_name |
469	>	serverinfo_network_desc |
470	>	serverinfo_max_clients |
471	>	serverinfo_max_nick_length |
472	>	serverinfo_max_topic_length |
473	>	serverinfo_ssl_dh_param_file |
474	>	serverinfo_ssl_dh_elliptic_curve |
475	>	serverinfo_rsa_private_key_file |
476	>	serverinfo_vhost6 |
477	>	serverinfo_sid |
478	>	serverinfo_ssl_certificate_file |
479		serverinfo_ssl_cipher_list |
480	<	error ';' ;
481	<
480	>	serverinfo_ssl_message_digest_algorithm |
481	>	error ';' ;
482
472	–	serverinfo_ssl_client_method: T_SSL_CLIENT_METHOD '=' client_method_types ';' ;
473	–	serverinfo_ssl_server_method: T_SSL_SERVER_METHOD '=' server_method_types ';' ;
474	–
475	–	client_method_types: client_method_types ',' client_method_type_item | client_method_type_item;
476	–	client_method_type_item: T_SSLV3
477	–	{
478	–	#ifdef HAVE_LIBCRYPTO
479	–	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
480	–	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv3);
481	–	#endif
482	–	} | T_TLSV1
483	–	{
484	–	#ifdef HAVE_LIBCRYPTO
485	–	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
486	–	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_TLSv1);
487	–	#endif
488	–	};
489	–
490	–	server_method_types: server_method_types ',' server_method_type_item | server_method_type_item;
491	–	server_method_type_item: T_SSLV3
492	–	{
493	–	#ifdef HAVE_LIBCRYPTO
494	–	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
495	–	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
496	–	#endif
497	–	} | T_TLSV1
498	–	{
499	–	#ifdef HAVE_LIBCRYPTO
500	–	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
501	–	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
502	–	#endif
503	–	};
483
484		serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
485		{
486		#ifdef HAVE_LIBCRYPTO
487	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
487	>	if (conf_parser_ctx.pass == 2)
488		{
489	<	if (!ServerInfo.rsa_private_key_file)
489	>	if (!ConfigServerInfo.rsa_private_key_file)
490		{
491		conf_error_report("No rsa_private_key_file specified, SSL disabled");
492		break;
493		}
494
495	<	if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
496	<	SSL_FILETYPE_PEM) <= 0 ||
518	<	SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
519	<	SSL_FILETYPE_PEM) <= 0)
495	>	if (SSL_CTX_use_certificate_chain_file(ConfigServerInfo.server_ctx, yylval.string) <= 0 ||
496	>	SSL_CTX_use_certificate_chain_file(ConfigServerInfo.client_ctx, yylval.string) <= 0)
497		{
498		report_crypto_errors();
499		conf_error_report("Could not open/read certificate file");
500		break;
501		}
502
503	<	if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
503	>	if (SSL_CTX_use_PrivateKey_file(ConfigServerInfo.server_ctx, ConfigServerInfo.rsa_private_key_file,
504		SSL_FILETYPE_PEM) <= 0 ||
505	<	SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
505	>	SSL_CTX_use_PrivateKey_file(ConfigServerInfo.client_ctx, ConfigServerInfo.rsa_private_key_file,
506		SSL_FILETYPE_PEM) <= 0)
507		{
508		report_crypto_errors();
#	Line 533 | Line 510 | serverinfo_ssl_certificate_file: SSL_CER
510		break;
511		}
512
513	<	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
514	<	!SSL_CTX_check_private_key(ServerInfo.client_ctx))
513	>	if (!SSL_CTX_check_private_key(ConfigServerInfo.server_ctx) ||
514	>	!SSL_CTX_check_private_key(ConfigServerInfo.client_ctx))
515		{
516		report_crypto_errors();
517		conf_error_report("Could not read RSA private key");
#	Line 547 | Line 524 | serverinfo_ssl_certificate_file: SSL_CER
524		serverinfo_rsa_private_key_file: RSA_PRIVATE_KEY_FILE '=' QSTRING ';'
525		{
526		#ifdef HAVE_LIBCRYPTO
527	<	if (conf_parser_ctx.pass == 1)
551	<	{
552	<	BIO *file;
527	>	BIO *file = NULL;
528
529	<	if (ServerInfo.rsa_private_key)
530	<	{
556	<	RSA_free(ServerInfo.rsa_private_key);
557	<	ServerInfo.rsa_private_key = NULL;
558	<	}
529	>	if (conf_parser_ctx.pass != 1)
530	>	break;
531
532	<	if (ServerInfo.rsa_private_key_file)
533	<	{
534	<	MyFree(ServerInfo.rsa_private_key_file);
535	<	ServerInfo.rsa_private_key_file = NULL;
536	<	}
532	>	if (ConfigServerInfo.rsa_private_key)
533	>	{
534	>	RSA_free(ConfigServerInfo.rsa_private_key);
535	>	ConfigServerInfo.rsa_private_key = NULL;
536	>	}
537
538	<	ServerInfo.rsa_private_key_file = xstrdup(yylval.string);
538	>	if (ConfigServerInfo.rsa_private_key_file)
539	>	{
540	>	MyFree(ConfigServerInfo.rsa_private_key_file);
541	>	ConfigServerInfo.rsa_private_key_file = NULL;
542	>	}
543
544	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
569	<	{
570	<	conf_error_report("File open failed, ignoring");
571	<	break;
572	<	}
544	>	ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
545
546	<	ServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
546	>	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
547	>	{
548	>	conf_error_report("File open failed, ignoring");
549	>	break;
550	>	}
551
552	<	BIO_set_close(file, BIO_CLOSE);
577	<	BIO_free(file);
552	>	ConfigServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
553
554	<	if (ServerInfo.rsa_private_key == NULL)
555	<	{
581	<	conf_error_report("Couldn't extract key, ignoring");
582	<	break;
583	<	}
554	>	BIO_set_close(file, BIO_CLOSE);
555	>	BIO_free(file);
556
557	<	if (!RSA_check_key(ServerInfo.rsa_private_key))
558	<	{
559	<	RSA_free(ServerInfo.rsa_private_key);
560	<	ServerInfo.rsa_private_key = NULL;
557	>	if (ConfigServerInfo.rsa_private_key == NULL)
558	>	{
559	>	conf_error_report("Couldn't extract key, ignoring");
560	>	break;
561	>	}
562
563	<	conf_error_report("Invalid key, ignoring");
564	<	break;
565	<	}
563	>	if (!RSA_check_key(ConfigServerInfo.rsa_private_key))
564	>	{
565	>	RSA_free(ConfigServerInfo.rsa_private_key);
566	>	ConfigServerInfo.rsa_private_key = NULL;
567
568	<	/* require 2048 bit (256 byte) key */
569	<	if (RSA_size(ServerInfo.rsa_private_key) != 256)
570	<	{
597	<	RSA_free(ServerInfo.rsa_private_key);
598	<	ServerInfo.rsa_private_key = NULL;
568	>	conf_error_report("Invalid key, ignoring");
569	>	break;
570	>	}
571
572	<	conf_error_report("Not a 2048 bit key, ignoring");
573	<	}
572	>	if (RSA_size(ConfigServerInfo.rsa_private_key) < 128)
573	>	{
574	>	RSA_free(ConfigServerInfo.rsa_private_key);
575	>	ConfigServerInfo.rsa_private_key = NULL;
576	>
577	>	conf_error_report("Ignoring serverinfo::rsa_private_key_file -- need at least a 1024 bit key size");
578		}
579		#endif
580		};
581
582		serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
583		{
608	–	/* TBD - XXX: error reporting */
584		#ifdef HAVE_LIBCRYPTO
585	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
585	>	if (conf_parser_ctx.pass == 2)
586		{
587		BIO *file = BIO_new_file(yylval.string, "r");
588
#	Line 622 | Line 597 | serverinfo_ssl_dh_param_file: SSL_DH_PAR
597		if (DH_size(dh) < 128)
598		conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
599		else
600	<	SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
600	>	SSL_CTX_set_tmp_dh(ConfigServerInfo.server_ctx, dh);
601
602		DH_free(dh);
603		}
604		}
605	+	else
606	+	conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- could not open/read Diffie-Hellman parameter file");
607		}
608		#endif
609		};
#	Line 634 | Line 611 | serverinfo_ssl_dh_param_file: SSL_DH_PAR
611		serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
612		{
613		#ifdef HAVE_LIBCRYPTO
614	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
615	<	SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
614	>	if (conf_parser_ctx.pass == 2)
615	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, yylval.string);
616		#endif
617		};
618
619	<	serverinfo_name: NAME '=' QSTRING ';'
619	>	serverinfo_ssl_message_digest_algorithm: SSL_MESSAGE_DIGEST_ALGORITHM '=' QSTRING ';'
620	>	{
621	>	#ifdef HAVE_LIBCRYPTO
622	>	if (conf_parser_ctx.pass == 2)
623	>	{
624	>	if ((ConfigServerInfo.message_digest_algorithm = EVP_get_digestbyname(yylval.string)) == NULL)
625	>	{
626	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
627	>	conf_error_report("Ignoring serverinfo::ssl_message_digest_algorithm -- unknown message digest algorithm");
628	>	}
629	>	}
630	>	#endif
631	>	}
632	>
633	>	serverinfo_ssl_dh_elliptic_curve: SSL_DH_ELLIPTIC_CURVE '=' QSTRING ';'
634	>	{
635	>	#ifdef HAVE_LIBCRYPTO
636	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
637	>	int nid = 0;
638	>	EC_KEY *key = NULL;
639	>
640	>	if (conf_parser_ctx.pass == 2)
641	>	{
642	>	if ((nid = OBJ_sn2nid(yylval.string)) == 0)
643	>	{
644	>	conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- unknown curve name");
645	>	break;
646	>	}
647	>
648	>	if ((key = EC_KEY_new_by_curve_name(nid)) == NULL)
649	>	{
650	>	conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- could not create curve");
651	>	break;
652	>	}
653	>
654	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
655	>	EC_KEY_free(key);
656	>	}
657	>	#endif
658	>	#endif
659	>	};
660	>
661	>	serverinfo_name: NAME '=' QSTRING ';'
662		{
663		/* this isn't rehashable */
664	<	if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
664	>	if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.name)
665		{
666		if (valid_servname(yylval.string))
667	<	ServerInfo.name = xstrdup(yylval.string);
667	>	ConfigServerInfo.name = xstrdup(yylval.string);
668		else
669		{
670		conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
#	Line 654 | Line 673 | serverinfo_name: NAME '=' QSTRING ';'
673		}
674		};
675
676	<	serverinfo_sid: IRCD_SID '=' QSTRING ';'
676	>	serverinfo_sid: IRCD_SID '=' QSTRING ';'
677		{
678		/* this isn't rehashable */
679	<	if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
679	>	if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.sid)
680		{
681		if (valid_sid(yylval.string))
682	<	ServerInfo.sid = xstrdup(yylval.string);
682	>	ConfigServerInfo.sid = xstrdup(yylval.string);
683		else
684		{
685		conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
#	Line 673 | Line 692 | serverinfo_description: DESCRIPTION '='
692		{
693		if (conf_parser_ctx.pass == 2)
694		{
695	<	MyFree(ServerInfo.description);
696	<	ServerInfo.description = xstrdup(yylval.string);
695	>	MyFree(ConfigServerInfo.description);
696	>	ConfigServerInfo.description = xstrdup(yylval.string);
697	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
698		}
699		};
700
#	Line 684 | Line 704 | serverinfo_network_name: NETWORK_NAME '=
704		{
705		char *p;
706
707	<	if ((p = strchr(yylval.string, ' ')) != NULL)
708	<	p = '\0';
707	>	if ((p = strchr(yylval.string, ' ')))
708	>	*p = '\0';
709
710	<	MyFree(ServerInfo.network_name);
711	<	ServerInfo.network_name = xstrdup(yylval.string);
710	>	MyFree(ConfigServerInfo.network_name);
711	>	ConfigServerInfo.network_name = xstrdup(yylval.string);
712		}
713		};
714
715		serverinfo_network_desc: NETWORK_DESC '=' QSTRING ';'
716		{
717	<	if (conf_parser_ctx.pass == 2)
718	<	{
719	<	MyFree(ServerInfo.network_desc);
720	<	ServerInfo.network_desc = xstrdup(yylval.string);
721	<	}
717	>	if (conf_parser_ctx.pass != 2)
718	>	break;
719	>
720	>	MyFree(ConfigServerInfo.network_desc);
721	>	ConfigServerInfo.network_desc = xstrdup(yylval.string);
722		};
723
724		serverinfo_vhost: VHOST '=' QSTRING ';'
#	Line 717 | Line 737 | serverinfo_vhost: VHOST '=' QSTRING ';'
737		ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
738		else
739		{
740	<	assert(res != NULL);
740	>	assert(res);
741
742	<	memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
743	<	ServerInfo.ip.ss.ss_family = res->ai_family;
744	<	ServerInfo.ip.ss_len = res->ai_addrlen;
742	>	memcpy(&ConfigServerInfo.ip, res->ai_addr, res->ai_addrlen);
743	>	ConfigServerInfo.ip.ss.ss_family = res->ai_family;
744	>	ConfigServerInfo.ip.ss_len = res->ai_addrlen;
745		freeaddrinfo(res);
746
747	<	ServerInfo.specific_ipv4_vhost = 1;
747	>	ConfigServerInfo.specific_ipv4_vhost = 1;
748		}
749		}
750		};
751
752		serverinfo_vhost6: VHOST6 '=' QSTRING ';'
753		{
734	–	#ifdef IPV6
754		if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
755		{
756		struct addrinfo hints, *res;
#	Line 746 | Line 765 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
765		ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
766		else
767		{
768	<	assert(res != NULL);
768	>	assert(res);
769
770	<	memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
771	<	ServerInfo.ip6.ss.ss_family = res->ai_family;
772	<	ServerInfo.ip6.ss_len = res->ai_addrlen;
770	>	memcpy(&ConfigServerInfo.ip6, res->ai_addr, res->ai_addrlen);
771	>	ConfigServerInfo.ip6.ss.ss_family = res->ai_family;
772	>	ConfigServerInfo.ip6.ss_len = res->ai_addrlen;
773		freeaddrinfo(res);
774
775	<	ServerInfo.specific_ipv6_vhost = 1;
775	>	ConfigServerInfo.specific_ipv6_vhost = 1;
776		}
777		}
759	–	#endif
778		};
779
780		serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
#	Line 766 | Line 784 | serverinfo_max_clients: T_MAX_CLIENTS '=
784
785		if ($3 < MAXCLIENTS_MIN)
786		{
787	<	char buf[IRCD_BUFSIZE];
787	>	char buf[IRCD_BUFSIZE] = "";
788
789		snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
790		conf_error_report(buf);
791	<	ServerInfo.max_clients = MAXCLIENTS_MIN;
791	>	ConfigServerInfo.max_clients = MAXCLIENTS_MIN;
792		}
793		else if ($3 > MAXCLIENTS_MAX)
794		{
795	<	char buf[IRCD_BUFSIZE];
795	>	char buf[IRCD_BUFSIZE] = "";
796
797		snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
798		conf_error_report(buf);
799	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
799	>	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
800		}
801		else
802	<	ServerInfo.max_clients = $3;
802	>	ConfigServerInfo.max_clients = $3;
803		};
804
805		serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
#	Line 792 | Line 810 | serverinfo_max_nick_length: MAX_NICK_LEN
810		if ($3 < 9)
811		{
812		conf_error_report("max_nick_length too low, setting to 9");
813	<	ServerInfo.max_nick_length = 9;
813	>	ConfigServerInfo.max_nick_length = 9;
814		}
815		else if ($3 > NICKLEN)
816		{
817	<	char buf[IRCD_BUFSIZE];
817	>	char buf[IRCD_BUFSIZE] = "";
818
819		snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
820		conf_error_report(buf);
821	<	ServerInfo.max_nick_length = NICKLEN;
821	>	ConfigServerInfo.max_nick_length = NICKLEN;
822		}
823		else
824	<	ServerInfo.max_nick_length = $3;
824	>	ConfigServerInfo.max_nick_length = $3;
825		};
826
827		serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
#	Line 814 | Line 832 | serverinfo_max_topic_length: MAX_TOPIC_L
832		if ($3 < 80)
833		{
834		conf_error_report("max_topic_length too low, setting to 80");
835	<	ServerInfo.max_topic_length = 80;
835	>	ConfigServerInfo.max_topic_length = 80;
836		}
837		else if ($3 > TOPICLEN)
838		{
839	<	char buf[IRCD_BUFSIZE];
839	>	char buf[IRCD_BUFSIZE] = "";
840
841		snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
842		conf_error_report(buf);
843	<	ServerInfo.max_topic_length = TOPICLEN;
843	>	ConfigServerInfo.max_topic_length = TOPICLEN;
844		}
845		else
846	<	ServerInfo.max_topic_length = $3;
846	>	ConfigServerInfo.max_topic_length = $3;
847		};
848
849	<	serverinfo_hub: HUB '=' TBOOL ';'
849	>	serverinfo_hub: HUB '=' TBOOL ';'
850		{
851		if (conf_parser_ctx.pass == 2)
852	<	ServerInfo.hub = yylval.number;
852	>	ConfigServerInfo.hub = yylval.number;
853		};
854
855		/***************************************************************************
#	Line 840 | Line 858 | serverinfo_hub: HUB '=' TBOOL ';'
858		admin_entry: ADMIN  '{' admin_items '}' ';' ;
859
860		admin_items: admin_items admin_item | admin_item;
861	<	admin_item:  admin_name | admin_description |
862	<	admin_email | error ';' ;
861	>	admin_item:  admin_name |
862	>	admin_description |
863	>	admin_email |
864	>	error ';' ;
865
866	<	admin_name: NAME '=' QSTRING ';'
866	>	admin_name: NAME '=' QSTRING ';'
867		{
868	<	if (conf_parser_ctx.pass == 2)
869	<	{
870	<	MyFree(AdminInfo.name);
871	<	AdminInfo.name = xstrdup(yylval.string);
872	<	}
868	>	if (conf_parser_ctx.pass != 2)
869	>	break;
870	>
871	>	MyFree(ConfigAdminInfo.name);
872	>	ConfigAdminInfo.name = xstrdup(yylval.string);
873		};
874
875		admin_email: EMAIL '=' QSTRING ';'
876		{
877	<	if (conf_parser_ctx.pass == 2)
878	<	{
879	<	MyFree(AdminInfo.email);
880	<	AdminInfo.email = xstrdup(yylval.string);
881	<	}
877	>	if (conf_parser_ctx.pass != 2)
878	>	break;
879	>
880	>	MyFree(ConfigAdminInfo.email);
881	>	ConfigAdminInfo.email = xstrdup(yylval.string);
882		};
883
884		admin_description: DESCRIPTION '=' QSTRING ';'
885		{
886	+	if (conf_parser_ctx.pass != 2)
887	+	break;
888	+
889	+	MyFree(ConfigAdminInfo.description);
890	+	ConfigAdminInfo.description = xstrdup(yylval.string);
891	+	};
892	+
893	+	/***************************************************************************
894	+	* motd section
895	+	***************************************************************************/
896	+	motd_entry: MOTD
897	+	{
898	+	if (conf_parser_ctx.pass == 2)
899	+	reset_block_state();
900	+	} '{' motd_items '}' ';'
901	+	{
902	+	dlink_node *node = NULL;
903	+
904	+	if (conf_parser_ctx.pass != 2)
905	+	break;
906	+
907	+	if (!block_state.file.buf[0])
908	+	break;
909	+
910	+	DLINK_FOREACH(node, block_state.mask.list.head)
911	+	motd_add(node->data, block_state.file.buf);
912	+	};
913	+
914	+	motd_items: motd_items motd_item | motd_item;
915	+	motd_item:  motd_mask | motd_file | error ';' ;
916	+
917	+	motd_mask: MASK '=' QSTRING ';'
918	+	{
919	+	if (conf_parser_ctx.pass == 2)
920	+	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
921	+	};
922	+
923	+	motd_file: T_FILE '=' QSTRING ';'
924	+	{
925	+	if (conf_parser_ctx.pass == 2)
926	+	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
927	+	};
928	+
929	+	/***************************************************************************
930	+	* pseudo section
931	+	***************************************************************************/
932	+	pseudo_entry: T_PSEUDO
933	+	{
934	+	if (conf_parser_ctx.pass == 2)
935	+	reset_block_state();
936	+	} '{' pseudo_items '}' ';'
937	+	{
938	+	if (conf_parser_ctx.pass != 2)
939	+	break;
940	+
941	+	if (!block_state.command.buf[0] ||
942	+	!block_state.name.buf[0] ||
943	+	!block_state.nick.buf[0] ||
944	+	!block_state.host.buf[0])
945	+	break;
946	+
947	+	pseudo_register(block_state.name.buf, block_state.nick.buf, block_state.host.buf,
948	+	block_state.prepend.buf, block_state.command.buf);
949	+	};
950	+
951	+	pseudo_items: pseudo_items pseudo_item | pseudo_item;
952	+	pseudo_item:  pseudo_command | pseudo_prepend | pseudo_name | pseudo_target | error ';' ;
953	+
954	+	pseudo_command: T_COMMAND '=' QSTRING ';'
955	+	{
956	+	if (conf_parser_ctx.pass == 2)
957	+	strlcpy(block_state.command.buf, yylval.string, sizeof(block_state.command.buf));
958	+	};
959	+
960	+	pseudo_name: NAME '=' QSTRING ';'
961	+	{
962	+	if (conf_parser_ctx.pass == 2)
963	+	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
964	+	};
965	+
966	+	pseudo_prepend: T_PREPEND '=' QSTRING ';'
967	+	{
968	+	if (conf_parser_ctx.pass == 2)
969	+	strlcpy(block_state.prepend.buf, yylval.string, sizeof(block_state.prepend.buf));
970	+	};
971	+
972	+	pseudo_target: T_TARGET '=' QSTRING ';'
973	+	{
974		if (conf_parser_ctx.pass == 2)
975		{
976	<	MyFree(AdminInfo.description);
977	<	AdminInfo.description = xstrdup(yylval.string);
976	>	struct split_nuh_item nuh;
977	>
978	>	nuh.nuhmask  = yylval.string;
979	>	nuh.nickptr  = NULL;
980	>	nuh.userptr  = block_state.user.buf;
981	>	nuh.hostptr  = block_state.host.buf;
982	>	nuh.nicksize = 0;
983	>	nuh.usersize = sizeof(block_state.nick.buf);
984	>	nuh.hostsize = sizeof(block_state.host.buf);
985	>	split_nuh(&nuh);
986	>
987	>	strlcpy(block_state.nick.buf, nuh.userptr, sizeof(block_state.nick.buf));
988	>	strlcpy(block_state.host.buf, nuh.hostptr, sizeof(block_state.host.buf));
989		}
990		};
991
#	Line 876 | Line 995 | admin_description: DESCRIPTION '=' QSTRI
995		logging_entry:          T_LOG  '{' logging_items '}' ';' ;
996		logging_items:          logging_items logging_item | logging_item ;
997
998	<	logging_item:           logging_use_logging | logging_file_entry |
999	<	error ';' ;
998	>	logging_item:           logging_use_logging | logging_file_entry |
999	>	error ';' ;
1000
1001		logging_use_logging: USE_LOGGING '=' TBOOL ';'
1002		{
1003		if (conf_parser_ctx.pass == 2)
1004	<	ConfigLoggingEntry.use_logging = yylval.number;
1004	>	ConfigLog.use_logging = yylval.number;
1005		};
1006
1007		logging_file_entry:
#	Line 940 | Line 1059 | logging_file_type_item:  USER
1059		{
1060		if (conf_parser_ctx.pass == 2)
1061		block_state.type.value = LOG_TYPE_GLINE;
1062	+	} | XLINE
1063	+	{
1064	+	if (conf_parser_ctx.pass == 2)
1065	+	block_state.type.value = LOG_TYPE_XLINE;
1066	+	} | RESV
1067	+	{
1068	+	if (conf_parser_ctx.pass == 2)
1069	+	block_state.type.value = LOG_TYPE_RESV;
1070		} | T_DLINE
1071		{
1072		if (conf_parser_ctx.pass == 2)
#	Line 962 | Line 1089 | logging_file_type_item:  USER
1089		/***************************************************************************
1090		* section oper
1091		***************************************************************************/
1092	<	oper_entry: OPERATOR
1092	>	oper_entry: OPERATOR
1093		{
1094		if (conf_parser_ctx.pass != 2)
1095		break;
#	Line 971 | Line 1098 | oper_entry: OPERATOR
1098		block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1099		} '{' oper_items '}' ';'
1100		{
1101	<	dlink_node *ptr = NULL;
1101	>	dlink_node *node = NULL;
1102
1103		if (conf_parser_ctx.pass != 2)
1104		break;
#	Line 979 | Line 1106 | oper_entry: OPERATOR
1106		if (!block_state.name.buf[0])
1107		break;
1108		#ifdef HAVE_LIBCRYPTO
1109	<	if (!(block_state.file.buf[0] ||
1110	<	block_state.rpass.buf[0]))
1109	>	if (!block_state.file.buf[0] &&
1110	>	!block_state.rpass.buf[0])
1111		break;
1112		#else
1113		if (!block_state.rpass.buf[0])
1114		break;
1115		#endif
1116
1117	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
1117	>	DLINK_FOREACH(node, block_state.mask.list.head)
1118		{
1119		struct MaskItem *conf = NULL;
1120		struct split_nuh_item nuh;
1121
1122	<	nuh.nuhmask  = ptr->data;
1122	>	nuh.nuhmask  = node->data;
1123		nuh.nickptr  = NULL;
1124		nuh.userptr  = block_state.user.buf;
1125		nuh.hostptr  = block_state.host.buf;
#	Line 1001 | Line 1128 | oper_entry: OPERATOR
1128		nuh.hostsize = sizeof(block_state.host.buf);
1129		split_nuh(&nuh);
1130
1131	<	conf        = conf_make(CONF_OPER);
1132	<	conf->name  = xstrdup(block_state.name.buf);
1133	<	conf->user  = xstrdup(block_state.user.buf);
1134	<	conf->host  = xstrdup(block_state.host.buf);
1131	>	conf         = conf_make(CONF_OPER);
1132	>	conf->name   = xstrdup(block_state.name.buf);
1133	>	conf->user   = xstrdup(block_state.user.buf);
1134	>	conf->host   = xstrdup(block_state.host.buf);
1135	>
1136	>	if (block_state.cert.buf[0])
1137	>	conf->certfp = xstrdup(block_state.cert.buf);
1138
1139		if (block_state.rpass.buf[0])
1140		conf->passwd = xstrdup(block_state.rpass.buf);
#	Line 1024 | Line 1154 | oper_entry: OPERATOR
1154
1155		if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
1156		{
1157	<	conf_error_report("Ignoring rsa_public_key_file -- file doesn't exist");
1157	>	ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- file doesn't exist");
1158		break;
1159		}
1160
1161		if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
1162	<	conf_error_report("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1162	>	ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key invalid; check key syntax");
1163	>	else
1164	>	{
1165	>	if (RSA_size(pkey) > 128)
1166	>	ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key size must be 1024 or below");
1167	>	else
1168	>	conf->rsa_public_key = pkey;
1169	>	}
1170
1034	–	conf->rsa_public_key = pkey;
1171		BIO_set_close(file, BIO_CLOSE);
1172		BIO_free(file);
1173		}
#	Line 1040 | Line 1176 | oper_entry: OPERATOR
1176		};
1177
1178		oper_items:     oper_items oper_item | oper_item;
1179	<	oper_item:      oper_name | oper_user | oper_password |
1180	<	oper_umodes | oper_class | oper_encrypted |
1181	<	oper_rsa_public_key_file | oper_flags | error ';' ;
1179	>	oper_item:      oper_name |
1180	>	oper_user |
1181	>	oper_password |
1182	>	oper_umodes |
1183	>	oper_class |
1184	>	oper_encrypted |
1185	>	oper_rsa_public_key_file |
1186	>	oper_ssl_certificate_fingerprint |
1187	>	oper_ssl_connection_required |
1188	>	oper_flags |
1189	>	error ';' ;
1190
1191		oper_name: NAME '=' QSTRING ';'
1192		{
#	Line 1064 | Line 1208 | oper_password: PASSWORD '=' QSTRING ';'
1208
1209		oper_encrypted: ENCRYPTED '=' TBOOL ';'
1210		{
1211	<	if (conf_parser_ctx.pass == 2)
1212	<	{
1213	<	if (yylval.number)
1214	<	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1215	<	else
1216	<	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1217	<	}
1211	>	if (conf_parser_ctx.pass != 2)
1212	>	break;
1213	>
1214	>	if (yylval.number)
1215	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1216	>	else
1217	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1218		};
1219
1220		oper_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
#	Line 1079 | Line 1223 | oper_rsa_public_key_file: RSA_PUBLIC_KEY
1223		strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
1224		};
1225
1226	+	oper_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
1227	+	{
1228	+	if (conf_parser_ctx.pass == 2)
1229	+	strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
1230	+	};
1231	+
1232	+	oper_ssl_connection_required: SSL_CONNECTION_REQUIRED '=' TBOOL ';'
1233	+	{
1234	+	if (conf_parser_ctx.pass != 2)
1235	+	break;
1236	+
1237	+	if (yylval.number)
1238	+	block_state.flags.value |= CONF_FLAGS_SSL;
1239	+	else
1240	+	block_state.flags.value &= ~CONF_FLAGS_SSL;
1241	+	};
1242	+
1243		oper_class: CLASS '=' QSTRING ';'
1244		{
1245		if (conf_parser_ctx.pass == 2)
#	Line 1100 | Line 1261 | oper_umodes_item:  T_BOTS
1261		{
1262		if (conf_parser_ctx.pass == 2)
1263		block_state.modes.value |= UMODE_CCONN;
1103	–	} | T_CCONN_FULL
1104	–	{
1105	–	if (conf_parser_ctx.pass == 2)
1106	–	block_state.modes.value |= UMODE_CCONN_FULL;
1264		} | T_DEAF
1265		{
1266		if (conf_parser_ctx.pass == 2)
#	Line 1120 | Line 1277 | oper_umodes_item:  T_BOTS
1277		{
1278		if (conf_parser_ctx.pass == 2)
1279		block_state.modes.value |= UMODE_HIDDEN;
1280	+	} | HIDE_CHANS
1281	+	{
1282	+	if (conf_parser_ctx.pass == 2)
1283	+	block_state.modes.value |= UMODE_HIDECHANS;
1284	+	} | HIDE_IDLE
1285	+	{
1286	+	if (conf_parser_ctx.pass == 2)
1287	+	block_state.modes.value |= UMODE_HIDEIDLE;
1288		} | T_SKILL
1289		{
1290		if (conf_parser_ctx.pass == 2)
#	Line 1144 | Line 1309 | oper_umodes_item:  T_BOTS
1309		{
1310		if (conf_parser_ctx.pass == 2)
1311		block_state.modes.value |= UMODE_EXTERNAL;
1147	–	} | T_OPERWALL
1148	–	{
1149	–	if (conf_parser_ctx.pass == 2)
1150	–	block_state.modes.value |= UMODE_OPERWALL;
1312		} | T_SERVNOTICE
1313		{
1314		if (conf_parser_ctx.pass == 2)
#	Line 1189 | Line 1350 | oper_flags: IRCD_FLAGS
1350		} '='  oper_flags_items ';';
1351
1352		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1353	<	oper_flags_item: GLOBAL_KILL
1353	>	oper_flags_item: KILL ':' REMOTE
1354		{
1355		if (conf_parser_ctx.pass == 2)
1356	<	block_state.port.value |= OPER_FLAG_GLOBAL_KILL;
1357	<	} | REMOTE
1356	>	block_state.port.value |= OPER_FLAG_KILL_REMOTE;
1357	>	} | KILL
1358		{
1359		if (conf_parser_ctx.pass == 2)
1360	<	block_state.port.value |= OPER_FLAG_REMOTE;
1360	>	block_state.port.value |= OPER_FLAG_KILL;
1361	>	} | CONNECT ':' REMOTE
1362	>	{
1363	>	if (conf_parser_ctx.pass == 2)
1364	>	block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
1365	>	} | CONNECT
1366	>	{
1367	>	if (conf_parser_ctx.pass == 2)
1368	>	block_state.port.value |= OPER_FLAG_CONNECT;
1369	>	} | SQUIT ':' REMOTE
1370	>	{
1371	>	if (conf_parser_ctx.pass == 2)
1372	>	block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
1373	>	} | SQUIT
1374	>	{
1375	>	if (conf_parser_ctx.pass == 2)
1376	>	block_state.port.value |= OPER_FLAG_SQUIT;
1377		} | KLINE
1378		{
1379		if (conf_parser_ctx.pass == 2)
1380	<	block_state.port.value |= OPER_FLAG_K;
1380	>	block_state.port.value |= OPER_FLAG_KLINE;
1381		} | UNKLINE
1382		{
1383		if (conf_parser_ctx.pass == 2)
#	Line 1216 | Line 1393 | oper_flags_item: GLOBAL_KILL
1393		} | XLINE
1394		{
1395		if (conf_parser_ctx.pass == 2)
1396	<	block_state.port.value |= OPER_FLAG_X;
1396	>	block_state.port.value |= OPER_FLAG_XLINE;
1397	>	} | T_UNXLINE
1398	>	{
1399	>	if (conf_parser_ctx.pass == 2)
1400	>	block_state.port.value |= OPER_FLAG_UNXLINE;
1401		} | GLINE
1402		{
1403		if (conf_parser_ctx.pass == 2)
#	Line 1237 | Line 1418 | oper_flags_item: GLOBAL_KILL
1418		{
1419		if (conf_parser_ctx.pass == 2)
1420		block_state.port.value |= OPER_FLAG_ADMIN;
1240	–	} | T_OPERWALL
1241	–	{
1242	–	if (conf_parser_ctx.pass == 2)
1243	–	block_state.port.value |= OPER_FLAG_OPERWALL;
1421		} | T_GLOBOPS
1422		{
1423		if (conf_parser_ctx.pass == 2)
1424		block_state.port.value |= OPER_FLAG_GLOBOPS;
1425	<	} | OPER_SPY_T
1425	>	} | T_WALLOPS
1426	>	{
1427	>	if (conf_parser_ctx.pass == 2)
1428	>	block_state.port.value |= OPER_FLAG_WALLOPS;
1429	>	} | T_LOCOPS
1430		{
1431		if (conf_parser_ctx.pass == 2)
1432	<	block_state.port.value |= OPER_FLAG_OPER_SPY;
1432	>	block_state.port.value |= OPER_FLAG_LOCOPS;
1433		} | REMOTEBAN
1434		{
1435		if (conf_parser_ctx.pass == 2)
#	Line 1304 | Line 1485 | class_entry: CLASS
1485		class->max_ident = block_state.max_ident.value;
1486		class->max_sendq = block_state.max_sendq.value;
1487		class->max_recvq = block_state.max_recvq.value;
1488	+	class->max_channels = block_state.max_channels.value;
1489
1490		if (block_state.min_idle.value > block_state.max_idle.value)
1491		{
#	Line 1330 | Line 1512 | class_entry: CLASS
1512
1513		class_items:    class_items class_item | class_item;
1514		class_item:     class_name |
1515	<	class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1515	>	class_cidr_bitlen_ipv4 |
1516	>	class_cidr_bitlen_ipv6 |
1517		class_ping_time |
1518	<	class_number_per_cidr |
1518	>	class_number_per_cidr |
1519		class_number_per_ip |
1520		class_connectfreq |
1521	+	class_max_channels |
1522		class_max_number |
1523	<	class_max_global |
1524	<	class_max_local |
1525	<	class_max_ident |
1523	>	class_max_global |
1524	>	class_max_local |
1525	>	class_max_ident |
1526		class_sendq | class_recvq |
1527		class_min_idle |
1528		class_max_idle |
1529		class_flags |
1530	<	error ';' ;
1530	>	error ';' ;
1531
1532	<	class_name: NAME '=' QSTRING ';'
1532	>	class_name: NAME '=' QSTRING ';'
1533		{
1534		if (conf_parser_ctx.pass == 1)
1535		strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
#	Line 1369 | Line 1553 | class_connectfreq: CONNECTFREQ '=' times
1553		block_state.con_freq.value = $3;
1554		};
1555
1556	+	class_max_channels: MAX_CHANNELS '=' NUMBER ';'
1557	+	{
1558	+	if (conf_parser_ctx.pass == 1)
1559	+	block_state.max_channels.value = $3;
1560	+	};
1561	+
1562		class_max_number: MAX_NUMBER '=' NUMBER ';'
1563		{
1564		if (conf_parser_ctx.pass == 1)
#	Line 1500 | Line 1690 | port_item: NUMBER
1690		{
1691		if (conf_parser_ctx.pass == 2)
1692		{
1693	+	#ifndef HAVE_LIBCRYPTO
1694		if (block_state.flags.value & LISTENER_SSL)
1695	<	#ifdef HAVE_LIBCRYPTO
1696	<	if (!ServerInfo.server_ctx)
1695	>	{
1696	>	conf_error_report("SSL not available - port closed");
1697	>	break;
1698	>	}
1699		#endif
1507	–	{
1508	–	conf_error_report("SSL not available - port closed");
1509	–	break;
1510	–	}
1700		add_listener($1, block_state.addr.buf, block_state.flags.value);
1701		}
1702		} | NUMBER TWODOTS NUMBER
1703		{
1704		if (conf_parser_ctx.pass == 2)
1705		{
1706	<	int i;
1518	<
1706	>	#ifndef HAVE_LIBCRYPTO
1707		if (block_state.flags.value & LISTENER_SSL)
1708	<	#ifdef HAVE_LIBCRYPTO
1709	<	if (!ServerInfo.server_ctx)
1708	>	{
1709	>	conf_error_report("SSL not available - port closed");
1710	>	break;
1711	>	}
1712		#endif
1523	–	{
1524	–	conf_error_report("SSL not available - port closed");
1525	–	break;
1526	–	}
1713
1714	<	for (i = $1; i <= $3; ++i)
1714	>	for (int i = $1; i <= $3; ++i)
1715		add_listener(i, block_state.addr.buf, block_state.flags.value);
1716		}
1717		};
#	Line 1551 | Line 1737 | auth_entry: IRCD_AUTH
1737		reset_block_state();
1738		} '{' auth_items '}' ';'
1739		{
1740	<	dlink_node *ptr = NULL;
1740	>	dlink_node *node = NULL;
1741
1742		if (conf_parser_ctx.pass != 2)
1743		break;
1744
1745	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
1745	>	DLINK_FOREACH(node, block_state.mask.list.head)
1746		{
1747		struct MaskItem *conf = NULL;
1748		struct split_nuh_item nuh;
1749
1750	<	nuh.nuhmask  = ptr->data;
1750	>	nuh.nuhmask  = node->data;
1751		nuh.nickptr  = NULL;
1752		nuh.userptr  = block_state.user.buf;
1753		nuh.hostptr  = block_state.host.buf;
#	Line 1571 | Line 1757 | auth_entry: IRCD_AUTH
1757		split_nuh(&nuh);
1758
1759		conf        = conf_make(CONF_CLIENT);
1760	<	conf->user  = xstrdup(collapse(block_state.user.buf));
1761	<	conf->host  = xstrdup(collapse(block_state.host.buf));
1760	>	conf->user  = xstrdup(block_state.user.buf);
1761	>	conf->host  = xstrdup(block_state.host.buf);
1762
1763		if (block_state.rpass.buf[0])
1764		conf->passwd = xstrdup(block_state.rpass.buf);
#	Line 1585 | Line 1771 | auth_entry: IRCD_AUTH
1771		conf_add_class_to_conf(conf, block_state.class.buf);
1772		add_conf_by_address(CONF_CLIENT, conf);
1773		}
1774	<	};
1774	>	};
1775
1776		auth_items:     auth_items auth_item | auth_item;
1777	<	auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1778	<	auth_spoof | auth_redir_serv | auth_redir_port |
1779	<	auth_encrypted | error ';' ;
1777	>	auth_item:      auth_user |
1778	>	auth_passwd |
1779	>	auth_class |
1780	>	auth_flags |
1781	>	auth_spoof |
1782	>	auth_redir_serv |
1783	>	auth_redir_port |
1784	>	auth_encrypted |
1785	>	error ';' ;
1786
1787		auth_user: USER '=' QSTRING ';'
1788		{
#	Line 1624 | Line 1816 | auth_encrypted: ENCRYPTED '=' TBOOL ';'
1816		auth_flags: IRCD_FLAGS
1817		{
1818		if (conf_parser_ctx.pass == 2)
1819	<	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
1819	>	block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
1820		} '='  auth_flags_items ';';
1821
1822		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
#	Line 1670 | Line 1862 | auth_flags_item: SPOOF_NOTICE
1862		block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1863		};
1864
1865	<	auth_spoof: SPOOF '=' QSTRING ';'
1865	>	auth_spoof: SPOOF '=' QSTRING ';'
1866		{
1867		if (conf_parser_ctx.pass != 2)
1868		break;
1869
1870	<	if (strlen(yylval.string) <= HOSTLEN && valid_hostname(yylval.string))
1870	>	if (valid_hostname(yylval.string))
1871		{
1872		strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1873		block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
#	Line 1721 | Line 1913 | resv_entry: RESV
1913		create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1914		};
1915
1916	<	resv_items:     resv_items resv_item | resv_item;
1917	<	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1916	>	resv_items:     resv_items resv_item | resv_item;
1917	>	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1918
1919		resv_mask: MASK '=' QSTRING ';'
1920		{
#	Line 1753 | Line 1945 | service_item:      service_name | error;
1945
1946		service_name: NAME '=' QSTRING ';'
1947		{
1948	<	if (conf_parser_ctx.pass == 2)
1948	>	if (conf_parser_ctx.pass != 2)
1949	>	break;
1950	>
1951	>	if (valid_servname(yylval.string))
1952		{
1953	<	if (valid_servname(yylval.string))
1954	<	{
1760	<	struct MaskItem *conf = conf_make(CONF_SERVICE);
1761	<	conf->name = xstrdup(yylval.string);
1762	<	}
1953	>	struct MaskItem *conf = conf_make(CONF_SERVICE);
1954	>	conf->name = xstrdup(yylval.string);
1955		}
1956		};
1957
#	Line 1892 | Line 2084 | cluster_entry: T_CLUSTER
2084		conf->name = xstrdup(block_state.name.buf);
2085		};
2086
2087	<	cluster_items:  cluster_items cluster_item | cluster_item;
2088	<	cluster_item:   cluster_name | cluster_type | error ';' ;
2087	>	cluster_items:  cluster_items cluster_item | cluster_item;
2088	>	cluster_item:   cluster_name | cluster_type | error ';' ;
2089
2090		cluster_name: NAME '=' QSTRING ';'
2091		{
#	Line 1907 | Line 2099 | cluster_type: TYPE
2099		block_state.flags.value = 0;
2100		} '=' cluster_types ';' ;
2101
2102	<	cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
2102	>	cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
2103		cluster_type_item: KLINE
2104		{
2105		if (conf_parser_ctx.pass == 2)
#	Line 1953 | Line 2145 | cluster_type_item: KLINE
2145		/***************************************************************************
2146		*  section connect
2147		***************************************************************************/
2148	<	connect_entry: CONNECT
2148	>	connect_entry: CONNECT
2149		{
2150
2151		if (conf_parser_ctx.pass != 2)
2152		break;
2153
2154		reset_block_state();
2155	+	block_state.aftype.value = AF_INET;
2156		block_state.port.value = PORTNUM;
2157		} '{' connect_items '}' ';'
2158		{
#	Line 1973 | Line 2166 | connect_entry: CONNECT
2166		!block_state.host.buf[0])
2167		break;
2168
2169	<	if (!(block_state.rpass.buf[0] ||
2170	<	block_state.spass.buf[0]))
2169	>	if (!block_state.rpass.buf[0] ||
2170	>	!block_state.spass.buf[0])
2171		break;
2172
2173		if (has_wildcards(block_state.name.buf) ||
#	Line 1989 | Line 2182 | connect_entry: CONNECT
2182		conf->name = xstrdup(block_state.name.buf);
2183		conf->passwd = xstrdup(block_state.rpass.buf);
2184		conf->spasswd = xstrdup(block_state.spass.buf);
2185	<	conf->cipher_list = xstrdup(block_state.ciph.buf);
2185	>
2186	>	if (block_state.cert.buf[0])
2187	>	conf->certfp = xstrdup(block_state.cert.buf);
2188	>
2189	>	if (block_state.ciph.buf[0])
2190	>	conf->cipher_list = xstrdup(block_state.ciph.buf);
2191
2192		dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
2193		dlinkMoveList(&block_state.hub.list, &conf->hub_list);
#	Line 2006 | Line 2204 | connect_entry: CONNECT
2204		ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2205		else
2206		{
2207	<	assert(res != NULL);
2207	>	assert(res);
2208
2209		memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2210		conf->bind.ss.ss_family = res->ai_family;
#	Line 2020 | Line 2218 | connect_entry: CONNECT
2218		};
2219
2220		connect_items:  connect_items connect_item | connect_item;
2221	<	connect_item:   connect_name | connect_host | connect_vhost |
2222	<	connect_send_password | connect_accept_password |
2223	<	connect_aftype | connect_port | connect_ssl_cipher_list |
2224	<	connect_flags | connect_hub_mask | connect_leaf_mask |
2225	<	connect_class | connect_encrypted |
2221	>	connect_item:   connect_name |
2222	>	connect_host |
2223	>	connect_vhost |
2224	>	connect_send_password |
2225	>	connect_accept_password |
2226	>	connect_ssl_certificate_fingerprint |
2227	>	connect_aftype |
2228	>	connect_port |
2229	>	connect_ssl_cipher_list |
2230	>	connect_flags |
2231	>	connect_hub_mask |
2232	>	connect_leaf_mask |
2233	>	connect_class |
2234	>	connect_encrypted |
2235		error ';' ;
2236
2237		connect_name: NAME '=' QSTRING ';'
#	Line 2033 | Line 2240 | connect_name: NAME '=' QSTRING ';'
2240		strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2241		};
2242
2243	<	connect_host: HOST '=' QSTRING ';'
2243	>	connect_host: HOST '=' QSTRING ';'
2244		{
2245		if (conf_parser_ctx.pass == 2)
2246		strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2247		};
2248
2249	<	connect_vhost: VHOST '=' QSTRING ';'
2249	>	connect_vhost: VHOST '=' QSTRING ';'
2250		{
2251		if (conf_parser_ctx.pass == 2)
2252		strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2253		};
2254	<
2254	>
2255		connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2256		{
2257		if (conf_parser_ctx.pass != 2)
#	Line 2052 | Line 2259 | connect_send_password: SEND_PASSWORD '='
2259
2260		if ($3[0] == ':')
2261		conf_error_report("Server passwords cannot begin with a colon");
2262	<	else if (strchr($3, ' ') != NULL)
2262	>	else if (strchr($3, ' '))
2263		conf_error_report("Server passwords cannot contain spaces");
2264		else
2265		strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
#	Line 2065 | Line 2272 | connect_accept_password: ACCEPT_PASSWORD
2272
2273		if ($3[0] == ':')
2274		conf_error_report("Server passwords cannot begin with a colon");
2275	<	else if (strchr($3, ' ') != NULL)
2275	>	else if (strchr($3, ' '))
2276		conf_error_report("Server passwords cannot contain spaces");
2277		else
2278		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2279		};
2280
2281	+	connect_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
2282	+	{
2283	+	if (conf_parser_ctx.pass == 2)
2284	+	strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
2285	+	};
2286	+
2287		connect_port: PORT '=' NUMBER ';'
2288		{
2289		if (conf_parser_ctx.pass == 2)
#	Line 2083 | Line 2296 | connect_aftype: AFTYPE '=' T_IPV4 ';'
2296		block_state.aftype.value = AF_INET;
2297		} | AFTYPE '=' T_IPV6 ';'
2298		{
2086	–	#ifdef IPV6
2299		if (conf_parser_ctx.pass == 2)
2300		block_state.aftype.value = AF_INET6;
2089	–	#endif
2301		};
2302
2303		connect_flags: IRCD_FLAGS
#	Line 2116 | Line 2327 | connect_encrypted: ENCRYPTED '=' TBOOL '
2327		}
2328		};
2329
2330	<	connect_hub_mask: HUB_MASK '=' QSTRING ';'
2330	>	connect_hub_mask: HUB_MASK '=' QSTRING ';'
2331		{
2332		if (conf_parser_ctx.pass == 2)
2333		dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2334		};
2335
2336	<	connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2336	>	connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2337		{
2338		if (conf_parser_ctx.pass == 2)
2339		dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
#	Line 2173 | Line 2384 | kill_entry: KILL
2384		else
2385		conf->reason = xstrdup(CONF_NOREASON);
2386		add_conf_by_address(CONF_KLINE, conf);
2387	<	};
2387	>	};
2388
2389		kill_items:     kill_items kill_item | kill_item;
2390		kill_item:      kill_user | kill_reason | error;
#	Line 2198 | Line 2409 | kill_user: USER '=' QSTRING ';'
2409		}
2410		};
2411
2412	<	kill_reason: REASON '=' QSTRING ';'
2412	>	kill_reason: REASON '=' QSTRING ';'
2413		{
2414		if (conf_parser_ctx.pass == 2)
2415		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
#	Line 2207 | Line 2418 | kill_reason: REASON '=' QSTRING ';'
2418		/***************************************************************************
2419		*  section deny
2420		***************************************************************************/
2421	<	deny_entry: DENY
2421	>	deny_entry: DENY
2422		{
2423		if (conf_parser_ctx.pass == 2)
2424		reset_block_state();
#	Line 2232 | Line 2443 | deny_entry: DENY
2443		conf->reason = xstrdup(CONF_NOREASON);
2444		add_conf_by_address(CONF_DLINE, conf);
2445		}
2446	<	};
2446	>	};
2447
2448		deny_items:     deny_items deny_item | deny_item;
2449		deny_item:      deny_ip | deny_reason | error;
#	Line 2243 | Line 2454 | deny_ip: IP '=' QSTRING ';'
2454		strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2455		};
2456
2457	<	deny_reason: REASON '=' QSTRING ';'
2457	>	deny_reason: REASON '=' QSTRING ';'
2458		{
2459		if (conf_parser_ctx.pass == 2)
2460		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
#	Line 2300 | Line 2511 | gecos_entry: GECOS
2511		gecos_items: gecos_items gecos_item | gecos_item;
2512		gecos_item:  gecos_name | gecos_reason | error;
2513
2514	<	gecos_name: NAME '=' QSTRING ';'
2514	>	gecos_name: NAME '=' QSTRING ';'
2515		{
2516		if (conf_parser_ctx.pass == 2)
2517		strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2518		};
2519
2520	<	gecos_reason: REASON '=' QSTRING ';'
2520	>	gecos_reason: REASON '=' QSTRING ';'
2521		{
2522		if (conf_parser_ctx.pass == 2)
2523		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
#	Line 2319 | Line 2530 | general_entry: GENERAL
2530		'{' general_items '}' ';';
2531
2532		general_items:      general_items general_item | general_item;
2533	<	general_item:       general_hide_spoof_ips | general_ignore_bogus_ts |
2534	<	general_failed_oper_notice | general_anti_nick_flood |
2535	<	general_max_nick_time | general_max_nick_changes |
2536	<	general_max_accept | general_anti_spam_exit_message_time |
2537	<	general_ts_warn_delta | general_ts_max_delta |
2533	>	general_item:       general_away_count |
2534	>	general_away_time |
2535	>	general_ignore_bogus_ts |
2536	>	general_failed_oper_notice |
2537	>	general_anti_nick_flood |
2538	>	general_max_nick_time |
2539	>	general_max_nick_changes |
2540	>	general_max_accept |
2541	>	general_anti_spam_exit_message_time |
2542	>	general_ts_warn_delta |
2543	>	general_ts_max_delta |
2544		general_kill_chase_time_limit |
2545		general_invisible_on_connect |
2546	<	general_warn_no_nline | general_dots_in_ident |
2547	<	general_stats_o_oper_only | general_stats_k_oper_only |
2548	<	general_pace_wait | general_stats_i_oper_only |
2549	<	general_pace_wait_simple | general_stats_P_oper_only |
2550	<	general_short_motd | general_no_oper_flood |
2551	<	general_true_no_oper_flood | general_oper_pass_resv |
2552	<	general_oper_only_umodes | general_max_targets |
2553	<	general_use_egd | general_egdpool_path |
2554	<	general_oper_umodes | general_caller_id_wait |
2555	<	general_opers_bypass_callerid | general_default_floodcount |
2556	<	general_min_nonwildcard | general_min_nonwildcard_simple |
2557	<	general_disable_remote_commands |
2558	<	general_throttle_time | general_havent_read_conf |
2546	>	general_warn_no_connect_block |
2547	>	general_dots_in_ident |
2548	>	general_stats_o_oper_only |
2549	>	general_stats_k_oper_only |
2550	>	general_pace_wait |
2551	>	general_stats_i_oper_only |
2552	>	general_pace_wait_simple |
2553	>	general_stats_P_oper_only |
2554	>	general_stats_u_oper_only |
2555	>	general_short_motd |
2556	>	general_no_oper_flood |
2557	>	general_true_no_oper_flood |
2558	>	general_oper_pass_resv |
2559	>	general_oper_only_umodes |
2560	>	general_max_targets |
2561	>	general_oper_umodes |
2562	>	general_caller_id_wait |
2563	>	general_opers_bypass_callerid |
2564	>	general_default_floodcount |
2565	>	general_min_nonwildcard |
2566	>	general_min_nonwildcard_simple |
2567	>	general_throttle_count |
2568	>	general_throttle_time |
2569	>	general_havent_read_conf |
2570		general_ping_cookie |
2571	<	general_disable_auth |
2572	<	general_tkline_expire_notices | general_gline_enable |
2573	<	general_gline_duration | general_gline_request_duration |
2571	>	general_disable_auth |
2572	>	general_tkline_expire_notices |
2573	>	general_gline_enable |
2574	>	general_gline_duration |
2575	>	general_gline_request_duration |
2576		general_gline_min_cidr |
2577		general_gline_min_cidr6 |
2578	<	general_stats_e_disabled |
2579	<	general_max_watch | general_services_name |
2580	<	error;
2578	>	general_stats_e_disabled |
2579	>	general_max_watch |
2580	>	general_cycle_on_host_change |
2581	>	error;
2582
2583
2584	+	general_away_count: AWAY_COUNT '=' NUMBER ';'
2585	+	{
2586	+	ConfigGeneral.away_count = $3;
2587	+	};
2588	+
2589	+	general_away_time: AWAY_TIME '=' timespec ';'
2590	+	{
2591	+	ConfigGeneral.away_time = $3;
2592	+	};
2593	+
2594		general_max_watch: MAX_WATCH '=' NUMBER ';'
2595		{
2596	<	ConfigFileEntry.max_watch = $3;
2596	>	ConfigGeneral.max_watch = $3;
2597	>	};
2598	>
2599	>	general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2600	>	{
2601	>	if (conf_parser_ctx.pass == 2)
2602	>	ConfigGeneral.cycle_on_host_change = yylval.number;
2603		};
2604
2605		general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2606		{
2607		if (conf_parser_ctx.pass == 2)
2608	<	ConfigFileEntry.glines = yylval.number;
2608	>	ConfigGeneral.glines = yylval.number;
2609		};
2610
2611		general_gline_duration: GLINE_DURATION '=' timespec ';'
2612		{
2613		if (conf_parser_ctx.pass == 2)
2614	<	ConfigFileEntry.gline_time = $3;
2614	>	ConfigGeneral.gline_time = $3;
2615		};
2616
2617		general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2618		{
2619		if (conf_parser_ctx.pass == 2)
2620	<	ConfigFileEntry.gline_request_time = $3;
2620	>	ConfigGeneral.gline_request_time = $3;
2621		};
2622
2623		general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2624		{
2625	<	ConfigFileEntry.gline_min_cidr = $3;
2625	>	ConfigGeneral.gline_min_cidr = $3;
2626		};
2627
2628		general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2629		{
2630	<	ConfigFileEntry.gline_min_cidr6 = $3;
2630	>	ConfigGeneral.gline_min_cidr6 = $3;
2631		};
2632
2633		general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2634		{
2635	<	ConfigFileEntry.tkline_expire_notices = yylval.number;
2635	>	ConfigGeneral.tkline_expire_notices = yylval.number;
2636		};
2637
2638		general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2639		{
2640	<	ConfigFileEntry.kill_chase_time_limit = $3;
2394	<	};
2395	<
2396	<	general_hide_spoof_ips: HIDE_SPOOF_IPS '=' TBOOL ';'
2397	<	{
2398	<	ConfigFileEntry.hide_spoof_ips = yylval.number;
2640	>	ConfigGeneral.kill_chase_time_limit = $3;
2641		};
2642
2643		general_ignore_bogus_ts: IGNORE_BOGUS_TS '=' TBOOL ';'
2644		{
2645	<	ConfigFileEntry.ignore_bogus_ts = yylval.number;
2404	<	};
2405	<
2406	<	general_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
2407	<	{
2408	<	ConfigFileEntry.disable_remote = yylval.number;
2645	>	ConfigGeneral.ignore_bogus_ts = yylval.number;
2646		};
2647
2648		general_failed_oper_notice: FAILED_OPER_NOTICE '=' TBOOL ';'
2649		{
2650	<	ConfigFileEntry.failed_oper_notice = yylval.number;
2650	>	ConfigGeneral.failed_oper_notice = yylval.number;
2651		};
2652
2653		general_anti_nick_flood: ANTI_NICK_FLOOD '=' TBOOL ';'
2654		{
2655	<	ConfigFileEntry.anti_nick_flood = yylval.number;
2655	>	ConfigGeneral.anti_nick_flood = yylval.number;
2656		};
2657
2658		general_max_nick_time: MAX_NICK_TIME '=' timespec ';'
2659		{
2660	<	ConfigFileEntry.max_nick_time = $3;
2660	>	ConfigGeneral.max_nick_time = $3;
2661		};
2662
2663		general_max_nick_changes: MAX_NICK_CHANGES '=' NUMBER ';'
2664		{
2665	<	ConfigFileEntry.max_nick_changes = $3;
2665	>	ConfigGeneral.max_nick_changes = $3;
2666		};
2667
2668		general_max_accept: MAX_ACCEPT '=' NUMBER ';'
2669		{
2670	<	ConfigFileEntry.max_accept = $3;
2670	>	ConfigGeneral.max_accept = $3;
2671		};
2672
2673		general_anti_spam_exit_message_time: ANTI_SPAM_EXIT_MESSAGE_TIME '=' timespec ';'
2674		{
2675	<	ConfigFileEntry.anti_spam_exit_message_time = $3;
2675	>	ConfigGeneral.anti_spam_exit_message_time = $3;
2676		};
2677
2678		general_ts_warn_delta: TS_WARN_DELTA '=' timespec ';'
2679		{
2680	<	ConfigFileEntry.ts_warn_delta = $3;
2680	>	ConfigGeneral.ts_warn_delta = $3;
2681		};
2682
2683		general_ts_max_delta: TS_MAX_DELTA '=' timespec ';'
2684		{
2685		if (conf_parser_ctx.pass == 2)
2686	<	ConfigFileEntry.ts_max_delta = $3;
2686	>	ConfigGeneral.ts_max_delta = $3;
2687		};
2688
2689		general_havent_read_conf: HAVENT_READ_CONF '=' NUMBER ';'
#	Line 2462 | Line 2699 | general_havent_read_conf: HAVENT_READ_CO
2699
2700		general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2701		{
2702	<	ConfigFileEntry.invisible_on_connect = yylval.number;
2702	>	ConfigGeneral.invisible_on_connect = yylval.number;
2703		};
2704
2705	<	general_warn_no_nline: WARN_NO_NLINE '=' TBOOL ';'
2705	>	general_warn_no_connect_block: WARN_NO_CONNECT_BLOCK '=' TBOOL ';'
2706		{
2707	<	ConfigFileEntry.warn_no_nline = yylval.number;
2707	>	ConfigGeneral.warn_no_connect_block = yylval.number;
2708		};
2709
2710		general_stats_e_disabled: STATS_E_DISABLED '=' TBOOL ';'
2711		{
2712	<	ConfigFileEntry.stats_e_disabled = yylval.number;
2712	>	ConfigGeneral.stats_e_disabled = yylval.number;
2713		};
2714
2715		general_stats_o_oper_only: STATS_O_OPER_ONLY '=' TBOOL ';'
2716		{
2717	<	ConfigFileEntry.stats_o_oper_only = yylval.number;
2717	>	ConfigGeneral.stats_o_oper_only = yylval.number;
2718		};
2719
2720		general_stats_P_oper_only: STATS_P_OPER_ONLY '=' TBOOL ';'
2721		{
2722	<	ConfigFileEntry.stats_P_oper_only = yylval.number;
2722	>	ConfigGeneral.stats_P_oper_only = yylval.number;
2723	>	};
2724	>
2725	>	general_stats_u_oper_only: STATS_U_OPER_ONLY '=' TBOOL ';'
2726	>	{
2727	>	ConfigGeneral.stats_u_oper_only = yylval.number;
2728		};
2729
2730		general_stats_k_oper_only: STATS_K_OPER_ONLY '=' TBOOL ';'
2731		{
2732	<	ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
2732	>	ConfigGeneral.stats_k_oper_only = 2 * yylval.number;
2733		} | STATS_K_OPER_ONLY '=' TMASKED ';'
2734		{
2735	<	ConfigFileEntry.stats_k_oper_only = 1;
2735	>	ConfigGeneral.stats_k_oper_only = 1;
2736		};
2737
2738		general_stats_i_oper_only: STATS_I_OPER_ONLY '=' TBOOL ';'
2739		{
2740	<	ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
2740	>	ConfigGeneral.stats_i_oper_only = 2 * yylval.number;
2741		} | STATS_I_OPER_ONLY '=' TMASKED ';'
2742		{
2743	<	ConfigFileEntry.stats_i_oper_only = 1;
2743	>	ConfigGeneral.stats_i_oper_only = 1;
2744		};
2745
2746		general_pace_wait: PACE_WAIT '=' timespec ';'
2747		{
2748	<	ConfigFileEntry.pace_wait = $3;
2748	>	ConfigGeneral.pace_wait = $3;
2749		};
2750
2751		general_caller_id_wait: CALLER_ID_WAIT '=' timespec ';'
2752		{
2753	<	ConfigFileEntry.caller_id_wait = $3;
2753	>	ConfigGeneral.caller_id_wait = $3;
2754		};
2755
2756		general_opers_bypass_callerid: OPERS_BYPASS_CALLERID '=' TBOOL ';'
2757		{
2758	<	ConfigFileEntry.opers_bypass_callerid = yylval.number;
2758	>	ConfigGeneral.opers_bypass_callerid = yylval.number;
2759		};
2760
2761		general_pace_wait_simple: PACE_WAIT_SIMPLE '=' timespec ';'
2762		{
2763	<	ConfigFileEntry.pace_wait_simple = $3;
2763	>	ConfigGeneral.pace_wait_simple = $3;
2764		};
2765
2766		general_short_motd: SHORT_MOTD '=' TBOOL ';'
2767		{
2768	<	ConfigFileEntry.short_motd = yylval.number;
2768	>	ConfigGeneral.short_motd = yylval.number;
2769		};
2770	<
2770	>
2771		general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
2772		{
2773	<	ConfigFileEntry.no_oper_flood = yylval.number;
2773	>	ConfigGeneral.no_oper_flood = yylval.number;
2774		};
2775
2776		general_true_no_oper_flood: TRUE_NO_OPER_FLOOD '=' TBOOL ';'
2777		{
2778	<	ConfigFileEntry.true_no_oper_flood = yylval.number;
2778	>	ConfigGeneral.true_no_oper_flood = yylval.number;
2779		};
2780
2781		general_oper_pass_resv: OPER_PASS_RESV '=' TBOOL ';'
2782		{
2783	<	ConfigFileEntry.oper_pass_resv = yylval.number;
2783	>	ConfigGeneral.oper_pass_resv = yylval.number;
2784		};
2785
2786		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2787		{
2788	<	ConfigFileEntry.dots_in_ident = $3;
2788	>	ConfigGeneral.dots_in_ident = $3;
2789		};
2790
2791		general_max_targets: MAX_TARGETS '=' NUMBER ';'
2792		{
2793	<	ConfigFileEntry.max_targets = $3;
2552	<	};
2553	<
2554	<	general_use_egd: USE_EGD '=' TBOOL ';'
2555	<	{
2556	<	ConfigFileEntry.use_egd = yylval.number;
2793	>	ConfigGeneral.max_targets = $3;
2794		};
2795
2796	<	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
2796	>	general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2797		{
2798	<	if (conf_parser_ctx.pass == 2)
2562	<	{
2563	<	MyFree(ConfigFileEntry.egdpool_path);
2564	<	ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
2565	<	}
2798	>	ConfigGeneral.ping_cookie = yylval.number;
2799		};
2800
2801	<	general_services_name: T_SERVICES_NAME '=' QSTRING ';'
2801	>	general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2802		{
2803	<	if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2571	<	{
2572	<	MyFree(ConfigFileEntry.service_name);
2573	<	ConfigFileEntry.service_name = xstrdup(yylval.string);
2574	<	}
2803	>	ConfigGeneral.disable_auth = yylval.number;
2804		};
2805
2806	<	general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2806	>	general_throttle_count: THROTTLE_COUNT '=' NUMBER ';'
2807		{
2808	<	ConfigFileEntry.ping_cookie = yylval.number;
2580	<	};
2581	<
2582	<	general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2583	<	{
2584	<	ConfigFileEntry.disable_auth = yylval.number;
2808	>	ConfigGeneral.throttle_count = $3;
2809		};
2810
2811		general_throttle_time: THROTTLE_TIME '=' timespec ';'
2812		{
2813	<	ConfigFileEntry.throttle_time = yylval.number;
2813	>	ConfigGeneral.throttle_time = $3;
2814		};
2815
2816		general_oper_umodes: OPER_UMODES
2817		{
2818	<	ConfigFileEntry.oper_umodes = 0;
2818	>	ConfigGeneral.oper_umodes = 0;
2819		} '='  umode_oitems ';' ;
2820
2821		umode_oitems:    umode_oitems ',' umode_oitem | umode_oitem;
2822		umode_oitem:     T_BOTS
2823		{
2824	<	ConfigFileEntry.oper_umodes |= UMODE_BOTS;
2824	>	ConfigGeneral.oper_umodes |= UMODE_BOTS;
2825		} | T_CCONN
2826		{
2827	<	ConfigFileEntry.oper_umodes |= UMODE_CCONN;
2604	<	} | T_CCONN_FULL
2605	<	{
2606	<	ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
2827	>	ConfigGeneral.oper_umodes |= UMODE_CCONN;
2828		} | T_DEAF
2829		{
2830	<	ConfigFileEntry.oper_umodes |= UMODE_DEAF;
2830	>	ConfigGeneral.oper_umodes |= UMODE_DEAF;
2831		} | T_DEBUG
2832		{
2833	<	ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
2833	>	ConfigGeneral.oper_umodes |= UMODE_DEBUG;
2834		} | T_FULL
2835		{
2836	<	ConfigFileEntry.oper_umodes |= UMODE_FULL;
2836	>	ConfigGeneral.oper_umodes |= UMODE_FULL;
2837		} | HIDDEN
2838		{
2839	<	ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
2839	>	ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
2840	>	} | HIDE_CHANS
2841	>	{
2842	>	ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
2843	>	} | HIDE_IDLE
2844	>	{
2845	>	ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
2846		} | T_SKILL
2847		{
2848	<	ConfigFileEntry.oper_umodes |= UMODE_SKILL;
2848	>	ConfigGeneral.oper_umodes |= UMODE_SKILL;
2849		} | T_NCHANGE
2850		{
2851	<	ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
2851	>	ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
2852		} | T_REJ
2853		{
2854	<	ConfigFileEntry.oper_umodes |= UMODE_REJ;
2854	>	ConfigGeneral.oper_umodes |= UMODE_REJ;
2855		} | T_UNAUTH
2856		{
2857	<	ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
2857	>	ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
2858		} | T_SPY
2859		{
2860	<	ConfigFileEntry.oper_umodes |= UMODE_SPY;
2860	>	ConfigGeneral.oper_umodes |= UMODE_SPY;
2861		} | T_EXTERNAL
2862		{
2863	<	ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
2637	<	} | T_OPERWALL
2638	<	{
2639	<	ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
2863	>	ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
2864		} | T_SERVNOTICE
2865		{
2866	<	ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
2866	>	ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
2867		} | T_INVISIBLE
2868		{
2869	<	ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
2869	>	ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
2870		} | T_WALLOP
2871		{
2872	<	ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
2872	>	ConfigGeneral.oper_umodes |= UMODE_WALLOP;
2873		} | T_SOFTCALLERID
2874		{
2875	<	ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
2875	>	ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
2876		} | T_CALLERID
2877		{
2878	<	ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
2878	>	ConfigGeneral.oper_umodes |= UMODE_CALLERID;
2879		} | T_LOCOPS
2880		{
2881	<	ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
2881	>	ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
2882	>	} | T_NONONREG
2883	>	{
2884	>	ConfigGeneral.oper_umodes |= UMODE_REGONLY;
2885		} | T_FARCONNECT
2886		{
2887	<	ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT;
2887	>	ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
2888		};
2889
2890	<	general_oper_only_umodes: OPER_ONLY_UMODES
2890	>	general_oper_only_umodes: OPER_ONLY_UMODES
2891		{
2892	<	ConfigFileEntry.oper_only_umodes = 0;
2892	>	ConfigGeneral.oper_only_umodes = 0;
2893		} '='  umode_items ';' ;
2894
2895	<	umode_items:    umode_items ',' umode_item | umode_item;
2896	<	umode_item:     T_BOTS
2895	>	umode_items:  umode_items ',' umode_item | umode_item;
2896	>	umode_item:   T_BOTS
2897		{
2898	<	ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
2898	>	ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
2899		} | T_CCONN
2900		{
2901	<	ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
2675	<	} | T_CCONN_FULL
2676	<	{
2677	<	ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
2901	>	ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
2902		} | T_DEAF
2903		{
2904	<	ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
2904	>	ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
2905		} | T_DEBUG
2906		{
2907	<	ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
2907	>	ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
2908		} | T_FULL
2909	<	{
2910	<	ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
2909	>	{
2910	>	ConfigGeneral.oper_only_umodes |= UMODE_FULL;
2911		} | T_SKILL
2912		{
2913	<	ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
2913	>	ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
2914		} | HIDDEN
2915		{
2916	<	ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
2916	>	ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
2917		} | T_NCHANGE
2918		{
2919	<	ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
2919	>	ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
2920		} | T_REJ
2921		{
2922	<	ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
2922	>	ConfigGeneral.oper_only_umodes |= UMODE_REJ;
2923		} | T_UNAUTH
2924		{
2925	<	ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
2925	>	ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
2926		} | T_SPY
2927		{
2928	<	ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
2928	>	ConfigGeneral.oper_only_umodes |= UMODE_SPY;
2929		} | T_EXTERNAL
2930		{
2931	<	ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
2708	<	} | T_OPERWALL
2709	<	{
2710	<	ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
2931	>	ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
2932		} | T_SERVNOTICE
2933		{
2934	<	ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
2934	>	ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
2935		} | T_INVISIBLE
2936		{
2937	<	ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
2937	>	ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
2938		} | T_WALLOP
2939		{
2940	<	ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
2940	>	ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
2941		} | T_SOFTCALLERID
2942		{
2943	<	ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
2943	>	ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
2944		} | T_CALLERID
2945		{
2946	<	ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
2946	>	ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
2947		} | T_LOCOPS
2948		{
2949	<	ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
2949	>	ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
2950		} | T_NONONREG
2951		{
2952	<	ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
2952	>	ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
2953		} | T_FARCONNECT
2954		{
2955	<	ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT;
2955	>	ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
2956		};
2957
2958		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
2959		{
2960	<	ConfigFileEntry.min_nonwildcard = $3;
2960	>	ConfigGeneral.min_nonwildcard = $3;
2961		};
2962
2963		general_min_nonwildcard_simple: MIN_NONWILDCARD_SIMPLE '=' NUMBER ';'
2964		{
2965	<	ConfigFileEntry.min_nonwildcard_simple = $3;
2965	>	ConfigGeneral.min_nonwildcard_simple = $3;
2966		};
2967
2968		general_default_floodcount: DEFAULT_FLOODCOUNT '=' NUMBER ';'
2969		{
2970	<	ConfigFileEntry.default_floodcount = $3;
2970	>	ConfigGeneral.default_floodcount = $3;
2971		};
2972
2973
#	Line 2758 | Line 2979 | channel_entry: CHANNEL
2979
2980		channel_items:      channel_items channel_item | channel_item;
2981		channel_item:       channel_max_bans |
2982	<	channel_knock_delay | channel_knock_delay_channel |
2983	<	channel_max_chans_per_user | channel_max_chans_per_oper |
2982	>	channel_invite_client_count |
2983	>	channel_invite_client_time |
2984	>	channel_knock_client_count |
2985	>	channel_knock_client_time |
2986	>	channel_knock_delay_channel |
2987	>	channel_max_channels |
2988		channel_default_split_user_count |
2989		channel_default_split_server_count |
2990		channel_no_create_on_split |
2991		channel_no_join_on_split |
2992	<	channel_jflood_count | channel_jflood_time |
2993	<	channel_disable_fake_channels | error;
2992	>	channel_jflood_count |
2993	>	channel_jflood_time |
2994	>	channel_disable_fake_channels |
2995	>	error;
2996
2997		channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
2998		{
2999		ConfigChannel.disable_fake_channels = yylval.number;
3000		};
3001
3002	<	channel_knock_delay: KNOCK_DELAY '=' timespec ';'
3002	>	channel_invite_client_count: INVITE_CLIENT_COUNT '=' NUMBER ';'
3003		{
3004	<	ConfigChannel.knock_delay = $3;
3004	>	ConfigChannel.invite_client_count = $3;
3005		};
3006
3007	<	channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
3007	>	channel_invite_client_time: INVITE_CLIENT_TIME '=' timespec ';'
3008		{
3009	<	ConfigChannel.knock_delay_channel = $3;
3009	>	ConfigChannel.invite_client_time = $3;
3010		};
3011
3012	<	channel_max_chans_per_user: MAX_CHANS_PER_USER '=' NUMBER ';'
3012	>	channel_knock_client_count: KNOCK_CLIENT_COUNT '=' NUMBER ';'
3013		{
3014	<	ConfigChannel.max_chans_per_user = $3;
3014	>	ConfigChannel.knock_client_count = $3;
3015		};
3016
3017	<	channel_max_chans_per_oper: MAX_CHANS_PER_OPER '=' NUMBER ';'
3017	>	channel_knock_client_time: KNOCK_CLIENT_TIME '=' timespec ';'
3018		{
3019	<	ConfigChannel.max_chans_per_oper = $3;
3019	>	ConfigChannel.knock_client_time = $3;
3020	>	};
3021	>
3022	>	channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
3023	>	{
3024	>	ConfigChannel.knock_delay_channel = $3;
3025	>	};
3026	>
3027	>	channel_max_channels: MAX_CHANNELS '=' NUMBER ';'
3028	>	{
3029	>	ConfigChannel.max_channels = $3;
3030		};
3031
3032		channel_max_bans: MAX_BANS '=' NUMBER ';'
#	Line 2824 | Line 3061 | channel_jflood_count: JOIN_FLOOD_COUNT '
3061
3062		channel_jflood_time: JOIN_FLOOD_TIME '=' timespec ';'
3063		{
3064	<	GlobalSetOptions.joinfloodtime = yylval.number;
3064	>	GlobalSetOptions.joinfloodtime = $3;
3065		};
3066
3067		/***************************************************************************
#	Line 2834 | Line 3071 | serverhide_entry: SERVERHIDE
3071		'{' serverhide_items '}' ';';
3072
3073		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
3074	<	serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
3075	<	serverhide_hide_services |
3076	<	serverhide_links_delay |
3077	<	serverhide_hidden | serverhide_hidden_name |
3078	<	serverhide_hide_server_ips |
3074	>	serverhide_item:    serverhide_flatten_links |
3075	>	serverhide_disable_remote_commands |
3076	>	serverhide_hide_servers |
3077	>	serverhide_hide_services |
3078	>	serverhide_links_delay |
3079	>	serverhide_hidden |
3080	>	serverhide_hidden_name |
3081	>	serverhide_hide_server_ips |
3082		error;
3083
3084		serverhide_flatten_links: FLATTEN_LINKS '=' TBOOL ';'
#	Line 2847 | Line 3087 | serverhide_flatten_links: FLATTEN_LINKS
3087		ConfigServerHide.flatten_links = yylval.number;
3088		};
3089
3090	+	serverhide_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
3091	+	{
3092	+	if (conf_parser_ctx.pass == 2)
3093	+	ConfigServerHide.disable_remote_commands = yylval.number;
3094	+	};
3095	+
3096		serverhide_hide_servers: HIDE_SERVERS '=' TBOOL ';'
3097		{
3098		if (conf_parser_ctx.pass == 2)
#	Line 2874 | Line 3120 | serverhide_links_delay: LINKS_DELAY '='
3120		{
3121		if (($3 > 0) && ConfigServerHide.links_disabled == 1)
3122		{
3123	<	eventAddIsh("write_links_file", write_links_file, NULL, $3);
3123	>	event_write_links_file.when = $3;
3124	>	event_addish(&event_write_links_file, NULL);
3125		ConfigServerHide.links_disabled = 0;
3126		}
3127

Diff Legend

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