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 2283 by michael, Tue Jun 18 19:13:20 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"
47		#include "resv.h"
48		#include "numeric.h"
49		#include "s_user.h"
50	+	#include "motd.h"
51
52		#ifdef HAVE_LIBCRYPTO
53		#include <openssl/rsa.h>
54		#include <openssl/bio.h>
55		#include <openssl/pem.h>
56	+	#include <openssl/dh.h>
57		#endif
58
59	<	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	<	};
59	>	#include "rsa.h"
60
61	<	static void
62	<	free_collect_item(struct CollectItem *item)
61	>	int yylex(void);
62	>
63	>	static struct
64		{
65	<	MyFree(item->name);
66	<	MyFree(item->user);
67	<	MyFree(item->host);
68	<	MyFree(item->passwd);
69	<	#ifdef HAVE_LIBCRYPTO
70	<	MyFree(item->rsa_public_key_file);
71	<	#endif
72	<	MyFree(item);
73	<	}
65	>	struct {
66	>	dlink_list list;
67	>	} mask,
68	>	leaf,
69	>	hub;
70	>
71	>	struct {
72	>	char buf[IRCD_BUFSIZE];
73	>	} name,
74	>	user,
75	>	host,
76	>	addr,
77	>	bind,
78	>	file,
79	>	ciph,
80	>	cert,
81	>	rpass,
82	>	spass,
83	>	class;
84	>
85	>	struct {
86	>	unsigned int value;
87	>	} flags,
88	>	modes,
89	>	size,
90	>	type,
91	>	port,
92	>	aftype,
93	>	ping_freq,
94	>	max_perip,
95	>	con_freq,
96	>	min_idle,
97	>	max_idle,
98	>	max_total,
99	>	max_global,
100	>	max_local,
101	>	max_ident,
102	>	max_sendq,
103	>	max_recvq,
104	>	cidr_bitlen_ipv4,
105	>	cidr_bitlen_ipv6,
106	>	number_per_cidr;
107	>	} block_state;
108
109		static void
110	<	unhook_hub_leaf_confs(void)
110	>	reset_block_state(void)
111		{
112	<	dlink_node *ptr;
113	<	dlink_node *next_ptr;
114	<	struct CollectItem *yy_hconf;
115	<	struct CollectItem *yy_lconf;
112	>	dlink_node *ptr = NULL, *ptr_next = NULL;
113
114	<	DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
114	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.mask.list.head)
115		{
116	<	yy_hconf = ptr->data;
117	<	dlinkDelete(&yy_hconf->node, &hub_conf_list);
118	<	free_collect_item(yy_hconf);
116	>	MyFree(ptr->data);
117	>	dlinkDelete(ptr, &block_state.mask.list);
118	>	free_dlink_node(ptr);
119		}
120
121	<	DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
121	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
122		{
123	<	yy_lconf = ptr->data;
124	<	dlinkDelete(&yy_lconf->node, &leaf_conf_list);
125	<	free_collect_item(yy_lconf);
123	>	MyFree(ptr->data);
124	>	dlinkDelete(ptr, &block_state.leaf.list);
125	>	free_dlink_node(ptr);
126		}
127	+
128	+	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.hub.list.head)
129	+	{
130	+	MyFree(ptr->data);
131	+	dlinkDelete(ptr, &block_state.hub.list);
132	+	free_dlink_node(ptr);
133	+	}
134	+
135	+	memset(&block_state, 0, sizeof(block_state));
136		}
137
138		%}
#	Line 137 | Line 143 | unhook_hub_leaf_confs(void)
143		}
144
145		%token  ACCEPT_PASSWORD
140	–	%token  ACTION
146		%token  ADMIN
147		%token  AFTYPE
143	–	%token  T_ALLOW
148		%token  ANTI_NICK_FLOOD
149		%token  ANTI_SPAM_EXIT_MESSAGE_TIME
150		%token  AUTOCONN
151	<	%token  T_BLOCK
148	<	%token  BURST_AWAY
149	<	%token  BURST_TOPICWHO
150	<	%token  BYTES KBYTES MBYTES GBYTES TBYTES
151	>	%token  BYTES KBYTES MBYTES
152		%token  CALLER_ID_WAIT
153		%token  CAN_FLOOD
153	–	%token  CAN_IDLE
154		%token  CHANNEL
155	<	%token  CIDR_BITLEN_IPV4
156	<	%token  CIDR_BITLEN_IPV6
157	<	%token  CIPHER_PREFERENCE
155	>	%token  CIDR_BITLEN_IPV4
156	>	%token  CIDR_BITLEN_IPV6
157		%token  CLASS
159	–	%token  COMPRESSED
160	–	%token  COMPRESSION_LEVEL
158		%token  CONNECT
159		%token  CONNECTFREQ
160	<	%token  CRYPTLINK
164	<	%token  DEFAULT_CIPHER_PREFERENCE
160	>	%token  CYCLE_ON_HOST_CHANGE
161		%token  DEFAULT_FLOODCOUNT
162		%token  DEFAULT_SPLIT_SERVER_COUNT
163		%token  DEFAULT_SPLIT_USER_COUNT
#	Line 169 | Line 165 | unhook_hub_leaf_confs(void)
165		%token  DESCRIPTION
166		%token  DIE
167		%token  DISABLE_AUTH
168	<	%token  DISABLE_HIDDEN
173	<	%token  DISABLE_LOCAL_CHANNELS
168	>	%token  DISABLE_FAKE_CHANNELS
169		%token  DISABLE_REMOTE_COMMANDS
175	–	%token  DOT_IN_IP6_ADDR
170		%token  DOTS_IN_IDENT
177	–	%token  DURATION
171		%token  EGDPOOL_PATH
172		%token  EMAIL
180	–	%token  ENABLE
173		%token  ENCRYPTED
174		%token  EXCEED_LIMIT
175		%token  EXEMPT
176		%token  FAILED_OPER_NOTICE
185	–	%token  FAKENAME
186	–	%token  IRCD_FLAGS
177		%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
178		%token  GECOS
179		%token  GENERAL
180		%token  GLINE
181	<	%token  GLINES
181	>	%token  GLINE_DURATION
182	>	%token  GLINE_ENABLE
183		%token  GLINE_EXEMPT
201	–	%token  GLINE_LOG
202	–	%token  GLINE_TIME
184		%token  GLINE_MIN_CIDR
185		%token  GLINE_MIN_CIDR6
186	+	%token  GLINE_REQUEST_DURATION
187		%token  GLOBAL_KILL
206	–	%token  IRCD_AUTH
207	–	%token  NEED_IDENT
188		%token  HAVENT_READ_CONF
189		%token  HIDDEN
190	<	%token  HIDDEN_ADMIN
191	<	%token  HIDDEN_NAME
212	<	%token  HIDDEN_OPER
190	>	%token  HIDDEN_NAME
191	>	%token  HIDE_IDLE_FROM_OPERS
192		%token  HIDE_SERVER_IPS
193		%token  HIDE_SERVERS
194	<	%token  HIDE_SPOOF_IPS
194	>	%token  HIDE_SERVICES
195	>	%token  HIDE_SPOOF_IPS
196		%token  HOST
197		%token  HUB
198		%token  HUB_MASK
219	–	%token  IDLETIME
199		%token  IGNORE_BOGUS_TS
200		%token  INVISIBLE_ON_CONNECT
201		%token  IP
202	+	%token  IRCD_AUTH
203	+	%token  IRCD_FLAGS
204	+	%token  IRCD_SID
205	+	%token  JOIN_FLOOD_COUNT
206	+	%token  JOIN_FLOOD_TIME
207		%token  KILL
208	<	%token  KILL_CHASE_TIME_LIMIT
208	>	%token  KILL_CHASE_TIME_LIMIT
209		%token  KLINE
210		%token  KLINE_EXEMPT
227	–	%token  KLINE_REASON
228	–	%token  KLINE_WITH_REASON
211		%token  KNOCK_DELAY
212		%token  KNOCK_DELAY_CHANNEL
231	–	%token  LAZYLINK
213		%token  LEAF_MASK
214		%token  LINKS_DELAY
215		%token  LISTEN
216	<	%token  T_LOG
236	<	%token  LOGGING
237	<	%token  LOG_LEVEL
216	>	%token  MASK
217		%token  MAX_ACCEPT
218		%token  MAX_BANS
219	+	%token  MAX_CHANS_PER_OPER
220		%token  MAX_CHANS_PER_USER
221		%token  MAX_GLOBAL
222		%token  MAX_IDENT
223	+	%token  MAX_IDLE
224		%token  MAX_LOCAL
225		%token  MAX_NICK_CHANGES
226	+	%token  MAX_NICK_LENGTH
227		%token  MAX_NICK_TIME
228		%token  MAX_NUMBER
229		%token  MAX_TARGETS
230	<	%token  MESSAGE_LOCALE
230	>	%token  MAX_TOPIC_LENGTH
231	>	%token  MAX_WATCH
232	>	%token  MIN_IDLE
233		%token  MIN_NONWILDCARD
234		%token  MIN_NONWILDCARD_SIMPLE
235		%token  MODULE
236		%token  MODULES
237	+	%token  MOTD
238		%token  NAME
239	+	%token  NEED_IDENT
240		%token  NEED_PASSWORD
241		%token  NETWORK_DESC
242		%token  NETWORK_NAME
243		%token  NICK
258	–	%token  NICK_CHANGES
244		%token  NO_CREATE_ON_SPLIT
245		%token  NO_JOIN_ON_SPLIT
246		%token  NO_OPER_FLOOD
247		%token  NO_TILDE
263	–	%token  NOT
248		%token  NUMBER
265	–	%token  NUMBER_PER_IDENT
249		%token  NUMBER_PER_CIDR
250		%token  NUMBER_PER_IP
268	–	%token  NUMBER_PER_IP_GLOBAL
269	–	%token  OPERATOR
270	–	%token  OPERS_BYPASS_CALLERID
271	–	%token  OPER_LOG
251		%token  OPER_ONLY_UMODES
252		%token  OPER_PASS_RESV
274	–	%token  OPER_SPY_T
253		%token  OPER_UMODES
254	<	%token  INVITE_OPS_ONLY
255	<	%token  JOIN_FLOOD_COUNT
278	<	%token  JOIN_FLOOD_TIME
254	>	%token  OPERATOR
255	>	%token  OPERS_BYPASS_CALLERID
256		%token  PACE_WAIT
257		%token  PACE_WAIT_SIMPLE
258		%token  PASSWORD
259		%token  PATH
260		%token  PING_COOKIE
261		%token  PING_TIME
285	–	%token  PING_WARNING
262		%token  PORT
263		%token  QSTRING
264	<	%token  QUIET_ON_BAN
264	>	%token  RANDOM_IDLE
265		%token  REASON
266		%token  REDIRPORT
267		%token  REDIRSERV
292	–	%token  REGEX_T
268		%token  REHASH
294	–	%token  TREJECT_HOLD_TIME
269		%token  REMOTE
270		%token  REMOTEBAN
297	–	%token  RESTRICT_CHANNELS
298	–	%token  RESTRICTED
299	–	%token  RSA_PRIVATE_KEY_FILE
300	–	%token  RSA_PUBLIC_KEY_FILE
301	–	%token  SSL_CERTIFICATE_FILE
271		%token  RESV
272		%token  RESV_EXEMPT
273	<	%token  SECONDS MINUTES HOURS DAYS WEEKS
274	<	%token  SENDQ
273	>	%token  RSA_PRIVATE_KEY_FILE
274	>	%token  RSA_PUBLIC_KEY_FILE
275	>	%token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
276		%token  SEND_PASSWORD
277	+	%token  SENDQ
278		%token  SERVERHIDE
279		%token  SERVERINFO
309	–	%token  SERVLINK_PATH
310	–	%token  IRCD_SID
311	–	%token  TKLINE_EXPIRE_NOTICES
312	–	%token  T_SHARED
313	–	%token  T_CLUSTER
314	–	%token  TYPE
280		%token  SHORT_MOTD
316	–	%token  SILENT
281		%token  SPOOF
282		%token  SPOOF_NOTICE
283	+	%token  SQUIT
284	+	%token  SSL_CERTIFICATE_FILE
285	+	%token  SSL_CERTIFICATE_FINGERPRINT
286	+	%token  SSL_CONNECTION_REQUIRED
287	+	%token  SSL_DH_PARAM_FILE
288	+	%token  STATS_E_DISABLED
289		%token  STATS_I_OPER_ONLY
290		%token  STATS_K_OPER_ONLY
291		%token  STATS_O_OPER_ONLY
292		%token  STATS_P_OPER_ONLY
293	<	%token  TBOOL
324	<	%token  TMASKED
325	<	%token  T_REJECT
326	<	%token  TS_MAX_DELTA
327	<	%token  TS_WARN_DELTA
328	<	%token  TWODOTS
293	>	%token  STATS_U_OPER_ONLY
294		%token  T_ALL
295		%token  T_BOTS
331	–	%token  T_SOFTCALLERID
296		%token  T_CALLERID
297		%token  T_CCONN
298	<	%token  T_CLIENT_FLOOD
298	>	%token  T_CLUSTER
299		%token  T_DEAF
300		%token  T_DEBUG
301	<	%token  T_DRONE
301	>	%token  T_DLINE
302		%token  T_EXTERNAL
303	+	%token  T_FARCONNECT
304	+	%token  T_FILE
305		%token  T_FULL
306	+	%token  T_GLOBOPS
307		%token  T_INVISIBLE
308		%token  T_IPV4
309		%token  T_IPV6
310		%token  T_LOCOPS
311	<	%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
311	>	%token  T_LOG
312		%token  T_MAX_CLIENTS
313		%token  T_NCHANGE
314	+	%token  T_NONONREG
315		%token  T_OPERWALL
316	+	%token  T_RECVQ
317		%token  T_REJ
318	+	%token  T_RESTART
319	+	%token  T_SERVER
320	+	%token  T_SERVICE
321	+	%token  T_SERVICES_NAME
322		%token  T_SERVNOTICE
323	+	%token  T_SET
324	+	%token  T_SHARED
325	+	%token  T_SIZE
326		%token  T_SKILL
327	+	%token  T_SOFTCALLERID
328		%token  T_SPY
329		%token  T_SSL
330	+	%token  T_SSL_CIPHER_LIST
331	+	%token  T_SSL_CLIENT_METHOD
332	+	%token  T_SSL_SERVER_METHOD
333	+	%token  T_SSLV3
334	+	%token  T_TLSV1
335	+	%token  T_UMODES
336		%token  T_UNAUTH
337	+	%token  T_UNDLINE
338	+	%token  T_UNLIMITED
339		%token  T_UNRESV
340		%token  T_UNXLINE
341		%token  T_WALLOP
342	+	%token  T_WALLOPS
343	+	%token  T_WEBIRC
344	+	%token  TBOOL
345		%token  THROTTLE_TIME
346	<	%token  TOPICBURST
346	>	%token  TKLINE_EXPIRE_NOTICES
347	>	%token  TMASKED
348		%token  TRUE_NO_OPER_FLOOD
349	<	%token  TKLINE
350	<	%token  TXLINE
351	<	%token  TRESV
349	>	%token  TS_MAX_DELTA
350	>	%token  TS_WARN_DELTA
351	>	%token  TWODOTS
352	>	%token  TYPE
353		%token  UNKLINE
371	–	%token  USER
354		%token  USE_EGD
373	–	%token  USE_EXCEPT
374	–	%token  USE_INVEX
375	–	%token  USE_KNOCK
355		%token  USE_LOGGING
356	<	%token  USE_WHOIS_ACTUALLY
356	>	%token  USER
357		%token  VHOST
358		%token  VHOST6
380	–	%token  XLINE
381	–	%token  WARN
359		%token  WARN_NO_NLINE
360	+	%token  XLINE
361
362	<	%type <string> QSTRING
363	<	%type <number> NUMBER
364	<	%type <number> timespec
365	<	%type <number> timespec_
366	<	%type <number> sizespec
367	<	%type <number> sizespec_
362	>	%type  <string> QSTRING
363	>	%type  <number> NUMBER
364	>	%type  <number> timespec
365	>	%type  <number> timespec_
366	>	%type  <number> sizespec
367	>	%type  <number> sizespec_
368
369		%%
370		conf:
#	Line 403 | Line 381 | conf_item:        admin_entry
381		| serverinfo_entry
382		| serverhide_entry
383		| resv_entry
384	+	| service_entry
385		| shared_entry
386		| cluster_entry
387		| connect_entry
#	Line 410 | Line 389 | conf_item:        admin_entry
389		| deny_entry
390		| exempt_entry
391		| general_entry
413	–	| gline_entry
392		| gecos_entry
393		| modules_entry
394	+	| motd_entry
395		| error ';'
396		| error '}'
397		;
#	Line 443 | Line 422 | timespec:      NUMBER timespec_
422		{
423		$$ = $1 * 60 * 60 * 24 * 7 + $3;
424		}
425	+	| NUMBER MONTHS timespec_
426	+	{
427	+	$$ = $1 * 60 * 60 * 24 * 7 * 4 + $3;
428	+	}
429	+	| NUMBER YEARS timespec_
430	+	{
431	+	$$ = $1 * 60 * 60 * 24 * 365 + $3;
432	+	}
433		;
434
435		sizespec_:      { $$ = 0; } | sizespec;
#	Line 464 | Line 451 | modules_item:   modules_module | modules
451
452		modules_module: MODULE '=' QSTRING ';'
453		{
454	<	#ifndef STATIC_MODULES /* NOOP in the static case */
455	<	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
454	>	if (conf_parser_ctx.pass == 2)
455	>	add_conf_module(libio_basename(yylval.string));
456		};
457
458		modules_path: PATH '=' QSTRING ';'
459		{
460	<	#ifndef STATIC_MODULES
485	<	if (ypass == 2)
460	>	if (conf_parser_ctx.pass == 2)
461		mod_add_path(yylval.string);
487	–	#endif
462		};
463
490	–	/***************************************************************************
491	–	*  section serverinfo
492	–	***************************************************************************/
493	–	serverinfo_entry: SERVERINFO
494	–	'{' serverinfo_items '}' ';';
464
465	<	serverinfo_items:       serverinfo_items serverinfo_item |
466	<	serverinfo_item ;
465	>	serverinfo_entry: SERVERINFO '{' serverinfo_items '}' ';';
466	>
467	>	serverinfo_items:       serverinfo_items serverinfo_item | serverinfo_item ;
468		serverinfo_item:        serverinfo_name | serverinfo_vhost |
469		serverinfo_hub | serverinfo_description |
470		serverinfo_network_name | serverinfo_network_desc |
471	<	serverinfo_max_clients |
471	>	serverinfo_max_clients | serverinfo_max_nick_length |
472	>	serverinfo_max_topic_length | serverinfo_ssl_dh_param_file |
473		serverinfo_rsa_private_key_file | serverinfo_vhost6 |
474		serverinfo_sid | serverinfo_ssl_certificate_file |
475	+	serverinfo_ssl_client_method | serverinfo_ssl_server_method |
476	+	serverinfo_ssl_cipher_list |
477		error ';' ;
478
479	+
480	+	serverinfo_ssl_client_method: T_SSL_CLIENT_METHOD '=' client_method_types ';' ;
481	+	serverinfo_ssl_server_method: T_SSL_SERVER_METHOD '=' server_method_types ';' ;
482	+
483	+	client_method_types: client_method_types ',' client_method_type_item | client_method_type_item;
484	+	client_method_type_item: T_SSLV3
485	+	{
486	+	#ifdef HAVE_LIBCRYPTO
487	+	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
488	+	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv3);
489	+	#endif
490	+	} | T_TLSV1
491	+	{
492	+	#ifdef HAVE_LIBCRYPTO
493	+	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
494	+	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_TLSv1);
495	+	#endif
496	+	};
497	+
498	+	server_method_types: server_method_types ',' server_method_type_item | server_method_type_item;
499	+	server_method_type_item: T_SSLV3
500	+	{
501	+	#ifdef HAVE_LIBCRYPTO
502	+	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
503	+	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
504	+	#endif
505	+	} | T_TLSV1
506	+	{
507	+	#ifdef HAVE_LIBCRYPTO
508	+	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
509	+	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
510	+	#endif
511	+	};
512	+
513		serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
514		{
515		#ifdef HAVE_LIBCRYPTO
516	<	if (ypass == 2 && ServerInfo.ctx)
516	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
517		{
518		if (!ServerInfo.rsa_private_key_file)
519		{
520	<	yyerror("No rsa_private_key_file specified, SSL disabled");
520	>	conf_error_report("No rsa_private_key_file specified, SSL disabled");
521		break;
522		}
523
524	<	if (SSL_CTX_use_certificate_file(ServerInfo.ctx,
525	<	yylval.string, SSL_FILETYPE_PEM) <= 0)
524	>	if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
525	>	SSL_FILETYPE_PEM) <= 0 ||
526	>	SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
527	>	SSL_FILETYPE_PEM) <= 0)
528		{
529	<	yyerror(ERR_lib_error_string(ERR_get_error()));
529	>	report_crypto_errors();
530	>	conf_error_report("Could not open/read certificate file");
531		break;
532		}
533
534	<	if (SSL_CTX_use_PrivateKey_file(ServerInfo.ctx,
535	<	ServerInfo.rsa_private_key_file, SSL_FILETYPE_PEM) <= 0)
534	>	if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
535	>	SSL_FILETYPE_PEM) <= 0 ||
536	>	SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
537	>	SSL_FILETYPE_PEM) <= 0)
538		{
539	<	yyerror(ERR_lib_error_string(ERR_get_error()));
539	>	report_crypto_errors();
540	>	conf_error_report("Could not read RSA private key");
541		break;
542		}
543
544	<	if (!SSL_CTX_check_private_key(ServerInfo.ctx))
544	>	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
545	>	!SSL_CTX_check_private_key(ServerInfo.client_ctx))
546		{
547	<	yyerror("RSA private key does not match the SSL certificate public key!");
547	>	report_crypto_errors();
548	>	conf_error_report("Could not read RSA private key");
549		break;
550		}
551		}
#	Line 540 | Line 555 | serverinfo_ssl_certificate_file: SSL_CER
555		serverinfo_rsa_private_key_file: RSA_PRIVATE_KEY_FILE '=' QSTRING ';'
556		{
557		#ifdef HAVE_LIBCRYPTO
558	<	if (ypass == 1)
558	>	BIO *file = NULL;
559	>
560	>	if (conf_parser_ctx.pass != 1)
561	>	break;
562	>
563	>	if (ServerInfo.rsa_private_key)
564		{
565	<	BIO *file;
565	>	RSA_free(ServerInfo.rsa_private_key);
566	>	ServerInfo.rsa_private_key = NULL;
567	>	}
568
569	<	if (ServerInfo.rsa_private_key)
570	<	{
571	<	RSA_free(ServerInfo.rsa_private_key);
572	<	ServerInfo.rsa_private_key = NULL;
573	<	}
569	>	if (ServerInfo.rsa_private_key_file)
570	>	{
571	>	MyFree(ServerInfo.rsa_private_key_file);
572	>	ServerInfo.rsa_private_key_file = NULL;
573	>	}
574
575	<	if (ServerInfo.rsa_private_key_file)
554	<	{
555	<	MyFree(ServerInfo.rsa_private_key_file);
556	<	ServerInfo.rsa_private_key_file = NULL;
557	<	}
575	>	ServerInfo.rsa_private_key_file = xstrdup(yylval.string);
576
577	<	DupString(ServerInfo.rsa_private_key_file, yylval.string);
577	>	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
578	>	{
579	>	conf_error_report("File open failed, ignoring");
580	>	break;
581	>	}
582
583	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
562	<	{
563	<	yyerror("File open failed, ignoring");
564	<	break;
565	<	}
583	>	ServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
584
585	<	ServerInfo.rsa_private_key = (RSA *)PEM_read_bio_RSAPrivateKey(file, NULL,
586	<	0, NULL);
585	>	BIO_set_close(file, BIO_CLOSE);
586	>	BIO_free(file);
587
588	<	BIO_set_close(file, BIO_CLOSE);
589	<	BIO_free(file);
588	>	if (ServerInfo.rsa_private_key == NULL)
589	>	{
590	>	conf_error_report("Couldn't extract key, ignoring");
591	>	break;
592	>	}
593
594	<	if (ServerInfo.rsa_private_key == NULL)
595	<	{
596	<	yyerror("Couldn't extract key, ignoring");
597	<	break;
577	<	}
594	>	if (!RSA_check_key(ServerInfo.rsa_private_key))
595	>	{
596	>	RSA_free(ServerInfo.rsa_private_key);
597	>	ServerInfo.rsa_private_key = NULL;
598
599	<	if (!RSA_check_key(ServerInfo.rsa_private_key))
600	<	{
601	<	RSA_free(ServerInfo.rsa_private_key);
582	<	ServerInfo.rsa_private_key = NULL;
599	>	conf_error_report("Invalid key, ignoring");
600	>	break;
601	>	}
602
603	<	yyerror("Invalid key, ignoring");
604	<	break;
605	<	}
603	>	/* require 2048 bit (256 byte) key */
604	>	if (RSA_size(ServerInfo.rsa_private_key) != 256)
605	>	{
606	>	RSA_free(ServerInfo.rsa_private_key);
607	>	ServerInfo.rsa_private_key = NULL;
608	>
609	>	conf_error_report("Not a 2048 bit key, ignoring");
610	>	}
611	>	#endif
612	>	};
613	>
614	>	serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
615	>	{
616	>	/* TBD - XXX: error reporting */
617	>	#ifdef HAVE_LIBCRYPTO
618	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
619	>	{
620	>	BIO *file = BIO_new_file(yylval.string, "r");
621
622	<	/* require 2048 bit (256 byte) key */
589	<	if (RSA_size(ServerInfo.rsa_private_key) != 256)
622	>	if (file)
623		{
624	<	RSA_free(ServerInfo.rsa_private_key);
625	<	ServerInfo.rsa_private_key = NULL;
624	>	DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
625	>
626	>	BIO_free(file);
627	>
628	>	if (dh)
629	>	{
630	>	if (DH_size(dh) < 128)
631	>	conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
632	>	else
633	>	SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
634
635	<	yyerror("Not a 2048 bit key, ignoring");
635	>	DH_free(dh);
636	>	}
637		}
638		}
639		#endif
640		};
641
642	+	serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
643	+	{
644	+	#ifdef HAVE_LIBCRYPTO
645	+	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
646	+	SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
647	+	#endif
648	+	};
649	+
650		serverinfo_name: NAME '=' QSTRING ';'
651		{
652		/* this isn't rehashable */
653	<	if (ypass == 2)
653	>	if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
654		{
655	<	if (ServerInfo.name == NULL)
655	>	if (valid_servname(yylval.string))
656	>	ServerInfo.name = xstrdup(yylval.string);
657	>	else
658		{
659	<	/* the ircd will exit() in main() if we dont set one */
660	<	if (strlen(yylval.string) <= HOSTLEN)
609	<	DupString(ServerInfo.name, yylval.string);
659	>	conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
660	>	exit(0);
661		}
662		}
663		};
#	Line 614 | Line 665 | serverinfo_name: NAME '=' QSTRING ';'
665		serverinfo_sid: IRCD_SID '=' QSTRING ';'
666		{
667		/* this isn't rehashable */
668	<	if (ypass == 2 && !ServerInfo.sid)
668	>	if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
669		{
670	<	if ((strlen(yylval.string) == IRC_MAXSID) && IsDigit(yylval.string[0])
671	<	&& IsAlNum(yylval.string[1]) && IsAlNum(yylval.string[2]))
621	<	{
622	<	DupString(ServerInfo.sid, yylval.string);
623	<	}
670	>	if (valid_sid(yylval.string))
671	>	ServerInfo.sid = xstrdup(yylval.string);
672		else
673		{
674	<	ilog(L_ERROR, "Ignoring config file entry SID -- invalid SID. Aborting.");
674	>	conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
675		exit(0);
676		}
677		}
#	Line 631 | Line 679 | serverinfo_sid: IRCD_SID '=' QSTRING ';'
679
680		serverinfo_description: DESCRIPTION '=' QSTRING ';'
681		{
682	<	if (ypass == 2)
682	>	if (conf_parser_ctx.pass == 2)
683		{
684		MyFree(ServerInfo.description);
685	<	DupString(ServerInfo.description,yylval.string);
685	>	ServerInfo.description = xstrdup(yylval.string);
686		}
687		};
688
689		serverinfo_network_name: NETWORK_NAME '=' QSTRING ';'
690		{
691	<	if (ypass == 2)
691	>	if (conf_parser_ctx.pass == 2)
692		{
693		char *p;
694
#	Line 648 | Line 696 | serverinfo_network_name: NETWORK_NAME '=
696		p = '\0';
697
698		MyFree(ServerInfo.network_name);
699	<	DupString(ServerInfo.network_name, yylval.string);
699	>	ServerInfo.network_name = xstrdup(yylval.string);
700		}
701		};
702
703		serverinfo_network_desc: NETWORK_DESC '=' QSTRING ';'
704		{
705	<	if (ypass == 2)
706	<	{
707	<	MyFree(ServerInfo.network_desc);
708	<	DupString(ServerInfo.network_desc, yylval.string);
709	<	}
705	>	if (conf_parser_ctx.pass != 2)
706	>	break;
707	>
708	>	MyFree(ServerInfo.network_desc);
709	>	ServerInfo.network_desc = xstrdup(yylval.string);
710		};
711
712		serverinfo_vhost: VHOST '=' QSTRING ';'
713		{
714	<	if (ypass == 2 && *yylval.string != '*')
714	>	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
715		{
716		struct addrinfo hints, *res;
717
#	Line 673 | Line 721 | serverinfo_vhost: VHOST '=' QSTRING ';'
721		hints.ai_socktype = SOCK_STREAM;
722		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
723
724	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
725	<	ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
724	>	if (getaddrinfo(yylval.string, NULL, &hints, &res))
725	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
726		else
727		{
728		assert(res != NULL);
#	Line 682 | Line 730 | serverinfo_vhost: VHOST '=' QSTRING ';'
730		memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
731		ServerInfo.ip.ss.ss_family = res->ai_family;
732		ServerInfo.ip.ss_len = res->ai_addrlen;
733	<	irc_freeaddrinfo(res);
733	>	freeaddrinfo(res);
734
735		ServerInfo.specific_ipv4_vhost = 1;
736		}
#	Line 692 | Line 740 | serverinfo_vhost: VHOST '=' QSTRING ';'
740		serverinfo_vhost6: VHOST6 '=' QSTRING ';'
741		{
742		#ifdef IPV6
743	<	if (ypass == 2 && *yylval.string != '*')
743	>	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
744		{
745		struct addrinfo hints, *res;
746
#	Line 702 | Line 750 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
750		hints.ai_socktype = SOCK_STREAM;
751		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
752
753	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
754	<	ilog(L_ERROR, "Invalid netmask for server vhost6(%s)", yylval.string);
753	>	if (getaddrinfo(yylval.string, NULL, &hints, &res))
754	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
755		else
756		{
757		assert(res != NULL);
#	Line 711 | Line 759 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
759		memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
760		ServerInfo.ip6.ss.ss_family = res->ai_family;
761		ServerInfo.ip6.ss_len = res->ai_addrlen;
762	<	irc_freeaddrinfo(res);
762	>	freeaddrinfo(res);
763
764		ServerInfo.specific_ipv6_vhost = 1;
765		}
#	Line 721 | Line 769 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
769
770		serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
771		{
772	<	if (ypass == 2)
772	>	if (conf_parser_ctx.pass != 2)
773	>	break;
774	>
775	>	if ($3 < MAXCLIENTS_MIN)
776		{
777	<	recalc_fdlimit(NULL);
777	>	char buf[IRCD_BUFSIZE];
778
779	<	if ($3 < MAXCLIENTS_MIN)
780	<	{
781	<	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;
779	>	snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
780	>	conf_error_report(buf);
781	>	ServerInfo.max_clients = MAXCLIENTS_MIN;
782		}
783	+	else if ($3 > MAXCLIENTS_MAX)
784	+	{
785	+	char buf[IRCD_BUFSIZE];
786	+
787	+	snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
788	+	conf_error_report(buf);
789	+	ServerInfo.max_clients = MAXCLIENTS_MAX;
790	+	}
791	+	else
792	+	ServerInfo.max_clients = $3;
793		};
794
795	<	serverinfo_hub: HUB '=' TBOOL ';'
795	>	serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
796		{
797	<	if (ypass == 2)
797	>	if (conf_parser_ctx.pass != 2)
798	>	break;
799	>
800	>	if ($3 < 9)
801		{
802	<	if (yylval.number)
803	<	{
804	<	/* Don't become a hub if we have a lazylink active. */
805	<	if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL))
806	<	{
807	<	sendto_realops_flags(UMODE_ALL, L_ALL,
755	<	"Ignoring config file line hub=yes; "
756	<	"due to active LazyLink (%s)", uplink->name);
757	<	}
758	<	else
759	<	{
760	<	ServerInfo.hub = 1;
761	<	uplink = NULL;
762	<	delete_capability("HUB");
763	<	add_capability("HUB", CAP_HUB, 1);
764	<	}
765	<	}
766	<	else if (ServerInfo.hub)
767	<	{
768	<	dlink_node *ptr = NULL;
802	>	conf_error_report("max_nick_length too low, setting to 9");
803	>	ServerInfo.max_nick_length = 9;
804	>	}
805	>	else if ($3 > NICKLEN)
806	>	{
807	>	char buf[IRCD_BUFSIZE];
808
809	<	ServerInfo.hub = 0;
810	<	delete_capability("HUB");
809	>	snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
810	>	conf_error_report(buf);
811	>	ServerInfo.max_nick_length = NICKLEN;
812	>	}
813	>	else
814	>	ServerInfo.max_nick_length = $3;
815	>	};
816
817	<	/* Don't become a leaf if we have a lazylink active. */
818	<	DLINK_FOREACH(ptr, serv_list.head)
819	<	{
820	<	const struct Client *acptr = ptr->data;
821	<	if (MyConnect(acptr) && IsCapable(acptr, CAP_LL))
822	<	{
823	<	sendto_realops_flags(UMODE_ALL, L_ALL,
824	<	"Ignoring config file line hub=no; "
825	<	"due to active LazyLink (%s)",
826	<	acptr->name);
827	<	add_capability("HUB", CAP_HUB, 1);
828	<	ServerInfo.hub = 1;
829	<	break;
830	<	}
831	<	}
832	<	}
817	>	serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
818	>	{
819	>	if (conf_parser_ctx.pass != 2)
820	>	break;
821	>
822	>	if ($3 < 80)
823	>	{
824	>	conf_error_report("max_topic_length too low, setting to 80");
825	>	ServerInfo.max_topic_length = 80;
826	>	}
827	>	else if ($3 > TOPICLEN)
828	>	{
829	>	char buf[IRCD_BUFSIZE];
830	>
831	>	snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
832	>	conf_error_report(buf);
833	>	ServerInfo.max_topic_length = TOPICLEN;
834		}
835	+	else
836	+	ServerInfo.max_topic_length = $3;
837	+	};
838	+
839	+	serverinfo_hub: HUB '=' TBOOL ';'
840	+	{
841	+	if (conf_parser_ctx.pass == 2)
842	+	ServerInfo.hub = yylval.number;
843		};
844
845		/***************************************************************************
#	Line 800 | Line 853 | admin_item:  admin_name | admin_descript
853
854		admin_name: NAME '=' QSTRING ';'
855		{
856	<	if (ypass == 2)
857	<	{
858	<	MyFree(AdminInfo.name);
859	<	DupString(AdminInfo.name, yylval.string);
860	<	}
856	>	if (conf_parser_ctx.pass != 2)
857	>	break;
858	>
859	>	MyFree(AdminInfo.name);
860	>	AdminInfo.name = xstrdup(yylval.string);
861		};
862
863		admin_email: EMAIL '=' QSTRING ';'
864		{
865	<	if (ypass == 2)
866	<	{
867	<	MyFree(AdminInfo.email);
868	<	DupString(AdminInfo.email, yylval.string);
869	<	}
865	>	if (conf_parser_ctx.pass != 2)
866	>	break;
867	>
868	>	MyFree(AdminInfo.email);
869	>	AdminInfo.email = xstrdup(yylval.string);
870		};
871
872		admin_description: DESCRIPTION '=' QSTRING ';'
873		{
874	<	if (ypass == 2)
875	<	{
876	<	MyFree(AdminInfo.description);
877	<	DupString(AdminInfo.description, yylval.string);
878	<	}
874	>	if (conf_parser_ctx.pass != 2)
875	>	break;
876	>
877	>	MyFree(AdminInfo.description);
878	>	AdminInfo.description = xstrdup(yylval.string);
879		};
880
881		/***************************************************************************
882	<	*  section logging
882	>	* motd section
883		***************************************************************************/
884	<	/* XXX */
885	<	logging_entry:          LOGGING  '{' logging_items '}' ';' ;
884	>	motd_entry: MOTD
885	>	{
886	>	if (conf_parser_ctx.pass == 2)
887	>	reset_block_state();
888	>	} '{' motd_items '}' ';'
889	>	{
890	>	dlink_node *ptr = NULL;
891
892	<	logging_items:          logging_items logging_item |
893	<	logging_item ;
892	>	if (conf_parser_ctx.pass != 2)
893	>	break;
894
895	<	logging_item:           logging_path | logging_oper_log |
896	<	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 |
844	<	error ';' ;
895	>	if (!block_state.file.buf[0])
896	>	break;
897
898	<	logging_path:           T_LOGPATH '=' QSTRING ';'
899	<	{
900	<	};
898	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
899	>	motd_add(ptr->data, block_state.file.buf);
900	>	};
901
902	<	logging_oper_log:       OPER_LOG '=' QSTRING ';'
903	<	{
852	<	};
902	>	motd_items: motd_items motd_item | motd_item;
903	>	motd_item:  motd_mask | motd_file | error ';' ;
904
905	<	logging_fuserlog: FUSERLOG '=' QSTRING ';'
905	>	motd_mask: MASK '=' QSTRING ';'
906		{
907	<	if (ypass == 2)
908	<	strlcpy(ConfigLoggingEntry.userlog, yylval.string,
858	<	sizeof(ConfigLoggingEntry.userlog));
907	>	if (conf_parser_ctx.pass == 2)
908	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
909		};
910
911	<	logging_ffailed_operlog: FFAILED_OPERLOG '=' QSTRING ';'
911	>	motd_file: T_FILE '=' QSTRING ';'
912		{
913	<	if (ypass == 2)
914	<	strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
865	<	sizeof(ConfigLoggingEntry.failed_operlog));
913	>	if (conf_parser_ctx.pass == 2)
914	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
915		};
916
917	<	logging_foperlog: FOPERLOG '=' QSTRING ';'
918	<	{
919	<	if (ypass == 2)
920	<	strlcpy(ConfigLoggingEntry.operlog, yylval.string,
921	<	sizeof(ConfigLoggingEntry.operlog));
873	<	};
917	>	/***************************************************************************
918	>	*  section logging
919	>	***************************************************************************/
920	>	logging_entry:          T_LOG  '{' logging_items '}' ';' ;
921	>	logging_items:          logging_items logging_item | logging_item ;
922
923	<	logging_foperspylog: FOPERSPYLOG '=' QSTRING ';'
924	<	{
877	<	if (ypass == 2)
878	<	strlcpy(ConfigLoggingEntry.operspylog, yylval.string,
879	<	sizeof(ConfigLoggingEntry.operspylog));
880	<	};
923	>	logging_item:           logging_use_logging | logging_file_entry |
924	>	error ';' ;
925
926	<	logging_fglinelog: FGLINELOG '=' QSTRING ';'
926	>	logging_use_logging: USE_LOGGING '=' TBOOL ';'
927		{
928	<	if (ypass == 2)
929	<	strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
886	<	sizeof(ConfigLoggingEntry.glinelog));
928	>	if (conf_parser_ctx.pass == 2)
929	>	ConfigLoggingEntry.use_logging = yylval.number;
930		};
931
932	<	logging_fklinelog: FKLINELOG '=' QSTRING ';'
932	>	logging_file_entry:
933	>	{
934	>	if (conf_parser_ctx.pass == 2)
935	>	reset_block_state();
936	>	} T_FILE  '{' logging_file_items '}' ';'
937		{
938	<	if (ypass == 2)
939	<	strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
940	<	sizeof(ConfigLoggingEntry.klinelog));
938	>	if (conf_parser_ctx.pass != 2)
939	>	break;
940	>
941	>	if (block_state.type.value && block_state.file.buf[0])
942	>	log_set_file(block_state.type.value, block_state.size.value,
943	>	block_state.file.buf);
944		};
945
946	<	logging_ioerrlog: FIOERRLOG '=' QSTRING ';'
946	>	logging_file_items: logging_file_items logging_file_item |
947	>	logging_file_item ;
948	>
949	>	logging_file_item:  logging_file_name | logging_file_type |
950	>	logging_file_size | error ';' ;
951	>
952	>	logging_file_name: NAME '=' QSTRING ';'
953		{
954	<	if (ypass == 2)
955	<	strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
956	<	sizeof(ConfigLoggingEntry.ioerrlog));
957	<	};
954	>	if (conf_parser_ctx.pass != 2)
955	>	break;
956	>
957	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
958	>	}
959
960	<	logging_killlog: FKILLLOG '=' QSTRING ';'
960	>	logging_file_size: T_SIZE '=' sizespec ';'
961		{
962	<	if (ypass == 2)
963	<	strlcpy(ConfigLoggingEntry.killlog, yylval.string,
964	<	sizeof(ConfigLoggingEntry.killlog));
962	>	block_state.size.value = $3;
963	>	} | T_SIZE '=' T_UNLIMITED ';'
964	>	{
965	>	block_state.size.value = 0;
966		};
967
968	<	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 ';'
968	>	logging_file_type: TYPE
969		{
970	<	if (ypass == 2)
971	<	set_log_level(L_DEBUG);
972	<	};
970	>	if (conf_parser_ctx.pass == 2)
971	>	block_state.type.value = 0;
972	>	} '='  logging_file_type_items ';' ;
973
974	<	logging_use_logging: USE_LOGGING '=' TBOOL ';'
974	>	logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
975	>	logging_file_type_item:  USER
976		{
977	<	if (ypass == 2)
978	<	ConfigLoggingEntry.use_logging = yylval.number;
977	>	if (conf_parser_ctx.pass == 2)
978	>	block_state.type.value = LOG_TYPE_USER;
979	>	} | OPERATOR
980	>	{
981	>	if (conf_parser_ctx.pass == 2)
982	>	block_state.type.value = LOG_TYPE_OPER;
983	>	} | GLINE
984	>	{
985	>	if (conf_parser_ctx.pass == 2)
986	>	block_state.type.value = LOG_TYPE_GLINE;
987	>	} | T_DLINE
988	>	{
989	>	if (conf_parser_ctx.pass == 2)
990	>	block_state.type.value = LOG_TYPE_DLINE;
991	>	} | KLINE
992	>	{
993	>	if (conf_parser_ctx.pass == 2)
994	>	block_state.type.value = LOG_TYPE_KLINE;
995	>	} | KILL
996	>	{
997	>	if (conf_parser_ctx.pass == 2)
998	>	block_state.type.value = LOG_TYPE_KILL;
999	>	} | T_DEBUG
1000	>	{
1001	>	if (conf_parser_ctx.pass == 2)
1002	>	block_state.type.value = LOG_TYPE_DEBUG;
1003		};
1004
1005	+
1006		/***************************************************************************
1007		* section oper
1008		***************************************************************************/
1009		oper_entry: OPERATOR
1010		{
1011	<	if (ypass == 2)
1012	<	{
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;
1011	>	if (conf_parser_ctx.pass != 2)
1012	>	break;
1013
1014	<	conf_add_class_to_conf(yy_conf, class_name);
1015	<
1016	<	/* Now, make sure there is a copy of the "base" given oper
1017	<	* block in each of the collected copies
1018	<	*/
1014	>	reset_block_state();
1015	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1016	>	} '{' oper_items '}' ';'
1017	>	{
1018	>	dlink_node *ptr = NULL;
1019
1020	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
1021	<	{
978	<	struct AccessItem *new_aconf;
979	<	struct ConfItem *new_conf;
980	<	yy_tmp = ptr->data;
981	<
982	<	new_conf = make_conf_item(OPER_TYPE);
983	<	new_aconf = (struct AccessItem *)map_to_conf(new_conf);
984	<
985	<	new_aconf->flags = yy_aconf->flags;
986	<
987	<	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);
1020	>	if (conf_parser_ctx.pass != 2)
1021	>	break;
1022
1023	<	new_aconf->port = yy_aconf->port;
1023	>	if (!block_state.name.buf[0])
1024	>	break;
1025		#ifdef HAVE_LIBCRYPTO
1026	<	if (yy_aconf->rsa_public_key_file != NULL)
1027	<	{
1028	<	BIO *file;
1026	>	if (!block_state.file.buf[0] &&
1027	>	!block_state.rpass.buf[0])
1028	>	break;
1029	>	#else
1030	>	if (!block_state.rpass.buf[0])
1031	>	break;
1032	>	#endif
1033
1034	<	DupString(new_aconf->rsa_public_key_file,
1035	<	yy_aconf->rsa_public_key_file);
1034	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
1035	>	{
1036	>	struct MaskItem *conf = NULL;
1037	>	struct split_nuh_item nuh;
1038
1039	<	file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
1040	<	new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
1041	<	NULL, 0, NULL);
1042	<	BIO_set_close(file, BIO_CLOSE);
1043	<	BIO_free(file);
1044	<	}
1045	<	#endif
1039	>	nuh.nuhmask  = ptr->data;
1040	>	nuh.nickptr  = NULL;
1041	>	nuh.userptr  = block_state.user.buf;
1042	>	nuh.hostptr  = block_state.host.buf;
1043	>	nuh.nicksize = 0;
1044	>	nuh.usersize = sizeof(block_state.user.buf);
1045	>	nuh.hostsize = sizeof(block_state.host.buf);
1046	>	split_nuh(&nuh);
1047	>
1048	>	conf         = conf_make(CONF_OPER);
1049	>	conf->name   = xstrdup(block_state.name.buf);
1050	>	conf->user   = xstrdup(block_state.user.buf);
1051	>	conf->host   = xstrdup(block_state.host.buf);
1052	>
1053	>	if (block_state.cert.buf[0])
1054	>	conf->certfp = xstrdup(block_state.cert.buf);
1055	>
1056	>	if (block_state.rpass.buf[0])
1057	>	conf->passwd = xstrdup(block_state.rpass.buf);
1058	>
1059	>	conf->flags = block_state.flags.value;
1060	>	conf->modes = block_state.modes.value;
1061	>	conf->port  = block_state.port.value;
1062	>	conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
1063	>
1064	>	conf_add_class_to_conf(conf, block_state.class.buf);
1065
1066		#ifdef HAVE_LIBCRYPTO
1067	<	if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
1068	<	&& yy_tmp->host)
1069	<	#else
1070	<	if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
1071	<	#endif
1067	>	if (block_state.file.buf[0])
1068	>	{
1069	>	BIO *file = NULL;
1070	>	RSA *pkey = NULL;
1071	>
1072	>	if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
1073		{
1074	<	conf_add_class_to_conf(new_conf, class_name);
1075	<	if (yy_tmp->name != NULL)
1027	<	DupString(new_conf->name, yy_tmp->name);
1074	>	conf_error_report("Ignoring rsa_public_key_file -- file doesn't exist");
1075	>	break;
1076		}
1077
1078	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1079	<	free_collect_item(yy_tmp);
1032	<	}
1033	<
1034	<	yy_conf = NULL;
1035	<	yy_aconf = NULL;
1036	<
1078	>	if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
1079	>	conf_error_report("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1080
1081	<	MyFree(class_name);
1082	<	class_name = NULL;
1081	>	conf->rsa_public_key = pkey;
1082	>	BIO_set_close(file, BIO_CLOSE);
1083	>	BIO_free(file);
1084	>	}
1085	>	#endif /* HAVE_LIBCRYPTO */
1086		}
1087	<	};
1087	>	};
1088
1043	–	oper_name_b: | oper_name_t;
1089		oper_items:     oper_items oper_item | oper_item;
1090	<	oper_item:      oper_name | oper_user | oper_password | oper_hidden_admin |
1091	<	oper_hidden_oper |
1092	<	oper_class | oper_global_kill | oper_remote |
1093	<	oper_kline | oper_xline | oper_unkline |
1094	<	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 ';' ;
1090	>	oper_item:      oper_name | oper_user | oper_password |
1091	>	oper_umodes | oper_class | oper_encrypted |
1092	>	oper_rsa_public_key_file | oper_ssl_certificate_fingerprint |
1093	>	oper_ssl_connection_required |
1094	>	oper_flags | error ';' ;
1095
1096		oper_name: NAME '=' QSTRING ';'
1097		{
1098	<	if (ypass == 2)
1099	<	{
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	<	}
1098	>	if (conf_parser_ctx.pass == 2)
1099	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1100		};
1101
1102		oper_user: USER '=' QSTRING ';'
1103		{
1104	<	if (ypass == 2)
1105	<	{
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	<	}
1104	>	if (conf_parser_ctx.pass == 2)
1105	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1106		};
1107
1108		oper_password: PASSWORD '=' QSTRING ';'
1109		{
1110	<	if (ypass == 2)
1111	<	{
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	<	}
1110	>	if (conf_parser_ctx.pass == 2)
1111	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1112		};
1113
1114		oper_encrypted: ENCRYPTED '=' TBOOL ';'
1115		{
1116	<	if (ypass == 2)
1117	<	{
1118	<	if (yylval.number)
1119	<	SetConfEncrypted(yy_aconf);
1120	<	else
1121	<	ClearConfEncrypted(yy_aconf);
1122	<	}
1116	>	if (conf_parser_ctx.pass != 2)
1117	>	break;
1118	>
1119	>	if (yylval.number)
1120	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1121	>	else
1122	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1123		};
1124
1125		oper_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
1126		{
1127	<	#ifdef HAVE_LIBCRYPTO
1128	<	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 */
1127	>	if (conf_parser_ctx.pass == 2)
1128	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
1129		};
1130
1131	<	oper_class: CLASS '=' QSTRING ';'
1131	>	oper_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
1132		{
1133	<	if (ypass == 2)
1134	<	{
1166	<	MyFree(class_name);
1167	<	DupString(class_name, yylval.string);
1168	<	}
1133	>	if (conf_parser_ctx.pass == 2)
1134	>	strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
1135		};
1136
1137	<	oper_global_kill: GLOBAL_KILL '=' TBOOL ';'
1137	>	oper_ssl_connection_required: SSL_CONNECTION_REQUIRED '=' TBOOL ';'
1138		{
1139	<	if (ypass == 2)
1140	<	{
1175	<	if (yylval.number)
1176	<	yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1177	<	else
1178	<	yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1179	<	}
1180	<	};
1139	>	if (conf_parser_ctx.pass != 2)
1140	>	break;
1141
1142	<	oper_remote: REMOTE '=' TBOOL ';'
1143	<	{
1144	<	if (ypass == 2)
1145	<	{
1186	<	if (yylval.number)
1187	<	yy_aconf->port |= OPER_FLAG_REMOTE;
1188	<	else
1189	<	yy_aconf->port &= ~OPER_FLAG_REMOTE;
1190	<	}
1142	>	if (yylval.number)
1143	>	block_state.flags.value |= CONF_FLAGS_SSL;
1144	>	else
1145	>	block_state.flags.value &= ~CONF_FLAGS_SSL;
1146		};
1147
1148	<	oper_remoteban: REMOTEBAN '=' TBOOL ';'
1148	>	oper_class: CLASS '=' QSTRING ';'
1149		{
1150	<	if (ypass == 2)
1151	<	{
1197	<	if (yylval.number)
1198	<	yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1199	<	else
1200	<	yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1201	<	}
1150	>	if (conf_parser_ctx.pass == 2)
1151	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1152		};
1153
1154	<	oper_kline: KLINE '=' TBOOL ';'
1154	>	oper_umodes: T_UMODES
1155		{
1156	<	if (ypass == 2)
1157	<	{
1158	<	if (yylval.number)
1209	<	yy_aconf->port |= OPER_FLAG_K;
1210	<	else
1211	<	yy_aconf->port &= ~OPER_FLAG_K;
1212	<	}
1213	<	};
1156	>	if (conf_parser_ctx.pass == 2)
1157	>	block_state.modes.value = 0;
1158	>	} '='  oper_umodes_items ';' ;
1159
1160	<	oper_xline: XLINE '=' TBOOL ';'
1160	>	oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1161	>	oper_umodes_item:  T_BOTS
1162		{
1163	<	if (ypass == 2)
1164	<	{
1165	<	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 ';'
1163	>	if (conf_parser_ctx.pass == 2)
1164	>	block_state.modes.value |= UMODE_BOTS;
1165	>	} | T_CCONN
1166		{
1167	<	if (ypass == 2)
1168	<	{
1169	<	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 ';'
1167	>	if (conf_parser_ctx.pass == 2)
1168	>	block_state.modes.value |= UMODE_CCONN;
1169	>	} | T_DEAF
1170		{
1171	<	if (ypass == 2)
1172	<	{
1173	<	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 ';'
1171	>	if (conf_parser_ctx.pass == 2)
1172	>	block_state.modes.value |= UMODE_DEAF;
1173	>	} | T_DEBUG
1174		{
1175	<	if (ypass == 2)
1176	<	{
1177	<	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 ';'
1175	>	if (conf_parser_ctx.pass == 2)
1176	>	block_state.modes.value |= UMODE_DEBUG;
1177	>	} | T_FULL
1178		{
1179	<	if (ypass == 2)
1180	<	{
1181	<	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 ';'
1179	>	if (conf_parser_ctx.pass == 2)
1180	>	block_state.modes.value |= UMODE_FULL;
1181	>	} | HIDDEN
1182		{
1183	<	if (ypass == 2)
1184	<	{
1185	<	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 ';'
1183	>	if (conf_parser_ctx.pass == 2)
1184	>	block_state.modes.value |= UMODE_HIDDEN;
1185	>	} | T_SKILL
1186		{
1187	<	if (ypass == 2)
1188	<	{
1189	<	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 ';'
1187	>	if (conf_parser_ctx.pass == 2)
1188	>	block_state.modes.value |= UMODE_SKILL;
1189	>	} | T_NCHANGE
1190		{
1191	<	if (ypass == 2)
1192	<	{
1193	<	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 ';'
1191	>	if (conf_parser_ctx.pass == 2)
1192	>	block_state.modes.value |= UMODE_NCHANGE;
1193	>	} | T_REJ
1194		{
1195	<	if (ypass == 2)
1196	<	{
1197	<	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 ';'
1195	>	if (conf_parser_ctx.pass == 2)
1196	>	block_state.modes.value |= UMODE_REJ;
1197	>	} | T_UNAUTH
1198		{
1199	<	if (ypass == 2)
1200	<	{
1201	<	if (yylval.number)
1202	<	yy_aconf->port |= OPER_FLAG_OPERWALL;
1203	<	else
1204	<	yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1205	<	}
1199	>	if (conf_parser_ctx.pass == 2)
1200	>	block_state.modes.value |= UMODE_UNAUTH;
1201	>	} | T_SPY
1202	>	{
1203	>	if (conf_parser_ctx.pass == 2)
1204	>	block_state.modes.value |= UMODE_SPY;
1205	>	} | T_EXTERNAL
1206	>	{
1207	>	if (conf_parser_ctx.pass == 2)
1208	>	block_state.modes.value |= UMODE_EXTERNAL;
1209	>	} | T_OPERWALL
1210	>	{
1211	>	if (conf_parser_ctx.pass == 2)
1212	>	block_state.modes.value |= UMODE_OPERWALL;
1213	>	} | T_SERVNOTICE
1214	>	{
1215	>	if (conf_parser_ctx.pass == 2)
1216	>	block_state.modes.value |= UMODE_SERVNOTICE;
1217	>	} | T_INVISIBLE
1218	>	{
1219	>	if (conf_parser_ctx.pass == 2)
1220	>	block_state.modes.value |= UMODE_INVISIBLE;
1221	>	} | T_WALLOP
1222	>	{
1223	>	if (conf_parser_ctx.pass == 2)
1224	>	block_state.modes.value |= UMODE_WALLOP;
1225	>	} | T_SOFTCALLERID
1226	>	{
1227	>	if (conf_parser_ctx.pass == 2)
1228	>	block_state.modes.value |= UMODE_SOFTCALLERID;
1229	>	} | T_CALLERID
1230	>	{
1231	>	if (conf_parser_ctx.pass == 2)
1232	>	block_state.modes.value |= UMODE_CALLERID;
1233	>	} | T_LOCOPS
1234	>	{
1235	>	if (conf_parser_ctx.pass == 2)
1236	>	block_state.modes.value |= UMODE_LOCOPS;
1237	>	} | T_NONONREG
1238	>	{
1239	>	if (conf_parser_ctx.pass == 2)
1240	>	block_state.modes.value |= UMODE_REGONLY;
1241	>	} | T_FARCONNECT
1242	>	{
1243	>	if (conf_parser_ctx.pass == 2)
1244	>	block_state.modes.value |= UMODE_FARCONNECT;
1245		};
1246
1247		oper_flags: IRCD_FLAGS
1248		{
1249	+	if (conf_parser_ctx.pass == 2)
1250	+	block_state.port.value = 0;
1251		} '='  oper_flags_items ';';
1252
1253		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1254	<	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
1254	>	oper_flags_item: KILL ':' REMOTE
1255		{
1256	<	if (ypass == 2)
1257	<	{
1258	<	if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1259	<	else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1260	<	}
1261	<	} | REMOTE
1256	>	if (conf_parser_ctx.pass == 2)
1257	>	block_state.port.value |= OPER_FLAG_KILL_REMOTE;
1258	>	} | KILL
1259	>	{
1260	>	if (conf_parser_ctx.pass == 2)
1261	>	block_state.port.value |= OPER_FLAG_KILL;
1262	>	} | CONNECT ':' REMOTE
1263	>	{
1264	>	if (conf_parser_ctx.pass == 2)
1265	>	block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
1266	>	} | CONNECT
1267	>	{
1268	>	if (conf_parser_ctx.pass == 2)
1269	>	block_state.port.value |= OPER_FLAG_CONNECT;
1270	>	} | SQUIT ':' REMOTE
1271	>	{
1272	>	if (conf_parser_ctx.pass == 2)
1273	>	block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
1274	>	} | SQUIT
1275		{
1276	<	if (ypass == 2)
1277	<	{
1344	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
1345	<	else yy_aconf->port |= OPER_FLAG_REMOTE;
1346	<	}
1276	>	if (conf_parser_ctx.pass == 2)
1277	>	block_state.port.value |= OPER_FLAG_SQUIT;
1278		} | KLINE
1279		{
1280	<	if (ypass == 2)
1281	<	{
1351	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
1352	<	else yy_aconf->port |= OPER_FLAG_K;
1353	<	}
1280	>	if (conf_parser_ctx.pass == 2)
1281	>	block_state.port.value |= OPER_FLAG_K;
1282		} | UNKLINE
1283		{
1284	<	if (ypass == 2)
1285	<	{
1286	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1287	<	else yy_aconf->port |= OPER_FLAG_UNKLINE;
1288	<	}
1284	>	if (conf_parser_ctx.pass == 2)
1285	>	block_state.port.value |= OPER_FLAG_UNKLINE;
1286	>	} | T_DLINE
1287	>	{
1288	>	if (conf_parser_ctx.pass == 2)
1289	>	block_state.port.value |= OPER_FLAG_DLINE;
1290	>	} | T_UNDLINE
1291	>	{
1292	>	if (conf_parser_ctx.pass == 2)
1293	>	block_state.port.value |= OPER_FLAG_UNDLINE;
1294		} | XLINE
1295		{
1296	<	if (ypass == 2)
1297	<	{
1365	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
1366	<	else yy_aconf->port |= OPER_FLAG_X;
1367	<	}
1296	>	if (conf_parser_ctx.pass == 2)
1297	>	block_state.port.value |= OPER_FLAG_X;
1298		} | GLINE
1299		{
1300	<	if (ypass == 2)
1301	<	{
1372	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
1373	<	else yy_aconf->port |= OPER_FLAG_GLINE;
1374	<	}
1300	>	if (conf_parser_ctx.pass == 2)
1301	>	block_state.port.value |= OPER_FLAG_GLINE;
1302		} | DIE
1303		{
1304	<	if (ypass == 2)
1305	<	{
1306	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
1307	<	else yy_aconf->port |= OPER_FLAG_DIE;
1308	<	}
1304	>	if (conf_parser_ctx.pass == 2)
1305	>	block_state.port.value |= OPER_FLAG_DIE;
1306	>	} | T_RESTART
1307	>	{
1308	>	if (conf_parser_ctx.pass == 2)
1309	>	block_state.port.value |= OPER_FLAG_RESTART;
1310		} | REHASH
1311		{
1312	<	if (ypass == 2)
1313	<	{
1386	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
1387	<	else yy_aconf->port |= OPER_FLAG_REHASH;
1388	<	}
1312	>	if (conf_parser_ctx.pass == 2)
1313	>	block_state.port.value |= OPER_FLAG_REHASH;
1314		} | ADMIN
1315		{
1316	<	if (ypass == 2)
1317	<	{
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	<	}
1403	<	} | NICK_CHANGES
1404	<	{
1405	<	if (ypass == 2)
1406	<	{
1407	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
1408	<	else yy_aconf->port |= OPER_FLAG_N;
1409	<	}
1316	>	if (conf_parser_ctx.pass == 2)
1317	>	block_state.port.value |= OPER_FLAG_ADMIN;
1318		} | T_OPERWALL
1319		{
1320	<	if (ypass == 2)
1321	<	{
1322	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1323	<	else yy_aconf->port |= OPER_FLAG_OPERWALL;
1324	<	}
1325	<	} | OPER_SPY_T
1320	>	if (conf_parser_ctx.pass == 2)
1321	>	block_state.port.value |= OPER_FLAG_OPERWALL;
1322	>	} | T_GLOBOPS
1323	>	{
1324	>	if (conf_parser_ctx.pass == 2)
1325	>	block_state.port.value |= OPER_FLAG_GLOBOPS;
1326	>	} | T_WALLOPS
1327		{
1328	<	if (ypass == 2)
1329	<	{
1330	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
1422	<	else yy_aconf->port |= OPER_FLAG_OPER_SPY;
1423	<	}
1424	<	} | HIDDEN_OPER
1328	>	if (conf_parser_ctx.pass == 2)
1329	>	block_state.port.value |= OPER_FLAG_WALLOPS;
1330	>	} | T_LOCOPS
1331		{
1332	<	if (ypass == 2)
1333	<	{
1428	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1429	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1430	<	}
1332	>	if (conf_parser_ctx.pass == 2)
1333	>	block_state.port.value |= OPER_FLAG_LOCOPS;
1334		} | REMOTEBAN
1335		{
1336	<	if (ypass == 2)
1337	<	{
1338	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1339	<	else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1340	<	}
1341	<	} | ENCRYPTED
1336	>	if (conf_parser_ctx.pass == 2)
1337	>	block_state.port.value |= OPER_FLAG_REMOTEBAN;
1338	>	} | T_SET
1339	>	{
1340	>	if (conf_parser_ctx.pass == 2)
1341	>	block_state.port.value |= OPER_FLAG_SET;
1342	>	} | MODULE
1343		{
1344	<	if (ypass == 2)
1345	<	{
1442	<	if (not_atom) ClearConfEncrypted(yy_aconf);
1443	<	else SetConfEncrypted(yy_aconf);
1444	<	}
1344	>	if (conf_parser_ctx.pass == 2)
1345	>	block_state.port.value |= OPER_FLAG_MODULE;
1346		};
1347
1348
#	Line 1450 | Line 1351 | oper_flags_item_atom: GLOBAL_KILL
1351		***************************************************************************/
1352		class_entry: CLASS
1353		{
1354	<	if (ypass == 1)
1355	<	{
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;
1354	>	if (conf_parser_ctx.pass != 1)
1355	>	break;
1356
1357	<	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);
1357	>	reset_block_state();
1358
1359	<	if (cconf != NULL)                /* The class existed already */
1360	<	{
1361	<	rebuild_cidr_class(cconf, yy_class);
1362	<	class = (struct ClassItem *) map_to_conf(cconf);
1363	<	*class = *yy_class;
1364	<	delete_conf_item(yy_conf);
1365	<
1366	<	MyFree(cconf->name);            /* Allows case change of class name */
1367	<	cconf->name = yy_class_name;
1368	<	}
1369	<	else      /* Brand new class */
1370	<	{
1371	<	MyFree(yy_conf->name);          /* just in case it was allocated */
1372	<	yy_conf->name = yy_class_name;
1373	<	}
1374	<	}
1375	<	yy_class_name = NULL;
1376	<	}
1359	>	block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1360	>	block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1361	>	block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1362	>	block_state.max_sendq.value = DEFAULT_SENDQ;
1363	>	block_state.max_recvq.value = DEFAULT_RECVQ;
1364	>	} '{' class_items '}' ';'
1365	>	{
1366	>	struct ClassItem *class = NULL;
1367	>
1368	>	if (conf_parser_ctx.pass != 1)
1369	>	break;
1370	>
1371	>	if (!block_state.class.buf[0])
1372	>	break;
1373	>
1374	>	if (!(class = class_find(block_state.class.buf, 0)))
1375	>	class = class_make();
1376	>
1377	>	class->active = 1;
1378	>	MyFree(class->name);
1379	>	class->name = xstrdup(block_state.class.buf);
1380	>	class->ping_freq = block_state.ping_freq.value;
1381	>	class->max_perip = block_state.max_perip.value;
1382	>	class->con_freq = block_state.con_freq.value;
1383	>	class->max_total = block_state.max_total.value;
1384	>	class->max_global = block_state.max_global.value;
1385	>	class->max_local = block_state.max_local.value;
1386	>	class->max_ident = block_state.max_ident.value;
1387	>	class->max_sendq = block_state.max_sendq.value;
1388	>	class->max_recvq = block_state.max_recvq.value;
1389	>
1390	>	if (block_state.min_idle.value > block_state.max_idle.value)
1391	>	{
1392	>	block_state.min_idle.value = 0;
1393	>	block_state.max_idle.value = 0;
1394	>	block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
1395	>	}
1396	>
1397	>	class->flags = block_state.flags.value;
1398	>	class->min_idle = block_state.min_idle.value;
1399	>	class->max_idle = block_state.max_idle.value;
1400	>
1401	>	if (class->number_per_cidr && block_state.number_per_cidr.value)
1402	>	if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
1403	>	(class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
1404	>	if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
1405	>	(class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
1406	>	rebuild_cidr_list(class);
1407	>
1408	>	class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1409	>	class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1410	>	class->number_per_cidr = block_state.number_per_cidr.value;
1411		};
1412
1493	–	class_name_b: | class_name_t;
1494	–
1413		class_items:    class_items class_item | class_item;
1414		class_item:     class_name |
1415		class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1416		class_ping_time |
1499	–	class_ping_warning |
1417		class_number_per_cidr |
1418		class_number_per_ip |
1419		class_connectfreq |
#	Line 1504 | Line 1421 | class_item:     class_name |
1421		class_max_global |
1422		class_max_local |
1423		class_max_ident |
1424	<	class_sendq |
1424	>	class_sendq | class_recvq |
1425	>	class_min_idle |
1426	>	class_max_idle |
1427	>	class_flags |
1428		error ';' ;
1429
1430		class_name: NAME '=' QSTRING ';'
1431		{
1432	<	if (ypass == 1)
1433	<	{
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	<	}
1432	>	if (conf_parser_ctx.pass == 1)
1433	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1434		};
1435
1436		class_ping_time: PING_TIME '=' timespec ';'
1437		{
1438	<	if (ypass == 1)
1439	<	PingFreq(yy_class) = $3;
1532	<	};
1533	<
1534	<	class_ping_warning: PING_WARNING '=' timespec ';'
1535	<	{
1536	<	if (ypass == 1)
1537	<	PingWarning(yy_class) = $3;
1438	>	if (conf_parser_ctx.pass == 1)
1439	>	block_state.ping_freq.value = $3;
1440		};
1441
1442		class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1443		{
1444	<	if (ypass == 1)
1445	<	MaxPerIp(yy_class) = $3;
1444	>	if (conf_parser_ctx.pass == 1)
1445	>	block_state.max_perip.value = $3;
1446		};
1447
1448		class_connectfreq: CONNECTFREQ '=' timespec ';'
1449		{
1450	<	if (ypass == 1)
1451	<	ConFreq(yy_class) = $3;
1450	>	if (conf_parser_ctx.pass == 1)
1451	>	block_state.con_freq.value = $3;
1452		};
1453
1454		class_max_number: MAX_NUMBER '=' NUMBER ';'
1455		{
1456	<	if (ypass == 1)
1457	<	MaxTotal(yy_class) = $3;
1456	>	if (conf_parser_ctx.pass == 1)
1457	>	block_state.max_total.value = $3;
1458		};
1459
1460		class_max_global: MAX_GLOBAL '=' NUMBER ';'
1461		{
1462	<	if (ypass == 1)
1463	<	MaxGlobal(yy_class) = $3;
1462	>	if (conf_parser_ctx.pass == 1)
1463	>	block_state.max_global.value = $3;
1464		};
1465
1466		class_max_local: MAX_LOCAL '=' NUMBER ';'
1467		{
1468	<	if (ypass == 1)
1469	<	MaxLocal(yy_class) = $3;
1468	>	if (conf_parser_ctx.pass == 1)
1469	>	block_state.max_local.value = $3;
1470		};
1471
1472		class_max_ident: MAX_IDENT '=' NUMBER ';'
1473		{
1474	<	if (ypass == 1)
1475	<	MaxIdent(yy_class) = $3;
1474	>	if (conf_parser_ctx.pass == 1)
1475	>	block_state.max_ident.value = $3;
1476		};
1477
1478		class_sendq: SENDQ '=' sizespec ';'
1479		{
1480	<	if (ypass == 1)
1481	<	MaxSendq(yy_class) = $3;
1480	>	if (conf_parser_ctx.pass == 1)
1481	>	block_state.max_sendq.value = $3;
1482	>	};
1483	>
1484	>	class_recvq: T_RECVQ '=' sizespec ';'
1485	>	{
1486	>	if (conf_parser_ctx.pass == 1)
1487	>	if ($3 >= CLIENT_FLOOD_MIN && $3 <= CLIENT_FLOOD_MAX)
1488	>	block_state.max_recvq.value = $3;
1489		};
1490
1491		class_cidr_bitlen_ipv4: CIDR_BITLEN_IPV4 '=' NUMBER ';'
1492		{
1493	<	if (ypass == 1)
1494	<	CidrBitlenIPV4(yy_class) = $3;
1493	>	if (conf_parser_ctx.pass == 1)
1494	>	block_state.cidr_bitlen_ipv4.value = $3 > 32 ? 32 : $3;
1495		};
1496
1497		class_cidr_bitlen_ipv6: CIDR_BITLEN_IPV6 '=' NUMBER ';'
1498		{
1499	<	if (ypass == 1)
1500	<	CidrBitlenIPV6(yy_class) = $3;
1499	>	if (conf_parser_ctx.pass == 1)
1500	>	block_state.cidr_bitlen_ipv6.value = $3 > 128 ? 128 : $3;
1501		};
1502
1503		class_number_per_cidr: NUMBER_PER_CIDR '=' NUMBER ';'
1504		{
1505	<	if (ypass == 1)
1506	<	NumberPerCidr(yy_class) = $3;
1505	>	if (conf_parser_ctx.pass == 1)
1506	>	block_state.number_per_cidr.value = $3;
1507	>	};
1508	>
1509	>	class_min_idle: MIN_IDLE '=' timespec ';'
1510	>	{
1511	>	if (conf_parser_ctx.pass != 1)
1512	>	break;
1513	>
1514	>	block_state.min_idle.value = $3;
1515	>	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1516	>	};
1517	>
1518	>	class_max_idle: MAX_IDLE '=' timespec ';'
1519	>	{
1520	>	if (conf_parser_ctx.pass != 1)
1521	>	break;
1522	>
1523	>	block_state.max_idle.value = $3;
1524	>	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1525	>	};
1526	>
1527	>	class_flags: IRCD_FLAGS
1528	>	{
1529	>	if (conf_parser_ctx.pass == 1)
1530	>	block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1531	>	} '='  class_flags_items ';';
1532	>
1533	>	class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1534	>	class_flags_item: RANDOM_IDLE
1535	>	{
1536	>	if (conf_parser_ctx.pass == 1)
1537	>	block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
1538	>	} | HIDE_IDLE_FROM_OPERS
1539	>	{
1540	>	if (conf_parser_ctx.pass == 1)
1541	>	block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
1542		};
1543
1544	+
1545		/***************************************************************************
1546		*  section listen
1547		***************************************************************************/
1548		listen_entry: LISTEN
1549		{
1550	<	if (ypass == 2)
1551	<	{
1552	<	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	<	};
1550	>	if (conf_parser_ctx.pass == 2)
1551	>	reset_block_state();
1552	>	} '{' listen_items '}' ';';
1553
1554		listen_flags: IRCD_FLAGS
1555		{
1556	+	block_state.flags.value = 0;
1557		} '='  listen_flags_items ';';
1558
1559		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1560		listen_flags_item: T_SSL
1561		{
1562	<	if (ypass == 2)
1563	<	listener_flags |= LISTENER_SSL;
1562	>	if (conf_parser_ctx.pass == 2)
1563	>	block_state.flags.value |= LISTENER_SSL;
1564		} | HIDDEN
1565		{
1566	<	if (ypass == 2)
1567	<	listener_flags |= LISTENER_HIDDEN;
1566	>	if (conf_parser_ctx.pass == 2)
1567	>	block_state.flags.value |= LISTENER_HIDDEN;
1568	>	} | T_SERVER
1569	>	{
1570	>	if (conf_parser_ctx.pass == 2)
1571	>	block_state.flags.value |= LISTENER_SERVER;
1572		};
1573
1574		listen_items:   listen_items listen_item | listen_item;
1575	<	listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';' ;
1575	>	listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';';
1576
1577	<	listen_port: PORT '=' port_items ';' ;
1577	>	listen_port: PORT '=' port_items { block_state.flags.value = 0; } ';';
1578
1579		port_items: port_items ',' port_item | port_item;
1580
1581		port_item: NUMBER
1582		{
1583	<	if (ypass == 2)
1583	>	if (conf_parser_ctx.pass == 2)
1584		{
1585	<	if ((listener_flags & LISTENER_SSL))
1585	>	if (block_state.flags.value & LISTENER_SSL)
1586		#ifdef HAVE_LIBCRYPTO
1587	<	if (!ServerInfo.ctx)
1587	>	if (!ServerInfo.server_ctx)
1588		#endif
1589		{
1590	<	yyerror("SSL not available - port closed");
1590	>	conf_error_report("SSL not available - port closed");
1591		break;
1592		}
1593	<	add_listener($1, listener_address, listener_flags);
1654	<	listener_flags = 0;
1593	>	add_listener($1, block_state.addr.buf, block_state.flags.value);
1594		}
1595		} | NUMBER TWODOTS NUMBER
1596		{
1597	<	if (ypass == 2)
1597	>	if (conf_parser_ctx.pass == 2)
1598		{
1599		int i;
1600
1601	<	if ((listener_flags & LISTENER_SSL))
1601	>	if (block_state.flags.value & LISTENER_SSL)
1602		#ifdef HAVE_LIBCRYPTO
1603	<	if (!ServerInfo.ctx)
1603	>	if (!ServerInfo.server_ctx)
1604		#endif
1605		{
1606	<	yyerror("SSL not available - port closed");
1606	>	conf_error_report("SSL not available - port closed");
1607		break;
1608		}
1609
1610		for (i = $1; i <= $3; ++i)
1611	<	add_listener(i, listener_address, listener_flags);
1673	<
1674	<	listener_flags = 0;
1611	>	add_listener(i, block_state.addr.buf, block_state.flags.value);
1612		}
1613		};
1614
1615		listen_address: IP '=' QSTRING ';'
1616		{
1617	<	if (ypass == 2)
1618	<	{
1682	<	MyFree(listener_address);
1683	<	DupString(listener_address, yylval.string);
1684	<	}
1617	>	if (conf_parser_ctx.pass == 2)
1618	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1619		};
1620
1621		listen_host: HOST '=' QSTRING ';'
1622		{
1623	<	if (ypass == 2)
1624	<	{
1691	<	MyFree(listener_address);
1692	<	DupString(listener_address, yylval.string);
1693	<	}
1623	>	if (conf_parser_ctx.pass == 2)
1624	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1625		};
1626
1627		/***************************************************************************
#	Line 1698 | Line 1629 | listen_host: HOST '=' QSTRING ';'
1629		***************************************************************************/
1630		auth_entry: IRCD_AUTH
1631		{
1632	<	if (ypass == 2)
1633	<	{
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	<	}
1632	>	if (conf_parser_ctx.pass == 2)
1633	>	reset_block_state();
1634		} '{' auth_items '}' ';'
1635		{
1636	<	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;
1736	<
1737	<	assert(yy_tmp->user && yy_tmp->host);
1738	<
1739	<	if (yy_aconf->passwd != NULL)
1740	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1741	<	if (yy_conf->name != NULL)
1742	<	DupString(new_conf->name, yy_conf->name);
1743	<	if (yy_aconf->passwd != NULL)
1744	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1745	<
1746	<	new_aconf->flags = yy_aconf->flags;
1747	<	new_aconf->port  = yy_aconf->port;
1636	>	dlink_node *ptr = NULL;
1637
1638	<	DupString(new_aconf->user, yy_tmp->user);
1639	<	collapse(new_aconf->user);
1638	>	if (conf_parser_ctx.pass != 2)
1639	>	break;
1640
1641	<	DupString(new_aconf->host, yy_tmp->host);
1642	<	collapse(new_aconf->host);
1641	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
1642	>	{
1643	>	struct MaskItem *conf = NULL;
1644	>	struct split_nuh_item nuh;
1645	>
1646	>	nuh.nuhmask  = ptr->data;
1647	>	nuh.nickptr  = NULL;
1648	>	nuh.userptr  = block_state.user.buf;
1649	>	nuh.hostptr  = block_state.host.buf;
1650	>	nuh.nicksize = 0;
1651	>	nuh.usersize = sizeof(block_state.user.buf);
1652	>	nuh.hostsize = sizeof(block_state.host.buf);
1653	>	split_nuh(&nuh);
1654	>
1655	>	conf        = conf_make(CONF_CLIENT);
1656	>	conf->user  = xstrdup(block_state.user.buf);
1657	>	conf->host  = xstrdup(block_state.host.buf);
1658	>
1659	>	if (block_state.rpass.buf[0])
1660	>	conf->passwd = xstrdup(block_state.rpass.buf);
1661	>	if (block_state.name.buf[0])
1662	>	conf->name = xstrdup(block_state.name.buf);
1663
1664	<	conf_add_class_to_conf(new_conf, class_name);
1665	<	add_conf_by_address(CONF_CLIENT, new_aconf);
1757	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1758	<	free_collect_item(yy_tmp);
1759	<	}
1664	>	conf->flags = block_state.flags.value;
1665	>	conf->port  = block_state.port.value;
1666
1667	<	MyFree(class_name);
1668	<	class_name = NULL;
1763	<	yy_conf = NULL;
1764	<	yy_aconf = NULL;
1667	>	conf_add_class_to_conf(conf, block_state.class.buf);
1668	>	add_conf_by_address(CONF_CLIENT, conf);
1669		}
1670		};
1671
1672		auth_items:     auth_items auth_item | auth_item;
1673		auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1674	<	auth_kline_exempt | auth_need_ident |
1675	<	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 ';' ;
1674	>	auth_spoof | auth_redir_serv | auth_redir_port |
1675	>	auth_encrypted | error ';' ;
1676
1677		auth_user: USER '=' QSTRING ';'
1678		{
1679	<	if (ypass == 2)
1680	<	{
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	<	}
1679	>	if (conf_parser_ctx.pass == 2)
1680	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1681		};
1682
1793	–	/* XXX - IP/IPV6 tags don't exist anymore - put IP/IPV6 into user. */
1794	–
1683		auth_passwd: PASSWORD '=' QSTRING ';'
1684		{
1685	<	if (ypass == 2)
1686	<	{
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	<	}
1685	>	if (conf_parser_ctx.pass == 2)
1686	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1687		};
1688
1689		auth_class: CLASS '=' QSTRING ';'
1690		{
1691	<	if (ypass == 2)
1692	<	{
1823	<	MyFree(class_name);
1824	<	DupString(class_name, yylval.string);
1825	<	}
1691	>	if (conf_parser_ctx.pass == 2)
1692	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1693		};
1694
1695		auth_encrypted: ENCRYPTED '=' TBOOL ';'
1696		{
1697	<	if (ypass == 2)
1697	>	if (conf_parser_ctx.pass == 2)
1698		{
1699		if (yylval.number)
1700	<	SetConfEncrypted(yy_aconf);
1700	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1701		else
1702	<	ClearConfEncrypted(yy_aconf);
1702	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1703		}
1704		};
1705
1706		auth_flags: IRCD_FLAGS
1707		{
1708	+	if (conf_parser_ctx.pass == 2)
1709	+	block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
1710		} '='  auth_flags_items ';';
1711
1712		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1713	<	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
1713	>	auth_flags_item: SPOOF_NOTICE
1714		{
1715	<	if (ypass == 2)
1716	<	{
1851	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1852	<	else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1853	<	}
1854	<
1715	>	if (conf_parser_ctx.pass == 2)
1716	>	block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1717		} | EXCEED_LIMIT
1718		{
1719	<	if (ypass == 2)
1720	<	{
1859	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
1860	<	else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1861	<	}
1719	>	if (conf_parser_ctx.pass == 2)
1720	>	block_state.flags.value |= CONF_FLAGS_NOLIMIT;
1721		} | KLINE_EXEMPT
1722		{
1723	<	if (ypass == 2)
1724	<	{
1866	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
1867	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1868	<	}
1723	>	if (conf_parser_ctx.pass == 2)
1724	>	block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1725		} | NEED_IDENT
1726		{
1727	<	if (ypass == 2)
1728	<	{
1873	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
1874	<	else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
1875	<	}
1727	>	if (conf_parser_ctx.pass == 2)
1728	>	block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
1729		} | CAN_FLOOD
1730		{
1731	<	if (ypass == 2)
1732	<	{
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	<	}
1731	>	if (conf_parser_ctx.pass == 2)
1732	>	block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
1733		} | NO_TILDE
1734		{
1735	<	if (ypass == 2)
1736	<	{
1894	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
1895	<	else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1896	<	}
1735	>	if (conf_parser_ctx.pass == 2)
1736	>	block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1737		} | GLINE_EXEMPT
1738		{
1739	<	if (ypass == 2)
1740	<	{
1901	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
1902	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
1903	<	}
1739	>	if (conf_parser_ctx.pass == 2)
1740	>	block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
1741		} | RESV_EXEMPT
1742		{
1743	<	if (ypass == 2)
1744	<	{
1745	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
1909	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
1910	<	}
1911	<	} | NEED_PASSWORD
1912	<	{
1913	<	if (ypass == 2)
1914	<	{
1915	<	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 ';'
1743	>	if (conf_parser_ctx.pass == 2)
1744	>	block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
1745	>	} | T_WEBIRC
1746		{
1747	<	if (ypass == 2)
1748	<	{
1749	<	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 ';'
1747	>	if (conf_parser_ctx.pass == 2)
1748	>	block_state.flags.value |= CONF_FLAGS_WEBIRC;
1749	>	} | NEED_PASSWORD
1750		{
1751	<	if (ypass == 2)
1752	<	{
1979	<	if (yylval.number)
1980	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
1981	<	else
1982	<	yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
1983	<	}
1751	>	if (conf_parser_ctx.pass == 2)
1752	>	block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1753		};
1754
1986	–	/* XXX - need check for illegal hostnames here */
1755		auth_spoof: SPOOF '=' QSTRING ';'
1756		{
1757	<	if (ypass == 2)
1758	<	{
1991	<	MyFree(yy_conf->name);
1757	>	if (conf_parser_ctx.pass != 2)
1758	>	break;
1759
1760	<	if (strlen(yylval.string) < HOSTLEN)
1761	<	{
1762	<	DupString(yy_conf->name, yylval.string);
1763	<	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	<	}
1760	>	if (strlen(yylval.string) <= HOSTLEN && valid_hostname(yylval.string))
1761	>	{
1762	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1763	>	block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
1764		}
1765	+	else
1766	+	ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
1767		};
1768
1769		auth_redir_serv: REDIRSERV '=' QSTRING ';'
1770		{
1771	<	if (ypass == 2)
1772	<	{
1773	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1774	<	MyFree(yy_conf->name);
1775	<	DupString(yy_conf->name, yylval.string);
2013	<	}
1771	>	if (conf_parser_ctx.pass != 2)
1772	>	break;
1773	>
1774	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1775	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1776		};
1777
1778		auth_redir_port: REDIRPORT '=' NUMBER ';'
1779		{
1780	<	if (ypass == 2)
1781	<	{
2020	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
2021	<	yy_aconf->port = $3;
2022	<	}
2023	<	};
1780	>	if (conf_parser_ctx.pass != 2)
1781	>	break;
1782
1783	<	auth_need_password: NEED_PASSWORD '=' TBOOL ';'
1784	<	{
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	<	}
1783	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1784	>	block_state.port.value = $3;
1785		};
1786
1787
#	Line 2039 | Line 1790 | auth_need_password: NEED_PASSWORD '=' TB
1790		***************************************************************************/
1791		resv_entry: RESV
1792		{
1793	<	if (ypass == 2)
1794	<	{
1795	<	MyFree(resv_reason);
1796	<	resv_reason = NULL;
1797	<	}
1793	>	if (conf_parser_ctx.pass != 2)
1794	>	break;
1795	>
1796	>	reset_block_state();
1797	>	strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
1798		} '{' resv_items '}' ';'
1799		{
1800	<	if (ypass == 2)
1801	<	{
1802	<	MyFree(resv_reason);
1803	<	resv_reason = NULL;
2053	<	}
1800	>	if (conf_parser_ctx.pass != 2)
1801	>	break;
1802	>
1803	>	create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1804		};
1805
1806		resv_items:     resv_items resv_item | resv_item;
1807	<	resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
1807	>	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1808
1809	<	resv_creason: REASON '=' QSTRING ';'
1809	>	resv_mask: MASK '=' QSTRING ';'
1810		{
1811	<	if (ypass == 2)
1812	<	{
2063	<	MyFree(resv_reason);
2064	<	DupString(resv_reason, yylval.string);
2065	<	}
1811	>	if (conf_parser_ctx.pass == 2)
1812	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1813		};
1814
1815	<	resv_channel: CHANNEL '=' QSTRING ';'
1815	>	resv_reason: REASON '=' QSTRING ';'
1816		{
1817	<	if (ypass == 2)
1818	<	{
1819	<	if (IsChanPrefix(*yylval.string))
2073	<	{
2074	<	char def_reason[] = "No reason";
1817	>	if (conf_parser_ctx.pass == 2)
1818	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1819	>	};
1820
1821	<	create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1822	<	}
1823	<	}
1824	<	/* ignore it for now.. but we really should make a warning if
2080	<	* its an erroneous name --fl_ */
1821	>	resv_exempt: EXEMPT '=' QSTRING ';'
1822	>	{
1823	>	if (conf_parser_ctx.pass == 2)
1824	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1825		};
1826
1827	<	resv_nick: NICK '=' QSTRING ';'
1827	>
1828	>	/***************************************************************************
1829	>	*  section service
1830	>	***************************************************************************/
1831	>	service_entry: T_SERVICE '{' service_items '}' ';';
1832	>
1833	>	service_items:     service_items service_item | service_item;
1834	>	service_item:      service_name | error;
1835	>
1836	>	service_name: NAME '=' QSTRING ';'
1837		{
1838	<	if (ypass == 2)
1839	<	{
2087	<	char def_reason[] = "No reason";
1838	>	if (conf_parser_ctx.pass != 2)
1839	>	break;
1840
1841	<	create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1841	>	if (valid_servname(yylval.string))
1842	>	{
1843	>	struct MaskItem *conf = conf_make(CONF_SERVICE);
1844	>	conf->name = xstrdup(yylval.string);
1845		}
1846		};
1847
#	Line 2095 | Line 1850 | resv_nick: NICK '=' QSTRING ';'
1850		***************************************************************************/
1851		shared_entry: T_SHARED
1852		{
1853	<	if (ypass == 2)
1854	<	{
1855	<	yy_conf = make_conf_item(ULINE_TYPE);
1856	<	yy_match_item = map_to_conf(yy_conf);
1857	<	yy_match_item->action = SHARED_ALL;
1858	<	}
1853	>	if (conf_parser_ctx.pass != 2)
1854	>	break;
1855	>
1856	>	reset_block_state();
1857	>
1858	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1859	>	strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
1860	>	strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
1861	>	block_state.flags.value = SHARED_ALL;
1862		} '{' shared_items '}' ';'
1863		{
1864	<	if (ypass == 2)
1865	<	{
1866	<	yy_conf = NULL;
1867	<	}
1864	>	struct MaskItem *conf = NULL;
1865	>
1866	>	if (conf_parser_ctx.pass != 2)
1867	>	break;
1868	>
1869	>	conf = conf_make(CONF_ULINE);
1870	>	conf->flags = block_state.flags.value;
1871	>	conf->name = xstrdup(block_state.name.buf);
1872	>	conf->user = xstrdup(block_state.user.buf);
1873	>	conf->host = xstrdup(block_state.host.buf);
1874		};
1875
1876		shared_items: shared_items shared_item | shared_item;
#	Line 2114 | Line 1878 | shared_item:  shared_name | shared_user
1878
1879		shared_name: NAME '=' QSTRING ';'
1880		{
1881	<	if (ypass == 2)
1882	<	{
2119	<	MyFree(yy_conf->name);
2120	<	DupString(yy_conf->name, yylval.string);
2121	<	}
1881	>	if (conf_parser_ctx.pass == 2)
1882	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1883		};
1884
1885		shared_user: USER '=' QSTRING ';'
1886		{
1887	<	if (ypass == 2)
1887	>	if (conf_parser_ctx.pass == 2)
1888		{
1889	<	split_nuh(yylval.string, NULL, &yy_match_item->user, &yy_match_item->host);
1889	>	struct split_nuh_item nuh;
1890	>
1891	>	nuh.nuhmask  = yylval.string;
1892	>	nuh.nickptr  = NULL;
1893	>	nuh.userptr  = block_state.user.buf;
1894	>	nuh.hostptr  = block_state.host.buf;
1895	>
1896	>	nuh.nicksize = 0;
1897	>	nuh.usersize = sizeof(block_state.user.buf);
1898	>	nuh.hostsize = sizeof(block_state.host.buf);
1899	>
1900	>	split_nuh(&nuh);
1901		}
1902		};
1903
1904		shared_type: TYPE
1905		{
1906	<	if (ypass == 2)
1907	<	yy_match_item->action = 0;
1906	>	if (conf_parser_ctx.pass == 2)
1907	>	block_state.flags.value = 0;
1908		} '=' shared_types ';' ;
1909
1910		shared_types: shared_types ',' shared_type_item | shared_type_item;
1911		shared_type_item: KLINE
1912		{
1913	<	if (ypass == 2)
1914	<	yy_match_item->action |= SHARED_KLINE;
2143	<	} | TKLINE
2144	<	{
2145	<	if (ypass == 2)
2146	<	yy_match_item->action |= SHARED_TKLINE;
1913	>	if (conf_parser_ctx.pass == 2)
1914	>	block_state.flags.value |= SHARED_KLINE;
1915		} | UNKLINE
1916		{
1917	<	if (ypass == 2)
1918	<	yy_match_item->action |= SHARED_UNKLINE;
1919	<	} | XLINE
1917	>	if (conf_parser_ctx.pass == 2)
1918	>	block_state.flags.value |= SHARED_UNKLINE;
1919	>	} | T_DLINE
1920	>	{
1921	>	if (conf_parser_ctx.pass == 2)
1922	>	block_state.flags.value |= SHARED_DLINE;
1923	>	} | T_UNDLINE
1924		{
1925	<	if (ypass == 2)
1926	<	yy_match_item->action |= SHARED_XLINE;
1927	<	} | TXLINE
1925	>	if (conf_parser_ctx.pass == 2)
1926	>	block_state.flags.value |= SHARED_UNDLINE;
1927	>	} | XLINE
1928		{
1929	<	if (ypass == 2)
1930	<	yy_match_item->action |= SHARED_TXLINE;
1929	>	if (conf_parser_ctx.pass == 2)
1930	>	block_state.flags.value |= SHARED_XLINE;
1931		} | T_UNXLINE
1932		{
1933	<	if (ypass == 2)
1934	<	yy_match_item->action |= SHARED_UNXLINE;
1933	>	if (conf_parser_ctx.pass == 2)
1934	>	block_state.flags.value |= SHARED_UNXLINE;
1935		} | RESV
1936		{
1937	<	if (ypass == 2)
1938	<	yy_match_item->action |= SHARED_RESV;
2167	<	} | TRESV
2168	<	{
2169	<	if (ypass == 2)
2170	<	yy_match_item->action |= SHARED_TRESV;
1937	>	if (conf_parser_ctx.pass == 2)
1938	>	block_state.flags.value |= SHARED_RESV;
1939		} | T_UNRESV
1940		{
1941	<	if (ypass == 2)
1942	<	yy_match_item->action |= SHARED_UNRESV;
1941	>	if (conf_parser_ctx.pass == 2)
1942	>	block_state.flags.value |= SHARED_UNRESV;
1943		} | T_LOCOPS
1944		{
1945	<	if (ypass == 2)
1946	<	yy_match_item->action |= SHARED_LOCOPS;
1945	>	if (conf_parser_ctx.pass == 2)
1946	>	block_state.flags.value |= SHARED_LOCOPS;
1947		} | T_ALL
1948		{
1949	<	if (ypass == 2)
1950	<	yy_match_item->action = SHARED_ALL;
1949	>	if (conf_parser_ctx.pass == 2)
1950	>	block_state.flags.value = SHARED_ALL;
1951		};
1952
1953		/***************************************************************************
#	Line 2187 | Line 1955 | shared_type_item: KLINE
1955		***************************************************************************/
1956		cluster_entry: T_CLUSTER
1957		{
1958	<	if (ypass == 2)
1959	<	{
1960	<	yy_conf = make_conf_item(CLUSTER_TYPE);
1961	<	yy_conf->flags = SHARED_ALL;
1962	<	}
1958	>	if (conf_parser_ctx.pass != 2)
1959	>	break;
1960	>
1961	>	reset_block_state();
1962	>
1963	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1964	>	block_state.flags.value = SHARED_ALL;
1965		} '{' cluster_items '}' ';'
1966		{
1967	<	if (ypass == 2)
1968	<	{
1969	<	if (yy_conf->name == NULL)
1970	<	DupString(yy_conf->name, "*");
1971	<	yy_conf = NULL;
1972	<	}
1967	>	struct MaskItem *conf = NULL;
1968	>
1969	>	if (conf_parser_ctx.pass != 2)
1970	>	break;
1971	>
1972	>	conf = conf_make(CONF_CLUSTER);
1973	>	conf->flags = block_state.flags.value;
1974	>	conf->name = xstrdup(block_state.name.buf);
1975		};
1976
1977		cluster_items:  cluster_items cluster_item | cluster_item;
#	Line 2207 | Line 1979 | cluster_item:  cluster_name | cluster_typ
1979
1980		cluster_name: NAME '=' QSTRING ';'
1981		{
1982	<	if (ypass == 2)
1983	<	DupString(yy_conf->name, yylval.string);
1982	>	if (conf_parser_ctx.pass == 2)
1983	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1984		};
1985
1986		cluster_type: TYPE
1987		{
1988	<	if (ypass == 2)
1989	<	yy_conf->flags = 0;
1988	>	if (conf_parser_ctx.pass == 2)
1989	>	block_state.flags.value = 0;
1990		} '=' cluster_types ';' ;
1991
1992		cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1993		cluster_type_item: KLINE
1994		{
1995	<	if (ypass == 2)
1996	<	yy_conf->flags |= SHARED_KLINE;
2225	<	} | TKLINE
2226	<	{
2227	<	if (ypass == 2)
2228	<	yy_conf->flags |= SHARED_TKLINE;
1995	>	if (conf_parser_ctx.pass == 2)
1996	>	block_state.flags.value |= SHARED_KLINE;
1997		} | UNKLINE
1998		{
1999	<	if (ypass == 2)
2000	<	yy_conf->flags |= SHARED_UNKLINE;
2001	<	} | XLINE
1999	>	if (conf_parser_ctx.pass == 2)
2000	>	block_state.flags.value |= SHARED_UNKLINE;
2001	>	} | T_DLINE
2002	>	{
2003	>	if (conf_parser_ctx.pass == 2)
2004	>	block_state.flags.value |= SHARED_DLINE;
2005	>	} | T_UNDLINE
2006		{
2007	<	if (ypass == 2)
2008	<	yy_conf->flags |= SHARED_XLINE;
2009	<	} | TXLINE
2007	>	if (conf_parser_ctx.pass == 2)
2008	>	block_state.flags.value |= SHARED_UNDLINE;
2009	>	} | XLINE
2010		{
2011	<	if (ypass == 2)
2012	<	yy_conf->flags |= SHARED_TXLINE;
2011	>	if (conf_parser_ctx.pass == 2)
2012	>	block_state.flags.value |= SHARED_XLINE;
2013		} | T_UNXLINE
2014		{
2015	<	if (ypass == 2)
2016	<	yy_conf->flags |= SHARED_UNXLINE;
2015	>	if (conf_parser_ctx.pass == 2)
2016	>	block_state.flags.value |= SHARED_UNXLINE;
2017		} | RESV
2018		{
2019	<	if (ypass == 2)
2020	<	yy_conf->flags |= SHARED_RESV;
2249	<	} | TRESV
2250	<	{
2251	<	if (ypass == 2)
2252	<	yy_conf->flags |= SHARED_TRESV;
2019	>	if (conf_parser_ctx.pass == 2)
2020	>	block_state.flags.value |= SHARED_RESV;
2021		} | T_UNRESV
2022		{
2023	<	if (ypass == 2)
2024	<	yy_conf->flags |= SHARED_UNRESV;
2023	>	if (conf_parser_ctx.pass == 2)
2024	>	block_state.flags.value |= SHARED_UNRESV;
2025		} | T_LOCOPS
2026		{
2027	<	if (ypass == 2)
2028	<	yy_conf->flags |= SHARED_LOCOPS;
2027	>	if (conf_parser_ctx.pass == 2)
2028	>	block_state.flags.value |= SHARED_LOCOPS;
2029		} | T_ALL
2030		{
2031	<	if (ypass == 2)
2032	<	yy_conf->flags = SHARED_ALL;
2031	>	if (conf_parser_ctx.pass == 2)
2032	>	block_state.flags.value = SHARED_ALL;
2033		};
2034
2035		/***************************************************************************
#	Line 2269 | Line 2037 | cluster_type_item: KLINE
2037		***************************************************************************/
2038		connect_entry: CONNECT
2039		{
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;
2040
2041	<	if (ConfigFileEntry.burst_away)
2042	<	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;
2041	>	if (conf_parser_ctx.pass != 2)
2042	>	break;
2043
2044	<	yy_hconf = ptr->data;
2044	>	reset_block_state();
2045	>	block_state.port.value = PORTNUM;
2046	>	} '{' connect_items '}' ';'
2047	>	{
2048	>	struct MaskItem *conf = NULL;
2049	>	struct addrinfo hints, *res;
2050	>
2051	>	if (conf_parser_ctx.pass != 2)
2052	>	break;
2053	>
2054	>	if (!block_state.name.buf[0] ||
2055	>	!block_state.host.buf[0])
2056	>	break;
2057	>
2058	>	if (!block_state.rpass.buf[0] ||
2059	>	!block_state.spass.buf[0])
2060	>	break;
2061	>
2062	>	if (has_wildcards(block_state.name.buf) ||
2063	>	has_wildcards(block_state.host.buf))
2064	>	break;
2065	>
2066	>	conf = conf_make(CONF_SERVER);
2067	>	conf->port = block_state.port.value;
2068	>	conf->flags = block_state.flags.value;
2069	>	conf->aftype = block_state.aftype.value;
2070	>	conf->host = xstrdup(block_state.host.buf);
2071	>	conf->name = xstrdup(block_state.name.buf);
2072	>	conf->passwd = xstrdup(block_state.rpass.buf);
2073	>	conf->spasswd = xstrdup(block_state.spass.buf);
2074	>
2075	>	if (block_state.cert.buf[0])
2076	>	conf->certfp = xstrdup(block_state.cert.buf);
2077
2078	<	/* yy_conf == NULL is a fatal error for this connect block! */
2079	<	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	<	}
2078	>	if (block_state.ciph.buf[0])
2079	>	conf->cipher_list = xstrdup(block_state.ciph.buf);
2080
2081	<	/* Ditto for the LEAF confs */
2081	>	dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
2082	>	dlinkMoveList(&block_state.hub.list, &conf->hub_list);
2083
2084	<	DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
2085	<	{
2086	<	struct ConfItem *new_leaf_conf;
2392	<	struct MatchItem *match_item;
2084	>	if (block_state.bind.buf[0])
2085	>	{
2086	>	memset(&hints, 0, sizeof(hints));
2087
2088	<	yy_lconf = ptr->data;
2088	>	hints.ai_family   = AF_UNSPEC;
2089	>	hints.ai_socktype = SOCK_STREAM;
2090	>	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2091
2092	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2093	<	{
2094	<	new_leaf_conf = make_conf_item(LEAF_TYPE);
2095	<	match_item = (struct MatchItem *)map_to_conf(new_leaf_conf);
2096	<	DupString(new_leaf_conf->name, yy_conf->name);
2097	<	if (yy_lconf->user != NULL)
2098	<	DupString(match_item->user, yy_lconf->user);
2099	<	else
2100	<	DupString(match_item->user, "*");
2101	<	if (yy_lconf->host != NULL)
2102	<	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;
2092	>	if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2093	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2094	>	else
2095	>	{
2096	>	assert(res != NULL);
2097	>
2098	>	memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2099	>	conf->bind.ss.ss_family = res->ai_family;
2100	>	conf->bind.ss_len = res->ai_addrlen;
2101	>	freeaddrinfo(res);
2102	>	}
2103		}
2104	+
2105	+	conf_add_class_to_conf(conf, block_state.class.buf);
2106	+	lookup_confhost(conf);
2107		};
2108
2420	–	connect_name_b: | connect_name_t;
2109		connect_items:  connect_items connect_item | connect_item;
2110		connect_item:   connect_name | connect_host | connect_vhost |
2111		connect_send_password | connect_accept_password |
2112	<	connect_aftype | connect_port |
2113	<	connect_fakename | connect_flags | connect_hub_mask |
2114	<	connect_leaf_mask | connect_class | connect_auto |
2115	<	connect_encrypted | connect_compressed | connect_cryptlink |
2428	<	connect_rsa_public_key_file | connect_cipher_preference |
2112	>	connect_ssl_certificate_fingerprint |
2113	>	connect_aftype | connect_port | connect_ssl_cipher_list |
2114	>	connect_flags | connect_hub_mask | connect_leaf_mask |
2115	>	connect_class | connect_encrypted |
2116		error ';' ;
2117
2118		connect_name: NAME '=' QSTRING ';'
2119		{
2120	<	if (ypass == 2)
2121	<	{
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	<	}
2120	>	if (conf_parser_ctx.pass == 2)
2121	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2122		};
2123
2124		connect_host: HOST '=' QSTRING ';'
2125		{
2126	<	if (ypass == 2)
2127	<	{
2459	<	MyFree(yy_aconf->host);
2460	<	DupString(yy_aconf->host, yylval.string);
2461	<	}
2126	>	if (conf_parser_ctx.pass == 2)
2127	>	strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2128		};
2129
2130		connect_vhost: VHOST '=' QSTRING ';'
2131		{
2132	<	if (ypass == 2)
2133	<	{
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	<	}
2132	>	if (conf_parser_ctx.pass == 2)
2133	>	strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2134		};
2135
2136		connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2137		{
2138	<	if (ypass == 2)
2139	<	{
2494	<	if (yy_aconf->spasswd != NULL)
2495	<	memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
2138	>	if (conf_parser_ctx.pass != 2)
2139	>	break;
2140
2141	<	MyFree(yy_aconf->spasswd);
2142	<	DupString(yy_aconf->spasswd, yylval.string);
2143	<	}
2141	>	if ($3[0] == ':')
2142	>	conf_error_report("Server passwords cannot begin with a colon");
2143	>	else if (strchr($3, ' ') != NULL)
2144	>	conf_error_report("Server passwords cannot contain spaces");
2145	>	else
2146	>	strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
2147		};
2148
2149		connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2150		{
2151	<	if (ypass == 2)
2152	<	{
2506	<	if (yy_aconf->passwd != NULL)
2507	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
2151	>	if (conf_parser_ctx.pass != 2)
2152	>	break;
2153
2154	<	MyFree(yy_aconf->passwd);
2155	<	DupString(yy_aconf->passwd, yylval.string);
2156	<	}
2154	>	if ($3[0] == ':')
2155	>	conf_error_report("Server passwords cannot begin with a colon");
2156	>	else if (strchr($3, ' ') != NULL)
2157	>	conf_error_report("Server passwords cannot contain spaces");
2158	>	else
2159	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2160	>	};
2161	>
2162	>	connect_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
2163	>	{
2164	>	if (conf_parser_ctx.pass == 2)
2165	>	strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
2166		};
2167
2168		connect_port: PORT '=' NUMBER ';'
2169		{
2170	<	if (ypass == 2)
2171	<	yy_aconf->port = $3;
2170	>	if (conf_parser_ctx.pass == 2)
2171	>	block_state.port.value = $3;
2172		};
2173
2174		connect_aftype: AFTYPE '=' T_IPV4 ';'
2175		{
2176	<	if (ypass == 2)
2177	<	yy_aconf->aftype = AF_INET;
2176	>	if (conf_parser_ctx.pass == 2)
2177	>	block_state.aftype.value = AF_INET;
2178		} | AFTYPE '=' T_IPV6 ';'
2179		{
2180		#ifdef IPV6
2181	<	if (ypass == 2)
2182	<	yy_aconf->aftype = AF_INET6;
2181	>	if (conf_parser_ctx.pass == 2)
2182	>	block_state.aftype.value = AF_INET6;
2183		#endif
2184		};
2185
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	–
2186		connect_flags: IRCD_FLAGS
2187		{
2188	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2189		} '='  connect_flags_items ';';
2190
2191		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2192	<	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
2550	<	{
2551	<	if (ypass == 2)
2552	<	{
2553	<	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
2192	>	connect_flags_item: AUTOCONN
2193		{
2194	<	if (ypass == 2)
2195	<	{
2196	<	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 ';'
2194	>	if (conf_parser_ctx.pass == 2)
2195	>	block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2196	>	} | T_SSL
2197		{
2198	<	#ifdef HAVE_LIBCRYPTO
2199	<	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 */
2198	>	if (conf_parser_ctx.pass == 2)
2199	>	block_state.flags.value |= CONF_FLAGS_SSL;
2200		};
2201
2202		connect_encrypted: ENCRYPTED '=' TBOOL ';'
2203		{
2204	<	if (ypass == 2)
2204	>	if (conf_parser_ctx.pass == 2)
2205		{
2206		if (yylval.number)
2207	<	yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
2207	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
2208		else
2209	<	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;
2209	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
2210		}
2211		};
2212
2213		connect_hub_mask: HUB_MASK '=' QSTRING ';'
2214		{
2215	<	if (ypass == 2)
2216	<	{
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	<	}
2215	>	if (conf_parser_ctx.pass == 2)
2216	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2217		};
2218
2219		connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2220		{
2221	<	if (ypass == 2)
2222	<	{
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	<	}
2221	>	if (conf_parser_ctx.pass == 2)
2222	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
2223		};
2224
2225		connect_class: CLASS '=' QSTRING ';'
2226		{
2227	<	if (ypass == 2)
2228	<	{
2717	<	MyFree(class_name);
2718	<	DupString(class_name, yylval.string);
2719	<	}
2227	>	if (conf_parser_ctx.pass == 2)
2228	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2229		};
2230
2231	<	connect_cipher_preference: CIPHER_PREFERENCE '=' QSTRING ';'
2231	>	connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2232		{
2233		#ifdef HAVE_LIBCRYPTO
2234	<	if (ypass == 2)
2235	<	{
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	<	}
2234	>	if (conf_parser_ctx.pass == 2)
2235	>	strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2236		#else
2237	<	if (ypass == 2)
2238	<	yyerror("Ignoring cipher_preference -- no OpenSSL support");
2237	>	if (conf_parser_ctx.pass == 2)
2238	>	conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
2239		#endif
2240		};
2241
2242	+
2243		/***************************************************************************
2244		*  section kill
2245		***************************************************************************/
2246		kill_entry: KILL
2247		{
2248	<	if (ypass == 2)
2249	<	{
2761	<	userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
2762	<	regex_ban = 0;
2763	<	}
2248	>	if (conf_parser_ctx.pass == 2)
2249	>	reset_block_state();
2250		} '{' kill_items '}' ';'
2251		{
2252	<	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;
2252	>	struct MaskItem *conf = NULL;
2253
2254	<	DupString(yy_aconf->user, userbuf);
2255	<	DupString(yy_aconf->host, hostbuf);
2789	<
2790	<	if (reasonbuf[0])
2791	<	DupString(yy_aconf->reason, reasonbuf);
2792	<	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);
2254	>	if (conf_parser_ctx.pass != 2)
2255	>	break;
2256
2257	<	DupString(yy_aconf->user, userbuf);
2258	<	DupString(yy_aconf->host, hostbuf);
2257	>	if (!block_state.user.buf[0] ||
2258	>	!block_state.host.buf[0])
2259	>	break;
2260
2261	<	if (reasonbuf[0])
2262	<	DupString(yy_aconf->reason, reasonbuf);
2263	<	else
2806	<	DupString(yy_aconf->reason, "No reason");
2807	<	add_conf_by_address(CONF_KILL, yy_aconf);
2808	<	}
2809	<	}
2810	<	else
2811	<	delete_conf_item(yy_conf);
2261	>	conf = conf_make(CONF_KLINE);
2262	>	conf->user = xstrdup(block_state.user.buf);
2263	>	conf->host = xstrdup(block_state.host.buf);
2264
2265	<	yy_conf = NULL;
2266	<	yy_aconf = NULL;
2267	<	}
2265	>	if (block_state.rpass.buf[0])
2266	>	conf->reason = xstrdup(block_state.rpass.buf);
2267	>	else
2268	>	conf->reason = xstrdup(CONF_NOREASON);
2269	>	add_conf_by_address(CONF_KLINE, conf);
2270		};
2271
2818	–	kill_type: TYPE
2819	–	{
2820	–	} '='  kill_type_items ';';
2821	–
2822	–	kill_type_items: kill_type_items ',' kill_type_item | kill_type_item;
2823	–	kill_type_item: REGEX_T
2824	–	{
2825	–	if (ypass == 2)
2826	–	regex_ban = 1;
2827	–	};
2828	–
2272		kill_items:     kill_items kill_item | kill_item;
2273	<	kill_item:      kill_user | kill_reason | kill_type | error;
2273	>	kill_item:      kill_user | kill_reason | error;
2274
2275		kill_user: USER '=' QSTRING ';'
2276		{
2277	<	if (ypass == 2)
2277	>
2278	>	if (conf_parser_ctx.pass == 2)
2279		{
2280	<	char *user = NULL, *host = NULL;
2280	>	struct split_nuh_item nuh;
2281
2282	<	split_nuh(yylval.string, NULL, &user, &host);
2282	>	nuh.nuhmask  = yylval.string;
2283	>	nuh.nickptr  = NULL;
2284	>	nuh.userptr  = block_state.user.buf;
2285	>	nuh.hostptr  = block_state.host.buf;
2286
2287	<	strlcpy(userbuf, user, sizeof(userbuf));
2288	<	strlcpy(hostbuf, host, sizeof(hostbuf));
2287	>	nuh.nicksize = 0;
2288	>	nuh.usersize = sizeof(block_state.user.buf);
2289	>	nuh.hostsize = sizeof(block_state.host.buf);
2290
2291	<	MyFree(user);
2844	<	MyFree(host);
2291	>	split_nuh(&nuh);
2292		}
2293		};
2294
2295		kill_reason: REASON '=' QSTRING ';'
2296		{
2297	<	if (ypass == 2)
2298	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2297	>	if (conf_parser_ctx.pass == 2)
2298	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2299		};
2300
2301		/***************************************************************************
#	Line 2856 | Line 2303 | kill_reason: REASON '=' QSTRING ';'
2303		***************************************************************************/
2304		deny_entry: DENY
2305		{
2306	<	if (ypass == 2)
2307	<	{
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	<	}
2306	>	if (conf_parser_ctx.pass == 2)
2307	>	reset_block_state();
2308		} '{' deny_items '}' ';'
2309		{
2310	<	if (ypass == 2)
2310	>	struct MaskItem *conf = NULL;
2311	>
2312	>	if (conf_parser_ctx.pass != 2)
2313	>	break;
2314	>
2315	>	if (!block_state.addr.buf[0])
2316	>	break;
2317	>
2318	>	if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2319		{
2320	<	if (yy_aconf->host && parse_netmask(yy_aconf->host, NULL, NULL) != HM_HOST)
2321	<	add_conf_by_address(CONF_DLINE, yy_aconf);
2320	>	conf = conf_make(CONF_DLINE);
2321	>	conf->host = xstrdup(block_state.addr.buf);
2322	>
2323	>	if (block_state.rpass.buf[0])
2324	>	conf->reason = xstrdup(block_state.rpass.buf);
2325		else
2326	<	delete_conf_item(yy_conf);
2327	<	yy_conf = NULL;
2875	<	yy_aconf = NULL;
2326	>	conf->reason = xstrdup(CONF_NOREASON);
2327	>	add_conf_by_address(CONF_DLINE, conf);
2328		}
2329		};
2330
#	Line 2881 | Line 2333 | deny_item:      deny_ip | deny_reason |
2333
2334		deny_ip: IP '=' QSTRING ';'
2335		{
2336	<	if (ypass == 2)
2337	<	{
2886	<	MyFree(yy_aconf->host);
2887	<	DupString(yy_aconf->host, yylval.string);
2888	<	}
2336	>	if (conf_parser_ctx.pass == 2)
2337	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2338		};
2339
2340		deny_reason: REASON '=' QSTRING ';'
2341		{
2342	<	if (ypass == 2)
2343	<	{
2895	<	MyFree(yy_aconf->reason);
2896	<	DupString(yy_aconf->reason, yylval.string);
2897	<	}
2342	>	if (conf_parser_ctx.pass == 2)
2343	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2344		};
2345
2346		/***************************************************************************
#	Line 2907 | Line 2353 | exempt_item:      exempt_ip | error;
2353
2354		exempt_ip: IP '=' QSTRING ';'
2355		{
2356	<	if (ypass == 2)
2356	>	if (conf_parser_ctx.pass == 2)
2357		{
2358		if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2359		{
2360	<	yy_conf = make_conf_item(EXEMPTDLINE_TYPE);
2361	<	yy_aconf = map_to_conf(yy_conf);
2916	<	DupString(yy_aconf->host, yylval.string);
2360	>	struct MaskItem *conf = conf_make(CONF_EXEMPT);
2361	>	conf->host = xstrdup(yylval.string);
2362
2363	<	add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
2919	<
2920	<	yy_conf = NULL;
2921	<	yy_aconf = NULL;
2363	>	add_conf_by_address(CONF_EXEMPT, conf);
2364		}
2365		}
2366		};
#	Line 2928 | Line 2370 | exempt_ip: IP '=' QSTRING ';'
2370		***************************************************************************/
2371		gecos_entry: GECOS
2372		{
2373	<	if (ypass == 2)
2374	<	{
2933	<	regex_ban = 0;
2934	<	reasonbuf[0] = gecos_name[0] = '\0';
2935	<	}
2373	>	if (conf_parser_ctx.pass == 2)
2374	>	reset_block_state();
2375		} '{' gecos_items '}' ';'
2376		{
2377	<	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;
2377	>	struct MaskItem *conf = NULL;
2378
2379	<	if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
2380	<	{
2949	<	ilog(L_ERROR, "Failed to add regular expression based X-Line: %s", errptr);
2950	<	break;
2951	<	}
2379	>	if (conf_parser_ctx.pass != 2)
2380	>	break;
2381
2382	<	yy_conf = make_conf_item(RXLINE_TYPE);
2383	<	yy_conf->regexpname = exp_p;
2955	<	}
2956	<	else
2957	<	yy_conf = make_conf_item(XLINE_TYPE);
2958	<
2959	<	yy_match_item = map_to_conf(yy_conf);
2960	<	DupString(yy_conf->name, gecos_name);
2961	<
2962	<	if (reasonbuf[0])
2963	<	DupString(yy_match_item->reason, reasonbuf);
2964	<	else
2965	<	DupString(yy_match_item->reason, "No reason");
2966	<	}
2967	<	}
2968	<	};
2382	>	if (!block_state.name.buf[0])
2383	>	break;
2384
2385	<	gecos_flags: TYPE
2386	<	{
2972	<	} '='  gecos_flags_items ';';
2385	>	conf = conf_make(CONF_XLINE);
2386	>	conf->name = xstrdup(block_state.name.buf);
2387
2388	<	gecos_flags_items: gecos_flags_items ',' gecos_flags_item | gecos_flags_item;
2389	<	gecos_flags_item: REGEX_T
2390	<	{
2391	<	if (ypass == 2)
2978	<	regex_ban = 1;
2388	>	if (block_state.rpass.buf[0])
2389	>	conf->reason = xstrdup(block_state.rpass.buf);
2390	>	else
2391	>	conf->reason = xstrdup(CONF_NOREASON);
2392		};
2393
2394		gecos_items: gecos_items gecos_item | gecos_item;
2395	<	gecos_item:  gecos_name | gecos_reason | gecos_flags | error;
2395	>	gecos_item:  gecos_name | gecos_reason | error;
2396
2397		gecos_name: NAME '=' QSTRING ';'
2398		{
2399	<	if (ypass == 2)
2400	<	strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
2399	>	if (conf_parser_ctx.pass == 2)
2400	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2401		};
2402
2403		gecos_reason: REASON '=' QSTRING ';'
2404		{
2405	<	if (ypass == 2)
2406	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2405	>	if (conf_parser_ctx.pass == 2)
2406	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2407		};
2408
2409		/***************************************************************************
#	Line 3005 | Line 2418 | general_item:       general_hide_spoof_i
2418		general_max_nick_time | general_max_nick_changes |
2419		general_max_accept | general_anti_spam_exit_message_time |
2420		general_ts_warn_delta | general_ts_max_delta |
2421	<	general_kill_chase_time_limit | general_kline_with_reason |
2422	<	general_kline_reason | general_invisible_on_connect |
2421	>	general_kill_chase_time_limit |
2422	>	general_invisible_on_connect |
2423		general_warn_no_nline | general_dots_in_ident |
2424		general_stats_o_oper_only | general_stats_k_oper_only |
2425		general_pace_wait | general_stats_i_oper_only |
2426		general_pace_wait_simple | general_stats_P_oper_only |
2427	+	general_stats_u_oper_only |
2428		general_short_motd | general_no_oper_flood |
2429		general_true_no_oper_flood | general_oper_pass_resv |
3016	–	general_idletime | general_message_locale |
2430		general_oper_only_umodes | general_max_targets |
2431		general_use_egd | general_egdpool_path |
2432		general_oper_umodes | general_caller_id_wait |
2433		general_opers_bypass_callerid | general_default_floodcount |
2434		general_min_nonwildcard | general_min_nonwildcard_simple |
3022	–	general_servlink_path | general_disable_remote_commands |
3023	–	general_default_cipher_preference |
3024	–	general_compression_level | general_client_flood |
2435		general_throttle_time | general_havent_read_conf |
2436	<	general_dot_in_ip6_addr | general_ping_cookie |
2437	<	general_disable_auth | general_burst_away |
2438	<	general_tkline_expire_notices | general_gline_min_cidr |
2439	<	general_gline_min_cidr6 | general_use_whois_actually |
2440	<	general_reject_hold_time |
2436	>	general_ping_cookie |
2437	>	general_disable_auth |
2438	>	general_tkline_expire_notices | general_gline_enable |
2439	>	general_gline_duration | general_gline_request_duration |
2440	>	general_gline_min_cidr |
2441	>	general_gline_min_cidr6 |
2442	>	general_stats_e_disabled |
2443	>	general_max_watch | general_services_name |
2444	>	general_cycle_on_host_change |
2445		error;
2446
2447
2448	+	general_max_watch: MAX_WATCH '=' NUMBER ';'
2449	+	{
2450	+	ConfigFileEntry.max_watch = $3;
2451	+	};
2452
2453	<	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2453	>	general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2454		{
2455	<	ConfigFileEntry.gline_min_cidr = $3;
2455	>	if (conf_parser_ctx.pass == 2)
2456	>	ConfigFileEntry.cycle_on_host_change = yylval.number;
2457		};
2458
2459	<	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2459	>	general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2460		{
2461	<	ConfigFileEntry.gline_min_cidr6 = $3;
2461	>	if (conf_parser_ctx.pass == 2)
2462	>	ConfigFileEntry.glines = yylval.number;
2463	>	};
2464	>
2465	>	general_gline_duration: GLINE_DURATION '=' timespec ';'
2466	>	{
2467	>	if (conf_parser_ctx.pass == 2)
2468	>	ConfigFileEntry.gline_time = $3;
2469		};
2470
2471	<	general_burst_away: BURST_AWAY '=' TBOOL ';'
2471	>	general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2472		{
2473	<	ConfigFileEntry.burst_away = yylval.number;
2473	>	if (conf_parser_ctx.pass == 2)
2474	>	ConfigFileEntry.gline_request_time = $3;
2475		};
2476
2477	<	general_use_whois_actually: USE_WHOIS_ACTUALLY '=' TBOOL ';'
2477	>	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2478		{
2479	<	ConfigFileEntry.use_whois_actually = yylval.number;
2479	>	ConfigFileEntry.gline_min_cidr = $3;
2480		};
2481
2482	<	general_reject_hold_time: TREJECT_HOLD_TIME '=' timespec ';'
2482	>	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2483		{
2484	<	GlobalSetOptions.rejecttime = yylval.number;
2484	>	ConfigFileEntry.gline_min_cidr6 = $3;
2485		};
2486
2487		general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
#	Line 3062 | Line 2489 | general_tkline_expire_notices: TKLINE_EX
2489		ConfigFileEntry.tkline_expire_notices = yylval.number;
2490		};
2491
2492	<	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' NUMBER ';'
2492	>	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2493		{
2494		ConfigFileEntry.kill_chase_time_limit = $3;
2495		};
#	Line 3077 | Line 2504 | general_ignore_bogus_ts: IGNORE_BOGUS_TS
2504		ConfigFileEntry.ignore_bogus_ts = yylval.number;
2505		};
2506
3080	–	general_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
3081	–	{
3082	–	ConfigFileEntry.disable_remote = yylval.number;
3083	–	};
3084	–
2507		general_failed_oper_notice: FAILED_OPER_NOTICE '=' TBOOL ';'
2508		{
2509		ConfigFileEntry.failed_oper_notice = yylval.number;
#	Line 3119 | Line 2541 | general_ts_warn_delta: TS_WARN_DELTA '='
2541
2542		general_ts_max_delta: TS_MAX_DELTA '=' timespec ';'
2543		{
2544	<	if (ypass == 2)
2544	>	if (conf_parser_ctx.pass == 2)
2545		ConfigFileEntry.ts_max_delta = $3;
2546		};
2547
2548		general_havent_read_conf: HAVENT_READ_CONF '=' NUMBER ';'
2549		{
2550	<	if (($3 > 0) && ypass == 1)
2550	>	if (($3 > 0) && conf_parser_ctx.pass == 1)
2551		{
2552	<	ilog(L_CRIT, "You haven't read your config file properly.");
2553	<	ilog(L_CRIT, "There is a line in the example conf that will kill your server if not removed.");
2554	<	ilog(L_CRIT, "Consider actually reading/editing the conf file, and removing this line.");
2552	>	ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
2553	>	ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
2554	>	ilog(LOG_TYPE_IRCD, "Consider actually reading/editing the conf file, and removing this line.");
2555		exit(0);
2556		}
2557		};
2558
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	–
2559		general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2560		{
2561		ConfigFileEntry.invisible_on_connect = yylval.number;
#	Line 3158 | Line 2566 | general_warn_no_nline: WARN_NO_NLINE '='
2566		ConfigFileEntry.warn_no_nline = yylval.number;
2567		};
2568
2569	+	general_stats_e_disabled: STATS_E_DISABLED '=' TBOOL ';'
2570	+	{
2571	+	ConfigFileEntry.stats_e_disabled = yylval.number;
2572	+	};
2573	+
2574		general_stats_o_oper_only: STATS_O_OPER_ONLY '=' TBOOL ';'
2575		{
2576		ConfigFileEntry.stats_o_oper_only = yylval.number;
#	Line 3168 | Line 2581 | general_stats_P_oper_only: STATS_P_OPER_
2581		ConfigFileEntry.stats_P_oper_only = yylval.number;
2582		};
2583
2584	+	general_stats_u_oper_only: STATS_U_OPER_ONLY '=' TBOOL ';'
2585	+	{
2586	+	ConfigFileEntry.stats_u_oper_only = yylval.number;
2587	+	};
2588	+
2589		general_stats_k_oper_only: STATS_K_OPER_ONLY '=' TBOOL ';'
2590		{
2591		ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
#	Line 3224 | Line 2642 | general_oper_pass_resv: OPER_PASS_RESV '
2642		ConfigFileEntry.oper_pass_resv = yylval.number;
2643		};
2644
3227	–	general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
3228	–	{
3229	–	if (ypass == 2)
3230	–	{
3231	–	if (strlen(yylval.string) > LOCALE_LENGTH-2)
3232	–	yylval.string[LOCALE_LENGTH-1] = '\0';
3233	–
3234	–	set_locale(yylval.string);
3235	–	}
3236	–	};
3237	–
3238	–	general_idletime: IDLETIME '=' timespec ';'
3239	–	{
3240	–	ConfigFileEntry.idletime = $3;
3241	–	};
3242	–
2645		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2646		{
2647		ConfigFileEntry.dots_in_ident = $3;
#	Line 3250 | Line 2652 | general_max_targets: MAX_TARGETS '=' NUM
2652		ConfigFileEntry.max_targets = $3;
2653		};
2654
2655	<	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 ';'
2655	>	general_use_egd: USE_EGD '=' TBOOL ';'
2656		{
2657	<	#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
2657	>	ConfigFileEntry.use_egd = yylval.number;
2658		};
2659
2660	<	general_compression_level: COMPRESSION_LEVEL '=' NUMBER ';'
2660	>	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
2661		{
2662	<	if (ypass == 2)
2662	>	if (conf_parser_ctx.pass == 2)
2663		{
2664	<	ConfigFileEntry.compression_level = $3;
2665	<	#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
2664	>	MyFree(ConfigFileEntry.egdpool_path);
2665	>	ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
2666		}
2667		};
2668
2669	<	general_use_egd: USE_EGD '=' TBOOL ';'
3313	<	{
3314	<	ConfigFileEntry.use_egd = yylval.number;
3315	<	};
3316	<
3317	<	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
2669	>	general_services_name: T_SERVICES_NAME '=' QSTRING ';'
2670		{
2671	<	if (ypass == 2)
2671	>	if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2672		{
2673	<	MyFree(ConfigFileEntry.egdpool_path);
2674	<	DupString(ConfigFileEntry.egdpool_path, yylval.string);
2673	>	MyFree(ConfigFileEntry.service_name);
2674	>	ConfigFileEntry.service_name = xstrdup(yylval.string);
2675		}
2676		};
2677
#	Line 3359 | Line 2711 | umode_oitem:     T_BOTS
2711		} | T_FULL
2712		{
2713		ConfigFileEntry.oper_umodes |= UMODE_FULL;
2714	+	} | HIDDEN
2715	+	{
2716	+	ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
2717		} | T_SKILL
2718		{
2719		ConfigFileEntry.oper_umodes |= UMODE_SKILL;
#	Line 3398 | Line 2753 | umode_oitem:     T_BOTS
2753		} | T_LOCOPS
2754		{
2755		ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
2756	+	} | T_NONONREG
2757	+	{
2758	+	ConfigFileEntry.oper_umodes |= UMODE_REGONLY;
2759	+	} | T_FARCONNECT
2760	+	{
2761	+	ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT;
2762		};
2763
2764		general_oper_only_umodes: OPER_ONLY_UMODES
#	Line 3424 | Line 2785 | umode_item:    T_BOTS
2785		} | T_SKILL
2786		{
2787		ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
2788	+	} | HIDDEN
2789	+	{
2790	+	ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
2791		} | T_NCHANGE
2792		{
2793		ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
#	Line 3460 | Line 2824 | umode_item:    T_BOTS
2824		} | T_LOCOPS
2825		{
2826		ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
2827	+	} | T_NONONREG
2828	+	{
2829	+	ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
2830	+	} | T_FARCONNECT
2831	+	{
2832	+	ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT;
2833		};
2834
2835		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
#	Line 3477 | Line 2847 | general_default_floodcount: DEFAULT_FLOO
2847		ConfigFileEntry.default_floodcount = $3;
2848		};
2849
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	–	};
2850
2851		/***************************************************************************
2852		*  section channel
#	Line 3642 | Line 2855 | channel_entry: CHANNEL
2855		'{' channel_items '}' ';';
2856
2857		channel_items:      channel_items channel_item | channel_item;
2858	<	channel_item:       channel_disable_local_channels | channel_use_except |
2859	<	channel_use_invex | channel_use_knock |
2860	<	channel_max_bans | channel_knock_delay |
2861	<	channel_knock_delay_channel | channel_invite_ops_only |
2862	<	channel_max_chans_per_user | channel_quiet_on_ban |
2863	<	channel_default_split_user_count |
2864	<	channel_default_split_server_count |
2865	<	channel_no_create_on_split | channel_restrict_channels |
2866	<	channel_no_join_on_split | channel_burst_topicwho |
3654	<	channel_jflood_count | channel_jflood_time |
3655	<	error;
3656	<
3657	<	channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
3658	<	{
3659	<	ConfigChannel.restrict_channels = yylval.number;
3660	<	};
3661	<
3662	<	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	<	};
2858	>	channel_item:       channel_max_bans |
2859	>	channel_knock_delay | channel_knock_delay_channel |
2860	>	channel_max_chans_per_user | channel_max_chans_per_oper |
2861	>	channel_default_split_user_count |
2862	>	channel_default_split_server_count |
2863	>	channel_no_create_on_split |
2864	>	channel_no_join_on_split |
2865	>	channel_jflood_count | channel_jflood_time |
2866	>	channel_disable_fake_channels | error;
2867
2868	<	channel_use_knock: USE_KNOCK '=' TBOOL ';'
2868	>	channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
2869		{
2870	<	ConfigChannel.use_knock = yylval.number;
2870	>	ConfigChannel.disable_fake_channels = yylval.number;
2871		};
2872
2873		channel_knock_delay: KNOCK_DELAY '=' timespec ';'
#	Line 3689 | Line 2880 | channel_knock_delay_channel: KNOCK_DELAY
2880		ConfigChannel.knock_delay_channel = $3;
2881		};
2882
3692	–	channel_invite_ops_only: INVITE_OPS_ONLY '=' TBOOL ';'
3693	–	{
3694	–	ConfigChannel.invite_ops_only = yylval.number;
3695	–	};
3696	–
2883		channel_max_chans_per_user: MAX_CHANS_PER_USER '=' NUMBER ';'
2884		{
2885		ConfigChannel.max_chans_per_user = $3;
2886		};
2887
2888	<	channel_quiet_on_ban: QUIET_ON_BAN '=' TBOOL ';'
2888	>	channel_max_chans_per_oper: MAX_CHANS_PER_OPER '=' NUMBER ';'
2889		{
2890	<	ConfigChannel.quiet_on_ban = yylval.number;
2890	>	ConfigChannel.max_chans_per_oper = $3;
2891		};
2892
2893		channel_max_bans: MAX_BANS '=' NUMBER ';'
#	Line 3729 | Line 2915 | channel_no_join_on_split: NO_JOIN_ON_SPL
2915		ConfigChannel.no_join_on_split = yylval.number;
2916		};
2917
3732	–	channel_burst_topicwho: BURST_TOPICWHO '=' TBOOL ';'
3733	–	{
3734	–	ConfigChannel.burst_topicwho = yylval.number;
3735	–	};
3736	–
2918		channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
2919		{
2920		GlobalSetOptions.joinfloodcount = yylval.number;
#	Line 3751 | Line 2932 | serverhide_entry: SERVERHIDE
2932		'{' serverhide_items '}' ';';
2933
2934		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
2935	<	serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
2935	>	serverhide_item:    serverhide_flatten_links | serverhide_disable_remote_commands |
2936	>	serverhide_hide_servers |
2937	>	serverhide_hide_services |
2938		serverhide_links_delay |
3756	–	serverhide_disable_hidden |
2939		serverhide_hidden | serverhide_hidden_name |
2940		serverhide_hide_server_ips |
2941		error;
2942
2943		serverhide_flatten_links: FLATTEN_LINKS '=' TBOOL ';'
2944		{
2945	<	if (ypass == 2)
2945	>	if (conf_parser_ctx.pass == 2)
2946		ConfigServerHide.flatten_links = yylval.number;
2947		};
2948
2949	+	serverhide_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
2950	+	{
2951	+	if (conf_parser_ctx.pass == 2)
2952	+	ConfigServerHide.disable_remote_commands = yylval.number;
2953	+	};
2954	+
2955		serverhide_hide_servers: HIDE_SERVERS '=' TBOOL ';'
2956		{
2957	<	if (ypass == 2)
2957	>	if (conf_parser_ctx.pass == 2)
2958		ConfigServerHide.hide_servers = yylval.number;
2959		};
2960
2961	+	serverhide_hide_services: HIDE_SERVICES '=' TBOOL ';'
2962	+	{
2963	+	if (conf_parser_ctx.pass == 2)
2964	+	ConfigServerHide.hide_services = yylval.number;
2965	+	};
2966	+
2967		serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2968		{
2969	<	if (ypass == 2)
2969	>	if (conf_parser_ctx.pass == 2)
2970		{
2971		MyFree(ConfigServerHide.hidden_name);
2972	<	DupString(ConfigServerHide.hidden_name, yylval.string);
2972	>	ConfigServerHide.hidden_name = xstrdup(yylval.string);
2973		}
2974		};
2975
2976		serverhide_links_delay: LINKS_DELAY '=' timespec ';'
2977		{
2978	<	if (ypass == 2)
2978	>	if (conf_parser_ctx.pass == 2)
2979		{
2980		if (($3 > 0) && ConfigServerHide.links_disabled == 1)
2981		{
#	Line 3795 | Line 2989 | serverhide_links_delay: LINKS_DELAY '='
2989
2990		serverhide_hidden: HIDDEN '=' TBOOL ';'
2991		{
2992	<	if (ypass == 2)
2992	>	if (conf_parser_ctx.pass == 2)
2993		ConfigServerHide.hidden = yylval.number;
2994		};
2995
3802	–	serverhide_disable_hidden: DISABLE_HIDDEN '=' TBOOL ';'
3803	–	{
3804	–	if (ypass == 2)
3805	–	ConfigServerHide.disable_hidden = yylval.number;
3806	–	};
3807	–
2996		serverhide_hide_server_ips: HIDE_SERVER_IPS '=' TBOOL ';'
2997		{
2998	<	if (ypass == 2)
2998	>	if (conf_parser_ctx.pass == 2)
2999		ConfigServerHide.hide_server_ips = yylval.number;
3000		};

Diff Legend

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