ViewVC Help

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

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

Comparing:
ircd-hybrid/src/ircd_parser.y (file contents), Revision 33 by knight, Sun Oct 2 20:50:00 2005 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 1825 by michael, Sun Apr 14 19:54:48 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 26 | Line 26
26
27		#define YY_NO_UNPUT
28		#include <sys/types.h>
29	+	#include <string.h>
30
31	+	#include "config.h"
32		#include "stdinc.h"
31	–	#include "dalloca.h"
33		#include "ircd.h"
33	–	#include "tools.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 */
39	–	#include "pcre.h"
40		#include "irc_string.h"
41	–	#include "irc_getaddrinfo.h"
42	–	#include "sprintf_irc.h"
41		#include "memory.h"
42		#include "modules.h"
43	<	#include "s_serv.h" /* for CAP_LL / IsCapable */
43	>	#include "s_serv.h"
44		#include "hostmask.h"
45		#include "send.h"
46		#include "listener.h"
#	Line 54 | 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;
60	<	static struct ConfItem *yy_conf = NULL;
61	<	static struct AccessItem *yy_aconf = NULL;
62	<	static struct MatchItem *yy_match_item = NULL;
63	<	static struct ClassItem *yy_class = NULL;
64	<	static char *yy_class_name = NULL;
65	<
66	<	static dlink_list col_conf_list  = { NULL, NULL, 0 };
67	<	static dlink_list hub_conf_list  = { NULL, NULL, 0 };
68	<	static dlink_list leaf_conf_list = { NULL, NULL, 0 };
69	<	static unsigned int listener_flags = 0;
70	<	static unsigned int regex_ban = 0;
71	<	static char userbuf[IRCD_BUFSIZE];
72	<	static char hostbuf[IRCD_BUFSIZE];
73	<	static char reasonbuf[REASONLEN + 1];
74	<	static char gecos_name[REALLEN * 4];
75	<
76	<	extern dlink_list gdeny_items; /* XXX */
77	<
78	<	static char *resv_reason = NULL;
79	<	static char *listener_address = NULL;
80	<	static int not_atom = 0;
81	<
82	<	struct CollectItem {
83	<	dlink_node node;
84	<	char *name;
85	<	char *user;
86	<	char *host;
87	<	char *passwd;
88	<	int  port;
89	<	int  flags;
90	<	#ifdef HAVE_LIBCRYPTO
91	<	char *rsa_public_key_file;
92	<	RSA *rsa_public_key;
93	<	#endif
94	<	};
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;
113	<	dlink_node *next_ptr;
114	<	struct CollectItem *yy_hconf;
115	<	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 137 | Line 141 | unhook_hub_leaf_confs(void)
141		}
142
143		%token  ACCEPT_PASSWORD
140	–	%token  ACTION
144		%token  ADMIN
145		%token  AFTYPE
143	–	%token  T_ALLOW
146		%token  ANTI_NICK_FLOOD
147		%token  ANTI_SPAM_EXIT_MESSAGE_TIME
148		%token  AUTOCONN
149	<	%token  T_BLOCK
148	<	%token  BURST_AWAY
149	<	%token  BURST_TOPICWHO
150	<	%token  BYTES KBYTES MBYTES GBYTES TBYTES
149	>	%token  BYTES KBYTES MBYTES
150		%token  CALLER_ID_WAIT
151		%token  CAN_FLOOD
153	–	%token  CAN_IDLE
152		%token  CHANNEL
153		%token  CIDR_BITLEN_IPV4
154		%token  CIDR_BITLEN_IPV6
157	–	%token  CIPHER_PREFERENCE
155		%token  CLASS
159	–	%token  COMPRESSED
160	–	%token  COMPRESSION_LEVEL
156		%token  CONNECT
157		%token  CONNECTFREQ
163	–	%token  CRYPTLINK
164	–	%token  DEFAULT_CIPHER_PREFERENCE
158		%token  DEFAULT_FLOODCOUNT
159		%token  DEFAULT_SPLIT_SERVER_COUNT
160		%token  DEFAULT_SPLIT_USER_COUNT
#	Line 169 | Line 162 | unhook_hub_leaf_confs(void)
162		%token  DESCRIPTION
163		%token  DIE
164		%token  DISABLE_AUTH
165	<	%token  DISABLE_HIDDEN
173	<	%token  DISABLE_LOCAL_CHANNELS
165	>	%token  DISABLE_FAKE_CHANNELS
166		%token  DISABLE_REMOTE_COMMANDS
175	–	%token  DOT_IN_IP6_ADDR
167		%token  DOTS_IN_IDENT
177	–	%token  DURATION
168		%token  EGDPOOL_PATH
169		%token  EMAIL
180	–	%token  ENABLE
170		%token  ENCRYPTED
171		%token  EXCEED_LIMIT
172		%token  EXEMPT
173		%token  FAILED_OPER_NOTICE
185	–	%token  FAKENAME
174		%token  IRCD_FLAGS
175		%token  FLATTEN_LINKS
188	–	%token  FFAILED_OPERLOG
189	–	%token  FKILLLOG
190	–	%token  FKLINELOG
191	–	%token  FGLINELOG
192	–	%token  FIOERRLOG
193	–	%token  FOPERLOG
194	–	%token  FOPERSPYLOG
195	–	%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
202	<	%token  GLINE_TIME
182	>	%token  GLINE_REQUEST_DURATION
183		%token  GLINE_MIN_CIDR
184		%token  GLINE_MIN_CIDR6
185		%token  GLOBAL_KILL
#	Line 207 | Line 187 | unhook_hub_leaf_confs(void)
187		%token  NEED_IDENT
188		%token  HAVENT_READ_CONF
189		%token  HIDDEN
210	–	%token  HIDDEN_ADMIN
190		%token  HIDDEN_NAME
212	–	%token  HIDDEN_OPER
191		%token  HIDE_SERVER_IPS
192		%token  HIDE_SERVERS
193		%token  HIDE_SPOOF_IPS
194		%token  HOST
195		%token  HUB
196		%token  HUB_MASK
219	–	%token  IDLETIME
197		%token  IGNORE_BOGUS_TS
198		%token  INVISIBLE_ON_CONNECT
199		%token  IP
#	Line 224 | Line 201 | unhook_hub_leaf_confs(void)
201		%token  KILL_CHASE_TIME_LIMIT
202		%token  KLINE
203		%token  KLINE_EXEMPT
227	–	%token  KLINE_REASON
228	–	%token  KLINE_WITH_REASON
204		%token  KNOCK_DELAY
205		%token  KNOCK_DELAY_CHANNEL
231	–	%token  LAZYLINK
206		%token  LEAF_MASK
207		%token  LINKS_DELAY
208		%token  LISTEN
209		%token  T_LOG
236	–	%token  LOGGING
237	–	%token  LOG_LEVEL
210		%token  MAX_ACCEPT
211		%token  MAX_BANS
212	+	%token  MAX_CHANS_PER_OPER
213		%token  MAX_CHANS_PER_USER
214		%token  MAX_GLOBAL
215		%token  MAX_IDENT
216		%token  MAX_LOCAL
217		%token  MAX_NICK_CHANGES
218	+	%token  MAX_NICK_LENGTH
219		%token  MAX_NICK_TIME
220		%token  MAX_NUMBER
221		%token  MAX_TARGETS
222	+	%token  MAX_TOPIC_LENGTH
223	+	%token  MAX_WATCH
224		%token  MESSAGE_LOCALE
225		%token  MIN_NONWILDCARD
226		%token  MIN_NONWILDCARD_SIMPLE
227	+	%token  MIN_IDLE
228	+	%token  MAX_IDLE
229	+	%token  RANDOM_IDLE
230	+	%token  HIDE_IDLE_FROM_OPERS
231		%token  MODULE
232		%token  MODULES
233		%token  NAME
#	Line 260 | Line 240 | unhook_hub_leaf_confs(void)
240		%token  NO_JOIN_ON_SPLIT
241		%token  NO_OPER_FLOOD
242		%token  NO_TILDE
263	–	%token  NOT
243		%token  NUMBER
265	–	%token  NUMBER_PER_IDENT
244		%token  NUMBER_PER_CIDR
245		%token  NUMBER_PER_IP
268	–	%token  NUMBER_PER_IP_GLOBAL
246		%token  OPERATOR
247		%token  OPERS_BYPASS_CALLERID
271	–	%token  OPER_LOG
248		%token  OPER_ONLY_UMODES
249		%token  OPER_PASS_RESV
250		%token  OPER_SPY_T
251		%token  OPER_UMODES
276	–	%token  INVITE_OPS_ONLY
252		%token  JOIN_FLOOD_COUNT
253		%token  JOIN_FLOOD_TIME
254		%token  PACE_WAIT
#	Line 282 | Line 257 | unhook_hub_leaf_confs(void)
257		%token  PATH
258		%token  PING_COOKIE
259		%token  PING_TIME
285	–	%token  PING_WARNING
260		%token  PORT
261		%token  QSTRING
262		%token  QUIET_ON_BAN
#	Line 291 | Line 265 | unhook_hub_leaf_confs(void)
265		%token  REDIRSERV
266		%token  REGEX_T
267		%token  REHASH
294	–	%token  TREJECT_HOLD_TIME
268		%token  REMOTE
269		%token  REMOTEBAN
270		%token  RESTRICT_CHANNELS
298	–	%token  RESTRICTED
271		%token  RSA_PRIVATE_KEY_FILE
272		%token  RSA_PUBLIC_KEY_FILE
273		%token  SSL_CERTIFICATE_FILE
274	+	%token  SSL_DH_PARAM_FILE
275	+	%token  T_SSL_CLIENT_METHOD
276	+	%token  T_SSL_SERVER_METHOD
277	+	%token  T_SSLV3
278	+	%token  T_TLSV1
279		%token  RESV
280		%token  RESV_EXEMPT
281	<	%token  SECONDS MINUTES HOURS DAYS WEEKS
281	>	%token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
282		%token  SENDQ
283		%token  SEND_PASSWORD
284		%token  SERVERHIDE
285		%token  SERVERINFO
309	–	%token  SERVLINK_PATH
286		%token  IRCD_SID
287		%token  TKLINE_EXPIRE_NOTICES
288		%token  T_SHARED
289		%token  T_CLUSTER
290		%token  TYPE
291		%token  SHORT_MOTD
316	–	%token  SILENT
292		%token  SPOOF
293		%token  SPOOF_NOTICE
294	+	%token  STATS_E_DISABLED
295		%token  STATS_I_OPER_ONLY
296		%token  STATS_K_OPER_ONLY
297		%token  STATS_O_OPER_ONLY
298		%token  STATS_P_OPER_ONLY
299		%token  TBOOL
300		%token  TMASKED
325	–	%token  T_REJECT
301		%token  TS_MAX_DELTA
302		%token  TS_WARN_DELTA
303		%token  TWODOTS
#	Line 331 | Line 306 | unhook_hub_leaf_confs(void)
306		%token  T_SOFTCALLERID
307		%token  T_CALLERID
308		%token  T_CCONN
309	<	%token  T_CLIENT_FLOOD
309	>	%token  T_CCONN_FULL
310	>	%token  T_SSL_CIPHER_LIST
311		%token  T_DEAF
312		%token  T_DEBUG
313	<	%token  T_DRONE
313	>	%token  T_DLINE
314		%token  T_EXTERNAL
315		%token  T_FULL
316		%token  T_INVISIBLE
317		%token  T_IPV4
318		%token  T_IPV6
319		%token  T_LOCOPS
344	–	%token  T_LOGPATH
345	–	%token  T_L_CRIT
346	–	%token  T_L_DEBUG
347	–	%token  T_L_ERROR
348	–	%token  T_L_INFO
349	–	%token  T_L_NOTICE
350	–	%token  T_L_TRACE
351	–	%token  T_L_WARN
320		%token  T_MAX_CLIENTS
321		%token  T_NCHANGE
322		%token  T_OPERWALL
323	+	%token  T_RECVQ
324		%token  T_REJ
325	+	%token  T_SERVER
326		%token  T_SERVNOTICE
327	+	%token  T_SET
328		%token  T_SKILL
329		%token  T_SPY
330		%token  T_SSL
331	+	%token  T_UMODES
332		%token  T_UNAUTH
333	+	%token  T_UNDLINE
334	+	%token  T_UNLIMITED
335		%token  T_UNRESV
336		%token  T_UNXLINE
337	+	%token  T_GLOBOPS
338		%token  T_WALLOP
339	+	%token  T_WEBIRC
340	+	%token  T_RESTART
341	+	%token  T_SERVICE
342	+	%token  T_SERVICES_NAME
343		%token  THROTTLE_TIME
365	–	%token  TOPICBURST
344		%token  TRUE_NO_OPER_FLOOD
367	–	%token  TKLINE
368	–	%token  TXLINE
369	–	%token  TRESV
345		%token  UNKLINE
346		%token  USER
347		%token  USE_EGD
373	–	%token  USE_EXCEPT
374	–	%token  USE_INVEX
375	–	%token  USE_KNOCK
348		%token  USE_LOGGING
377	–	%token  USE_WHOIS_ACTUALLY
349		%token  VHOST
350		%token  VHOST6
351		%token  XLINE
381	–	%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 403 | 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 410 | Line 383 | conf_item:        admin_entry
383		| deny_entry
384		| exempt_entry
385		| general_entry
413	–	| gline_entry
386		| gecos_entry
387		| modules_entry
388		| error ';'
#	Line 443 | 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 464 | Line 444 | modules_item:   modules_module | modules
444
445		modules_module: MODULE '=' QSTRING ';'
446		{
447	<	#ifndef STATIC_MODULES /* NOOP in the static case */
448	<	if (ypass == 2)
469	<	{
470	<	char *m_bn;
471	<
472	<	m_bn = basename(yylval.string);
473	<
474	<	/* I suppose we should just ignore it if it is already loaded(since
475	<	* otherwise we would flood the opers on rehash) -A1kmm.
476	<	*/
477	<	add_conf_module(yylval.string);
478	<	}
479	<	#endif
447	>	if (conf_parser_ctx.pass == 2)
448	>	add_conf_module(libio_basename(yylval.string));
449		};
450
451		modules_path: PATH '=' QSTRING ';'
452		{
453	<	#ifndef STATIC_MODULES
485	<	if (ypass == 2)
453	>	if (conf_parser_ctx.pass == 2)
454		mod_add_path(yylval.string);
487	–	#endif
455		};
456
490	–	/***************************************************************************
491	–	*  section serverinfo
492	–	***************************************************************************/
493	–	serverinfo_entry: SERVERINFO
494	–	'{' serverinfo_items '}' ';';
457
458	<	serverinfo_items:       serverinfo_items serverinfo_item |
459	<	serverinfo_item ;
458	>	serverinfo_entry: SERVERINFO '{' serverinfo_items '}' ';';
459	>
460	>	serverinfo_items:       serverinfo_items serverinfo_item | serverinfo_item ;
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_client_method | serverinfo_ssl_server_method |
469	+	serverinfo_ssl_cipher_list |
470		error ';' ;
471
472	+
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.pass == 2 && ServerInfo.client_ctx)
481	+	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv3);
482	+	#endif
483	+	} | T_TLSV1
484	+	{
485	+	#ifdef HAVE_LIBCRYPTO
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	+	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.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.pass == 2 && ServerInfo.server_ctx)
502	+	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
503	+	#endif
504	+	};
505	+
506		serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
507		{
508		#ifdef HAVE_LIBCRYPTO
509	<	if (ypass == 2 && ServerInfo.ctx)
509	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
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.ctx,
518	<	yylval.string, SSL_FILETYPE_PEM) <= 0)
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.ctx,
528	<	ServerInfo.rsa_private_key_file, SSL_FILETYPE_PEM) <= 0)
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.ctx))
537	>	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
538	>	!SSL_CTX_check_private_key(ServerInfo.client_ctx))
539		{
540	<	yyerror("RSA private key does not match the SSL certificate public key!");
540	>	report_crypto_errors();
541	>	conf_error_report("Could not read RSA private key");
542		break;
543		}
544		}
#	Line 540 | Line 548 | serverinfo_ssl_certificate_file: SSL_CER
548		serverinfo_rsa_private_key_file: RSA_PRIVATE_KEY_FILE '=' QSTRING ';'
549		{
550		#ifdef HAVE_LIBCRYPTO
551	<	if (ypass == 1)
551	>	if (conf_parser_ctx.pass == 1)
552		{
553		BIO *file;
554
#	Line 556 | 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,
568	<	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 581 | 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 591 | 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 (ypass == 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)
609	<	DupString(ServerInfo.name, yylval.string);
652	>	conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
653	>	exit(0);
654		}
655		}
656		};
#	Line 614 | Line 658 | serverinfo_name: NAME '=' QSTRING ';'
658		serverinfo_sid: IRCD_SID '=' QSTRING ';'
659		{
660		/* this isn't rehashable */
661	<	if (ypass == 2 && !ServerInfo.sid)
661	>	if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
662		{
663	<	if ((strlen(yylval.string) == IRC_MAXSID) && IsDigit(yylval.string[0])
664	<	&& IsAlNum(yylval.string[1]) && IsAlNum(yylval.string[2]))
621	<	{
622	<	DupString(ServerInfo.sid, yylval.string);
623	<	}
663	>	if (valid_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 631 | Line 672 | serverinfo_sid: IRCD_SID '=' QSTRING ';'
672
673		serverinfo_description: DESCRIPTION '=' QSTRING ';'
674		{
675	<	if (ypass == 2)
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
682		serverinfo_network_name: NETWORK_NAME '=' QSTRING ';'
683		{
684	<	if (ypass == 2)
684	>	if (conf_parser_ctx.pass == 2)
685		{
686		char *p;
687
#	Line 648 | 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
696		serverinfo_network_desc: NETWORK_DESC '=' QSTRING ';'
697		{
698	<	if (ypass == 2)
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
705		serverinfo_vhost: VHOST '=' QSTRING ';'
706		{
707	<	if (ypass == 2 && *yylval.string != '*')
707	>	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
708		{
709		struct addrinfo hints, *res;
710
#	Line 673 | 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 682 | 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 692 | Line 733 | serverinfo_vhost: VHOST '=' QSTRING ';'
733		serverinfo_vhost6: VHOST6 '=' QSTRING ';'
734		{
735		#ifdef IPV6
736	<	if (ypass == 2 && *yylval.string != '*')
736	>	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
737		{
738		struct addrinfo hints, *res;
739
#	Line 702 | 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 711 | 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 721 | Line 762 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
762
763		serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
764		{
765	<	if (ypass == 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];
731	<	ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
732	<	yyerror(buf);
733	<	}
734	<	else if ($3 > MAXCLIENTS_MAX)
735	<	{
736	<	char buf[IRCD_BUFSIZE];
737	<	ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
738	<	yyerror(buf);
739	<	}
740	<	else
741	<	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 (ypass == 2)
790	>	if (conf_parser_ctx.pass != 2)
791	>	break;
792	>
793	>	if ($3 < 9)
794		{
795	<	if (yylval.number)
796	<	{
797	<	/* Don't become a hub if we have a lazylink active. */
798	<	if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL))
799	<	{
800	<	sendto_realops_flags(UMODE_ALL, L_ALL,
801	<	"Ignoring config file line hub=yes; "
802	<	"due to active LazyLink (%s)", uplink->name);
803	<	}
804	<	else
805	<	{
806	<	ServerInfo.hub = 1;
807	<	uplink = NULL;
808	<	delete_capability("HUB");
763	<	add_capability("HUB", CAP_HUB, 1);
764	<	}
765	<	}
766	<	else if (ServerInfo.hub)
767	<	{
768	<	dlink_node *ptr = NULL;
795	>	conf_error_report("max_nick_length too low, setting to 9");
796	>	ServerInfo.max_nick_length = 9;
797	>	}
798	>	else if ($3 > NICKLEN)
799	>	{
800	>	char buf[IRCD_BUFSIZE];
801	>
802	>	snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
803	>	conf_error_report(buf);
804	>	ServerInfo.max_nick_length = NICKLEN;
805	>	}
806	>	else
807	>	ServerInfo.max_nick_length = $3;
808	>	};
809
810	<	ServerInfo.hub = 0;
811	<	delete_capability("HUB");
810	>	serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
811	>	{
812	>	if (conf_parser_ctx.pass != 2)
813	>	break;
814
815	<	/* Don't become a leaf if we have a lazylink active. */
816	<	DLINK_FOREACH(ptr, serv_list.head)
817	<	{
818	<	const struct Client *acptr = ptr->data;
777	<	if (MyConnect(acptr) && IsCapable(acptr, CAP_LL))
778	<	{
779	<	sendto_realops_flags(UMODE_ALL, L_ALL,
780	<	"Ignoring config file line hub=no; "
781	<	"due to active LazyLink (%s)",
782	<	acptr->name);
783	<	add_capability("HUB", CAP_HUB, 1);
784	<	ServerInfo.hub = 1;
785	<	break;
786	<	}
787	<	}
788	<	}
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 846 | admin_item:  admin_name | admin_descript
846
847		admin_name: NAME '=' QSTRING ';'
848		{
849	<	if (ypass == 2)
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
856		admin_email: EMAIL '=' QSTRING ';'
857		{
858	<	if (ypass == 2)
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
865		admin_description: DESCRIPTION '=' QSTRING ';'
866		{
867	<	if (ypass == 2)
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 |
835	<	logging_item ;
836	<
837	<	logging_item:           logging_path | logging_oper_log |
838	<	logging_log_level |
839	<	logging_use_logging | logging_fuserlog |
840	<	logging_foperlog | logging_fglinelog |
841	<	logging_fklinelog | logging_killlog |
842	<	logging_foperspylog | logging_ioerrlog |
843	<	logging_ffailed_operlog |
880	>	logging_item:           logging_use_logging | logging_file_entry |
881		error ';' ;
882
883	<	logging_path:           T_LOGPATH '=' QSTRING ';'
847	<	{
848	<	};
849	<
850	<	logging_oper_log:       OPER_LOG '=' QSTRING ';'
851	<	{
852	<	};
853	<
854	<	logging_fuserlog: FUSERLOG '=' QSTRING ';'
883	>	logging_use_logging: USE_LOGGING '=' TBOOL ';'
884		{
885	<	if (ypass == 2)
886	<	strlcpy(ConfigLoggingEntry.userlog, yylval.string,
858	<	sizeof(ConfigLoggingEntry.userlog));
885	>	if (conf_parser_ctx.pass == 2)
886	>	ConfigLoggingEntry.use_logging = yylval.number;
887		};
888
889	<	logging_ffailed_operlog: FFAILED_OPERLOG '=' QSTRING ';'
889	>	logging_file_entry:
890		{
891	<	if (ypass == 2)
892	<	strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
893	<	sizeof(ConfigLoggingEntry.failed_operlog));
866	<	};
867	<
868	<	logging_foperlog: FOPERLOG '=' QSTRING ';'
891	>	if (conf_parser_ctx.pass == 2)
892	>	reset_block_state();
893	>	} T_FILE  '{' logging_file_items '}' ';'
894		{
895	<	if (ypass == 2)
896	<	strlcpy(ConfigLoggingEntry.operlog, yylval.string,
872	<	sizeof(ConfigLoggingEntry.operlog));
873	<	};
895	>	if (conf_parser_ctx.pass != 2)
896	>	break;
897
898	<	logging_foperspylog: FOPERSPYLOG '=' QSTRING ';'
899	<	{
900	<	if (ypass == 2)
878	<	strlcpy(ConfigLoggingEntry.operspylog, yylval.string,
879	<	sizeof(ConfigLoggingEntry.operspylog));
898	>	if (block_state.type.value && block_state.file.buf[0])
899	>	log_add_file(block_state.type.value, block_state.size.value,
900	>	block_state.file.buf);
901		};
902
903	<	logging_fglinelog: FGLINELOG '=' QSTRING ';'
904	<	{
884	<	if (ypass == 2)
885	<	strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
886	<	sizeof(ConfigLoggingEntry.glinelog));
887	<	};
903	>	logging_file_items: logging_file_items logging_file_item |
904	>	logging_file_item ;
905
906	<	logging_fklinelog: FKLINELOG '=' QSTRING ';'
907	<	{
891	<	if (ypass == 2)
892	<	strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
893	<	sizeof(ConfigLoggingEntry.klinelog));
894	<	};
906	>	logging_file_item:  logging_file_name | logging_file_type |
907	>	logging_file_size | error ';' ;
908
909	<	logging_ioerrlog: FIOERRLOG '=' QSTRING ';'
909	>	logging_file_name: NAME '=' QSTRING ';'
910		{
911	<	if (ypass == 2)
912	<	strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
900	<	sizeof(ConfigLoggingEntry.ioerrlog));
901	<	};
911	>	if (conf_parser_ctx.pass != 2)
912	>	break;
913
914	<	logging_killlog: FKILLLOG '=' QSTRING ';'
914	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
915	>	}
916	>
917	>	logging_file_size: T_SIZE '=' sizespec ';'
918		{
919	<	if (ypass == 2)
920	<	strlcpy(ConfigLoggingEntry.killlog, yylval.string,
921	<	sizeof(ConfigLoggingEntry.killlog));
919	>	block_state.size.value = $3;
920	>	} | T_SIZE '=' T_UNLIMITED ';'
921	>	{
922	>	block_state.size.value = 0;
923		};
924
925	<	logging_log_level: LOG_LEVEL '=' T_L_CRIT ';'
911	<	{
912	<	if (ypass == 2)
913	<	set_log_level(L_CRIT);
914	<	} | LOG_LEVEL '=' T_L_ERROR ';'
915	<	{
916	<	if (ypass == 2)
917	<	set_log_level(L_ERROR);
918	<	} | LOG_LEVEL '=' T_L_WARN ';'
919	<	{
920	<	if (ypass == 2)
921	<	set_log_level(L_WARN);
922	<	} | LOG_LEVEL '=' T_L_NOTICE ';'
923	<	{
924	<	if (ypass == 2)
925	<	set_log_level(L_NOTICE);
926	<	} | LOG_LEVEL '=' T_L_TRACE ';'
927	<	{
928	<	if (ypass == 2)
929	<	set_log_level(L_TRACE);
930	<	} | LOG_LEVEL '=' T_L_INFO ';'
931	<	{
932	<	if (ypass == 2)
933	<	set_log_level(L_INFO);
934	<	} | LOG_LEVEL '=' T_L_DEBUG ';'
925	>	logging_file_type: TYPE
926		{
927	<	if (ypass == 2)
928	<	set_log_level(L_DEBUG);
929	<	};
927	>	if (conf_parser_ctx.pass == 2)
928	>	block_state.type.value = 0;
929	>	} '='  logging_file_type_items ';' ;
930
931	<	logging_use_logging: USE_LOGGING '=' TBOOL ';'
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 (ypass == 2)
935	<	ConfigLoggingEntry.use_logging = yylval.number;
934	>	if (conf_parser_ctx.pass == 2)
935	>	block_state.type.value = LOG_TYPE_USER;
936	>	} | OPERATOR
937	>	{
938	>	if (conf_parser_ctx.pass == 2)
939	>	block_state.type.value = LOG_TYPE_OPER;
940	>	} | GLINE
941	>	{
942	>	if (conf_parser_ctx.pass == 2)
943	>	block_state.type.value = LOG_TYPE_GLINE;
944	>	} | T_DLINE
945	>	{
946	>	if (conf_parser_ctx.pass == 2)
947	>	block_state.type.value = LOG_TYPE_DLINE;
948	>	} | KLINE
949	>	{
950	>	if (conf_parser_ctx.pass == 2)
951	>	block_state.type.value = LOG_TYPE_KLINE;
952	>	} | KILL
953	>	{
954	>	if (conf_parser_ctx.pass == 2)
955	>	block_state.type.value = LOG_TYPE_KILL;
956	>	} | T_DEBUG
957	>	{
958	>	if (conf_parser_ctx.pass == 2)
959	>	block_state.type.value = LOG_TYPE_DEBUG;
960		};
961
962	+
963		/***************************************************************************
964		* section oper
965		***************************************************************************/
966		oper_entry: OPERATOR
967		{
968	<	if (ypass == 2)
969	<	{
953	<	yy_conf = make_conf_item(OPER_TYPE);
954	<	yy_aconf = map_to_conf(yy_conf);
955	<	SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
956	<	}
957	<	else
958	<	{
959	<	MyFree(class_name);
960	<	class_name = NULL;
961	<	}
962	<	} oper_name_b '{' oper_items '}' ';'
963	<	{
964	<	if (ypass == 2)
965	<	{
966	<	struct CollectItem *yy_tmp;
967	<	dlink_node *ptr;
968	<	dlink_node *next_ptr;
968	>	if (conf_parser_ctx.pass != 2)
969	>	break;
970
971	<	conf_add_class_to_conf(yy_conf, class_name);
971	>	reset_block_state();
972	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
973	>	} '{' oper_items '}' ';'
974	>	{
975	>	dlink_node *ptr = NULL;
976
977	<	/* Now, make sure there is a copy of the "base" given oper
978	<	* block in each of the collected copies
974	<	*/
977	>	if (conf_parser_ctx.pass != 2)
978	>	break;
979
980	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
981	<	{
982	<	struct AccessItem *new_aconf;
983	<	struct ConfItem *new_conf;
984	<	yy_tmp = ptr->data;
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	<	new_conf = make_conf_item(OPER_TYPE);
992	<	new_aconf = (struct AccessItem *)map_to_conf(new_conf);
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->flags = yy_aconf->flags;
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	>	conf        = conf_make(CONF_OPER);
1006	>	conf->name  = xstrdup(block_state.name.buf);
1007	>	conf->user  = xstrdup(block_state.user.buf);
1008	>	conf->host  = xstrdup(block_state.host.buf);
1009	>
1010	>	if (block_state.rpass.buf[0])
1011	>	conf->passwd = xstrdup(block_state.rpass.buf);
1012	>
1013	>	conf->flags = block_state.flags.value;
1014	>	conf->modes = block_state.modes.value;
1015	>	conf->port  = block_state.port.value;
1016	>	conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
1017
1018	<	if (yy_conf->name != NULL)
988	<	DupString(new_conf->name, yy_conf->name);
989	<	if (yy_tmp->user != NULL)
990	<	DupString(new_aconf->user, yy_tmp->user);
991	<	else
992	<	DupString(new_aconf->user, "*");
993	<	if (yy_tmp->host != NULL)
994	<	DupString(new_aconf->host, yy_tmp->host);
995	<	else
996	<	DupString(new_aconf->host, "*");
997	<	conf_add_class_to_conf(new_conf, class_name);
998	<	if (yy_aconf->passwd != NULL)
999	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1018	>	conf_add_class_to_conf(conf, block_state.class.buf);
1019
1001	–	new_aconf->port = yy_aconf->port;
1020		#ifdef HAVE_LIBCRYPTO
1021	<	if (yy_aconf->rsa_public_key_file != NULL)
1022	<	{
1023	<	BIO *file;
1024	<
1007	<	DupString(new_aconf->rsa_public_key_file,
1008	<	yy_aconf->rsa_public_key_file);
1009	<
1010	<	file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
1011	<	new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
1012	<	NULL, 0, NULL);
1013	<	BIO_set_close(file, BIO_CLOSE);
1014	<	BIO_free(file);
1015	<	}
1016	<	#endif
1021	>	if (block_state.file.buf[0])
1022	>	{
1023	>	BIO *file = NULL;
1024	>	RSA *pkey = NULL;
1025
1026	<	#ifdef HAVE_LIBCRYPTO
1019	<	if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
1020	<	&& yy_tmp->host)
1021	<	#else
1022	<	if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
1023	<	#endif
1026	>	if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
1027		{
1028	<	conf_add_class_to_conf(new_conf, class_name);
1029	<	if (yy_tmp->name != NULL)
1027	<	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);
1032	<	}
1032	>	if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
1033	>	conf_error_report("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1034
1035	<	yy_conf = NULL;
1036	<	yy_aconf = NULL;
1037	<
1038	<
1039	<	MyFree(class_name);
1039	<	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
1043	–	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 |
1046	<	oper_class | oper_global_kill | oper_remote |
1048	<	oper_kline | oper_xline | oper_unkline |
1049	<	oper_gline | oper_nick_changes | oper_remoteban |
1050	<	oper_die | oper_rehash | oper_admin | oper_operwall |
1051	<	oper_encrypted | oper_rsa_public_key_file |
1052	<	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 (ypass == 2)
1051	<	{
1058	<	if (strlen(yylval.string) > OPERNICKLEN)
1059	<	yylval.string[OPERNICKLEN] = '\0';
1060	<
1061	<	MyFree(yy_conf->name);
1062	<	DupString(yy_conf->name, yylval.string);
1063	<	}
1064	<	};
1065	<
1066	<	oper_name_t: QSTRING
1067	<	{
1068	<	if (ypass == 2)
1069	<	{
1070	<	if (strlen(yylval.string) > OPERNICKLEN)
1071	<	yylval.string[OPERNICKLEN] = '\0';
1072	<
1073	<	MyFree(yy_conf->name);
1074	<	DupString(yy_conf->name, yylval.string);
1075	<	}
1050	>	if (conf_parser_ctx.pass == 2)
1051	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1052		};
1053
1054		oper_user: USER '=' QSTRING ';'
1055		{
1056	<	if (ypass == 2)
1057	<	{
1082	<	struct CollectItem *yy_tmp;
1083	<
1084	<	if (yy_aconf->user == NULL)
1085	<	{
1086	<	split_nuh(yylval.string, NULL, &yy_aconf->user, &yy_aconf->host);
1087	<	}
1088	<	else
1089	<	{
1090	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
1091	<	split_nuh(yylval.string, NULL, &yy_tmp->user, &yy_tmp->host);
1092	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1093	<	}
1094	<	}
1056	>	if (conf_parser_ctx.pass == 2)
1057	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1058		};
1059
1060		oper_password: PASSWORD '=' QSTRING ';'
1061		{
1062	<	if (ypass == 2)
1063	<	{
1101	<	if (yy_aconf->passwd != NULL)
1102	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1103	<
1104	<	MyFree(yy_aconf->passwd);
1105	<	DupString(yy_aconf->passwd, yylval.string);
1106	<	}
1062	>	if (conf_parser_ctx.pass == 2)
1063	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1064		};
1065
1066		oper_encrypted: ENCRYPTED '=' TBOOL ';'
1067		{
1068	<	if (ypass == 2)
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		{
1079	<	#ifdef HAVE_LIBCRYPTO
1080	<	if (ypass == 2)
1124	<	{
1125	<	BIO *file;
1126	<
1127	<	if (yy_aconf->rsa_public_key != NULL)
1128	<	{
1129	<	RSA_free(yy_aconf->rsa_public_key);
1130	<	yy_aconf->rsa_public_key = NULL;
1131	<	}
1132	<
1133	<	if (yy_aconf->rsa_public_key_file != NULL)
1134	<	{
1135	<	MyFree(yy_aconf->rsa_public_key_file);
1136	<	yy_aconf->rsa_public_key_file = NULL;
1137	<	}
1138	<
1139	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
1140	<	file = BIO_new_file(yylval.string, "r");
1141	<
1142	<	if (file == NULL)
1143	<	{
1144	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
1145	<	break;
1146	<	}
1147	<
1148	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
1149	<
1150	<	if (yy_aconf->rsa_public_key == NULL)
1151	<	{
1152	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1153	<	break;
1154	<	}
1155	<
1156	<	BIO_set_close(file, BIO_CLOSE);
1157	<	BIO_free(file);
1158	<	}
1159	<	#endif /* HAVE_LIBCRYPTO */
1079	>	if (conf_parser_ctx.pass == 2)
1080	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
1081		};
1082
1083		oper_class: CLASS '=' QSTRING ';'
1084		{
1085	<	if (ypass == 2)
1086	<	{
1166	<	MyFree(class_name);
1167	<	DupString(class_name, yylval.string);
1168	<	}
1085	>	if (conf_parser_ctx.pass == 2)
1086	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1087		};
1088
1089	<	oper_global_kill: GLOBAL_KILL '=' TBOOL ';'
1089	>	oper_umodes: T_UMODES
1090		{
1091	<	if (ypass == 2)
1092	<	{
1093	<	if (yylval.number)
1176	<	yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1177	<	else
1178	<	yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1179	<	}
1180	<	};
1091	>	if (conf_parser_ctx.pass == 2)
1092	>	block_state.modes.value = 0;
1093	>	} '='  oper_umodes_items ';' ;
1094
1095	<	oper_remote: REMOTE '=' TBOOL ';'
1095	>	oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1096	>	oper_umodes_item:  T_BOTS
1097		{
1098	<	if (ypass == 2)
1099	<	{
1100	<	if (yylval.number)
1187	<	yy_aconf->port |= OPER_FLAG_REMOTE;
1188	<	else
1189	<	yy_aconf->port &= ~OPER_FLAG_REMOTE;
1190	<	}
1191	<	};
1192	<
1193	<	oper_remoteban: REMOTEBAN '=' TBOOL ';'
1098	>	if (conf_parser_ctx.pass == 2)
1099	>	block_state.modes.value |= UMODE_BOTS;
1100	>	} | T_CCONN
1101		{
1102	<	if (ypass == 2)
1103	<	{
1104	<	if (yylval.number)
1198	<	yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1199	<	else
1200	<	yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1201	<	}
1202	<	};
1203	<
1204	<	oper_kline: KLINE '=' TBOOL ';'
1102	>	if (conf_parser_ctx.pass == 2)
1103	>	block_state.modes.value |= UMODE_CCONN;
1104	>	} | T_CCONN_FULL
1105		{
1106	<	if (ypass == 2)
1107	<	{
1108	<	if (yylval.number)
1209	<	yy_aconf->port |= OPER_FLAG_K;
1210	<	else
1211	<	yy_aconf->port &= ~OPER_FLAG_K;
1212	<	}
1213	<	};
1214	<
1215	<	oper_xline: XLINE '=' TBOOL ';'
1106	>	if (conf_parser_ctx.pass == 2)
1107	>	block_state.modes.value |= UMODE_CCONN_FULL;
1108	>	} | T_DEAF
1109		{
1110	<	if (ypass == 2)
1111	<	{
1112	<	if (yylval.number)
1220	<	yy_aconf->port |= OPER_FLAG_X;
1221	<	else
1222	<	yy_aconf->port &= ~OPER_FLAG_X;
1223	<	}
1224	<	};
1225	<
1226	<	oper_unkline: UNKLINE '=' TBOOL ';'
1110	>	if (conf_parser_ctx.pass == 2)
1111	>	block_state.modes.value |= UMODE_DEAF;
1112	>	} | T_DEBUG
1113		{
1114	<	if (ypass == 2)
1115	<	{
1116	<	if (yylval.number)
1231	<	yy_aconf->port |= OPER_FLAG_UNKLINE;
1232	<	else
1233	<	yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1234	<	}
1235	<	};
1236	<
1237	<	oper_gline: GLINE '=' TBOOL ';'
1114	>	if (conf_parser_ctx.pass == 2)
1115	>	block_state.modes.value |= UMODE_DEBUG;
1116	>	} | T_FULL
1117		{
1118	<	if (ypass == 2)
1119	<	{
1120	<	if (yylval.number)
1242	<	yy_aconf->port |= OPER_FLAG_GLINE;
1243	<	else
1244	<	yy_aconf->port &= ~OPER_FLAG_GLINE;
1245	<	}
1246	<	};
1247	<
1248	<	oper_nick_changes: NICK_CHANGES '=' TBOOL ';'
1118	>	if (conf_parser_ctx.pass == 2)
1119	>	block_state.modes.value |= UMODE_FULL;
1120	>	} | HIDDEN
1121		{
1122	<	if (ypass == 2)
1123	<	{
1124	<	if (yylval.number)
1253	<	yy_aconf->port |= OPER_FLAG_N;
1254	<	else
1255	<	yy_aconf->port &= ~OPER_FLAG_N;
1256	<	}
1257	<	};
1258	<
1259	<	oper_die: DIE '=' TBOOL ';'
1122	>	if (conf_parser_ctx.pass == 2)
1123	>	block_state.modes.value |= UMODE_HIDDEN;
1124	>	} | T_SKILL
1125		{
1126	<	if (ypass == 2)
1127	<	{
1128	<	if (yylval.number)
1264	<	yy_aconf->port |= OPER_FLAG_DIE;
1265	<	else
1266	<	yy_aconf->port &= ~OPER_FLAG_DIE;
1267	<	}
1268	<	};
1269	<
1270	<	oper_rehash: REHASH '=' TBOOL ';'
1126	>	if (conf_parser_ctx.pass == 2)
1127	>	block_state.modes.value |= UMODE_SKILL;
1128	>	} | T_NCHANGE
1129		{
1130	<	if (ypass == 2)
1131	<	{
1132	<	if (yylval.number)
1275	<	yy_aconf->port |= OPER_FLAG_REHASH;
1276	<	else
1277	<	yy_aconf->port &= ~OPER_FLAG_REHASH;
1278	<	}
1279	<	};
1280	<
1281	<	oper_admin: ADMIN '=' TBOOL ';'
1130	>	if (conf_parser_ctx.pass == 2)
1131	>	block_state.modes.value |= UMODE_NCHANGE;
1132	>	} | T_REJ
1133		{
1134	<	if (ypass == 2)
1135	<	{
1136	<	if (yylval.number)
1286	<	yy_aconf->port |= OPER_FLAG_ADMIN;
1287	<	else
1288	<	yy_aconf->port &= ~OPER_FLAG_ADMIN;
1289	<	}
1290	<	};
1291	<
1292	<	oper_hidden_admin: HIDDEN_ADMIN '=' TBOOL ';'
1134	>	if (conf_parser_ctx.pass == 2)
1135	>	block_state.modes.value |= UMODE_REJ;
1136	>	} | T_UNAUTH
1137		{
1138	<	if (ypass == 2)
1139	<	{
1140	<	if (yylval.number)
1297	<	yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1298	<	else
1299	<	yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1300	<	}
1301	<	};
1302	<
1303	<	oper_hidden_oper: HIDDEN_OPER '=' TBOOL ';'
1138	>	if (conf_parser_ctx.pass == 2)
1139	>	block_state.modes.value |= UMODE_UNAUTH;
1140	>	} | T_SPY
1141		{
1142	<	if (ypass == 2)
1143	<	{
1144	<	if (yylval.number)
1308	<	yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1309	<	else
1310	<	yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1311	<	}
1312	<	};
1313	<
1314	<	oper_operwall: T_OPERWALL '=' TBOOL ';'
1142	>	if (conf_parser_ctx.pass == 2)
1143	>	block_state.modes.value |= UMODE_SPY;
1144	>	} | T_EXTERNAL
1145		{
1146	<	if (ypass == 2)
1147	<	{
1148	<	if (yylval.number)
1149	<	yy_aconf->port |= OPER_FLAG_OPERWALL;
1150	<	else
1151	<	yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1152	<	}
1146	>	if (conf_parser_ctx.pass == 2)
1147	>	block_state.modes.value |= UMODE_EXTERNAL;
1148	>	} | T_OPERWALL
1149	>	{
1150	>	if (conf_parser_ctx.pass == 2)
1151	>	block_state.modes.value |= UMODE_OPERWALL;
1152	>	} | T_SERVNOTICE
1153	>	{
1154	>	if (conf_parser_ctx.pass == 2)
1155	>	block_state.modes.value |= UMODE_SERVNOTICE;
1156	>	} | T_INVISIBLE
1157	>	{
1158	>	if (conf_parser_ctx.pass == 2)
1159	>	block_state.modes.value |= UMODE_INVISIBLE;
1160	>	} | T_WALLOP
1161	>	{
1162	>	if (conf_parser_ctx.pass == 2)
1163	>	block_state.modes.value |= UMODE_WALLOP;
1164	>	} | T_SOFTCALLERID
1165	>	{
1166	>	if (conf_parser_ctx.pass == 2)
1167	>	block_state.modes.value |= UMODE_SOFTCALLERID;
1168	>	} | T_CALLERID
1169	>	{
1170	>	if (conf_parser_ctx.pass == 2)
1171	>	block_state.modes.value |= UMODE_CALLERID;
1172	>	} | T_LOCOPS
1173	>	{
1174	>	if (conf_parser_ctx.pass == 2)
1175	>	block_state.modes.value |= UMODE_LOCOPS;
1176		};
1177
1178		oper_flags: IRCD_FLAGS
1179		{
1180	+	if (conf_parser_ctx.pass == 2)
1181	+	block_state.port.value = 0;
1182		} '='  oper_flags_items ';';
1183
1184		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1185	<	oper_flags_item: NOT oper_flags_item_atom { not_atom = 1; }
1331	<	| oper_flags_item_atom { not_atom = 0; };
1332	<
1333	<	oper_flags_item_atom: GLOBAL_KILL
1185	>	oper_flags_item: GLOBAL_KILL
1186		{
1187	<	if (ypass == 2)
1188	<	{
1337	<	if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1338	<	else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1339	<	}
1187	>	if (conf_parser_ctx.pass == 2)
1188	>	block_state.port.value |= OPER_FLAG_GLOBAL_KILL;
1189		} | REMOTE
1190		{
1191	<	if (ypass == 2)
1192	<	{
1344	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
1345	<	else yy_aconf->port |= OPER_FLAG_REMOTE;
1346	<	}
1191	>	if (conf_parser_ctx.pass == 2)
1192	>	block_state.port.value |= OPER_FLAG_REMOTE;
1193		} | KLINE
1194		{
1195	<	if (ypass == 2)
1196	<	{
1351	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
1352	<	else yy_aconf->port |= OPER_FLAG_K;
1353	<	}
1195	>	if (conf_parser_ctx.pass == 2)
1196	>	block_state.port.value |= OPER_FLAG_K;
1197		} | UNKLINE
1198		{
1199	<	if (ypass == 2)
1200	<	{
1201	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1202	<	else yy_aconf->port |= OPER_FLAG_UNKLINE;
1203	<	}
1199	>	if (conf_parser_ctx.pass == 2)
1200	>	block_state.port.value |= OPER_FLAG_UNKLINE;
1201	>	} | T_DLINE
1202	>	{
1203	>	if (conf_parser_ctx.pass == 2)
1204	>	block_state.port.value |= OPER_FLAG_DLINE;
1205	>	} | T_UNDLINE
1206	>	{
1207	>	if (conf_parser_ctx.pass == 2)
1208	>	block_state.port.value |= OPER_FLAG_UNDLINE;
1209		} | XLINE
1210		{
1211	<	if (ypass == 2)
1212	<	{
1365	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
1366	<	else yy_aconf->port |= OPER_FLAG_X;
1367	<	}
1211	>	if (conf_parser_ctx.pass == 2)
1212	>	block_state.port.value |= OPER_FLAG_X;
1213		} | GLINE
1214		{
1215	<	if (ypass == 2)
1216	<	{
1372	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
1373	<	else yy_aconf->port |= OPER_FLAG_GLINE;
1374	<	}
1215	>	if (conf_parser_ctx.pass == 2)
1216	>	block_state.port.value |= OPER_FLAG_GLINE;
1217		} | DIE
1218		{
1219	<	if (ypass == 2)
1220	<	{
1221	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
1222	<	else yy_aconf->port |= OPER_FLAG_DIE;
1223	<	}
1219	>	if (conf_parser_ctx.pass == 2)
1220	>	block_state.port.value |= OPER_FLAG_DIE;
1221	>	} | T_RESTART
1222	>	{
1223	>	if (conf_parser_ctx.pass == 2)
1224	>	block_state.port.value |= OPER_FLAG_RESTART;
1225		} | REHASH
1226		{
1227	<	if (ypass == 2)
1228	<	{
1386	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
1387	<	else yy_aconf->port |= OPER_FLAG_REHASH;
1388	<	}
1227	>	if (conf_parser_ctx.pass == 2)
1228	>	block_state.port.value |= OPER_FLAG_REHASH;
1229		} | ADMIN
1230		{
1231	<	if (ypass == 2)
1232	<	{
1393	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_ADMIN;
1394	<	else yy_aconf->port |= OPER_FLAG_ADMIN;
1395	<	}
1396	<	} | HIDDEN_ADMIN
1397	<	{
1398	<	if (ypass == 2)
1399	<	{
1400	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1401	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1402	<	}
1231	>	if (conf_parser_ctx.pass == 2)
1232	>	block_state.port.value |= OPER_FLAG_ADMIN;
1233		} | NICK_CHANGES
1234		{
1235	<	if (ypass == 2)
1236	<	{
1407	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
1408	<	else yy_aconf->port |= OPER_FLAG_N;
1409	<	}
1235	>	if (conf_parser_ctx.pass == 2)
1236	>	block_state.port.value |= OPER_FLAG_N;
1237		} | T_OPERWALL
1238		{
1239	<	if (ypass == 2)
1240	<	{
1241	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1415	<	else yy_aconf->port |= OPER_FLAG_OPERWALL;
1416	<	}
1417	<	} | OPER_SPY_T
1239	>	if (conf_parser_ctx.pass == 2)
1240	>	block_state.port.value |= OPER_FLAG_OPERWALL;
1241	>	} | T_GLOBOPS
1242		{
1243	<	if (ypass == 2)
1244	<	{
1245	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
1422	<	else yy_aconf->port |= OPER_FLAG_OPER_SPY;
1423	<	}
1424	<	} | HIDDEN_OPER
1243	>	if (conf_parser_ctx.pass == 2)
1244	>	block_state.port.value |= OPER_FLAG_GLOBOPS;
1245	>	} | OPER_SPY_T
1246		{
1247	<	if (ypass == 2)
1248	<	{
1428	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1429	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1430	<	}
1247	>	if (conf_parser_ctx.pass == 2)
1248	>	block_state.port.value |= OPER_FLAG_OPER_SPY;
1249		} | REMOTEBAN
1250		{
1251	<	if (ypass == 2)
1252	<	{
1253	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1254	<	else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1255	<	}
1256	<	} | ENCRYPTED
1251	>	if (conf_parser_ctx.pass == 2)
1252	>	block_state.port.value |= OPER_FLAG_REMOTEBAN;
1253	>	} | T_SET
1254	>	{
1255	>	if (conf_parser_ctx.pass == 2)
1256	>	block_state.port.value |= OPER_FLAG_SET;
1257	>	} | MODULE
1258		{
1259	<	if (ypass == 2)
1260	<	{
1442	<	if (not_atom) ClearConfEncrypted(yy_aconf);
1443	<	else SetConfEncrypted(yy_aconf);
1444	<	}
1259	>	if (conf_parser_ctx.pass == 2)
1260	>	block_state.port.value |= OPER_FLAG_MODULE;
1261		};
1262
1263
#	Line 1450 | Line 1266 | oper_flags_item_atom: GLOBAL_KILL
1266		***************************************************************************/
1267		class_entry: CLASS
1268		{
1269	<	if (ypass == 1)
1270	<	{
1455	<	yy_conf = make_conf_item(CLASS_TYPE);
1456	<	yy_class = (struct ClassItem *)map_to_conf(yy_conf);
1457	<	}
1458	<	} class_name_b '{' class_items '}' ';'
1459	<	{
1460	<	if (ypass == 1)
1461	<	{
1462	<	struct ConfItem *cconf;
1463	<	struct ClassItem *class = NULL;
1269	>	if (conf_parser_ctx.pass != 1)
1270	>	break;
1271
1272	<	if (yy_class_name == NULL)
1466	<	{
1467	<	delete_conf_item(yy_conf);
1468	<	}
1469	<	else
1470	<	{
1471	<	cconf = find_exact_name_conf(CLASS_TYPE, yy_class_name, NULL, NULL);
1272	>	reset_block_state();
1273
1274	<	if (cconf != NULL)                /* The class existed already */
1275	<	{
1276	<	rebuild_cidr_class(cconf, yy_class);
1277	<	class = (struct ClassItem *) map_to_conf(cconf);
1278	<	*class = *yy_class;
1279	<	delete_conf_item(yy_conf);
1280	<
1281	<	MyFree(cconf->name);            /* Allows case change of class name */
1282	<	cconf->name = yy_class_name;
1283	<	}
1284	<	else      /* Brand new class */
1285	<	{
1286	<	MyFree(yy_conf->name);          /* just in case it was allocated */
1287	<	yy_conf->name = yy_class_name;
1288	<	}
1289	<	}
1290	<	yy_class_name = NULL;
1291	<	}
1274	>	block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1275	>	block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1276	>	block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1277	>	block_state.max_sendq.value = DEFAULT_SENDQ;
1278	>	block_state.max_recvq.value = DEFAULT_RECVQ;
1279	>	} '{' class_items '}' ';'
1280	>	{
1281	>	struct ClassItem *class = NULL;
1282	>
1283	>	if (conf_parser_ctx.pass != 1)
1284	>	break;
1285	>
1286	>	if (!block_state.class.buf[0])
1287	>	break;
1288	>
1289	>	if (!(class = class_find(block_state.class.buf, 0)))
1290	>	class = class_make();
1291	>
1292	>	class->active = 1;
1293	>	MyFree(class->name);
1294	>	class->name = xstrdup(block_state.class.buf);
1295	>	class->ping_freq = block_state.ping_freq.value;
1296	>	class->max_perip = block_state.max_perip.value;
1297	>	class->con_freq = block_state.con_freq.value;
1298	>	class->max_total = block_state.max_total.value;
1299	>	class->max_global = block_state.max_global.value;
1300	>	class->max_local = block_state.max_local.value;
1301	>	class->max_ident = block_state.max_ident.value;
1302	>	class->max_sendq = block_state.max_sendq.value;
1303	>	class->max_recvq = block_state.max_recvq.value;
1304	>
1305	>	if (block_state.min_idle.value > block_state.max_idle.value)
1306	>	{
1307	>	block_state.min_idle.value = 0;
1308	>	block_state.max_idle.value = 0;
1309	>	block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
1310	>	}
1311	>
1312	>	class->flags = block_state.flags.value;
1313	>	class->min_idle = block_state.min_idle.value;
1314	>	class->max_idle = block_state.max_idle.value;
1315	>
1316	>	if (class->number_per_cidr && block_state.number_per_cidr.value)
1317	>	if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
1318	>	(class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
1319	>	if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
1320	>	(class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
1321	>	rebuild_cidr_list(class);
1322	>
1323	>	class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1324	>	class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1325	>	class->number_per_cidr = block_state.number_per_cidr.value;
1326		};
1327
1493	–	class_name_b: | class_name_t;
1494	–
1328		class_items:    class_items class_item | class_item;
1329		class_item:     class_name |
1330		class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1331		class_ping_time |
1499	–	class_ping_warning |
1332		class_number_per_cidr |
1333		class_number_per_ip |
1334		class_connectfreq |
#	Line 1504 | Line 1336 | class_item:     class_name |
1336		class_max_global |
1337		class_max_local |
1338		class_max_ident |
1339	<	class_sendq |
1339	>	class_sendq | class_recvq |
1340	>	class_min_idle |
1341	>	class_max_idle |
1342	>	class_flags |
1343		error ';' ;
1344
1345		class_name: NAME '=' QSTRING ';'
1346		{
1347	<	if (ypass == 1)
1348	<	{
1514	<	MyFree(yy_class_name);
1515	<	DupString(yy_class_name, yylval.string);
1516	<	}
1517	<	};
1518	<
1519	<	class_name_t: QSTRING
1520	<	{
1521	<	if (ypass == 1)
1522	<	{
1523	<	MyFree(yy_class_name);
1524	<	DupString(yy_class_name, yylval.string);
1525	<	}
1347	>	if (conf_parser_ctx.pass == 1)
1348	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1349		};
1350
1351		class_ping_time: PING_TIME '=' timespec ';'
1352		{
1353	<	if (ypass == 1)
1354	<	PingFreq(yy_class) = $3;
1532	<	};
1533	<
1534	<	class_ping_warning: PING_WARNING '=' timespec ';'
1535	<	{
1536	<	if (ypass == 1)
1537	<	PingWarning(yy_class) = $3;
1353	>	if (conf_parser_ctx.pass == 1)
1354	>	block_state.ping_freq.value = $3;
1355		};
1356
1357		class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1358		{
1359	<	if (ypass == 1)
1360	<	MaxPerIp(yy_class) = $3;
1359	>	if (conf_parser_ctx.pass == 1)
1360	>	block_state.max_perip.value = $3;
1361		};
1362
1363		class_connectfreq: CONNECTFREQ '=' timespec ';'
1364		{
1365	<	if (ypass == 1)
1366	<	ConFreq(yy_class) = $3;
1365	>	if (conf_parser_ctx.pass == 1)
1366	>	block_state.con_freq.value = $3;
1367		};
1368
1369		class_max_number: MAX_NUMBER '=' NUMBER ';'
1370		{
1371	<	if (ypass == 1)
1372	<	MaxTotal(yy_class) = $3;
1371	>	if (conf_parser_ctx.pass == 1)
1372	>	block_state.max_total.value = $3;
1373		};
1374
1375		class_max_global: MAX_GLOBAL '=' NUMBER ';'
1376		{
1377	<	if (ypass == 1)
1378	<	MaxGlobal(yy_class) = $3;
1377	>	if (conf_parser_ctx.pass == 1)
1378	>	block_state.max_global.value = $3;
1379		};
1380
1381		class_max_local: MAX_LOCAL '=' NUMBER ';'
1382		{
1383	<	if (ypass == 1)
1384	<	MaxLocal(yy_class) = $3;
1383	>	if (conf_parser_ctx.pass == 1)
1384	>	block_state.max_local.value = $3;
1385		};
1386
1387		class_max_ident: MAX_IDENT '=' NUMBER ';'
1388		{
1389	<	if (ypass == 1)
1390	<	MaxIdent(yy_class) = $3;
1389	>	if (conf_parser_ctx.pass == 1)
1390	>	block_state.max_ident.value = $3;
1391		};
1392
1393		class_sendq: SENDQ '=' sizespec ';'
1394		{
1395	<	if (ypass == 1)
1396	<	MaxSendq(yy_class) = $3;
1395	>	if (conf_parser_ctx.pass == 1)
1396	>	block_state.max_sendq.value = $3;
1397	>	};
1398	>
1399	>	class_recvq: T_RECVQ '=' sizespec ';'
1400	>	{
1401	>	if (conf_parser_ctx.pass == 1)
1402	>	if ($3 >= CLIENT_FLOOD_MIN && $3 <= CLIENT_FLOOD_MAX)
1403	>	block_state.max_recvq.value = $3;
1404		};
1405
1406		class_cidr_bitlen_ipv4: CIDR_BITLEN_IPV4 '=' NUMBER ';'
1407		{
1408	<	if (ypass == 1)
1409	<	CidrBitlenIPV4(yy_class) = $3;
1408	>	if (conf_parser_ctx.pass == 1)
1409	>	block_state.cidr_bitlen_ipv4.value = $3 > 32 ? 32 : $3;
1410		};
1411
1412		class_cidr_bitlen_ipv6: CIDR_BITLEN_IPV6 '=' NUMBER ';'
1413		{
1414	<	if (ypass == 1)
1415	<	CidrBitlenIPV6(yy_class) = $3;
1414	>	if (conf_parser_ctx.pass == 1)
1415	>	block_state.cidr_bitlen_ipv6.value = $3 > 128 ? 128 : $3;
1416		};
1417
1418		class_number_per_cidr: NUMBER_PER_CIDR '=' NUMBER ';'
1419		{
1420	<	if (ypass == 1)
1421	<	NumberPerCidr(yy_class) = $3;
1420	>	if (conf_parser_ctx.pass == 1)
1421	>	block_state.number_per_cidr.value = $3;
1422	>	};
1423	>
1424	>	class_min_idle: MIN_IDLE '=' timespec ';'
1425	>	{
1426	>	if (conf_parser_ctx.pass != 1)
1427	>	break;
1428	>
1429	>	block_state.min_idle.value = $3;
1430	>	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1431		};
1432
1433	+	class_max_idle: MAX_IDLE '=' timespec ';'
1434	+	{
1435	+	if (conf_parser_ctx.pass != 1)
1436	+	break;
1437	+
1438	+	block_state.max_idle.value = $3;
1439	+	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1440	+	};
1441	+
1442	+	class_flags: IRCD_FLAGS
1443	+	{
1444	+	if (conf_parser_ctx.pass == 1)
1445	+	block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1446	+	} '='  class_flags_items ';';
1447	+
1448	+	class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1449	+	class_flags_item: RANDOM_IDLE
1450	+	{
1451	+	if (conf_parser_ctx.pass == 1)
1452	+	block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
1453	+	} | HIDE_IDLE_FROM_OPERS
1454	+	{
1455	+	if (conf_parser_ctx.pass == 1)
1456	+	block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
1457	+	};
1458	+
1459	+
1460		/***************************************************************************
1461		*  section listen
1462		***************************************************************************/
1463		listen_entry: LISTEN
1464		{
1465	<	if (ypass == 2)
1466	<	{
1467	<	listener_address = NULL;
1608	<	listener_flags = 0;
1609	<	}
1610	<	} '{' listen_items '}' ';'
1611	<	{
1612	<	if (ypass == 2)
1613	<	{
1614	<	MyFree(listener_address);
1615	<	listener_address = NULL;
1616	<	}
1617	<	};
1465	>	if (conf_parser_ctx.pass == 2)
1466	>	reset_block_state();
1467	>	} '{' listen_items '}' ';';
1468
1469		listen_flags: IRCD_FLAGS
1470		{
1471	+	block_state.flags.value = 0;
1472		} '='  listen_flags_items ';';
1473
1474		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1475		listen_flags_item: T_SSL
1476		{
1477	<	if (ypass == 2)
1478	<	listener_flags |= LISTENER_SSL;
1477	>	if (conf_parser_ctx.pass == 2)
1478	>	block_state.flags.value |= LISTENER_SSL;
1479		} | HIDDEN
1480		{
1481	<	if (ypass == 2)
1482	<	listener_flags |= LISTENER_HIDDEN;
1481	>	if (conf_parser_ctx.pass == 2)
1482	>	block_state.flags.value |= LISTENER_HIDDEN;
1483	>	} | T_SERVER
1484	>	{
1485	>	if (conf_parser_ctx.pass == 2)
1486	>	block_state.flags.value |= LISTENER_SERVER;
1487		};
1488
1489		listen_items:   listen_items listen_item | listen_item;
1490	<	listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';' ;
1490	>	listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';';
1491
1492	<	listen_port: PORT '=' port_items ';' ;
1492	>	listen_port: PORT '=' port_items { block_state.flags.value = 0; } ';';
1493
1494		port_items: port_items ',' port_item | port_item;
1495
1496		port_item: NUMBER
1497		{
1498	<	if (ypass == 2)
1498	>	if (conf_parser_ctx.pass == 2)
1499		{
1500	<	if ((listener_flags & LISTENER_SSL))
1500	>	if (block_state.flags.value & LISTENER_SSL)
1501		#ifdef HAVE_LIBCRYPTO
1502	<	if (!ServerInfo.ctx)
1502	>	if (!ServerInfo.server_ctx)
1503		#endif
1504		{
1505	<	yyerror("SSL not available - port closed");
1505	>	conf_error_report("SSL not available - port closed");
1506		break;
1507		}
1508	<	add_listener($1, listener_address, listener_flags);
1654	<	listener_flags = 0;
1508	>	add_listener($1, block_state.addr.buf, block_state.flags.value);
1509		}
1510		} | NUMBER TWODOTS NUMBER
1511		{
1512	<	if (ypass == 2)
1512	>	if (conf_parser_ctx.pass == 2)
1513		{
1514		int i;
1515
1516	<	if ((listener_flags & LISTENER_SSL))
1516	>	if (block_state.flags.value & LISTENER_SSL)
1517		#ifdef HAVE_LIBCRYPTO
1518	<	if (!ServerInfo.ctx)
1518	>	if (!ServerInfo.server_ctx)
1519		#endif
1520		{
1521	<	yyerror("SSL not available - port closed");
1521	>	conf_error_report("SSL not available - port closed");
1522		break;
1523		}
1524
1525		for (i = $1; i <= $3; ++i)
1526	<	add_listener(i, listener_address, listener_flags);
1673	<
1674	<	listener_flags = 0;
1526	>	add_listener(i, block_state.addr.buf, block_state.flags.value);
1527		}
1528		};
1529
1530		listen_address: IP '=' QSTRING ';'
1531		{
1532	<	if (ypass == 2)
1533	<	{
1682	<	MyFree(listener_address);
1683	<	DupString(listener_address, yylval.string);
1684	<	}
1532	>	if (conf_parser_ctx.pass == 2)
1533	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1534		};
1535
1536		listen_host: HOST '=' QSTRING ';'
1537		{
1538	<	if (ypass == 2)
1539	<	{
1691	<	MyFree(listener_address);
1692	<	DupString(listener_address, yylval.string);
1693	<	}
1538	>	if (conf_parser_ctx.pass == 2)
1539	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1540		};
1541
1542		/***************************************************************************
#	Line 1698 | Line 1544 | listen_host: HOST '=' QSTRING ';'
1544		***************************************************************************/
1545		auth_entry: IRCD_AUTH
1546		{
1547	<	if (ypass == 2)
1548	<	{
1703	<	yy_conf = make_conf_item(CLIENT_TYPE);
1704	<	yy_aconf = map_to_conf(yy_conf);
1705	<	}
1706	<	else
1707	<	{
1708	<	MyFree(class_name);
1709	<	class_name = NULL;
1710	<	}
1547	>	if (conf_parser_ctx.pass == 2)
1548	>	reset_block_state();
1549		} '{' auth_items '}' ';'
1550		{
1551	<	if (ypass == 2)
1714	<	{
1715	<	struct CollectItem *yy_tmp = NULL;
1716	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1717	<
1718	<	if (yy_aconf->user && yy_aconf->host)
1719	<	{
1720	<	conf_add_class_to_conf(yy_conf, class_name);
1721	<	add_conf_by_address(CONF_CLIENT, yy_aconf);
1722	<	}
1723	<	else
1724	<	delete_conf_item(yy_conf);
1725	<
1726	<	/* copy over settings from first struct */
1727	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
1728	<	{
1729	<	struct AccessItem *new_aconf;
1730	<	struct ConfItem *new_conf;
1731	<
1732	<	new_conf = make_conf_item(CLIENT_TYPE);
1733	<	new_aconf = map_to_conf(new_conf);
1734	<
1735	<	yy_tmp = ptr->data;
1551	>	dlink_node *ptr = NULL;
1552
1553	<	assert(yy_tmp->user && yy_tmp->host);
1553	>	if (conf_parser_ctx.pass != 2)
1554	>	break;
1555
1556	<	if (yy_aconf->passwd != NULL)
1557	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1558	<	if (yy_conf->name != NULL)
1559	<	DupString(new_conf->name, yy_conf->name);
1560	<	if (yy_aconf->passwd != NULL)
1561	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1562	<
1563	<	new_aconf->flags = yy_aconf->flags;
1564	<	new_aconf->port  = yy_aconf->port;
1565	<
1566	<	DupString(new_aconf->user, yy_tmp->user);
1567	<	collapse(new_aconf->user);
1556	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
1557	>	{
1558	>	struct MaskItem *conf = NULL;
1559	>	struct split_nuh_item nuh;
1560	>
1561	>	nuh.nuhmask  = ptr->data;
1562	>	nuh.nickptr  = NULL;
1563	>	nuh.userptr  = block_state.user.buf;
1564	>	nuh.hostptr  = block_state.host.buf;
1565	>	nuh.nicksize = 0;
1566	>	nuh.usersize = sizeof(block_state.user.buf);
1567	>	nuh.hostsize = sizeof(block_state.host.buf);
1568	>	split_nuh(&nuh);
1569	>
1570	>	conf        = conf_make(CONF_CLIENT);
1571	>	conf->user  = xstrdup(collapse(block_state.user.buf));
1572	>	conf->host  = xstrdup(collapse(block_state.host.buf));
1573	>
1574	>	if (block_state.rpass.buf[0])
1575	>	conf->passwd = xstrdup(block_state.rpass.buf);
1576	>	if (block_state.name.buf[0])
1577	>	conf->passwd = xstrdup(block_state.name.buf);
1578
1579	<	DupString(new_aconf->host, yy_tmp->host);
1580	<	collapse(new_aconf->host);
1579	>	conf->flags = block_state.flags.value;
1580	>	conf->port  = block_state.port.value;
1581
1582	<	conf_add_class_to_conf(new_conf, class_name);
1583	<	add_conf_by_address(CONF_CLIENT, new_aconf);
1757	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1758	<	free_collect_item(yy_tmp);
1759	<	}
1760	<
1761	<	MyFree(class_name);
1762	<	class_name = NULL;
1763	<	yy_conf = NULL;
1764	<	yy_aconf = NULL;
1582	>	conf_add_class_to_conf(conf, block_state.class.buf);
1583	>	add_conf_by_address(CONF_CLIENT, conf);
1584		}
1585		};
1586
1587		auth_items:     auth_items auth_item | auth_item;
1588		auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1589	<	auth_kline_exempt | auth_need_ident |
1590	<	auth_exceed_limit | auth_no_tilde | auth_gline_exempt |
1772	<	auth_spoof | auth_spoof_notice |
1773	<	auth_redir_serv | auth_redir_port | auth_can_flood |
1774	<	auth_need_password | auth_encrypted | error ';' ;
1589	>	auth_spoof | auth_redir_serv | auth_redir_port |
1590	>	auth_encrypted | error ';' ;
1591
1592		auth_user: USER '=' QSTRING ';'
1593		{
1594	<	if (ypass == 2)
1595	<	{
1780	<	struct CollectItem *yy_tmp;
1781	<
1782	<	if (yy_aconf->user == NULL)
1783	<	split_nuh(yylval.string, NULL, &yy_aconf->user, &yy_aconf->host);
1784	<	else
1785	<	{
1786	<	yy_tmp = MyMalloc(sizeof(struct CollectItem));
1787	<	split_nuh(yylval.string, NULL, &yy_tmp->user, &yy_tmp->host);
1788	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1789	<	}
1790	<	}
1594	>	if (conf_parser_ctx.pass == 2)
1595	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1596		};
1597
1793	–	/* XXX - IP/IPV6 tags don't exist anymore - put IP/IPV6 into user. */
1794	–
1598		auth_passwd: PASSWORD '=' QSTRING ';'
1599		{
1600	<	if (ypass == 2)
1601	<	{
1799	<	/* be paranoid */
1800	<	if (yy_aconf->passwd != NULL)
1801	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1802	<
1803	<	MyFree(yy_aconf->passwd);
1804	<	DupString(yy_aconf->passwd, yylval.string);
1805	<	}
1806	<	};
1807	<
1808	<	auth_spoof_notice: SPOOF_NOTICE '=' TBOOL ';'
1809	<	{
1810	<	if (ypass == 2)
1811	<	{
1812	<	if (yylval.number)
1813	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1814	<	else
1815	<	yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1816	<	}
1600	>	if (conf_parser_ctx.pass == 2)
1601	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1602		};
1603
1604		auth_class: CLASS '=' QSTRING ';'
1605		{
1606	<	if (ypass == 2)
1607	<	{
1823	<	MyFree(class_name);
1824	<	DupString(class_name, yylval.string);
1825	<	}
1606	>	if (conf_parser_ctx.pass == 2)
1607	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1608		};
1609
1610		auth_encrypted: ENCRYPTED '=' TBOOL ';'
1611		{
1612	<	if (ypass == 2)
1612	>	if (conf_parser_ctx.pass == 2)
1613		{
1614		if (yylval.number)
1615	<	SetConfEncrypted(yy_aconf);
1615	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1616		else
1617	<	ClearConfEncrypted(yy_aconf);
1617	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1618		}
1619		};
1620
1621		auth_flags: IRCD_FLAGS
1622		{
1623	+	if (conf_parser_ctx.pass == 2)
1624	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
1625		} '='  auth_flags_items ';';
1626
1627		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1628	<	auth_flags_item: NOT auth_flags_item_atom { not_atom = 1; }
1845	<	| auth_flags_item_atom { not_atom = 0; };
1846	<
1847	<	auth_flags_item_atom: SPOOF_NOTICE
1628	>	auth_flags_item: SPOOF_NOTICE
1629		{
1630	<	if (ypass == 2)
1631	<	{
1851	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1852	<	else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1853	<	}
1854	<
1630	>	if (conf_parser_ctx.pass == 2)
1631	>	block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1632		} | EXCEED_LIMIT
1633		{
1634	<	if (ypass == 2)
1635	<	{
1859	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
1860	<	else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1861	<	}
1634	>	if (conf_parser_ctx.pass == 2)
1635	>	block_state.flags.value |= CONF_FLAGS_NOLIMIT;
1636		} | KLINE_EXEMPT
1637		{
1638	<	if (ypass == 2)
1639	<	{
1866	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
1867	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1868	<	}
1638	>	if (conf_parser_ctx.pass == 2)
1639	>	block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1640		} | NEED_IDENT
1641		{
1642	<	if (ypass == 2)
1643	<	{
1873	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
1874	<	else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
1875	<	}
1642	>	if (conf_parser_ctx.pass == 2)
1643	>	block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
1644		} | CAN_FLOOD
1645		{
1646	<	if (ypass == 2)
1647	<	{
1880	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
1881	<	else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
1882	<	}
1883	<	} | CAN_IDLE
1884	<	{
1885	<	if (ypass == 2)
1886	<	{
1887	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_IDLE_LINED;
1888	<	else yy_aconf->flags |= CONF_FLAGS_IDLE_LINED;
1889	<	}
1646	>	if (conf_parser_ctx.pass == 2)
1647	>	block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
1648		} | NO_TILDE
1649		{
1650	<	if (ypass == 2)
1651	<	{
1894	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
1895	<	else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1896	<	}
1650	>	if (conf_parser_ctx.pass == 2)
1651	>	block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1652		} | GLINE_EXEMPT
1653		{
1654	<	if (ypass == 2)
1655	<	{
1901	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
1902	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
1903	<	}
1654	>	if (conf_parser_ctx.pass == 2)
1655	>	block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
1656		} | RESV_EXEMPT
1657		{
1658	<	if (ypass == 2)
1659	<	{
1660	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
1909	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
1910	<	}
1911	<	} | NEED_PASSWORD
1658	>	if (conf_parser_ctx.pass == 2)
1659	>	block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
1660	>	} | T_WEBIRC
1661		{
1662	<	if (ypass == 2)
1663	<	{
1664	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
1916	<	else yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
1917	<	}
1918	<	};
1919	<
1920	<	auth_kline_exempt: KLINE_EXEMPT '=' TBOOL ';'
1921	<	{
1922	<	if (ypass == 2)
1923	<	{
1924	<	if (yylval.number)
1925	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1926	<	else
1927	<	yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
1928	<	}
1929	<	};
1930	<
1931	<	auth_need_ident: NEED_IDENT '=' TBOOL ';'
1932	<	{
1933	<	if (ypass == 2)
1934	<	{
1935	<	if (yylval.number)
1936	<	yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
1937	<	else
1938	<	yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
1939	<	}
1940	<	};
1941	<
1942	<	auth_exceed_limit: EXCEED_LIMIT '=' TBOOL ';'
1943	<	{
1944	<	if (ypass == 2)
1945	<	{
1946	<	if (yylval.number)
1947	<	yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1948	<	else
1949	<	yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
1950	<	}
1951	<	};
1952	<
1953	<	auth_can_flood: CAN_FLOOD '=' TBOOL ';'
1954	<	{
1955	<	if (ypass == 2)
1956	<	{
1957	<	if (yylval.number)
1958	<	yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
1959	<	else
1960	<	yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
1961	<	}
1962	<	};
1963	<
1964	<	auth_no_tilde: NO_TILDE '=' TBOOL ';'
1965	<	{
1966	<	if (ypass == 2)
1967	<	{
1968	<	if (yylval.number)
1969	<	yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1970	<	else
1971	<	yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
1972	<	}
1973	<	};
1974	<
1975	<	auth_gline_exempt: GLINE_EXEMPT '=' TBOOL ';'
1662	>	if (conf_parser_ctx.pass == 2)
1663	>	block_state.flags.value |= CONF_FLAGS_WEBIRC;
1664	>	} | NEED_PASSWORD
1665		{
1666	<	if (ypass == 2)
1667	<	{
1979	<	if (yylval.number)
1980	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
1981	<	else
1982	<	yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
1983	<	}
1666	>	if (conf_parser_ctx.pass == 2)
1667	>	block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1668		};
1669
1986	–	/* XXX - need check for illegal hostnames here */
1670		auth_spoof: SPOOF '=' QSTRING ';'
1671		{
1672	<	if (ypass == 2)
1673	<	{
1991	<	MyFree(yy_conf->name);
1672	>	if (conf_parser_ctx.pass != 2)
1673	>	break;
1674
1675	<	if (strlen(yylval.string) < HOSTLEN)
1676	<	{
1677	<	DupString(yy_conf->name, yylval.string);
1678	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
1997	<	}
1998	<	else
1999	<	{
2000	<	ilog(L_ERROR, "Spoofs must be less than %d..ignoring it", HOSTLEN);
2001	<	yy_conf->name = NULL;
2002	<	}
1675	>	if (strlen(yylval.string) <= HOSTLEN && valid_hostname(yylval.string))
1676	>	{
1677	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1678	>	block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
1679		}
1680	+	else
1681	+	ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
1682		};
1683
1684		auth_redir_serv: REDIRSERV '=' QSTRING ';'
1685		{
1686	<	if (ypass == 2)
1687	<	{
1688	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1689	<	MyFree(yy_conf->name);
1690	<	DupString(yy_conf->name, yylval.string);
2013	<	}
1686	>	if (conf_parser_ctx.pass != 2)
1687	>	break;
1688	>
1689	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1690	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1691		};
1692
1693		auth_redir_port: REDIRPORT '=' NUMBER ';'
1694		{
1695	<	if (ypass == 2)
1696	<	{
2020	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
2021	<	yy_aconf->port = $3;
2022	<	}
2023	<	};
1695	>	if (conf_parser_ctx.pass != 2)
1696	>	break;
1697
1698	<	auth_need_password: NEED_PASSWORD '=' TBOOL ';'
1699	<	{
2027	<	if (ypass == 2)
2028	<	{
2029	<	if (yylval.number)
2030	<	yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
2031	<	else
2032	<	yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
2033	<	}
1698	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1699	>	block_state.port.value = $3;
1700		};
1701
1702
#	Line 2039 | Line 1705 | auth_need_password: NEED_PASSWORD '=' TB
1705		***************************************************************************/
1706		resv_entry: RESV
1707		{
1708	<	if (ypass == 2)
1709	<	{
1710	<	MyFree(resv_reason);
1711	<	resv_reason = NULL;
1712	<	}
1708	>	if (conf_parser_ctx.pass != 2)
1709	>	break;
1710	>
1711	>	reset_block_state();
1712	>	strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
1713		} '{' resv_items '}' ';'
1714		{
1715	<	if (ypass == 2)
1716	<	{
1717	<	MyFree(resv_reason);
1718	<	resv_reason = NULL;
2053	<	}
1715	>	if (IsChanPrefix(block_state.name.buf[0]))
1716	>	create_channel_resv(block_state.name.buf, block_state.rpass.buf);
1717	>	else if (block_state.name.buf[0])
1718	>	create_nick_resv(block_state.name.buf, block_state.rpass.buf);
1719		};
1720
1721		resv_items:     resv_items resv_item | resv_item;
1722	<	resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
1722	>	resv_item:      resv_reason | resv_channel | resv_nick | error ';' ;
1723
1724	<	resv_creason: REASON '=' QSTRING ';'
1724	>	resv_reason: REASON '=' QSTRING ';'
1725		{
1726	<	if (ypass == 2)
1727	<	{
2063	<	MyFree(resv_reason);
2064	<	DupString(resv_reason, yylval.string);
2065	<	}
1726	>	if (conf_parser_ctx.pass == 2)
1727	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1728		};
1729
1730		resv_channel: CHANNEL '=' QSTRING ';'
1731		{
1732	<	if (ypass == 2)
1733	<	{
2072	<	if (IsChanPrefix(*yylval.string))
2073	<	{
2074	<	char def_reason[] = "No reason";
2075	<
2076	<	create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
2077	<	}
2078	<	}
2079	<	/* ignore it for now.. but we really should make a warning if
2080	<	* its an erroneous name --fl_ */
1732	>	if (conf_parser_ctx.pass == 2)
1733	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1734		};
1735
1736		resv_nick: NICK '=' QSTRING ';'
1737		{
1738	<	if (ypass == 2)
1739	<	{
1740	<	char def_reason[] = "No reason";
1738	>	if (conf_parser_ctx.pass == 2)
1739	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1740	>	};
1741
1742	<	create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1742	>	/***************************************************************************
1743	>	*  section service
1744	>	***************************************************************************/
1745	>	service_entry: T_SERVICE '{' service_items '}' ';';
1746	>
1747	>	service_items:     service_items service_item | service_item;
1748	>	service_item:      service_name | error;
1749	>
1750	>	service_name: NAME '=' QSTRING ';'
1751	>	{
1752	>	if (conf_parser_ctx.pass == 2)
1753	>	{
1754	>	if (valid_servname(yylval.string))
1755	>	{
1756	>	struct MaskItem *conf = conf_make(CONF_SERVICE);
1757	>	conf->name = xstrdup(yylval.string);
1758	>	}
1759		}
1760		};
1761
#	Line 2095 | Line 1764 | resv_nick: NICK '=' QSTRING ';'
1764		***************************************************************************/
1765		shared_entry: T_SHARED
1766		{
1767	<	if (ypass == 2)
1768	<	{
1769	<	yy_conf = make_conf_item(ULINE_TYPE);
1770	<	yy_match_item = map_to_conf(yy_conf);
1771	<	yy_match_item->action = SHARED_ALL;
1772	<	}
1767	>	if (conf_parser_ctx.pass != 2)
1768	>	break;
1769	>
1770	>	reset_block_state();
1771	>
1772	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1773	>	strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
1774	>	strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
1775	>	block_state.flags.value = SHARED_ALL;
1776		} '{' shared_items '}' ';'
1777		{
1778	<	if (ypass == 2)
1779	<	{
1780	<	yy_conf = NULL;
1781	<	}
1778	>	struct MaskItem *conf = NULL;
1779	>
1780	>	if (conf_parser_ctx.pass != 2)
1781	>	break;
1782	>
1783	>	conf = conf_make(CONF_ULINE);
1784	>	conf->flags = block_state.flags.value;
1785	>	conf->name = xstrdup(block_state.name.buf);
1786	>	conf->user = xstrdup(block_state.user.buf);
1787	>	conf->user = xstrdup(block_state.host.buf);
1788		};
1789
1790		shared_items: shared_items shared_item | shared_item;
#	Line 2114 | Line 1792 | shared_item:  shared_name | shared_user
1792
1793		shared_name: NAME '=' QSTRING ';'
1794		{
1795	<	if (ypass == 2)
1796	<	{
2119	<	MyFree(yy_conf->name);
2120	<	DupString(yy_conf->name, yylval.string);
2121	<	}
1795	>	if (conf_parser_ctx.pass == 2)
1796	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1797		};
1798
1799		shared_user: USER '=' QSTRING ';'
1800		{
1801	<	if (ypass == 2)
1801	>	if (conf_parser_ctx.pass == 2)
1802		{
1803	<	split_nuh(yylval.string, NULL, &yy_match_item->user, &yy_match_item->host);
1803	>	struct split_nuh_item nuh;
1804	>
1805	>	nuh.nuhmask  = yylval.string;
1806	>	nuh.nickptr  = NULL;
1807	>	nuh.userptr  = block_state.user.buf;
1808	>	nuh.hostptr  = block_state.host.buf;
1809	>
1810	>	nuh.nicksize = 0;
1811	>	nuh.usersize = sizeof(block_state.user.buf);
1812	>	nuh.hostsize = sizeof(block_state.host.buf);
1813	>
1814	>	split_nuh(&nuh);
1815		}
1816		};
1817
1818		shared_type: TYPE
1819		{
1820	<	if (ypass == 2)
1821	<	yy_match_item->action = 0;
1820	>	if (conf_parser_ctx.pass == 2)
1821	>	block_state.flags.value = 0;
1822		} '=' shared_types ';' ;
1823
1824		shared_types: shared_types ',' shared_type_item | shared_type_item;
1825		shared_type_item: KLINE
1826		{
1827	<	if (ypass == 2)
1828	<	yy_match_item->action |= SHARED_KLINE;
2143	<	} | TKLINE
2144	<	{
2145	<	if (ypass == 2)
2146	<	yy_match_item->action |= SHARED_TKLINE;
1827	>	if (conf_parser_ctx.pass == 2)
1828	>	block_state.flags.value |= SHARED_KLINE;
1829		} | UNKLINE
1830		{
1831	<	if (ypass == 2)
1832	<	yy_match_item->action |= SHARED_UNKLINE;
1833	<	} | XLINE
1831	>	if (conf_parser_ctx.pass == 2)
1832	>	block_state.flags.value |= SHARED_UNKLINE;
1833	>	} | T_DLINE
1834	>	{
1835	>	if (conf_parser_ctx.pass == 2)
1836	>	block_state.flags.value |= SHARED_DLINE;
1837	>	} | T_UNDLINE
1838		{
1839	<	if (ypass == 2)
1840	<	yy_match_item->action |= SHARED_XLINE;
1841	<	} | TXLINE
1839	>	if (conf_parser_ctx.pass == 2)
1840	>	block_state.flags.value |= SHARED_UNDLINE;
1841	>	} | XLINE
1842		{
1843	<	if (ypass == 2)
1844	<	yy_match_item->action |= SHARED_TXLINE;
1843	>	if (conf_parser_ctx.pass == 2)
1844	>	block_state.flags.value |= SHARED_XLINE;
1845		} | T_UNXLINE
1846		{
1847	<	if (ypass == 2)
1848	<	yy_match_item->action |= SHARED_UNXLINE;
1847	>	if (conf_parser_ctx.pass == 2)
1848	>	block_state.flags.value |= SHARED_UNXLINE;
1849		} | RESV
1850		{
1851	<	if (ypass == 2)
1852	<	yy_match_item->action |= SHARED_RESV;
2167	<	} | TRESV
2168	<	{
2169	<	if (ypass == 2)
2170	<	yy_match_item->action |= SHARED_TRESV;
1851	>	if (conf_parser_ctx.pass == 2)
1852	>	block_state.flags.value |= SHARED_RESV;
1853		} | T_UNRESV
1854		{
1855	<	if (ypass == 2)
1856	<	yy_match_item->action |= SHARED_UNRESV;
1855	>	if (conf_parser_ctx.pass == 2)
1856	>	block_state.flags.value |= SHARED_UNRESV;
1857		} | T_LOCOPS
1858		{
1859	<	if (ypass == 2)
1860	<	yy_match_item->action |= SHARED_LOCOPS;
1859	>	if (conf_parser_ctx.pass == 2)
1860	>	block_state.flags.value |= SHARED_LOCOPS;
1861		} | T_ALL
1862		{
1863	<	if (ypass == 2)
1864	<	yy_match_item->action = SHARED_ALL;
1863	>	if (conf_parser_ctx.pass == 2)
1864	>	block_state.flags.value = SHARED_ALL;
1865		};
1866
1867		/***************************************************************************
#	Line 2187 | Line 1869 | shared_type_item: KLINE
1869		***************************************************************************/
1870		cluster_entry: T_CLUSTER
1871		{
1872	<	if (ypass == 2)
1873	<	{
1874	<	yy_conf = make_conf_item(CLUSTER_TYPE);
1875	<	yy_conf->flags = SHARED_ALL;
1876	<	}
1872	>	if (conf_parser_ctx.pass != 2)
1873	>	break;
1874	>
1875	>	reset_block_state();
1876	>
1877	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1878	>	block_state.flags.value = SHARED_ALL;
1879		} '{' cluster_items '}' ';'
1880		{
1881	<	if (ypass == 2)
1882	<	{
1883	<	if (yy_conf->name == NULL)
1884	<	DupString(yy_conf->name, "*");
1885	<	yy_conf = NULL;
1886	<	}
1881	>	struct MaskItem *conf = NULL;
1882	>
1883	>	if (conf_parser_ctx.pass != 2)
1884	>	break;
1885	>
1886	>	conf = conf_make(CONF_CLUSTER);
1887	>	conf->flags = block_state.flags.value;
1888	>	conf->name = xstrdup(block_state.name.buf);
1889		};
1890
1891		cluster_items:  cluster_items cluster_item | cluster_item;
#	Line 2207 | Line 1893 | cluster_item:  cluster_name | cluster_typ
1893
1894		cluster_name: NAME '=' QSTRING ';'
1895		{
1896	<	if (ypass == 2)
1897	<	DupString(yy_conf->name, yylval.string);
1896	>	if (conf_parser_ctx.pass == 2)
1897	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1898		};
1899
1900		cluster_type: TYPE
1901		{
1902	<	if (ypass == 2)
1903	<	yy_conf->flags = 0;
1902	>	if (conf_parser_ctx.pass == 2)
1903	>	block_state.flags.value = 0;
1904		} '=' cluster_types ';' ;
1905
1906		cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1907		cluster_type_item: KLINE
1908		{
1909	<	if (ypass == 2)
1910	<	yy_conf->flags |= SHARED_KLINE;
2225	<	} | TKLINE
2226	<	{
2227	<	if (ypass == 2)
2228	<	yy_conf->flags |= SHARED_TKLINE;
1909	>	if (conf_parser_ctx.pass == 2)
1910	>	block_state.flags.value |= SHARED_KLINE;
1911		} | UNKLINE
1912		{
1913	<	if (ypass == 2)
1914	<	yy_conf->flags |= SHARED_UNKLINE;
1915	<	} | XLINE
1913	>	if (conf_parser_ctx.pass == 2)
1914	>	block_state.flags.value |= SHARED_UNKLINE;
1915	>	} | T_DLINE
1916	>	{
1917	>	if (conf_parser_ctx.pass == 2)
1918	>	block_state.flags.value |= SHARED_DLINE;
1919	>	} | T_UNDLINE
1920		{
1921	<	if (ypass == 2)
1922	<	yy_conf->flags |= SHARED_XLINE;
1923	<	} | TXLINE
1921	>	if (conf_parser_ctx.pass == 2)
1922	>	block_state.flags.value |= SHARED_UNDLINE;
1923	>	} | XLINE
1924		{
1925	<	if (ypass == 2)
1926	<	yy_conf->flags |= SHARED_TXLINE;
1925	>	if (conf_parser_ctx.pass == 2)
1926	>	block_state.flags.value |= SHARED_XLINE;
1927		} | T_UNXLINE
1928		{
1929	<	if (ypass == 2)
1930	<	yy_conf->flags |= SHARED_UNXLINE;
1929	>	if (conf_parser_ctx.pass == 2)
1930	>	block_state.flags.value |= SHARED_UNXLINE;
1931		} | RESV
1932		{
1933	<	if (ypass == 2)
1934	<	yy_conf->flags |= SHARED_RESV;
2249	<	} | TRESV
2250	<	{
2251	<	if (ypass == 2)
2252	<	yy_conf->flags |= SHARED_TRESV;
1933	>	if (conf_parser_ctx.pass == 2)
1934	>	block_state.flags.value |= SHARED_RESV;
1935		} | T_UNRESV
1936		{
1937	<	if (ypass == 2)
1938	<	yy_conf->flags |= SHARED_UNRESV;
1937	>	if (conf_parser_ctx.pass == 2)
1938	>	block_state.flags.value |= SHARED_UNRESV;
1939		} | T_LOCOPS
1940		{
1941	<	if (ypass == 2)
1942	<	yy_conf->flags |= SHARED_LOCOPS;
1941	>	if (conf_parser_ctx.pass == 2)
1942	>	block_state.flags.value |= SHARED_LOCOPS;
1943		} | T_ALL
1944		{
1945	<	if (ypass == 2)
1946	<	yy_conf->flags = SHARED_ALL;
1945	>	if (conf_parser_ctx.pass == 2)
1946	>	block_state.flags.value = SHARED_ALL;
1947		};
1948
1949		/***************************************************************************
#	Line 2269 | Line 1951 | cluster_type_item: KLINE
1951		***************************************************************************/
1952		connect_entry: CONNECT
1953		{
2272	–	if (ypass == 2)
2273	–	{
2274	–	yy_conf = make_conf_item(SERVER_TYPE);
2275	–	yy_aconf = (struct AccessItem *)map_to_conf(yy_conf);
2276	–	yy_aconf->passwd = NULL;
2277	–	/* defaults */
2278	–	yy_aconf->port = PORTNUM;
1954
1955	<	if (ConfigFileEntry.burst_away)
1956	<	yy_aconf->flags = CONF_FLAGS_BURST_AWAY;
2282	<	}
2283	<	else
2284	<	{
2285	<	MyFree(class_name);
2286	<	class_name = NULL;
2287	<	}
2288	<	} connect_name_b '{' connect_items '}' ';'
2289	<	{
2290	<	if (ypass == 2)
2291	<	{
2292	<	struct CollectItem *yy_hconf=NULL;
2293	<	struct CollectItem *yy_lconf=NULL;
2294	<	dlink_node *ptr;
2295	<	dlink_node *next_ptr;
2296	<	#ifdef HAVE_LIBCRYPTO
2297	<	if (yy_aconf->host &&
2298	<	((yy_aconf->passwd && yy_aconf->spasswd) ||
2299	<	(yy_aconf->rsa_public_key && IsConfCryptLink(yy_aconf))))
2300	<	#else /* !HAVE_LIBCRYPTO */
2301	<	if (yy_aconf->host && !IsConfCryptLink(yy_aconf) &&
2302	<	yy_aconf->passwd && yy_aconf->spasswd)
2303	<	#endif /* !HAVE_LIBCRYPTO */
2304	<	{
2305	<	if (conf_add_server(yy_conf, scount, class_name) >= 0)
2306	<	{
2307	<	++scount;
2308	<	}
2309	<	else
2310	<	{
2311	<	delete_conf_item(yy_conf);
2312	<	yy_conf = NULL;
2313	<	yy_aconf = NULL;
2314	<	}
2315	<	}
2316	<	else
2317	<	{
2318	<	/* Even if yy_conf ->name is NULL
2319	<	* should still unhook any hub/leaf confs still pending
2320	<	*/
2321	<	unhook_hub_leaf_confs();
2322	<
2323	<	if (yy_conf->name != NULL)
2324	<	{
2325	<	#ifndef HAVE_LIBCRYPTO
2326	<	if (IsConfCryptLink(yy_aconf))
2327	<	yyerror("Ignoring connect block -- no OpenSSL support");
2328	<	#else
2329	<	if (IsConfCryptLink(yy_aconf) && !yy_aconf->rsa_public_key)
2330	<	yyerror("Ignoring connect block -- missing key");
2331	<	#endif
2332	<	if (yy_aconf->host == NULL)
2333	<	yyerror("Ignoring connect block -- missing host");
2334	<	else if (!IsConfCryptLink(yy_aconf) &&
2335	<	(!yy_aconf->passwd || !yy_aconf->spasswd))
2336	<	yyerror("Ignoring connect block -- missing password");
2337	<	}
2338	<
2339	<
2340	<	/* XXX
2341	<	* This fixes a try_connections() core (caused by invalid class_ptr
2342	<	* pointers) reported by metalrock. That's an ugly fix, but there
2343	<	* is currently no better way. The entire config subsystem needs an
2344	<	* rewrite ASAP. make_conf_item() shouldn't really add things onto
2345	<	* a doubly linked list immediately without any sanity checks!  -Michael
2346	<	*/
2347	<	delete_conf_item(yy_conf);
2348	<
2349	<	yy_aconf = NULL;
2350	<	yy_conf = NULL;
2351	<	}
2352	<
2353	<	/*
2354	<	* yy_conf is still pointing at the server that is having
2355	<	* a connect block built for it. This means, y_aconf->name
2356	<	* points to the actual irc name this server will be known as.
2357	<	* Now this new server has a set or even just one hub_mask (or leaf_mask)
2358	<	* given in the link list at yy_hconf. Fill in the HUB confs
2359	<	* from this link list now.
2360	<	*/
2361	<	DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
2362	<	{
2363	<	struct ConfItem *new_hub_conf;
2364	<	struct MatchItem *match_item;
1955	>	if (conf_parser_ctx.pass != 2)
1956	>	break;
1957
1958	<	yy_hconf = ptr->data;
1958	>	reset_block_state();
1959	>	block_state.port.value = PORTNUM;
1960	>	} '{' connect_items '}' ';'
1961	>	{
1962	>	struct MaskItem *conf = NULL;
1963	>	struct addrinfo hints, *res;
1964	>
1965	>	if (conf_parser_ctx.pass != 2)
1966	>	break;
1967	>
1968	>	if (!block_state.name.buf[0] ||
1969	>	!block_state.host.buf[0])
1970	>	break;
1971	>
1972	>	if (!(block_state.rpass.buf[0] ||
1973	>	block_state.spass.buf[0]))
1974	>	break;
1975	>
1976	>	if (has_wildcards(block_state.name.buf) ||
1977	>	has_wildcards(block_state.host.buf))
1978	>	break;
1979	>
1980	>	conf = conf_make(CONF_SERVER);
1981	>	conf->port = block_state.port.value;
1982	>	conf->flags = block_state.flags.value;
1983	>	conf->aftype = block_state.aftype.value;
1984	>	conf->host = xstrdup(block_state.host.buf);
1985	>	conf->name = xstrdup(block_state.name.buf);
1986	>	conf->passwd = xstrdup(block_state.rpass.buf);
1987	>	conf->spasswd = xstrdup(block_state.spass.buf);
1988	>	conf->cipher_list = xstrdup(block_state.ciph.buf);
1989
1990	<	/* yy_conf == NULL is a fatal error for this connect block! */
1991	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2370	<	{
2371	<	new_hub_conf = make_conf_item(HUB_TYPE);
2372	<	match_item = (struct MatchItem *)map_to_conf(new_hub_conf);
2373	<	DupString(new_hub_conf->name, yy_conf->name);
2374	<	if (yy_hconf->user != NULL)
2375	<	DupString(match_item->user, yy_hconf->user);
2376	<	else
2377	<	DupString(match_item->user, "*");
2378	<	if (yy_hconf->host != NULL)
2379	<	DupString(match_item->host, yy_hconf->host);
2380	<	else
2381	<	DupString(match_item->host, "*");
2382	<	}
2383	<	dlinkDelete(&yy_hconf->node, &hub_conf_list);
2384	<	free_collect_item(yy_hconf);
2385	<	}
1990	>	dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
1991	>	dlinkMoveList(&block_state.hub.list, &conf->hub_list);
1992
1993	<	/* Ditto for the LEAF confs */
1993	>	if (block_state.bind.buf[0])
1994	>	{
1995	>	memset(&hints, 0, sizeof(hints));
1996
1997	<	DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
1998	<	{
1999	<	struct ConfItem *new_leaf_conf;
2392	<	struct MatchItem *match_item;
1997	>	hints.ai_family   = AF_UNSPEC;
1998	>	hints.ai_socktype = SOCK_STREAM;
1999	>	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2000
2001	<	yy_lconf = ptr->data;
2001	>	if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2002	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2003	>	else
2004	>	{
2005	>	assert(res != NULL);
2006
2007	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2008	<	{
2009	<	new_leaf_conf = make_conf_item(LEAF_TYPE);
2010	<	match_item = (struct MatchItem *)map_to_conf(new_leaf_conf);
2011	<	DupString(new_leaf_conf->name, yy_conf->name);
2401	<	if (yy_lconf->user != NULL)
2402	<	DupString(match_item->user, yy_lconf->user);
2403	<	else
2404	<	DupString(match_item->user, "*");
2405	<	if (yy_lconf->host != NULL)
2406	<	DupString(match_item->host, yy_lconf->host);
2407	<	else
2408	<	DupString(match_item->host, "*");
2409	<	}
2410	<	dlinkDelete(&yy_lconf->node, &leaf_conf_list);
2411	<	free_collect_item(yy_lconf);
2412	<	}
2413	<	MyFree(class_name);
2414	<	class_name = NULL;
2415	<	yy_conf = NULL;
2416	<	yy_aconf = NULL;
2007	>	memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2008	>	conf->bind.ss.ss_family = res->ai_family;
2009	>	conf->bind.ss_len = res->ai_addrlen;
2010	>	freeaddrinfo(res);
2011	>	}
2012		}
2013	+
2014	+	conf_add_class_to_conf(conf, block_state.class.buf);
2015	+	lookup_confhost(conf);
2016		};
2017
2420	–	connect_name_b: | connect_name_t;
2018		connect_items:  connect_items connect_item | connect_item;
2019		connect_item:   connect_name | connect_host | connect_vhost |
2020		connect_send_password | connect_accept_password |
2021	<	connect_aftype | connect_port |
2022	<	connect_fakename | connect_flags | connect_hub_mask |
2023	<	connect_leaf_mask | connect_class | connect_auto |
2427	<	connect_encrypted | connect_compressed | connect_cryptlink |
2428	<	connect_rsa_public_key_file | connect_cipher_preference |
2021	>	connect_aftype | connect_port | connect_ssl_cipher_list |
2022	>	connect_flags | connect_hub_mask | connect_leaf_mask |
2023	>	connect_class | connect_encrypted |
2024		error ';' ;
2025
2026		connect_name: NAME '=' QSTRING ';'
2027		{
2028	<	if (ypass == 2)
2029	<	{
2435	<	if (yy_conf->name != NULL)
2436	<	yyerror("Multiple connect name entry");
2437	<
2438	<	MyFree(yy_conf->name);
2439	<	DupString(yy_conf->name, yylval.string);
2440	<	}
2441	<	};
2442	<
2443	<	connect_name_t: QSTRING
2444	<	{
2445	<	if (ypass == 2)
2446	<	{
2447	<	if (yy_conf->name != NULL)
2448	<	yyerror("Multiple connect name entry");
2449	<
2450	<	MyFree(yy_conf->name);
2451	<	DupString(yy_conf->name, yylval.string);
2452	<	}
2028	>	if (conf_parser_ctx.pass == 2)
2029	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2030		};
2031
2032		connect_host: HOST '=' QSTRING ';'
2033		{
2034	<	if (ypass == 2)
2035	<	{
2459	<	MyFree(yy_aconf->host);
2460	<	DupString(yy_aconf->host, yylval.string);
2461	<	}
2034	>	if (conf_parser_ctx.pass == 2)
2035	>	strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2036		};
2037
2038		connect_vhost: VHOST '=' QSTRING ';'
2039		{
2040	<	if (ypass == 2)
2041	<	{
2468	<	struct addrinfo hints, *res;
2469	<
2470	<	memset(&hints, 0, sizeof(hints));
2471	<
2472	<	hints.ai_family   = AF_UNSPEC;
2473	<	hints.ai_socktype = SOCK_STREAM;
2474	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2475	<
2476	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
2477	<	ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
2478	<	else
2479	<	{
2480	<	assert(res != NULL);
2481	<
2482	<	memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
2483	<	yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
2484	<	yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
2485	<	irc_freeaddrinfo(res);
2486	<	}
2487	<	}
2040	>	if (conf_parser_ctx.pass == 2)
2041	>	strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2042		};
2043
2044		connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2045		{
2046	<	if (ypass == 2)
2047	<	{
2494	<	if (yy_aconf->spasswd != NULL)
2495	<	memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
2046	>	if (conf_parser_ctx.pass != 2)
2047	>	break;
2048
2049	<	MyFree(yy_aconf->spasswd);
2050	<	DupString(yy_aconf->spasswd, yylval.string);
2051	<	}
2049	>	if ($3[0] == ':')
2050	>	conf_error_report("Server passwords cannot begin with a colon");
2051	>	else if (strchr($3, ' ') != NULL)
2052	>	conf_error_report("Server passwords cannot contain spaces");
2053	>	else
2054	>	strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
2055		};
2056
2057		connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2058		{
2059	<	if (ypass == 2)
2060	<	{
2506	<	if (yy_aconf->passwd != NULL)
2507	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
2059	>	if (conf_parser_ctx.pass != 2)
2060	>	break;
2061
2062	<	MyFree(yy_aconf->passwd);
2063	<	DupString(yy_aconf->passwd, yylval.string);
2064	<	}
2062	>	if ($3[0] == ':')
2063	>	conf_error_report("Server passwords cannot begin with a colon");
2064	>	else if (strchr($3, ' ') != NULL)
2065	>	conf_error_report("Server passwords cannot contain spaces");
2066	>	else
2067	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2068		};
2069
2070		connect_port: PORT '=' NUMBER ';'
2071		{
2072	<	if (ypass == 2)
2073	<	yy_aconf->port = $3;
2072	>	if (conf_parser_ctx.pass == 2)
2073	>	block_state.port.value = $3;
2074		};
2075
2076		connect_aftype: AFTYPE '=' T_IPV4 ';'
2077		{
2078	<	if (ypass == 2)
2079	<	yy_aconf->aftype = AF_INET;
2078	>	if (conf_parser_ctx.pass == 2)
2079	>	block_state.aftype.value = AF_INET;
2080		} | AFTYPE '=' T_IPV6 ';'
2081		{
2082		#ifdef IPV6
2083	<	if (ypass == 2)
2084	<	yy_aconf->aftype = AF_INET6;
2083	>	if (conf_parser_ctx.pass == 2)
2084	>	block_state.aftype.value = AF_INET6;
2085		#endif
2086		};
2087
2532	–	connect_fakename: FAKENAME '=' QSTRING ';'
2533	–	{
2534	–	if (ypass == 2)
2535	–	{
2536	–	MyFree(yy_aconf->fakename);
2537	–	DupString(yy_aconf->fakename, yylval.string);
2538	–	}
2539	–	};
2540	–
2088		connect_flags: IRCD_FLAGS
2089		{
2090	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2091		} '='  connect_flags_items ';';
2092
2093		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2094	<	connect_flags_item: NOT connect_flags_item_atom { not_atom = 1; }
2547	<	| connect_flags_item_atom { not_atom = 0; };
2548	<
2549	<	connect_flags_item_atom: LAZYLINK
2094	>	connect_flags_item: AUTOCONN
2095		{
2096	<	if (ypass == 2)
2097	<	{
2098	<	if (not_atom)ClearConfLazyLink(yy_aconf);
2554	<	else SetConfLazyLink(yy_aconf);
2555	<	}
2556	<	} | COMPRESSED
2557	<	{
2558	<	if (ypass == 2)
2559	<	#ifndef HAVE_LIBZ
2560	<	yyerror("Ignoring flags = compressed; -- no zlib support");
2561	<	#else
2562	<	{
2563	<	if (not_atom)ClearConfCompressed(yy_aconf);
2564	<	else SetConfCompressed(yy_aconf);
2565	<	}
2566	<	#endif
2567	<	} | CRYPTLINK
2568	<	{
2569	<	if (ypass == 2)
2570	<	{
2571	<	if (not_atom)ClearConfCryptLink(yy_aconf);
2572	<	else SetConfCryptLink(yy_aconf);
2573	<	}
2574	<	} | AUTOCONN
2096	>	if (conf_parser_ctx.pass == 2)
2097	>	block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2098	>	} | T_SSL
2099		{
2100	<	if (ypass == 2)
2101	<	{
2578	<	if (not_atom)ClearConfAllowAutoConn(yy_aconf);
2579	<	else SetConfAllowAutoConn(yy_aconf);
2580	<	}
2581	<	} | BURST_AWAY
2582	<	{
2583	<	if (ypass == 2)
2584	<	{
2585	<	if (not_atom)ClearConfAwayBurst(yy_aconf);
2586	<	else SetConfAwayBurst(yy_aconf);
2587	<	}
2588	<	} | TOPICBURST
2589	<	{
2590	<	if (ypass == 2)
2591	<	{
2592	<	if (not_atom)ClearConfTopicBurst(yy_aconf);
2593	<	else SetConfTopicBurst(yy_aconf);
2594	<	}
2595	<	}
2596	<	;
2597	<
2598	<	connect_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
2599	<	{
2600	<	#ifdef HAVE_LIBCRYPTO
2601	<	if (ypass == 2)
2602	<	{
2603	<	BIO *file;
2604	<
2605	<	if (yy_aconf->rsa_public_key != NULL)
2606	<	{
2607	<	RSA_free(yy_aconf->rsa_public_key);
2608	<	yy_aconf->rsa_public_key = NULL;
2609	<	}
2610	<
2611	<	if (yy_aconf->rsa_public_key_file != NULL)
2612	<	{
2613	<	MyFree(yy_aconf->rsa_public_key_file);
2614	<	yy_aconf->rsa_public_key_file = NULL;
2615	<	}
2616	<
2617	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
2618	<
2619	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
2620	<	{
2621	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
2622	<	break;
2623	<	}
2624	<
2625	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
2626	<
2627	<	if (yy_aconf->rsa_public_key == NULL)
2628	<	{
2629	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
2630	<	break;
2631	<	}
2632	<
2633	<	BIO_set_close(file, BIO_CLOSE);
2634	<	BIO_free(file);
2635	<	}
2636	<	#endif /* HAVE_LIBCRYPTO */
2100	>	if (conf_parser_ctx.pass == 2)
2101	>	block_state.flags.value |= CONF_FLAGS_SSL;
2102		};
2103
2104		connect_encrypted: ENCRYPTED '=' TBOOL ';'
2105		{
2106	<	if (ypass == 2)
2106	>	if (conf_parser_ctx.pass == 2)
2107		{
2108		if (yylval.number)
2109	<	yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
2109	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
2110		else
2111	<	yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
2647	<	}
2648	<	};
2649	<
2650	<	connect_cryptlink: CRYPTLINK '=' TBOOL ';'
2651	<	{
2652	<	if (ypass == 2)
2653	<	{
2654	<	if (yylval.number)
2655	<	yy_aconf->flags |= CONF_FLAGS_CRYPTLINK;
2656	<	else
2657	<	yy_aconf->flags &= ~CONF_FLAGS_CRYPTLINK;
2658	<	}
2659	<	};
2660	<
2661	<	connect_compressed: COMPRESSED '=' TBOOL ';'
2662	<	{
2663	<	if (ypass == 2)
2664	<	{
2665	<	if (yylval.number)
2666	<	#ifndef HAVE_LIBZ
2667	<	yyerror("Ignoring compressed=yes; -- no zlib support");
2668	<	#else
2669	<	yy_aconf->flags |= CONF_FLAGS_COMPRESSED;
2670	<	#endif
2671	<	else
2672	<	yy_aconf->flags &= ~CONF_FLAGS_COMPRESSED;
2673	<	}
2674	<	};
2675	<
2676	<	connect_auto: AUTOCONN '=' TBOOL ';'
2677	<	{
2678	<	if (ypass == 2)
2679	<	{
2680	<	if (yylval.number)
2681	<	yy_aconf->flags |= CONF_FLAGS_ALLOW_AUTO_CONN;
2682	<	else
2683	<	yy_aconf->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN;
2111	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
2112		}
2113		};
2114
2115		connect_hub_mask: HUB_MASK '=' QSTRING ';'
2116		{
2117	<	if (ypass == 2)
2118	<	{
2691	<	struct CollectItem *yy_tmp;
2692	<
2693	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2694	<	DupString(yy_tmp->host, yylval.string);
2695	<	DupString(yy_tmp->user, "*");
2696	<	dlinkAdd(yy_tmp, &yy_tmp->node, &hub_conf_list);
2697	<	}
2117	>	if (conf_parser_ctx.pass == 2)
2118	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2119		};
2120
2121		connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2122		{
2123	<	if (ypass == 2)
2124	<	{
2704	<	struct CollectItem *yy_tmp;
2705	<
2706	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2707	<	DupString(yy_tmp->host, yylval.string);
2708	<	DupString(yy_tmp->user, "*");
2709	<	dlinkAdd(yy_tmp, &yy_tmp->node, &leaf_conf_list);
2710	<	}
2123	>	if (conf_parser_ctx.pass == 2)
2124	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
2125		};
2126
2127		connect_class: CLASS '=' QSTRING ';'
2128		{
2129	<	if (ypass == 2)
2130	<	{
2717	<	MyFree(class_name);
2718	<	DupString(class_name, yylval.string);
2719	<	}
2129	>	if (conf_parser_ctx.pass == 2)
2130	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2131		};
2132
2133	<	connect_cipher_preference: CIPHER_PREFERENCE '=' QSTRING ';'
2133	>	connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2134		{
2135		#ifdef HAVE_LIBCRYPTO
2136	<	if (ypass == 2)
2137	<	{
2727	<	struct EncCapability *ecap;
2728	<	const char *cipher_name;
2729	<	int found = 0;
2730	<
2731	<	yy_aconf->cipher_preference = NULL;
2732	<	cipher_name = yylval.string;
2733	<
2734	<	for (ecap = CipherTable; ecap->name; ecap++)
2735	<	{
2736	<	if ((irccmp(ecap->name, cipher_name) == 0) &&
2737	<	(ecap->cap & CAP_ENC_MASK))
2738	<	{
2739	<	yy_aconf->cipher_preference = ecap;
2740	<	found = 1;
2741	<	break;
2742	<	}
2743	<	}
2744	<
2745	<	if (!found)
2746	<	yyerror("Invalid cipher");
2747	<	}
2136	>	if (conf_parser_ctx.pass == 2)
2137	>	strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2138		#else
2139	<	if (ypass == 2)
2140	<	yyerror("Ignoring cipher_preference -- no OpenSSL support");
2139	>	if (conf_parser_ctx.pass == 2)
2140	>	conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
2141		#endif
2142		};
2143
2144	+
2145		/***************************************************************************
2146		*  section kill
2147		***************************************************************************/
2148		kill_entry: KILL
2149		{
2150	<	if (ypass == 2)
2151	<	{
2761	<	userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
2762	<	regex_ban = 0;
2763	<	}
2150	>	if (conf_parser_ctx.pass == 2)
2151	>	reset_block_state();
2152		} '{' kill_items '}' ';'
2153		{
2154	<	if (ypass == 2)
2767	<	{
2768	<	if (userbuf[0] && hostbuf[0])
2769	<	{
2770	<	if (regex_ban)
2771	<	{
2772	<	pcre *exp_user = NULL;
2773	<	pcre *exp_host = NULL;
2774	<	const char *errptr = NULL;
2775	<
2776	<	if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
2777	<	!(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
2778	<	{
2779	<	ilog(L_ERROR, "Failed to add regular expression based K-Line: %s", errptr);
2780	<	break;
2781	<	}
2782	<
2783	<	yy_conf = make_conf_item(RKLINE_TYPE);
2784	<	yy_aconf->regexuser = exp_user;
2785	<	yy_aconf->regexhost = exp_host;
2154	>	struct MaskItem *conf = NULL;
2155
2156	<	DupString(yy_aconf->user, userbuf);
2157	<	DupString(yy_aconf->host, hostbuf);
2156	>	if (conf_parser_ctx.pass != 2)
2157	>	break;
2158
2159	<	if (reasonbuf[0])
2160	<	DupString(yy_aconf->reason, reasonbuf);
2161	<	else
2793	<	DupString(yy_aconf->reason, "No reason");
2794	<	}
2795	<	else
2796	<	{
2797	<	yy_conf = make_conf_item(KLINE_TYPE);
2798	<	yy_aconf = map_to_conf(yy_conf);
2159	>	if (!block_state.user.buf[0] ||
2160	>	!block_state.host.buf[0])
2161	>	break;
2162
2800	–	DupString(yy_aconf->user, userbuf);
2801	–	DupString(yy_aconf->host, hostbuf);
2163
2164	<	if (reasonbuf[0])
2165	<	DupString(yy_aconf->reason, reasonbuf);
2166	<	else
2167	<	DupString(yy_aconf->reason, "No reason");
2168	<	add_conf_by_address(CONF_KILL, yy_aconf);
2169	<	}
2164	>	if (block_state.port.value == 1)
2165	>	{
2166	>	#ifdef HAVE_LIBPCRE
2167	>	void *exp_user = NULL;
2168	>	void *exp_host = NULL;
2169	>	const char *errptr = NULL;
2170	>
2171	>	if (!(exp_user = ircd_pcre_compile(block_state.user.buf, &errptr)) ||
2172	>	!(exp_host = ircd_pcre_compile(block_state.host.buf, &errptr)))
2173	>	{
2174	>	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: %s",
2175	>	errptr);
2176	>	break;
2177		}
2178	+
2179	+	conf = conf_make(CONF_RKLINE);
2180	+	conf->regexuser = exp_user;
2181	+	conf->regexhost = exp_host;
2182	+
2183	+	conf->user = xstrdup(block_state.user.buf);
2184	+	conf->host = xstrdup(block_state.host.buf);
2185	+
2186	+	if (block_state.rpass.buf[0])
2187	+	conf->reason = xstrdup(block_state.rpass.buf);
2188		else
2189	<	delete_conf_item(yy_conf);
2189	>	conf->reason = xstrdup(CONF_NOREASON);
2190	>	#else
2191	>	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: no PCRE support");
2192	>	break;
2193	>	#endif
2194	>	}
2195	>	else
2196	>	{
2197	>	conf = conf_make(CONF_KLINE);
2198	>
2199	>	conf->user = xstrdup(block_state.user.buf);
2200	>	conf->host = xstrdup(block_state.host.buf);
2201
2202	<	yy_conf = NULL;
2203	<	yy_aconf = NULL;
2202	>	if (block_state.rpass.buf[0])
2203	>	conf->reason = xstrdup(block_state.rpass.buf);
2204	>	else
2205	>	conf->reason = xstrdup(CONF_NOREASON);
2206	>	add_conf_by_address(CONF_KLINE, conf);
2207		}
2208		};
2209
2210		kill_type: TYPE
2211		{
2212	+	if (conf_parser_ctx.pass == 2)
2213	+	block_state.port.value = 0;
2214		} '='  kill_type_items ';';
2215
2216		kill_type_items: kill_type_items ',' kill_type_item | kill_type_item;
2217		kill_type_item: REGEX_T
2218		{
2219	<	if (ypass == 2)
2220	<	regex_ban = 1;
2219	>	if (conf_parser_ctx.pass == 2)
2220	>	block_state.port.value = 1;
2221		};
2222
2223		kill_items:     kill_items kill_item | kill_item;
#	Line 2831 | Line 2225 | kill_item:      kill_user | kill_reason
2225
2226		kill_user: USER '=' QSTRING ';'
2227		{
2228	<	if (ypass == 2)
2228	>
2229	>	if (conf_parser_ctx.pass == 2)
2230		{
2231	<	char *user = NULL, *host = NULL;
2231	>	struct split_nuh_item nuh;
2232
2233	<	split_nuh(yylval.string, NULL, &user, &host);
2233	>	nuh.nuhmask  = yylval.string;
2234	>	nuh.nickptr  = NULL;
2235	>	nuh.userptr  = block_state.user.buf;
2236	>	nuh.hostptr  = block_state.host.buf;
2237
2238	<	strlcpy(userbuf, user, sizeof(userbuf));
2239	<	strlcpy(hostbuf, host, sizeof(hostbuf));
2238	>	nuh.nicksize = 0;
2239	>	nuh.usersize = sizeof(block_state.user.buf);
2240	>	nuh.hostsize = sizeof(block_state.host.buf);
2241
2242	<	MyFree(user);
2844	<	MyFree(host);
2242	>	split_nuh(&nuh);
2243		}
2244		};
2245
2246		kill_reason: REASON '=' QSTRING ';'
2247		{
2248	<	if (ypass == 2)
2249	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2248	>	if (conf_parser_ctx.pass == 2)
2249	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2250		};
2251
2252		/***************************************************************************
#	Line 2856 | Line 2254 | kill_reason: REASON '=' QSTRING ';'
2254		***************************************************************************/
2255		deny_entry: DENY
2256		{
2257	<	if (ypass == 2)
2258	<	{
2861	<	yy_conf = make_conf_item(DLINE_TYPE);
2862	<	yy_aconf = map_to_conf(yy_conf);
2863	<	/* default reason */
2864	<	DupString(yy_aconf->reason, "No reason");
2865	<	}
2257	>	if (conf_parser_ctx.pass == 2)
2258	>	reset_block_state();
2259		} '{' deny_items '}' ';'
2260		{
2261	<	if (ypass == 2)
2261	>	struct MaskItem *conf = NULL;
2262	>
2263	>	if (conf_parser_ctx.pass != 2)
2264	>	break;
2265	>
2266	>	if (!block_state.addr.buf[0])
2267	>	break;
2268	>
2269	>	if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2270		{
2271	<	if (yy_aconf->host && parse_netmask(yy_aconf->host, NULL, NULL) != HM_HOST)
2272	<	add_conf_by_address(CONF_DLINE, yy_aconf);
2271	>	conf = conf_make(CONF_DLINE);
2272	>	conf->host = xstrdup(block_state.addr.buf);
2273	>
2274	>	if (block_state.rpass.buf[0])
2275	>	conf->reason = xstrdup(block_state.rpass.buf);
2276		else
2277	<	delete_conf_item(yy_conf);
2278	<	yy_conf = NULL;
2875	<	yy_aconf = NULL;
2277	>	conf->reason = xstrdup(CONF_NOREASON);
2278	>	add_conf_by_address(CONF_DLINE, conf);
2279		}
2280		};
2281
#	Line 2881 | Line 2284 | deny_item:      deny_ip | deny_reason |
2284
2285		deny_ip: IP '=' QSTRING ';'
2286		{
2287	<	if (ypass == 2)
2288	<	{
2886	<	MyFree(yy_aconf->host);
2887	<	DupString(yy_aconf->host, yylval.string);
2888	<	}
2287	>	if (conf_parser_ctx.pass == 2)
2288	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2289		};
2290
2291		deny_reason: REASON '=' QSTRING ';'
2292		{
2293	<	if (ypass == 2)
2294	<	{
2895	<	MyFree(yy_aconf->reason);
2896	<	DupString(yy_aconf->reason, yylval.string);
2897	<	}
2293	>	if (conf_parser_ctx.pass == 2)
2294	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2295		};
2296
2297		/***************************************************************************
#	Line 2907 | Line 2304 | exempt_item:      exempt_ip | error;
2304
2305		exempt_ip: IP '=' QSTRING ';'
2306		{
2307	<	if (ypass == 2)
2307	>	if (conf_parser_ctx.pass == 2)
2308		{
2309		if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2310		{
2311	<	yy_conf = make_conf_item(EXEMPTDLINE_TYPE);
2312	<	yy_aconf = map_to_conf(yy_conf);
2916	<	DupString(yy_aconf->host, yylval.string);
2311	>	struct MaskItem *conf = conf_make(CONF_EXEMPT);
2312	>	conf->host = xstrdup(yylval.string);
2313
2314	<	add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
2919	<
2920	<	yy_conf = NULL;
2921	<	yy_aconf = NULL;
2314	>	add_conf_by_address(CONF_EXEMPT, conf);
2315		}
2316		}
2317		};
#	Line 2928 | Line 2321 | exempt_ip: IP '=' QSTRING ';'
2321		***************************************************************************/
2322		gecos_entry: GECOS
2323		{
2324	<	if (ypass == 2)
2325	<	{
2933	<	regex_ban = 0;
2934	<	reasonbuf[0] = gecos_name[0] = '\0';
2935	<	}
2324	>	if (conf_parser_ctx.pass == 2)
2325	>	reset_block_state();
2326		} '{' gecos_items '}' ';'
2327		{
2328	<	if (ypass == 2)
2939	<	{
2940	<	if (gecos_name[0])
2941	<	{
2942	<	if (regex_ban)
2943	<	{
2944	<	pcre *exp_p = NULL;
2945	<	const char *errptr = NULL;
2328	>	struct MaskItem *conf = NULL;
2329
2330	<	if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
2331	<	{
2949	<	ilog(L_ERROR, "Failed to add regular expression based X-Line: %s", errptr);
2950	<	break;
2951	<	}
2330	>	if (conf_parser_ctx.pass != 2)
2331	>	break;
2332
2333	<	yy_conf = make_conf_item(RXLINE_TYPE);
2334	<	yy_conf->regexpname = exp_p;
2955	<	}
2956	<	else
2957	<	yy_conf = make_conf_item(XLINE_TYPE);
2333	>	if (!block_state.name.buf[0])
2334	>	break;
2335
2336	<	yy_match_item = map_to_conf(yy_conf);
2337	<	DupString(yy_conf->name, gecos_name);
2336	>	if (block_state.port.value == 1)
2337	>	{
2338	>	#ifdef HAVE_LIBPCRE
2339	>	void *exp_p = NULL;
2340	>	const char *errptr = NULL;
2341
2342	<	if (reasonbuf[0])
2343	<	DupString(yy_match_item->reason, reasonbuf);
2344	<	else
2345	<	DupString(yy_match_item->reason, "No reason");
2342	>	if (!(exp_p = ircd_pcre_compile(block_state.name.buf, &errptr)))
2343	>	{
2344	>	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: %s",
2345	>	errptr);
2346	>	break;
2347		}
2348	+
2349	+	conf = conf_make(CONF_RXLINE);
2350	+	conf->regexuser = exp_p;
2351	+	#else
2352	+	conf_error_report("Failed to add regular expression based X-Line: no PCRE support");
2353	+	break;
2354	+	#endif
2355		}
2356	+	else
2357	+	conf = conf_make(CONF_XLINE);
2358	+
2359	+	conf->name = xstrdup(block_state.name.buf);
2360	+
2361	+	if (block_state.rpass.buf[0])
2362	+	conf->reason = xstrdup(block_state.rpass.buf);
2363	+	else
2364	+	conf->reason = xstrdup(CONF_NOREASON);
2365		};
2366
2367		gecos_flags: TYPE
2368		{
2369	+	if (conf_parser_ctx.pass == 2)
2370	+	block_state.port.value = 0;
2371		} '='  gecos_flags_items ';';
2372
2373		gecos_flags_items: gecos_flags_items ',' gecos_flags_item | gecos_flags_item;
2374		gecos_flags_item: REGEX_T
2375		{
2376	<	if (ypass == 2)
2377	<	regex_ban = 1;
2376	>	if (conf_parser_ctx.pass == 2)
2377	>	block_state.port.value = 1;
2378		};
2379
2380		gecos_items: gecos_items gecos_item | gecos_item;
#	Line 2983 | Line 2382 | gecos_item:  gecos_name | gecos_reason |
2382
2383		gecos_name: NAME '=' QSTRING ';'
2384		{
2385	<	if (ypass == 2)
2386	<	strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
2385	>	if (conf_parser_ctx.pass == 2)
2386	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2387		};
2388
2389		gecos_reason: REASON '=' QSTRING ';'
2390		{
2391	<	if (ypass == 2)
2392	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2391	>	if (conf_parser_ctx.pass == 2)
2392	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2393		};
2394
2395		/***************************************************************************
#	Line 3005 | Line 2404 | general_item:       general_hide_spoof_i
2404		general_max_nick_time | general_max_nick_changes |
2405		general_max_accept | general_anti_spam_exit_message_time |
2406		general_ts_warn_delta | general_ts_max_delta |
2407	<	general_kill_chase_time_limit | general_kline_with_reason |
2408	<	general_kline_reason | general_invisible_on_connect |
2407	>	general_kill_chase_time_limit |
2408	>	general_invisible_on_connect |
2409		general_warn_no_nline | general_dots_in_ident |
2410		general_stats_o_oper_only | general_stats_k_oper_only |
2411		general_pace_wait | general_stats_i_oper_only |
2412		general_pace_wait_simple | general_stats_P_oper_only |
2413		general_short_motd | general_no_oper_flood |
2414		general_true_no_oper_flood | general_oper_pass_resv |
2415	<	general_idletime | general_message_locale |
2415	>	general_message_locale |
2416		general_oper_only_umodes | general_max_targets |
2417		general_use_egd | general_egdpool_path |
2418		general_oper_umodes | general_caller_id_wait |
2419		general_opers_bypass_callerid | general_default_floodcount |
2420		general_min_nonwildcard | general_min_nonwildcard_simple |
2421	<	general_servlink_path | general_disable_remote_commands |
3023	<	general_default_cipher_preference |
3024	<	general_compression_level | general_client_flood |
2421	>	general_disable_remote_commands |
2422		general_throttle_time | general_havent_read_conf |
2423	<	general_dot_in_ip6_addr | general_ping_cookie |
2424	<	general_disable_auth | general_burst_away |
2425	<	general_tkline_expire_notices | general_gline_min_cidr |
2426	<	general_gline_min_cidr6 | general_use_whois_actually |
2427	<	general_reject_hold_time |
2423	>	general_ping_cookie |
2424	>	general_disable_auth |
2425	>	general_tkline_expire_notices | general_gline_enable |
2426	>	general_gline_duration | general_gline_request_duration |
2427	>	general_gline_min_cidr |
2428	>	general_gline_min_cidr6 |
2429	>	general_stats_e_disabled |
2430	>	general_max_watch | general_services_name |
2431		error;
2432
2433
2434	+	general_max_watch: MAX_WATCH '=' NUMBER ';'
2435	+	{
2436	+	ConfigFileEntry.max_watch = $3;
2437	+	};
2438
2439	<	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2439	>	general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2440		{
2441	<	ConfigFileEntry.gline_min_cidr = $3;
2441	>	if (conf_parser_ctx.pass == 2)
2442	>	ConfigFileEntry.glines = yylval.number;
2443		};
2444
2445	<	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2445	>	general_gline_duration: GLINE_DURATION '=' timespec ';'
2446		{
2447	<	ConfigFileEntry.gline_min_cidr6 = $3;
2447	>	if (conf_parser_ctx.pass == 2)
2448	>	ConfigFileEntry.gline_time = $3;
2449		};
2450
2451	<	general_burst_away: BURST_AWAY '=' TBOOL ';'
2451	>	general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2452		{
2453	<	ConfigFileEntry.burst_away = yylval.number;
2453	>	if (conf_parser_ctx.pass == 2)
2454	>	ConfigFileEntry.gline_request_time = $3;
2455		};
2456
2457	<	general_use_whois_actually: USE_WHOIS_ACTUALLY '=' TBOOL ';'
2457	>	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2458		{
2459	<	ConfigFileEntry.use_whois_actually = yylval.number;
2459	>	ConfigFileEntry.gline_min_cidr = $3;
2460		};
2461
2462	<	general_reject_hold_time: TREJECT_HOLD_TIME '=' timespec ';'
2462	>	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2463		{
2464	<	GlobalSetOptions.rejecttime = yylval.number;
2464	>	ConfigFileEntry.gline_min_cidr6 = $3;
2465		};
2466
2467		general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
#	Line 3062 | Line 2469 | general_tkline_expire_notices: TKLINE_EX
2469		ConfigFileEntry.tkline_expire_notices = yylval.number;
2470		};
2471
2472	<	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' NUMBER ';'
2472	>	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2473		{
2474		ConfigFileEntry.kill_chase_time_limit = $3;
2475		};
#	Line 3119 | Line 2526 | general_ts_warn_delta: TS_WARN_DELTA '='
2526
2527		general_ts_max_delta: TS_MAX_DELTA '=' timespec ';'
2528		{
2529	<	if (ypass == 2)
2529	>	if (conf_parser_ctx.pass == 2)
2530		ConfigFileEntry.ts_max_delta = $3;
2531		};
2532
2533		general_havent_read_conf: HAVENT_READ_CONF '=' NUMBER ';'
2534		{
2535	<	if (($3 > 0) && ypass == 1)
2535	>	if (($3 > 0) && conf_parser_ctx.pass == 1)
2536		{
2537	<	ilog(L_CRIT, "You haven't read your config file properly.");
2538	<	ilog(L_CRIT, "There is a line in the example conf that will kill your server if not removed.");
2539	<	ilog(L_CRIT, "Consider actually reading/editing the conf file, and removing this line.");
2537	>	ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
2538	>	ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
2539	>	ilog(LOG_TYPE_IRCD, "Consider actually reading/editing the conf file, and removing this line.");
2540		exit(0);
2541		}
2542		};
2543
3137	–	general_kline_with_reason: KLINE_WITH_REASON '=' TBOOL ';'
3138	–	{
3139	–	ConfigFileEntry.kline_with_reason = yylval.number;
3140	–	};
3141	–
3142	–	general_kline_reason: KLINE_REASON '=' QSTRING ';'
3143	–	{
3144	–	if (ypass == 2)
3145	–	{
3146	–	MyFree(ConfigFileEntry.kline_reason);
3147	–	DupString(ConfigFileEntry.kline_reason, yylval.string);
3148	–	}
3149	–	};
3150	–
2544		general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2545		{
2546		ConfigFileEntry.invisible_on_connect = yylval.number;
#	Line 3158 | Line 2551 | general_warn_no_nline: WARN_NO_NLINE '='
2551		ConfigFileEntry.warn_no_nline = yylval.number;
2552		};
2553
2554	+	general_stats_e_disabled: STATS_E_DISABLED '=' TBOOL ';'
2555	+	{
2556	+	ConfigFileEntry.stats_e_disabled = yylval.number;
2557	+	};
2558	+
2559		general_stats_o_oper_only: STATS_O_OPER_ONLY '=' TBOOL ';'
2560		{
2561		ConfigFileEntry.stats_o_oper_only = yylval.number;
#	Line 3226 | Line 2624 | general_oper_pass_resv: OPER_PASS_RESV '
2624
2625		general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
2626		{
2627	<	if (ypass == 2)
2627	>	if (conf_parser_ctx.pass == 2)
2628		{
2629		if (strlen(yylval.string) > LOCALE_LENGTH-2)
2630		yylval.string[LOCALE_LENGTH-1] = '\0';
#	Line 3235 | Line 2633 | general_message_locale: MESSAGE_LOCALE '
2633		}
2634		};
2635
3238	–	general_idletime: IDLETIME '=' timespec ';'
3239	–	{
3240	–	ConfigFileEntry.idletime = $3;
3241	–	};
3242	–
2636		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2637		{
2638		ConfigFileEntry.dots_in_ident = $3;
#	Line 3250 | Line 2643 | general_max_targets: MAX_TARGETS '=' NUM
2643		ConfigFileEntry.max_targets = $3;
2644		};
2645
2646	<	general_servlink_path: SERVLINK_PATH '=' QSTRING ';'
3254	<	{
3255	<	if (ypass == 2)
3256	<	{
3257	<	MyFree(ConfigFileEntry.servlink_path);
3258	<	DupString(ConfigFileEntry.servlink_path, yylval.string);
3259	<	}
3260	<	};
3261	<
3262	<	general_default_cipher_preference: DEFAULT_CIPHER_PREFERENCE '=' QSTRING ';'
2646	>	general_use_egd: USE_EGD '=' TBOOL ';'
2647		{
2648	<	#ifdef HAVE_LIBCRYPTO
3265	<	if (ypass == 2)
3266	<	{
3267	<	struct EncCapability *ecap;
3268	<	const char *cipher_name;
3269	<	int found = 0;
3270	<
3271	<	ConfigFileEntry.default_cipher_preference = NULL;
3272	<	cipher_name = yylval.string;
3273	<
3274	<	for (ecap = CipherTable; ecap->name; ecap++)
3275	<	{
3276	<	if ((irccmp(ecap->name, cipher_name) == 0) &&
3277	<	(ecap->cap & CAP_ENC_MASK))
3278	<	{
3279	<	ConfigFileEntry.default_cipher_preference = ecap;
3280	<	found = 1;
3281	<	break;
3282	<	}
3283	<	}
3284	<
3285	<	if (!found)
3286	<	yyerror("Invalid cipher");
3287	<	}
3288	<	#else
3289	<	if (ypass == 2)
3290	<	yyerror("Ignoring default_cipher_preference -- no OpenSSL support");
3291	<	#endif
2648	>	ConfigFileEntry.use_egd = yylval.number;
2649		};
2650
2651	<	general_compression_level: COMPRESSION_LEVEL '=' NUMBER ';'
2651	>	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
2652		{
2653	<	if (ypass == 2)
2653	>	if (conf_parser_ctx.pass == 2)
2654		{
2655	<	ConfigFileEntry.compression_level = $3;
2656	<	#ifndef HAVE_LIBZ
3300	<	yyerror("Ignoring compression_level -- no zlib support");
3301	<	#else
3302	<	if ((ConfigFileEntry.compression_level < 1) ||
3303	<	(ConfigFileEntry.compression_level > 9))
3304	<	{
3305	<	yyerror("Ignoring invalid compression_level, using default");
3306	<	ConfigFileEntry.compression_level = 0;
3307	<	}
3308	<	#endif
2655	>	MyFree(ConfigFileEntry.egdpool_path);
2656	>	ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
2657		}
2658		};
2659
2660	<	general_use_egd: USE_EGD '=' TBOOL ';'
2660	>	general_services_name: T_SERVICES_NAME '=' QSTRING ';'
2661		{
2662	<	ConfigFileEntry.use_egd = yylval.number;
3315	<	};
3316	<
3317	<	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
3318	<	{
3319	<	if (ypass == 2)
2662	>	if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2663		{
2664	<	MyFree(ConfigFileEntry.egdpool_path);
2665	<	DupString(ConfigFileEntry.egdpool_path, yylval.string);
2664	>	MyFree(ConfigFileEntry.service_name);
2665	>	ConfigFileEntry.service_name = xstrdup(yylval.string);
2666		}
2667		};
2668
#	Line 3350 | Line 2693 | umode_oitem:     T_BOTS
2693		} | T_CCONN
2694		{
2695		ConfigFileEntry.oper_umodes |= UMODE_CCONN;
2696	+	} | T_CCONN_FULL
2697	+	{
2698	+	ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
2699		} | T_DEAF
2700		{
2701		ConfigFileEntry.oper_umodes |= UMODE_DEAF;
#	Line 3359 | Line 2705 | umode_oitem:     T_BOTS
2705		} | T_FULL
2706		{
2707		ConfigFileEntry.oper_umodes |= UMODE_FULL;
2708	+	} | HIDDEN
2709	+	{
2710	+	ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
2711		} | T_SKILL
2712		{
2713		ConfigFileEntry.oper_umodes |= UMODE_SKILL;
#	Line 3412 | Line 2761 | umode_item:    T_BOTS
2761		} | T_CCONN
2762		{
2763		ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
2764	+	} | T_CCONN_FULL
2765	+	{
2766	+	ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
2767		} | T_DEAF
2768		{
2769		ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
#	Line 3424 | Line 2776 | umode_item:    T_BOTS
2776		} | T_SKILL
2777		{
2778		ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
2779	+	} | HIDDEN
2780	+	{
2781	+	ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
2782		} | T_NCHANGE
2783		{
2784		ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
#	Line 3477 | Line 2832 | general_default_floodcount: DEFAULT_FLOO
2832		ConfigFileEntry.default_floodcount = $3;
2833		};
2834
3480	–	general_client_flood: T_CLIENT_FLOOD '=' sizespec ';'
3481	–	{
3482	–	ConfigFileEntry.client_flood = $3;
3483	–	};
3484	–
3485	–	general_dot_in_ip6_addr: DOT_IN_IP6_ADDR '=' TBOOL ';'
3486	–	{
3487	–	ConfigFileEntry.dot_in_ip6_addr = yylval.number;
3488	–	};
3489	–
3490	–	/***************************************************************************
3491	–	*  section glines
3492	–	***************************************************************************/
3493	–	gline_entry: GLINES
3494	–	{
3495	–	if (ypass == 2)
3496	–	{
3497	–	yy_conf = make_conf_item(GDENY_TYPE);
3498	–	yy_aconf = (struct AccessItem *)map_to_conf(yy_conf);
3499	–	yy_aconf->flags = 0;
3500	–	}
3501	–	} '{' gline_items '}' ';'
3502	–	{
3503	–	if (ypass == 2)
3504	–	{
3505	–	/*
3506	–	* since we re-allocate yy_conf/yy_aconf after the end of action=, at the
3507	–	* end we will have one extra, so we should free it.
3508	–	*/
3509	–	if (yy_conf->name == NULL && gdeny_items.length)
3510	–	{
3511	–	dlinkDelete(gdeny_items.tail, &gdeny_items);
3512	–	MyFree(yy_conf);
3513	–	yy_conf = NULL;
3514	–	yy_aconf = NULL;
3515	–	}
3516	–	}
3517	–	};
3518	–
3519	–	gline_items:        gline_items gline_item | gline_item;
3520	–	gline_item:         gline_enable |
3521	–	gline_duration |
3522	–	gline_logging |
3523	–	gline_user |
3524	–	gline_server |
3525	–	gline_action |
3526	–	error;
3527	–
3528	–	gline_enable: ENABLE '=' TBOOL ';'
3529	–	{
3530	–	if (ypass == 2)
3531	–	ConfigFileEntry.glines = yylval.number;
3532	–	};
3533	–
3534	–	gline_duration: DURATION '=' timespec ';'
3535	–	{
3536	–	if (ypass == 2)
3537	–	ConfigFileEntry.gline_time = $3;
3538	–	};
3539	–
3540	–	gline_logging: LOGGING
3541	–	{
3542	–	if (ypass == 2)
3543	–	ConfigFileEntry.gline_logging = 0;
3544	–	} '=' gline_logging_types ';';
3545	–	gline_logging_types:     gline_logging_types ',' gline_logging_type_item | gline_logging_type_item;
3546	–	gline_logging_type_item: T_REJECT
3547	–	{
3548	–	if (ypass == 2)
3549	–	ConfigFileEntry.gline_logging |= GDENY_REJECT;
3550	–	} | T_BLOCK
3551	–	{
3552	–	if (ypass == 2)
3553	–	ConfigFileEntry.gline_logging |= GDENY_BLOCK;
3554	–	};
3555	–
3556	–	gline_user: USER '=' QSTRING ';'
3557	–	{
3558	–	if (ypass == 2)
3559	–	{
3560	–	struct CollectItem *yy_tmp;
3561	–
3562	–	if (yy_aconf->user == NULL)
3563	–	{
3564	–	split_nuh(yylval.string, NULL, &yy_aconf->user, &yy_aconf->host);
3565	–	}
3566	–	else
3567	–	{
3568	–	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
3569	–	split_nuh(yylval.string, NULL, &yy_tmp->user, &yy_tmp->host);
3570	–	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
3571	–	}
3572	–	}
3573	–	};
3574	–
3575	–	gline_server: NAME '=' QSTRING ';'
3576	–	{
3577	–	if (ypass == 2)
3578	–	{
3579	–	MyFree(yy_conf->name);
3580	–	DupString(yy_conf->name, yylval.string);
3581	–	}
3582	–	};
3583	–
3584	–	gline_action: ACTION
3585	–	{
3586	–	if (ypass == 2)
3587	–	yy_aconf->flags = 0;
3588	–	} '=' gdeny_types ';'
3589	–	{
3590	–	if (ypass == 2)
3591	–	{
3592	–	struct CollectItem *yy_tmp;
3593	–	dlink_node *ptr, *next_ptr;
3594	–
3595	–	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3596	–	{
3597	–	struct AccessItem *new_aconf;
3598	–	struct ConfItem *new_conf;
3599	–
3600	–	yy_tmp = ptr->data;
3601	–	new_conf = make_conf_item(GDENY_TYPE);
3602	–	new_aconf = (struct AccessItem *)map_to_conf(new_conf);
3603	–
3604	–	new_aconf->flags = yy_aconf->flags;
3605	–
3606	–	if (yy_conf->name != NULL)
3607	–	DupString(new_conf->name, yy_conf->name);
3608	–	else
3609	–	DupString(new_conf->name, "*");
3610	–	if (yy_aconf->user != NULL)
3611	–	DupString(new_aconf->user, yy_tmp->user);
3612	–	else
3613	–	DupString(new_aconf->user, "*");
3614	–	if (yy_aconf->host != NULL)
3615	–	DupString(new_aconf->host, yy_tmp->host);
3616	–	else
3617	–	DupString(new_aconf->host, "*");
3618	–
3619	–	dlinkDelete(&yy_tmp->node, &col_conf_list);
3620	–	}
3621	–	yy_conf = make_conf_item(GDENY_TYPE);
3622	–	yy_aconf = (struct AccessItem *)map_to_conf(yy_conf);
3623	–	yy_aconf->flags = 0;
3624	–	}
3625	–	};
3626	–
3627	–	gdeny_types: gdeny_types ',' gdeny_type_item | gdeny_type_item;
3628	–	gdeny_type_item: T_REJECT
3629	–	{
3630	–	if (ypass == 2)
3631	–	yy_aconf->flags |= GDENY_REJECT;
3632	–	} | T_BLOCK
3633	–	{
3634	–	if (ypass == 2)
3635	–	yy_aconf->flags |= GDENY_BLOCK;
3636	–	};
2835
2836		/***************************************************************************
2837		*  section channel
#	Line 3642 | Line 2840 | channel_entry: CHANNEL
2840		'{' channel_items '}' ';';
2841
2842		channel_items:      channel_items channel_item | channel_item;
2843	<	channel_item:       channel_disable_local_channels | channel_use_except |
2844	<	channel_use_invex | channel_use_knock |
2845	<	channel_max_bans | channel_knock_delay |
2846	<	channel_knock_delay_channel | channel_invite_ops_only |
2847	<	channel_max_chans_per_user | channel_quiet_on_ban |
2848	<	channel_default_split_user_count |
2849	<	channel_default_split_server_count |
2850	<	channel_no_create_on_split | channel_restrict_channels |
2851	<	channel_no_join_on_split | channel_burst_topicwho |
3654	<	channel_jflood_count | channel_jflood_time |
3655	<	error;
2843	>	channel_item:       channel_max_bans |
2844	>	channel_knock_delay | channel_knock_delay_channel |
2845	>	channel_max_chans_per_user | channel_max_chans_per_oper |
2846	>	channel_quiet_on_ban | channel_default_split_user_count |
2847	>	channel_default_split_server_count |
2848	>	channel_no_create_on_split | channel_restrict_channels |
2849	>	channel_no_join_on_split |
2850	>	channel_jflood_count | channel_jflood_time |
2851	>	channel_disable_fake_channels | error;
2852
2853	<	channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
2853	>	channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
2854		{
2855	<	ConfigChannel.restrict_channels = yylval.number;
2855	>	ConfigChannel.disable_fake_channels = yylval.number;
2856		};
2857
2858	<	channel_disable_local_channels: DISABLE_LOCAL_CHANNELS '=' TBOOL ';'
3663	<	{
3664	<	ConfigChannel.disable_local_channels = yylval.number;
3665	<	};
3666	<
3667	<	channel_use_except: USE_EXCEPT '=' TBOOL ';'
3668	<	{
3669	<	ConfigChannel.use_except = yylval.number;
3670	<	};
3671	<
3672	<	channel_use_invex: USE_INVEX '=' TBOOL ';'
3673	<	{
3674	<	ConfigChannel.use_invex = yylval.number;
3675	<	};
3676	<
3677	<	channel_use_knock: USE_KNOCK '=' TBOOL ';'
2858	>	channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
2859		{
2860	<	ConfigChannel.use_knock = yylval.number;
2860	>	ConfigChannel.restrict_channels = yylval.number;
2861		};
2862
2863		channel_knock_delay: KNOCK_DELAY '=' timespec ';'
#	Line 3689 | Line 2870 | channel_knock_delay_channel: KNOCK_DELAY
2870		ConfigChannel.knock_delay_channel = $3;
2871		};
2872
2873	<	channel_invite_ops_only: INVITE_OPS_ONLY '=' TBOOL ';'
2873	>	channel_max_chans_per_user: MAX_CHANS_PER_USER '=' NUMBER ';'
2874		{
2875	<	ConfigChannel.invite_ops_only = yylval.number;
2875	>	ConfigChannel.max_chans_per_user = $3;
2876		};
2877
2878	<	channel_max_chans_per_user: MAX_CHANS_PER_USER '=' NUMBER ';'
2878	>	channel_max_chans_per_oper: MAX_CHANS_PER_OPER '=' NUMBER ';'
2879		{
2880	<	ConfigChannel.max_chans_per_user = $3;
2880	>	ConfigChannel.max_chans_per_oper = $3;
2881		};
2882
2883		channel_quiet_on_ban: QUIET_ON_BAN '=' TBOOL ';'
#	Line 3729 | Line 2910 | channel_no_join_on_split: NO_JOIN_ON_SPL
2910		ConfigChannel.no_join_on_split = yylval.number;
2911		};
2912
3732	–	channel_burst_topicwho: BURST_TOPICWHO '=' TBOOL ';'
3733	–	{
3734	–	ConfigChannel.burst_topicwho = yylval.number;
3735	–	};
3736	–
2913		channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
2914		{
2915		GlobalSetOptions.joinfloodcount = yylval.number;
#	Line 3753 | Line 2929 | serverhide_entry: SERVERHIDE
2929		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
2930		serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
2931		serverhide_links_delay |
3756	–	serverhide_disable_hidden |
2932		serverhide_hidden | serverhide_hidden_name |
2933		serverhide_hide_server_ips |
2934		error;
2935
2936		serverhide_flatten_links: FLATTEN_LINKS '=' TBOOL ';'
2937		{
2938	<	if (ypass == 2)
2938	>	if (conf_parser_ctx.pass == 2)
2939		ConfigServerHide.flatten_links = yylval.number;
2940		};
2941
2942		serverhide_hide_servers: HIDE_SERVERS '=' TBOOL ';'
2943		{
2944	<	if (ypass == 2)
2944	>	if (conf_parser_ctx.pass == 2)
2945		ConfigServerHide.hide_servers = yylval.number;
2946		};
2947
2948		serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2949		{
2950	<	if (ypass == 2)
2950	>	if (conf_parser_ctx.pass == 2)
2951		{
2952		MyFree(ConfigServerHide.hidden_name);
2953	<	DupString(ConfigServerHide.hidden_name, yylval.string);
2953	>	ConfigServerHide.hidden_name = xstrdup(yylval.string);
2954		}
2955		};
2956
2957		serverhide_links_delay: LINKS_DELAY '=' timespec ';'
2958		{
2959	<	if (ypass == 2)
2959	>	if (conf_parser_ctx.pass == 2)
2960		{
2961		if (($3 > 0) && ConfigServerHide.links_disabled == 1)
2962		{
#	Line 3795 | Line 2970 | serverhide_links_delay: LINKS_DELAY '='
2970
2971		serverhide_hidden: HIDDEN '=' TBOOL ';'
2972		{
2973	<	if (ypass == 2)
2973	>	if (conf_parser_ctx.pass == 2)
2974		ConfigServerHide.hidden = yylval.number;
2975		};
2976
3802	–	serverhide_disable_hidden: DISABLE_HIDDEN '=' TBOOL ';'
3803	–	{
3804	–	if (ypass == 2)
3805	–	ConfigServerHide.disable_hidden = yylval.number;
3806	–	};
3807	–
2977		serverhide_hide_server_ips: HIDE_SERVER_IPS '=' TBOOL ';'
2978		{
2979	<	if (ypass == 2)
2979	>	if (conf_parser_ctx.pass == 2)
2980		ConfigServerHide.hide_server_ips = yylval.number;
2981		};

Diff Legend

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