ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/conf_parser.y

Comparing:
ircd-hybrid-8/src/ircd_parser.y (file contents), Revision 1265 by michael, Tue Jan 17 12:54:17 2012 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 1904 by michael, Sat Apr 27 21:16:22 2013 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  ircd_parser.y: Parses the ircd configuration file.
3	>	*  conf_parser.y: Parses the ircd configuration file.
4		*
5		*  Copyright (C) 2005 by the past and present ircd coders, and others.
6		*
#	Line 32 | Line 32
32		#include "stdinc.h"
33		#include "ircd.h"
34		#include "list.h"
35	<	#include "s_conf.h"
35	>	#include "conf.h"
36	>	#include "conf_class.h"
37		#include "event.h"
38	<	#include "s_log.h"
38	>	#include "log.h"
39		#include "client.h"     /* for UMODE_ALL only */
40		#include "irc_string.h"
40	–	#include "sprintf_irc.h"
41		#include "memory.h"
42		#include "modules.h"
43		#include "s_serv.h"
#	Line 52 | Line 52
52		#include <openssl/rsa.h>
53		#include <openssl/bio.h>
54		#include <openssl/pem.h>
55	+	#include <openssl/dh.h>
56		#endif
57
58	<	static char *class_name = NULL;
58	<	static struct ConfItem *yy_conf = NULL;
59	<	static struct AccessItem *yy_aconf = NULL;
60	<	static struct MatchItem *yy_match_item = NULL;
61	<	static struct ClassItem *yy_class = NULL;
62	<	static char *yy_class_name = NULL;
63	<
64	<	static dlink_list col_conf_list  = { NULL, NULL, 0 };
65	<	static dlink_list hub_conf_list  = { NULL, NULL, 0 };
66	<	static dlink_list leaf_conf_list = { NULL, NULL, 0 };
67	<	static unsigned int listener_flags = 0;
68	<	static unsigned int regex_ban = 0;
69	<	static char userbuf[IRCD_BUFSIZE];
70	<	static char hostbuf[IRCD_BUFSIZE];
71	<	static char reasonbuf[REASONLEN + 1];
72	<	static char gecos_name[REALLEN * 4];
73	<	static char lfile[IRCD_BUFSIZE];
74	<	static unsigned int ltype = 0;
75	<	static unsigned int lsize = 0;
76	<	static char *resv_reason = NULL;
77	<	static char *listener_address = NULL;
78	<
79	<	struct CollectItem
80	<	{
81	<	dlink_node node;
82	<	char *name;
83	<	char *user;
84	<	char *host;
85	<	char *passwd;
86	<	int  port;
87	<	int  flags;
88	<	#ifdef HAVE_LIBCRYPTO
89	<	char *rsa_public_key_file;
90	<	RSA *rsa_public_key;
91	<	#endif
92	<	};
58	>	#include "rsa.h"
59
60	<	static void
61	<	free_collect_item(struct CollectItem *item)
60	>	int yylex(void);
61	>
62	>	static struct
63		{
64	<	MyFree(item->name);
65	<	MyFree(item->user);
66	<	MyFree(item->host);
67	<	MyFree(item->passwd);
68	<	#ifdef HAVE_LIBCRYPTO
69	<	MyFree(item->rsa_public_key_file);
70	<	#endif
71	<	MyFree(item);
72	<	}
64	>	struct {
65	>	dlink_list list;
66	>	} mask,
67	>	leaf,
68	>	hub;
69	>
70	>	struct {
71	>	char buf[IRCD_BUFSIZE];
72	>	} name,
73	>	user,
74	>	host,
75	>	addr,
76	>	bind,
77	>	file,
78	>	ciph,
79	>	rpass,
80	>	spass,
81	>	class;
82	>
83	>	struct {
84	>	unsigned int value;
85	>	} flags,
86	>	modes,
87	>	size,
88	>	type,
89	>	port,
90	>	aftype,
91	>	ping_freq,
92	>	max_perip,
93	>	con_freq,
94	>	min_idle,
95	>	max_idle,
96	>	max_total,
97	>	max_global,
98	>	max_local,
99	>	max_ident,
100	>	max_sendq,
101	>	max_recvq,
102	>	cidr_bitlen_ipv4,
103	>	cidr_bitlen_ipv6,
104	>	number_per_cidr;
105	>	} block_state;
106
107		static void
108	<	unhook_hub_leaf_confs(void)
108	>	reset_block_state(void)
109		{
110	<	dlink_node *ptr;
111	<	dlink_node *next_ptr;
112	<	struct CollectItem *yy_hconf;
113	<	struct CollectItem *yy_lconf;
110	>	dlink_node *ptr = NULL, *ptr_next = NULL;
111	>
112	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.mask.list.head)
113	>	{
114	>	MyFree(ptr->data);
115	>	dlinkDelete(ptr, &block_state.mask.list);
116	>	free_dlink_node(ptr);
117	>	}
118
119	<	DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
119	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
120		{
121	<	yy_hconf = ptr->data;
122	<	dlinkDelete(&yy_hconf->node, &hub_conf_list);
123	<	free_collect_item(yy_hconf);
121	>	MyFree(ptr->data);
122	>	dlinkDelete(ptr, &block_state.leaf.list);
123	>	free_dlink_node(ptr);
124		}
125
126	<	DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
126	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.hub.list.head)
127		{
128	<	yy_lconf = ptr->data;
129	<	dlinkDelete(&yy_lconf->node, &leaf_conf_list);
130	<	free_collect_item(yy_lconf);
128	>	MyFree(ptr->data);
129	>	dlinkDelete(ptr, &block_state.hub.list);
130	>	free_dlink_node(ptr);
131		}
132	+
133	+	memset(&block_state, 0, sizeof(block_state));
134		}
135
136		%}
#	Line 135 | Line 141 | unhook_hub_leaf_confs(void)
141		}
142
143		%token  ACCEPT_PASSWORD
138	–	%token  ACTION
144		%token  ADMIN
145		%token  AFTYPE
141	–	%token  T_ALLOW
146		%token  ANTI_NICK_FLOOD
147		%token  ANTI_SPAM_EXIT_MESSAGE_TIME
148		%token  AUTOCONN
149	<	%token  T_BLOCK
146	<	%token  BURST_AWAY
147	<	%token  BURST_TOPICWHO
148	<	%token  BYTES KBYTES MBYTES GBYTES TBYTES
149	>	%token  BYTES KBYTES MBYTES
150		%token  CALLER_ID_WAIT
151		%token  CAN_FLOOD
152		%token  CHANNEL
153		%token  CIDR_BITLEN_IPV4
154		%token  CIDR_BITLEN_IPV6
154	–	%token  CIPHER_PREFERENCE
155		%token  CLASS
156	–	%token  COMPRESSED
157	–	%token  COMPRESSION_LEVEL
156		%token  CONNECT
157		%token  CONNECTFREQ
160	–	%token  CRYPTLINK
161	–	%token  DEFAULT_CIPHER_PREFERENCE
158		%token  DEFAULT_FLOODCOUNT
159		%token  DEFAULT_SPLIT_SERVER_COUNT
160		%token  DEFAULT_SPLIT_USER_COUNT
#	Line 167 | Line 163 | unhook_hub_leaf_confs(void)
163		%token  DIE
164		%token  DISABLE_AUTH
165		%token  DISABLE_FAKE_CHANNELS
170	–	%token  DISABLE_HIDDEN
171	–	%token  DISABLE_LOCAL_CHANNELS
166		%token  DISABLE_REMOTE_COMMANDS
167		%token  DOTS_IN_IDENT
174	–	%token  DURATION
168		%token  EGDPOOL_PATH
169		%token  EMAIL
177	–	%token  ENABLE
170		%token  ENCRYPTED
171		%token  EXCEED_LIMIT
172		%token  EXEMPT
#	Line 184 | Line 176 | unhook_hub_leaf_confs(void)
176		%token  GECOS
177		%token  GENERAL
178		%token  GLINE
179	<	%token  GLINES
179	>	%token  GLINE_DURATION
180	>	%token  GLINE_ENABLE
181		%token  GLINE_EXEMPT
182	<	%token  GLINE_TIME
182	>	%token  GLINE_REQUEST_DURATION
183		%token  GLINE_MIN_CIDR
184		%token  GLINE_MIN_CIDR6
185		%token  GLOBAL_KILL
#	Line 194 | Line 187 | unhook_hub_leaf_confs(void)
187		%token  NEED_IDENT
188		%token  HAVENT_READ_CONF
189		%token  HIDDEN
197	–	%token  HIDDEN_ADMIN
190		%token  HIDDEN_NAME
199	–	%token  HIDDEN_OPER
191		%token  HIDE_SERVER_IPS
192		%token  HIDE_SERVERS
193	+	%token  HIDE_SERVICES
194		%token  HIDE_SPOOF_IPS
195		%token  HOST
196		%token  HUB
#	Line 210 | Line 202 | unhook_hub_leaf_confs(void)
202		%token  KILL_CHASE_TIME_LIMIT
203		%token  KLINE
204		%token  KLINE_EXEMPT
213	–	%token  KLINE_REASON
214	–	%token  KLINE_WITH_REASON
205		%token  KNOCK_DELAY
206		%token  KNOCK_DELAY_CHANNEL
207		%token  LEAF_MASK
208		%token  LINKS_DELAY
209		%token  LISTEN
210		%token  T_LOG
211	+	%token  MASK
212		%token  MAX_ACCEPT
213		%token  MAX_BANS
214	+	%token  MAX_CHANS_PER_OPER
215		%token  MAX_CHANS_PER_USER
216		%token  MAX_GLOBAL
217		%token  MAX_IDENT
218		%token  MAX_LOCAL
219		%token  MAX_NICK_CHANGES
220	+	%token  MAX_NICK_LENGTH
221		%token  MAX_NICK_TIME
222		%token  MAX_NUMBER
223		%token  MAX_TARGETS
224	+	%token  MAX_TOPIC_LENGTH
225		%token  MAX_WATCH
232	–	%token  MESSAGE_LOCALE
226		%token  MIN_NONWILDCARD
227		%token  MIN_NONWILDCARD_SIMPLE
228	+	%token  MIN_IDLE
229	+	%token  MAX_IDLE
230	+	%token  RANDOM_IDLE
231	+	%token  HIDE_IDLE_FROM_OPERS
232		%token  MODULE
233		%token  MODULES
234		%token  NAME
#	Line 239 | Line 236 | unhook_hub_leaf_confs(void)
236		%token  NETWORK_DESC
237		%token  NETWORK_NAME
238		%token  NICK
242	–	%token  NICK_CHANGES
239		%token  NO_CREATE_ON_SPLIT
240		%token  NO_JOIN_ON_SPLIT
241		%token  NO_OPER_FLOOD
242		%token  NO_TILDE
243		%token  NUMBER
248	–	%token  NUMBER_PER_IDENT
244		%token  NUMBER_PER_CIDR
245		%token  NUMBER_PER_IP
251	–	%token  NUMBER_PER_IP_GLOBAL
246		%token  OPERATOR
247		%token  OPERS_BYPASS_CALLERID
248		%token  OPER_ONLY_UMODES
#	Line 263 | Line 257 | unhook_hub_leaf_confs(void)
257		%token  PATH
258		%token  PING_COOKIE
259		%token  PING_TIME
266	–	%token  PING_WARNING
260		%token  PORT
261		%token  QSTRING
262		%token  QUIET_ON_BAN
#	Line 272 | Line 265 | unhook_hub_leaf_confs(void)
265		%token  REDIRSERV
266		%token  REGEX_T
267		%token  REHASH
275	–	%token  TREJECT_HOLD_TIME
268		%token  REMOTE
269		%token  REMOTEBAN
278	–	%token  RESTRICT_CHANNELS
279	–	%token  RESTRICTED
270		%token  RSA_PRIVATE_KEY_FILE
271		%token  RSA_PUBLIC_KEY_FILE
272		%token  SSL_CERTIFICATE_FILE
273	<	%token  T_SSL_CONNECTION_METHOD
273	>	%token  SSL_DH_PARAM_FILE
274	>	%token  T_SSL_CLIENT_METHOD
275	>	%token  T_SSL_SERVER_METHOD
276		%token  T_SSLV3
277		%token  T_TLSV1
278		%token  RESV
279		%token  RESV_EXEMPT
280	<	%token  SECONDS MINUTES HOURS DAYS WEEKS
280	>	%token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
281		%token  SENDQ
282		%token  SEND_PASSWORD
283		%token  SERVERHIDE
284		%token  SERVERINFO
293	–	%token  SERVLINK_PATH
285		%token  IRCD_SID
286		%token  TKLINE_EXPIRE_NOTICES
287		%token  T_SHARED
288		%token  T_CLUSTER
289		%token  TYPE
290		%token  SHORT_MOTD
300	–	%token  SILENT
291		%token  SPOOF
292		%token  SPOOF_NOTICE
293		%token  STATS_E_DISABLED
#	Line 307 | Line 297 | unhook_hub_leaf_confs(void)
297		%token  STATS_P_OPER_ONLY
298		%token  TBOOL
299		%token  TMASKED
310	–	%token  T_REJECT
300		%token  TS_MAX_DELTA
301		%token  TS_WARN_DELTA
302		%token  TWODOTS
#	Line 317 | Line 306 | unhook_hub_leaf_confs(void)
306		%token  T_CALLERID
307		%token  T_CCONN
308		%token  T_CCONN_FULL
309	<	%token  T_CLIENT_FLOOD
309	>	%token  T_SSL_CIPHER_LIST
310		%token  T_DEAF
311		%token  T_DEBUG
312		%token  T_DLINE
324	–	%token  T_DRONE
313		%token  T_EXTERNAL
314		%token  T_FULL
315		%token  T_INVISIBLE
#	Line 330 | Line 318 | unhook_hub_leaf_confs(void)
318		%token  T_LOCOPS
319		%token  T_MAX_CLIENTS
320		%token  T_NCHANGE
321	+	%token  T_NONONREG
322		%token  T_OPERWALL
323	+	%token  T_RECVQ
324		%token  T_REJ
325		%token  T_SERVER
326		%token  T_SERVNOTICE
327	+	%token  T_SET
328		%token  T_SKILL
329		%token  T_SPY
330		%token  T_SSL
331		%token  T_UMODES
332		%token  T_UNAUTH
333	+	%token  T_UNDLINE
334		%token  T_UNLIMITED
335		%token  T_UNRESV
336		%token  T_UNXLINE
337		%token  T_GLOBOPS
338		%token  T_WALLOP
339	+	%token  T_WEBIRC
340		%token  T_RESTART
341		%token  T_SERVICE
342		%token  T_SERVICES_NAME
350	–	%token  T_TIMESTAMP
343		%token  THROTTLE_TIME
352	–	%token  TOPICBURST
344		%token  TRUE_NO_OPER_FLOOD
354	–	%token  TKLINE
355	–	%token  TXLINE
356	–	%token  TRESV
345		%token  UNKLINE
346		%token  USER
347		%token  USE_EGD
360	–	%token  USE_EXCEPT
361	–	%token  USE_INVEX
362	–	%token  USE_KNOCK
348		%token  USE_LOGGING
364	–	%token  USE_WHOIS_ACTUALLY
349		%token  VHOST
350		%token  VHOST6
351		%token  XLINE
368	–	%token  WARN
352		%token  WARN_NO_NLINE
353		%token  T_SIZE
354		%token  T_FILE
#	Line 400 | Line 383 | conf_item:        admin_entry
383		| deny_entry
384		| exempt_entry
385		| general_entry
403	–	| gline_entry
386		| gecos_entry
387		| modules_entry
388		| error ';'
#	Line 433 | Line 415 | timespec:      NUMBER timespec_
415		{
416		$$ = $1 * 60 * 60 * 24 * 7 + $3;
417		}
418	+	| NUMBER MONTHS timespec_
419	+	{
420	+	$$ = $1 * 60 * 60 * 24 * 7 * 4 + $3;
421	+	}
422	+	| NUMBER YEARS timespec_
423	+	{
424	+	$$ = $1 * 60 * 60 * 24 * 365 + $3;
425	+	}
426		;
427
428		sizespec_:      { $$ = 0; } | sizespec;
#	Line 471 | Line 461 | serverinfo_items:       serverinfo_items
461		serverinfo_item:        serverinfo_name | serverinfo_vhost |
462		serverinfo_hub | serverinfo_description |
463		serverinfo_network_name | serverinfo_network_desc |
464	<	serverinfo_max_clients |
464	>	serverinfo_max_clients | serverinfo_max_nick_length |
465	>	serverinfo_max_topic_length | serverinfo_ssl_dh_param_file |
466		serverinfo_rsa_private_key_file | serverinfo_vhost6 |
467		serverinfo_sid | serverinfo_ssl_certificate_file |
468	<	serverinfo_ssl_connection_method |
468	>	serverinfo_ssl_client_method | serverinfo_ssl_server_method |
469	>	serverinfo_ssl_cipher_list |
470		error ';' ;
471
472
473	<	serverinfo_ssl_connection_method: T_SSL_CONNECTION_METHOD
473	>	serverinfo_ssl_client_method: T_SSL_CLIENT_METHOD '=' client_method_types ';' ;
474	>	serverinfo_ssl_server_method: T_SSL_SERVER_METHOD '=' server_method_types ';' ;
475	>
476	>	client_method_types: client_method_types ',' client_method_type_item | client_method_type_item;
477	>	client_method_type_item: T_SSLV3
478		{
479		#ifdef HAVE_LIBCRYPTO
480	<	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
481	<	ServerInfo.tls_version = 0;
480	>	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
481	>	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv3);
482		#endif
483	<	} '=' method_types ';'
483	>	} | T_TLSV1
484		{
485		#ifdef HAVE_LIBCRYPTO
486	<	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
487	<	{
492	<	if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_SSLV3))
493	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
494	<	if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_TLSV1))
495	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
496	<	}
486	>	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
487	>	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_TLSv1);
488		#endif
489		};
490
491	<	method_types: method_types ',' method_type_item | method_type_item;
492	<	method_type_item: T_SSLV3
491	>	server_method_types: server_method_types ',' server_method_type_item | server_method_type_item;
492	>	server_method_type_item: T_SSLV3
493		{
494		#ifdef HAVE_LIBCRYPTO
495	<	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
496	<	ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_SSLV3;
495	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
496	>	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
497		#endif
498		} | T_TLSV1
499		{
500		#ifdef HAVE_LIBCRYPTO
501	<	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
502	<	ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_TLSV1;
501	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
502	>	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
503		#endif
504		};
505
#	Line 519 | Line 510 | serverinfo_ssl_certificate_file: SSL_CER
510		{
511		if (!ServerInfo.rsa_private_key_file)
512		{
513	<	yyerror("No rsa_private_key_file specified, SSL disabled");
513	>	conf_error_report("No rsa_private_key_file specified, SSL disabled");
514		break;
515		}
516
517		if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
518	+	SSL_FILETYPE_PEM) <= 0 ||
519	+	SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
520		SSL_FILETYPE_PEM) <= 0)
521		{
522	<	yyerror(ERR_lib_error_string(ERR_get_error()));
522	>	report_crypto_errors();
523	>	conf_error_report("Could not open/read certificate file");
524		break;
525		}
526
527		if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
528	+	SSL_FILETYPE_PEM) <= 0 ||
529	+	SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
530		SSL_FILETYPE_PEM) <= 0)
531		{
532	<	yyerror(ERR_lib_error_string(ERR_get_error()));
532	>	report_crypto_errors();
533	>	conf_error_report("Could not read RSA private key");
534		break;
535		}
536
537	<	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx))
537	>	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
538	>	!SSL_CTX_check_private_key(ServerInfo.client_ctx))
539		{
540	<	yyerror(ERR_lib_error_string(ERR_get_error()));
540	>	report_crypto_errors();
541	>	conf_error_report("Could not read RSA private key");
542		break;
543		}
544		}
#	Line 565 | Line 564 | serverinfo_rsa_private_key_file: RSA_PRI
564		ServerInfo.rsa_private_key_file = NULL;
565		}
566
567	<	DupString(ServerInfo.rsa_private_key_file, yylval.string);
567	>	ServerInfo.rsa_private_key_file = xstrdup(yylval.string);
568
569		if ((file = BIO_new_file(yylval.string, "r")) == NULL)
570		{
571	<	yyerror("File open failed, ignoring");
571	>	conf_error_report("File open failed, ignoring");
572		break;
573		}
574
575	<	ServerInfo.rsa_private_key = (RSA *)PEM_read_bio_RSAPrivateKey(file, NULL,
577	<	0, NULL);
575	>	ServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
576
577		BIO_set_close(file, BIO_CLOSE);
578		BIO_free(file);
579
580		if (ServerInfo.rsa_private_key == NULL)
581		{
582	<	yyerror("Couldn't extract key, ignoring");
582	>	conf_error_report("Couldn't extract key, ignoring");
583		break;
584		}
585
#	Line 590 | Line 588 | serverinfo_rsa_private_key_file: RSA_PRI
588		RSA_free(ServerInfo.rsa_private_key);
589		ServerInfo.rsa_private_key = NULL;
590
591	<	yyerror("Invalid key, ignoring");
591	>	conf_error_report("Invalid key, ignoring");
592		break;
593		}
594
#	Line 600 | Line 598 | serverinfo_rsa_private_key_file: RSA_PRI
598		RSA_free(ServerInfo.rsa_private_key);
599		ServerInfo.rsa_private_key = NULL;
600
601	<	yyerror("Not a 2048 bit key, ignoring");
601	>	conf_error_report("Not a 2048 bit key, ignoring");
602	>	}
603	>	}
604	>	#endif
605	>	};
606	>
607	>	serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
608	>	{
609	>	/* TBD - XXX: error reporting */
610	>	#ifdef HAVE_LIBCRYPTO
611	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
612	>	{
613	>	BIO *file = BIO_new_file(yylval.string, "r");
614	>
615	>	if (file)
616	>	{
617	>	DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
618	>
619	>	BIO_free(file);
620	>
621	>	if (dh)
622	>	{
623	>	if (DH_size(dh) < 128)
624	>	conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
625	>	else
626	>	SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
627	>
628	>	DH_free(dh);
629	>	}
630		}
631		}
632		#endif
633		};
634
635	+	serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
636	+	{
637	+	#ifdef HAVE_LIBCRYPTO
638	+	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
639	+	SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
640	+	#endif
641	+	};
642	+
643		serverinfo_name: NAME '=' QSTRING ';'
644		{
645		/* this isn't rehashable */
646		if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
647		{
648		if (valid_servname(yylval.string))
649	<	DupString(ServerInfo.name, yylval.string);
649	>	ServerInfo.name = xstrdup(yylval.string);
650		else
651		{
652	<	ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::name -- invalid name. Aborting.");
652	>	conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
653		exit(0);
654		}
655		}
#	Line 627 | Line 661 | serverinfo_sid: IRCD_SID '=' QSTRING ';'
661		if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
662		{
663		if (valid_sid(yylval.string))
664	<	DupString(ServerInfo.sid, yylval.string);
664	>	ServerInfo.sid = xstrdup(yylval.string);
665		else
666		{
667	<	ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::sid -- invalid SID. Aborting.");
667	>	conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
668		exit(0);
669		}
670		}
#	Line 641 | Line 675 | serverinfo_description: DESCRIPTION '='
675		if (conf_parser_ctx.pass == 2)
676		{
677		MyFree(ServerInfo.description);
678	<	DupString(ServerInfo.description,yylval.string);
678	>	ServerInfo.description = xstrdup(yylval.string);
679		}
680		};
681
#	Line 655 | Line 689 | serverinfo_network_name: NETWORK_NAME '=
689		p = '\0';
690
691		MyFree(ServerInfo.network_name);
692	<	DupString(ServerInfo.network_name, yylval.string);
692	>	ServerInfo.network_name = xstrdup(yylval.string);
693		}
694		};
695
#	Line 664 | Line 698 | serverinfo_network_desc: NETWORK_DESC '=
698		if (conf_parser_ctx.pass == 2)
699		{
700		MyFree(ServerInfo.network_desc);
701	<	DupString(ServerInfo.network_desc, yylval.string);
701	>	ServerInfo.network_desc = xstrdup(yylval.string);
702		}
703		};
704
#	Line 728 | Line 762 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
762
763		serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
764		{
765	<	if (conf_parser_ctx.pass == 2)
765	>	if (conf_parser_ctx.pass != 2)
766	>	break;
767	>
768	>	if ($3 < MAXCLIENTS_MIN)
769		{
770	<	recalc_fdlimit(NULL);
770	>	char buf[IRCD_BUFSIZE];
771
772	<	if ($3 < MAXCLIENTS_MIN)
773	<	{
774	<	char buf[IRCD_BUFSIZE];
775	<	ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
776	<	yyerror(buf);
777	<	}
778	<	else if ($3 > MAXCLIENTS_MAX)
779	<	{
780	<	char buf[IRCD_BUFSIZE];
781	<	ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
782	<	yyerror(buf);
783	<	}
784	<	else
785	<	ServerInfo.max_clients = $3;
772	>	snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
773	>	conf_error_report(buf);
774	>	ServerInfo.max_clients = MAXCLIENTS_MIN;
775	>	}
776	>	else if ($3 > MAXCLIENTS_MAX)
777	>	{
778	>	char buf[IRCD_BUFSIZE];
779	>
780	>	snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
781	>	conf_error_report(buf);
782	>	ServerInfo.max_clients = MAXCLIENTS_MAX;
783	>	}
784	>	else
785	>	ServerInfo.max_clients = $3;
786	>	};
787	>
788	>	serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
789	>	{
790	>	if (conf_parser_ctx.pass != 2)
791	>	break;
792	>
793	>	if ($3 < 9)
794	>	{
795	>	conf_error_report("max_nick_length too low, setting to 9");
796	>	ServerInfo.max_nick_length = 9;
797	>	}
798	>	else if ($3 > NICKLEN)
799	>	{
800	>	char buf[IRCD_BUFSIZE];
801	>
802	>	snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
803	>	conf_error_report(buf);
804	>	ServerInfo.max_nick_length = NICKLEN;
805		}
806	+	else
807	+	ServerInfo.max_nick_length = $3;
808	+	};
809	+
810	+	serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
811	+	{
812	+	if (conf_parser_ctx.pass != 2)
813	+	break;
814	+
815	+	if ($3 < 80)
816	+	{
817	+	conf_error_report("max_topic_length too low, setting to 80");
818	+	ServerInfo.max_topic_length = 80;
819	+	}
820	+	else if ($3 > TOPICLEN)
821	+	{
822	+	char buf[IRCD_BUFSIZE];
823	+
824	+	snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
825	+	conf_error_report(buf);
826	+	ServerInfo.max_topic_length = TOPICLEN;
827	+	}
828	+	else
829	+	ServerInfo.max_topic_length = $3;
830		};
831
832		serverinfo_hub: HUB '=' TBOOL ';'
#	Line 769 | Line 849 | admin_name: NAME '=' QSTRING ';'
849		if (conf_parser_ctx.pass == 2)
850		{
851		MyFree(AdminInfo.name);
852	<	DupString(AdminInfo.name, yylval.string);
852	>	AdminInfo.name = xstrdup(yylval.string);
853		}
854		};
855
#	Line 778 | Line 858 | admin_email: EMAIL '=' QSTRING ';'
858		if (conf_parser_ctx.pass == 2)
859		{
860		MyFree(AdminInfo.email);
861	<	DupString(AdminInfo.email, yylval.string);
861	>	AdminInfo.email = xstrdup(yylval.string);
862		}
863		};
864
#	Line 787 | Line 867 | admin_description: DESCRIPTION '=' QSTRI
867		if (conf_parser_ctx.pass == 2)
868		{
869		MyFree(AdminInfo.description);
870	<	DupString(AdminInfo.description, yylval.string);
870	>	AdminInfo.description = xstrdup(yylval.string);
871		}
872		};
873
#	Line 797 | Line 877 | admin_description: DESCRIPTION '=' QSTRI
877		logging_entry:          T_LOG  '{' logging_items '}' ';' ;
878		logging_items:          logging_items logging_item | logging_item ;
879
880	<	logging_item:           logging_use_logging | logging_timestamp | logging_file_entry |
880	>	logging_item:           logging_use_logging | logging_file_entry |
881		error ';' ;
882
883		logging_use_logging: USE_LOGGING '=' TBOOL ';'
#	Line 806 | Line 886 | logging_use_logging: USE_LOGGING '=' TBO
886		ConfigLoggingEntry.use_logging = yylval.number;
887		};
888
809	–	logging_timestamp: T_TIMESTAMP '=' TBOOL ';'
810	–	{
811	–	if (conf_parser_ctx.pass == 2)
812	–	ConfigLoggingEntry.timestamp = yylval.number;
813	–	};
814	–
889		logging_file_entry:
890		{
891	<	lfile[0] = '\0';
892	<	ltype = 0;
819	<	lsize = 0;
891	>	if (conf_parser_ctx.pass == 2)
892	>	reset_block_state();
893		} T_FILE  '{' logging_file_items '}' ';'
894		{
895	<	if (conf_parser_ctx.pass == 2 && ltype > 0)
896	<	log_add_file(ltype, lsize, lfile);
895	>	if (conf_parser_ctx.pass != 2)
896	>	break;
897	>
898	>	if (block_state.type.value && block_state.file.buf[0])
899	>	log_set_file(block_state.type.value, block_state.size.value,
900	>	block_state.file.buf);
901		};
902
903		logging_file_items: logging_file_items logging_file_item |
#	Line 831 | Line 908 | logging_file_item:  logging_file_name |
908
909		logging_file_name: NAME '=' QSTRING ';'
910		{
911	<	strlcpy(lfile, yylval.string, sizeof(lfile));
911	>	if (conf_parser_ctx.pass != 2)
912	>	break;
913	>
914	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
915		}
916
917		logging_file_size: T_SIZE '=' sizespec ';'
918		{
919	<	lsize = $3;
919	>	block_state.size.value = $3;
920		} | T_SIZE '=' T_UNLIMITED ';'
921		{
922	<	lsize = 0;
922	>	block_state.size.value = 0;
923		};
924
925		logging_file_type: TYPE
926		{
927		if (conf_parser_ctx.pass == 2)
928	<	ltype = 0;
928	>	block_state.type.value = 0;
929		} '='  logging_file_type_items ';' ;
930
931		logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
932		logging_file_type_item:  USER
933		{
934		if (conf_parser_ctx.pass == 2)
935	<	ltype = LOG_TYPE_USER;
935	>	block_state.type.value = LOG_TYPE_USER;
936		} | OPERATOR
937		{
938		if (conf_parser_ctx.pass == 2)
939	<	ltype = LOG_TYPE_OPER;
939	>	block_state.type.value = LOG_TYPE_OPER;
940		} | GLINE
941		{
942		if (conf_parser_ctx.pass == 2)
943	<	ltype = LOG_TYPE_GLINE;
943	>	block_state.type.value = LOG_TYPE_GLINE;
944		} | T_DLINE
945		{
946		if (conf_parser_ctx.pass == 2)
947	<	ltype = LOG_TYPE_DLINE;
947	>	block_state.type.value = LOG_TYPE_DLINE;
948		} | KLINE
949		{
950		if (conf_parser_ctx.pass == 2)
951	<	ltype = LOG_TYPE_KLINE;
951	>	block_state.type.value = LOG_TYPE_KLINE;
952		} | KILL
953		{
954		if (conf_parser_ctx.pass == 2)
955	<	ltype = LOG_TYPE_KILL;
955	>	block_state.type.value = LOG_TYPE_KILL;
956		} | T_DEBUG
957		{
958		if (conf_parser_ctx.pass == 2)
959	<	ltype = LOG_TYPE_DEBUG;
959	>	block_state.type.value = LOG_TYPE_DEBUG;
960		};
961
962
#	Line 885 | Line 965 | logging_file_type_item:  USER
965		***************************************************************************/
966		oper_entry: OPERATOR
967		{
968	<	if (conf_parser_ctx.pass == 2)
969	<	{
970	<	yy_conf = make_conf_item(OPER_TYPE);
971	<	yy_aconf = map_to_conf(yy_conf);
972	<	SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
973	<	}
894	<	else
895	<	{
896	<	MyFree(class_name);
897	<	class_name = NULL;
898	<	}
899	<	} oper_name_b '{' oper_items '}' ';'
968	>	if (conf_parser_ctx.pass != 2)
969	>	break;
970	>
971	>	reset_block_state();
972	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
973	>	} '{' oper_items '}' ';'
974		{
975	<	if (conf_parser_ctx.pass == 2)
902	<	{
903	<	struct CollectItem *yy_tmp;
904	<	dlink_node *ptr;
905	<	dlink_node *next_ptr;
975	>	dlink_node *ptr = NULL;
976
977	<	conf_add_class_to_conf(yy_conf, class_name);
977	>	if (conf_parser_ctx.pass != 2)
978	>	break;
979
980	<	/* Now, make sure there is a copy of the "base" given oper
981	<	* block in each of the collected copies
982	<	*/
980	>	if (!block_state.name.buf[0])
981	>	break;
982	>	#ifdef HAVE_LIBCRYPTO
983	>	if (!(block_state.file.buf[0] ||
984	>	block_state.rpass.buf[0]))
985	>	break;
986	>	#else
987	>	if (!block_state.rpass.buf[0])
988	>	break;
989	>	#endif
990
991	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
992	<	{
993	<	struct AccessItem *new_aconf;
994	<	struct ConfItem *new_conf;
917	<	yy_tmp = ptr->data;
991	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
992	>	{
993	>	struct MaskItem *conf = NULL;
994	>	struct split_nuh_item nuh;
995
996	<	new_conf = make_conf_item(OPER_TYPE);
997	<	new_aconf = (struct AccessItem *)map_to_conf(new_conf);
996	>	nuh.nuhmask  = ptr->data;
997	>	nuh.nickptr  = NULL;
998	>	nuh.userptr  = block_state.user.buf;
999	>	nuh.hostptr  = block_state.host.buf;
1000	>	nuh.nicksize = 0;
1001	>	nuh.usersize = sizeof(block_state.user.buf);
1002	>	nuh.hostsize = sizeof(block_state.host.buf);
1003	>	split_nuh(&nuh);
1004
1005	<	new_aconf->flags = yy_aconf->flags;
1005	>	conf        = conf_make(CONF_OPER);
1006	>	conf->name  = xstrdup(block_state.name.buf);
1007	>	conf->user  = xstrdup(block_state.user.buf);
1008	>	conf->host  = xstrdup(block_state.host.buf);
1009	>
1010	>	if (block_state.rpass.buf[0])
1011	>	conf->passwd = xstrdup(block_state.rpass.buf);
1012	>
1013	>	conf->flags = block_state.flags.value;
1014	>	conf->modes = block_state.modes.value;
1015	>	conf->port  = block_state.port.value;
1016	>	conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
1017
1018	<	if (yy_conf->name != NULL)
925	<	DupString(new_conf->name, yy_conf->name);
926	<	if (yy_tmp->user != NULL)
927	<	DupString(new_aconf->user, yy_tmp->user);
928	<	else
929	<	DupString(new_aconf->user, "*");
930	<	if (yy_tmp->host != NULL)
931	<	DupString(new_aconf->host, yy_tmp->host);
932	<	else
933	<	DupString(new_aconf->host, "*");
934	<	conf_add_class_to_conf(new_conf, class_name);
935	<	if (yy_aconf->passwd != NULL)
936	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1018	>	conf_add_class_to_conf(conf, block_state.class.buf);
1019
938	–	new_aconf->port = yy_aconf->port;
1020		#ifdef HAVE_LIBCRYPTO
1021	<	if (yy_aconf->rsa_public_key_file != NULL)
1022	<	{
1023	<	BIO *file;
1024	<
944	<	DupString(new_aconf->rsa_public_key_file,
945	<	yy_aconf->rsa_public_key_file);
946	<
947	<	file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
948	<	new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
949	<	NULL, 0, NULL);
950	<	BIO_set_close(file, BIO_CLOSE);
951	<	BIO_free(file);
952	<	}
953	<	#endif
1021	>	if (block_state.file.buf[0])
1022	>	{
1023	>	BIO *file = NULL;
1024	>	RSA *pkey = NULL;
1025
1026	<	#ifdef HAVE_LIBCRYPTO
956	<	if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
957	<	&& yy_tmp->host)
958	<	#else
959	<	if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
960	<	#endif
1026	>	if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
1027		{
1028	<	conf_add_class_to_conf(new_conf, class_name);
1029	<	if (yy_tmp->name != NULL)
964	<	DupString(new_conf->name, yy_tmp->name);
1028	>	conf_error_report("Ignoring rsa_public_key_file -- file doesn't exist");
1029	>	break;
1030		}
1031
1032	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1033	<	free_collect_item(yy_tmp);
969	<	}
1032	>	if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
1033	>	conf_error_report("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1034
1035	<	yy_conf = NULL;
1036	<	yy_aconf = NULL;
1037	<
1038	<
1039	<	MyFree(class_name);
976	<	class_name = NULL;
1035	>	conf->rsa_public_key = pkey;
1036	>	BIO_set_close(file, BIO_CLOSE);
1037	>	BIO_free(file);
1038	>	}
1039	>	#endif /* HAVE_LIBCRYPTO */
1040		}
1041	<	};
1041	>	};
1042
980	–	oper_name_b: | oper_name_t;
1043		oper_items:     oper_items oper_item | oper_item;
1044		oper_item:      oper_name | oper_user | oper_password |
1045		oper_umodes | oper_class | oper_encrypted |
#	Line 986 | Line 1048 | oper_item:      oper_name | oper_user |
1048		oper_name: NAME '=' QSTRING ';'
1049		{
1050		if (conf_parser_ctx.pass == 2)
1051	<	{
990	<	if (strlen(yylval.string) > OPERNICKLEN)
991	<	yylval.string[OPERNICKLEN] = '\0';
992	<
993	<	MyFree(yy_conf->name);
994	<	DupString(yy_conf->name, yylval.string);
995	<	}
996	<	};
997	<
998	<	oper_name_t: QSTRING
999	<	{
1000	<	if (conf_parser_ctx.pass == 2)
1001	<	{
1002	<	if (strlen(yylval.string) > OPERNICKLEN)
1003	<	yylval.string[OPERNICKLEN] = '\0';
1004	<
1005	<	MyFree(yy_conf->name);
1006	<	DupString(yy_conf->name, yylval.string);
1007	<	}
1051	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1052		};
1053
1054		oper_user: USER '=' QSTRING ';'
1055		{
1056		if (conf_parser_ctx.pass == 2)
1057	<	{
1014	<	struct split_nuh_item nuh;
1015	<
1016	<	nuh.nuhmask  = yylval.string;
1017	<	nuh.nickptr  = NULL;
1018	<	nuh.userptr  = userbuf;
1019	<	nuh.hostptr  = hostbuf;
1020	<
1021	<	nuh.nicksize = 0;
1022	<	nuh.usersize = sizeof(userbuf);
1023	<	nuh.hostsize = sizeof(hostbuf);
1024	<
1025	<	split_nuh(&nuh);
1026	<
1027	<	if (yy_aconf->user == NULL)
1028	<	{
1029	<	DupString(yy_aconf->user, userbuf);
1030	<	DupString(yy_aconf->host, hostbuf);
1031	<	}
1032	<	else
1033	<	{
1034	<	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
1035	<
1036	<	DupString(yy_tmp->user, userbuf);
1037	<	DupString(yy_tmp->host, hostbuf);
1038	<
1039	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1040	<	}
1041	<	}
1057	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1058		};
1059
1060		oper_password: PASSWORD '=' QSTRING ';'
1061		{
1062		if (conf_parser_ctx.pass == 2)
1063	<	{
1048	<	if (yy_aconf->passwd != NULL)
1049	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1050	<
1051	<	MyFree(yy_aconf->passwd);
1052	<	DupString(yy_aconf->passwd, yylval.string);
1053	<	}
1063	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1064		};
1065
1066		oper_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 1058 | Line 1068 | oper_encrypted: ENCRYPTED '=' TBOOL ';'
1068		if (conf_parser_ctx.pass == 2)
1069		{
1070		if (yylval.number)
1071	<	SetConfEncrypted(yy_aconf);
1071	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1072		else
1073	<	ClearConfEncrypted(yy_aconf);
1073	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1074		}
1075		};
1076
1077		oper_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
1078		{
1069	–	#ifdef HAVE_LIBCRYPTO
1079		if (conf_parser_ctx.pass == 2)
1080	<	{
1072	<	BIO *file;
1073	<
1074	<	if (yy_aconf->rsa_public_key != NULL)
1075	<	{
1076	<	RSA_free(yy_aconf->rsa_public_key);
1077	<	yy_aconf->rsa_public_key = NULL;
1078	<	}
1079	<
1080	<	if (yy_aconf->rsa_public_key_file != NULL)
1081	<	{
1082	<	MyFree(yy_aconf->rsa_public_key_file);
1083	<	yy_aconf->rsa_public_key_file = NULL;
1084	<	}
1085	<
1086	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
1087	<	file = BIO_new_file(yylval.string, "r");
1088	<
1089	<	if (file == NULL)
1090	<	{
1091	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
1092	<	break;
1093	<	}
1094	<
1095	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
1096	<
1097	<	if (yy_aconf->rsa_public_key == NULL)
1098	<	{
1099	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1100	<	break;
1101	<	}
1102	<
1103	<	BIO_set_close(file, BIO_CLOSE);
1104	<	BIO_free(file);
1105	<	}
1106	<	#endif /* HAVE_LIBCRYPTO */
1080	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
1081		};
1082
1083		oper_class: CLASS '=' QSTRING ';'
1084		{
1085		if (conf_parser_ctx.pass == 2)
1086	<	{
1113	<	MyFree(class_name);
1114	<	DupString(class_name, yylval.string);
1115	<	}
1086	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1087		};
1088
1089		oper_umodes: T_UMODES
1090		{
1091		if (conf_parser_ctx.pass == 2)
1092	<	yy_aconf->modes = 0;
1092	>	block_state.modes.value = 0;
1093		} '='  oper_umodes_items ';' ;
1094
1095		oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1096		oper_umodes_item:  T_BOTS
1097		{
1098		if (conf_parser_ctx.pass == 2)
1099	<	yy_aconf->modes |= UMODE_BOTS;
1099	>	block_state.modes.value |= UMODE_BOTS;
1100		} | T_CCONN
1101		{
1102		if (conf_parser_ctx.pass == 2)
1103	<	yy_aconf->modes |= UMODE_CCONN;
1103	>	block_state.modes.value |= UMODE_CCONN;
1104		} | T_CCONN_FULL
1105		{
1106		if (conf_parser_ctx.pass == 2)
1107	<	yy_aconf->modes |= UMODE_CCONN_FULL;
1107	>	block_state.modes.value |= UMODE_CCONN_FULL;
1108		} | T_DEAF
1109		{
1110		if (conf_parser_ctx.pass == 2)
1111	<	yy_aconf->modes |= UMODE_DEAF;
1111	>	block_state.modes.value |= UMODE_DEAF;
1112		} | T_DEBUG
1113		{
1114		if (conf_parser_ctx.pass == 2)
1115	<	yy_aconf->modes |= UMODE_DEBUG;
1115	>	block_state.modes.value |= UMODE_DEBUG;
1116		} | T_FULL
1117		{
1118		if (conf_parser_ctx.pass == 2)
1119	<	yy_aconf->modes |= UMODE_FULL;
1119	>	block_state.modes.value |= UMODE_FULL;
1120	>	} | HIDDEN
1121	>	{
1122	>	if (conf_parser_ctx.pass == 2)
1123	>	block_state.modes.value |= UMODE_HIDDEN;
1124		} | T_SKILL
1125		{
1126		if (conf_parser_ctx.pass == 2)
1127	<	yy_aconf->modes |= UMODE_SKILL;
1127	>	block_state.modes.value |= UMODE_SKILL;
1128		} | T_NCHANGE
1129		{
1130		if (conf_parser_ctx.pass == 2)
1131	<	yy_aconf->modes |= UMODE_NCHANGE;
1131	>	block_state.modes.value |= UMODE_NCHANGE;
1132		} | T_REJ
1133		{
1134		if (conf_parser_ctx.pass == 2)
1135	<	yy_aconf->modes |= UMODE_REJ;
1135	>	block_state.modes.value |= UMODE_REJ;
1136		} | T_UNAUTH
1137		{
1138		if (conf_parser_ctx.pass == 2)
1139	<	yy_aconf->modes |= UMODE_UNAUTH;
1139	>	block_state.modes.value |= UMODE_UNAUTH;
1140		} | T_SPY
1141		{
1142		if (conf_parser_ctx.pass == 2)
1143	<	yy_aconf->modes |= UMODE_SPY;
1143	>	block_state.modes.value |= UMODE_SPY;
1144		} | T_EXTERNAL
1145		{
1146		if (conf_parser_ctx.pass == 2)
1147	<	yy_aconf->modes |= UMODE_EXTERNAL;
1147	>	block_state.modes.value |= UMODE_EXTERNAL;
1148		} | T_OPERWALL
1149		{
1150		if (conf_parser_ctx.pass == 2)
1151	<	yy_aconf->modes |= UMODE_OPERWALL;
1151	>	block_state.modes.value |= UMODE_OPERWALL;
1152		} | T_SERVNOTICE
1153		{
1154		if (conf_parser_ctx.pass == 2)
1155	<	yy_aconf->modes |= UMODE_SERVNOTICE;
1155	>	block_state.modes.value |= UMODE_SERVNOTICE;
1156		} | T_INVISIBLE
1157		{
1158		if (conf_parser_ctx.pass == 2)
1159	<	yy_aconf->modes |= UMODE_INVISIBLE;
1159	>	block_state.modes.value |= UMODE_INVISIBLE;
1160		} | T_WALLOP
1161		{
1162		if (conf_parser_ctx.pass == 2)
1163	<	yy_aconf->modes |= UMODE_WALLOP;
1163	>	block_state.modes.value |= UMODE_WALLOP;
1164		} | T_SOFTCALLERID
1165		{
1166		if (conf_parser_ctx.pass == 2)
1167	<	yy_aconf->modes |= UMODE_SOFTCALLERID;
1167	>	block_state.modes.value |= UMODE_SOFTCALLERID;
1168		} | T_CALLERID
1169		{
1170		if (conf_parser_ctx.pass == 2)
1171	<	yy_aconf->modes |= UMODE_CALLERID;
1171	>	block_state.modes.value |= UMODE_CALLERID;
1172		} | T_LOCOPS
1173		{
1174		if (conf_parser_ctx.pass == 2)
1175	<	yy_aconf->modes |= UMODE_LOCOPS;
1175	>	block_state.modes.value |= UMODE_LOCOPS;
1176	>	} | T_NONONREG
1177	>	{
1178	>	if (conf_parser_ctx.pass == 2)
1179	>	block_state.modes.value |= UMODE_REGONLY;
1180		};
1181
1182		oper_flags: IRCD_FLAGS
1183		{
1184		if (conf_parser_ctx.pass == 2)
1185	<	yy_aconf->port = 0;
1185	>	block_state.port.value = 0;
1186		} '='  oper_flags_items ';';
1187
1188		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1189		oper_flags_item: GLOBAL_KILL
1190		{
1191		if (conf_parser_ctx.pass == 2)
1192	<	yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1192	>	block_state.port.value |= OPER_FLAG_GLOBAL_KILL;
1193		} | REMOTE
1194		{
1195		if (conf_parser_ctx.pass == 2)
1196	<	yy_aconf->port |= OPER_FLAG_REMOTE;
1196	>	block_state.port.value |= OPER_FLAG_REMOTE;
1197		} | KLINE
1198		{
1199		if (conf_parser_ctx.pass == 2)
1200	<	yy_aconf->port |= OPER_FLAG_K;
1200	>	block_state.port.value |= OPER_FLAG_K;
1201		} | UNKLINE
1202		{
1203		if (conf_parser_ctx.pass == 2)
1204	<	yy_aconf->port |= OPER_FLAG_UNKLINE;
1204	>	block_state.port.value |= OPER_FLAG_UNKLINE;
1205	>	} | T_DLINE
1206	>	{
1207	>	if (conf_parser_ctx.pass == 2)
1208	>	block_state.port.value |= OPER_FLAG_DLINE;
1209	>	} | T_UNDLINE
1210	>	{
1211	>	if (conf_parser_ctx.pass == 2)
1212	>	block_state.port.value |= OPER_FLAG_UNDLINE;
1213		} | XLINE
1214		{
1215		if (conf_parser_ctx.pass == 2)
1216	<	yy_aconf->port |= OPER_FLAG_X;
1216	>	block_state.port.value |= OPER_FLAG_X;
1217		} | GLINE
1218		{
1219		if (conf_parser_ctx.pass == 2)
1220	<	yy_aconf->port |= OPER_FLAG_GLINE;
1220	>	block_state.port.value |= OPER_FLAG_GLINE;
1221		} | DIE
1222		{
1223		if (conf_parser_ctx.pass == 2)
1224	<	yy_aconf->port |= OPER_FLAG_DIE;
1224	>	block_state.port.value |= OPER_FLAG_DIE;
1225		} | T_RESTART
1226		{
1227		if (conf_parser_ctx.pass == 2)
1228	<	yy_aconf->port |= OPER_FLAG_RESTART;
1228	>	block_state.port.value |= OPER_FLAG_RESTART;
1229		} | REHASH
1230		{
1231		if (conf_parser_ctx.pass == 2)
1232	<	yy_aconf->port |= OPER_FLAG_REHASH;
1232	>	block_state.port.value |= OPER_FLAG_REHASH;
1233		} | ADMIN
1234		{
1235		if (conf_parser_ctx.pass == 2)
1236	<	yy_aconf->port |= OPER_FLAG_ADMIN;
1250	<	} | HIDDEN_ADMIN
1251	<	{
1252	<	if (conf_parser_ctx.pass == 2)
1253	<	yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1254	<	} | NICK_CHANGES
1255	<	{
1256	<	if (conf_parser_ctx.pass == 2)
1257	<	yy_aconf->port |= OPER_FLAG_N;
1236	>	block_state.port.value |= OPER_FLAG_ADMIN;
1237		} | T_OPERWALL
1238		{
1239		if (conf_parser_ctx.pass == 2)
1240	<	yy_aconf->port |= OPER_FLAG_OPERWALL;
1240	>	block_state.port.value |= OPER_FLAG_OPERWALL;
1241		} | T_GLOBOPS
1242		{
1243		if (conf_parser_ctx.pass == 2)
1244	<	yy_aconf->port |= OPER_FLAG_GLOBOPS;
1244	>	block_state.port.value |= OPER_FLAG_GLOBOPS;
1245		} | OPER_SPY_T
1246		{
1247		if (conf_parser_ctx.pass == 2)
1248	<	yy_aconf->port |= OPER_FLAG_OPER_SPY;
1249	<	} | HIDDEN_OPER
1248	>	block_state.port.value |= OPER_FLAG_OPER_SPY;
1249	>	} | REMOTEBAN
1250		{
1251		if (conf_parser_ctx.pass == 2)
1252	<	yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1253	<	} | REMOTEBAN
1252	>	block_state.port.value |= OPER_FLAG_REMOTEBAN;
1253	>	} | T_SET
1254		{
1255		if (conf_parser_ctx.pass == 2)
1256	<	yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1256	>	block_state.port.value |= OPER_FLAG_SET;
1257		} | MODULE
1258		{
1259		if (conf_parser_ctx.pass == 2)
1260	<	yy_aconf->port |= OPER_FLAG_MODULE;
1260	>	block_state.port.value |= OPER_FLAG_MODULE;
1261		};
1262
1263
#	Line 1287 | Line 1266 | oper_flags_item: GLOBAL_KILL
1266		***************************************************************************/
1267		class_entry: CLASS
1268		{
1269	<	if (conf_parser_ctx.pass == 1)
1270	<	{
1292	<	yy_conf = make_conf_item(CLASS_TYPE);
1293	<	yy_class = map_to_conf(yy_conf);
1294	<	}
1295	<	} class_name_b '{' class_items '}' ';'
1296	<	{
1297	<	if (conf_parser_ctx.pass == 1)
1298	<	{
1299	<	struct ConfItem *cconf = NULL;
1300	<	struct ClassItem *class = NULL;
1301	<
1302	<	if (yy_class_name == NULL)
1303	<	delete_conf_item(yy_conf);
1304	<	else
1305	<	{
1306	<	cconf = find_exact_name_conf(CLASS_TYPE, yy_class_name, NULL, NULL);
1307	<
1308	<	if (cconf != NULL)                /* The class existed already */
1309	<	{
1310	<	int user_count = 0;
1311	<
1312	<	rebuild_cidr_class(cconf, yy_class);
1313	<
1314	<	class = map_to_conf(cconf);
1269	>	if (conf_parser_ctx.pass != 1)
1270	>	break;
1271
1272	<	user_count = class->curr_user_count;
1317	<	memcpy(class, yy_class, sizeof(*class));
1318	<	class->curr_user_count = user_count;
1319	<	class->active = 1;
1272	>	reset_block_state();
1273
1274	<	delete_conf_item(yy_conf);
1275	<
1276	<	MyFree(cconf->name);            /* Allows case change of class name */
1277	<	cconf->name = yy_class_name;
1278	<	}
1279	<	else      /* Brand new class */
1280	<	{
1281	<	MyFree(yy_conf->name);          /* just in case it was allocated */
1282	<	yy_conf->name = yy_class_name;
1283	<	yy_class->active = 1;
1284	<	}
1285	<	}
1286	<
1287	<	yy_class_name = NULL;
1288	<	}
1274	>	block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1275	>	block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1276	>	block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1277	>	block_state.max_sendq.value = DEFAULT_SENDQ;
1278	>	block_state.max_recvq.value = DEFAULT_RECVQ;
1279	>	} '{' class_items '}' ';'
1280	>	{
1281	>	struct ClassItem *class = NULL;
1282	>
1283	>	if (conf_parser_ctx.pass != 1)
1284	>	break;
1285	>
1286	>	if (!block_state.class.buf[0])
1287	>	break;
1288	>
1289	>	if (!(class = class_find(block_state.class.buf, 0)))
1290	>	class = class_make();
1291	>
1292	>	class->active = 1;
1293	>	MyFree(class->name);
1294	>	class->name = xstrdup(block_state.class.buf);
1295	>	class->ping_freq = block_state.ping_freq.value;
1296	>	class->max_perip = block_state.max_perip.value;
1297	>	class->con_freq = block_state.con_freq.value;
1298	>	class->max_total = block_state.max_total.value;
1299	>	class->max_global = block_state.max_global.value;
1300	>	class->max_local = block_state.max_local.value;
1301	>	class->max_ident = block_state.max_ident.value;
1302	>	class->max_sendq = block_state.max_sendq.value;
1303	>	class->max_recvq = block_state.max_recvq.value;
1304	>
1305	>	if (block_state.min_idle.value > block_state.max_idle.value)
1306	>	{
1307	>	block_state.min_idle.value = 0;
1308	>	block_state.max_idle.value = 0;
1309	>	block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
1310	>	}
1311	>
1312	>	class->flags = block_state.flags.value;
1313	>	class->min_idle = block_state.min_idle.value;
1314	>	class->max_idle = block_state.max_idle.value;
1315	>
1316	>	if (class->number_per_cidr && block_state.number_per_cidr.value)
1317	>	if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
1318	>	(class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
1319	>	if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
1320	>	(class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
1321	>	rebuild_cidr_list(class);
1322	>
1323	>	class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1324	>	class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1325	>	class->number_per_cidr = block_state.number_per_cidr.value;
1326		};
1327
1338	–	class_name_b: | class_name_t;
1339	–
1328		class_items:    class_items class_item | class_item;
1329		class_item:     class_name |
1330		class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1331		class_ping_time |
1344	–	class_ping_warning |
1332		class_number_per_cidr |
1333		class_number_per_ip |
1334		class_connectfreq |
#	Line 1349 | Line 1336 | class_item:     class_name |
1336		class_max_global |
1337		class_max_local |
1338		class_max_ident |
1339	<	class_sendq |
1339	>	class_sendq | class_recvq |
1340	>	class_min_idle |
1341	>	class_max_idle |
1342	>	class_flags |
1343		error ';' ;
1344
1345		class_name: NAME '=' QSTRING ';'
1346		{
1347		if (conf_parser_ctx.pass == 1)
1348	<	{
1359	<	MyFree(yy_class_name);
1360	<	DupString(yy_class_name, yylval.string);
1361	<	}
1362	<	};
1363	<
1364	<	class_name_t: QSTRING
1365	<	{
1366	<	if (conf_parser_ctx.pass == 1)
1367	<	{
1368	<	MyFree(yy_class_name);
1369	<	DupString(yy_class_name, yylval.string);
1370	<	}
1348	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1349		};
1350
1351		class_ping_time: PING_TIME '=' timespec ';'
1352		{
1353		if (conf_parser_ctx.pass == 1)
1354	<	PingFreq(yy_class) = $3;
1377	<	};
1378	<
1379	<	class_ping_warning: PING_WARNING '=' timespec ';'
1380	<	{
1381	<	if (conf_parser_ctx.pass == 1)
1382	<	PingWarning(yy_class) = $3;
1354	>	block_state.ping_freq.value = $3;
1355		};
1356
1357		class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1358		{
1359		if (conf_parser_ctx.pass == 1)
1360	<	MaxPerIp(yy_class) = $3;
1360	>	block_state.max_perip.value = $3;
1361		};
1362
1363		class_connectfreq: CONNECTFREQ '=' timespec ';'
1364		{
1365		if (conf_parser_ctx.pass == 1)
1366	<	ConFreq(yy_class) = $3;
1366	>	block_state.con_freq.value = $3;
1367		};
1368
1369		class_max_number: MAX_NUMBER '=' NUMBER ';'
1370		{
1371		if (conf_parser_ctx.pass == 1)
1372	<	MaxTotal(yy_class) = $3;
1372	>	block_state.max_total.value = $3;
1373		};
1374
1375		class_max_global: MAX_GLOBAL '=' NUMBER ';'
1376		{
1377		if (conf_parser_ctx.pass == 1)
1378	<	MaxGlobal(yy_class) = $3;
1378	>	block_state.max_global.value = $3;
1379		};
1380
1381		class_max_local: MAX_LOCAL '=' NUMBER ';'
1382		{
1383		if (conf_parser_ctx.pass == 1)
1384	<	MaxLocal(yy_class) = $3;
1384	>	block_state.max_local.value = $3;
1385		};
1386
1387		class_max_ident: MAX_IDENT '=' NUMBER ';'
1388		{
1389		if (conf_parser_ctx.pass == 1)
1390	<	MaxIdent(yy_class) = $3;
1390	>	block_state.max_ident.value = $3;
1391		};
1392
1393		class_sendq: SENDQ '=' sizespec ';'
1394		{
1395		if (conf_parser_ctx.pass == 1)
1396	<	MaxSendq(yy_class) = $3;
1396	>	block_state.max_sendq.value = $3;
1397	>	};
1398	>
1399	>	class_recvq: T_RECVQ '=' sizespec ';'
1400	>	{
1401	>	if (conf_parser_ctx.pass == 1)
1402	>	if ($3 >= CLIENT_FLOOD_MIN && $3 <= CLIENT_FLOOD_MAX)
1403	>	block_state.max_recvq.value = $3;
1404		};
1405
1406		class_cidr_bitlen_ipv4: CIDR_BITLEN_IPV4 '=' NUMBER ';'
1407		{
1408		if (conf_parser_ctx.pass == 1)
1409	<	CidrBitlenIPV4(yy_class) = $3;
1409	>	block_state.cidr_bitlen_ipv4.value = $3 > 32 ? 32 : $3;
1410		};
1411
1412		class_cidr_bitlen_ipv6: CIDR_BITLEN_IPV6 '=' NUMBER ';'
1413		{
1414		if (conf_parser_ctx.pass == 1)
1415	<	CidrBitlenIPV6(yy_class) = $3;
1415	>	block_state.cidr_bitlen_ipv6.value = $3 > 128 ? 128 : $3;
1416		};
1417
1418		class_number_per_cidr: NUMBER_PER_CIDR '=' NUMBER ';'
1419		{
1420		if (conf_parser_ctx.pass == 1)
1421	<	NumberPerCidr(yy_class) = $3;
1421	>	block_state.number_per_cidr.value = $3;
1422	>	};
1423	>
1424	>	class_min_idle: MIN_IDLE '=' timespec ';'
1425	>	{
1426	>	if (conf_parser_ctx.pass != 1)
1427	>	break;
1428	>
1429	>	block_state.min_idle.value = $3;
1430	>	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1431	>	};
1432	>
1433	>	class_max_idle: MAX_IDLE '=' timespec ';'
1434	>	{
1435	>	if (conf_parser_ctx.pass != 1)
1436	>	break;
1437	>
1438	>	block_state.max_idle.value = $3;
1439	>	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1440	>	};
1441	>
1442	>	class_flags: IRCD_FLAGS
1443	>	{
1444	>	if (conf_parser_ctx.pass == 1)
1445	>	block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1446	>	} '='  class_flags_items ';';
1447	>
1448	>	class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1449	>	class_flags_item: RANDOM_IDLE
1450	>	{
1451	>	if (conf_parser_ctx.pass == 1)
1452	>	block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
1453	>	} | HIDE_IDLE_FROM_OPERS
1454	>	{
1455	>	if (conf_parser_ctx.pass == 1)
1456	>	block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
1457		};
1458
1459	+
1460		/***************************************************************************
1461		*  section listen
1462		***************************************************************************/
1463		listen_entry: LISTEN
1464		{
1465		if (conf_parser_ctx.pass == 2)
1466	<	{
1467	<	listener_address = NULL;
1453	<	listener_flags = 0;
1454	<	}
1455	<	} '{' listen_items '}' ';'
1456	<	{
1457	<	if (conf_parser_ctx.pass == 2)
1458	<	{
1459	<	MyFree(listener_address);
1460	<	listener_address = NULL;
1461	<	}
1462	<	};
1466	>	reset_block_state();
1467	>	} '{' listen_items '}' ';';
1468
1469		listen_flags: IRCD_FLAGS
1470		{
1471	<	listener_flags = 0;
1471	>	block_state.flags.value = 0;
1472		} '='  listen_flags_items ';';
1473
1474		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1475		listen_flags_item: T_SSL
1476		{
1477		if (conf_parser_ctx.pass == 2)
1478	<	listener_flags |= LISTENER_SSL;
1478	>	block_state.flags.value |= LISTENER_SSL;
1479		} | HIDDEN
1480		{
1481		if (conf_parser_ctx.pass == 2)
1482	<	listener_flags |= LISTENER_HIDDEN;
1482	>	block_state.flags.value |= LISTENER_HIDDEN;
1483		} | T_SERVER
1484		{
1485		if (conf_parser_ctx.pass == 2)
1486	<	listener_flags |= LISTENER_SERVER;
1486	>	block_state.flags.value |= LISTENER_SERVER;
1487		};
1488
1484	–
1485	–
1489		listen_items:   listen_items listen_item | listen_item;
1490		listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';';
1491
1492	<	listen_port: PORT '=' port_items { listener_flags = 0; } ';';
1492	>	listen_port: PORT '=' port_items { block_state.flags.value = 0; } ';';
1493
1494		port_items: port_items ',' port_item | port_item;
1495
#	Line 1494 | Line 1497 | port_item: NUMBER
1497		{
1498		if (conf_parser_ctx.pass == 2)
1499		{
1500	<	if ((listener_flags & LISTENER_SSL))
1500	>	if (block_state.flags.value & LISTENER_SSL)
1501		#ifdef HAVE_LIBCRYPTO
1502		if (!ServerInfo.server_ctx)
1503		#endif
1504		{
1505	<	yyerror("SSL not available - port closed");
1505	>	conf_error_report("SSL not available - port closed");
1506		break;
1507		}
1508	<	add_listener($1, listener_address, listener_flags);
1508	>	add_listener($1, block_state.addr.buf, block_state.flags.value);
1509		}
1510		} | NUMBER TWODOTS NUMBER
1511		{
#	Line 1510 | Line 1513 | port_item: NUMBER
1513		{
1514		int i;
1515
1516	<	if ((listener_flags & LISTENER_SSL))
1516	>	if (block_state.flags.value & LISTENER_SSL)
1517		#ifdef HAVE_LIBCRYPTO
1518		if (!ServerInfo.server_ctx)
1519		#endif
1520		{
1521	<	yyerror("SSL not available - port closed");
1521	>	conf_error_report("SSL not available - port closed");
1522		break;
1523		}
1524
1525		for (i = $1; i <= $3; ++i)
1526	<	add_listener(i, listener_address, listener_flags);
1526	>	add_listener(i, block_state.addr.buf, block_state.flags.value);
1527		}
1528		};
1529
1530		listen_address: IP '=' QSTRING ';'
1531		{
1532		if (conf_parser_ctx.pass == 2)
1533	<	{
1531	<	MyFree(listener_address);
1532	<	DupString(listener_address, yylval.string);
1533	<	}
1533	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1534		};
1535
1536		listen_host: HOST '=' QSTRING ';'
1537		{
1538		if (conf_parser_ctx.pass == 2)
1539	<	{
1540	<	MyFree(listener_address);
1541	<	DupString(listener_address, yylval.string);
1542	<	}
1539	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1540		};
1541
1542		/***************************************************************************
#	Line 1548 | Line 1545 | listen_host: HOST '=' QSTRING ';'
1545		auth_entry: IRCD_AUTH
1546		{
1547		if (conf_parser_ctx.pass == 2)
1548	<	{
1552	<	yy_conf = make_conf_item(CLIENT_TYPE);
1553	<	yy_aconf = map_to_conf(yy_conf);
1554	<	}
1555	<	else
1556	<	{
1557	<	MyFree(class_name);
1558	<	class_name = NULL;
1559	<	}
1548	>	reset_block_state();
1549		} '{' auth_items '}' ';'
1550		{
1551	<	if (conf_parser_ctx.pass == 2)
1563	<	{
1564	<	struct CollectItem *yy_tmp = NULL;
1565	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1566	<
1567	<	if (yy_aconf->user && yy_aconf->host)
1568	<	{
1569	<	conf_add_class_to_conf(yy_conf, class_name);
1570	<	add_conf_by_address(CONF_CLIENT, yy_aconf);
1571	<	}
1572	<	else
1573	<	delete_conf_item(yy_conf);
1574	<
1575	<	/* copy over settings from first struct */
1576	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
1577	<	{
1578	<	struct AccessItem *new_aconf;
1579	<	struct ConfItem *new_conf;
1580	<
1581	<	new_conf = make_conf_item(CLIENT_TYPE);
1582	<	new_aconf = map_to_conf(new_conf);
1551	>	dlink_node *ptr = NULL;
1552
1553	<	yy_tmp = ptr->data;
1553	>	if (conf_parser_ctx.pass != 2)
1554	>	break;
1555
1556	<	assert(yy_tmp->user && yy_tmp->host);
1557	<
1558	<	if (yy_aconf->passwd != NULL)
1559	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1590	<	if (yy_conf->name != NULL)
1591	<	DupString(new_conf->name, yy_conf->name);
1592	<	if (yy_aconf->passwd != NULL)
1593	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1594	<
1595	<	new_aconf->flags = yy_aconf->flags;
1596	<	new_aconf->port  = yy_aconf->port;
1556	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
1557	>	{
1558	>	struct MaskItem *conf = NULL;
1559	>	struct split_nuh_item nuh;
1560
1561	<	DupString(new_aconf->user, yy_tmp->user);
1562	<	collapse(new_aconf->user);
1561	>	nuh.nuhmask  = ptr->data;
1562	>	nuh.nickptr  = NULL;
1563	>	nuh.userptr  = block_state.user.buf;
1564	>	nuh.hostptr  = block_state.host.buf;
1565	>	nuh.nicksize = 0;
1566	>	nuh.usersize = sizeof(block_state.user.buf);
1567	>	nuh.hostsize = sizeof(block_state.host.buf);
1568	>	split_nuh(&nuh);
1569
1570	<	DupString(new_aconf->host, yy_tmp->host);
1571	<	collapse(new_aconf->host);
1570	>	conf        = conf_make(CONF_CLIENT);
1571	>	conf->user  = xstrdup(collapse(block_state.user.buf));
1572	>	conf->host  = xstrdup(collapse(block_state.host.buf));
1573	>
1574	>	if (block_state.rpass.buf[0])
1575	>	conf->passwd = xstrdup(block_state.rpass.buf);
1576	>	if (block_state.name.buf[0])
1577	>	conf->passwd = xstrdup(block_state.name.buf);
1578
1579	<	conf_add_class_to_conf(new_conf, class_name);
1580	<	add_conf_by_address(CONF_CLIENT, new_aconf);
1606	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1607	<	free_collect_item(yy_tmp);
1608	<	}
1579	>	conf->flags = block_state.flags.value;
1580	>	conf->port  = block_state.port.value;
1581
1582	<	MyFree(class_name);
1583	<	class_name = NULL;
1612	<	yy_conf = NULL;
1613	<	yy_aconf = NULL;
1582	>	conf_add_class_to_conf(conf, block_state.class.buf);
1583	>	add_conf_by_address(CONF_CLIENT, conf);
1584		}
1585		};
1586
#	Line 1622 | Line 1592 | auth_item:      auth_user | auth_passwd
1592		auth_user: USER '=' QSTRING ';'
1593		{
1594		if (conf_parser_ctx.pass == 2)
1595	<	{
1626	<	struct CollectItem *yy_tmp = NULL;
1627	<	struct split_nuh_item nuh;
1628	<
1629	<	nuh.nuhmask  = yylval.string;
1630	<	nuh.nickptr  = NULL;
1631	<	nuh.userptr  = userbuf;
1632	<	nuh.hostptr  = hostbuf;
1633	<
1634	<	nuh.nicksize = 0;
1635	<	nuh.usersize = sizeof(userbuf);
1636	<	nuh.hostsize = sizeof(hostbuf);
1637	<
1638	<	split_nuh(&nuh);
1639	<
1640	<	if (yy_aconf->user == NULL)
1641	<	{
1642	<	DupString(yy_aconf->user, userbuf);
1643	<	DupString(yy_aconf->host, hostbuf);
1644	<	}
1645	<	else
1646	<	{
1647	<	yy_tmp = MyMalloc(sizeof(struct CollectItem));
1648	<
1649	<	DupString(yy_tmp->user, userbuf);
1650	<	DupString(yy_tmp->host, hostbuf);
1651	<
1652	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1653	<	}
1654	<	}
1595	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1596		};
1597
1657	–	/* XXX - IP/IPV6 tags don't exist anymore - put IP/IPV6 into user. */
1658	–
1598		auth_passwd: PASSWORD '=' QSTRING ';'
1599		{
1600		if (conf_parser_ctx.pass == 2)
1601	<	{
1663	<	/* be paranoid */
1664	<	if (yy_aconf->passwd != NULL)
1665	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1666	<
1667	<	MyFree(yy_aconf->passwd);
1668	<	DupString(yy_aconf->passwd, yylval.string);
1669	<	}
1601	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1602		};
1603
1604		auth_class: CLASS '=' QSTRING ';'
1605		{
1606		if (conf_parser_ctx.pass == 2)
1607	<	{
1676	<	MyFree(class_name);
1677	<	DupString(class_name, yylval.string);
1678	<	}
1607	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1608		};
1609
1610		auth_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 1683 | Line 1612 | auth_encrypted: ENCRYPTED '=' TBOOL ';'
1612		if (conf_parser_ctx.pass == 2)
1613		{
1614		if (yylval.number)
1615	<	SetConfEncrypted(yy_aconf);
1615	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1616		else
1617	<	ClearConfEncrypted(yy_aconf);
1617	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1618		}
1619		};
1620
1621		auth_flags: IRCD_FLAGS
1622		{
1623	+	if (conf_parser_ctx.pass == 2)
1624	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
1625		} '='  auth_flags_items ';';
1626
1627		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1628		auth_flags_item: SPOOF_NOTICE
1629		{
1630		if (conf_parser_ctx.pass == 2)
1631	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1631	>	block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1632		} | EXCEED_LIMIT
1633		{
1634		if (conf_parser_ctx.pass == 2)
1635	<	yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1635	>	block_state.flags.value |= CONF_FLAGS_NOLIMIT;
1636		} | KLINE_EXEMPT
1637		{
1638		if (conf_parser_ctx.pass == 2)
1639	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1639	>	block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1640		} | NEED_IDENT
1641		{
1642		if (conf_parser_ctx.pass == 2)
1643	<	yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
1643	>	block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
1644		} | CAN_FLOOD
1645		{
1646		if (conf_parser_ctx.pass == 2)
1647	<	yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
1647	>	block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
1648		} | NO_TILDE
1649		{
1650		if (conf_parser_ctx.pass == 2)
1651	<	yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1651	>	block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1652		} | GLINE_EXEMPT
1653		{
1654		if (conf_parser_ctx.pass == 2)
1655	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
1655	>	block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
1656		} | RESV_EXEMPT
1657		{
1658		if (conf_parser_ctx.pass == 2)
1659	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
1659	>	block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
1660	>	} | T_WEBIRC
1661	>	{
1662	>	if (conf_parser_ctx.pass == 2)
1663	>	block_state.flags.value |= CONF_FLAGS_WEBIRC;
1664		} | NEED_PASSWORD
1665		{
1666		if (conf_parser_ctx.pass == 2)
1667	<	yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
1667	>	block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1668		};
1669
1735	–	/* XXX - need check for illegal hostnames here */
1670		auth_spoof: SPOOF '=' QSTRING ';'
1671		{
1672	<	if (conf_parser_ctx.pass == 2)
1673	<	{
1740	<	MyFree(yy_conf->name);
1672	>	if (conf_parser_ctx.pass != 2)
1673	>	break;
1674
1675	<	if (strlen(yylval.string) < HOSTLEN)
1676	<	{
1677	<	DupString(yy_conf->name, yylval.string);
1678	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
1746	<	}
1747	<	else
1748	<	{
1749	<	ilog(LOG_TYPE_IRCD, "Spoofs must be less than %d..ignoring it", HOSTLEN);
1750	<	yy_conf->name = NULL;
1751	<	}
1675	>	if (strlen(yylval.string) <= HOSTLEN && valid_hostname(yylval.string))
1676	>	{
1677	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1678	>	block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
1679		}
1680	+	else
1681	+	ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
1682		};
1683
1684		auth_redir_serv: REDIRSERV '=' QSTRING ';'
1685		{
1686	<	if (conf_parser_ctx.pass == 2)
1687	<	{
1688	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1689	<	MyFree(yy_conf->name);
1690	<	DupString(yy_conf->name, yylval.string);
1762	<	}
1686	>	if (conf_parser_ctx.pass != 2)
1687	>	break;
1688	>
1689	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1690	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1691		};
1692
1693		auth_redir_port: REDIRPORT '=' NUMBER ';'
1694		{
1695	<	if (conf_parser_ctx.pass == 2)
1696	<	{
1697	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1698	<	yy_aconf->port = $3;
1699	<	}
1695	>	if (conf_parser_ctx.pass != 2)
1696	>	break;
1697	>
1698	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1699	>	block_state.port.value = $3;
1700		};
1701
1702
#	Line 1777 | Line 1705 | auth_redir_port: REDIRPORT '=' NUMBER ';
1705		***************************************************************************/
1706		resv_entry: RESV
1707		{
1708	<	if (conf_parser_ctx.pass == 2)
1709	<	{
1710	<	MyFree(resv_reason);
1711	<	resv_reason = NULL;
1712	<	}
1708	>	if (conf_parser_ctx.pass != 2)
1709	>	break;
1710	>
1711	>	reset_block_state();
1712	>	strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
1713		} '{' resv_items '}' ';'
1714		{
1715	<	if (conf_parser_ctx.pass == 2)
1716	<	{
1717	<	MyFree(resv_reason);
1718	<	resv_reason = NULL;
1791	<	}
1715	>	if (conf_parser_ctx.pass != 2)
1716	>	break;
1717	>
1718	>	create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1719		};
1720
1721		resv_items:     resv_items resv_item | resv_item;
1722	<	resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
1722	>	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1723
1724	<	resv_creason: REASON '=' QSTRING ';'
1724	>	resv_mask: MASK '=' QSTRING ';'
1725		{
1726		if (conf_parser_ctx.pass == 2)
1727	<	{
1801	<	MyFree(resv_reason);
1802	<	DupString(resv_reason, yylval.string);
1803	<	}
1727	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1728		};
1729
1730	<	resv_channel: CHANNEL '=' QSTRING ';'
1730	>	resv_reason: REASON '=' QSTRING ';'
1731		{
1732		if (conf_parser_ctx.pass == 2)
1733	<	{
1810	<	if (IsChanPrefix(*yylval.string))
1811	<	{
1812	<	char def_reason[] = "No reason";
1813	<
1814	<	create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1815	<	}
1816	<	}
1817	<	/* ignore it for now.. but we really should make a warning if
1818	<	* its an erroneous name --fl_ */
1733	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1734		};
1735
1736	<	resv_nick: NICK '=' QSTRING ';'
1736	>	resv_exempt: EXEMPT '=' QSTRING ';'
1737		{
1738		if (conf_parser_ctx.pass == 2)
1739	<	{
1825	<	char def_reason[] = "No reason";
1826	<
1827	<	create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1828	<	}
1739	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1740		};
1741
1742	+
1743		/***************************************************************************
1744		*  section service
1745		***************************************************************************/
#	Line 1842 | Line 1754 | service_name: NAME '=' QSTRING ';'
1754		{
1755		if (valid_servname(yylval.string))
1756		{
1757	<	yy_conf = make_conf_item(SERVICE_TYPE);
1758	<	DupString(yy_conf->name, yylval.string);
1757	>	struct MaskItem *conf = conf_make(CONF_SERVICE);
1758	>	conf->name = xstrdup(yylval.string);
1759		}
1760		}
1761		};
#	Line 1853 | Line 1765 | service_name: NAME '=' QSTRING ';'
1765		***************************************************************************/
1766		shared_entry: T_SHARED
1767		{
1768	<	if (conf_parser_ctx.pass == 2)
1769	<	{
1770	<	yy_conf = make_conf_item(ULINE_TYPE);
1771	<	yy_match_item = map_to_conf(yy_conf);
1772	<	yy_match_item->action = SHARED_ALL;
1773	<	}
1768	>	if (conf_parser_ctx.pass != 2)
1769	>	break;
1770	>
1771	>	reset_block_state();
1772	>
1773	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1774	>	strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
1775	>	strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
1776	>	block_state.flags.value = SHARED_ALL;
1777		} '{' shared_items '}' ';'
1778		{
1779	<	if (conf_parser_ctx.pass == 2)
1780	<	{
1781	<	yy_conf = NULL;
1782	<	}
1779	>	struct MaskItem *conf = NULL;
1780	>
1781	>	if (conf_parser_ctx.pass != 2)
1782	>	break;
1783	>
1784	>	conf = conf_make(CONF_ULINE);
1785	>	conf->flags = block_state.flags.value;
1786	>	conf->name = xstrdup(block_state.name.buf);
1787	>	conf->user = xstrdup(block_state.user.buf);
1788	>	conf->user = xstrdup(block_state.host.buf);
1789		};
1790
1791		shared_items: shared_items shared_item | shared_item;
#	Line 1873 | Line 1794 | shared_item:  shared_name | shared_user
1794		shared_name: NAME '=' QSTRING ';'
1795		{
1796		if (conf_parser_ctx.pass == 2)
1797	<	{
1877	<	MyFree(yy_conf->name);
1878	<	DupString(yy_conf->name, yylval.string);
1879	<	}
1797	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1798		};
1799
1800		shared_user: USER '=' QSTRING ';'
#	Line 1887 | Line 1805 | shared_user: USER '=' QSTRING ';'
1805
1806		nuh.nuhmask  = yylval.string;
1807		nuh.nickptr  = NULL;
1808	<	nuh.userptr  = userbuf;
1809	<	nuh.hostptr  = hostbuf;
1808	>	nuh.userptr  = block_state.user.buf;
1809	>	nuh.hostptr  = block_state.host.buf;
1810
1811		nuh.nicksize = 0;
1812	<	nuh.usersize = sizeof(userbuf);
1813	<	nuh.hostsize = sizeof(hostbuf);
1812	>	nuh.usersize = sizeof(block_state.user.buf);
1813	>	nuh.hostsize = sizeof(block_state.host.buf);
1814
1815		split_nuh(&nuh);
1898	–
1899	–	DupString(yy_match_item->user, userbuf);
1900	–	DupString(yy_match_item->host, hostbuf);
1816		}
1817		};
1818
1819		shared_type: TYPE
1820		{
1821		if (conf_parser_ctx.pass == 2)
1822	<	yy_match_item->action = 0;
1822	>	block_state.flags.value = 0;
1823		} '=' shared_types ';' ;
1824
1825		shared_types: shared_types ',' shared_type_item | shared_type_item;
1826		shared_type_item: KLINE
1827		{
1828		if (conf_parser_ctx.pass == 2)
1829	<	yy_match_item->action |= SHARED_KLINE;
1830	<	} | TKLINE
1829	>	block_state.flags.value |= SHARED_KLINE;
1830	>	} | UNKLINE
1831		{
1832		if (conf_parser_ctx.pass == 2)
1833	<	yy_match_item->action |= SHARED_TKLINE;
1834	<	} | UNKLINE
1833	>	block_state.flags.value |= SHARED_UNKLINE;
1834	>	} | T_DLINE
1835		{
1836		if (conf_parser_ctx.pass == 2)
1837	<	yy_match_item->action |= SHARED_UNKLINE;
1838	<	} | XLINE
1837	>	block_state.flags.value |= SHARED_DLINE;
1838	>	} | T_UNDLINE
1839		{
1840		if (conf_parser_ctx.pass == 2)
1841	<	yy_match_item->action |= SHARED_XLINE;
1842	<	} | TXLINE
1841	>	block_state.flags.value |= SHARED_UNDLINE;
1842	>	} | XLINE
1843		{
1844		if (conf_parser_ctx.pass == 2)
1845	<	yy_match_item->action |= SHARED_TXLINE;
1845	>	block_state.flags.value |= SHARED_XLINE;
1846		} | T_UNXLINE
1847		{
1848		if (conf_parser_ctx.pass == 2)
1849	<	yy_match_item->action |= SHARED_UNXLINE;
1849	>	block_state.flags.value |= SHARED_UNXLINE;
1850		} | RESV
1851		{
1852		if (conf_parser_ctx.pass == 2)
1853	<	yy_match_item->action |= SHARED_RESV;
1939	<	} | TRESV
1940	<	{
1941	<	if (conf_parser_ctx.pass == 2)
1942	<	yy_match_item->action |= SHARED_TRESV;
1853	>	block_state.flags.value |= SHARED_RESV;
1854		} | T_UNRESV
1855		{
1856		if (conf_parser_ctx.pass == 2)
1857	<	yy_match_item->action |= SHARED_UNRESV;
1857	>	block_state.flags.value |= SHARED_UNRESV;
1858		} | T_LOCOPS
1859		{
1860		if (conf_parser_ctx.pass == 2)
1861	<	yy_match_item->action |= SHARED_LOCOPS;
1861	>	block_state.flags.value |= SHARED_LOCOPS;
1862		} | T_ALL
1863		{
1864		if (conf_parser_ctx.pass == 2)
1865	<	yy_match_item->action = SHARED_ALL;
1865	>	block_state.flags.value = SHARED_ALL;
1866		};
1867
1868		/***************************************************************************
#	Line 1959 | Line 1870 | shared_type_item: KLINE
1870		***************************************************************************/
1871		cluster_entry: T_CLUSTER
1872		{
1873	<	if (conf_parser_ctx.pass == 2)
1874	<	{
1875	<	yy_conf = make_conf_item(CLUSTER_TYPE);
1876	<	yy_conf->flags = SHARED_ALL;
1877	<	}
1873	>	if (conf_parser_ctx.pass != 2)
1874	>	break;
1875	>
1876	>	reset_block_state();
1877	>
1878	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1879	>	block_state.flags.value = SHARED_ALL;
1880		} '{' cluster_items '}' ';'
1881		{
1882	<	if (conf_parser_ctx.pass == 2)
1883	<	{
1884	<	if (yy_conf->name == NULL)
1885	<	DupString(yy_conf->name, "*");
1886	<	yy_conf = NULL;
1887	<	}
1882	>	struct MaskItem *conf = NULL;
1883	>
1884	>	if (conf_parser_ctx.pass != 2)
1885	>	break;
1886	>
1887	>	conf = conf_make(CONF_CLUSTER);
1888	>	conf->flags = block_state.flags.value;
1889	>	conf->name = xstrdup(block_state.name.buf);
1890		};
1891
1892		cluster_items:  cluster_items cluster_item | cluster_item;
#	Line 1980 | Line 1895 | cluster_item:  cluster_name | cluster_typ
1895		cluster_name: NAME '=' QSTRING ';'
1896		{
1897		if (conf_parser_ctx.pass == 2)
1898	<	DupString(yy_conf->name, yylval.string);
1898	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1899		};
1900
1901		cluster_type: TYPE
1902		{
1903		if (conf_parser_ctx.pass == 2)
1904	<	yy_conf->flags = 0;
1904	>	block_state.flags.value = 0;
1905		} '=' cluster_types ';' ;
1906
1907		cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1908		cluster_type_item: KLINE
1909		{
1910		if (conf_parser_ctx.pass == 2)
1911	<	yy_conf->flags |= SHARED_KLINE;
1912	<	} | TKLINE
1911	>	block_state.flags.value |= SHARED_KLINE;
1912	>	} | UNKLINE
1913		{
1914		if (conf_parser_ctx.pass == 2)
1915	<	yy_conf->flags |= SHARED_TKLINE;
1916	<	} | UNKLINE
1915	>	block_state.flags.value |= SHARED_UNKLINE;
1916	>	} | T_DLINE
1917		{
1918		if (conf_parser_ctx.pass == 2)
1919	<	yy_conf->flags |= SHARED_UNKLINE;
1920	<	} | XLINE
1919	>	block_state.flags.value |= SHARED_DLINE;
1920	>	} | T_UNDLINE
1921		{
1922		if (conf_parser_ctx.pass == 2)
1923	<	yy_conf->flags |= SHARED_XLINE;
1924	<	} | TXLINE
1923	>	block_state.flags.value |= SHARED_UNDLINE;
1924	>	} | XLINE
1925		{
1926		if (conf_parser_ctx.pass == 2)
1927	<	yy_conf->flags |= SHARED_TXLINE;
1927	>	block_state.flags.value |= SHARED_XLINE;
1928		} | T_UNXLINE
1929		{
1930		if (conf_parser_ctx.pass == 2)
1931	<	yy_conf->flags |= SHARED_UNXLINE;
1931	>	block_state.flags.value |= SHARED_UNXLINE;
1932		} | RESV
1933		{
1934		if (conf_parser_ctx.pass == 2)
1935	<	yy_conf->flags |= SHARED_RESV;
2021	<	} | TRESV
2022	<	{
2023	<	if (conf_parser_ctx.pass == 2)
2024	<	yy_conf->flags |= SHARED_TRESV;
1935	>	block_state.flags.value |= SHARED_RESV;
1936		} | T_UNRESV
1937		{
1938		if (conf_parser_ctx.pass == 2)
1939	<	yy_conf->flags |= SHARED_UNRESV;
1939	>	block_state.flags.value |= SHARED_UNRESV;
1940		} | T_LOCOPS
1941		{
1942		if (conf_parser_ctx.pass == 2)
1943	<	yy_conf->flags |= SHARED_LOCOPS;
1943	>	block_state.flags.value |= SHARED_LOCOPS;
1944		} | T_ALL
1945		{
1946		if (conf_parser_ctx.pass == 2)
1947	<	yy_conf->flags = SHARED_ALL;
1947	>	block_state.flags.value = SHARED_ALL;
1948		};
1949
1950		/***************************************************************************
#	Line 2041 | Line 1952 | cluster_type_item: KLINE
1952		***************************************************************************/
1953		connect_entry: CONNECT
1954		{
2044	–	if (conf_parser_ctx.pass == 2)
2045	–	{
2046	–	yy_conf = make_conf_item(SERVER_TYPE);
2047	–	yy_aconf = map_to_conf(yy_conf);
1955
1956	<	/* defaults */
1957	<	yy_aconf->port = PORTNUM;
2051	<	}
2052	<	else
2053	<	{
2054	<	MyFree(class_name);
2055	<	class_name = NULL;
2056	<	}
2057	<	} connect_name_b '{' connect_items '}' ';'
2058	<	{
2059	<	if (conf_parser_ctx.pass == 2)
2060	<	{
2061	<	struct CollectItem *yy_hconf=NULL;
2062	<	struct CollectItem *yy_lconf=NULL;
2063	<	dlink_node *ptr;
2064	<	dlink_node *next_ptr;
2065	<	#ifdef HAVE_LIBCRYPTO
2066	<	if (yy_aconf->host &&
2067	<	((yy_aconf->passwd && yy_aconf->spasswd) ||
2068	<	(yy_aconf->rsa_public_key && IsConfCryptLink(yy_aconf))))
2069	<	#else /* !HAVE_LIBCRYPTO */
2070	<	if (yy_aconf->host && !IsConfCryptLink(yy_aconf) &&
2071	<	yy_aconf->passwd && yy_aconf->spasswd)
2072	<	#endif /* !HAVE_LIBCRYPTO */
2073	<	{
2074	<	if (conf_add_server(yy_conf, class_name) == -1)
2075	<	{
2076	<	delete_conf_item(yy_conf);
2077	<	yy_conf = NULL;
2078	<	yy_aconf = NULL;
2079	<	}
2080	<	}
2081	<	else
2082	<	{
2083	<	/* Even if yy_conf ->name is NULL
2084	<	* should still unhook any hub/leaf confs still pending
2085	<	*/
2086	<	unhook_hub_leaf_confs();
2087	<
2088	<	if (yy_conf->name != NULL)
2089	<	{
2090	<	#ifndef HAVE_LIBCRYPTO
2091	<	if (IsConfCryptLink(yy_aconf))
2092	<	yyerror("Ignoring connect block -- no OpenSSL support");
2093	<	#else
2094	<	if (IsConfCryptLink(yy_aconf) && !yy_aconf->rsa_public_key)
2095	<	yyerror("Ignoring connect block -- missing key");
2096	<	#endif
2097	<	if (yy_aconf->host == NULL)
2098	<	yyerror("Ignoring connect block -- missing host");
2099	<	else if (!IsConfCryptLink(yy_aconf) &&
2100	<	(!yy_aconf->passwd || !yy_aconf->spasswd))
2101	<	yyerror("Ignoring connect block -- missing password");
2102	<	}
2103	<
2104	<
2105	<	/* XXX
2106	<	* This fixes a try_connections() core (caused by invalid class_ptr
2107	<	* pointers) reported by metalrock. That's an ugly fix, but there
2108	<	* is currently no better way. The entire config subsystem needs an
2109	<	* rewrite ASAP. make_conf_item() shouldn't really add things onto
2110	<	* a doubly linked list immediately without any sanity checks!  -Michael
2111	<	*/
2112	<	delete_conf_item(yy_conf);
2113	<
2114	<	yy_aconf = NULL;
2115	<	yy_conf = NULL;
2116	<	}
2117	<
2118	<	/*
2119	<	* yy_conf is still pointing at the server that is having
2120	<	* a connect block built for it. This means, y_aconf->name
2121	<	* points to the actual irc name this server will be known as.
2122	<	* Now this new server has a set or even just one hub_mask (or leaf_mask)
2123	<	* given in the link list at yy_hconf. Fill in the HUB confs
2124	<	* from this link list now.
2125	<	*/
2126	<	DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
2127	<	{
2128	<	struct ConfItem *new_hub_conf;
2129	<	struct MatchItem *match_item;
1956	>	if (conf_parser_ctx.pass != 2)
1957	>	break;
1958
1959	<	yy_hconf = ptr->data;
1959	>	reset_block_state();
1960	>	block_state.port.value = PORTNUM;
1961	>	} '{' connect_items '}' ';'
1962	>	{
1963	>	struct MaskItem *conf = NULL;
1964	>	struct addrinfo hints, *res;
1965	>
1966	>	if (conf_parser_ctx.pass != 2)
1967	>	break;
1968	>
1969	>	if (!block_state.name.buf[0] ||
1970	>	!block_state.host.buf[0])
1971	>	break;
1972	>
1973	>	if (!(block_state.rpass.buf[0] ||
1974	>	block_state.spass.buf[0]))
1975	>	break;
1976	>
1977	>	if (has_wildcards(block_state.name.buf) ||
1978	>	has_wildcards(block_state.host.buf))
1979	>	break;
1980	>
1981	>	conf = conf_make(CONF_SERVER);
1982	>	conf->port = block_state.port.value;
1983	>	conf->flags = block_state.flags.value;
1984	>	conf->aftype = block_state.aftype.value;
1985	>	conf->host = xstrdup(block_state.host.buf);
1986	>	conf->name = xstrdup(block_state.name.buf);
1987	>	conf->passwd = xstrdup(block_state.rpass.buf);
1988	>	conf->spasswd = xstrdup(block_state.spass.buf);
1989	>	conf->cipher_list = xstrdup(block_state.ciph.buf);
1990
1991	<	/* yy_conf == NULL is a fatal error for this connect block! */
1992	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2135	<	{
2136	<	new_hub_conf = make_conf_item(HUB_TYPE);
2137	<	match_item = (struct MatchItem *)map_to_conf(new_hub_conf);
2138	<	DupString(new_hub_conf->name, yy_conf->name);
2139	<	if (yy_hconf->user != NULL)
2140	<	DupString(match_item->user, yy_hconf->user);
2141	<	else
2142	<	DupString(match_item->user, "*");
2143	<	if (yy_hconf->host != NULL)
2144	<	DupString(match_item->host, yy_hconf->host);
2145	<	else
2146	<	DupString(match_item->host, "*");
2147	<	}
2148	<	dlinkDelete(&yy_hconf->node, &hub_conf_list);
2149	<	free_collect_item(yy_hconf);
2150	<	}
1991	>	dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
1992	>	dlinkMoveList(&block_state.hub.list, &conf->hub_list);
1993
1994	<	/* Ditto for the LEAF confs */
1994	>	if (block_state.bind.buf[0])
1995	>	{
1996	>	memset(&hints, 0, sizeof(hints));
1997
1998	<	DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
1999	<	{
2000	<	struct ConfItem *new_leaf_conf;
2157	<	struct MatchItem *match_item;
1998	>	hints.ai_family   = AF_UNSPEC;
1999	>	hints.ai_socktype = SOCK_STREAM;
2000	>	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2001
2002	<	yy_lconf = ptr->data;
2002	>	if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2003	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2004	>	else
2005	>	{
2006	>	assert(res != NULL);
2007
2008	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2009	<	{
2010	<	new_leaf_conf = make_conf_item(LEAF_TYPE);
2011	<	match_item = (struct MatchItem *)map_to_conf(new_leaf_conf);
2012	<	DupString(new_leaf_conf->name, yy_conf->name);
2166	<	if (yy_lconf->user != NULL)
2167	<	DupString(match_item->user, yy_lconf->user);
2168	<	else
2169	<	DupString(match_item->user, "*");
2170	<	if (yy_lconf->host != NULL)
2171	<	DupString(match_item->host, yy_lconf->host);
2172	<	else
2173	<	DupString(match_item->host, "*");
2174	<	}
2175	<	dlinkDelete(&yy_lconf->node, &leaf_conf_list);
2176	<	free_collect_item(yy_lconf);
2177	<	}
2178	<	MyFree(class_name);
2179	<	class_name = NULL;
2180	<	yy_conf = NULL;
2181	<	yy_aconf = NULL;
2008	>	memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2009	>	conf->bind.ss.ss_family = res->ai_family;
2010	>	conf->bind.ss_len = res->ai_addrlen;
2011	>	freeaddrinfo(res);
2012	>	}
2013		}
2014	+
2015	+	conf_add_class_to_conf(conf, block_state.class.buf);
2016	+	lookup_confhost(conf);
2017		};
2018
2185	–	connect_name_b: | connect_name_t;
2019		connect_items:  connect_items connect_item | connect_item;
2020		connect_item:   connect_name | connect_host | connect_vhost |
2021		connect_send_password | connect_accept_password |
2022	<	connect_aftype | connect_port |
2022	>	connect_aftype | connect_port | connect_ssl_cipher_list |
2023		connect_flags | connect_hub_mask | connect_leaf_mask |
2024	<	connect_class | connect_encrypted |
2192	<	connect_rsa_public_key_file | connect_cipher_preference |
2024	>	connect_class | connect_encrypted |
2025		error ';' ;
2026
2027		connect_name: NAME '=' QSTRING ';'
2028		{
2029		if (conf_parser_ctx.pass == 2)
2030	<	{
2199	<	if (yy_conf->name != NULL)
2200	<	yyerror("Multiple connect name entry");
2201	<
2202	<	MyFree(yy_conf->name);
2203	<	DupString(yy_conf->name, yylval.string);
2204	<	}
2205	<	};
2206	<
2207	<	connect_name_t: QSTRING
2208	<	{
2209	<	if (conf_parser_ctx.pass == 2)
2210	<	{
2211	<	if (yy_conf->name != NULL)
2212	<	yyerror("Multiple connect name entry");
2213	<
2214	<	MyFree(yy_conf->name);
2215	<	DupString(yy_conf->name, yylval.string);
2216	<	}
2030	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2031		};
2032
2033		connect_host: HOST '=' QSTRING ';'
2034		{
2035		if (conf_parser_ctx.pass == 2)
2036	<	{
2223	<	MyFree(yy_aconf->host);
2224	<	DupString(yy_aconf->host, yylval.string);
2225	<	}
2036	>	strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2037		};
2038
2039		connect_vhost: VHOST '=' QSTRING ';'
2040		{
2041		if (conf_parser_ctx.pass == 2)
2042	<	{
2232	<	struct addrinfo hints, *res;
2233	<
2234	<	memset(&hints, 0, sizeof(hints));
2235	<
2236	<	hints.ai_family   = AF_UNSPEC;
2237	<	hints.ai_socktype = SOCK_STREAM;
2238	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2239	<
2240	<	if (getaddrinfo(yylval.string, NULL, &hints, &res))
2241	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
2242	<	else
2243	<	{
2244	<	assert(res != NULL);
2245	<
2246	<	memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
2247	<	yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
2248	<	yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
2249	<	freeaddrinfo(res);
2250	<	}
2251	<	}
2042	>	strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2043		};
2044
2045		connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2046		{
2047	<	if (conf_parser_ctx.pass == 2)
2048	<	{
2258	<	if ($3[0] == ':')
2259	<	yyerror("Server passwords cannot begin with a colon");
2260	<	else if (strchr($3, ' ') != NULL)
2261	<	yyerror("Server passwords cannot contain spaces");
2262	<	else {
2263	<	if (yy_aconf->spasswd != NULL)
2264	<	memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
2047	>	if (conf_parser_ctx.pass != 2)
2048	>	break;
2049
2050	<	MyFree(yy_aconf->spasswd);
2051	<	DupString(yy_aconf->spasswd, yylval.string);
2052	<	}
2053	<	}
2050	>	if ($3[0] == ':')
2051	>	conf_error_report("Server passwords cannot begin with a colon");
2052	>	else if (strchr($3, ' ') != NULL)
2053	>	conf_error_report("Server passwords cannot contain spaces");
2054	>	else
2055	>	strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
2056		};
2057
2058		connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2059		{
2060	<	if (conf_parser_ctx.pass == 2)
2061	<	{
2276	<	if ($3[0] == ':')
2277	<	yyerror("Server passwords cannot begin with a colon");
2278	<	else if (strchr($3, ' ') != NULL)
2279	<	yyerror("Server passwords cannot contain spaces");
2280	<	else {
2281	<	if (yy_aconf->passwd != NULL)
2282	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
2060	>	if (conf_parser_ctx.pass != 2)
2061	>	break;
2062
2063	<	MyFree(yy_aconf->passwd);
2064	<	DupString(yy_aconf->passwd, yylval.string);
2065	<	}
2066	<	}
2063	>	if ($3[0] == ':')
2064	>	conf_error_report("Server passwords cannot begin with a colon");
2065	>	else if (strchr($3, ' ') != NULL)
2066	>	conf_error_report("Server passwords cannot contain spaces");
2067	>	else
2068	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2069		};
2070
2071		connect_port: PORT '=' NUMBER ';'
2072		{
2073		if (conf_parser_ctx.pass == 2)
2074	<	yy_aconf->port = $3;
2074	>	block_state.port.value = $3;
2075		};
2076
2077		connect_aftype: AFTYPE '=' T_IPV4 ';'
2078		{
2079		if (conf_parser_ctx.pass == 2)
2080	<	yy_aconf->aftype = AF_INET;
2080	>	block_state.aftype.value = AF_INET;
2081		} | AFTYPE '=' T_IPV6 ';'
2082		{
2083		#ifdef IPV6
2084		if (conf_parser_ctx.pass == 2)
2085	<	yy_aconf->aftype = AF_INET6;
2085	>	block_state.aftype.value = AF_INET6;
2086		#endif
2087		};
2088
2089		connect_flags: IRCD_FLAGS
2090		{
2091	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2092		} '='  connect_flags_items ';';
2093
2094		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2095	<	connect_flags_item: COMPRESSED
2314	<	{
2315	<	if (conf_parser_ctx.pass == 2)
2316	<	#ifndef HAVE_LIBZ
2317	<	yyerror("Ignoring flags = compressed; -- no zlib support");
2318	<	#else
2319	<	{
2320	<	SetConfCompressed(yy_aconf);
2321	<	}
2322	<	#endif
2323	<	} | CRYPTLINK
2095	>	connect_flags_item: AUTOCONN
2096		{
2097		if (conf_parser_ctx.pass == 2)
2098	<	SetConfCryptLink(yy_aconf);
2099	<	} | AUTOCONN
2098	>	block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2099	>	} | T_SSL
2100		{
2101		if (conf_parser_ctx.pass == 2)
2102	<	SetConfAllowAutoConn(yy_aconf);
2331	<	} | BURST_AWAY
2332	<	{
2333	<	if (conf_parser_ctx.pass == 2)
2334	<	SetConfAwayBurst(yy_aconf);
2335	<	} | TOPICBURST
2336	<	{
2337	<	if (conf_parser_ctx.pass == 2)
2338	<	SetConfTopicBurst(yy_aconf);
2339	<	};
2340	<
2341	<	connect_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
2342	<	{
2343	<	#ifdef HAVE_LIBCRYPTO
2344	<	if (conf_parser_ctx.pass == 2)
2345	<	{
2346	<	BIO *file;
2347	<
2348	<	if (yy_aconf->rsa_public_key != NULL)
2349	<	{
2350	<	RSA_free(yy_aconf->rsa_public_key);
2351	<	yy_aconf->rsa_public_key = NULL;
2352	<	}
2353	<
2354	<	if (yy_aconf->rsa_public_key_file != NULL)
2355	<	{
2356	<	MyFree(yy_aconf->rsa_public_key_file);
2357	<	yy_aconf->rsa_public_key_file = NULL;
2358	<	}
2359	<
2360	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
2361	<
2362	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
2363	<	{
2364	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
2365	<	break;
2366	<	}
2367	<
2368	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
2369	<
2370	<	if (yy_aconf->rsa_public_key == NULL)
2371	<	{
2372	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
2373	<	break;
2374	<	}
2375	<
2376	<	BIO_set_close(file, BIO_CLOSE);
2377	<	BIO_free(file);
2378	<	}
2379	<	#endif /* HAVE_LIBCRYPTO */
2102	>	block_state.flags.value |= CONF_FLAGS_SSL;
2103		};
2104
2105		connect_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 2384 | Line 2107 | connect_encrypted: ENCRYPTED '=' TBOOL '
2107		if (conf_parser_ctx.pass == 2)
2108		{
2109		if (yylval.number)
2110	<	yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
2110	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
2111		else
2112	<	yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
2112	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
2113		}
2114		};
2115
2116		connect_hub_mask: HUB_MASK '=' QSTRING ';'
2117		{
2118		if (conf_parser_ctx.pass == 2)
2119	<	{
2397	<	struct CollectItem *yy_tmp;
2398	<
2399	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2400	<	DupString(yy_tmp->host, yylval.string);
2401	<	DupString(yy_tmp->user, "*");
2402	<	dlinkAdd(yy_tmp, &yy_tmp->node, &hub_conf_list);
2403	<	}
2119	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2120		};
2121
2122		connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2123		{
2124		if (conf_parser_ctx.pass == 2)
2125	<	{
2410	<	struct CollectItem *yy_tmp;
2411	<
2412	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2413	<	DupString(yy_tmp->host, yylval.string);
2414	<	DupString(yy_tmp->user, "*");
2415	<	dlinkAdd(yy_tmp, &yy_tmp->node, &leaf_conf_list);
2416	<	}
2125	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
2126		};
2127
2128		connect_class: CLASS '=' QSTRING ';'
2129		{
2130		if (conf_parser_ctx.pass == 2)
2131	<	{
2423	<	MyFree(class_name);
2424	<	DupString(class_name, yylval.string);
2425	<	}
2131	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2132		};
2133
2134	<	connect_cipher_preference: CIPHER_PREFERENCE '=' QSTRING ';'
2134	>	connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2135		{
2136		#ifdef HAVE_LIBCRYPTO
2137		if (conf_parser_ctx.pass == 2)
2138	<	{
2433	<	struct EncCapability *ecap;
2434	<	const char *cipher_name;
2435	<	int found = 0;
2436	<
2437	<	yy_aconf->cipher_preference = NULL;
2438	<	cipher_name = yylval.string;
2439	<
2440	<	for (ecap = CipherTable; ecap->name; ecap++)
2441	<	{
2442	<	if ((irccmp(ecap->name, cipher_name) == 0) &&
2443	<	(ecap->cap & CAP_ENC_MASK))
2444	<	{
2445	<	yy_aconf->cipher_preference = ecap;
2446	<	found = 1;
2447	<	break;
2448	<	}
2449	<	}
2450	<
2451	<	if (!found)
2452	<	yyerror("Invalid cipher");
2453	<	}
2138	>	strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2139		#else
2140		if (conf_parser_ctx.pass == 2)
2141	<	yyerror("Ignoring cipher_preference -- no OpenSSL support");
2141	>	conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
2142		#endif
2143		};
2144
2145	+
2146		/***************************************************************************
2147		*  section kill
2148		***************************************************************************/
2149		kill_entry: KILL
2150		{
2151		if (conf_parser_ctx.pass == 2)
2152	<	{
2467	<	userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
2468	<	regex_ban = 0;
2469	<	}
2152	>	reset_block_state();
2153		} '{' kill_items '}' ';'
2154		{
2155	<	if (conf_parser_ctx.pass == 2)
2155	>	struct MaskItem *conf = NULL;
2156	>
2157	>	if (conf_parser_ctx.pass != 2)
2158	>	break;
2159	>
2160	>	if (!block_state.user.buf[0] ||
2161	>	!block_state.host.buf[0])
2162	>	break;
2163	>
2164	>
2165	>	if (block_state.port.value == 1)
2166		{
2474	–	if (userbuf[0] && hostbuf[0])
2475	–	{
2476	–	if (regex_ban)
2477	–	{
2167		#ifdef HAVE_LIBPCRE
2168	<	void *exp_user = NULL;
2169	<	void *exp_host = NULL;
2170	<	const char *errptr = NULL;
2171	<
2172	<	if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
2173	<	!(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
2174	<	{
2175	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: %s",
2176	<	errptr);
2177	<	break;
2178	<	}
2490	<
2491	<	yy_aconf = map_to_conf(make_conf_item(RKLINE_TYPE));
2492	<	yy_aconf->regexuser = exp_user;
2493	<	yy_aconf->regexhost = exp_host;
2168	>	void *exp_user = NULL;
2169	>	void *exp_host = NULL;
2170	>	const char *errptr = NULL;
2171	>
2172	>	if (!(exp_user = ircd_pcre_compile(block_state.user.buf, &errptr)) ||
2173	>	!(exp_host = ircd_pcre_compile(block_state.host.buf, &errptr)))
2174	>	{
2175	>	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: %s",
2176	>	errptr);
2177	>	break;
2178	>	}
2179
2180	<	DupString(yy_aconf->user, userbuf);
2181	<	DupString(yy_aconf->host, hostbuf);
2180	>	conf = conf_make(CONF_RKLINE);
2181	>	conf->regexuser = exp_user;
2182	>	conf->regexhost = exp_host;
2183
2184	<	if (reasonbuf[0])
2185	<	DupString(yy_aconf->reason, reasonbuf);
2186	<	else
2187	<	DupString(yy_aconf->reason, "No reason");
2184	>	conf->user = xstrdup(block_state.user.buf);
2185	>	conf->host = xstrdup(block_state.host.buf);
2186	>
2187	>	if (block_state.rpass.buf[0])
2188	>	conf->reason = xstrdup(block_state.rpass.buf);
2189	>	else
2190	>	conf->reason = xstrdup(CONF_NOREASON);
2191		#else
2192	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: no PCRE support");
2193	<	break;
2192	>	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: no PCRE support");
2193	>	break;
2194		#endif
2195	<	}
2196	<	else
2197	<	{
2198	<	yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
2195	>	}
2196	>	else
2197	>	{
2198	>	conf = conf_make(CONF_KLINE);
2199
2200	<	DupString(yy_aconf->user, userbuf);
2201	<	DupString(yy_aconf->host, hostbuf);
2200	>	conf->user = xstrdup(block_state.user.buf);
2201	>	conf->host = xstrdup(block_state.host.buf);
2202
2203	<	if (reasonbuf[0])
2204	<	DupString(yy_aconf->reason, reasonbuf);
2205	<	else
2206	<	DupString(yy_aconf->reason, "No reason");
2207	<	add_conf_by_address(CONF_KILL, yy_aconf);
2519	<	}
2520	<	}
2521	<
2522	<	yy_aconf = NULL;
2203	>	if (block_state.rpass.buf[0])
2204	>	conf->reason = xstrdup(block_state.rpass.buf);
2205	>	else
2206	>	conf->reason = xstrdup(CONF_NOREASON);
2207	>	add_conf_by_address(CONF_KLINE, conf);
2208		}
2209		};
2210
2211		kill_type: TYPE
2212		{
2213	+	if (conf_parser_ctx.pass == 2)
2214	+	block_state.port.value = 0;
2215		} '='  kill_type_items ';';
2216
2217		kill_type_items: kill_type_items ',' kill_type_item | kill_type_item;
2218		kill_type_item: REGEX_T
2219		{
2220		if (conf_parser_ctx.pass == 2)
2221	<	regex_ban = 1;
2221	>	block_state.port.value = 1;
2222		};
2223
2224		kill_items:     kill_items kill_item | kill_item;
#	Line 2539 | Line 2226 | kill_item:      kill_user | kill_reason
2226
2227		kill_user: USER '=' QSTRING ';'
2228		{
2229	+
2230		if (conf_parser_ctx.pass == 2)
2231		{
2232		struct split_nuh_item nuh;
2233
2234		nuh.nuhmask  = yylval.string;
2235		nuh.nickptr  = NULL;
2236	<	nuh.userptr  = userbuf;
2237	<	nuh.hostptr  = hostbuf;
2236	>	nuh.userptr  = block_state.user.buf;
2237	>	nuh.hostptr  = block_state.host.buf;
2238
2239		nuh.nicksize = 0;
2240	<	nuh.usersize = sizeof(userbuf);
2241	<	nuh.hostsize = sizeof(hostbuf);
2240	>	nuh.usersize = sizeof(block_state.user.buf);
2241	>	nuh.hostsize = sizeof(block_state.host.buf);
2242
2243		split_nuh(&nuh);
2244		}
#	Line 2559 | Line 2247 | kill_user: USER '=' QSTRING ';'
2247		kill_reason: REASON '=' QSTRING ';'
2248		{
2249		if (conf_parser_ctx.pass == 2)
2250	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2250	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2251		};
2252
2253		/***************************************************************************
#	Line 2568 | Line 2256 | kill_reason: REASON '=' QSTRING ';'
2256		deny_entry: DENY
2257		{
2258		if (conf_parser_ctx.pass == 2)
2259	<	hostbuf[0] = reasonbuf[0] = '\0';
2259	>	reset_block_state();
2260		} '{' deny_items '}' ';'
2261		{
2262	<	if (conf_parser_ctx.pass == 2)
2262	>	struct MaskItem *conf = NULL;
2263	>
2264	>	if (conf_parser_ctx.pass != 2)
2265	>	break;
2266	>
2267	>	if (!block_state.addr.buf[0])
2268	>	break;
2269	>
2270	>	if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2271		{
2272	<	if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
2273	<	{
2578	<	yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
2579	<	DupString(yy_aconf->host, hostbuf);
2272	>	conf = conf_make(CONF_DLINE);
2273	>	conf->host = xstrdup(block_state.addr.buf);
2274
2275	<	if (reasonbuf[0])
2276	<	DupString(yy_aconf->reason, reasonbuf);
2277	<	else
2278	<	DupString(yy_aconf->reason, "No reason");
2279	<	add_conf_by_address(CONF_DLINE, yy_aconf);
2586	<	yy_aconf = NULL;
2587	<	}
2275	>	if (block_state.rpass.buf[0])
2276	>	conf->reason = xstrdup(block_state.rpass.buf);
2277	>	else
2278	>	conf->reason = xstrdup(CONF_NOREASON);
2279	>	add_conf_by_address(CONF_DLINE, conf);
2280		}
2281		};
2282
#	Line 2594 | Line 2286 | deny_item:      deny_ip | deny_reason |
2286		deny_ip: IP '=' QSTRING ';'
2287		{
2288		if (conf_parser_ctx.pass == 2)
2289	<	strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
2289	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2290		};
2291
2292		deny_reason: REASON '=' QSTRING ';'
2293		{
2294		if (conf_parser_ctx.pass == 2)
2295	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2295	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2296		};
2297
2298		/***************************************************************************
#	Line 2617 | Line 2309 | exempt_ip: IP '=' QSTRING ';'
2309		{
2310		if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2311		{
2312	<	yy_aconf = map_to_conf(make_conf_item(EXEMPTDLINE_TYPE));
2313	<	DupString(yy_aconf->host, yylval.string);
2312	>	struct MaskItem *conf = conf_make(CONF_EXEMPT);
2313	>	conf->host = xstrdup(yylval.string);
2314
2315	<	add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
2624	<	yy_aconf = NULL;
2315	>	add_conf_by_address(CONF_EXEMPT, conf);
2316		}
2317		}
2318		};
#	Line 2632 | Line 2323 | exempt_ip: IP '=' QSTRING ';'
2323		gecos_entry: GECOS
2324		{
2325		if (conf_parser_ctx.pass == 2)
2326	<	{
2636	<	regex_ban = 0;
2637	<	reasonbuf[0] = gecos_name[0] = '\0';
2638	<	}
2326	>	reset_block_state();
2327		} '{' gecos_items '}' ';'
2328		{
2329	<	if (conf_parser_ctx.pass == 2)
2329	>	struct MaskItem *conf = NULL;
2330	>
2331	>	if (conf_parser_ctx.pass != 2)
2332	>	break;
2333	>
2334	>	if (!block_state.name.buf[0])
2335	>	break;
2336	>
2337	>	if (block_state.port.value == 1)
2338		{
2643	–	if (gecos_name[0])
2644	–	{
2645	–	if (regex_ban)
2646	–	{
2339		#ifdef HAVE_LIBPCRE
2340	<	void *exp_p = NULL;
2341	<	const char *errptr = NULL;
2340	>	void *exp_p = NULL;
2341	>	const char *errptr = NULL;
2342
2343	<	if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
2344	<	{
2345	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: %s",
2346	<	errptr);
2347	<	break;
2348	<	}
2343	>	if (!(exp_p = ircd_pcre_compile(block_state.name.buf, &errptr)))
2344	>	{
2345	>	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: %s",
2346	>	errptr);
2347	>	break;
2348	>	}
2349
2350	<	yy_conf = make_conf_item(RXLINE_TYPE);
2351	<	yy_conf->regexpname = exp_p;
2350	>	conf = conf_make(CONF_RXLINE);
2351	>	conf->regexuser = exp_p;
2352		#else
2353	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: no PCRE support");
2354	<	break;
2353	>	conf_error_report("Failed to add regular expression based X-Line: no PCRE support");
2354	>	break;
2355		#endif
2356	<	}
2357	<	else
2358	<	yy_conf = make_conf_item(XLINE_TYPE);
2356	>	}
2357	>	else
2358	>	conf = conf_make(CONF_XLINE);
2359
2360	<	yy_match_item = map_to_conf(yy_conf);
2669	<	DupString(yy_conf->name, gecos_name);
2360	>	conf->name = xstrdup(block_state.name.buf);
2361
2362	<	if (reasonbuf[0])
2363	<	DupString(yy_match_item->reason, reasonbuf);
2364	<	else
2365	<	DupString(yy_match_item->reason, "No reason");
2675	<	}
2676	<	}
2362	>	if (block_state.rpass.buf[0])
2363	>	conf->reason = xstrdup(block_state.rpass.buf);
2364	>	else
2365	>	conf->reason = xstrdup(CONF_NOREASON);
2366		};
2367
2368		gecos_flags: TYPE
2369		{
2370	+	if (conf_parser_ctx.pass == 2)
2371	+	block_state.port.value = 0;
2372		} '='  gecos_flags_items ';';
2373
2374		gecos_flags_items: gecos_flags_items ',' gecos_flags_item | gecos_flags_item;
2375		gecos_flags_item: REGEX_T
2376		{
2377		if (conf_parser_ctx.pass == 2)
2378	<	regex_ban = 1;
2378	>	block_state.port.value = 1;
2379		};
2380
2381		gecos_items: gecos_items gecos_item | gecos_item;
#	Line 2693 | Line 2384 | gecos_item:  gecos_name | gecos_reason |
2384		gecos_name: NAME '=' QSTRING ';'
2385		{
2386		if (conf_parser_ctx.pass == 2)
2387	<	strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
2387	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2388		};
2389
2390		gecos_reason: REASON '=' QSTRING ';'
2391		{
2392		if (conf_parser_ctx.pass == 2)
2393	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2393	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2394		};
2395
2396		/***************************************************************************
#	Line 2714 | Line 2405 | general_item:       general_hide_spoof_i
2405		general_max_nick_time | general_max_nick_changes |
2406		general_max_accept | general_anti_spam_exit_message_time |
2407		general_ts_warn_delta | general_ts_max_delta |
2408	<	general_kill_chase_time_limit | general_kline_with_reason |
2409	<	general_kline_reason | general_invisible_on_connect |
2408	>	general_kill_chase_time_limit |
2409	>	general_invisible_on_connect |
2410		general_warn_no_nline | general_dots_in_ident |
2411		general_stats_o_oper_only | general_stats_k_oper_only |
2412		general_pace_wait | general_stats_i_oper_only |
2413		general_pace_wait_simple | general_stats_P_oper_only |
2414		general_short_motd | general_no_oper_flood |
2415		general_true_no_oper_flood | general_oper_pass_resv |
2725	–	general_message_locale |
2416		general_oper_only_umodes | general_max_targets |
2417		general_use_egd | general_egdpool_path |
2418		general_oper_umodes | general_caller_id_wait |
2419		general_opers_bypass_callerid | general_default_floodcount |
2420		general_min_nonwildcard | general_min_nonwildcard_simple |
2421	<	general_servlink_path | general_disable_remote_commands |
2732	<	general_default_cipher_preference |
2733	<	general_compression_level | general_client_flood |
2421	>	general_disable_remote_commands |
2422		general_throttle_time | general_havent_read_conf |
2423		general_ping_cookie |
2424		general_disable_auth |
2425	<	general_tkline_expire_notices | general_gline_min_cidr |
2426	<	general_gline_min_cidr6 | general_use_whois_actually |
2427	<	general_reject_hold_time | general_stats_e_disabled |
2425	>	general_tkline_expire_notices | general_gline_enable |
2426	>	general_gline_duration | general_gline_request_duration |
2427	>	general_gline_min_cidr |
2428	>	general_gline_min_cidr6 |
2429	>	general_stats_e_disabled |
2430		general_max_watch | general_services_name |
2431		error;
2432
#	Line 2746 | Line 2436 | general_max_watch: MAX_WATCH '=' NUMBER
2436		ConfigFileEntry.max_watch = $3;
2437		};
2438
2439	<	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2439	>	general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2440		{
2441	<	ConfigFileEntry.gline_min_cidr = $3;
2441	>	if (conf_parser_ctx.pass == 2)
2442	>	ConfigFileEntry.glines = yylval.number;
2443		};
2444
2445	<	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2445	>	general_gline_duration: GLINE_DURATION '=' timespec ';'
2446		{
2447	<	ConfigFileEntry.gline_min_cidr6 = $3;
2447	>	if (conf_parser_ctx.pass == 2)
2448	>	ConfigFileEntry.gline_time = $3;
2449		};
2450
2451	<	general_use_whois_actually: USE_WHOIS_ACTUALLY '=' TBOOL ';'
2451	>	general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2452		{
2453	<	ConfigFileEntry.use_whois_actually = yylval.number;
2453	>	if (conf_parser_ctx.pass == 2)
2454	>	ConfigFileEntry.gline_request_time = $3;
2455		};
2456
2457	<	general_reject_hold_time: TREJECT_HOLD_TIME '=' timespec ';'
2457	>	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2458		{
2459	<	GlobalSetOptions.rejecttime = yylval.number;
2459	>	ConfigFileEntry.gline_min_cidr = $3;
2460	>	};
2461	>
2462	>	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2463	>	{
2464	>	ConfigFileEntry.gline_min_cidr6 = $3;
2465		};
2466
2467		general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
#	Line 2843 | Line 2541 | general_havent_read_conf: HAVENT_READ_CO
2541		}
2542		};
2543
2846	–	general_kline_with_reason: KLINE_WITH_REASON '=' TBOOL ';'
2847	–	{
2848	–	ConfigFileEntry.kline_with_reason = yylval.number;
2849	–	};
2850	–
2851	–	general_kline_reason: KLINE_REASON '=' QSTRING ';'
2852	–	{
2853	–	if (conf_parser_ctx.pass == 2)
2854	–	{
2855	–	MyFree(ConfigFileEntry.kline_reason);
2856	–	DupString(ConfigFileEntry.kline_reason, yylval.string);
2857	–	}
2858	–	};
2859	–
2544		general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2545		{
2546		ConfigFileEntry.invisible_on_connect = yylval.number;
#	Line 2938 | Line 2622 | general_oper_pass_resv: OPER_PASS_RESV '
2622		ConfigFileEntry.oper_pass_resv = yylval.number;
2623		};
2624
2941	–	general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
2942	–	{
2943	–	if (conf_parser_ctx.pass == 2)
2944	–	{
2945	–	if (strlen(yylval.string) > LOCALE_LENGTH-2)
2946	–	yylval.string[LOCALE_LENGTH-1] = '\0';
2947	–
2948	–	set_locale(yylval.string);
2949	–	}
2950	–	};
2951	–
2625		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2626		{
2627		ConfigFileEntry.dots_in_ident = $3;
#	Line 2959 | Line 2632 | general_max_targets: MAX_TARGETS '=' NUM
2632		ConfigFileEntry.max_targets = $3;
2633		};
2634
2962	–	general_servlink_path: SERVLINK_PATH '=' QSTRING ';'
2963	–	{
2964	–	if (conf_parser_ctx.pass == 2)
2965	–	{
2966	–	MyFree(ConfigFileEntry.servlink_path);
2967	–	DupString(ConfigFileEntry.servlink_path, yylval.string);
2968	–	}
2969	–	};
2970	–
2971	–	general_default_cipher_preference: DEFAULT_CIPHER_PREFERENCE '=' QSTRING ';'
2972	–	{
2973	–	#ifdef HAVE_LIBCRYPTO
2974	–	if (conf_parser_ctx.pass == 2)
2975	–	{
2976	–	struct EncCapability *ecap;
2977	–	const char *cipher_name;
2978	–	int found = 0;
2979	–
2980	–	ConfigFileEntry.default_cipher_preference = NULL;
2981	–	cipher_name = yylval.string;
2982	–
2983	–	for (ecap = CipherTable; ecap->name; ecap++)
2984	–	{
2985	–	if ((irccmp(ecap->name, cipher_name) == 0) &&
2986	–	(ecap->cap & CAP_ENC_MASK))
2987	–	{
2988	–	ConfigFileEntry.default_cipher_preference = ecap;
2989	–	found = 1;
2990	–	break;
2991	–	}
2992	–	}
2993	–
2994	–	if (!found)
2995	–	yyerror("Invalid cipher");
2996	–	}
2997	–	#else
2998	–	if (conf_parser_ctx.pass == 2)
2999	–	yyerror("Ignoring default_cipher_preference -- no OpenSSL support");
3000	–	#endif
3001	–	};
3002	–
3003	–	general_compression_level: COMPRESSION_LEVEL '=' NUMBER ';'
3004	–	{
3005	–	if (conf_parser_ctx.pass == 2)
3006	–	{
3007	–	ConfigFileEntry.compression_level = $3;
3008	–	#ifndef HAVE_LIBZ
3009	–	yyerror("Ignoring compression_level -- no zlib support");
3010	–	#else
3011	–	if ((ConfigFileEntry.compression_level < 1) ||
3012	–	(ConfigFileEntry.compression_level > 9))
3013	–	{
3014	–	yyerror("Ignoring invalid compression_level, using default");
3015	–	ConfigFileEntry.compression_level = 0;
3016	–	}
3017	–	#endif
3018	–	}
3019	–	};
3020	–
2635		general_use_egd: USE_EGD '=' TBOOL ';'
2636		{
2637		ConfigFileEntry.use_egd = yylval.number;
#	Line 3028 | Line 2642 | general_egdpool_path: EGDPOOL_PATH '=' Q
2642		if (conf_parser_ctx.pass == 2)
2643		{
2644		MyFree(ConfigFileEntry.egdpool_path);
2645	<	DupString(ConfigFileEntry.egdpool_path, yylval.string);
2645	>	ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
2646		}
2647		};
2648
#	Line 3037 | Line 2651 | general_services_name: T_SERVICES_NAME '
2651		if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2652		{
2653		MyFree(ConfigFileEntry.service_name);
2654	<	DupString(ConfigFileEntry.service_name, yylval.string);
2654	>	ConfigFileEntry.service_name = xstrdup(yylval.string);
2655		}
2656		};
2657
#	Line 3080 | Line 2694 | umode_oitem:     T_BOTS
2694		} | T_FULL
2695		{
2696		ConfigFileEntry.oper_umodes |= UMODE_FULL;
2697	+	} | HIDDEN
2698	+	{
2699	+	ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
2700		} | T_SKILL
2701		{
2702		ConfigFileEntry.oper_umodes |= UMODE_SKILL;
#	Line 3148 | Line 2765 | umode_item:    T_BOTS
2765		} | T_SKILL
2766		{
2767		ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
2768	+	} | HIDDEN
2769	+	{
2770	+	ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
2771		} | T_NCHANGE
2772		{
2773		ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
#	Line 3184 | Line 2804 | umode_item:    T_BOTS
2804		} | T_LOCOPS
2805		{
2806		ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
2807	+	} | T_NONONREG
2808	+	{
2809	+	ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
2810		};
2811
2812		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
#	Line 3201 | Line 2824 | general_default_floodcount: DEFAULT_FLOO
2824		ConfigFileEntry.default_floodcount = $3;
2825		};
2826
3204	–	general_client_flood: T_CLIENT_FLOOD '=' sizespec ';'
3205	–	{
3206	–	ConfigFileEntry.client_flood = $3;
3207	–	};
3208	–
3209	–
3210	–	/***************************************************************************
3211	–	*  section glines
3212	–	***************************************************************************/
3213	–	gline_entry: GLINES
3214	–	{
3215	–	if (conf_parser_ctx.pass == 2)
3216	–	{
3217	–	yy_conf = make_conf_item(GDENY_TYPE);
3218	–	yy_aconf = map_to_conf(yy_conf);
3219	–	}
3220	–	} '{' gline_items '}' ';'
3221	–	{
3222	–	if (conf_parser_ctx.pass == 2)
3223	–	{
3224	–	/*
3225	–	* since we re-allocate yy_conf/yy_aconf after the end of action=, at the
3226	–	* end we will have one extra, so we should free it.
3227	–	*/
3228	–	if (yy_conf->name == NULL || yy_aconf->user == NULL)
3229	–	{
3230	–	delete_conf_item(yy_conf);
3231	–	yy_conf = NULL;
3232	–	yy_aconf = NULL;
3233	–	}
3234	–	}
3235	–	};
3236	–
3237	–	gline_items:        gline_items gline_item | gline_item;
3238	–	gline_item:         gline_enable |
3239	–	gline_duration |
3240	–	gline_logging |
3241	–	gline_user |
3242	–	gline_server |
3243	–	gline_action |
3244	–	error;
3245	–
3246	–	gline_enable: ENABLE '=' TBOOL ';'
3247	–	{
3248	–	if (conf_parser_ctx.pass == 2)
3249	–	ConfigFileEntry.glines = yylval.number;
3250	–	};
3251	–
3252	–	gline_duration: DURATION '=' timespec ';'
3253	–	{
3254	–	if (conf_parser_ctx.pass == 2)
3255	–	ConfigFileEntry.gline_time = $3;
3256	–	};
3257	–
3258	–	gline_logging: T_LOG
3259	–	{
3260	–	if (conf_parser_ctx.pass == 2)
3261	–	ConfigFileEntry.gline_logging = 0;
3262	–	} '=' gline_logging_types ';';
3263	–	gline_logging_types:     gline_logging_types ',' gline_logging_type_item | gline_logging_type_item;
3264	–	gline_logging_type_item: T_REJECT
3265	–	{
3266	–	if (conf_parser_ctx.pass == 2)
3267	–	ConfigFileEntry.gline_logging |= GDENY_REJECT;
3268	–	} | T_BLOCK
3269	–	{
3270	–	if (conf_parser_ctx.pass == 2)
3271	–	ConfigFileEntry.gline_logging |= GDENY_BLOCK;
3272	–	};
3273	–
3274	–	gline_user: USER '=' QSTRING ';'
3275	–	{
3276	–	if (conf_parser_ctx.pass == 2)
3277	–	{
3278	–	struct split_nuh_item nuh;
3279	–
3280	–	nuh.nuhmask  = yylval.string;
3281	–	nuh.nickptr  = NULL;
3282	–	nuh.userptr  = userbuf;
3283	–	nuh.hostptr  = hostbuf;
3284	–
3285	–	nuh.nicksize = 0;
3286	–	nuh.usersize = sizeof(userbuf);
3287	–	nuh.hostsize = sizeof(hostbuf);
3288	–
3289	–	split_nuh(&nuh);
3290	–
3291	–	if (yy_aconf->user == NULL)
3292	–	{
3293	–	DupString(yy_aconf->user, userbuf);
3294	–	DupString(yy_aconf->host, hostbuf);
3295	–	}
3296	–	else
3297	–	{
3298	–	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
3299	–
3300	–	DupString(yy_tmp->user, userbuf);
3301	–	DupString(yy_tmp->host, hostbuf);
3302	–
3303	–	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
3304	–	}
3305	–	}
3306	–	};
3307	–
3308	–	gline_server: NAME '=' QSTRING ';'
3309	–	{
3310	–	if (conf_parser_ctx.pass == 2)
3311	–	{
3312	–	MyFree(yy_conf->name);
3313	–	DupString(yy_conf->name, yylval.string);
3314	–	}
3315	–	};
3316	–
3317	–	gline_action: ACTION
3318	–	{
3319	–	if (conf_parser_ctx.pass == 2)
3320	–	yy_aconf->flags = 0;
3321	–	} '=' gdeny_types ';'
3322	–	{
3323	–	if (conf_parser_ctx.pass == 2)
3324	–	{
3325	–	struct CollectItem *yy_tmp = NULL;
3326	–	dlink_node *ptr, *next_ptr;
3327	–
3328	–	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3329	–	{
3330	–	struct AccessItem *new_aconf;
3331	–	struct ConfItem *new_conf;
3332	–
3333	–	yy_tmp = ptr->data;
3334	–	new_conf = make_conf_item(GDENY_TYPE);
3335	–	new_aconf = map_to_conf(new_conf);
3336	–
3337	–	new_aconf->flags = yy_aconf->flags;
3338	–
3339	–	if (yy_conf->name != NULL)
3340	–	DupString(new_conf->name, yy_conf->name);
3341	–	else
3342	–	DupString(new_conf->name, "*");
3343	–	if (yy_aconf->user != NULL)
3344	–	DupString(new_aconf->user, yy_tmp->user);
3345	–	else
3346	–	DupString(new_aconf->user, "*");
3347	–	if (yy_aconf->host != NULL)
3348	–	DupString(new_aconf->host, yy_tmp->host);
3349	–	else
3350	–	DupString(new_aconf->host, "*");
3351	–
3352	–	dlinkDelete(&yy_tmp->node, &col_conf_list);
3353	–	}
3354	–
3355	–	/*
3356	–	* In case someone has fed us with more than one action= after user/name
3357	–	* which would leak memory  -Michael
3358	–	*/
3359	–	if (yy_conf->name == NULL || yy_aconf->user == NULL)
3360	–	delete_conf_item(yy_conf);
3361	–
3362	–	yy_conf = make_conf_item(GDENY_TYPE);
3363	–	yy_aconf = map_to_conf(yy_conf);
3364	–	}
3365	–	};
3366	–
3367	–	gdeny_types: gdeny_types ',' gdeny_type_item | gdeny_type_item;
3368	–	gdeny_type_item: T_REJECT
3369	–	{
3370	–	if (conf_parser_ctx.pass == 2)
3371	–	yy_aconf->flags |= GDENY_REJECT;
3372	–	} | T_BLOCK
3373	–	{
3374	–	if (conf_parser_ctx.pass == 2)
3375	–	yy_aconf->flags |= GDENY_BLOCK;
3376	–	};
2827
2828		/***************************************************************************
2829		*  section channel
#	Line 3382 | Line 2832 | channel_entry: CHANNEL
2832		'{' channel_items '}' ';';
2833
2834		channel_items:      channel_items channel_item | channel_item;
2835	<	channel_item:       channel_disable_local_channels | channel_use_except |
2836	<	channel_use_invex | channel_use_knock |
2837	<	channel_max_bans | channel_knock_delay |
3388	<	channel_knock_delay_channel | channel_max_chans_per_user |
2835	>	channel_item:       channel_max_bans |
2836	>	channel_knock_delay | channel_knock_delay_channel |
2837	>	channel_max_chans_per_user | channel_max_chans_per_oper |
2838		channel_quiet_on_ban | channel_default_split_user_count |
2839		channel_default_split_server_count |
2840	<	channel_no_create_on_split | channel_restrict_channels |
2841	<	channel_no_join_on_split | channel_burst_topicwho |
2840	>	channel_no_create_on_split |
2841	>	channel_no_join_on_split |
2842		channel_jflood_count | channel_jflood_time |
2843		channel_disable_fake_channels | error;
2844
#	Line 3398 | Line 2847 | channel_disable_fake_channels: DISABLE_F
2847		ConfigChannel.disable_fake_channels = yylval.number;
2848		};
2849
3401	–	channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
3402	–	{
3403	–	ConfigChannel.restrict_channels = yylval.number;
3404	–	};
3405	–
3406	–	channel_disable_local_channels: DISABLE_LOCAL_CHANNELS '=' TBOOL ';'
3407	–	{
3408	–	ConfigChannel.disable_local_channels = yylval.number;
3409	–	};
3410	–
3411	–	channel_use_except: USE_EXCEPT '=' TBOOL ';'
3412	–	{
3413	–	ConfigChannel.use_except = yylval.number;
3414	–	};
3415	–
3416	–	channel_use_invex: USE_INVEX '=' TBOOL ';'
3417	–	{
3418	–	ConfigChannel.use_invex = yylval.number;
3419	–	};
3420	–
3421	–	channel_use_knock: USE_KNOCK '=' TBOOL ';'
3422	–	{
3423	–	ConfigChannel.use_knock = yylval.number;
3424	–	};
3425	–
2850		channel_knock_delay: KNOCK_DELAY '=' timespec ';'
2851		{
2852		ConfigChannel.knock_delay = $3;
#	Line 3438 | Line 2862 | channel_max_chans_per_user: MAX_CHANS_PE
2862		ConfigChannel.max_chans_per_user = $3;
2863		};
2864
2865	+	channel_max_chans_per_oper: MAX_CHANS_PER_OPER '=' NUMBER ';'
2866	+	{
2867	+	ConfigChannel.max_chans_per_oper = $3;
2868	+	};
2869	+
2870		channel_quiet_on_ban: QUIET_ON_BAN '=' TBOOL ';'
2871		{
2872		ConfigChannel.quiet_on_ban = yylval.number;
#	Line 3468 | Line 2897 | channel_no_join_on_split: NO_JOIN_ON_SPL
2897		ConfigChannel.no_join_on_split = yylval.number;
2898		};
2899
3471	–	channel_burst_topicwho: BURST_TOPICWHO '=' TBOOL ';'
3472	–	{
3473	–	ConfigChannel.burst_topicwho = yylval.number;
3474	–	};
3475	–
2900		channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
2901		{
2902		GlobalSetOptions.joinfloodcount = yylval.number;
#	Line 3491 | Line 2915 | serverhide_entry: SERVERHIDE
2915
2916		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
2917		serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
2918	+	serverhide_hide_services |
2919		serverhide_links_delay |
3495	–	serverhide_disable_hidden |
2920		serverhide_hidden | serverhide_hidden_name |
2921		serverhide_hide_server_ips |
2922		error;
#	Line 3509 | Line 2933 | serverhide_hide_servers: HIDE_SERVERS '=
2933		ConfigServerHide.hide_servers = yylval.number;
2934		};
2935
2936	+	serverhide_hide_services: HIDE_SERVICES '=' TBOOL ';'
2937	+	{
2938	+	if (conf_parser_ctx.pass == 2)
2939	+	ConfigServerHide.hide_services = yylval.number;
2940	+	};
2941	+
2942		serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2943		{
2944		if (conf_parser_ctx.pass == 2)
2945		{
2946		MyFree(ConfigServerHide.hidden_name);
2947	<	DupString(ConfigServerHide.hidden_name, yylval.string);
2947	>	ConfigServerHide.hidden_name = xstrdup(yylval.string);
2948		}
2949		};
2950
#	Line 3538 | Line 2968 | serverhide_hidden: HIDDEN '=' TBOOL ';'
2968		ConfigServerHide.hidden = yylval.number;
2969		};
2970
3541	–	serverhide_disable_hidden: DISABLE_HIDDEN '=' TBOOL ';'
3542	–	{
3543	–	if (conf_parser_ctx.pass == 2)
3544	–	ConfigServerHide.disable_hidden = yylval.number;
3545	–	};
3546	–
2971		serverhide_hide_server_ips: HIDE_SERVER_IPS '=' TBOOL ';'
2972		{
2973		if (conf_parser_ctx.pass == 2)

Diff Legend

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