ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/ircd_parser.y (file contents), Revision 1024 by michael, Sun Nov 1 23:14:25 2009 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 2038 by michael, Tue May 14 19:21:32 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 "irc_getaddrinfo.h"
41	–	#include "sprintf_irc.h"
41		#include "memory.h"
42		#include "modules.h"
43		#include "s_serv.h"
#	Line 53 | 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;
59	<	static struct ConfItem *yy_conf = NULL;
60	<	static struct AccessItem *yy_aconf = NULL;
61	<	static struct MatchItem *yy_match_item = NULL;
62	<	static struct ClassItem *yy_class = NULL;
63	<	static char *yy_class_name = NULL;
64	<
65	<	static dlink_list col_conf_list  = { NULL, NULL, 0 };
66	<	static dlink_list hub_conf_list  = { NULL, NULL, 0 };
67	<	static dlink_list leaf_conf_list = { NULL, NULL, 0 };
68	<	static unsigned int listener_flags = 0;
69	<	static unsigned int regex_ban = 0;
70	<	static char userbuf[IRCD_BUFSIZE];
71	<	static char hostbuf[IRCD_BUFSIZE];
72	<	static char reasonbuf[REASONLEN + 1];
73	<	static char gecos_name[REALLEN * 4];
74	<
75	<	static char *resv_reason = NULL;
76	<	static char *listener_address = NULL;
77	<	static int not_atom = 0;
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, next_ptr, hub_conf_list.head)
112	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.mask.list.head)
113		{
114	<	yy_hconf = ptr->data;
115	<	dlinkDelete(&yy_hconf->node, &hub_conf_list);
116	<	free_collect_item(yy_hconf);
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, leaf_conf_list.head)
119	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
120		{
121	<	yy_lconf = ptr->data;
122	<	dlinkDelete(&yy_lconf->node, &leaf_conf_list);
123	<	free_collect_item(yy_lconf);
121	>	MyFree(ptr->data);
122	>	dlinkDelete(ptr, &block_state.leaf.list);
123	>	free_dlink_node(ptr);
124		}
125	+
126	+	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.hub.list.head)
127	+	{
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
151	–	%token  CAN_IDLE
152		%token  CHANNEL
153		%token  CIDR_BITLEN_IPV4
154		%token  CIDR_BITLEN_IPV6
155	–	%token  CIPHER_PREFERENCE
155		%token  CLASS
157	–	%token  COMPRESSED
158	–	%token  COMPRESSION_LEVEL
156		%token  CONNECT
157		%token  CONNECTFREQ
161	–	%token  CRYPTLINK
162	–	%token  DEFAULT_CIPHER_PREFERENCE
158		%token  DEFAULT_FLOODCOUNT
159		%token  DEFAULT_SPLIT_SERVER_COUNT
160		%token  DEFAULT_SPLIT_USER_COUNT
#	Line 168 | Line 163 | unhook_hub_leaf_confs(void)
163		%token  DIE
164		%token  DISABLE_AUTH
165		%token  DISABLE_FAKE_CHANNELS
171	–	%token  DISABLE_HIDDEN
172	–	%token  DISABLE_LOCAL_CHANNELS
166		%token  DISABLE_REMOTE_COMMANDS
174	–	%token  DOT_IN_IP6_ADDR
167		%token  DOTS_IN_IDENT
176	–	%token  DURATION
168		%token  EGDPOOL_PATH
169		%token  EMAIL
179	–	%token  ENABLE
170		%token  ENCRYPTED
171		%token  EXCEED_LIMIT
172		%token  EXEMPT
173		%token  FAILED_OPER_NOTICE
184	–	%token  FAKENAME
174		%token  IRCD_FLAGS
175		%token  FLATTEN_LINKS
187	–	%token  FFAILED_OPERLOG
188	–	%token  FKILLLOG
189	–	%token  FKLINELOG
190	–	%token  FGLINELOG
191	–	%token  FIOERRLOG
192	–	%token  FOPERLOG
193	–	%token  FOPERSPYLOG
194	–	%token  FUSERLOG
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_LOG
201	<	%token  GLINE_TIME
182	>	%token  GLINE_REQUEST_DURATION
183		%token  GLINE_MIN_CIDR
184		%token  GLINE_MIN_CIDR6
185		%token  GLOBAL_KILL
#	Line 206 | Line 187 | unhook_hub_leaf_confs(void)
187		%token  NEED_IDENT
188		%token  HAVENT_READ_CONF
189		%token  HIDDEN
209	–	%token  HIDDEN_ADMIN
190		%token  HIDDEN_NAME
211	–	%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
197		%token  HUB_MASK
218	–	%token  IDLETIME
198		%token  IGNORE_BOGUS_TS
199		%token  INVISIBLE_ON_CONNECT
200		%token  IP
#	Line 223 | Line 202 | unhook_hub_leaf_confs(void)
202		%token  KILL_CHASE_TIME_LIMIT
203		%token  KLINE
204		%token  KLINE_EXEMPT
226	–	%token  KLINE_REASON
227	–	%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  LOGGING
235	<	%token  LOG_LEVEL
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
247	–	%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 254 | Line 236 | unhook_hub_leaf_confs(void)
236		%token  NETWORK_DESC
237		%token  NETWORK_NAME
238		%token  NICK
257	–	%token  NICK_CHANGES
239		%token  NO_CREATE_ON_SPLIT
240		%token  NO_JOIN_ON_SPLIT
241		%token  NO_OPER_FLOOD
242		%token  NO_TILDE
262	–	%token  NOT
243		%token  NUMBER
264	–	%token  NUMBER_PER_IDENT
244		%token  NUMBER_PER_CIDR
245		%token  NUMBER_PER_IP
267	–	%token  NUMBER_PER_IP_GLOBAL
246		%token  OPERATOR
247		%token  OPERS_BYPASS_CALLERID
270	–	%token  OPER_LOG
248		%token  OPER_ONLY_UMODES
249		%token  OPER_PASS_RESV
273	–	%token  OPER_SPY_T
250		%token  OPER_UMODES
251		%token  JOIN_FLOOD_COUNT
252		%token  JOIN_FLOOD_TIME
#	Line 280 | Line 256 | unhook_hub_leaf_confs(void)
256		%token  PATH
257		%token  PING_COOKIE
258		%token  PING_TIME
283	–	%token  PING_WARNING
259		%token  PORT
260		%token  QSTRING
286	–	%token  QUIET_ON_BAN
261		%token  REASON
262		%token  REDIRPORT
263		%token  REDIRSERV
290	–	%token  REGEX_T
264		%token  REHASH
292	–	%token  TREJECT_HOLD_TIME
265		%token  REMOTE
266		%token  REMOTEBAN
295	–	%token  RESTRICT_CHANNELS
296	–	%token  RESTRICTED
267		%token  RSA_PRIVATE_KEY_FILE
268		%token  RSA_PUBLIC_KEY_FILE
269		%token  SSL_CERTIFICATE_FILE
270	<	%token  T_SSL_CONNECTION_METHOD
270	>	%token  SSL_DH_PARAM_FILE
271	>	%token  T_SSL_CLIENT_METHOD
272	>	%token  T_SSL_SERVER_METHOD
273		%token  T_SSLV3
274		%token  T_TLSV1
275		%token  RESV
276		%token  RESV_EXEMPT
277	<	%token  SECONDS MINUTES HOURS DAYS WEEKS
277	>	%token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
278		%token  SENDQ
279		%token  SEND_PASSWORD
280		%token  SERVERHIDE
281		%token  SERVERINFO
282	<	%token  SERVLINK_PATH
282	>	%token  SQUIT
283		%token  IRCD_SID
284		%token  TKLINE_EXPIRE_NOTICES
285		%token  T_SHARED
286		%token  T_CLUSTER
287		%token  TYPE
288		%token  SHORT_MOTD
317	–	%token  SILENT
289		%token  SPOOF
290		%token  SPOOF_NOTICE
291		%token  STATS_E_DISABLED
#	Line 324 | Line 295 | unhook_hub_leaf_confs(void)
295		%token  STATS_P_OPER_ONLY
296		%token  TBOOL
297		%token  TMASKED
327	–	%token  T_REJECT
298		%token  TS_MAX_DELTA
299		%token  TS_WARN_DELTA
300		%token  TWODOTS
#	Line 334 | Line 304 | unhook_hub_leaf_confs(void)
304		%token  T_CALLERID
305		%token  T_CCONN
306		%token  T_CCONN_FULL
307	<	%token  T_CLIENT_FLOOD
307	>	%token  T_SSL_CIPHER_LIST
308		%token  T_DEAF
309		%token  T_DEBUG
310	<	%token  T_DRONE
310	>	%token  T_DLINE
311		%token  T_EXTERNAL
312	+	%token  T_FARCONNECT
313		%token  T_FULL
314		%token  T_INVISIBLE
315		%token  T_IPV4
316		%token  T_IPV6
317		%token  T_LOCOPS
347	–	%token  T_LOGPATH
348	–	%token  T_L_CRIT
349	–	%token  T_L_DEBUG
350	–	%token  T_L_ERROR
351	–	%token  T_L_INFO
352	–	%token  T_L_NOTICE
353	–	%token  T_L_TRACE
354	–	%token  T_L_WARN
318		%token  T_MAX_CLIENTS
319		%token  T_NCHANGE
320	+	%token  T_NONONREG
321		%token  T_OPERWALL
322	+	%token  T_RECVQ
323		%token  T_REJ
324		%token  T_SERVER
325		%token  T_SERVNOTICE
326	+	%token  T_SET
327		%token  T_SKILL
328		%token  T_SPY
329		%token  T_SSL
330		%token  T_UMODES
331		%token  T_UNAUTH
332	+	%token  T_UNDLINE
333	+	%token  T_UNLIMITED
334		%token  T_UNRESV
335		%token  T_UNXLINE
336	+	%token  T_GLOBOPS
337		%token  T_WALLOP
338	+	%token  T_WALLOPS
339	+	%token  T_WEBIRC
340	+	%token  T_RESTART
341	+	%token  T_SERVICE
342	+	%token  T_SERVICES_NAME
343		%token  THROTTLE_TIME
370	–	%token  TOPICBURST
344		%token  TRUE_NO_OPER_FLOOD
372	–	%token  TKLINE
373	–	%token  TXLINE
374	–	%token  TRESV
345		%token  UNKLINE
346		%token  USER
347		%token  USE_EGD
378	–	%token  USE_EXCEPT
379	–	%token  USE_INVEX
380	–	%token  USE_KNOCK
348		%token  USE_LOGGING
382	–	%token  USE_WHOIS_ACTUALLY
349		%token  VHOST
350		%token  VHOST6
351		%token  XLINE
386	–	%token  WARN
352		%token  WARN_NO_NLINE
353	+	%token  T_SIZE
354	+	%token  T_FILE
355
356		%type <string> QSTRING
357		%type <number> NUMBER
#	Line 408 | Line 375 | conf_item:        admin_entry
375		| serverinfo_entry
376		| serverhide_entry
377		| resv_entry
378	+	| service_entry
379		| shared_entry
380		| cluster_entry
381		| connect_entry
#	Line 415 | Line 383 | conf_item:        admin_entry
383		| deny_entry
384		| exempt_entry
385		| general_entry
418	–	| gline_entry
386		| gecos_entry
387		| modules_entry
388		| error ';'
#	Line 448 | 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 469 | Line 444 | modules_item:   modules_module | modules
444
445		modules_module: MODULE '=' QSTRING ';'
446		{
472	–	#ifndef STATIC_MODULES /* NOOP in the static case */
447		if (conf_parser_ctx.pass == 2)
448		add_conf_module(libio_basename(yylval.string));
475	–	#endif
449		};
450
451		modules_path: PATH '=' QSTRING ';'
452		{
480	–	#ifndef STATIC_MODULES
453		if (conf_parser_ctx.pass == 2)
454		mod_add_path(yylval.string);
483	–	#endif
455		};
456
457
#	Line 490 | 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	<	{
511	<	if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_SSLV3))
512	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
513	<	if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_TLSV1))
514	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
515	<	}
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 538 | 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 584 | 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,
596	<	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 609 | 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 619 | 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)
646	>	if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
647		{
648	<	if (ServerInfo.name == NULL)
648	>	if (valid_servname(yylval.string))
649	>	ServerInfo.name = xstrdup(yylval.string);
650	>	else
651		{
652	<	/* the ircd will exit() in main() if we dont set one */
653	<	if (strlen(yylval.string) <= HOSTLEN)
637	<	DupString(ServerInfo.name, yylval.string);
652	>	conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
653	>	exit(0);
654		}
655		}
656		};
#	Line 645 | 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(L_ERROR, "Ignoring config file entry SID -- invalid SID. Aborting.");
667	>	conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
668		exit(0);
669		}
670		}
#	Line 659 | 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 673 | 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 682 | 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 698 | Line 714 | serverinfo_vhost: VHOST '=' QSTRING ';'
714		hints.ai_socktype = SOCK_STREAM;
715		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
716
717	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
718	<	ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
717	>	if (getaddrinfo(yylval.string, NULL, &hints, &res))
718	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
719		else
720		{
721		assert(res != NULL);
#	Line 707 | Line 723 | serverinfo_vhost: VHOST '=' QSTRING ';'
723		memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
724		ServerInfo.ip.ss.ss_family = res->ai_family;
725		ServerInfo.ip.ss_len = res->ai_addrlen;
726	<	irc_freeaddrinfo(res);
726	>	freeaddrinfo(res);
727
728		ServerInfo.specific_ipv4_vhost = 1;
729		}
#	Line 727 | Line 743 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
743		hints.ai_socktype = SOCK_STREAM;
744		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
745
746	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
747	<	ilog(L_ERROR, "Invalid netmask for server vhost6(%s)", yylval.string);
746	>	if (getaddrinfo(yylval.string, NULL, &hints, &res))
747	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
748		else
749		{
750		assert(res != NULL);
#	Line 736 | Line 752 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
752		memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
753		ServerInfo.ip6.ss.ss_family = res->ai_family;
754		ServerInfo.ip6.ss_len = res->ai_addrlen;
755	<	irc_freeaddrinfo(res);
755	>	freeaddrinfo(res);
756
757		ServerInfo.specific_ipv6_vhost = 1;
758		}
#	Line 746 | 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];
756	<	ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
757	<	yyerror(buf);
758	<	}
759	<	else if ($3 > MAXCLIENTS_MAX)
760	<	{
761	<	char buf[IRCD_BUFSIZE];
762	<	ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
763	<	yyerror(buf);
764	<	}
765	<	else
766	<	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_hub: HUB '=' TBOOL ';'
788	>	serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
789		{
790	<	if (conf_parser_ctx.pass == 2)
790	>	if (conf_parser_ctx.pass != 2)
791	>	break;
792	>
793	>	if ($3 < 9)
794		{
795	<	if (yylval.number)
796	<	{
797	<	ServerInfo.hub = 1;
798	<	delete_capability("HUB");
799	<	add_capability("HUB", CAP_HUB, 1);
800	<	}
780	<	else if (ServerInfo.hub)
781	<	{
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	<	ServerInfo.hub = 0;
803	<	delete_capability("HUB");
804	<	}
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 ';'
833	+	{
834	+	if (conf_parser_ctx.pass == 2)
835	+	ServerInfo.hub = yylval.number;
836		};
837
838		/***************************************************************************
#	Line 800 | 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 809 | 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 818 | 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
874		/***************************************************************************
875		*  section logging
876		***************************************************************************/
877	<	/* XXX */
878	<	logging_entry:          LOGGING  '{' logging_items '}' ';' ;
877	>	logging_entry:          T_LOG  '{' logging_items '}' ';' ;
878	>	logging_items:          logging_items logging_item | logging_item ;
879
880	<	logging_items:          logging_items logging_item |
832	<	logging_item ;
833	<
834	<	logging_item:           logging_path | logging_oper_log |
835	<	logging_log_level |
836	<	logging_use_logging | logging_fuserlog |
837	<	logging_foperlog | logging_fglinelog |
838	<	logging_fklinelog | logging_killlog |
839	<	logging_foperspylog | logging_ioerrlog |
840	<	logging_ffailed_operlog |
880	>	logging_item:           logging_use_logging | logging_file_entry |
881		error ';' ;
882
883	<	logging_path:           T_LOGPATH '=' QSTRING ';'
844	<	{
845	<	};
846	<
847	<	logging_oper_log:       OPER_LOG '=' QSTRING ';'
848	<	{
849	<	};
850	<
851	<	logging_fuserlog: FUSERLOG '=' QSTRING ';'
883	>	logging_use_logging: USE_LOGGING '=' TBOOL ';'
884		{
885		if (conf_parser_ctx.pass == 2)
886	<	strlcpy(ConfigLoggingEntry.userlog, yylval.string,
855	<	sizeof(ConfigLoggingEntry.userlog));
886	>	ConfigLoggingEntry.use_logging = yylval.number;
887		};
888
889	<	logging_ffailed_operlog: FFAILED_OPERLOG '=' QSTRING ';'
889	>	logging_file_entry:
890		{
891		if (conf_parser_ctx.pass == 2)
892	<	strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
893	<	sizeof(ConfigLoggingEntry.failed_operlog));
863	<	};
864	<
865	<	logging_foperlog: FOPERLOG '=' QSTRING ';'
892	>	reset_block_state();
893	>	} T_FILE  '{' logging_file_items '}' ';'
894		{
895	<	if (conf_parser_ctx.pass == 2)
896	<	strlcpy(ConfigLoggingEntry.operlog, yylval.string,
869	<	sizeof(ConfigLoggingEntry.operlog));
870	<	};
895	>	if (conf_parser_ctx.pass != 2)
896	>	break;
897
898	<	logging_foperspylog: FOPERSPYLOG '=' QSTRING ';'
899	<	{
900	<	if (conf_parser_ctx.pass == 2)
875	<	strlcpy(ConfigLoggingEntry.operspylog, yylval.string,
876	<	sizeof(ConfigLoggingEntry.operspylog));
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_fglinelog: FGLINELOG '=' QSTRING ';'
904	<	{
881	<	if (conf_parser_ctx.pass == 2)
882	<	strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
883	<	sizeof(ConfigLoggingEntry.glinelog));
884	<	};
903	>	logging_file_items: logging_file_items logging_file_item |
904	>	logging_file_item ;
905
906	<	logging_fklinelog: FKLINELOG '=' QSTRING ';'
906	>	logging_file_item:  logging_file_name | logging_file_type |
907	>	logging_file_size | error ';' ;
908	>
909	>	logging_file_name: NAME '=' QSTRING ';'
910		{
911	<	if (conf_parser_ctx.pass == 2)
912	<	strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
913	<	sizeof(ConfigLoggingEntry.klinelog));
914	<	};
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_ioerrlog: FIOERRLOG '=' QSTRING ';'
917	>	logging_file_size: T_SIZE '=' sizespec ';'
918		{
919	<	if (conf_parser_ctx.pass == 2)
920	<	strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
921	<	sizeof(ConfigLoggingEntry.ioerrlog));
919	>	block_state.size.value = $3;
920	>	} | T_SIZE '=' T_UNLIMITED ';'
921	>	{
922	>	block_state.size.value = 0;
923		};
924
925	<	logging_killlog: FKILLLOG '=' QSTRING ';'
925	>	logging_file_type: TYPE
926		{
927		if (conf_parser_ctx.pass == 2)
928	<	strlcpy(ConfigLoggingEntry.killlog, yylval.string,
929	<	sizeof(ConfigLoggingEntry.killlog));
905	<	};
928	>	block_state.type.value = 0;
929	>	} '='  logging_file_type_items ';' ;
930
931	<	logging_log_level: LOG_LEVEL '=' T_L_CRIT ';'
932	<	{
909	<	if (conf_parser_ctx.pass == 2)
910	<	set_log_level(L_CRIT);
911	<	} | LOG_LEVEL '=' T_L_ERROR ';'
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	<	set_log_level(L_ERROR);
936	<	} | LOG_LEVEL '=' T_L_WARN ';'
935	>	block_state.type.value = LOG_TYPE_USER;
936	>	} | OPERATOR
937		{
938		if (conf_parser_ctx.pass == 2)
939	<	set_log_level(L_WARN);
940	<	} | LOG_LEVEL '=' T_L_NOTICE ';'
939	>	block_state.type.value = LOG_TYPE_OPER;
940	>	} | GLINE
941		{
942		if (conf_parser_ctx.pass == 2)
943	<	set_log_level(L_NOTICE);
944	<	} | LOG_LEVEL '=' T_L_TRACE ';'
943	>	block_state.type.value = LOG_TYPE_GLINE;
944	>	} | T_DLINE
945		{
946		if (conf_parser_ctx.pass == 2)
947	<	set_log_level(L_TRACE);
948	<	} | LOG_LEVEL '=' T_L_INFO ';'
947	>	block_state.type.value = LOG_TYPE_DLINE;
948	>	} | KLINE
949		{
950		if (conf_parser_ctx.pass == 2)
951	<	set_log_level(L_INFO);
952	<	} | LOG_LEVEL '=' T_L_DEBUG ';'
951	>	block_state.type.value = LOG_TYPE_KLINE;
952	>	} | KILL
953		{
954		if (conf_parser_ctx.pass == 2)
955	<	set_log_level(L_DEBUG);
956	<	};
936	<
937	<	logging_use_logging: USE_LOGGING '=' TBOOL ';'
955	>	block_state.type.value = LOG_TYPE_KILL;
956	>	} | T_DEBUG
957		{
958		if (conf_parser_ctx.pass == 2)
959	<	ConfigLoggingEntry.use_logging = yylval.number;
959	>	block_state.type.value = LOG_TYPE_DEBUG;
960		};
961
962	+
963		/***************************************************************************
964		* section oper
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	<	}
954	<	else
955	<	{
956	<	MyFree(class_name);
957	<	class_name = NULL;
958	<	}
959	<	} 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)
962	<	{
963	<	struct CollectItem *yy_tmp;
964	<	dlink_node *ptr;
965	<	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;
977	<	yy_tmp = ptr->data;
978	<
979	<	new_conf = make_conf_item(OPER_TYPE);
980	<	new_aconf = (struct AccessItem *)map_to_conf(new_conf);
981	<
982	<	new_aconf->flags = yy_aconf->flags;
983	<
984	<	if (yy_conf->name != NULL)
985	<	DupString(new_conf->name, yy_conf->name);
986	<	if (yy_tmp->user != NULL)
987	<	DupString(new_aconf->user, yy_tmp->user);
988	<	else
989	<	DupString(new_aconf->user, "*");
990	<	if (yy_tmp->host != NULL)
991	<	DupString(new_aconf->host, yy_tmp->host);
992	<	else
993	<	DupString(new_aconf->host, "*");
994	<	conf_add_class_to_conf(new_conf, class_name);
995	<	if (yy_aconf->passwd != NULL)
996	<	DupString(new_aconf->passwd, yy_aconf->passwd);
991	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
992	>	{
993	>	struct MaskItem *conf = NULL;
994	>	struct split_nuh_item nuh;
995
996	<	new_aconf->port = yy_aconf->port;
997	<	#ifdef HAVE_LIBCRYPTO
998	<	if (yy_aconf->rsa_public_key_file != NULL)
999	<	{
1000	<	BIO *file;
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	<	DupString(new_aconf->rsa_public_key_file,
1006	<	yy_aconf->rsa_public_key_file);
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	<	file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
1008	<	new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
1009	<	NULL, 0, NULL);
1010	<	BIO_set_close(file, BIO_CLOSE);
1011	<	BIO_free(file);
1012	<	}
1013	<	#endif
1018	>	conf_add_class_to_conf(conf, block_state.class.buf);
1019
1020		#ifdef HAVE_LIBCRYPTO
1021	<	if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
1022	<	&& yy_tmp->host)
1023	<	#else
1024	<	if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
1025	<	#endif
1021	>	if (block_state.file.buf[0])
1022	>	{
1023	>	BIO *file = NULL;
1024	>	RSA *pkey = NULL;
1025	>
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)
1024	<	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);
1029	<	}
1030	<
1031	<	yy_conf = NULL;
1032	<	yy_aconf = NULL;
1033	<
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	<	MyFree(class_name);
1036	<	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
1040	–	oper_name_b: | oper_name_t;
1043		oper_items:     oper_items oper_item | oper_item;
1044	<	oper_item:      oper_name | oper_user | oper_password | oper_hidden_admin |
1045	<	oper_hidden_oper | oper_umodes |
1046	<	oper_class | oper_global_kill | oper_remote |
1045	<	oper_kline | oper_xline | oper_unkline |
1046	<	oper_gline | oper_nick_changes | oper_remoteban |
1047	<	oper_die | oper_rehash | oper_admin | oper_operwall |
1048	<	oper_encrypted | oper_rsa_public_key_file |
1049	<	oper_flags | error ';' ;
1044	>	oper_item:      oper_name | oper_user | oper_password |
1045	>	oper_umodes | oper_class | oper_encrypted |
1046	>	oper_rsa_public_key_file | oper_flags | error ';' ;
1047
1048		oper_name: NAME '=' QSTRING ';'
1049		{
1050		if (conf_parser_ctx.pass == 2)
1051	<	{
1055	<	if (strlen(yylval.string) > OPERNICKLEN)
1056	<	yylval.string[OPERNICKLEN] = '\0';
1057	<
1058	<	MyFree(yy_conf->name);
1059	<	DupString(yy_conf->name, yylval.string);
1060	<	}
1061	<	};
1062	<
1063	<	oper_name_t: QSTRING
1064	<	{
1065	<	if (conf_parser_ctx.pass == 2)
1066	<	{
1067	<	if (strlen(yylval.string) > OPERNICKLEN)
1068	<	yylval.string[OPERNICKLEN] = '\0';
1069	<
1070	<	MyFree(yy_conf->name);
1071	<	DupString(yy_conf->name, yylval.string);
1072	<	}
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	<	{
1079	<	struct split_nuh_item nuh;
1080	<
1081	<	nuh.nuhmask  = yylval.string;
1082	<	nuh.nickptr  = NULL;
1083	<	nuh.userptr  = userbuf;
1084	<	nuh.hostptr  = hostbuf;
1085	<
1086	<	nuh.nicksize = 0;
1087	<	nuh.usersize = sizeof(userbuf);
1088	<	nuh.hostsize = sizeof(hostbuf);
1089	<
1090	<	split_nuh(&nuh);
1091	<
1092	<	if (yy_aconf->user == NULL)
1093	<	{
1094	<	DupString(yy_aconf->user, userbuf);
1095	<	DupString(yy_aconf->host, hostbuf);
1096	<	}
1097	<	else
1098	<	{
1099	<	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
1100	<
1101	<	DupString(yy_tmp->user, userbuf);
1102	<	DupString(yy_tmp->host, hostbuf);
1103	<
1104	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1105	<	}
1106	<	}
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	<	{
1113	<	if (yy_aconf->passwd != NULL)
1114	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1115	<
1116	<	MyFree(yy_aconf->passwd);
1117	<	DupString(yy_aconf->passwd, yylval.string);
1118	<	}
1063	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1064		};
1065
1066		oper_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 1123 | 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		{
1134	–	#ifdef HAVE_LIBCRYPTO
1079		if (conf_parser_ctx.pass == 2)
1080	<	{
1137	<	BIO *file;
1138	<
1139	<	if (yy_aconf->rsa_public_key != NULL)
1140	<	{
1141	<	RSA_free(yy_aconf->rsa_public_key);
1142	<	yy_aconf->rsa_public_key = NULL;
1143	<	}
1144	<
1145	<	if (yy_aconf->rsa_public_key_file != NULL)
1146	<	{
1147	<	MyFree(yy_aconf->rsa_public_key_file);
1148	<	yy_aconf->rsa_public_key_file = NULL;
1149	<	}
1150	<
1151	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
1152	<	file = BIO_new_file(yylval.string, "r");
1153	<
1154	<	if (file == NULL)
1155	<	{
1156	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
1157	<	break;
1158	<	}
1159	<
1160	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
1161	<
1162	<	if (yy_aconf->rsa_public_key == NULL)
1163	<	{
1164	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1165	<	break;
1166	<	}
1167	<
1168	<	BIO_set_close(file, BIO_CLOSE);
1169	<	BIO_free(file);
1170	<	}
1171	<	#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	<	{
1178	<	MyFree(class_name);
1179	<	DupString(class_name, yylval.string);
1180	<	}
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;
1176	<	};
1267	<
1268	<	oper_global_kill: GLOBAL_KILL '=' TBOOL ';'
1269	<	{
1270	<	if (conf_parser_ctx.pass == 2)
1271	<	{
1272	<	if (yylval.number)
1273	<	yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1274	<	else
1275	<	yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1276	<	}
1277	<	};
1278	<
1279	<	oper_remote: REMOTE '=' TBOOL ';'
1280	<	{
1281	<	if (conf_parser_ctx.pass == 2)
1282	<	{
1283	<	if (yylval.number)
1284	<	yy_aconf->port |= OPER_FLAG_REMOTE;
1285	<	else
1286	<	yy_aconf->port &= ~OPER_FLAG_REMOTE;
1287	<	}
1288	<	};
1289	<
1290	<	oper_remoteban: REMOTEBAN '=' TBOOL ';'
1291	<	{
1292	<	if (conf_parser_ctx.pass == 2)
1293	<	{
1294	<	if (yylval.number)
1295	<	yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1296	<	else
1297	<	yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1298	<	}
1299	<	};
1300	<
1301	<	oper_kline: KLINE '=' TBOOL ';'
1302	<	{
1303	<	if (conf_parser_ctx.pass == 2)
1304	<	{
1305	<	if (yylval.number)
1306	<	yy_aconf->port |= OPER_FLAG_K;
1307	<	else
1308	<	yy_aconf->port &= ~OPER_FLAG_K;
1309	<	}
1310	<	};
1311	<
1312	<	oper_xline: XLINE '=' TBOOL ';'
1313	<	{
1314	<	if (conf_parser_ctx.pass == 2)
1315	<	{
1316	<	if (yylval.number)
1317	<	yy_aconf->port |= OPER_FLAG_X;
1318	<	else
1319	<	yy_aconf->port &= ~OPER_FLAG_X;
1320	<	}
1321	<	};
1322	<
1323	<	oper_unkline: UNKLINE '=' TBOOL ';'
1175	>	block_state.modes.value |= UMODE_LOCOPS;
1176	>	} | T_NONONREG
1177		{
1178		if (conf_parser_ctx.pass == 2)
1179	<	{
1180	<	if (yylval.number)
1328	<	yy_aconf->port |= OPER_FLAG_UNKLINE;
1329	<	else
1330	<	yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1331	<	}
1332	<	};
1333	<
1334	<	oper_gline: GLINE '=' TBOOL ';'
1179	>	block_state.modes.value |= UMODE_REGONLY;
1180	>	} | T_FARCONNECT
1181		{
1182		if (conf_parser_ctx.pass == 2)
1183	<	{
1338	<	if (yylval.number)
1339	<	yy_aconf->port |= OPER_FLAG_GLINE;
1340	<	else
1341	<	yy_aconf->port &= ~OPER_FLAG_GLINE;
1342	<	}
1183	>	block_state.modes.value |= UMODE_FARCONNECT;
1184		};
1185
1186	<	oper_nick_changes: NICK_CHANGES '=' TBOOL ';'
1186	>	oper_flags: IRCD_FLAGS
1187		{
1188		if (conf_parser_ctx.pass == 2)
1189	<	{
1190	<	if (yylval.number)
1350	<	yy_aconf->port |= OPER_FLAG_N;
1351	<	else
1352	<	yy_aconf->port &= ~OPER_FLAG_N;
1353	<	}
1354	<	};
1189	>	block_state.port.value = 0;
1190	>	} '='  oper_flags_items ';';
1191
1192	<	oper_die: DIE '=' TBOOL ';'
1192	>	oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1193	>	oper_flags_item: KILL ':' REMOTE
1194		{
1195		if (conf_parser_ctx.pass == 2)
1196	<	{
1197	<	if (yylval.number)
1361	<	yy_aconf->port |= OPER_FLAG_DIE;
1362	<	else
1363	<	yy_aconf->port &= ~OPER_FLAG_DIE;
1364	<	}
1365	<	};
1366	<
1367	<	oper_rehash: REHASH '=' TBOOL ';'
1196	>	block_state.port.value |= OPER_FLAG_KILL_REMOTE;
1197	>	} | KILL
1198		{
1199		if (conf_parser_ctx.pass == 2)
1200	<	{
1201	<	if (yylval.number)
1372	<	yy_aconf->port |= OPER_FLAG_REHASH;
1373	<	else
1374	<	yy_aconf->port &= ~OPER_FLAG_REHASH;
1375	<	}
1376	<	};
1377	<
1378	<	oper_admin: ADMIN '=' TBOOL ';'
1200	>	block_state.port.value |= OPER_FLAG_KILL;
1201	>	} | CONNECT ':' REMOTE
1202		{
1203		if (conf_parser_ctx.pass == 2)
1204	<	{
1205	<	if (yylval.number)
1383	<	yy_aconf->port |= OPER_FLAG_ADMIN;
1384	<	else
1385	<	yy_aconf->port &= ~OPER_FLAG_ADMIN;
1386	<	}
1387	<	};
1388	<
1389	<	oper_hidden_admin: HIDDEN_ADMIN '=' TBOOL ';'
1204	>	block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
1205	>	} | CONNECT
1206		{
1207		if (conf_parser_ctx.pass == 2)
1208	<	{
1209	<	if (yylval.number)
1394	<	yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1395	<	else
1396	<	yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1397	<	}
1398	<	};
1399	<
1400	<	oper_hidden_oper: HIDDEN_OPER '=' TBOOL ';'
1208	>	block_state.port.value |= OPER_FLAG_CONNECT;
1209	>	} | SQUIT ':' REMOTE
1210		{
1211		if (conf_parser_ctx.pass == 2)
1212	<	{
1213	<	if (yylval.number)
1405	<	yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1406	<	else
1407	<	yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1408	<	}
1409	<	};
1410	<
1411	<	oper_operwall: T_OPERWALL '=' TBOOL ';'
1212	>	block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
1213	>	} | SQUIT
1214		{
1215		if (conf_parser_ctx.pass == 2)
1216	<	{
1217	<	if (yylval.number)
1416	<	yy_aconf->port |= OPER_FLAG_OPERWALL;
1417	<	else
1418	<	yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1419	<	}
1420	<	};
1421	<
1422	<	oper_flags: IRCD_FLAGS
1423	<	{
1424	<	} '='  oper_flags_items ';';
1425	<
1426	<	oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1427	<	oper_flags_item: NOT { not_atom = 1; } oper_flags_item_atom
1428	<	| { not_atom = 0; } oper_flags_item_atom;
1429	<
1430	<	oper_flags_item_atom: GLOBAL_KILL
1216	>	block_state.port.value |= OPER_FLAG_SQUIT;
1217	>	} | KLINE
1218		{
1219		if (conf_parser_ctx.pass == 2)
1220	<	{
1221	<	if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1435	<	else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1436	<	}
1437	<	} | REMOTE
1220	>	block_state.port.value |= OPER_FLAG_K;
1221	>	} | UNKLINE
1222		{
1223		if (conf_parser_ctx.pass == 2)
1224	<	{
1225	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
1442	<	else yy_aconf->port |= OPER_FLAG_REMOTE;
1443	<	}
1444	<	} | KLINE
1224	>	block_state.port.value |= OPER_FLAG_UNKLINE;
1225	>	} | T_DLINE
1226		{
1227		if (conf_parser_ctx.pass == 2)
1228	<	{
1229	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
1449	<	else yy_aconf->port |= OPER_FLAG_K;
1450	<	}
1451	<	} | UNKLINE
1228	>	block_state.port.value |= OPER_FLAG_DLINE;
1229	>	} | T_UNDLINE
1230		{
1231		if (conf_parser_ctx.pass == 2)
1232	<	{
1455	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1456	<	else yy_aconf->port |= OPER_FLAG_UNKLINE;
1457	<	}
1232	>	block_state.port.value |= OPER_FLAG_UNDLINE;
1233		} | XLINE
1234		{
1235		if (conf_parser_ctx.pass == 2)
1236	<	{
1462	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
1463	<	else yy_aconf->port |= OPER_FLAG_X;
1464	<	}
1236	>	block_state.port.value |= OPER_FLAG_X;
1237		} | GLINE
1238		{
1239		if (conf_parser_ctx.pass == 2)
1240	<	{
1469	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
1470	<	else yy_aconf->port |= OPER_FLAG_GLINE;
1471	<	}
1240	>	block_state.port.value |= OPER_FLAG_GLINE;
1241		} | DIE
1242		{
1243		if (conf_parser_ctx.pass == 2)
1244	<	{
1245	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
1246	<	else yy_aconf->port |= OPER_FLAG_DIE;
1247	<	}
1244	>	block_state.port.value |= OPER_FLAG_DIE;
1245	>	} | T_RESTART
1246	>	{
1247	>	if (conf_parser_ctx.pass == 2)
1248	>	block_state.port.value |= OPER_FLAG_RESTART;
1249		} | REHASH
1250		{
1251		if (conf_parser_ctx.pass == 2)
1252	<	{
1483	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
1484	<	else yy_aconf->port |= OPER_FLAG_REHASH;
1485	<	}
1252	>	block_state.port.value |= OPER_FLAG_REHASH;
1253		} | ADMIN
1254		{
1255		if (conf_parser_ctx.pass == 2)
1256	<	{
1257	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_ADMIN;
1491	<	else yy_aconf->port |= OPER_FLAG_ADMIN;
1492	<	}
1493	<	} | HIDDEN_ADMIN
1256	>	block_state.port.value |= OPER_FLAG_ADMIN;
1257	>	} | T_OPERWALL
1258		{
1259		if (conf_parser_ctx.pass == 2)
1260	<	{
1261	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1498	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1499	<	}
1500	<	} | NICK_CHANGES
1260	>	block_state.port.value |= OPER_FLAG_OPERWALL;
1261	>	} | T_GLOBOPS
1262		{
1263		if (conf_parser_ctx.pass == 2)
1264	<	{
1265	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
1505	<	else yy_aconf->port |= OPER_FLAG_N;
1506	<	}
1507	<	} | T_OPERWALL
1264	>	block_state.port.value |= OPER_FLAG_GLOBOPS;
1265	>	} | T_WALLOPS
1266		{
1267		if (conf_parser_ctx.pass == 2)
1268	<	{
1269	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1512	<	else yy_aconf->port |= OPER_FLAG_OPERWALL;
1513	<	}
1514	<	} | OPER_SPY_T
1268	>	block_state.port.value |= OPER_FLAG_WALLOPS;
1269	>	} | T_LOCOPS
1270		{
1271		if (conf_parser_ctx.pass == 2)
1272	<	{
1273	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
1519	<	else yy_aconf->port |= OPER_FLAG_OPER_SPY;
1520	<	}
1521	<	} | HIDDEN_OPER
1272	>	block_state.port.value |= OPER_FLAG_LOCOPS;
1273	>	} | REMOTEBAN
1274		{
1275		if (conf_parser_ctx.pass == 2)
1276	<	{
1277	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1526	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1527	<	}
1528	<	} | REMOTEBAN
1276	>	block_state.port.value |= OPER_FLAG_REMOTEBAN;
1277	>	} | T_SET
1278		{
1279		if (conf_parser_ctx.pass == 2)
1280	<	{
1281	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1533	<	else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1534	<	}
1535	<	} | ENCRYPTED
1280	>	block_state.port.value |= OPER_FLAG_SET;
1281	>	} | MODULE
1282		{
1283		if (conf_parser_ctx.pass == 2)
1284	<	{
1539	<	if (not_atom) ClearConfEncrypted(yy_aconf);
1540	<	else SetConfEncrypted(yy_aconf);
1541	<	}
1284	>	block_state.port.value |= OPER_FLAG_MODULE;
1285		};
1286
1287
#	Line 1547 | Line 1290 | oper_flags_item_atom: GLOBAL_KILL
1290		***************************************************************************/
1291		class_entry: CLASS
1292		{
1293	<	if (conf_parser_ctx.pass == 1)
1294	<	{
1552	<	yy_conf = make_conf_item(CLASS_TYPE);
1553	<	yy_class = map_to_conf(yy_conf);
1554	<	}
1555	<	} class_name_b '{' class_items '}' ';'
1556	<	{
1557	<	if (conf_parser_ctx.pass == 1)
1558	<	{
1559	<	struct ConfItem *cconf = NULL;
1560	<	struct ClassItem *class = NULL;
1561	<
1562	<	if (yy_class_name == NULL)
1563	<	delete_conf_item(yy_conf);
1564	<	else
1565	<	{
1566	<	cconf = find_exact_name_conf(CLASS_TYPE, yy_class_name, NULL, NULL);
1567	<
1568	<	if (cconf != NULL)                /* The class existed already */
1569	<	{
1570	<	int user_count = 0;
1571	<
1572	<	rebuild_cidr_class(cconf, yy_class);
1573	<
1574	<	class = map_to_conf(cconf);
1293	>	if (conf_parser_ctx.pass != 1)
1294	>	break;
1295
1296	<	user_count = class->curr_user_count;
1577	<	memcpy(class, yy_class, sizeof(*class));
1578	<	class->curr_user_count = user_count;
1579	<	class->active = 1;
1296	>	reset_block_state();
1297
1298	<	delete_conf_item(yy_conf);
1299	<
1300	<	MyFree(cconf->name);            /* Allows case change of class name */
1301	<	cconf->name = yy_class_name;
1302	<	}
1303	<	else      /* Brand new class */
1304	<	{
1305	<	MyFree(yy_conf->name);          /* just in case it was allocated */
1306	<	yy_conf->name = yy_class_name;
1307	<	yy_class->active = 1;
1308	<	}
1309	<	}
1310	<
1311	<	yy_class_name = NULL;
1312	<	}
1298	>	block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1299	>	block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1300	>	block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1301	>	block_state.max_sendq.value = DEFAULT_SENDQ;
1302	>	block_state.max_recvq.value = DEFAULT_RECVQ;
1303	>	} '{' class_items '}' ';'
1304	>	{
1305	>	struct ClassItem *class = NULL;
1306	>
1307	>	if (conf_parser_ctx.pass != 1)
1308	>	break;
1309	>
1310	>	if (!block_state.class.buf[0])
1311	>	break;
1312	>
1313	>	if (!(class = class_find(block_state.class.buf, 0)))
1314	>	class = class_make();
1315	>
1316	>	class->active = 1;
1317	>	MyFree(class->name);
1318	>	class->name = xstrdup(block_state.class.buf);
1319	>	class->ping_freq = block_state.ping_freq.value;
1320	>	class->max_perip = block_state.max_perip.value;
1321	>	class->con_freq = block_state.con_freq.value;
1322	>	class->max_total = block_state.max_total.value;
1323	>	class->max_global = block_state.max_global.value;
1324	>	class->max_local = block_state.max_local.value;
1325	>	class->max_ident = block_state.max_ident.value;
1326	>	class->max_sendq = block_state.max_sendq.value;
1327	>	class->max_recvq = block_state.max_recvq.value;
1328	>
1329	>	if (block_state.min_idle.value > block_state.max_idle.value)
1330	>	{
1331	>	block_state.min_idle.value = 0;
1332	>	block_state.max_idle.value = 0;
1333	>	block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
1334	>	}
1335	>
1336	>	class->flags = block_state.flags.value;
1337	>	class->min_idle = block_state.min_idle.value;
1338	>	class->max_idle = block_state.max_idle.value;
1339	>
1340	>	if (class->number_per_cidr && block_state.number_per_cidr.value)
1341	>	if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
1342	>	(class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
1343	>	if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
1344	>	(class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
1345	>	rebuild_cidr_list(class);
1346	>
1347	>	class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1348	>	class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1349	>	class->number_per_cidr = block_state.number_per_cidr.value;
1350		};
1351
1598	–	class_name_b: | class_name_t;
1599	–
1352		class_items:    class_items class_item | class_item;
1353		class_item:     class_name |
1354		class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1355		class_ping_time |
1604	–	class_ping_warning |
1356		class_number_per_cidr |
1357		class_number_per_ip |
1358		class_connectfreq |
#	Line 1609 | Line 1360 | class_item:     class_name |
1360		class_max_global |
1361		class_max_local |
1362		class_max_ident |
1363	<	class_sendq |
1363	>	class_sendq | class_recvq |
1364	>	class_min_idle |
1365	>	class_max_idle |
1366	>	class_flags |
1367		error ';' ;
1368
1369		class_name: NAME '=' QSTRING ';'
1370		{
1371		if (conf_parser_ctx.pass == 1)
1372	<	{
1619	<	MyFree(yy_class_name);
1620	<	DupString(yy_class_name, yylval.string);
1621	<	}
1622	<	};
1623	<
1624	<	class_name_t: QSTRING
1625	<	{
1626	<	if (conf_parser_ctx.pass == 1)
1627	<	{
1628	<	MyFree(yy_class_name);
1629	<	DupString(yy_class_name, yylval.string);
1630	<	}
1372	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1373		};
1374
1375		class_ping_time: PING_TIME '=' timespec ';'
1376		{
1377		if (conf_parser_ctx.pass == 1)
1378	<	PingFreq(yy_class) = $3;
1637	<	};
1638	<
1639	<	class_ping_warning: PING_WARNING '=' timespec ';'
1640	<	{
1641	<	if (conf_parser_ctx.pass == 1)
1642	<	PingWarning(yy_class) = $3;
1378	>	block_state.ping_freq.value = $3;
1379		};
1380
1381		class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1382		{
1383		if (conf_parser_ctx.pass == 1)
1384	<	MaxPerIp(yy_class) = $3;
1384	>	block_state.max_perip.value = $3;
1385		};
1386
1387		class_connectfreq: CONNECTFREQ '=' timespec ';'
1388		{
1389		if (conf_parser_ctx.pass == 1)
1390	<	ConFreq(yy_class) = $3;
1390	>	block_state.con_freq.value = $3;
1391		};
1392
1393		class_max_number: MAX_NUMBER '=' NUMBER ';'
1394		{
1395		if (conf_parser_ctx.pass == 1)
1396	<	MaxTotal(yy_class) = $3;
1396	>	block_state.max_total.value = $3;
1397		};
1398
1399		class_max_global: MAX_GLOBAL '=' NUMBER ';'
1400		{
1401		if (conf_parser_ctx.pass == 1)
1402	<	MaxGlobal(yy_class) = $3;
1402	>	block_state.max_global.value = $3;
1403		};
1404
1405		class_max_local: MAX_LOCAL '=' NUMBER ';'
1406		{
1407		if (conf_parser_ctx.pass == 1)
1408	<	MaxLocal(yy_class) = $3;
1408	>	block_state.max_local.value = $3;
1409		};
1410
1411		class_max_ident: MAX_IDENT '=' NUMBER ';'
1412		{
1413		if (conf_parser_ctx.pass == 1)
1414	<	MaxIdent(yy_class) = $3;
1414	>	block_state.max_ident.value = $3;
1415		};
1416
1417		class_sendq: SENDQ '=' sizespec ';'
1418		{
1419		if (conf_parser_ctx.pass == 1)
1420	<	MaxSendq(yy_class) = $3;
1420	>	block_state.max_sendq.value = $3;
1421	>	};
1422	>
1423	>	class_recvq: T_RECVQ '=' sizespec ';'
1424	>	{
1425	>	if (conf_parser_ctx.pass == 1)
1426	>	if ($3 >= CLIENT_FLOOD_MIN && $3 <= CLIENT_FLOOD_MAX)
1427	>	block_state.max_recvq.value = $3;
1428		};
1429
1430		class_cidr_bitlen_ipv4: CIDR_BITLEN_IPV4 '=' NUMBER ';'
1431		{
1432		if (conf_parser_ctx.pass == 1)
1433	<	CidrBitlenIPV4(yy_class) = $3;
1433	>	block_state.cidr_bitlen_ipv4.value = $3 > 32 ? 32 : $3;
1434		};
1435
1436		class_cidr_bitlen_ipv6: CIDR_BITLEN_IPV6 '=' NUMBER ';'
1437		{
1438		if (conf_parser_ctx.pass == 1)
1439	<	CidrBitlenIPV6(yy_class) = $3;
1439	>	block_state.cidr_bitlen_ipv6.value = $3 > 128 ? 128 : $3;
1440		};
1441
1442		class_number_per_cidr: NUMBER_PER_CIDR '=' NUMBER ';'
1443		{
1444		if (conf_parser_ctx.pass == 1)
1445	<	NumberPerCidr(yy_class) = $3;
1445	>	block_state.number_per_cidr.value = $3;
1446		};
1447
1448	+	class_min_idle: MIN_IDLE '=' timespec ';'
1449	+	{
1450	+	if (conf_parser_ctx.pass != 1)
1451	+	break;
1452	+
1453	+	block_state.min_idle.value = $3;
1454	+	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1455	+	};
1456	+
1457	+	class_max_idle: MAX_IDLE '=' timespec ';'
1458	+	{
1459	+	if (conf_parser_ctx.pass != 1)
1460	+	break;
1461	+
1462	+	block_state.max_idle.value = $3;
1463	+	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1464	+	};
1465	+
1466	+	class_flags: IRCD_FLAGS
1467	+	{
1468	+	if (conf_parser_ctx.pass == 1)
1469	+	block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1470	+	} '='  class_flags_items ';';
1471	+
1472	+	class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1473	+	class_flags_item: RANDOM_IDLE
1474	+	{
1475	+	if (conf_parser_ctx.pass == 1)
1476	+	block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
1477	+	} | HIDE_IDLE_FROM_OPERS
1478	+	{
1479	+	if (conf_parser_ctx.pass == 1)
1480	+	block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
1481	+	};
1482	+
1483	+
1484		/***************************************************************************
1485		*  section listen
1486		***************************************************************************/
1487		listen_entry: LISTEN
1488		{
1489		if (conf_parser_ctx.pass == 2)
1490	<	{
1491	<	listener_address = NULL;
1713	<	listener_flags = 0;
1714	<	}
1715	<	} '{' listen_items '}' ';'
1716	<	{
1717	<	if (conf_parser_ctx.pass == 2)
1718	<	{
1719	<	MyFree(listener_address);
1720	<	listener_address = NULL;
1721	<	}
1722	<	};
1490	>	reset_block_state();
1491	>	} '{' listen_items '}' ';';
1492
1493		listen_flags: IRCD_FLAGS
1494		{
1495	<	listener_flags = 0;
1495	>	block_state.flags.value = 0;
1496		} '='  listen_flags_items ';';
1497
1498		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1499		listen_flags_item: T_SSL
1500		{
1501		if (conf_parser_ctx.pass == 2)
1502	<	listener_flags |= LISTENER_SSL;
1502	>	block_state.flags.value |= LISTENER_SSL;
1503		} | HIDDEN
1504		{
1505		if (conf_parser_ctx.pass == 2)
1506	<	listener_flags |= LISTENER_HIDDEN;
1506	>	block_state.flags.value |= LISTENER_HIDDEN;
1507		} | T_SERVER
1508		{
1509		if (conf_parser_ctx.pass == 2)
1510	<	listener_flags |= LISTENER_SERVER;
1510	>	block_state.flags.value |= LISTENER_SERVER;
1511		};
1512
1744	–
1745	–
1513		listen_items:   listen_items listen_item | listen_item;
1514		listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';';
1515
1516	<	listen_port: PORT '=' port_items { listener_flags = 0; } ';';
1516	>	listen_port: PORT '=' port_items { block_state.flags.value = 0; } ';';
1517
1518		port_items: port_items ',' port_item | port_item;
1519
#	Line 1754 | Line 1521 | port_item: NUMBER
1521		{
1522		if (conf_parser_ctx.pass == 2)
1523		{
1524	<	if ((listener_flags & LISTENER_SSL))
1524	>	if (block_state.flags.value & LISTENER_SSL)
1525		#ifdef HAVE_LIBCRYPTO
1526		if (!ServerInfo.server_ctx)
1527		#endif
1528		{
1529	<	yyerror("SSL not available - port closed");
1529	>	conf_error_report("SSL not available - port closed");
1530		break;
1531		}
1532	<	add_listener($1, listener_address, listener_flags);
1532	>	add_listener($1, block_state.addr.buf, block_state.flags.value);
1533		}
1534		} | NUMBER TWODOTS NUMBER
1535		{
#	Line 1770 | Line 1537 | port_item: NUMBER
1537		{
1538		int i;
1539
1540	<	if ((listener_flags & LISTENER_SSL))
1540	>	if (block_state.flags.value & LISTENER_SSL)
1541		#ifdef HAVE_LIBCRYPTO
1542		if (!ServerInfo.server_ctx)
1543		#endif
1544		{
1545	<	yyerror("SSL not available - port closed");
1545	>	conf_error_report("SSL not available - port closed");
1546		break;
1547		}
1548
1549		for (i = $1; i <= $3; ++i)
1550	<	add_listener(i, listener_address, listener_flags);
1550	>	add_listener(i, block_state.addr.buf, block_state.flags.value);
1551		}
1552		};
1553
1554		listen_address: IP '=' QSTRING ';'
1555		{
1556		if (conf_parser_ctx.pass == 2)
1557	<	{
1791	<	MyFree(listener_address);
1792	<	DupString(listener_address, yylval.string);
1793	<	}
1557	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1558		};
1559
1560		listen_host: HOST '=' QSTRING ';'
1561		{
1562		if (conf_parser_ctx.pass == 2)
1563	<	{
1800	<	MyFree(listener_address);
1801	<	DupString(listener_address, yylval.string);
1802	<	}
1563	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1564		};
1565
1566		/***************************************************************************
#	Line 1808 | Line 1569 | listen_host: HOST '=' QSTRING ';'
1569		auth_entry: IRCD_AUTH
1570		{
1571		if (conf_parser_ctx.pass == 2)
1572	<	{
1812	<	yy_conf = make_conf_item(CLIENT_TYPE);
1813	<	yy_aconf = map_to_conf(yy_conf);
1814	<	}
1815	<	else
1816	<	{
1817	<	MyFree(class_name);
1818	<	class_name = NULL;
1819	<	}
1572	>	reset_block_state();
1573		} '{' auth_items '}' ';'
1574		{
1575	<	if (conf_parser_ctx.pass == 2)
1823	<	{
1824	<	struct CollectItem *yy_tmp = NULL;
1825	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1826	<
1827	<	if (yy_aconf->user && yy_aconf->host)
1828	<	{
1829	<	conf_add_class_to_conf(yy_conf, class_name);
1830	<	add_conf_by_address(CONF_CLIENT, yy_aconf);
1831	<	}
1832	<	else
1833	<	delete_conf_item(yy_conf);
1834	<
1835	<	/* copy over settings from first struct */
1836	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
1837	<	{
1838	<	struct AccessItem *new_aconf;
1839	<	struct ConfItem *new_conf;
1840	<
1841	<	new_conf = make_conf_item(CLIENT_TYPE);
1842	<	new_aconf = map_to_conf(new_conf);
1843	<
1844	<	yy_tmp = ptr->data;
1845	<
1846	<	assert(yy_tmp->user && yy_tmp->host);
1847	<
1848	<	if (yy_aconf->passwd != NULL)
1849	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1850	<	if (yy_conf->name != NULL)
1851	<	DupString(new_conf->name, yy_conf->name);
1852	<	if (yy_aconf->passwd != NULL)
1853	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1575	>	dlink_node *ptr = NULL;
1576
1577	<	new_aconf->flags = yy_aconf->flags;
1578	<	new_aconf->port  = yy_aconf->port;
1577	>	if (conf_parser_ctx.pass != 2)
1578	>	break;
1579
1580	<	DupString(new_aconf->user, yy_tmp->user);
1859	<	collapse(new_aconf->user);
1860	<
1861	<	DupString(new_aconf->host, yy_tmp->host);
1862	<	collapse(new_aconf->host);
1863	<
1864	<	conf_add_class_to_conf(new_conf, class_name);
1865	<	add_conf_by_address(CONF_CLIENT, new_aconf);
1866	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1867	<	free_collect_item(yy_tmp);
1868	<	}
1869	<
1870	<	MyFree(class_name);
1871	<	class_name = NULL;
1872	<	yy_conf = NULL;
1873	<	yy_aconf = NULL;
1874	<	}
1875	<	};
1876	<
1877	<	auth_items:     auth_items auth_item | auth_item;
1878	<	auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1879	<	auth_kline_exempt | auth_need_ident |
1880	<	auth_exceed_limit | auth_no_tilde | auth_gline_exempt |
1881	<	auth_spoof | auth_spoof_notice |
1882	<	auth_redir_serv | auth_redir_port | auth_can_flood |
1883	<	auth_need_password | auth_encrypted | error ';' ;
1884	<
1885	<	auth_user: USER '=' QSTRING ';'
1886	<	{
1887	<	if (conf_parser_ctx.pass == 2)
1580	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
1581		{
1582	<	struct CollectItem *yy_tmp = NULL;
1582	>	struct MaskItem *conf = NULL;
1583		struct split_nuh_item nuh;
1584
1585	<	nuh.nuhmask  = yylval.string;
1585	>	nuh.nuhmask  = ptr->data;
1586		nuh.nickptr  = NULL;
1587	<	nuh.userptr  = userbuf;
1588	<	nuh.hostptr  = hostbuf;
1896	<
1587	>	nuh.userptr  = block_state.user.buf;
1588	>	nuh.hostptr  = block_state.host.buf;
1589		nuh.nicksize = 0;
1590	<	nuh.usersize = sizeof(userbuf);
1591	<	nuh.hostsize = sizeof(hostbuf);
1900	<
1590	>	nuh.usersize = sizeof(block_state.user.buf);
1591	>	nuh.hostsize = sizeof(block_state.host.buf);
1592		split_nuh(&nuh);
1593
1594	<	if (yy_aconf->user == NULL)
1595	<	{
1596	<	DupString(yy_aconf->user, userbuf);
1597	<	DupString(yy_aconf->host, hostbuf);
1598	<	}
1599	<	else
1600	<	{
1601	<	yy_tmp = MyMalloc(sizeof(struct CollectItem));
1594	>	conf        = conf_make(CONF_CLIENT);
1595	>	conf->user  = xstrdup(collapse(block_state.user.buf));
1596	>	conf->host  = xstrdup(collapse(block_state.host.buf));
1597	>
1598	>	if (block_state.rpass.buf[0])
1599	>	conf->passwd = xstrdup(block_state.rpass.buf);
1600	>	if (block_state.name.buf[0])
1601	>	conf->name = xstrdup(block_state.name.buf);
1602
1603	<	DupString(yy_tmp->user, userbuf);
1604	<	DupString(yy_tmp->host, hostbuf);
1603	>	conf->flags = block_state.flags.value;
1604	>	conf->port  = block_state.port.value;
1605
1606	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1607	<	}
1606	>	conf_add_class_to_conf(conf, block_state.class.buf);
1607	>	add_conf_by_address(CONF_CLIENT, conf);
1608		}
1609	<	};
1609	>	};
1610
1611	<	/* XXX - IP/IPV6 tags don't exist anymore - put IP/IPV6 into user. */
1611	>	auth_items:     auth_items auth_item | auth_item;
1612	>	auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1613	>	auth_spoof | auth_redir_serv | auth_redir_port |
1614	>	auth_encrypted | error ';' ;
1615
1616	<	auth_passwd: PASSWORD '=' QSTRING ';'
1616	>	auth_user: USER '=' QSTRING ';'
1617		{
1618		if (conf_parser_ctx.pass == 2)
1619	<	{
1926	<	/* be paranoid */
1927	<	if (yy_aconf->passwd != NULL)
1928	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1929	<
1930	<	MyFree(yy_aconf->passwd);
1931	<	DupString(yy_aconf->passwd, yylval.string);
1932	<	}
1619	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1620		};
1621
1622	<	auth_spoof_notice: SPOOF_NOTICE '=' TBOOL ';'
1622	>	auth_passwd: PASSWORD '=' QSTRING ';'
1623		{
1624		if (conf_parser_ctx.pass == 2)
1625	<	{
1939	<	if (yylval.number)
1940	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1941	<	else
1942	<	yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1943	<	}
1625	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1626		};
1627
1628		auth_class: CLASS '=' QSTRING ';'
1629		{
1630		if (conf_parser_ctx.pass == 2)
1631	<	{
1950	<	MyFree(class_name);
1951	<	DupString(class_name, yylval.string);
1952	<	}
1631	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1632		};
1633
1634		auth_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 1957 | Line 1636 | auth_encrypted: ENCRYPTED '=' TBOOL ';'
1636		if (conf_parser_ctx.pass == 2)
1637		{
1638		if (yylval.number)
1639	<	SetConfEncrypted(yy_aconf);
1639	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1640		else
1641	<	ClearConfEncrypted(yy_aconf);
1641	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1642		}
1643		};
1644
1645		auth_flags: IRCD_FLAGS
1646		{
1647	+	if (conf_parser_ctx.pass == 2)
1648	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
1649		} '='  auth_flags_items ';';
1650
1651		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1652	<	auth_flags_item: NOT { not_atom = 1; } auth_flags_item_atom
1972	<	| { not_atom = 0; } auth_flags_item_atom;
1973	<
1974	<	auth_flags_item_atom: SPOOF_NOTICE
1652	>	auth_flags_item: SPOOF_NOTICE
1653		{
1654		if (conf_parser_ctx.pass == 2)
1655	<	{
1978	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1979	<	else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1980	<	}
1981	<
1655	>	block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1656		} | EXCEED_LIMIT
1657		{
1658		if (conf_parser_ctx.pass == 2)
1659	<	{
1986	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
1987	<	else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1988	<	}
1659	>	block_state.flags.value |= CONF_FLAGS_NOLIMIT;
1660		} | KLINE_EXEMPT
1661		{
1662		if (conf_parser_ctx.pass == 2)
1663	<	{
1993	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
1994	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1995	<	}
1663	>	block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1664		} | NEED_IDENT
1665		{
1666		if (conf_parser_ctx.pass == 2)
1667	<	{
2000	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
2001	<	else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
2002	<	}
1667	>	block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
1668		} | CAN_FLOOD
1669		{
1670		if (conf_parser_ctx.pass == 2)
1671	<	{
2007	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
2008	<	else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
2009	<	}
2010	<	} | CAN_IDLE
2011	<	{
2012	<	if (conf_parser_ctx.pass == 2)
2013	<	{
2014	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_IDLE_LINED;
2015	<	else yy_aconf->flags |= CONF_FLAGS_IDLE_LINED;
2016	<	}
1671	>	block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
1672		} | NO_TILDE
1673		{
1674		if (conf_parser_ctx.pass == 2)
1675	<	{
2021	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
2022	<	else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
2023	<	}
1675	>	block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1676		} | GLINE_EXEMPT
1677		{
1678		if (conf_parser_ctx.pass == 2)
1679	<	{
2028	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
2029	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
2030	<	}
1679	>	block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
1680		} | RESV_EXEMPT
1681		{
1682		if (conf_parser_ctx.pass == 2)
1683	<	{
1684	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
2036	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
2037	<	}
2038	<	} | NEED_PASSWORD
1683	>	block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
1684	>	} | T_WEBIRC
1685		{
1686		if (conf_parser_ctx.pass == 2)
1687	<	{
1688	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
2043	<	else yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
2044	<	}
2045	<	};
2046	<
2047	<	auth_kline_exempt: KLINE_EXEMPT '=' TBOOL ';'
1687	>	block_state.flags.value |= CONF_FLAGS_WEBIRC;
1688	>	} | NEED_PASSWORD
1689		{
1690		if (conf_parser_ctx.pass == 2)
1691	<	{
2051	<	if (yylval.number)
2052	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
2053	<	else
2054	<	yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
2055	<	}
1691	>	block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1692		};
1693
1694	<	auth_need_ident: NEED_IDENT '=' TBOOL ';'
1694	>	auth_spoof: SPOOF '=' QSTRING ';'
1695		{
1696	<	if (conf_parser_ctx.pass == 2)
1697	<	{
2062	<	if (yylval.number)
2063	<	yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
2064	<	else
2065	<	yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
2066	<	}
2067	<	};
1696	>	if (conf_parser_ctx.pass != 2)
1697	>	break;
1698
1699	<	auth_exceed_limit: EXCEED_LIMIT '=' TBOOL ';'
2070	<	{
2071	<	if (conf_parser_ctx.pass == 2)
1699	>	if (strlen(yylval.string) <= HOSTLEN && valid_hostname(yylval.string))
1700		{
1701	<	if (yylval.number)
1702	<	yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
2075	<	else
2076	<	yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
1701	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1702	>	block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
1703		}
1704	+	else
1705	+	ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
1706		};
1707
1708	<	auth_can_flood: CAN_FLOOD '=' TBOOL ';'
1708	>	auth_redir_serv: REDIRSERV '=' QSTRING ';'
1709		{
1710	<	if (conf_parser_ctx.pass == 2)
1711	<	{
1712	<	if (yylval.number)
1713	<	yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
1714	<	else
2087	<	yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
2088	<	}
1710	>	if (conf_parser_ctx.pass != 2)
1711	>	break;
1712	>
1713	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1714	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1715		};
1716
1717	<	auth_no_tilde: NO_TILDE '=' TBOOL ';'
1717	>	auth_redir_port: REDIRPORT '=' NUMBER ';'
1718		{
1719	<	if (conf_parser_ctx.pass == 2)
1720	<	{
1721	<	if (yylval.number)
1722	<	yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1723	<	else
2098	<	yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
2099	<	}
1719	>	if (conf_parser_ctx.pass != 2)
1720	>	break;
1721	>
1722	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1723	>	block_state.port.value = $3;
1724		};
1725
1726	<	auth_gline_exempt: GLINE_EXEMPT '=' TBOOL ';'
1726	>
1727	>	/***************************************************************************
1728	>	*  section resv
1729	>	***************************************************************************/
1730	>	resv_entry: RESV
1731		{
1732	<	if (conf_parser_ctx.pass == 2)
1733	<	{
2106	<	if (yylval.number)
2107	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
2108	<	else
2109	<	yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
2110	<	}
2111	<	};
1732	>	if (conf_parser_ctx.pass != 2)
1733	>	break;
1734
1735	<	/* XXX - need check for illegal hostnames here */
1736	<	auth_spoof: SPOOF '=' QSTRING ';'
1735	>	reset_block_state();
1736	>	strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
1737	>	} '{' resv_items '}' ';'
1738		{
1739	<	if (conf_parser_ctx.pass == 2)
1740	<	{
2118	<	MyFree(yy_conf->name);
1739	>	if (conf_parser_ctx.pass != 2)
1740	>	break;
1741
1742	<	if (strlen(yylval.string) < HOSTLEN)
2121	<	{
2122	<	DupString(yy_conf->name, yylval.string);
2123	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
2124	<	}
2125	<	else
2126	<	{
2127	<	ilog(L_ERROR, "Spoofs must be less than %d..ignoring it", HOSTLEN);
2128	<	yy_conf->name = NULL;
2129	<	}
2130	<	}
1742	>	create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1743		};
1744
1745	<	auth_redir_serv: REDIRSERV '=' QSTRING ';'
1745	>	resv_items:     resv_items resv_item | resv_item;
1746	>	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1747	>
1748	>	resv_mask: MASK '=' QSTRING ';'
1749		{
1750		if (conf_parser_ctx.pass == 2)
1751	<	{
2137	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
2138	<	MyFree(yy_conf->name);
2139	<	DupString(yy_conf->name, yylval.string);
2140	<	}
1751	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1752		};
1753
1754	<	auth_redir_port: REDIRPORT '=' NUMBER ';'
1754	>	resv_reason: REASON '=' QSTRING ';'
1755		{
1756		if (conf_parser_ctx.pass == 2)
1757	<	{
2147	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
2148	<	yy_aconf->port = $3;
2149	<	}
1757	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1758		};
1759
1760	<	auth_need_password: NEED_PASSWORD '=' TBOOL ';'
1760	>	resv_exempt: EXEMPT '=' QSTRING ';'
1761		{
1762		if (conf_parser_ctx.pass == 2)
1763	<	{
2156	<	if (yylval.number)
2157	<	yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
2158	<	else
2159	<	yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
2160	<	}
1763	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1764		};
1765
1766
1767		/***************************************************************************
1768	<	*  section resv
1768	>	*  section service
1769		***************************************************************************/
1770	<	resv_entry: RESV
2168	<	{
2169	<	if (conf_parser_ctx.pass == 2)
2170	<	{
2171	<	MyFree(resv_reason);
2172	<	resv_reason = NULL;
2173	<	}
2174	<	} '{' resv_items '}' ';'
2175	<	{
2176	<	if (conf_parser_ctx.pass == 2)
2177	<	{
2178	<	MyFree(resv_reason);
2179	<	resv_reason = NULL;
2180	<	}
2181	<	};
1770	>	service_entry: T_SERVICE '{' service_items '}' ';';
1771
1772	<	resv_items:     resv_items resv_item | resv_item;
1773	<	resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
2185	<
2186	<	resv_creason: REASON '=' QSTRING ';'
2187	<	{
2188	<	if (conf_parser_ctx.pass == 2)
2189	<	{
2190	<	MyFree(resv_reason);
2191	<	DupString(resv_reason, yylval.string);
2192	<	}
2193	<	};
1772	>	service_items:     service_items service_item | service_item;
1773	>	service_item:      service_name | error;
1774
1775	<	resv_channel: CHANNEL '=' QSTRING ';'
1775	>	service_name: NAME '=' QSTRING ';'
1776		{
1777		if (conf_parser_ctx.pass == 2)
1778		{
1779	<	if (IsChanPrefix(*yylval.string))
1779	>	if (valid_servname(yylval.string))
1780		{
1781	<	char def_reason[] = "No reason";
1782	<
2203	<	create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1781	>	struct MaskItem *conf = conf_make(CONF_SERVICE);
1782	>	conf->name = xstrdup(yylval.string);
1783		}
1784		}
2206	–	/* ignore it for now.. but we really should make a warning if
2207	–	* its an erroneous name --fl_ */
2208	–	};
2209	–
2210	–	resv_nick: NICK '=' QSTRING ';'
2211	–	{
2212	–	if (conf_parser_ctx.pass == 2)
2213	–	{
2214	–	char def_reason[] = "No reason";
2215	–
2216	–	create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
2217	–	}
1785		};
1786
1787		/***************************************************************************
#	Line 2222 | Line 1789 | resv_nick: NICK '=' QSTRING ';'
1789		***************************************************************************/
1790		shared_entry: T_SHARED
1791		{
1792	<	if (conf_parser_ctx.pass == 2)
1793	<	{
1794	<	yy_conf = make_conf_item(ULINE_TYPE);
1795	<	yy_match_item = map_to_conf(yy_conf);
1796	<	yy_match_item->action = SHARED_ALL;
1797	<	}
1792	>	if (conf_parser_ctx.pass != 2)
1793	>	break;
1794	>
1795	>	reset_block_state();
1796	>
1797	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1798	>	strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
1799	>	strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
1800	>	block_state.flags.value = SHARED_ALL;
1801		} '{' shared_items '}' ';'
1802		{
1803	<	if (conf_parser_ctx.pass == 2)
1804	<	{
1805	<	yy_conf = NULL;
1806	<	}
1803	>	struct MaskItem *conf = NULL;
1804	>
1805	>	if (conf_parser_ctx.pass != 2)
1806	>	break;
1807	>
1808	>	conf = conf_make(CONF_ULINE);
1809	>	conf->flags = block_state.flags.value;
1810	>	conf->name = xstrdup(block_state.name.buf);
1811	>	conf->user = xstrdup(block_state.user.buf);
1812	>	conf->host = xstrdup(block_state.host.buf);
1813		};
1814
1815		shared_items: shared_items shared_item | shared_item;
#	Line 2242 | Line 1818 | shared_item:  shared_name | shared_user
1818		shared_name: NAME '=' QSTRING ';'
1819		{
1820		if (conf_parser_ctx.pass == 2)
1821	<	{
2246	<	MyFree(yy_conf->name);
2247	<	DupString(yy_conf->name, yylval.string);
2248	<	}
1821	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1822		};
1823
1824		shared_user: USER '=' QSTRING ';'
#	Line 2256 | Line 1829 | shared_user: USER '=' QSTRING ';'
1829
1830		nuh.nuhmask  = yylval.string;
1831		nuh.nickptr  = NULL;
1832	<	nuh.userptr  = userbuf;
1833	<	nuh.hostptr  = hostbuf;
1832	>	nuh.userptr  = block_state.user.buf;
1833	>	nuh.hostptr  = block_state.host.buf;
1834
1835		nuh.nicksize = 0;
1836	<	nuh.usersize = sizeof(userbuf);
1837	<	nuh.hostsize = sizeof(hostbuf);
1836	>	nuh.usersize = sizeof(block_state.user.buf);
1837	>	nuh.hostsize = sizeof(block_state.host.buf);
1838
1839		split_nuh(&nuh);
2267	–
2268	–	DupString(yy_match_item->user, userbuf);
2269	–	DupString(yy_match_item->host, hostbuf);
1840		}
1841		};
1842
1843		shared_type: TYPE
1844		{
1845		if (conf_parser_ctx.pass == 2)
1846	<	yy_match_item->action = 0;
1846	>	block_state.flags.value = 0;
1847		} '=' shared_types ';' ;
1848
1849		shared_types: shared_types ',' shared_type_item | shared_type_item;
1850		shared_type_item: KLINE
1851		{
1852		if (conf_parser_ctx.pass == 2)
1853	<	yy_match_item->action |= SHARED_KLINE;
1854	<	} | TKLINE
1853	>	block_state.flags.value |= SHARED_KLINE;
1854	>	} | UNKLINE
1855		{
1856		if (conf_parser_ctx.pass == 2)
1857	<	yy_match_item->action |= SHARED_TKLINE;
1858	<	} | UNKLINE
1857	>	block_state.flags.value |= SHARED_UNKLINE;
1858	>	} | T_DLINE
1859		{
1860		if (conf_parser_ctx.pass == 2)
1861	<	yy_match_item->action |= SHARED_UNKLINE;
1862	<	} | XLINE
1861	>	block_state.flags.value |= SHARED_DLINE;
1862	>	} | T_UNDLINE
1863		{
1864		if (conf_parser_ctx.pass == 2)
1865	<	yy_match_item->action |= SHARED_XLINE;
1866	<	} | TXLINE
1865	>	block_state.flags.value |= SHARED_UNDLINE;
1866	>	} | XLINE
1867		{
1868		if (conf_parser_ctx.pass == 2)
1869	<	yy_match_item->action |= SHARED_TXLINE;
1869	>	block_state.flags.value |= SHARED_XLINE;
1870		} | T_UNXLINE
1871		{
1872		if (conf_parser_ctx.pass == 2)
1873	<	yy_match_item->action |= SHARED_UNXLINE;
1873	>	block_state.flags.value |= SHARED_UNXLINE;
1874		} | RESV
1875		{
1876		if (conf_parser_ctx.pass == 2)
1877	<	yy_match_item->action |= SHARED_RESV;
2308	<	} | TRESV
2309	<	{
2310	<	if (conf_parser_ctx.pass == 2)
2311	<	yy_match_item->action |= SHARED_TRESV;
1877	>	block_state.flags.value |= SHARED_RESV;
1878		} | T_UNRESV
1879		{
1880		if (conf_parser_ctx.pass == 2)
1881	<	yy_match_item->action |= SHARED_UNRESV;
1881	>	block_state.flags.value |= SHARED_UNRESV;
1882		} | T_LOCOPS
1883		{
1884		if (conf_parser_ctx.pass == 2)
1885	<	yy_match_item->action |= SHARED_LOCOPS;
1885	>	block_state.flags.value |= SHARED_LOCOPS;
1886		} | T_ALL
1887		{
1888		if (conf_parser_ctx.pass == 2)
1889	<	yy_match_item->action = SHARED_ALL;
1889	>	block_state.flags.value = SHARED_ALL;
1890		};
1891
1892		/***************************************************************************
#	Line 2328 | Line 1894 | shared_type_item: KLINE
1894		***************************************************************************/
1895		cluster_entry: T_CLUSTER
1896		{
1897	<	if (conf_parser_ctx.pass == 2)
1898	<	{
1899	<	yy_conf = make_conf_item(CLUSTER_TYPE);
1900	<	yy_conf->flags = SHARED_ALL;
1901	<	}
1897	>	if (conf_parser_ctx.pass != 2)
1898	>	break;
1899	>
1900	>	reset_block_state();
1901	>
1902	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1903	>	block_state.flags.value = SHARED_ALL;
1904		} '{' cluster_items '}' ';'
1905		{
1906	<	if (conf_parser_ctx.pass == 2)
1907	<	{
1908	<	if (yy_conf->name == NULL)
1909	<	DupString(yy_conf->name, "*");
1910	<	yy_conf = NULL;
1911	<	}
1906	>	struct MaskItem *conf = NULL;
1907	>
1908	>	if (conf_parser_ctx.pass != 2)
1909	>	break;
1910	>
1911	>	conf = conf_make(CONF_CLUSTER);
1912	>	conf->flags = block_state.flags.value;
1913	>	conf->name = xstrdup(block_state.name.buf);
1914		};
1915
1916		cluster_items:  cluster_items cluster_item | cluster_item;
#	Line 2349 | Line 1919 | cluster_item:  cluster_name | cluster_typ
1919		cluster_name: NAME '=' QSTRING ';'
1920		{
1921		if (conf_parser_ctx.pass == 2)
1922	<	DupString(yy_conf->name, yylval.string);
1922	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1923		};
1924
1925		cluster_type: TYPE
1926		{
1927		if (conf_parser_ctx.pass == 2)
1928	<	yy_conf->flags = 0;
1928	>	block_state.flags.value = 0;
1929		} '=' cluster_types ';' ;
1930
1931		cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1932		cluster_type_item: KLINE
1933		{
1934		if (conf_parser_ctx.pass == 2)
1935	<	yy_conf->flags |= SHARED_KLINE;
1936	<	} | TKLINE
1935	>	block_state.flags.value |= SHARED_KLINE;
1936	>	} | UNKLINE
1937		{
1938		if (conf_parser_ctx.pass == 2)
1939	<	yy_conf->flags |= SHARED_TKLINE;
1940	<	} | UNKLINE
1939	>	block_state.flags.value |= SHARED_UNKLINE;
1940	>	} | T_DLINE
1941		{
1942		if (conf_parser_ctx.pass == 2)
1943	<	yy_conf->flags |= SHARED_UNKLINE;
1944	<	} | XLINE
1943	>	block_state.flags.value |= SHARED_DLINE;
1944	>	} | T_UNDLINE
1945		{
1946		if (conf_parser_ctx.pass == 2)
1947	<	yy_conf->flags |= SHARED_XLINE;
1948	<	} | TXLINE
1947	>	block_state.flags.value |= SHARED_UNDLINE;
1948	>	} | XLINE
1949		{
1950		if (conf_parser_ctx.pass == 2)
1951	<	yy_conf->flags |= SHARED_TXLINE;
1951	>	block_state.flags.value |= SHARED_XLINE;
1952		} | T_UNXLINE
1953		{
1954		if (conf_parser_ctx.pass == 2)
1955	<	yy_conf->flags |= SHARED_UNXLINE;
1955	>	block_state.flags.value |= SHARED_UNXLINE;
1956		} | RESV
1957		{
1958		if (conf_parser_ctx.pass == 2)
1959	<	yy_conf->flags |= SHARED_RESV;
2390	<	} | TRESV
2391	<	{
2392	<	if (conf_parser_ctx.pass == 2)
2393	<	yy_conf->flags |= SHARED_TRESV;
1959	>	block_state.flags.value |= SHARED_RESV;
1960		} | T_UNRESV
1961		{
1962		if (conf_parser_ctx.pass == 2)
1963	<	yy_conf->flags |= SHARED_UNRESV;
1963	>	block_state.flags.value |= SHARED_UNRESV;
1964		} | T_LOCOPS
1965		{
1966		if (conf_parser_ctx.pass == 2)
1967	<	yy_conf->flags |= SHARED_LOCOPS;
1967	>	block_state.flags.value |= SHARED_LOCOPS;
1968		} | T_ALL
1969		{
1970		if (conf_parser_ctx.pass == 2)
1971	<	yy_conf->flags = SHARED_ALL;
1971	>	block_state.flags.value = SHARED_ALL;
1972		};
1973
1974		/***************************************************************************
#	Line 2410 | Line 1976 | cluster_type_item: KLINE
1976		***************************************************************************/
1977		connect_entry: CONNECT
1978		{
2413	–	if (conf_parser_ctx.pass == 2)
2414	–	{
2415	–	yy_conf = make_conf_item(SERVER_TYPE);
2416	–	yy_aconf = (struct AccessItem *)map_to_conf(yy_conf);
2417	–	yy_aconf->passwd = NULL;
2418	–	/* defaults */
2419	–	yy_aconf->port = PORTNUM;
1979
1980	<	if (ConfigFileEntry.burst_away)
1981	<	yy_aconf->flags = CONF_FLAGS_BURST_AWAY;
2423	<	}
2424	<	else
2425	<	{
2426	<	MyFree(class_name);
2427	<	class_name = NULL;
2428	<	}
2429	<	} connect_name_b '{' connect_items '}' ';'
2430	<	{
2431	<	if (conf_parser_ctx.pass == 2)
2432	<	{
2433	<	struct CollectItem *yy_hconf=NULL;
2434	<	struct CollectItem *yy_lconf=NULL;
2435	<	dlink_node *ptr;
2436	<	dlink_node *next_ptr;
2437	<	#ifdef HAVE_LIBCRYPTO
2438	<	if (yy_aconf->host &&
2439	<	((yy_aconf->passwd && yy_aconf->spasswd) ||
2440	<	(yy_aconf->rsa_public_key && IsConfCryptLink(yy_aconf))))
2441	<	#else /* !HAVE_LIBCRYPTO */
2442	<	if (yy_aconf->host && !IsConfCryptLink(yy_aconf) &&
2443	<	yy_aconf->passwd && yy_aconf->spasswd)
2444	<	#endif /* !HAVE_LIBCRYPTO */
2445	<	{
2446	<	if (conf_add_server(yy_conf, class_name) == -1)
2447	<	{
2448	<	delete_conf_item(yy_conf);
2449	<	yy_conf = NULL;
2450	<	yy_aconf = NULL;
2451	<	}
2452	<	}
2453	<	else
2454	<	{
2455	<	/* Even if yy_conf ->name is NULL
2456	<	* should still unhook any hub/leaf confs still pending
2457	<	*/
2458	<	unhook_hub_leaf_confs();
2459	<
2460	<	if (yy_conf->name != NULL)
2461	<	{
2462	<	#ifndef HAVE_LIBCRYPTO
2463	<	if (IsConfCryptLink(yy_aconf))
2464	<	yyerror("Ignoring connect block -- no OpenSSL support");
2465	<	#else
2466	<	if (IsConfCryptLink(yy_aconf) && !yy_aconf->rsa_public_key)
2467	<	yyerror("Ignoring connect block -- missing key");
2468	<	#endif
2469	<	if (yy_aconf->host == NULL)
2470	<	yyerror("Ignoring connect block -- missing host");
2471	<	else if (!IsConfCryptLink(yy_aconf) &&
2472	<	(!yy_aconf->passwd || !yy_aconf->spasswd))
2473	<	yyerror("Ignoring connect block -- missing password");
2474	<	}
2475	<
2476	<
2477	<	/* XXX
2478	<	* This fixes a try_connections() core (caused by invalid class_ptr
2479	<	* pointers) reported by metalrock. That's an ugly fix, but there
2480	<	* is currently no better way. The entire config subsystem needs an
2481	<	* rewrite ASAP. make_conf_item() shouldn't really add things onto
2482	<	* a doubly linked list immediately without any sanity checks!  -Michael
2483	<	*/
2484	<	delete_conf_item(yy_conf);
2485	<
2486	<	yy_aconf = NULL;
2487	<	yy_conf = NULL;
2488	<	}
2489	<
2490	<	/*
2491	<	* yy_conf is still pointing at the server that is having
2492	<	* a connect block built for it. This means, y_aconf->name
2493	<	* points to the actual irc name this server will be known as.
2494	<	* Now this new server has a set or even just one hub_mask (or leaf_mask)
2495	<	* given in the link list at yy_hconf. Fill in the HUB confs
2496	<	* from this link list now.
2497	<	*/
2498	<	DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
2499	<	{
2500	<	struct ConfItem *new_hub_conf;
2501	<	struct MatchItem *match_item;
1980	>	if (conf_parser_ctx.pass != 2)
1981	>	break;
1982
1983	<	yy_hconf = ptr->data;
1983	>	reset_block_state();
1984	>	block_state.port.value = PORTNUM;
1985	>	} '{' connect_items '}' ';'
1986	>	{
1987	>	struct MaskItem *conf = NULL;
1988	>	struct addrinfo hints, *res;
1989	>
1990	>	if (conf_parser_ctx.pass != 2)
1991	>	break;
1992	>
1993	>	if (!block_state.name.buf[0] ||
1994	>	!block_state.host.buf[0])
1995	>	break;
1996	>
1997	>	if (!(block_state.rpass.buf[0] ||
1998	>	block_state.spass.buf[0]))
1999	>	break;
2000	>
2001	>	if (has_wildcards(block_state.name.buf) ||
2002	>	has_wildcards(block_state.host.buf))
2003	>	break;
2004	>
2005	>	conf = conf_make(CONF_SERVER);
2006	>	conf->port = block_state.port.value;
2007	>	conf->flags = block_state.flags.value;
2008	>	conf->aftype = block_state.aftype.value;
2009	>	conf->host = xstrdup(block_state.host.buf);
2010	>	conf->name = xstrdup(block_state.name.buf);
2011	>	conf->passwd = xstrdup(block_state.rpass.buf);
2012	>	conf->spasswd = xstrdup(block_state.spass.buf);
2013	>	conf->cipher_list = xstrdup(block_state.ciph.buf);
2014
2015	<	/* yy_conf == NULL is a fatal error for this connect block! */
2016	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2507	<	{
2508	<	new_hub_conf = make_conf_item(HUB_TYPE);
2509	<	match_item = (struct MatchItem *)map_to_conf(new_hub_conf);
2510	<	DupString(new_hub_conf->name, yy_conf->name);
2511	<	if (yy_hconf->user != NULL)
2512	<	DupString(match_item->user, yy_hconf->user);
2513	<	else
2514	<	DupString(match_item->user, "*");
2515	<	if (yy_hconf->host != NULL)
2516	<	DupString(match_item->host, yy_hconf->host);
2517	<	else
2518	<	DupString(match_item->host, "*");
2519	<	}
2520	<	dlinkDelete(&yy_hconf->node, &hub_conf_list);
2521	<	free_collect_item(yy_hconf);
2522	<	}
2015	>	dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
2016	>	dlinkMoveList(&block_state.hub.list, &conf->hub_list);
2017
2018	<	/* Ditto for the LEAF confs */
2018	>	if (block_state.bind.buf[0])
2019	>	{
2020	>	memset(&hints, 0, sizeof(hints));
2021
2022	<	DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
2023	<	{
2024	<	struct ConfItem *new_leaf_conf;
2529	<	struct MatchItem *match_item;
2022	>	hints.ai_family   = AF_UNSPEC;
2023	>	hints.ai_socktype = SOCK_STREAM;
2024	>	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2025
2026	<	yy_lconf = ptr->data;
2026	>	if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2027	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2028	>	else
2029	>	{
2030	>	assert(res != NULL);
2031
2032	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2033	<	{
2034	<	new_leaf_conf = make_conf_item(LEAF_TYPE);
2035	<	match_item = (struct MatchItem *)map_to_conf(new_leaf_conf);
2036	<	DupString(new_leaf_conf->name, yy_conf->name);
2538	<	if (yy_lconf->user != NULL)
2539	<	DupString(match_item->user, yy_lconf->user);
2540	<	else
2541	<	DupString(match_item->user, "*");
2542	<	if (yy_lconf->host != NULL)
2543	<	DupString(match_item->host, yy_lconf->host);
2544	<	else
2545	<	DupString(match_item->host, "*");
2546	<	}
2547	<	dlinkDelete(&yy_lconf->node, &leaf_conf_list);
2548	<	free_collect_item(yy_lconf);
2549	<	}
2550	<	MyFree(class_name);
2551	<	class_name = NULL;
2552	<	yy_conf = NULL;
2553	<	yy_aconf = NULL;
2032	>	memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2033	>	conf->bind.ss.ss_family = res->ai_family;
2034	>	conf->bind.ss_len = res->ai_addrlen;
2035	>	freeaddrinfo(res);
2036	>	}
2037		}
2038	+
2039	+	conf_add_class_to_conf(conf, block_state.class.buf);
2040	+	lookup_confhost(conf);
2041		};
2042
2557	–	connect_name_b: | connect_name_t;
2043		connect_items:  connect_items connect_item | connect_item;
2044		connect_item:   connect_name | connect_host | connect_vhost |
2045		connect_send_password | connect_accept_password |
2046	<	connect_aftype | connect_port |
2047	<	connect_fakename | connect_flags | connect_hub_mask |
2048	<	connect_leaf_mask | connect_class | connect_auto |
2049	<	connect_encrypted | connect_compressed | connect_cryptlink |
2565	<	connect_rsa_public_key_file | connect_cipher_preference |
2566	<	connect_topicburst | error ';' ;
2046	>	connect_aftype | connect_port | connect_ssl_cipher_list |
2047	>	connect_flags | connect_hub_mask | connect_leaf_mask |
2048	>	connect_class | connect_encrypted |
2049	>	error ';' ;
2050
2051		connect_name: NAME '=' QSTRING ';'
2052		{
2053		if (conf_parser_ctx.pass == 2)
2054	<	{
2572	<	if (yy_conf->name != NULL)
2573	<	yyerror("Multiple connect name entry");
2574	<
2575	<	MyFree(yy_conf->name);
2576	<	DupString(yy_conf->name, yylval.string);
2577	<	}
2578	<	};
2579	<
2580	<	connect_name_t: QSTRING
2581	<	{
2582	<	if (conf_parser_ctx.pass == 2)
2583	<	{
2584	<	if (yy_conf->name != NULL)
2585	<	yyerror("Multiple connect name entry");
2586	<
2587	<	MyFree(yy_conf->name);
2588	<	DupString(yy_conf->name, yylval.string);
2589	<	}
2054	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2055		};
2056
2057		connect_host: HOST '=' QSTRING ';'
2058		{
2059		if (conf_parser_ctx.pass == 2)
2060	<	{
2596	<	MyFree(yy_aconf->host);
2597	<	DupString(yy_aconf->host, yylval.string);
2598	<	}
2060	>	strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2061		};
2062
2063		connect_vhost: VHOST '=' QSTRING ';'
2064		{
2065		if (conf_parser_ctx.pass == 2)
2066	<	{
2605	<	struct addrinfo hints, *res;
2606	<
2607	<	memset(&hints, 0, sizeof(hints));
2608	<
2609	<	hints.ai_family   = AF_UNSPEC;
2610	<	hints.ai_socktype = SOCK_STREAM;
2611	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2612	<
2613	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
2614	<	ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
2615	<	else
2616	<	{
2617	<	assert(res != NULL);
2618	<
2619	<	memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
2620	<	yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
2621	<	yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
2622	<	irc_freeaddrinfo(res);
2623	<	}
2624	<	}
2066	>	strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2067		};
2068
2069		connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2070		{
2071	<	if (conf_parser_ctx.pass == 2)
2072	<	{
2631	<	if ($3[0] == ':')
2632	<	yyerror("Server passwords cannot begin with a colon");
2633	<	else if (strchr($3, ' ') != NULL)
2634	<	yyerror("Server passwords cannot contain spaces");
2635	<	else {
2636	<	if (yy_aconf->spasswd != NULL)
2637	<	memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
2071	>	if (conf_parser_ctx.pass != 2)
2072	>	break;
2073
2074	<	MyFree(yy_aconf->spasswd);
2075	<	DupString(yy_aconf->spasswd, yylval.string);
2076	<	}
2077	<	}
2074	>	if ($3[0] == ':')
2075	>	conf_error_report("Server passwords cannot begin with a colon");
2076	>	else if (strchr($3, ' ') != NULL)
2077	>	conf_error_report("Server passwords cannot contain spaces");
2078	>	else
2079	>	strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
2080		};
2081
2082		connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2083		{
2084	<	if (conf_parser_ctx.pass == 2)
2085	<	{
2649	<	if ($3[0] == ':')
2650	<	yyerror("Server passwords cannot begin with a colon");
2651	<	else if (strchr($3, ' ') != NULL)
2652	<	yyerror("Server passwords cannot contain spaces");
2653	<	else {
2654	<	if (yy_aconf->passwd != NULL)
2655	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
2084	>	if (conf_parser_ctx.pass != 2)
2085	>	break;
2086
2087	<	MyFree(yy_aconf->passwd);
2088	<	DupString(yy_aconf->passwd, yylval.string);
2089	<	}
2090	<	}
2087	>	if ($3[0] == ':')
2088	>	conf_error_report("Server passwords cannot begin with a colon");
2089	>	else if (strchr($3, ' ') != NULL)
2090	>	conf_error_report("Server passwords cannot contain spaces");
2091	>	else
2092	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2093		};
2094
2095		connect_port: PORT '=' NUMBER ';'
2096		{
2097		if (conf_parser_ctx.pass == 2)
2098	<	yy_aconf->port = $3;
2098	>	block_state.port.value = $3;
2099		};
2100
2101		connect_aftype: AFTYPE '=' T_IPV4 ';'
2102		{
2103		if (conf_parser_ctx.pass == 2)
2104	<	yy_aconf->aftype = AF_INET;
2104	>	block_state.aftype.value = AF_INET;
2105		} | AFTYPE '=' T_IPV6 ';'
2106		{
2107		#ifdef IPV6
2108		if (conf_parser_ctx.pass == 2)
2109	<	yy_aconf->aftype = AF_INET6;
2109	>	block_state.aftype.value = AF_INET6;
2110		#endif
2111		};
2112
2681	–	connect_fakename: FAKENAME '=' QSTRING ';'
2682	–	{
2683	–	if (conf_parser_ctx.pass == 2)
2684	–	{
2685	–	MyFree(yy_aconf->fakename);
2686	–	DupString(yy_aconf->fakename, yylval.string);
2687	–	}
2688	–	};
2689	–
2113		connect_flags: IRCD_FLAGS
2114		{
2115	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2116		} '='  connect_flags_items ';';
2117
2118		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2119	<	connect_flags_item: NOT  { not_atom = 1; } connect_flags_item_atom
2696	<	|  { not_atom = 0; } connect_flags_item_atom;
2697	<
2698	<	connect_flags_item_atom: COMPRESSED
2699	<	{
2700	<	if (conf_parser_ctx.pass == 2)
2701	<	#ifndef HAVE_LIBZ
2702	<	yyerror("Ignoring flags = compressed; -- no zlib support");
2703	<	#else
2704	<	{
2705	<	if (not_atom)ClearConfCompressed(yy_aconf);
2706	<	else SetConfCompressed(yy_aconf);
2707	<	}
2708	<	#endif
2709	<	} | CRYPTLINK
2710	<	{
2711	<	if (conf_parser_ctx.pass == 2)
2712	<	{
2713	<	if (not_atom)ClearConfCryptLink(yy_aconf);
2714	<	else SetConfCryptLink(yy_aconf);
2715	<	}
2716	<	} | AUTOCONN
2717	<	{
2718	<	if (conf_parser_ctx.pass == 2)
2719	<	{
2720	<	if (not_atom)ClearConfAllowAutoConn(yy_aconf);
2721	<	else SetConfAllowAutoConn(yy_aconf);
2722	<	}
2723	<	} | BURST_AWAY
2724	<	{
2725	<	if (conf_parser_ctx.pass == 2)
2726	<	{
2727	<	if (not_atom)ClearConfAwayBurst(yy_aconf);
2728	<	else SetConfAwayBurst(yy_aconf);
2729	<	}
2730	<	} | TOPICBURST
2119	>	connect_flags_item: AUTOCONN
2120		{
2121		if (conf_parser_ctx.pass == 2)
2122	<	{
2123	<	if (not_atom)ClearConfTopicBurst(yy_aconf);
2735	<	else SetConfTopicBurst(yy_aconf);
2736	<	}
2737	<	}
2738	<	;
2739	<
2740	<	connect_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
2122	>	block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2123	>	} | T_SSL
2124		{
2742	–	#ifdef HAVE_LIBCRYPTO
2125		if (conf_parser_ctx.pass == 2)
2126	<	{
2745	<	BIO *file;
2746	<
2747	<	if (yy_aconf->rsa_public_key != NULL)
2748	<	{
2749	<	RSA_free(yy_aconf->rsa_public_key);
2750	<	yy_aconf->rsa_public_key = NULL;
2751	<	}
2752	<
2753	<	if (yy_aconf->rsa_public_key_file != NULL)
2754	<	{
2755	<	MyFree(yy_aconf->rsa_public_key_file);
2756	<	yy_aconf->rsa_public_key_file = NULL;
2757	<	}
2758	<
2759	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
2760	<
2761	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
2762	<	{
2763	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
2764	<	break;
2765	<	}
2766	<
2767	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
2768	<
2769	<	if (yy_aconf->rsa_public_key == NULL)
2770	<	{
2771	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
2772	<	break;
2773	<	}
2774	<
2775	<	BIO_set_close(file, BIO_CLOSE);
2776	<	BIO_free(file);
2777	<	}
2778	<	#endif /* HAVE_LIBCRYPTO */
2126	>	block_state.flags.value |= CONF_FLAGS_SSL;
2127		};
2128
2129		connect_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 2783 | Line 2131 | connect_encrypted: ENCRYPTED '=' TBOOL '
2131		if (conf_parser_ctx.pass == 2)
2132		{
2133		if (yylval.number)
2134	<	yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
2787	<	else
2788	<	yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
2789	<	}
2790	<	};
2791	<
2792	<	connect_cryptlink: CRYPTLINK '=' TBOOL ';'
2793	<	{
2794	<	if (conf_parser_ctx.pass == 2)
2795	<	{
2796	<	if (yylval.number)
2797	<	yy_aconf->flags |= CONF_FLAGS_CRYPTLINK;
2798	<	else
2799	<	yy_aconf->flags &= ~CONF_FLAGS_CRYPTLINK;
2800	<	}
2801	<	};
2802	<
2803	<	connect_compressed: COMPRESSED '=' TBOOL ';'
2804	<	{
2805	<	if (conf_parser_ctx.pass == 2)
2806	<	{
2807	<	if (yylval.number)
2808	<	#ifndef HAVE_LIBZ
2809	<	yyerror("Ignoring compressed=yes; -- no zlib support");
2810	<	#else
2811	<	yy_aconf->flags |= CONF_FLAGS_COMPRESSED;
2812	<	#endif
2813	<	else
2814	<	yy_aconf->flags &= ~CONF_FLAGS_COMPRESSED;
2815	<	}
2816	<	};
2817	<
2818	<	connect_auto: AUTOCONN '=' TBOOL ';'
2819	<	{
2820	<	if (conf_parser_ctx.pass == 2)
2821	<	{
2822	<	if (yylval.number)
2823	<	yy_aconf->flags |= CONF_FLAGS_ALLOW_AUTO_CONN;
2824	<	else
2825	<	yy_aconf->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN;
2826	<	}
2827	<	};
2828	<
2829	<	connect_topicburst: TOPICBURST '=' TBOOL ';'
2830	<	{
2831	<	if (conf_parser_ctx.pass == 2)
2832	<	{
2833	<	if (yylval.number)
2834	<	SetConfTopicBurst(yy_aconf);
2134	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
2135		else
2136	<	ClearConfTopicBurst(yy_aconf);
2136	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
2137		}
2138		};
2139
2140		connect_hub_mask: HUB_MASK '=' QSTRING ';'
2141		{
2142		if (conf_parser_ctx.pass == 2)
2143	<	{
2844	<	struct CollectItem *yy_tmp;
2845	<
2846	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2847	<	DupString(yy_tmp->host, yylval.string);
2848	<	DupString(yy_tmp->user, "*");
2849	<	dlinkAdd(yy_tmp, &yy_tmp->node, &hub_conf_list);
2850	<	}
2143	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2144		};
2145
2146		connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2147		{
2148		if (conf_parser_ctx.pass == 2)
2149	<	{
2857	<	struct CollectItem *yy_tmp;
2858	<
2859	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2860	<	DupString(yy_tmp->host, yylval.string);
2861	<	DupString(yy_tmp->user, "*");
2862	<	dlinkAdd(yy_tmp, &yy_tmp->node, &leaf_conf_list);
2863	<	}
2149	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
2150		};
2151
2152		connect_class: CLASS '=' QSTRING ';'
2153		{
2154		if (conf_parser_ctx.pass == 2)
2155	<	{
2870	<	MyFree(class_name);
2871	<	DupString(class_name, yylval.string);
2872	<	}
2155	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2156		};
2157
2158	<	connect_cipher_preference: CIPHER_PREFERENCE '=' QSTRING ';'
2158	>	connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2159		{
2160		#ifdef HAVE_LIBCRYPTO
2161		if (conf_parser_ctx.pass == 2)
2162	<	{
2880	<	struct EncCapability *ecap;
2881	<	const char *cipher_name;
2882	<	int found = 0;
2883	<
2884	<	yy_aconf->cipher_preference = NULL;
2885	<	cipher_name = yylval.string;
2886	<
2887	<	for (ecap = CipherTable; ecap->name; ecap++)
2888	<	{
2889	<	if ((irccmp(ecap->name, cipher_name) == 0) &&
2890	<	(ecap->cap & CAP_ENC_MASK))
2891	<	{
2892	<	yy_aconf->cipher_preference = ecap;
2893	<	found = 1;
2894	<	break;
2895	<	}
2896	<	}
2897	<
2898	<	if (!found)
2899	<	yyerror("Invalid cipher");
2900	<	}
2162	>	strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2163		#else
2164		if (conf_parser_ctx.pass == 2)
2165	<	yyerror("Ignoring cipher_preference -- no OpenSSL support");
2165	>	conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
2166		#endif
2167		};
2168
2169	+
2170		/***************************************************************************
2171		*  section kill
2172		***************************************************************************/
2173		kill_entry: KILL
2174		{
2175		if (conf_parser_ctx.pass == 2)
2176	<	{
2914	<	userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
2915	<	regex_ban = 0;
2916	<	}
2176	>	reset_block_state();
2177		} '{' kill_items '}' ';'
2178		{
2179	<	if (conf_parser_ctx.pass == 2)
2920	<	{
2921	<	if (userbuf[0] && hostbuf[0])
2922	<	{
2923	<	if (regex_ban)
2924	<	{
2925	<	#ifdef HAVE_LIBPCRE
2926	<	void *exp_user = NULL;
2927	<	void *exp_host = NULL;
2928	<	const char *errptr = NULL;
2929	<
2930	<	if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
2931	<	!(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
2932	<	{
2933	<	ilog(L_ERROR, "Failed to add regular expression based K-Line: %s",
2934	<	errptr);
2935	<	break;
2936	<	}
2937	<
2938	<	yy_aconf = map_to_conf(make_conf_item(RKLINE_TYPE));
2939	<	yy_aconf->regexuser = exp_user;
2940	<	yy_aconf->regexhost = exp_host;
2941	<
2942	<	DupString(yy_aconf->user, userbuf);
2943	<	DupString(yy_aconf->host, hostbuf);
2179	>	struct MaskItem *conf = NULL;
2180
2181	<	if (reasonbuf[0])
2182	<	DupString(yy_aconf->reason, reasonbuf);
2947	<	else
2948	<	DupString(yy_aconf->reason, "No reason");
2949	<	#else
2950	<	ilog(L_ERROR, "Failed to add regular expression based K-Line: no PCRE support");
2951	<	break;
2952	<	#endif
2953	<	}
2954	<	else
2955	<	{
2956	<	yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
2181	>	if (conf_parser_ctx.pass != 2)
2182	>	break;
2183
2184	<	DupString(yy_aconf->user, userbuf);
2185	<	DupString(yy_aconf->host, hostbuf);
2184	>	if (!block_state.user.buf[0] ||
2185	>	!block_state.host.buf[0])
2186	>	break;
2187
2188	<	if (reasonbuf[0])
2189	<	DupString(yy_aconf->reason, reasonbuf);
2190	<	else
2964	<	DupString(yy_aconf->reason, "No reason");
2965	<	add_conf_by_address(CONF_KILL, yy_aconf);
2966	<	}
2967	<	}
2188	>	conf = conf_make(CONF_KLINE);
2189	>	conf->user = xstrdup(block_state.user.buf);
2190	>	conf->host = xstrdup(block_state.host.buf);
2191
2192	<	yy_aconf = NULL;
2193	<	}
2192	>	if (block_state.rpass.buf[0])
2193	>	conf->reason = xstrdup(block_state.rpass.buf);
2194	>	else
2195	>	conf->reason = xstrdup(CONF_NOREASON);
2196	>	add_conf_by_address(CONF_KLINE, conf);
2197		};
2198
2973	–	kill_type: TYPE
2974	–	{
2975	–	} '='  kill_type_items ';';
2976	–
2977	–	kill_type_items: kill_type_items ',' kill_type_item | kill_type_item;
2978	–	kill_type_item: REGEX_T
2979	–	{
2980	–	if (conf_parser_ctx.pass == 2)
2981	–	regex_ban = 1;
2982	–	};
2983	–
2199		kill_items:     kill_items kill_item | kill_item;
2200	<	kill_item:      kill_user | kill_reason | kill_type | error;
2200	>	kill_item:      kill_user | kill_reason | error;
2201
2202		kill_user: USER '=' QSTRING ';'
2203		{
2204	+
2205		if (conf_parser_ctx.pass == 2)
2206		{
2207		struct split_nuh_item nuh;
2208
2209		nuh.nuhmask  = yylval.string;
2210		nuh.nickptr  = NULL;
2211	<	nuh.userptr  = userbuf;
2212	<	nuh.hostptr  = hostbuf;
2211	>	nuh.userptr  = block_state.user.buf;
2212	>	nuh.hostptr  = block_state.host.buf;
2213
2214		nuh.nicksize = 0;
2215	<	nuh.usersize = sizeof(userbuf);
2216	<	nuh.hostsize = sizeof(hostbuf);
2215	>	nuh.usersize = sizeof(block_state.user.buf);
2216	>	nuh.hostsize = sizeof(block_state.host.buf);
2217
2218		split_nuh(&nuh);
2219		}
#	Line 3006 | Line 2222 | kill_user: USER '=' QSTRING ';'
2222		kill_reason: REASON '=' QSTRING ';'
2223		{
2224		if (conf_parser_ctx.pass == 2)
2225	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2225	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2226		};
2227
2228		/***************************************************************************
#	Line 3015 | Line 2231 | kill_reason: REASON '=' QSTRING ';'
2231		deny_entry: DENY
2232		{
2233		if (conf_parser_ctx.pass == 2)
2234	<	hostbuf[0] = reasonbuf[0] = '\0';
2234	>	reset_block_state();
2235		} '{' deny_items '}' ';'
2236		{
2237	<	if (conf_parser_ctx.pass == 2)
2237	>	struct MaskItem *conf = NULL;
2238	>
2239	>	if (conf_parser_ctx.pass != 2)
2240	>	break;
2241	>
2242	>	if (!block_state.addr.buf[0])
2243	>	break;
2244	>
2245	>	if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2246		{
2247	<	if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
2248	<	{
3025	<	yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
3026	<	DupString(yy_aconf->host, hostbuf);
2247	>	conf = conf_make(CONF_DLINE);
2248	>	conf->host = xstrdup(block_state.addr.buf);
2249
2250	<	if (reasonbuf[0])
2251	<	DupString(yy_aconf->reason, reasonbuf);
2252	<	else
2253	<	DupString(yy_aconf->reason, "No reason");
2254	<	add_conf_by_address(CONF_DLINE, yy_aconf);
3033	<	yy_aconf = NULL;
3034	<	}
2250	>	if (block_state.rpass.buf[0])
2251	>	conf->reason = xstrdup(block_state.rpass.buf);
2252	>	else
2253	>	conf->reason = xstrdup(CONF_NOREASON);
2254	>	add_conf_by_address(CONF_DLINE, conf);
2255		}
2256		};
2257
#	Line 3041 | Line 2261 | deny_item:      deny_ip | deny_reason |
2261		deny_ip: IP '=' QSTRING ';'
2262		{
2263		if (conf_parser_ctx.pass == 2)
2264	<	strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
2264	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2265		};
2266
2267		deny_reason: REASON '=' QSTRING ';'
2268		{
2269		if (conf_parser_ctx.pass == 2)
2270	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2270	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2271		};
2272
2273		/***************************************************************************
#	Line 3064 | Line 2284 | exempt_ip: IP '=' QSTRING ';'
2284		{
2285		if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2286		{
2287	<	yy_aconf = map_to_conf(make_conf_item(EXEMPTDLINE_TYPE));
2288	<	DupString(yy_aconf->host, yylval.string);
2287	>	struct MaskItem *conf = conf_make(CONF_EXEMPT);
2288	>	conf->host = xstrdup(yylval.string);
2289
2290	<	add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
3071	<	yy_aconf = NULL;
2290	>	add_conf_by_address(CONF_EXEMPT, conf);
2291		}
2292		}
2293		};
#	Line 3079 | Line 2298 | exempt_ip: IP '=' QSTRING ';'
2298		gecos_entry: GECOS
2299		{
2300		if (conf_parser_ctx.pass == 2)
2301	<	{
3083	<	regex_ban = 0;
3084	<	reasonbuf[0] = gecos_name[0] = '\0';
3085	<	}
2301	>	reset_block_state();
2302		} '{' gecos_items '}' ';'
2303		{
2304	<	if (conf_parser_ctx.pass == 2)
3089	<	{
3090	<	if (gecos_name[0])
3091	<	{
3092	<	if (regex_ban)
3093	<	{
3094	<	#ifdef HAVE_LIBPCRE
3095	<	void *exp_p = NULL;
3096	<	const char *errptr = NULL;
3097	<
3098	<	if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
3099	<	{
3100	<	ilog(L_ERROR, "Failed to add regular expression based X-Line: %s",
3101	<	errptr);
3102	<	break;
3103	<	}
3104	<
3105	<	yy_conf = make_conf_item(RXLINE_TYPE);
3106	<	yy_conf->regexpname = exp_p;
3107	<	#else
3108	<	ilog(L_ERROR, "Failed to add regular expression based X-Line: no PCRE support");
3109	<	break;
3110	<	#endif
3111	<	}
3112	<	else
3113	<	yy_conf = make_conf_item(XLINE_TYPE);
2304	>	struct MaskItem *conf = NULL;
2305
2306	<	yy_match_item = map_to_conf(yy_conf);
2307	<	DupString(yy_conf->name, gecos_name);
2306	>	if (conf_parser_ctx.pass != 2)
2307	>	break;
2308
2309	<	if (reasonbuf[0])
2310	<	DupString(yy_match_item->reason, reasonbuf);
3120	<	else
3121	<	DupString(yy_match_item->reason, "No reason");
3122	<	}
3123	<	}
3124	<	};
2309	>	if (!block_state.name.buf[0])
2310	>	break;
2311
2312	<	gecos_flags: TYPE
2313	<	{
3128	<	} '='  gecos_flags_items ';';
2312	>	conf = conf_make(CONF_XLINE);
2313	>	conf->name = xstrdup(block_state.name.buf);
2314
2315	<	gecos_flags_items: gecos_flags_items ',' gecos_flags_item | gecos_flags_item;
2316	<	gecos_flags_item: REGEX_T
2317	<	{
2318	<	if (conf_parser_ctx.pass == 2)
3134	<	regex_ban = 1;
2315	>	if (block_state.rpass.buf[0])
2316	>	conf->reason = xstrdup(block_state.rpass.buf);
2317	>	else
2318	>	conf->reason = xstrdup(CONF_NOREASON);
2319		};
2320
2321		gecos_items: gecos_items gecos_item | gecos_item;
2322	<	gecos_item:  gecos_name | gecos_reason | gecos_flags | error;
2322	>	gecos_item:  gecos_name | gecos_reason | error;
2323
2324		gecos_name: NAME '=' QSTRING ';'
2325		{
2326		if (conf_parser_ctx.pass == 2)
2327	<	strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
2327	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2328		};
2329
2330		gecos_reason: REASON '=' QSTRING ';'
2331		{
2332		if (conf_parser_ctx.pass == 2)
2333	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2333	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2334		};
2335
2336		/***************************************************************************
#	Line 3161 | Line 2345 | general_item:       general_hide_spoof_i
2345		general_max_nick_time | general_max_nick_changes |
2346		general_max_accept | general_anti_spam_exit_message_time |
2347		general_ts_warn_delta | general_ts_max_delta |
2348	<	general_kill_chase_time_limit | general_kline_with_reason |
2349	<	general_kline_reason | general_invisible_on_connect |
2348	>	general_kill_chase_time_limit |
2349	>	general_invisible_on_connect |
2350		general_warn_no_nline | general_dots_in_ident |
2351		general_stats_o_oper_only | general_stats_k_oper_only |
2352		general_pace_wait | general_stats_i_oper_only |
2353		general_pace_wait_simple | general_stats_P_oper_only |
2354		general_short_motd | general_no_oper_flood |
2355		general_true_no_oper_flood | general_oper_pass_resv |
3172	–	general_idletime | general_message_locale |
2356		general_oper_only_umodes | general_max_targets |
2357		general_use_egd | general_egdpool_path |
2358		general_oper_umodes | general_caller_id_wait |
2359		general_opers_bypass_callerid | general_default_floodcount |
2360		general_min_nonwildcard | general_min_nonwildcard_simple |
2361	<	general_servlink_path | general_disable_remote_commands |
3179	<	general_default_cipher_preference |
3180	<	general_compression_level | general_client_flood |
2361	>	general_disable_remote_commands |
2362		general_throttle_time | general_havent_read_conf |
2363	<	general_dot_in_ip6_addr | general_ping_cookie |
2364	<	general_disable_auth | general_burst_away |
2365	<	general_tkline_expire_notices | general_gline_min_cidr |
2366	<	general_gline_min_cidr6 | general_use_whois_actually |
2367	<	general_reject_hold_time | general_stats_e_disabled |
2368	<	general_max_watch |
2363	>	general_ping_cookie |
2364	>	general_disable_auth |
2365	>	general_tkline_expire_notices | general_gline_enable |
2366	>	general_gline_duration | general_gline_request_duration |
2367	>	general_gline_min_cidr |
2368	>	general_gline_min_cidr6 |
2369	>	general_stats_e_disabled |
2370	>	general_max_watch | general_services_name |
2371		error;
2372
2373
#	Line 3193 | Line 2376 | general_max_watch: MAX_WATCH '=' NUMBER
2376		ConfigFileEntry.max_watch = $3;
2377		};
2378
2379	<	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2379	>	general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2380		{
2381	<	ConfigFileEntry.gline_min_cidr = $3;
2381	>	if (conf_parser_ctx.pass == 2)
2382	>	ConfigFileEntry.glines = yylval.number;
2383		};
2384
2385	<	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2385	>	general_gline_duration: GLINE_DURATION '=' timespec ';'
2386		{
2387	<	ConfigFileEntry.gline_min_cidr6 = $3;
2387	>	if (conf_parser_ctx.pass == 2)
2388	>	ConfigFileEntry.gline_time = $3;
2389		};
2390
2391	<	general_burst_away: BURST_AWAY '=' TBOOL ';'
2391	>	general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2392		{
2393	<	ConfigFileEntry.burst_away = yylval.number;
2393	>	if (conf_parser_ctx.pass == 2)
2394	>	ConfigFileEntry.gline_request_time = $3;
2395		};
2396
2397	<	general_use_whois_actually: USE_WHOIS_ACTUALLY '=' TBOOL ';'
2397	>	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2398		{
2399	<	ConfigFileEntry.use_whois_actually = yylval.number;
2399	>	ConfigFileEntry.gline_min_cidr = $3;
2400		};
2401
2402	<	general_reject_hold_time: TREJECT_HOLD_TIME '=' timespec ';'
2402	>	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2403		{
2404	<	GlobalSetOptions.rejecttime = yylval.number;
2404	>	ConfigFileEntry.gline_min_cidr6 = $3;
2405		};
2406
2407		general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
#	Line 3223 | Line 2409 | general_tkline_expire_notices: TKLINE_EX
2409		ConfigFileEntry.tkline_expire_notices = yylval.number;
2410		};
2411
2412	<	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' NUMBER ';'
2412	>	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2413		{
2414		ConfigFileEntry.kill_chase_time_limit = $3;
2415		};
#	Line 3288 | Line 2474 | general_havent_read_conf: HAVENT_READ_CO
2474		{
2475		if (($3 > 0) && conf_parser_ctx.pass == 1)
2476		{
2477	<	ilog(L_CRIT, "You haven't read your config file properly.");
2478	<	ilog(L_CRIT, "There is a line in the example conf that will kill your server if not removed.");
2479	<	ilog(L_CRIT, "Consider actually reading/editing the conf file, and removing this line.");
2477	>	ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
2478	>	ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
2479	>	ilog(LOG_TYPE_IRCD, "Consider actually reading/editing the conf file, and removing this line.");
2480		exit(0);
2481		}
2482		};
2483
3298	–	general_kline_with_reason: KLINE_WITH_REASON '=' TBOOL ';'
3299	–	{
3300	–	ConfigFileEntry.kline_with_reason = yylval.number;
3301	–	};
3302	–
3303	–	general_kline_reason: KLINE_REASON '=' QSTRING ';'
3304	–	{
3305	–	if (conf_parser_ctx.pass == 2)
3306	–	{
3307	–	MyFree(ConfigFileEntry.kline_reason);
3308	–	DupString(ConfigFileEntry.kline_reason, yylval.string);
3309	–	}
3310	–	};
3311	–
2484		general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2485		{
2486		ConfigFileEntry.invisible_on_connect = yylval.number;
#	Line 3390 | Line 2562 | general_oper_pass_resv: OPER_PASS_RESV '
2562		ConfigFileEntry.oper_pass_resv = yylval.number;
2563		};
2564
3393	–	general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
3394	–	{
3395	–	if (conf_parser_ctx.pass == 2)
3396	–	{
3397	–	if (strlen(yylval.string) > LOCALE_LENGTH-2)
3398	–	yylval.string[LOCALE_LENGTH-1] = '\0';
3399	–
3400	–	set_locale(yylval.string);
3401	–	}
3402	–	};
3403	–
3404	–	general_idletime: IDLETIME '=' timespec ';'
3405	–	{
3406	–	ConfigFileEntry.idletime = $3;
3407	–	};
3408	–
2565		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2566		{
2567		ConfigFileEntry.dots_in_ident = $3;
#	Line 3416 | Line 2572 | general_max_targets: MAX_TARGETS '=' NUM
2572		ConfigFileEntry.max_targets = $3;
2573		};
2574
2575	<	general_servlink_path: SERVLINK_PATH '=' QSTRING ';'
3420	<	{
3421	<	if (conf_parser_ctx.pass == 2)
3422	<	{
3423	<	MyFree(ConfigFileEntry.servlink_path);
3424	<	DupString(ConfigFileEntry.servlink_path, yylval.string);
3425	<	}
3426	<	};
3427	<
3428	<	general_default_cipher_preference: DEFAULT_CIPHER_PREFERENCE '=' QSTRING ';'
2575	>	general_use_egd: USE_EGD '=' TBOOL ';'
2576		{
2577	<	#ifdef HAVE_LIBCRYPTO
3431	<	if (conf_parser_ctx.pass == 2)
3432	<	{
3433	<	struct EncCapability *ecap;
3434	<	const char *cipher_name;
3435	<	int found = 0;
3436	<
3437	<	ConfigFileEntry.default_cipher_preference = NULL;
3438	<	cipher_name = yylval.string;
3439	<
3440	<	for (ecap = CipherTable; ecap->name; ecap++)
3441	<	{
3442	<	if ((irccmp(ecap->name, cipher_name) == 0) &&
3443	<	(ecap->cap & CAP_ENC_MASK))
3444	<	{
3445	<	ConfigFileEntry.default_cipher_preference = ecap;
3446	<	found = 1;
3447	<	break;
3448	<	}
3449	<	}
3450	<
3451	<	if (!found)
3452	<	yyerror("Invalid cipher");
3453	<	}
3454	<	#else
3455	<	if (conf_parser_ctx.pass == 2)
3456	<	yyerror("Ignoring default_cipher_preference -- no OpenSSL support");
3457	<	#endif
2577	>	ConfigFileEntry.use_egd = yylval.number;
2578		};
2579
2580	<	general_compression_level: COMPRESSION_LEVEL '=' NUMBER ';'
2580	>	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
2581		{
2582		if (conf_parser_ctx.pass == 2)
2583		{
2584	<	ConfigFileEntry.compression_level = $3;
2585	<	#ifndef HAVE_LIBZ
3466	<	yyerror("Ignoring compression_level -- no zlib support");
3467	<	#else
3468	<	if ((ConfigFileEntry.compression_level < 1) ||
3469	<	(ConfigFileEntry.compression_level > 9))
3470	<	{
3471	<	yyerror("Ignoring invalid compression_level, using default");
3472	<	ConfigFileEntry.compression_level = 0;
3473	<	}
3474	<	#endif
2584	>	MyFree(ConfigFileEntry.egdpool_path);
2585	>	ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
2586		}
2587		};
2588
2589	<	general_use_egd: USE_EGD '=' TBOOL ';'
3479	<	{
3480	<	ConfigFileEntry.use_egd = yylval.number;
3481	<	};
3482	<
3483	<	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
2589	>	general_services_name: T_SERVICES_NAME '=' QSTRING ';'
2590		{
2591	<	if (conf_parser_ctx.pass == 2)
2591	>	if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2592		{
2593	<	MyFree(ConfigFileEntry.egdpool_path);
2594	<	DupString(ConfigFileEntry.egdpool_path, yylval.string);
2593	>	MyFree(ConfigFileEntry.service_name);
2594	>	ConfigFileEntry.service_name = xstrdup(yylval.string);
2595		}
2596		};
2597
#	Line 3528 | Line 2634 | umode_oitem:     T_BOTS
2634		} | T_FULL
2635		{
2636		ConfigFileEntry.oper_umodes |= UMODE_FULL;
2637	+	} | HIDDEN
2638	+	{
2639	+	ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
2640		} | T_SKILL
2641		{
2642		ConfigFileEntry.oper_umodes |= UMODE_SKILL;
#	Line 3567 | Line 2676 | umode_oitem:     T_BOTS
2676		} | T_LOCOPS
2677		{
2678		ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
2679	+	} | T_NONONREG
2680	+	{
2681	+	ConfigFileEntry.oper_umodes |= UMODE_REGONLY;
2682	+	} | T_FARCONNECT
2683	+	{
2684	+	ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT;
2685		};
2686
2687		general_oper_only_umodes: OPER_ONLY_UMODES
#	Line 3596 | Line 2711 | umode_item:    T_BOTS
2711		} | T_SKILL
2712		{
2713		ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
2714	+	} | HIDDEN
2715	+	{
2716	+	ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
2717		} | T_NCHANGE
2718		{
2719		ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
#	Line 3632 | Line 2750 | umode_item:    T_BOTS
2750		} | T_LOCOPS
2751		{
2752		ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
2753	+	} | T_NONONREG
2754	+	{
2755	+	ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
2756	+	} | T_FARCONNECT
2757	+	{
2758	+	ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT;
2759		};
2760
2761		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
#	Line 3649 | Line 2773 | general_default_floodcount: DEFAULT_FLOO
2773		ConfigFileEntry.default_floodcount = $3;
2774		};
2775
3652	–	general_client_flood: T_CLIENT_FLOOD '=' sizespec ';'
3653	–	{
3654	–	ConfigFileEntry.client_flood = $3;
3655	–	};
3656	–
3657	–	general_dot_in_ip6_addr: DOT_IN_IP6_ADDR '=' TBOOL ';'
3658	–	{
3659	–	ConfigFileEntry.dot_in_ip6_addr = yylval.number;
3660	–	};
3661	–
3662	–	/***************************************************************************
3663	–	*  section glines
3664	–	***************************************************************************/
3665	–	gline_entry: GLINES
3666	–	{
3667	–	if (conf_parser_ctx.pass == 2)
3668	–	{
3669	–	yy_conf = make_conf_item(GDENY_TYPE);
3670	–	yy_aconf = map_to_conf(yy_conf);
3671	–	}
3672	–	} '{' gline_items '}' ';'
3673	–	{
3674	–	if (conf_parser_ctx.pass == 2)
3675	–	{
3676	–	/*
3677	–	* since we re-allocate yy_conf/yy_aconf after the end of action=, at the
3678	–	* end we will have one extra, so we should free it.
3679	–	*/
3680	–	if (yy_conf->name == NULL || yy_aconf->user == NULL)
3681	–	{
3682	–	delete_conf_item(yy_conf);
3683	–	yy_conf = NULL;
3684	–	yy_aconf = NULL;
3685	–	}
3686	–	}
3687	–	};
3688	–
3689	–	gline_items:        gline_items gline_item | gline_item;
3690	–	gline_item:         gline_enable |
3691	–	gline_duration |
3692	–	gline_logging |
3693	–	gline_user |
3694	–	gline_server |
3695	–	gline_action |
3696	–	error;
3697	–
3698	–	gline_enable: ENABLE '=' TBOOL ';'
3699	–	{
3700	–	if (conf_parser_ctx.pass == 2)
3701	–	ConfigFileEntry.glines = yylval.number;
3702	–	};
3703	–
3704	–	gline_duration: DURATION '=' timespec ';'
3705	–	{
3706	–	if (conf_parser_ctx.pass == 2)
3707	–	ConfigFileEntry.gline_time = $3;
3708	–	};
3709	–
3710	–	gline_logging: LOGGING
3711	–	{
3712	–	if (conf_parser_ctx.pass == 2)
3713	–	ConfigFileEntry.gline_logging = 0;
3714	–	} '=' gline_logging_types ';';
3715	–	gline_logging_types:     gline_logging_types ',' gline_logging_type_item | gline_logging_type_item;
3716	–	gline_logging_type_item: T_REJECT
3717	–	{
3718	–	if (conf_parser_ctx.pass == 2)
3719	–	ConfigFileEntry.gline_logging |= GDENY_REJECT;
3720	–	} | T_BLOCK
3721	–	{
3722	–	if (conf_parser_ctx.pass == 2)
3723	–	ConfigFileEntry.gline_logging |= GDENY_BLOCK;
3724	–	};
3725	–
3726	–	gline_user: USER '=' QSTRING ';'
3727	–	{
3728	–	if (conf_parser_ctx.pass == 2)
3729	–	{
3730	–	struct split_nuh_item nuh;
3731	–
3732	–	nuh.nuhmask  = yylval.string;
3733	–	nuh.nickptr  = NULL;
3734	–	nuh.userptr  = userbuf;
3735	–	nuh.hostptr  = hostbuf;
3736	–
3737	–	nuh.nicksize = 0;
3738	–	nuh.usersize = sizeof(userbuf);
3739	–	nuh.hostsize = sizeof(hostbuf);
3740	–
3741	–	split_nuh(&nuh);
3742	–
3743	–	if (yy_aconf->user == NULL)
3744	–	{
3745	–	DupString(yy_aconf->user, userbuf);
3746	–	DupString(yy_aconf->host, hostbuf);
3747	–	}
3748	–	else
3749	–	{
3750	–	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
3751	–
3752	–	DupString(yy_tmp->user, userbuf);
3753	–	DupString(yy_tmp->host, hostbuf);
3754	–
3755	–	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
3756	–	}
3757	–	}
3758	–	};
3759	–
3760	–	gline_server: NAME '=' QSTRING ';'
3761	–	{
3762	–	if (conf_parser_ctx.pass == 2)
3763	–	{
3764	–	MyFree(yy_conf->name);
3765	–	DupString(yy_conf->name, yylval.string);
3766	–	}
3767	–	};
3768	–
3769	–	gline_action: ACTION
3770	–	{
3771	–	if (conf_parser_ctx.pass == 2)
3772	–	yy_aconf->flags = 0;
3773	–	} '=' gdeny_types ';'
3774	–	{
3775	–	if (conf_parser_ctx.pass == 2)
3776	–	{
3777	–	struct CollectItem *yy_tmp = NULL;
3778	–	dlink_node *ptr, *next_ptr;
3779	–
3780	–	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3781	–	{
3782	–	struct AccessItem *new_aconf;
3783	–	struct ConfItem *new_conf;
3784	–
3785	–	yy_tmp = ptr->data;
3786	–	new_conf = make_conf_item(GDENY_TYPE);
3787	–	new_aconf = map_to_conf(new_conf);
3788	–
3789	–	new_aconf->flags = yy_aconf->flags;
3790	–
3791	–	if (yy_conf->name != NULL)
3792	–	DupString(new_conf->name, yy_conf->name);
3793	–	else
3794	–	DupString(new_conf->name, "*");
3795	–	if (yy_aconf->user != NULL)
3796	–	DupString(new_aconf->user, yy_tmp->user);
3797	–	else
3798	–	DupString(new_aconf->user, "*");
3799	–	if (yy_aconf->host != NULL)
3800	–	DupString(new_aconf->host, yy_tmp->host);
3801	–	else
3802	–	DupString(new_aconf->host, "*");
3803	–
3804	–	dlinkDelete(&yy_tmp->node, &col_conf_list);
3805	–	}
3806	–
3807	–	/*
3808	–	* In case someone has fed us with more than one action= after user/name
3809	–	* which would leak memory  -Michael
3810	–	*/
3811	–	if (yy_conf->name == NULL || yy_aconf->user == NULL)
3812	–	delete_conf_item(yy_conf);
3813	–
3814	–	yy_conf = make_conf_item(GDENY_TYPE);
3815	–	yy_aconf = map_to_conf(yy_conf);
3816	–	}
3817	–	};
3818	–
3819	–	gdeny_types: gdeny_types ',' gdeny_type_item | gdeny_type_item;
3820	–	gdeny_type_item: T_REJECT
3821	–	{
3822	–	if (conf_parser_ctx.pass == 2)
3823	–	yy_aconf->flags |= GDENY_REJECT;
3824	–	} | T_BLOCK
3825	–	{
3826	–	if (conf_parser_ctx.pass == 2)
3827	–	yy_aconf->flags |= GDENY_BLOCK;
3828	–	};
2776
2777		/***************************************************************************
2778		*  section channel
#	Line 3834 | Line 2781 | channel_entry: CHANNEL
2781		'{' channel_items '}' ';';
2782
2783		channel_items:      channel_items channel_item | channel_item;
2784	<	channel_item:       channel_disable_local_channels | channel_use_except |
2785	<	channel_use_invex | channel_use_knock |
2786	<	channel_max_bans | channel_knock_delay |
2787	<	channel_knock_delay_channel | channel_max_chans_per_user |
3841	<	channel_quiet_on_ban | channel_default_split_user_count |
2784	>	channel_item:       channel_max_bans |
2785	>	channel_knock_delay | channel_knock_delay_channel |
2786	>	channel_max_chans_per_user | channel_max_chans_per_oper |
2787	>	channel_default_split_user_count |
2788		channel_default_split_server_count |
2789	<	channel_no_create_on_split | channel_restrict_channels |
2790	<	channel_no_join_on_split | channel_burst_topicwho |
2789	>	channel_no_create_on_split |
2790	>	channel_no_join_on_split |
2791		channel_jflood_count | channel_jflood_time |
2792		channel_disable_fake_channels | error;
2793
#	Line 3850 | Line 2796 | channel_disable_fake_channels: DISABLE_F
2796		ConfigChannel.disable_fake_channels = yylval.number;
2797		};
2798
3853	–	channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
3854	–	{
3855	–	ConfigChannel.restrict_channels = yylval.number;
3856	–	};
3857	–
3858	–	channel_disable_local_channels: DISABLE_LOCAL_CHANNELS '=' TBOOL ';'
3859	–	{
3860	–	ConfigChannel.disable_local_channels = yylval.number;
3861	–	};
3862	–
3863	–	channel_use_except: USE_EXCEPT '=' TBOOL ';'
3864	–	{
3865	–	ConfigChannel.use_except = yylval.number;
3866	–	};
3867	–
3868	–	channel_use_invex: USE_INVEX '=' TBOOL ';'
3869	–	{
3870	–	ConfigChannel.use_invex = yylval.number;
3871	–	};
3872	–
3873	–	channel_use_knock: USE_KNOCK '=' TBOOL ';'
3874	–	{
3875	–	ConfigChannel.use_knock = yylval.number;
3876	–	};
3877	–
2799		channel_knock_delay: KNOCK_DELAY '=' timespec ';'
2800		{
2801		ConfigChannel.knock_delay = $3;
#	Line 3890 | Line 2811 | channel_max_chans_per_user: MAX_CHANS_PE
2811		ConfigChannel.max_chans_per_user = $3;
2812		};
2813
2814	<	channel_quiet_on_ban: QUIET_ON_BAN '=' TBOOL ';'
2814	>	channel_max_chans_per_oper: MAX_CHANS_PER_OPER '=' NUMBER ';'
2815		{
2816	<	ConfigChannel.quiet_on_ban = yylval.number;
2816	>	ConfigChannel.max_chans_per_oper = $3;
2817		};
2818
2819		channel_max_bans: MAX_BANS '=' NUMBER ';'
#	Line 3920 | Line 2841 | channel_no_join_on_split: NO_JOIN_ON_SPL
2841		ConfigChannel.no_join_on_split = yylval.number;
2842		};
2843
3923	–	channel_burst_topicwho: BURST_TOPICWHO '=' TBOOL ';'
3924	–	{
3925	–	ConfigChannel.burst_topicwho = yylval.number;
3926	–	};
3927	–
2844		channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
2845		{
2846		GlobalSetOptions.joinfloodcount = yylval.number;
#	Line 3943 | Line 2859 | serverhide_entry: SERVERHIDE
2859
2860		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
2861		serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
2862	+	serverhide_hide_services |
2863		serverhide_links_delay |
3947	–	serverhide_disable_hidden |
2864		serverhide_hidden | serverhide_hidden_name |
2865		serverhide_hide_server_ips |
2866		error;
#	Line 3961 | Line 2877 | serverhide_hide_servers: HIDE_SERVERS '=
2877		ConfigServerHide.hide_servers = yylval.number;
2878		};
2879
2880	+	serverhide_hide_services: HIDE_SERVICES '=' TBOOL ';'
2881	+	{
2882	+	if (conf_parser_ctx.pass == 2)
2883	+	ConfigServerHide.hide_services = yylval.number;
2884	+	};
2885	+
2886		serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2887		{
2888		if (conf_parser_ctx.pass == 2)
2889		{
2890		MyFree(ConfigServerHide.hidden_name);
2891	<	DupString(ConfigServerHide.hidden_name, yylval.string);
2891	>	ConfigServerHide.hidden_name = xstrdup(yylval.string);
2892		}
2893		};
2894
#	Line 3990 | Line 2912 | serverhide_hidden: HIDDEN '=' TBOOL ';'
2912		ConfigServerHide.hidden = yylval.number;
2913		};
2914
3993	–	serverhide_disable_hidden: DISABLE_HIDDEN '=' TBOOL ';'
3994	–	{
3995	–	if (conf_parser_ctx.pass == 2)
3996	–	ConfigServerHide.disable_hidden = yylval.number;
3997	–	};
3998	–
2915		serverhide_hide_server_ips: HIDE_SERVER_IPS '=' TBOOL ';'
2916		{
2917		if (conf_parser_ctx.pass == 2)

Diff Legend

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