ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/ircd_parser.y (file contents), Revision 1176 by michael, Sun Aug 14 11:24:24 2011 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 3435 by michael, Thu May 1 13:57:39 2014 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.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2005 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 2000-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
21	–	*
22	–	*  $Id$
20		*/
21
22	+	/*! \file conf_parser.y
23	+	* \brief Parses the ircd configuration file.
24	+	* \version $Id$
25	+	*/
26	+
27	+
28		%{
29
30		#define YY_NO_UNPUT
#	Line 32 | Line 35
35		#include "stdinc.h"
36		#include "ircd.h"
37		#include "list.h"
38	<	#include "s_conf.h"
38	>	#include "conf.h"
39	>	#include "conf_class.h"
40		#include "event.h"
41	<	#include "s_log.h"
41	>	#include "log.h"
42		#include "client.h"     /* for UMODE_ALL only */
43		#include "irc_string.h"
40	–	#include "sprintf_irc.h"
44		#include "memory.h"
45		#include "modules.h"
46	<	#include "s_serv.h"
46	>	#include "server.h"
47		#include "hostmask.h"
48		#include "send.h"
49		#include "listener.h"
50		#include "resv.h"
51		#include "numeric.h"
52	<	#include "s_user.h"
52	>	#include "user.h"
53	>	#include "motd.h"
54
55		#ifdef HAVE_LIBCRYPTO
56		#include <openssl/rsa.h>
57		#include <openssl/bio.h>
58		#include <openssl/pem.h>
59	+	#include <openssl/dh.h>
60		#endif
61
62	<	static char *class_name = NULL;
58	<	static struct ConfItem *yy_conf = NULL;
59	<	static struct AccessItem *yy_aconf = NULL;
60	<	static struct MatchItem *yy_match_item = NULL;
61	<	static struct ClassItem *yy_class = NULL;
62	<	static char *yy_class_name = NULL;
63	<
64	<	static dlink_list col_conf_list  = { NULL, NULL, 0 };
65	<	static dlink_list hub_conf_list  = { NULL, NULL, 0 };
66	<	static dlink_list leaf_conf_list = { NULL, NULL, 0 };
67	<	static unsigned int listener_flags = 0;
68	<	static unsigned int regex_ban = 0;
69	<	static char userbuf[IRCD_BUFSIZE];
70	<	static char hostbuf[IRCD_BUFSIZE];
71	<	static char reasonbuf[REASONLEN + 1];
72	<	static char gecos_name[REALLEN * 4];
73	<
74	<	static char *resv_reason = NULL;
75	<	static char *listener_address = NULL;
76	<	static int not_atom = 0;
77	<
78	<	struct CollectItem
79	<	{
80	<	dlink_node node;
81	<	char *name;
82	<	char *user;
83	<	char *host;
84	<	char *passwd;
85	<	int  port;
86	<	int  flags;
87	<	#ifdef HAVE_LIBCRYPTO
88	<	char *rsa_public_key_file;
89	<	RSA *rsa_public_key;
90	<	#endif
91	<	};
62	>	#include "rsa.h"
63
64	<	static void
65	<	free_collect_item(struct CollectItem *item)
64	>	int yylex(void);
65	>
66	>	static struct
67		{
68	<	MyFree(item->name);
69	<	MyFree(item->user);
70	<	MyFree(item->host);
71	<	MyFree(item->passwd);
72	<	#ifdef HAVE_LIBCRYPTO
73	<	MyFree(item->rsa_public_key_file);
74	<	#endif
75	<	MyFree(item);
76	<	}
68	>	struct {
69	>	dlink_list list;
70	>	} mask,
71	>	leaf,
72	>	hub;
73	>
74	>	struct {
75	>	char buf[IRCD_BUFSIZE];
76	>	} name,
77	>	user,
78	>	host,
79	>	addr,
80	>	bind,
81	>	file,
82	>	ciph,
83	>	cert,
84	>	rpass,
85	>	spass,
86	>	class;
87	>
88	>	struct {
89	>	unsigned int value;
90	>	} flags,
91	>	modes,
92	>	size,
93	>	type,
94	>	port,
95	>	aftype,
96	>	ping_freq,
97	>	max_perip,
98	>	con_freq,
99	>	min_idle,
100	>	max_idle,
101	>	max_total,
102	>	max_global,
103	>	max_local,
104	>	max_ident,
105	>	max_sendq,
106	>	max_recvq,
107	>	cidr_bitlen_ipv4,
108	>	cidr_bitlen_ipv6,
109	>	number_per_cidr;
110	>	} block_state;
111
112		static void
113	<	unhook_hub_leaf_confs(void)
113	>	reset_block_state(void)
114		{
115	<	dlink_node *ptr;
116	<	dlink_node *next_ptr;
117	<	struct CollectItem *yy_hconf;
118	<	struct CollectItem *yy_lconf;
115	>	dlink_node *ptr = NULL, *ptr_next = NULL;
116	>
117	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.mask.list.head)
118	>	{
119	>	MyFree(ptr->data);
120	>	dlinkDelete(ptr, &block_state.mask.list);
121	>	free_dlink_node(ptr);
122	>	}
123
124	<	DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
124	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
125		{
126	<	yy_hconf = ptr->data;
127	<	dlinkDelete(&yy_hconf->node, &hub_conf_list);
128	<	free_collect_item(yy_hconf);
126	>	MyFree(ptr->data);
127	>	dlinkDelete(ptr, &block_state.leaf.list);
128	>	free_dlink_node(ptr);
129		}
130
131	<	DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
131	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.hub.list.head)
132		{
133	<	yy_lconf = ptr->data;
134	<	dlinkDelete(&yy_lconf->node, &leaf_conf_list);
135	<	free_collect_item(yy_lconf);
133	>	MyFree(ptr->data);
134	>	dlinkDelete(ptr, &block_state.hub.list);
135	>	free_dlink_node(ptr);
136		}
137	+
138	+	memset(&block_state, 0, sizeof(block_state));
139		}
140
141		%}
#	Line 134 | Line 146 | unhook_hub_leaf_confs(void)
146		}
147
148		%token  ACCEPT_PASSWORD
137	–	%token  ACTION
149		%token  ADMIN
150		%token  AFTYPE
140	–	%token  T_ALLOW
151		%token  ANTI_NICK_FLOOD
152		%token  ANTI_SPAM_EXIT_MESSAGE_TIME
153		%token  AUTOCONN
154	<	%token  T_BLOCK
145	<	%token  BURST_AWAY
146	<	%token  BURST_TOPICWHO
147	<	%token  BYTES KBYTES MBYTES GBYTES TBYTES
154	>	%token  BYTES KBYTES MBYTES
155		%token  CALLER_ID_WAIT
156		%token  CAN_FLOOD
157		%token  CHANNEL
158	<	%token  CIDR_BITLEN_IPV4
159	<	%token  CIDR_BITLEN_IPV6
153	<	%token  CIPHER_PREFERENCE
158	>	%token  CIDR_BITLEN_IPV4
159	>	%token  CIDR_BITLEN_IPV6
160		%token  CLASS
155	–	%token  COMPRESSED
156	–	%token  COMPRESSION_LEVEL
161		%token  CONNECT
162		%token  CONNECTFREQ
163	<	%token  CRYPTLINK
160	<	%token  DEFAULT_CIPHER_PREFERENCE
163	>	%token  CYCLE_ON_HOST_CHANGE
164		%token  DEFAULT_FLOODCOUNT
165		%token  DEFAULT_SPLIT_SERVER_COUNT
166		%token  DEFAULT_SPLIT_USER_COUNT
#	Line 166 | Line 169 | unhook_hub_leaf_confs(void)
169		%token  DIE
170		%token  DISABLE_AUTH
171		%token  DISABLE_FAKE_CHANNELS
169	–	%token  DISABLE_HIDDEN
170	–	%token  DISABLE_LOCAL_CHANNELS
172		%token  DISABLE_REMOTE_COMMANDS
173		%token  DOTS_IN_IDENT
173	–	%token  DURATION
174		%token  EGDPOOL_PATH
175		%token  EMAIL
176	–	%token  ENABLE
176		%token  ENCRYPTED
177		%token  EXCEED_LIMIT
178		%token  EXEMPT
179		%token  FAILED_OPER_NOTICE
181	–	%token  IRCD_FLAGS
180		%token  FLATTEN_LINKS
183	–	%token  FFAILED_OPERLOG
184	–	%token  FKILLLOG
185	–	%token  FKLINELOG
186	–	%token  FGLINELOG
187	–	%token  FIOERRLOG
188	–	%token  FOPERLOG
189	–	%token  FOPERSPYLOG
190	–	%token  FUSERLOG
181		%token  GECOS
182		%token  GENERAL
183		%token  GLINE
184	<	%token  GLINES
184	>	%token  GLINE_DURATION
185	>	%token  GLINE_ENABLE
186		%token  GLINE_EXEMPT
196	–	%token  GLINE_LOG
197	–	%token  GLINE_TIME
187		%token  GLINE_MIN_CIDR
188		%token  GLINE_MIN_CIDR6
189	+	%token  GLINE_REQUEST_DURATION
190		%token  GLOBAL_KILL
201	–	%token  IRCD_AUTH
202	–	%token  NEED_IDENT
191		%token  HAVENT_READ_CONF
192		%token  HIDDEN
193	<	%token  HIDDEN_ADMIN
194	<	%token  HIDDEN_NAME
207	<	%token  HIDDEN_OPER
193	>	%token  HIDDEN_NAME
194	>	%token  HIDE_IDLE_FROM_OPERS
195		%token  HIDE_SERVER_IPS
196		%token  HIDE_SERVERS
197	<	%token  HIDE_SPOOF_IPS
197	>	%token  HIDE_SERVICES
198	>	%token  HIDE_SPOOF_IPS
199		%token  HOST
200		%token  HUB
201		%token  HUB_MASK
202		%token  IGNORE_BOGUS_TS
203		%token  INVISIBLE_ON_CONNECT
204		%token  IP
205	+	%token  IRCD_AUTH
206	+	%token  IRCD_FLAGS
207	+	%token  IRCD_SID
208	+	%token  JOIN_FLOOD_COUNT
209	+	%token  JOIN_FLOOD_TIME
210		%token  KILL
211	<	%token  KILL_CHASE_TIME_LIMIT
211	>	%token  KILL_CHASE_TIME_LIMIT
212		%token  KLINE
213		%token  KLINE_EXEMPT
221	–	%token  KLINE_REASON
222	–	%token  KLINE_WITH_REASON
214		%token  KNOCK_DELAY
215		%token  KNOCK_DELAY_CHANNEL
216		%token  LEAF_MASK
217		%token  LINKS_DELAY
218		%token  LISTEN
219	<	%token  T_LOG
229	<	%token  LOGGING
230	<	%token  LOG_LEVEL
219	>	%token  MASK
220		%token  MAX_ACCEPT
221		%token  MAX_BANS
222	+	%token  MAX_CHANS_PER_OPER
223		%token  MAX_CHANS_PER_USER
224		%token  MAX_GLOBAL
225		%token  MAX_IDENT
226	+	%token  MAX_IDLE
227		%token  MAX_LOCAL
228		%token  MAX_NICK_CHANGES
229	+	%token  MAX_NICK_LENGTH
230		%token  MAX_NICK_TIME
231		%token  MAX_NUMBER
232		%token  MAX_TARGETS
233	+	%token  MAX_TOPIC_LENGTH
234		%token  MAX_WATCH
235	<	%token  MESSAGE_LOCALE
235	>	%token  MIN_IDLE
236		%token  MIN_NONWILDCARD
237		%token  MIN_NONWILDCARD_SIMPLE
238		%token  MODULE
239		%token  MODULES
240	+	%token  MOTD
241		%token  NAME
242	+	%token  NEED_IDENT
243		%token  NEED_PASSWORD
244		%token  NETWORK_DESC
245		%token  NETWORK_NAME
246		%token  NICK
252	–	%token  NICK_CHANGES
247		%token  NO_CREATE_ON_SPLIT
248		%token  NO_JOIN_ON_SPLIT
249		%token  NO_OPER_FLOOD
250		%token  NO_TILDE
257	–	%token  NOT
251		%token  NUMBER
259	–	%token  NUMBER_PER_IDENT
252		%token  NUMBER_PER_CIDR
253		%token  NUMBER_PER_IP
262	–	%token  NUMBER_PER_IP_GLOBAL
263	–	%token  OPERATOR
264	–	%token  OPERS_BYPASS_CALLERID
265	–	%token  OPER_LOG
254		%token  OPER_ONLY_UMODES
255		%token  OPER_PASS_RESV
268	–	%token  OPER_SPY_T
256		%token  OPER_UMODES
257	<	%token  JOIN_FLOOD_COUNT
258	<	%token  JOIN_FLOOD_TIME
257	>	%token  OPERATOR
258	>	%token  OPERS_BYPASS_CALLERID
259		%token  PACE_WAIT
260		%token  PACE_WAIT_SIMPLE
261		%token  PASSWORD
262		%token  PATH
263		%token  PING_COOKIE
264		%token  PING_TIME
278	–	%token  PING_WARNING
265		%token  PORT
266		%token  QSTRING
267	<	%token  QUIET_ON_BAN
267	>	%token  RANDOM_IDLE
268		%token  REASON
269		%token  REDIRPORT
270		%token  REDIRSERV
285	–	%token  REGEX_T
271		%token  REHASH
287	–	%token  TREJECT_HOLD_TIME
272		%token  REMOTE
273		%token  REMOTEBAN
290	–	%token  RESTRICT_CHANNELS
291	–	%token  RESTRICTED
292	–	%token  RSA_PRIVATE_KEY_FILE
293	–	%token  RSA_PUBLIC_KEY_FILE
294	–	%token  SSL_CERTIFICATE_FILE
295	–	%token  T_SSL_CONNECTION_METHOD
296	–	%token  T_SSLV3
297	–	%token  T_TLSV1
274		%token  RESV
275		%token  RESV_EXEMPT
276	<	%token  SECONDS MINUTES HOURS DAYS WEEKS
277	<	%token  SENDQ
276	>	%token  RSA_PRIVATE_KEY_FILE
277	>	%token  RSA_PUBLIC_KEY_FILE
278	>	%token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
279		%token  SEND_PASSWORD
280	+	%token  SENDQ
281		%token  SERVERHIDE
282		%token  SERVERINFO
305	–	%token  SERVLINK_PATH
306	–	%token  IRCD_SID
307	–	%token  TKLINE_EXPIRE_NOTICES
308	–	%token  T_SHARED
309	–	%token  T_CLUSTER
310	–	%token  TYPE
283		%token  SHORT_MOTD
312	–	%token  SILENT
284		%token  SPOOF
285		%token  SPOOF_NOTICE
286	+	%token  SQUIT
287	+	%token  SSL_CERTIFICATE_FILE
288	+	%token  SSL_CERTIFICATE_FINGERPRINT
289	+	%token  SSL_CONNECTION_REQUIRED
290	+	%token  SSL_DH_PARAM_FILE
291		%token  STATS_E_DISABLED
292		%token  STATS_I_OPER_ONLY
293		%token  STATS_K_OPER_ONLY
294		%token  STATS_O_OPER_ONLY
295		%token  STATS_P_OPER_ONLY
296	<	%token  TBOOL
321	<	%token  TMASKED
322	<	%token  T_REJECT
323	<	%token  TS_MAX_DELTA
324	<	%token  TS_WARN_DELTA
325	<	%token  TWODOTS
296	>	%token  STATS_U_OPER_ONLY
297		%token  T_ALL
298		%token  T_BOTS
328	–	%token  T_SOFTCALLERID
299		%token  T_CALLERID
300		%token  T_CCONN
301	<	%token  T_CCONN_FULL
332	<	%token  T_CLIENT_FLOOD
301	>	%token  T_CLUSTER
302		%token  T_DEAF
303		%token  T_DEBUG
304	<	%token  T_DRONE
304	>	%token  T_DLINE
305		%token  T_EXTERNAL
306	+	%token  T_FARCONNECT
307	+	%token  T_FILE
308		%token  T_FULL
309	+	%token  T_GLOBOPS
310		%token  T_INVISIBLE
311		%token  T_IPV4
312		%token  T_IPV6
313		%token  T_LOCOPS
314	<	%token  T_LOGPATH
343	<	%token  T_L_CRIT
344	<	%token  T_L_DEBUG
345	<	%token  T_L_ERROR
346	<	%token  T_L_INFO
347	<	%token  T_L_NOTICE
348	<	%token  T_L_TRACE
349	<	%token  T_L_WARN
314	>	%token  T_LOG
315		%token  T_MAX_CLIENTS
316		%token  T_NCHANGE
317	+	%token  T_NONONREG
318		%token  T_OPERWALL
319	+	%token  T_RECVQ
320		%token  T_REJ
321	+	%token  T_RESTART
322		%token  T_SERVER
323	+	%token  T_SERVICE
324	+	%token  T_SERVICES_NAME
325		%token  T_SERVNOTICE
326	+	%token  T_SET
327	+	%token  T_SHARED
328	+	%token  T_SIZE
329		%token  T_SKILL
330	+	%token  T_SOFTCALLERID
331		%token  T_SPY
332		%token  T_SSL
333	+	%token  T_SSL_CIPHER_LIST
334	+	%token  T_SSL_CLIENT_METHOD
335	+	%token  T_SSL_SERVER_METHOD
336	+	%token  T_SSLV3
337	+	%token  T_TLSV1
338		%token  T_UMODES
339		%token  T_UNAUTH
340	+	%token  T_UNDLINE
341	+	%token  T_UNLIMITED
342		%token  T_UNRESV
343		%token  T_UNXLINE
344		%token  T_WALLOP
345	<	%token  T_SERVICE
346	<	%token  T_SERVICES_NAME
345	>	%token  T_WALLOPS
346	>	%token  T_WEBIRC
347	>	%token  TBOOL
348		%token  THROTTLE_TIME
349	<	%token  TOPICBURST
349	>	%token  TKLINE_EXPIRE_NOTICES
350	>	%token  TMASKED
351		%token  TRUE_NO_OPER_FLOOD
352	<	%token  TKLINE
353	<	%token  TXLINE
354	<	%token  TRESV
352	>	%token  TS_MAX_DELTA
353	>	%token  TS_WARN_DELTA
354	>	%token  TWODOTS
355	>	%token  TYPE
356		%token  UNKLINE
373	–	%token  USER
357		%token  USE_EGD
375	–	%token  USE_EXCEPT
376	–	%token  USE_INVEX
377	–	%token  USE_KNOCK
358		%token  USE_LOGGING
359	<	%token  USE_WHOIS_ACTUALLY
359	>	%token  USER
360		%token  VHOST
361		%token  VHOST6
382	–	%token  XLINE
383	–	%token  WARN
362		%token  WARN_NO_NLINE
363	+	%token  XLINE
364
365	<	%type <string> QSTRING
366	<	%type <number> NUMBER
367	<	%type <number> timespec
368	<	%type <number> timespec_
369	<	%type <number> sizespec
370	<	%type <number> sizespec_
365	>	%type  <string> QSTRING
366	>	%type  <number> NUMBER
367	>	%type  <number> timespec
368	>	%type  <number> timespec_
369	>	%type  <number> sizespec
370	>	%type  <number> sizespec_
371
372		%%
373	<	conf:
373	>	conf:
374		| conf conf_item
375		;
376
#	Line 399 | Line 378 | conf_item:        admin_entry
378		| logging_entry
379		| oper_entry
380		| channel_entry
381	<	| class_entry
381	>	| class_entry
382		| listen_entry
383		| auth_entry
384		| serverinfo_entry
#	Line 413 | Line 392 | conf_item:        admin_entry
392		| deny_entry
393		| exempt_entry
394		| general_entry
416	–	| gline_entry
395		| gecos_entry
396		| modules_entry
397	+	| motd_entry
398		| error ';'
399		| error '}'
400		;
#	Line 446 | Line 425 | timespec:      NUMBER timespec_
425		{
426		$$ = $1 * 60 * 60 * 24 * 7 + $3;
427		}
428	+	| NUMBER MONTHS timespec_
429	+	{
430	+	$$ = $1 * 60 * 60 * 24 * 7 * 4 + $3;
431	+	}
432	+	| NUMBER YEARS timespec_
433	+	{
434	+	$$ = $1 * 60 * 60 * 24 * 365 + $3;
435	+	}
436		;
437
438		sizespec_:      { $$ = 0; } | sizespec;
#	Line 484 | Line 471 | serverinfo_items:       serverinfo_items
471		serverinfo_item:        serverinfo_name | serverinfo_vhost |
472		serverinfo_hub | serverinfo_description |
473		serverinfo_network_name | serverinfo_network_desc |
474	<	serverinfo_max_clients |
474	>	serverinfo_max_clients | serverinfo_max_nick_length |
475	>	serverinfo_max_topic_length | serverinfo_ssl_dh_param_file |
476		serverinfo_rsa_private_key_file | serverinfo_vhost6 |
477		serverinfo_sid | serverinfo_ssl_certificate_file |
478	<	serverinfo_ssl_connection_method |
478	>	serverinfo_ssl_client_method | serverinfo_ssl_server_method |
479	>	serverinfo_ssl_cipher_list |
480		error ';' ;
481
482
483	<	serverinfo_ssl_connection_method: T_SSL_CONNECTION_METHOD
483	>	serverinfo_ssl_client_method: T_SSL_CLIENT_METHOD '=' client_method_types ';' ;
484	>	serverinfo_ssl_server_method: T_SSL_SERVER_METHOD '=' server_method_types ';' ;
485	>
486	>	client_method_types: client_method_types ',' client_method_type_item | client_method_type_item;
487	>	client_method_type_item: T_SSLV3
488		{
489		#ifdef HAVE_LIBCRYPTO
490	<	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
491	<	ServerInfo.tls_version = 0;
490	>	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
491	>	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv3);
492		#endif
493	<	} '=' method_types ';'
493	>	} | T_TLSV1
494		{
495		#ifdef HAVE_LIBCRYPTO
496	<	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
497	<	{
505	<	if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_SSLV3))
506	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
507	<	if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_TLSV1))
508	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
509	<	}
496	>	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
497	>	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_TLSv1);
498		#endif
499		};
500
501	<	method_types: method_types ',' method_type_item | method_type_item;
502	<	method_type_item: T_SSLV3
501	>	server_method_types: server_method_types ',' server_method_type_item | server_method_type_item;
502	>	server_method_type_item: T_SSLV3
503		{
504		#ifdef HAVE_LIBCRYPTO
505	<	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
506	<	ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_SSLV3;
505	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
506	>	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
507		#endif
508		} | T_TLSV1
509		{
510		#ifdef HAVE_LIBCRYPTO
511	<	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
512	<	ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_TLSV1;
511	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
512	>	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
513		#endif
514		};
515
516		serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
517		{
518		#ifdef HAVE_LIBCRYPTO
519	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
519	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
520		{
521		if (!ServerInfo.rsa_private_key_file)
522		{
523	<	yyerror("No rsa_private_key_file specified, SSL disabled");
523	>	conf_error_report("No rsa_private_key_file specified, SSL disabled");
524		break;
525		}
526
527		if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
528	+	SSL_FILETYPE_PEM) <= 0 ||
529	+	SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
530		SSL_FILETYPE_PEM) <= 0)
531		{
532	<	yyerror(ERR_lib_error_string(ERR_get_error()));
532	>	report_crypto_errors();
533	>	conf_error_report("Could not open/read certificate file");
534		break;
535		}
536
537		if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
538	+	SSL_FILETYPE_PEM) <= 0 ||
539	+	SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
540		SSL_FILETYPE_PEM) <= 0)
541		{
542	<	yyerror(ERR_lib_error_string(ERR_get_error()));
542	>	report_crypto_errors();
543	>	conf_error_report("Could not read RSA private key");
544		break;
545		}
546
547	<	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx))
547	>	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
548	>	!SSL_CTX_check_private_key(ServerInfo.client_ctx))
549		{
550	<	yyerror(ERR_lib_error_string(ERR_get_error()));
550	>	report_crypto_errors();
551	>	conf_error_report("Could not read RSA private key");
552		break;
553		}
554		}
#	Line 562 | Line 558 | serverinfo_ssl_certificate_file: SSL_CER
558		serverinfo_rsa_private_key_file: RSA_PRIVATE_KEY_FILE '=' QSTRING ';'
559		{
560		#ifdef HAVE_LIBCRYPTO
561	<	if (conf_parser_ctx.pass == 1)
561	>	BIO *file = NULL;
562	>
563	>	if (conf_parser_ctx.pass != 1)
564	>	break;
565	>
566	>	if (ServerInfo.rsa_private_key)
567		{
568	<	BIO *file;
568	>	RSA_free(ServerInfo.rsa_private_key);
569	>	ServerInfo.rsa_private_key = NULL;
570	>	}
571
572	<	if (ServerInfo.rsa_private_key)
573	<	{
574	<	RSA_free(ServerInfo.rsa_private_key);
575	<	ServerInfo.rsa_private_key = NULL;
576	<	}
572	>	if (ServerInfo.rsa_private_key_file)
573	>	{
574	>	MyFree(ServerInfo.rsa_private_key_file);
575	>	ServerInfo.rsa_private_key_file = NULL;
576	>	}
577
578	<	if (ServerInfo.rsa_private_key_file)
576	<	{
577	<	MyFree(ServerInfo.rsa_private_key_file);
578	<	ServerInfo.rsa_private_key_file = NULL;
579	<	}
578	>	ServerInfo.rsa_private_key_file = xstrdup(yylval.string);
579
580	<	DupString(ServerInfo.rsa_private_key_file, yylval.string);
580	>	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
581	>	{
582	>	conf_error_report("File open failed, ignoring");
583	>	break;
584	>	}
585
586	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
584	<	{
585	<	yyerror("File open failed, ignoring");
586	<	break;
587	<	}
586	>	ServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
587
588	<	ServerInfo.rsa_private_key = (RSA *)PEM_read_bio_RSAPrivateKey(file, NULL,
589	<	0, NULL);
588	>	BIO_set_close(file, BIO_CLOSE);
589	>	BIO_free(file);
590
591	<	BIO_set_close(file, BIO_CLOSE);
592	<	BIO_free(file);
591	>	if (ServerInfo.rsa_private_key == NULL)
592	>	{
593	>	conf_error_report("Couldn't extract key, ignoring");
594	>	break;
595	>	}
596
597	<	if (ServerInfo.rsa_private_key == NULL)
598	<	{
599	<	yyerror("Couldn't extract key, ignoring");
600	<	break;
599	<	}
597	>	if (!RSA_check_key(ServerInfo.rsa_private_key))
598	>	{
599	>	RSA_free(ServerInfo.rsa_private_key);
600	>	ServerInfo.rsa_private_key = NULL;
601
602	<	if (!RSA_check_key(ServerInfo.rsa_private_key))
603	<	{
604	<	RSA_free(ServerInfo.rsa_private_key);
604	<	ServerInfo.rsa_private_key = NULL;
602	>	conf_error_report("Invalid key, ignoring");
603	>	break;
604	>	}
605
606	<	yyerror("Invalid key, ignoring");
607	<	break;
608	<	}
606	>	if (RSA_size(ServerInfo.rsa_private_key) < 128)
607	>	{
608	>	RSA_free(ServerInfo.rsa_private_key);
609	>	ServerInfo.rsa_private_key = NULL;
610	>
611	>	conf_error_report("Ignoring serverinfo::rsa_private_key_file -- need at least a 1024 bit key size");
612	>	}
613	>	#endif
614	>	};
615	>
616	>	serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
617	>	{
618	>	/* TBD - XXX: error reporting */
619	>	#ifdef HAVE_LIBCRYPTO
620	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
621	>	{
622	>	BIO *file = BIO_new_file(yylval.string, "r");
623
624	<	/* require 2048 bit (256 byte) key */
611	<	if (RSA_size(ServerInfo.rsa_private_key) != 256)
624	>	if (file)
625		{
626	<	RSA_free(ServerInfo.rsa_private_key);
627	<	ServerInfo.rsa_private_key = NULL;
626	>	DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
627	>
628	>	BIO_free(file);
629
630	<	yyerror("Not a 2048 bit key, ignoring");
630	>	if (dh)
631	>	{
632	>	if (DH_size(dh) < 128)
633	>	conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
634	>	else
635	>	SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
636	>
637	>	DH_free(dh);
638	>	}
639		}
640		}
641		#endif
642		};
643
644	<	serverinfo_name: NAME '=' QSTRING ';'
644	>	serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
645	>	{
646	>	#ifdef HAVE_LIBCRYPTO
647	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
648	>	SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
649	>	#endif
650	>	};
651	>
652	>	serverinfo_name: NAME '=' QSTRING ';'
653		{
654		/* this isn't rehashable */
655		if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
656		{
657		if (valid_servname(yylval.string))
658	<	DupString(ServerInfo.name, yylval.string);
658	>	ServerInfo.name = xstrdup(yylval.string);
659		else
660		{
661	<	ilog(L_ERROR, "Ignoring serverinfo::name -- invalid name. Aborting.");
661	>	conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
662		exit(0);
663		}
664		}
665		};
666
667	<	serverinfo_sid: IRCD_SID '=' QSTRING ';'
667	>	serverinfo_sid: IRCD_SID '=' QSTRING ';'
668		{
669		/* this isn't rehashable */
670		if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
671		{
672		if (valid_sid(yylval.string))
673	<	DupString(ServerInfo.sid, yylval.string);
673	>	ServerInfo.sid = xstrdup(yylval.string);
674		else
675		{
676	<	ilog(L_ERROR, "Ignoring serverinfo::sid -- invalid SID. Aborting.");
676	>	conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
677		exit(0);
678		}
679		}
#	Line 654 | Line 684 | serverinfo_description: DESCRIPTION '='
684		if (conf_parser_ctx.pass == 2)
685		{
686		MyFree(ServerInfo.description);
687	<	DupString(ServerInfo.description,yylval.string);
687	>	ServerInfo.description = xstrdup(yylval.string);
688		}
689		};
690
#	Line 668 | Line 698 | serverinfo_network_name: NETWORK_NAME '=
698		p = '\0';
699
700		MyFree(ServerInfo.network_name);
701	<	DupString(ServerInfo.network_name, yylval.string);
701	>	ServerInfo.network_name = xstrdup(yylval.string);
702		}
703		};
704
705		serverinfo_network_desc: NETWORK_DESC '=' QSTRING ';'
706		{
707	<	if (conf_parser_ctx.pass == 2)
708	<	{
709	<	MyFree(ServerInfo.network_desc);
710	<	DupString(ServerInfo.network_desc, yylval.string);
711	<	}
707	>	if (conf_parser_ctx.pass != 2)
708	>	break;
709	>
710	>	MyFree(ServerInfo.network_desc);
711	>	ServerInfo.network_desc = xstrdup(yylval.string);
712		};
713
714		serverinfo_vhost: VHOST '=' QSTRING ';'
#	Line 694 | Line 724 | serverinfo_vhost: VHOST '=' QSTRING ';'
724		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
725
726		if (getaddrinfo(yylval.string, NULL, &hints, &res))
727	<	ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
727	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
728		else
729		{
730		assert(res != NULL);
#	Line 723 | Line 753 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
753		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
754
755		if (getaddrinfo(yylval.string, NULL, &hints, &res))
756	<	ilog(L_ERROR, "Invalid netmask for server vhost6(%s)", yylval.string);
756	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
757		else
758		{
759		assert(res != NULL);
#	Line 741 | Line 771 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
771
772		serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
773		{
774	<	if (conf_parser_ctx.pass == 2)
774	>	if (conf_parser_ctx.pass != 2)
775	>	break;
776	>
777	>	if ($3 < MAXCLIENTS_MIN)
778		{
779	<	recalc_fdlimit(NULL);
779	>	char buf[IRCD_BUFSIZE];
780
781	<	if ($3 < MAXCLIENTS_MIN)
782	<	{
783	<	char buf[IRCD_BUFSIZE];
784	<	ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
785	<	yyerror(buf);
786	<	}
787	<	else if ($3 > MAXCLIENTS_MAX)
788	<	{
789	<	char buf[IRCD_BUFSIZE];
790	<	ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
791	<	yyerror(buf);
792	<	}
793	<	else
794	<	ServerInfo.max_clients = $3;
781	>	snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
782	>	conf_error_report(buf);
783	>	ServerInfo.max_clients = MAXCLIENTS_MIN;
784	>	}
785	>	else if ($3 > MAXCLIENTS_MAX)
786	>	{
787	>	char buf[IRCD_BUFSIZE];
788	>
789	>	snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
790	>	conf_error_report(buf);
791	>	ServerInfo.max_clients = MAXCLIENTS_MAX;
792	>	}
793	>	else
794	>	ServerInfo.max_clients = $3;
795	>	};
796	>
797	>	serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
798	>	{
799	>	if (conf_parser_ctx.pass != 2)
800	>	break;
801	>
802	>	if ($3 < 9)
803	>	{
804	>	conf_error_report("max_nick_length too low, setting to 9");
805	>	ServerInfo.max_nick_length = 9;
806	>	}
807	>	else if ($3 > NICKLEN)
808	>	{
809	>	char buf[IRCD_BUFSIZE];
810	>
811	>	snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
812	>	conf_error_report(buf);
813	>	ServerInfo.max_nick_length = NICKLEN;
814	>	}
815	>	else
816	>	ServerInfo.max_nick_length = $3;
817	>	};
818	>
819	>	serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
820	>	{
821	>	if (conf_parser_ctx.pass != 2)
822	>	break;
823	>
824	>	if ($3 < 80)
825	>	{
826	>	conf_error_report("max_topic_length too low, setting to 80");
827	>	ServerInfo.max_topic_length = 80;
828	>	}
829	>	else if ($3 > TOPICLEN)
830	>	{
831	>	char buf[IRCD_BUFSIZE];
832	>
833	>	snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
834	>	conf_error_report(buf);
835	>	ServerInfo.max_topic_length = TOPICLEN;
836		}
837	+	else
838	+	ServerInfo.max_topic_length = $3;
839		};
840
841	<	serverinfo_hub: HUB '=' TBOOL ';'
841	>	serverinfo_hub: HUB '=' TBOOL ';'
842		{
843		if (conf_parser_ctx.pass == 2)
844		ServerInfo.hub = yylval.number;
#	Line 777 | Line 853 | admin_items: admin_items admin_item | ad
853		admin_item:  admin_name | admin_description |
854		admin_email | error ';' ;
855
856	<	admin_name: NAME '=' QSTRING ';'
856	>	admin_name: NAME '=' QSTRING ';'
857		{
858	<	if (conf_parser_ctx.pass == 2)
859	<	{
860	<	MyFree(AdminInfo.name);
861	<	DupString(AdminInfo.name, yylval.string);
862	<	}
858	>	if (conf_parser_ctx.pass != 2)
859	>	break;
860	>
861	>	MyFree(AdminInfo.name);
862	>	AdminInfo.name = xstrdup(yylval.string);
863		};
864
865		admin_email: EMAIL '=' QSTRING ';'
866		{
867	<	if (conf_parser_ctx.pass == 2)
868	<	{
869	<	MyFree(AdminInfo.email);
870	<	DupString(AdminInfo.email, yylval.string);
871	<	}
867	>	if (conf_parser_ctx.pass != 2)
868	>	break;
869	>
870	>	MyFree(AdminInfo.email);
871	>	AdminInfo.email = xstrdup(yylval.string);
872		};
873
874		admin_description: DESCRIPTION '=' QSTRING ';'
875		{
876	<	if (conf_parser_ctx.pass == 2)
877	<	{
878	<	MyFree(AdminInfo.description);
879	<	DupString(AdminInfo.description, yylval.string);
880	<	}
876	>	if (conf_parser_ctx.pass != 2)
877	>	break;
878	>
879	>	MyFree(AdminInfo.description);
880	>	AdminInfo.description = xstrdup(yylval.string);
881		};
882
883		/***************************************************************************
884	<	*  section logging
884	>	* motd section
885		***************************************************************************/
886	<	/* XXX */
887	<	logging_entry:          LOGGING  '{' logging_items '}' ';' ;
886	>	motd_entry: MOTD
887	>	{
888	>	if (conf_parser_ctx.pass == 2)
889	>	reset_block_state();
890	>	} '{' motd_items '}' ';'
891	>	{
892	>	dlink_node *ptr = NULL;
893
894	<	logging_items:          logging_items logging_item |
895	<	logging_item ;
894	>	if (conf_parser_ctx.pass != 2)
895	>	break;
896
897	<	logging_item:           logging_path | logging_oper_log |
898	<	logging_log_level |
818	<	logging_use_logging | logging_fuserlog |
819	<	logging_foperlog | logging_fglinelog |
820	<	logging_fklinelog | logging_killlog |
821	<	logging_foperspylog | logging_ioerrlog |
822	<	logging_ffailed_operlog |
823	<	error ';' ;
897	>	if (!block_state.file.buf[0])
898	>	break;
899
900	<	logging_path:           T_LOGPATH '=' QSTRING ';'
901	<	{
902	<	};
900	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
901	>	motd_add(ptr->data, block_state.file.buf);
902	>	};
903
904	<	logging_oper_log:       OPER_LOG '=' QSTRING ';'
905	<	{
831	<	};
904	>	motd_items: motd_items motd_item | motd_item;
905	>	motd_item:  motd_mask | motd_file | error ';' ;
906
907	<	logging_fuserlog: FUSERLOG '=' QSTRING ';'
907	>	motd_mask: MASK '=' QSTRING ';'
908		{
909		if (conf_parser_ctx.pass == 2)
910	<	strlcpy(ConfigLoggingEntry.userlog, yylval.string,
837	<	sizeof(ConfigLoggingEntry.userlog));
910	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
911		};
912
913	<	logging_ffailed_operlog: FFAILED_OPERLOG '=' QSTRING ';'
913	>	motd_file: T_FILE '=' QSTRING ';'
914		{
915		if (conf_parser_ctx.pass == 2)
916	<	strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
844	<	sizeof(ConfigLoggingEntry.failed_operlog));
916	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
917		};
918
919	<	logging_foperlog: FOPERLOG '=' QSTRING ';'
919	>	/***************************************************************************
920	>	*  section logging
921	>	***************************************************************************/
922	>	logging_entry:          T_LOG  '{' logging_items '}' ';' ;
923	>	logging_items:          logging_items logging_item | logging_item ;
924	>
925	>	logging_item:           logging_use_logging | logging_file_entry |
926	>	error ';' ;
927	>
928	>	logging_use_logging: USE_LOGGING '=' TBOOL ';'
929		{
930		if (conf_parser_ctx.pass == 2)
931	<	strlcpy(ConfigLoggingEntry.operlog, yylval.string,
851	<	sizeof(ConfigLoggingEntry.operlog));
931	>	ConfigLoggingEntry.use_logging = yylval.number;
932		};
933
934	<	logging_foperspylog: FOPERSPYLOG '=' QSTRING ';'
934	>	logging_file_entry:
935		{
936		if (conf_parser_ctx.pass == 2)
937	<	strlcpy(ConfigLoggingEntry.operspylog, yylval.string,
938	<	sizeof(ConfigLoggingEntry.operspylog));
937	>	reset_block_state();
938	>	} T_FILE  '{' logging_file_items '}' ';'
939	>	{
940	>	if (conf_parser_ctx.pass != 2)
941	>	break;
942	>
943	>	if (block_state.type.value && block_state.file.buf[0])
944	>	log_set_file(block_state.type.value, block_state.size.value,
945	>	block_state.file.buf);
946		};
947
948	<	logging_fglinelog: FGLINELOG '=' QSTRING ';'
948	>	logging_file_items: logging_file_items logging_file_item |
949	>	logging_file_item ;
950	>
951	>	logging_file_item:  logging_file_name | logging_file_type |
952	>	logging_file_size | error ';' ;
953	>
954	>	logging_file_name: NAME '=' QSTRING ';'
955		{
956	<	if (conf_parser_ctx.pass == 2)
957	<	strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
865	<	sizeof(ConfigLoggingEntry.glinelog));
866	<	};
956	>	if (conf_parser_ctx.pass != 2)
957	>	break;
958
959	<	logging_fklinelog: FKLINELOG '=' QSTRING ';'
959	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
960	>	}
961	>
962	>	logging_file_size: T_SIZE '=' sizespec ';'
963		{
964	<	if (conf_parser_ctx.pass == 2)
965	<	strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
966	<	sizeof(ConfigLoggingEntry.klinelog));
964	>	block_state.size.value = $3;
965	>	} | T_SIZE '=' T_UNLIMITED ';'
966	>	{
967	>	block_state.size.value = 0;
968		};
969
970	<	logging_ioerrlog: FIOERRLOG '=' QSTRING ';'
970	>	logging_file_type: TYPE
971		{
972		if (conf_parser_ctx.pass == 2)
973	<	strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
974	<	sizeof(ConfigLoggingEntry.ioerrlog));
880	<	};
973	>	block_state.type.value = 0;
974	>	} '='  logging_file_type_items ';' ;
975
976	<	logging_killlog: FKILLLOG '=' QSTRING ';'
976	>	logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
977	>	logging_file_type_item:  USER
978		{
979		if (conf_parser_ctx.pass == 2)
980	<	strlcpy(ConfigLoggingEntry.killlog, yylval.string,
981	<	sizeof(ConfigLoggingEntry.killlog));
982	<	};
888	<
889	<	logging_log_level: LOG_LEVEL '=' T_L_CRIT ';'
890	<	{
980	>	block_state.type.value = LOG_TYPE_USER;
981	>	} | OPERATOR
982	>	{
983		if (conf_parser_ctx.pass == 2)
984	<	set_log_level(L_CRIT);
985	<	} | LOG_LEVEL '=' T_L_ERROR ';'
984	>	block_state.type.value = LOG_TYPE_OPER;
985	>	} | GLINE
986		{
987		if (conf_parser_ctx.pass == 2)
988	<	set_log_level(L_ERROR);
989	<	} | LOG_LEVEL '=' T_L_WARN ';'
988	>	block_state.type.value = LOG_TYPE_GLINE;
989	>	} | XLINE
990		{
991		if (conf_parser_ctx.pass == 2)
992	<	set_log_level(L_WARN);
993	<	} | LOG_LEVEL '=' T_L_NOTICE ';'
992	>	block_state.type.value = LOG_TYPE_XLINE;
993	>	} | RESV
994		{
995		if (conf_parser_ctx.pass == 2)
996	<	set_log_level(L_NOTICE);
997	<	} | LOG_LEVEL '=' T_L_TRACE ';'
996	>	block_state.type.value = LOG_TYPE_RESV;
997	>	} | T_DLINE
998		{
999		if (conf_parser_ctx.pass == 2)
1000	<	set_log_level(L_TRACE);
1001	<	} | LOG_LEVEL '=' T_L_INFO ';'
1000	>	block_state.type.value = LOG_TYPE_DLINE;
1001	>	} | KLINE
1002		{
1003		if (conf_parser_ctx.pass == 2)
1004	<	set_log_level(L_INFO);
1005	<	} | LOG_LEVEL '=' T_L_DEBUG ';'
1004	>	block_state.type.value = LOG_TYPE_KLINE;
1005	>	} | KILL
1006		{
1007		if (conf_parser_ctx.pass == 2)
1008	<	set_log_level(L_DEBUG);
1009	<	};
918	<
919	<	logging_use_logging: USE_LOGGING '=' TBOOL ';'
1008	>	block_state.type.value = LOG_TYPE_KILL;
1009	>	} | T_DEBUG
1010		{
1011		if (conf_parser_ctx.pass == 2)
1012	<	ConfigLoggingEntry.use_logging = yylval.number;
1012	>	block_state.type.value = LOG_TYPE_DEBUG;
1013		};
1014
1015	+
1016		/***************************************************************************
1017		* section oper
1018		***************************************************************************/
1019	<	oper_entry: OPERATOR
1019	>	oper_entry: OPERATOR
1020		{
1021	<	if (conf_parser_ctx.pass == 2)
1022	<	{
1023	<	yy_conf = make_conf_item(OPER_TYPE);
1024	<	yy_aconf = map_to_conf(yy_conf);
1025	<	SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
1026	<	}
936	<	else
937	<	{
938	<	MyFree(class_name);
939	<	class_name = NULL;
940	<	}
941	<	} oper_name_b '{' oper_items '}' ';'
1021	>	if (conf_parser_ctx.pass != 2)
1022	>	break;
1023	>
1024	>	reset_block_state();
1025	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1026	>	} '{' oper_items '}' ';'
1027		{
1028	<	if (conf_parser_ctx.pass == 2)
944	<	{
945	<	struct CollectItem *yy_tmp;
946	<	dlink_node *ptr;
947	<	dlink_node *next_ptr;
1028	>	dlink_node *ptr = NULL;
1029
1030	<	conf_add_class_to_conf(yy_conf, class_name);
1030	>	if (conf_parser_ctx.pass != 2)
1031	>	break;
1032
1033	<	/* Now, make sure there is a copy of the "base" given oper
1034	<	* block in each of the collected copies
1035	<	*/
1033	>	if (!block_state.name.buf[0])
1034	>	break;
1035	>	#ifdef HAVE_LIBCRYPTO
1036	>	if (!block_state.file.buf[0] &&
1037	>	!block_state.rpass.buf[0])
1038	>	break;
1039	>	#else
1040	>	if (!block_state.rpass.buf[0])
1041	>	break;
1042	>	#endif
1043
1044	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
1045	<	{
1046	<	struct AccessItem *new_aconf;
1047	<	struct ConfItem *new_conf;
959	<	yy_tmp = ptr->data;
960	<
961	<	new_conf = make_conf_item(OPER_TYPE);
962	<	new_aconf = (struct AccessItem *)map_to_conf(new_conf);
963	<
964	<	new_aconf->flags = yy_aconf->flags;
965	<
966	<	if (yy_conf->name != NULL)
967	<	DupString(new_conf->name, yy_conf->name);
968	<	if (yy_tmp->user != NULL)
969	<	DupString(new_aconf->user, yy_tmp->user);
970	<	else
971	<	DupString(new_aconf->user, "*");
972	<	if (yy_tmp->host != NULL)
973	<	DupString(new_aconf->host, yy_tmp->host);
974	<	else
975	<	DupString(new_aconf->host, "*");
976	<	conf_add_class_to_conf(new_conf, class_name);
977	<	if (yy_aconf->passwd != NULL)
978	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1044	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
1045	>	{
1046	>	struct MaskItem *conf = NULL;
1047	>	struct split_nuh_item nuh;
1048
1049	<	new_aconf->port = yy_aconf->port;
1050	<	#ifdef HAVE_LIBCRYPTO
1051	<	if (yy_aconf->rsa_public_key_file != NULL)
1052	<	{
1053	<	BIO *file;
1049	>	nuh.nuhmask  = ptr->data;
1050	>	nuh.nickptr  = NULL;
1051	>	nuh.userptr  = block_state.user.buf;
1052	>	nuh.hostptr  = block_state.host.buf;
1053	>	nuh.nicksize = 0;
1054	>	nuh.usersize = sizeof(block_state.user.buf);
1055	>	nuh.hostsize = sizeof(block_state.host.buf);
1056	>	split_nuh(&nuh);
1057
1058	<	DupString(new_aconf->rsa_public_key_file,
1059	<	yy_aconf->rsa_public_key_file);
1058	>	conf         = conf_make(CONF_OPER);
1059	>	conf->name   = xstrdup(block_state.name.buf);
1060	>	conf->user   = xstrdup(block_state.user.buf);
1061	>	conf->host   = xstrdup(block_state.host.buf);
1062	>
1063	>	if (block_state.cert.buf[0])
1064	>	conf->certfp = xstrdup(block_state.cert.buf);
1065	>
1066	>	if (block_state.rpass.buf[0])
1067	>	conf->passwd = xstrdup(block_state.rpass.buf);
1068	>
1069	>	conf->flags = block_state.flags.value;
1070	>	conf->modes = block_state.modes.value;
1071	>	conf->port  = block_state.port.value;
1072	>	conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
1073
1074	<	file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
990	<	new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
991	<	NULL, 0, NULL);
992	<	BIO_set_close(file, BIO_CLOSE);
993	<	BIO_free(file);
994	<	}
995	<	#endif
1074	>	conf_add_class_to_conf(conf, block_state.class.buf);
1075
1076		#ifdef HAVE_LIBCRYPTO
1077	<	if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
1078	<	&& yy_tmp->host)
1079	<	#else
1080	<	if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
1081	<	#endif
1077	>	if (block_state.file.buf[0])
1078	>	{
1079	>	BIO *file = NULL;
1080	>	RSA *pkey = NULL;
1081	>
1082	>	if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
1083		{
1084	<	conf_add_class_to_conf(new_conf, class_name);
1085	<	if (yy_tmp->name != NULL)
1006	<	DupString(new_conf->name, yy_tmp->name);
1084	>	conf_error_report("Ignoring rsa_public_key_file -- file doesn't exist");
1085	>	break;
1086		}
1087
1088	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1089	<	free_collect_item(yy_tmp);
1011	<	}
1088	>	if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
1089	>	conf_error_report("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1090
1091	<	yy_conf = NULL;
1092	<	yy_aconf = NULL;
1093	<
1094	<
1095	<	MyFree(class_name);
1018	<	class_name = NULL;
1091	>	conf->rsa_public_key = pkey;
1092	>	BIO_set_close(file, BIO_CLOSE);
1093	>	BIO_free(file);
1094	>	}
1095	>	#endif /* HAVE_LIBCRYPTO */
1096		}
1097	<	};
1097	>	};
1098
1022	–	oper_name_b: | oper_name_t;
1099		oper_items:     oper_items oper_item | oper_item;
1100		oper_item:      oper_name | oper_user | oper_password |
1101		oper_umodes | oper_class | oper_encrypted |
1102	<	oper_rsa_public_key_file | oper_flags | error ';' ;
1102	>	oper_rsa_public_key_file | oper_ssl_certificate_fingerprint |
1103	>	oper_ssl_connection_required |
1104	>	oper_flags | error ';' ;
1105
1106		oper_name: NAME '=' QSTRING ';'
1107		{
1108		if (conf_parser_ctx.pass == 2)
1109	<	{
1032	<	if (strlen(yylval.string) > OPERNICKLEN)
1033	<	yylval.string[OPERNICKLEN] = '\0';
1034	<
1035	<	MyFree(yy_conf->name);
1036	<	DupString(yy_conf->name, yylval.string);
1037	<	}
1038	<	};
1039	<
1040	<	oper_name_t: QSTRING
1041	<	{
1042	<	if (conf_parser_ctx.pass == 2)
1043	<	{
1044	<	if (strlen(yylval.string) > OPERNICKLEN)
1045	<	yylval.string[OPERNICKLEN] = '\0';
1046	<
1047	<	MyFree(yy_conf->name);
1048	<	DupString(yy_conf->name, yylval.string);
1049	<	}
1109	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1110		};
1111
1112		oper_user: USER '=' QSTRING ';'
1113		{
1114		if (conf_parser_ctx.pass == 2)
1115	<	{
1056	<	struct split_nuh_item nuh;
1057	<
1058	<	nuh.nuhmask  = yylval.string;
1059	<	nuh.nickptr  = NULL;
1060	<	nuh.userptr  = userbuf;
1061	<	nuh.hostptr  = hostbuf;
1062	<
1063	<	nuh.nicksize = 0;
1064	<	nuh.usersize = sizeof(userbuf);
1065	<	nuh.hostsize = sizeof(hostbuf);
1066	<
1067	<	split_nuh(&nuh);
1068	<
1069	<	if (yy_aconf->user == NULL)
1070	<	{
1071	<	DupString(yy_aconf->user, userbuf);
1072	<	DupString(yy_aconf->host, hostbuf);
1073	<	}
1074	<	else
1075	<	{
1076	<	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
1077	<
1078	<	DupString(yy_tmp->user, userbuf);
1079	<	DupString(yy_tmp->host, hostbuf);
1080	<
1081	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1082	<	}
1083	<	}
1115	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1116		};
1117
1118		oper_password: PASSWORD '=' QSTRING ';'
1119		{
1120		if (conf_parser_ctx.pass == 2)
1121	<	{
1090	<	if (yy_aconf->passwd != NULL)
1091	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1092	<
1093	<	MyFree(yy_aconf->passwd);
1094	<	DupString(yy_aconf->passwd, yylval.string);
1095	<	}
1121	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1122		};
1123
1124		oper_encrypted: ENCRYPTED '=' TBOOL ';'
1125		{
1126	<	if (conf_parser_ctx.pass == 2)
1127	<	{
1128	<	if (yylval.number)
1129	<	SetConfEncrypted(yy_aconf);
1130	<	else
1131	<	ClearConfEncrypted(yy_aconf);
1132	<	}
1126	>	if (conf_parser_ctx.pass != 2)
1127	>	break;
1128	>
1129	>	if (yylval.number)
1130	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1131	>	else
1132	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1133		};
1134
1135		oper_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
1136		{
1111	–	#ifdef HAVE_LIBCRYPTO
1137		if (conf_parser_ctx.pass == 2)
1138	<	{
1139	<	BIO *file;
1115	<
1116	<	if (yy_aconf->rsa_public_key != NULL)
1117	<	{
1118	<	RSA_free(yy_aconf->rsa_public_key);
1119	<	yy_aconf->rsa_public_key = NULL;
1120	<	}
1121	<
1122	<	if (yy_aconf->rsa_public_key_file != NULL)
1123	<	{
1124	<	MyFree(yy_aconf->rsa_public_key_file);
1125	<	yy_aconf->rsa_public_key_file = NULL;
1126	<	}
1127	<
1128	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
1129	<	file = BIO_new_file(yylval.string, "r");
1130	<
1131	<	if (file == NULL)
1132	<	{
1133	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
1134	<	break;
1135	<	}
1138	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
1139	>	};
1140
1141	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
1141	>	oper_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
1142	>	{
1143	>	if (conf_parser_ctx.pass == 2)
1144	>	strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
1145	>	};
1146
1147	<	if (yy_aconf->rsa_public_key == NULL)
1148	<	{
1149	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1150	<	break;
1143	<	}
1147	>	oper_ssl_connection_required: SSL_CONNECTION_REQUIRED '=' TBOOL ';'
1148	>	{
1149	>	if (conf_parser_ctx.pass != 2)
1150	>	break;
1151
1152	<	BIO_set_close(file, BIO_CLOSE);
1153	<	BIO_free(file);
1154	<	}
1155	<	#endif /* HAVE_LIBCRYPTO */
1152	>	if (yylval.number)
1153	>	block_state.flags.value |= CONF_FLAGS_SSL;
1154	>	else
1155	>	block_state.flags.value &= ~CONF_FLAGS_SSL;
1156		};
1157
1158		oper_class: CLASS '=' QSTRING ';'
1159		{
1160		if (conf_parser_ctx.pass == 2)
1161	<	{
1155	<	MyFree(class_name);
1156	<	DupString(class_name, yylval.string);
1157	<	}
1161	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1162		};
1163
1164		oper_umodes: T_UMODES
1165		{
1166		if (conf_parser_ctx.pass == 2)
1167	<	yy_aconf->modes = 0;
1167	>	block_state.modes.value = 0;
1168		} '='  oper_umodes_items ';' ;
1169
1170		oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1171		oper_umodes_item:  T_BOTS
1172		{
1173		if (conf_parser_ctx.pass == 2)
1174	<	yy_aconf->modes |= UMODE_BOTS;
1174	>	block_state.modes.value |= UMODE_BOTS;
1175		} | T_CCONN
1176		{
1177		if (conf_parser_ctx.pass == 2)
1178	<	yy_aconf->modes |= UMODE_CCONN;
1175	<	} | T_CCONN_FULL
1176	<	{
1177	<	if (conf_parser_ctx.pass == 2)
1178	<	yy_aconf->modes |= UMODE_CCONN_FULL;
1178	>	block_state.modes.value |= UMODE_CCONN;
1179		} | T_DEAF
1180		{
1181		if (conf_parser_ctx.pass == 2)
1182	<	yy_aconf->modes |= UMODE_DEAF;
1182	>	block_state.modes.value |= UMODE_DEAF;
1183		} | T_DEBUG
1184		{
1185		if (conf_parser_ctx.pass == 2)
1186	<	yy_aconf->modes |= UMODE_DEBUG;
1186	>	block_state.modes.value |= UMODE_DEBUG;
1187		} | T_FULL
1188		{
1189		if (conf_parser_ctx.pass == 2)
1190	<	yy_aconf->modes |= UMODE_FULL;
1190	>	block_state.modes.value |= UMODE_FULL;
1191	>	} | HIDDEN
1192	>	{
1193	>	if (conf_parser_ctx.pass == 2)
1194	>	block_state.modes.value |= UMODE_HIDDEN;
1195		} | T_SKILL
1196		{
1197		if (conf_parser_ctx.pass == 2)
1198	<	yy_aconf->modes |= UMODE_SKILL;
1198	>	block_state.modes.value |= UMODE_SKILL;
1199		} | T_NCHANGE
1200		{
1201		if (conf_parser_ctx.pass == 2)
1202	<	yy_aconf->modes |= UMODE_NCHANGE;
1202	>	block_state.modes.value |= UMODE_NCHANGE;
1203		} | T_REJ
1204		{
1205		if (conf_parser_ctx.pass == 2)
1206	<	yy_aconf->modes |= UMODE_REJ;
1206	>	block_state.modes.value |= UMODE_REJ;
1207		} | T_UNAUTH
1208		{
1209		if (conf_parser_ctx.pass == 2)
1210	<	yy_aconf->modes |= UMODE_UNAUTH;
1210	>	block_state.modes.value |= UMODE_UNAUTH;
1211		} | T_SPY
1212		{
1213		if (conf_parser_ctx.pass == 2)
1214	<	yy_aconf->modes |= UMODE_SPY;
1214	>	block_state.modes.value |= UMODE_SPY;
1215		} | T_EXTERNAL
1216		{
1217		if (conf_parser_ctx.pass == 2)
1218	<	yy_aconf->modes |= UMODE_EXTERNAL;
1218	>	block_state.modes.value |= UMODE_EXTERNAL;
1219		} | T_OPERWALL
1220		{
1221		if (conf_parser_ctx.pass == 2)
1222	<	yy_aconf->modes |= UMODE_OPERWALL;
1222	>	block_state.modes.value |= UMODE_OPERWALL;
1223		} | T_SERVNOTICE
1224		{
1225		if (conf_parser_ctx.pass == 2)
1226	<	yy_aconf->modes |= UMODE_SERVNOTICE;
1226	>	block_state.modes.value |= UMODE_SERVNOTICE;
1227		} | T_INVISIBLE
1228		{
1229		if (conf_parser_ctx.pass == 2)
1230	<	yy_aconf->modes |= UMODE_INVISIBLE;
1230	>	block_state.modes.value |= UMODE_INVISIBLE;
1231		} | T_WALLOP
1232		{
1233		if (conf_parser_ctx.pass == 2)
1234	<	yy_aconf->modes |= UMODE_WALLOP;
1234	>	block_state.modes.value |= UMODE_WALLOP;
1235		} | T_SOFTCALLERID
1236		{
1237		if (conf_parser_ctx.pass == 2)
1238	<	yy_aconf->modes |= UMODE_SOFTCALLERID;
1238	>	block_state.modes.value |= UMODE_SOFTCALLERID;
1239		} | T_CALLERID
1240		{
1241		if (conf_parser_ctx.pass == 2)
1242	<	yy_aconf->modes |= UMODE_CALLERID;
1242	>	block_state.modes.value |= UMODE_CALLERID;
1243		} | T_LOCOPS
1244		{
1245		if (conf_parser_ctx.pass == 2)
1246	<	yy_aconf->modes |= UMODE_LOCOPS;
1246	>	block_state.modes.value |= UMODE_LOCOPS;
1247	>	} | T_NONONREG
1248	>	{
1249	>	if (conf_parser_ctx.pass == 2)
1250	>	block_state.modes.value |= UMODE_REGONLY;
1251	>	} | T_FARCONNECT
1252	>	{
1253	>	if (conf_parser_ctx.pass == 2)
1254	>	block_state.modes.value |= UMODE_FARCONNECT;
1255		};
1256
1257		oper_flags: IRCD_FLAGS
1258		{
1259	+	if (conf_parser_ctx.pass == 2)
1260	+	block_state.port.value = 0;
1261		} '='  oper_flags_items ';';
1262
1263		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1264	<	oper_flags_item: NOT { not_atom = 1; } oper_flags_item_atom
1251	<	| { not_atom = 0; } oper_flags_item_atom;
1252	<
1253	<	oper_flags_item_atom: GLOBAL_KILL
1264	>	oper_flags_item: KILL ':' REMOTE
1265		{
1266		if (conf_parser_ctx.pass == 2)
1267	<	{
1268	<	if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1258	<	else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1259	<	}
1260	<	} | REMOTE
1267	>	block_state.port.value |= OPER_FLAG_KILL_REMOTE;
1268	>	} | KILL
1269		{
1270		if (conf_parser_ctx.pass == 2)
1271	<	{
1272	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
1273	<	else yy_aconf->port |= OPER_FLAG_REMOTE;
1274	<	}
1271	>	block_state.port.value |= OPER_FLAG_KILL;
1272	>	} | CONNECT ':' REMOTE
1273	>	{
1274	>	if (conf_parser_ctx.pass == 2)
1275	>	block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
1276	>	} | CONNECT
1277	>	{
1278	>	if (conf_parser_ctx.pass == 2)
1279	>	block_state.port.value |= OPER_FLAG_CONNECT;
1280	>	} | SQUIT ':' REMOTE
1281	>	{
1282	>	if (conf_parser_ctx.pass == 2)
1283	>	block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
1284	>	} | SQUIT
1285	>	{
1286	>	if (conf_parser_ctx.pass == 2)
1287	>	block_state.port.value |= OPER_FLAG_SQUIT;
1288		} | KLINE
1289		{
1290		if (conf_parser_ctx.pass == 2)
1291	<	{
1271	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
1272	<	else yy_aconf->port |= OPER_FLAG_K;
1273	<	}
1291	>	block_state.port.value |= OPER_FLAG_K;
1292		} | UNKLINE
1293		{
1294		if (conf_parser_ctx.pass == 2)
1295	<	{
1296	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1297	<	else yy_aconf->port |= OPER_FLAG_UNKLINE;
1298	<	}
1295	>	block_state.port.value |= OPER_FLAG_UNKLINE;
1296	>	} | T_DLINE
1297	>	{
1298	>	if (conf_parser_ctx.pass == 2)
1299	>	block_state.port.value |= OPER_FLAG_DLINE;
1300	>	} | T_UNDLINE
1301	>	{
1302	>	if (conf_parser_ctx.pass == 2)
1303	>	block_state.port.value |= OPER_FLAG_UNDLINE;
1304		} | XLINE
1305		{
1306		if (conf_parser_ctx.pass == 2)
1307	<	{
1308	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
1309	<	else yy_aconf->port |= OPER_FLAG_X;
1310	<	}
1307	>	block_state.port.value |= OPER_FLAG_XLINE;
1308	>	} | T_UNXLINE
1309	>	{
1310	>	if (conf_parser_ctx.pass == 2)
1311	>	block_state.port.value |= OPER_FLAG_UNXLINE;
1312		} | GLINE
1313		{
1314		if (conf_parser_ctx.pass == 2)
1315	<	{
1292	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
1293	<	else yy_aconf->port |= OPER_FLAG_GLINE;
1294	<	}
1315	>	block_state.port.value |= OPER_FLAG_GLINE;
1316		} | DIE
1317		{
1318		if (conf_parser_ctx.pass == 2)
1319	<	{
1320	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
1321	<	else yy_aconf->port |= OPER_FLAG_DIE;
1322	<	}
1319	>	block_state.port.value |= OPER_FLAG_DIE;
1320	>	} | T_RESTART
1321	>	{
1322	>	if (conf_parser_ctx.pass == 2)
1323	>	block_state.port.value |= OPER_FLAG_RESTART;
1324		} | REHASH
1325		{
1326		if (conf_parser_ctx.pass == 2)
1327	<	{
1306	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
1307	<	else yy_aconf->port |= OPER_FLAG_REHASH;
1308	<	}
1327	>	block_state.port.value |= OPER_FLAG_REHASH;
1328		} | ADMIN
1329		{
1330		if (conf_parser_ctx.pass == 2)
1331	<	{
1332	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_ADMIN;
1314	<	else yy_aconf->port |= OPER_FLAG_ADMIN;
1315	<	}
1316	<	} | HIDDEN_ADMIN
1331	>	block_state.port.value |= OPER_FLAG_ADMIN;
1332	>	} | T_OPERWALL
1333		{
1334		if (conf_parser_ctx.pass == 2)
1335	<	{
1336	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1321	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1322	<	}
1323	<	} | NICK_CHANGES
1335	>	block_state.port.value |= OPER_FLAG_OPERWALL;
1336	>	} | T_GLOBOPS
1337		{
1338		if (conf_parser_ctx.pass == 2)
1339	<	{
1340	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
1328	<	else yy_aconf->port |= OPER_FLAG_N;
1329	<	}
1330	<	} | T_OPERWALL
1339	>	block_state.port.value |= OPER_FLAG_GLOBOPS;
1340	>	} | T_WALLOPS
1341		{
1342		if (conf_parser_ctx.pass == 2)
1343	<	{
1344	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1335	<	else yy_aconf->port |= OPER_FLAG_OPERWALL;
1336	<	}
1337	<	} | OPER_SPY_T
1343	>	block_state.port.value |= OPER_FLAG_WALLOPS;
1344	>	} | T_LOCOPS
1345		{
1346		if (conf_parser_ctx.pass == 2)
1347	<	{
1348	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
1342	<	else yy_aconf->port |= OPER_FLAG_OPER_SPY;
1343	<	}
1344	<	} | HIDDEN_OPER
1347	>	block_state.port.value |= OPER_FLAG_LOCOPS;
1348	>	} | REMOTEBAN
1349		{
1350		if (conf_parser_ctx.pass == 2)
1351	<	{
1352	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1349	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1350	<	}
1351	<	} | REMOTEBAN
1351	>	block_state.port.value |= OPER_FLAG_REMOTEBAN;
1352	>	} | T_SET
1353		{
1354		if (conf_parser_ctx.pass == 2)
1355	<	{
1356	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1356	<	else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1357	<	}
1358	<	} | ENCRYPTED
1355	>	block_state.port.value |= OPER_FLAG_SET;
1356	>	} | MODULE
1357		{
1358		if (conf_parser_ctx.pass == 2)
1359	<	{
1362	<	if (not_atom) ClearConfEncrypted(yy_aconf);
1363	<	else SetConfEncrypted(yy_aconf);
1364	<	}
1359	>	block_state.port.value |= OPER_FLAG_MODULE;
1360		};
1361
1362
#	Line 1370 | Line 1365 | oper_flags_item_atom: GLOBAL_KILL
1365		***************************************************************************/
1366		class_entry: CLASS
1367		{
1368	<	if (conf_parser_ctx.pass == 1)
1369	<	{
1375	<	yy_conf = make_conf_item(CLASS_TYPE);
1376	<	yy_class = map_to_conf(yy_conf);
1377	<	}
1378	<	} class_name_b '{' class_items '}' ';'
1379	<	{
1380	<	if (conf_parser_ctx.pass == 1)
1381	<	{
1382	<	struct ConfItem *cconf = NULL;
1383	<	struct ClassItem *class = NULL;
1384	<
1385	<	if (yy_class_name == NULL)
1386	<	delete_conf_item(yy_conf);
1387	<	else
1388	<	{
1389	<	cconf = find_exact_name_conf(CLASS_TYPE, yy_class_name, NULL, NULL);
1368	>	if (conf_parser_ctx.pass != 1)
1369	>	break;
1370
1371	<	if (cconf != NULL)                /* The class existed already */
1392	<	{
1393	<	int user_count = 0;
1394	<
1395	<	rebuild_cidr_class(cconf, yy_class);
1396	<
1397	<	class = map_to_conf(cconf);
1398	<
1399	<	user_count = class->curr_user_count;
1400	<	memcpy(class, yy_class, sizeof(*class));
1401	<	class->curr_user_count = user_count;
1402	<	class->active = 1;
1371	>	reset_block_state();
1372
1373	<	delete_conf_item(yy_conf);
1374	<
1375	<	MyFree(cconf->name);            /* Allows case change of class name */
1376	<	cconf->name = yy_class_name;
1377	<	}
1378	<	else      /* Brand new class */
1379	<	{
1380	<	MyFree(yy_conf->name);          /* just in case it was allocated */
1381	<	yy_conf->name = yy_class_name;
1382	<	yy_class->active = 1;
1383	<	}
1384	<	}
1385	<
1386	<	yy_class_name = NULL;
1387	<	}
1373	>	block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1374	>	block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1375	>	block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1376	>	block_state.max_sendq.value = DEFAULT_SENDQ;
1377	>	block_state.max_recvq.value = DEFAULT_RECVQ;
1378	>	} '{' class_items '}' ';'
1379	>	{
1380	>	struct ClassItem *class = NULL;
1381	>
1382	>	if (conf_parser_ctx.pass != 1)
1383	>	break;
1384	>
1385	>	if (!block_state.class.buf[0])
1386	>	break;
1387	>
1388	>	if (!(class = class_find(block_state.class.buf, 0)))
1389	>	class = class_make();
1390	>
1391	>	class->active = 1;
1392	>	MyFree(class->name);
1393	>	class->name = xstrdup(block_state.class.buf);
1394	>	class->ping_freq = block_state.ping_freq.value;
1395	>	class->max_perip = block_state.max_perip.value;
1396	>	class->con_freq = block_state.con_freq.value;
1397	>	class->max_total = block_state.max_total.value;
1398	>	class->max_global = block_state.max_global.value;
1399	>	class->max_local = block_state.max_local.value;
1400	>	class->max_ident = block_state.max_ident.value;
1401	>	class->max_sendq = block_state.max_sendq.value;
1402	>	class->max_recvq = block_state.max_recvq.value;
1403	>
1404	>	if (block_state.min_idle.value > block_state.max_idle.value)
1405	>	{
1406	>	block_state.min_idle.value = 0;
1407	>	block_state.max_idle.value = 0;
1408	>	block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
1409	>	}
1410	>
1411	>	class->flags = block_state.flags.value;
1412	>	class->min_idle = block_state.min_idle.value;
1413	>	class->max_idle = block_state.max_idle.value;
1414	>
1415	>	if (class->number_per_cidr && block_state.number_per_cidr.value)
1416	>	if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
1417	>	(class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
1418	>	if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
1419	>	(class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
1420	>	rebuild_cidr_list(class);
1421	>
1422	>	class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1423	>	class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1424	>	class->number_per_cidr = block_state.number_per_cidr.value;
1425		};
1426
1421	–	class_name_b: | class_name_t;
1422	–
1427		class_items:    class_items class_item | class_item;
1428		class_item:     class_name |
1429		class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1430		class_ping_time |
1427	–	class_ping_warning |
1431		class_number_per_cidr |
1432		class_number_per_ip |
1433		class_connectfreq |
#	Line 1432 | Line 1435 | class_item:     class_name |
1435		class_max_global |
1436		class_max_local |
1437		class_max_ident |
1438	<	class_sendq |
1438	>	class_sendq | class_recvq |
1439	>	class_min_idle |
1440	>	class_max_idle |
1441	>	class_flags |
1442		error ';' ;
1443
1444	<	class_name: NAME '=' QSTRING ';'
1439	<	{
1440	<	if (conf_parser_ctx.pass == 1)
1441	<	{
1442	<	MyFree(yy_class_name);
1443	<	DupString(yy_class_name, yylval.string);
1444	<	}
1445	<	};
1446	<
1447	<	class_name_t: QSTRING
1444	>	class_name: NAME '=' QSTRING ';'
1445		{
1446		if (conf_parser_ctx.pass == 1)
1447	<	{
1451	<	MyFree(yy_class_name);
1452	<	DupString(yy_class_name, yylval.string);
1453	<	}
1447	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1448		};
1449
1450		class_ping_time: PING_TIME '=' timespec ';'
1451		{
1452		if (conf_parser_ctx.pass == 1)
1453	<	PingFreq(yy_class) = $3;
1460	<	};
1461	<
1462	<	class_ping_warning: PING_WARNING '=' timespec ';'
1463	<	{
1464	<	if (conf_parser_ctx.pass == 1)
1465	<	PingWarning(yy_class) = $3;
1453	>	block_state.ping_freq.value = $3;
1454		};
1455
1456		class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1457		{
1458		if (conf_parser_ctx.pass == 1)
1459	<	MaxPerIp(yy_class) = $3;
1459	>	block_state.max_perip.value = $3;
1460		};
1461
1462		class_connectfreq: CONNECTFREQ '=' timespec ';'
1463		{
1464		if (conf_parser_ctx.pass == 1)
1465	<	ConFreq(yy_class) = $3;
1465	>	block_state.con_freq.value = $3;
1466		};
1467
1468		class_max_number: MAX_NUMBER '=' NUMBER ';'
1469		{
1470		if (conf_parser_ctx.pass == 1)
1471	<	MaxTotal(yy_class) = $3;
1471	>	block_state.max_total.value = $3;
1472		};
1473
1474		class_max_global: MAX_GLOBAL '=' NUMBER ';'
1475		{
1476		if (conf_parser_ctx.pass == 1)
1477	<	MaxGlobal(yy_class) = $3;
1477	>	block_state.max_global.value = $3;
1478		};
1479
1480		class_max_local: MAX_LOCAL '=' NUMBER ';'
1481		{
1482		if (conf_parser_ctx.pass == 1)
1483	<	MaxLocal(yy_class) = $3;
1483	>	block_state.max_local.value = $3;
1484		};
1485
1486		class_max_ident: MAX_IDENT '=' NUMBER ';'
1487		{
1488		if (conf_parser_ctx.pass == 1)
1489	<	MaxIdent(yy_class) = $3;
1489	>	block_state.max_ident.value = $3;
1490		};
1491
1492		class_sendq: SENDQ '=' sizespec ';'
1493		{
1494		if (conf_parser_ctx.pass == 1)
1495	<	MaxSendq(yy_class) = $3;
1495	>	block_state.max_sendq.value = $3;
1496	>	};
1497	>
1498	>	class_recvq: T_RECVQ '=' sizespec ';'
1499	>	{
1500	>	if (conf_parser_ctx.pass == 1)
1501	>	if ($3 >= CLIENT_FLOOD_MIN && $3 <= CLIENT_FLOOD_MAX)
1502	>	block_state.max_recvq.value = $3;
1503		};
1504
1505		class_cidr_bitlen_ipv4: CIDR_BITLEN_IPV4 '=' NUMBER ';'
1506		{
1507		if (conf_parser_ctx.pass == 1)
1508	<	CidrBitlenIPV4(yy_class) = $3;
1508	>	block_state.cidr_bitlen_ipv4.value = $3 > 32 ? 32 : $3;
1509		};
1510
1511		class_cidr_bitlen_ipv6: CIDR_BITLEN_IPV6 '=' NUMBER ';'
1512		{
1513		if (conf_parser_ctx.pass == 1)
1514	<	CidrBitlenIPV6(yy_class) = $3;
1514	>	block_state.cidr_bitlen_ipv6.value = $3 > 128 ? 128 : $3;
1515		};
1516
1517		class_number_per_cidr: NUMBER_PER_CIDR '=' NUMBER ';'
1518		{
1519		if (conf_parser_ctx.pass == 1)
1520	<	NumberPerCidr(yy_class) = $3;
1520	>	block_state.number_per_cidr.value = $3;
1521	>	};
1522	>
1523	>	class_min_idle: MIN_IDLE '=' timespec ';'
1524	>	{
1525	>	if (conf_parser_ctx.pass != 1)
1526	>	break;
1527	>
1528	>	block_state.min_idle.value = $3;
1529	>	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1530	>	};
1531	>
1532	>	class_max_idle: MAX_IDLE '=' timespec ';'
1533	>	{
1534	>	if (conf_parser_ctx.pass != 1)
1535	>	break;
1536	>
1537	>	block_state.max_idle.value = $3;
1538	>	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1539	>	};
1540	>
1541	>	class_flags: IRCD_FLAGS
1542	>	{
1543	>	if (conf_parser_ctx.pass == 1)
1544	>	block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1545	>	} '='  class_flags_items ';';
1546	>
1547	>	class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1548	>	class_flags_item: RANDOM_IDLE
1549	>	{
1550	>	if (conf_parser_ctx.pass == 1)
1551	>	block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
1552	>	} | HIDE_IDLE_FROM_OPERS
1553	>	{
1554	>	if (conf_parser_ctx.pass == 1)
1555	>	block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
1556		};
1557
1558	+
1559		/***************************************************************************
1560		*  section listen
1561		***************************************************************************/
1562		listen_entry: LISTEN
1563		{
1564		if (conf_parser_ctx.pass == 2)
1565	<	{
1566	<	listener_address = NULL;
1536	<	listener_flags = 0;
1537	<	}
1538	<	} '{' listen_items '}' ';'
1539	<	{
1540	<	if (conf_parser_ctx.pass == 2)
1541	<	{
1542	<	MyFree(listener_address);
1543	<	listener_address = NULL;
1544	<	}
1545	<	};
1565	>	reset_block_state();
1566	>	} '{' listen_items '}' ';';
1567
1568		listen_flags: IRCD_FLAGS
1569		{
1570	<	listener_flags = 0;
1570	>	block_state.flags.value = 0;
1571		} '='  listen_flags_items ';';
1572
1573		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1574		listen_flags_item: T_SSL
1575		{
1576		if (conf_parser_ctx.pass == 2)
1577	<	listener_flags |= LISTENER_SSL;
1577	>	block_state.flags.value |= LISTENER_SSL;
1578		} | HIDDEN
1579		{
1580		if (conf_parser_ctx.pass == 2)
1581	<	listener_flags |= LISTENER_HIDDEN;
1581	>	block_state.flags.value |= LISTENER_HIDDEN;
1582		} | T_SERVER
1583		{
1584		if (conf_parser_ctx.pass == 2)
1585	<	listener_flags |= LISTENER_SERVER;
1585	>	block_state.flags.value |= LISTENER_SERVER;
1586		};
1587
1567	–
1568	–
1588		listen_items:   listen_items listen_item | listen_item;
1589		listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';';
1590
1591	<	listen_port: PORT '=' port_items { listener_flags = 0; } ';';
1591	>	listen_port: PORT '=' port_items { block_state.flags.value = 0; } ';';
1592
1593		port_items: port_items ',' port_item | port_item;
1594
#	Line 1577 | Line 1596 | port_item: NUMBER
1596		{
1597		if (conf_parser_ctx.pass == 2)
1598		{
1599	<	if ((listener_flags & LISTENER_SSL))
1599	>	if (block_state.flags.value & LISTENER_SSL)
1600		#ifdef HAVE_LIBCRYPTO
1601		if (!ServerInfo.server_ctx)
1602		#endif
1603		{
1604	<	yyerror("SSL not available - port closed");
1604	>	conf_error_report("SSL not available - port closed");
1605		break;
1606		}
1607	<	add_listener($1, listener_address, listener_flags);
1607	>	add_listener($1, block_state.addr.buf, block_state.flags.value);
1608		}
1609		} | NUMBER TWODOTS NUMBER
1610		{
#	Line 1593 | Line 1612 | port_item: NUMBER
1612		{
1613		int i;
1614
1615	<	if ((listener_flags & LISTENER_SSL))
1615	>	if (block_state.flags.value & LISTENER_SSL)
1616		#ifdef HAVE_LIBCRYPTO
1617		if (!ServerInfo.server_ctx)
1618		#endif
1619		{
1620	<	yyerror("SSL not available - port closed");
1620	>	conf_error_report("SSL not available - port closed");
1621		break;
1622		}
1623
1624		for (i = $1; i <= $3; ++i)
1625	<	add_listener(i, listener_address, listener_flags);
1625	>	add_listener(i, block_state.addr.buf, block_state.flags.value);
1626		}
1627		};
1628
1629		listen_address: IP '=' QSTRING ';'
1630		{
1631		if (conf_parser_ctx.pass == 2)
1632	<	{
1614	<	MyFree(listener_address);
1615	<	DupString(listener_address, yylval.string);
1616	<	}
1632	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1633		};
1634
1635		listen_host: HOST '=' QSTRING ';'
1636		{
1637		if (conf_parser_ctx.pass == 2)
1638	<	{
1623	<	MyFree(listener_address);
1624	<	DupString(listener_address, yylval.string);
1625	<	}
1638	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1639		};
1640
1641		/***************************************************************************
#	Line 1631 | Line 1644 | listen_host: HOST '=' QSTRING ';'
1644		auth_entry: IRCD_AUTH
1645		{
1646		if (conf_parser_ctx.pass == 2)
1647	<	{
1635	<	yy_conf = make_conf_item(CLIENT_TYPE);
1636	<	yy_aconf = map_to_conf(yy_conf);
1637	<	}
1638	<	else
1639	<	{
1640	<	MyFree(class_name);
1641	<	class_name = NULL;
1642	<	}
1647	>	reset_block_state();
1648		} '{' auth_items '}' ';'
1649		{
1650	<	if (conf_parser_ctx.pass == 2)
1646	<	{
1647	<	struct CollectItem *yy_tmp = NULL;
1648	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1649	<
1650	<	if (yy_aconf->user && yy_aconf->host)
1651	<	{
1652	<	conf_add_class_to_conf(yy_conf, class_name);
1653	<	add_conf_by_address(CONF_CLIENT, yy_aconf);
1654	<	}
1655	<	else
1656	<	delete_conf_item(yy_conf);
1657	<
1658	<	/* copy over settings from first struct */
1659	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
1660	<	{
1661	<	struct AccessItem *new_aconf;
1662	<	struct ConfItem *new_conf;
1663	<
1664	<	new_conf = make_conf_item(CLIENT_TYPE);
1665	<	new_aconf = map_to_conf(new_conf);
1666	<
1667	<	yy_tmp = ptr->data;
1668	<
1669	<	assert(yy_tmp->user && yy_tmp->host);
1650	>	dlink_node *ptr = NULL;
1651
1652	<	if (yy_aconf->passwd != NULL)
1653	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1673	<	if (yy_conf->name != NULL)
1674	<	DupString(new_conf->name, yy_conf->name);
1675	<	if (yy_aconf->passwd != NULL)
1676	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1652	>	if (conf_parser_ctx.pass != 2)
1653	>	break;
1654
1655	<	new_aconf->flags = yy_aconf->flags;
1656	<	new_aconf->port  = yy_aconf->port;
1655	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
1656	>	{
1657	>	struct MaskItem *conf = NULL;
1658	>	struct split_nuh_item nuh;
1659
1660	<	DupString(new_aconf->user, yy_tmp->user);
1661	<	collapse(new_aconf->user);
1660	>	nuh.nuhmask  = ptr->data;
1661	>	nuh.nickptr  = NULL;
1662	>	nuh.userptr  = block_state.user.buf;
1663	>	nuh.hostptr  = block_state.host.buf;
1664	>	nuh.nicksize = 0;
1665	>	nuh.usersize = sizeof(block_state.user.buf);
1666	>	nuh.hostsize = sizeof(block_state.host.buf);
1667	>	split_nuh(&nuh);
1668
1669	<	DupString(new_aconf->host, yy_tmp->host);
1670	<	collapse(new_aconf->host);
1669	>	conf        = conf_make(CONF_CLIENT);
1670	>	conf->user  = xstrdup(block_state.user.buf);
1671	>	conf->host  = xstrdup(block_state.host.buf);
1672	>
1673	>	if (block_state.rpass.buf[0])
1674	>	conf->passwd = xstrdup(block_state.rpass.buf);
1675	>	if (block_state.name.buf[0])
1676	>	conf->name = xstrdup(block_state.name.buf);
1677
1678	<	conf_add_class_to_conf(new_conf, class_name);
1679	<	add_conf_by_address(CONF_CLIENT, new_aconf);
1689	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1690	<	free_collect_item(yy_tmp);
1691	<	}
1678	>	conf->flags = block_state.flags.value;
1679	>	conf->port  = block_state.port.value;
1680
1681	<	MyFree(class_name);
1682	<	class_name = NULL;
1695	<	yy_conf = NULL;
1696	<	yy_aconf = NULL;
1681	>	conf_add_class_to_conf(conf, block_state.class.buf);
1682	>	add_conf_by_address(CONF_CLIENT, conf);
1683		}
1684	<	};
1684	>	};
1685
1686		auth_items:     auth_items auth_item | auth_item;
1687		auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
#	Line 1705 | Line 1691 | auth_item:      auth_user | auth_passwd
1691		auth_user: USER '=' QSTRING ';'
1692		{
1693		if (conf_parser_ctx.pass == 2)
1694	<	{
1709	<	struct CollectItem *yy_tmp = NULL;
1710	<	struct split_nuh_item nuh;
1711	<
1712	<	nuh.nuhmask  = yylval.string;
1713	<	nuh.nickptr  = NULL;
1714	<	nuh.userptr  = userbuf;
1715	<	nuh.hostptr  = hostbuf;
1716	<
1717	<	nuh.nicksize = 0;
1718	<	nuh.usersize = sizeof(userbuf);
1719	<	nuh.hostsize = sizeof(hostbuf);
1720	<
1721	<	split_nuh(&nuh);
1722	<
1723	<	if (yy_aconf->user == NULL)
1724	<	{
1725	<	DupString(yy_aconf->user, userbuf);
1726	<	DupString(yy_aconf->host, hostbuf);
1727	<	}
1728	<	else
1729	<	{
1730	<	yy_tmp = MyMalloc(sizeof(struct CollectItem));
1731	<
1732	<	DupString(yy_tmp->user, userbuf);
1733	<	DupString(yy_tmp->host, hostbuf);
1734	<
1735	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1736	<	}
1737	<	}
1694	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1695		};
1696
1740	–	/* XXX - IP/IPV6 tags don't exist anymore - put IP/IPV6 into user. */
1741	–
1697		auth_passwd: PASSWORD '=' QSTRING ';'
1698		{
1699		if (conf_parser_ctx.pass == 2)
1700	<	{
1746	<	/* be paranoid */
1747	<	if (yy_aconf->passwd != NULL)
1748	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1749	<
1750	<	MyFree(yy_aconf->passwd);
1751	<	DupString(yy_aconf->passwd, yylval.string);
1752	<	}
1700	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1701		};
1702
1703		auth_class: CLASS '=' QSTRING ';'
1704		{
1705		if (conf_parser_ctx.pass == 2)
1706	<	{
1759	<	MyFree(class_name);
1760	<	DupString(class_name, yylval.string);
1761	<	}
1706	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1707		};
1708
1709		auth_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 1766 | Line 1711 | auth_encrypted: ENCRYPTED '=' TBOOL ';'
1711		if (conf_parser_ctx.pass == 2)
1712		{
1713		if (yylval.number)
1714	<	SetConfEncrypted(yy_aconf);
1714	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1715		else
1716	<	ClearConfEncrypted(yy_aconf);
1716	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1717		}
1718		};
1719
1720		auth_flags: IRCD_FLAGS
1721		{
1722	+	if (conf_parser_ctx.pass == 2)
1723	+	block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
1724		} '='  auth_flags_items ';';
1725
1726		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1727	<	auth_flags_item: NOT { not_atom = 1; } auth_flags_item_atom
1781	<	| { not_atom = 0; } auth_flags_item_atom;
1782	<
1783	<	auth_flags_item_atom: SPOOF_NOTICE
1727	>	auth_flags_item: SPOOF_NOTICE
1728		{
1729		if (conf_parser_ctx.pass == 2)
1730	<	{
1787	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1788	<	else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1789	<	}
1730	>	block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1731		} | EXCEED_LIMIT
1732		{
1733		if (conf_parser_ctx.pass == 2)
1734	<	{
1794	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
1795	<	else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1796	<	}
1734	>	block_state.flags.value |= CONF_FLAGS_NOLIMIT;
1735		} | KLINE_EXEMPT
1736		{
1737		if (conf_parser_ctx.pass == 2)
1738	<	{
1801	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
1802	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1803	<	}
1738	>	block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1739		} | NEED_IDENT
1740		{
1741		if (conf_parser_ctx.pass == 2)
1742	<	{
1808	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
1809	<	else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
1810	<	}
1742	>	block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
1743		} | CAN_FLOOD
1744		{
1745		if (conf_parser_ctx.pass == 2)
1746	<	{
1815	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
1816	<	else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
1817	<	}
1746	>	block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
1747		} | NO_TILDE
1748		{
1749		if (conf_parser_ctx.pass == 2)
1750	<	{
1822	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
1823	<	else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1824	<	}
1750	>	block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1751		} | GLINE_EXEMPT
1752		{
1753		if (conf_parser_ctx.pass == 2)
1754	<	{
1829	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
1830	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
1831	<	}
1754	>	block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
1755		} | RESV_EXEMPT
1756		{
1757		if (conf_parser_ctx.pass == 2)
1758	<	{
1759	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
1760	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
1761	<	}
1758	>	block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
1759	>	} | T_WEBIRC
1760	>	{
1761	>	if (conf_parser_ctx.pass == 2)
1762	>	block_state.flags.value |= CONF_FLAGS_WEBIRC;
1763		} | NEED_PASSWORD
1764		{
1765		if (conf_parser_ctx.pass == 2)
1766	<	{
1843	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
1844	<	else yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
1845	<	}
1766	>	block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1767		};
1768
1769	<	/* XXX - need check for illegal hostnames here */
1849	<	auth_spoof: SPOOF '=' QSTRING ';'
1769	>	auth_spoof: SPOOF '=' QSTRING ';'
1770		{
1771	<	if (conf_parser_ctx.pass == 2)
1772	<	{
1853	<	MyFree(yy_conf->name);
1771	>	if (conf_parser_ctx.pass != 2)
1772	>	break;
1773
1774	<	if (strlen(yylval.string) < HOSTLEN)
1775	<	{
1776	<	DupString(yy_conf->name, yylval.string);
1777	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
1859	<	}
1860	<	else
1861	<	{
1862	<	ilog(L_ERROR, "Spoofs must be less than %d..ignoring it", HOSTLEN);
1863	<	yy_conf->name = NULL;
1864	<	}
1774	>	if (strlen(yylval.string) <= HOSTLEN && valid_hostname(yylval.string))
1775	>	{
1776	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1777	>	block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
1778		}
1779	+	else
1780	+	ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
1781		};
1782
1783		auth_redir_serv: REDIRSERV '=' QSTRING ';'
1784		{
1785	<	if (conf_parser_ctx.pass == 2)
1786	<	{
1787	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1788	<	MyFree(yy_conf->name);
1789	<	DupString(yy_conf->name, yylval.string);
1875	<	}
1785	>	if (conf_parser_ctx.pass != 2)
1786	>	break;
1787	>
1788	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1789	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1790		};
1791
1792		auth_redir_port: REDIRPORT '=' NUMBER ';'
1793		{
1794	<	if (conf_parser_ctx.pass == 2)
1795	<	{
1796	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1797	<	yy_aconf->port = $3;
1798	<	}
1794	>	if (conf_parser_ctx.pass != 2)
1795	>	break;
1796	>
1797	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1798	>	block_state.port.value = $3;
1799		};
1800
1801
#	Line 1890 | Line 1804 | auth_redir_port: REDIRPORT '=' NUMBER ';
1804		***************************************************************************/
1805		resv_entry: RESV
1806		{
1807	<	if (conf_parser_ctx.pass == 2)
1808	<	{
1809	<	MyFree(resv_reason);
1810	<	resv_reason = NULL;
1811	<	}
1807	>	if (conf_parser_ctx.pass != 2)
1808	>	break;
1809	>
1810	>	reset_block_state();
1811	>	strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
1812		} '{' resv_items '}' ';'
1813		{
1814	<	if (conf_parser_ctx.pass == 2)
1815	<	{
1816	<	MyFree(resv_reason);
1817	<	resv_reason = NULL;
1904	<	}
1814	>	if (conf_parser_ctx.pass != 2)
1815	>	break;
1816	>
1817	>	create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1818		};
1819
1820		resv_items:     resv_items resv_item | resv_item;
1821	<	resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
1821	>	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1822
1823	<	resv_creason: REASON '=' QSTRING ';'
1823	>	resv_mask: MASK '=' QSTRING ';'
1824		{
1825		if (conf_parser_ctx.pass == 2)
1826	<	{
1914	<	MyFree(resv_reason);
1915	<	DupString(resv_reason, yylval.string);
1916	<	}
1826	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1827		};
1828
1829	<	resv_channel: CHANNEL '=' QSTRING ';'
1829	>	resv_reason: REASON '=' QSTRING ';'
1830		{
1831		if (conf_parser_ctx.pass == 2)
1832	<	{
1923	<	if (IsChanPrefix(*yylval.string))
1924	<	{
1925	<	char def_reason[] = "No reason";
1926	<
1927	<	create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1928	<	}
1929	<	}
1930	<	/* ignore it for now.. but we really should make a warning if
1931	<	* its an erroneous name --fl_ */
1832	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1833		};
1834
1835	<	resv_nick: NICK '=' QSTRING ';'
1835	>	resv_exempt: EXEMPT '=' QSTRING ';'
1836		{
1837		if (conf_parser_ctx.pass == 2)
1838	<	{
1938	<	char def_reason[] = "No reason";
1939	<
1940	<	create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1941	<	}
1838	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1839		};
1840
1841	+
1842		/***************************************************************************
1843		*  section service
1844		***************************************************************************/
#	Line 1951 | Line 1849 | service_item:      service_name | error;
1849
1850		service_name: NAME '=' QSTRING ';'
1851		{
1852	<	if (conf_parser_ctx.pass == 2)
1852	>	if (conf_parser_ctx.pass != 2)
1853	>	break;
1854	>
1855	>	if (valid_servname(yylval.string))
1856		{
1857	<	if (valid_servname(yylval.string))
1858	<	{
1958	<	yy_conf = make_conf_item(SERVICE_TYPE);
1959	<	DupString(yy_conf->name, yylval.string);
1960	<	}
1857	>	struct MaskItem *conf = conf_make(CONF_SERVICE);
1858	>	conf->name = xstrdup(yylval.string);
1859		}
1860		};
1861
#	Line 1966 | Line 1864 | service_name: NAME '=' QSTRING ';'
1864		***************************************************************************/
1865		shared_entry: T_SHARED
1866		{
1867	<	if (conf_parser_ctx.pass == 2)
1868	<	{
1869	<	yy_conf = make_conf_item(ULINE_TYPE);
1870	<	yy_match_item = map_to_conf(yy_conf);
1871	<	yy_match_item->action = SHARED_ALL;
1872	<	}
1867	>	if (conf_parser_ctx.pass != 2)
1868	>	break;
1869	>
1870	>	reset_block_state();
1871	>
1872	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1873	>	strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
1874	>	strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
1875	>	block_state.flags.value = SHARED_ALL;
1876		} '{' shared_items '}' ';'
1877		{
1878	<	if (conf_parser_ctx.pass == 2)
1879	<	{
1880	<	yy_conf = NULL;
1881	<	}
1878	>	struct MaskItem *conf = NULL;
1879	>
1880	>	if (conf_parser_ctx.pass != 2)
1881	>	break;
1882	>
1883	>	conf = conf_make(CONF_ULINE);
1884	>	conf->flags = block_state.flags.value;
1885	>	conf->name = xstrdup(block_state.name.buf);
1886	>	conf->user = xstrdup(block_state.user.buf);
1887	>	conf->host = xstrdup(block_state.host.buf);
1888		};
1889
1890		shared_items: shared_items shared_item | shared_item;
#	Line 1986 | Line 1893 | shared_item:  shared_name | shared_user
1893		shared_name: NAME '=' QSTRING ';'
1894		{
1895		if (conf_parser_ctx.pass == 2)
1896	<	{
1990	<	MyFree(yy_conf->name);
1991	<	DupString(yy_conf->name, yylval.string);
1992	<	}
1896	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1897		};
1898
1899		shared_user: USER '=' QSTRING ';'
#	Line 2000 | Line 1904 | shared_user: USER '=' QSTRING ';'
1904
1905		nuh.nuhmask  = yylval.string;
1906		nuh.nickptr  = NULL;
1907	<	nuh.userptr  = userbuf;
1908	<	nuh.hostptr  = hostbuf;
1907	>	nuh.userptr  = block_state.user.buf;
1908	>	nuh.hostptr  = block_state.host.buf;
1909
1910		nuh.nicksize = 0;
1911	<	nuh.usersize = sizeof(userbuf);
1912	<	nuh.hostsize = sizeof(hostbuf);
1911	>	nuh.usersize = sizeof(block_state.user.buf);
1912	>	nuh.hostsize = sizeof(block_state.host.buf);
1913
1914		split_nuh(&nuh);
2011	–
2012	–	DupString(yy_match_item->user, userbuf);
2013	–	DupString(yy_match_item->host, hostbuf);
1915		}
1916		};
1917
1918		shared_type: TYPE
1919		{
1920		if (conf_parser_ctx.pass == 2)
1921	<	yy_match_item->action = 0;
1921	>	block_state.flags.value = 0;
1922		} '=' shared_types ';' ;
1923
1924		shared_types: shared_types ',' shared_type_item | shared_type_item;
1925		shared_type_item: KLINE
1926		{
1927		if (conf_parser_ctx.pass == 2)
1928	<	yy_match_item->action |= SHARED_KLINE;
1929	<	} | TKLINE
1928	>	block_state.flags.value |= SHARED_KLINE;
1929	>	} | UNKLINE
1930		{
1931		if (conf_parser_ctx.pass == 2)
1932	<	yy_match_item->action |= SHARED_TKLINE;
1933	<	} | UNKLINE
1932	>	block_state.flags.value |= SHARED_UNKLINE;
1933	>	} | T_DLINE
1934		{
1935		if (conf_parser_ctx.pass == 2)
1936	<	yy_match_item->action |= SHARED_UNKLINE;
1937	<	} | XLINE
1936	>	block_state.flags.value |= SHARED_DLINE;
1937	>	} | T_UNDLINE
1938		{
1939		if (conf_parser_ctx.pass == 2)
1940	<	yy_match_item->action |= SHARED_XLINE;
1941	<	} | TXLINE
1940	>	block_state.flags.value |= SHARED_UNDLINE;
1941	>	} | XLINE
1942		{
1943		if (conf_parser_ctx.pass == 2)
1944	<	yy_match_item->action |= SHARED_TXLINE;
1944	>	block_state.flags.value |= SHARED_XLINE;
1945		} | T_UNXLINE
1946		{
1947		if (conf_parser_ctx.pass == 2)
1948	<	yy_match_item->action |= SHARED_UNXLINE;
1948	>	block_state.flags.value |= SHARED_UNXLINE;
1949		} | RESV
1950		{
1951		if (conf_parser_ctx.pass == 2)
1952	<	yy_match_item->action |= SHARED_RESV;
2052	<	} | TRESV
2053	<	{
2054	<	if (conf_parser_ctx.pass == 2)
2055	<	yy_match_item->action |= SHARED_TRESV;
1952	>	block_state.flags.value |= SHARED_RESV;
1953		} | T_UNRESV
1954		{
1955		if (conf_parser_ctx.pass == 2)
1956	<	yy_match_item->action |= SHARED_UNRESV;
1956	>	block_state.flags.value |= SHARED_UNRESV;
1957		} | T_LOCOPS
1958		{
1959		if (conf_parser_ctx.pass == 2)
1960	<	yy_match_item->action |= SHARED_LOCOPS;
1960	>	block_state.flags.value |= SHARED_LOCOPS;
1961		} | T_ALL
1962		{
1963		if (conf_parser_ctx.pass == 2)
1964	<	yy_match_item->action = SHARED_ALL;
1964	>	block_state.flags.value = SHARED_ALL;
1965		};
1966
1967		/***************************************************************************
#	Line 2072 | Line 1969 | shared_type_item: KLINE
1969		***************************************************************************/
1970		cluster_entry: T_CLUSTER
1971		{
1972	<	if (conf_parser_ctx.pass == 2)
1973	<	{
1974	<	yy_conf = make_conf_item(CLUSTER_TYPE);
1975	<	yy_conf->flags = SHARED_ALL;
1976	<	}
1972	>	if (conf_parser_ctx.pass != 2)
1973	>	break;
1974	>
1975	>	reset_block_state();
1976	>
1977	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1978	>	block_state.flags.value = SHARED_ALL;
1979		} '{' cluster_items '}' ';'
1980		{
1981	<	if (conf_parser_ctx.pass == 2)
1982	<	{
1983	<	if (yy_conf->name == NULL)
1984	<	DupString(yy_conf->name, "*");
1985	<	yy_conf = NULL;
1986	<	}
1981	>	struct MaskItem *conf = NULL;
1982	>
1983	>	if (conf_parser_ctx.pass != 2)
1984	>	break;
1985	>
1986	>	conf = conf_make(CONF_CLUSTER);
1987	>	conf->flags = block_state.flags.value;
1988	>	conf->name = xstrdup(block_state.name.buf);
1989		};
1990
1991		cluster_items:  cluster_items cluster_item | cluster_item;
#	Line 2093 | Line 1994 | cluster_item:  cluster_name | cluster_typ
1994		cluster_name: NAME '=' QSTRING ';'
1995		{
1996		if (conf_parser_ctx.pass == 2)
1997	<	DupString(yy_conf->name, yylval.string);
1997	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1998		};
1999
2000		cluster_type: TYPE
2001		{
2002		if (conf_parser_ctx.pass == 2)
2003	<	yy_conf->flags = 0;
2003	>	block_state.flags.value = 0;
2004		} '=' cluster_types ';' ;
2005
2006		cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
2007		cluster_type_item: KLINE
2008		{
2009		if (conf_parser_ctx.pass == 2)
2010	<	yy_conf->flags |= SHARED_KLINE;
2011	<	} | TKLINE
2010	>	block_state.flags.value |= SHARED_KLINE;
2011	>	} | UNKLINE
2012		{
2013		if (conf_parser_ctx.pass == 2)
2014	<	yy_conf->flags |= SHARED_TKLINE;
2015	<	} | UNKLINE
2014	>	block_state.flags.value |= SHARED_UNKLINE;
2015	>	} | T_DLINE
2016		{
2017		if (conf_parser_ctx.pass == 2)
2018	<	yy_conf->flags |= SHARED_UNKLINE;
2019	<	} | XLINE
2018	>	block_state.flags.value |= SHARED_DLINE;
2019	>	} | T_UNDLINE
2020		{
2021		if (conf_parser_ctx.pass == 2)
2022	<	yy_conf->flags |= SHARED_XLINE;
2023	<	} | TXLINE
2022	>	block_state.flags.value |= SHARED_UNDLINE;
2023	>	} | XLINE
2024		{
2025		if (conf_parser_ctx.pass == 2)
2026	<	yy_conf->flags |= SHARED_TXLINE;
2026	>	block_state.flags.value |= SHARED_XLINE;
2027		} | T_UNXLINE
2028		{
2029		if (conf_parser_ctx.pass == 2)
2030	<	yy_conf->flags |= SHARED_UNXLINE;
2030	>	block_state.flags.value |= SHARED_UNXLINE;
2031		} | RESV
2032		{
2033		if (conf_parser_ctx.pass == 2)
2034	<	yy_conf->flags |= SHARED_RESV;
2134	<	} | TRESV
2135	<	{
2136	<	if (conf_parser_ctx.pass == 2)
2137	<	yy_conf->flags |= SHARED_TRESV;
2034	>	block_state.flags.value |= SHARED_RESV;
2035		} | T_UNRESV
2036		{
2037		if (conf_parser_ctx.pass == 2)
2038	<	yy_conf->flags |= SHARED_UNRESV;
2038	>	block_state.flags.value |= SHARED_UNRESV;
2039		} | T_LOCOPS
2040		{
2041		if (conf_parser_ctx.pass == 2)
2042	<	yy_conf->flags |= SHARED_LOCOPS;
2042	>	block_state.flags.value |= SHARED_LOCOPS;
2043		} | T_ALL
2044		{
2045		if (conf_parser_ctx.pass == 2)
2046	<	yy_conf->flags = SHARED_ALL;
2046	>	block_state.flags.value = SHARED_ALL;
2047		};
2048
2049		/***************************************************************************
2050		*  section connect
2051		***************************************************************************/
2052	<	connect_entry: CONNECT
2052	>	connect_entry: CONNECT
2053		{
2157	–	if (conf_parser_ctx.pass == 2)
2158	–	{
2159	–	yy_conf = make_conf_item(SERVER_TYPE);
2160	–	yy_aconf = (struct AccessItem *)map_to_conf(yy_conf);
2161	–	yy_aconf->passwd = NULL;
2162	–	/* defaults */
2163	–	yy_aconf->port = PORTNUM;
2054
2055	<	if (ConfigFileEntry.burst_away)
2056	<	yy_aconf->flags = CONF_FLAGS_BURST_AWAY;
2057	<	}
2058	<	else
2059	<	{
2060	<	MyFree(class_name);
2061	<	class_name = NULL;
2172	<	}
2173	<	} connect_name_b '{' connect_items '}' ';'
2055	>	if (conf_parser_ctx.pass != 2)
2056	>	break;
2057	>
2058	>	reset_block_state();
2059	>	block_state.aftype.value = AF_INET;
2060	>	block_state.port.value = PORTNUM;
2061	>	} '{' connect_items '}' ';'
2062		{
2063	<	if (conf_parser_ctx.pass == 2)
2064	<	{
2177	<	struct CollectItem *yy_hconf=NULL;
2178	<	struct CollectItem *yy_lconf=NULL;
2179	<	dlink_node *ptr;
2180	<	dlink_node *next_ptr;
2181	<	#ifdef HAVE_LIBCRYPTO
2182	<	if (yy_aconf->host &&
2183	<	((yy_aconf->passwd && yy_aconf->spasswd) ||
2184	<	(yy_aconf->rsa_public_key && IsConfCryptLink(yy_aconf))))
2185	<	#else /* !HAVE_LIBCRYPTO */
2186	<	if (yy_aconf->host && !IsConfCryptLink(yy_aconf) &&
2187	<	yy_aconf->passwd && yy_aconf->spasswd)
2188	<	#endif /* !HAVE_LIBCRYPTO */
2189	<	{
2190	<	if (conf_add_server(yy_conf, class_name) == -1)
2191	<	{
2192	<	delete_conf_item(yy_conf);
2193	<	yy_conf = NULL;
2194	<	yy_aconf = NULL;
2195	<	}
2196	<	}
2197	<	else
2198	<	{
2199	<	/* Even if yy_conf ->name is NULL
2200	<	* should still unhook any hub/leaf confs still pending
2201	<	*/
2202	<	unhook_hub_leaf_confs();
2203	<
2204	<	if (yy_conf->name != NULL)
2205	<	{
2206	<	#ifndef HAVE_LIBCRYPTO
2207	<	if (IsConfCryptLink(yy_aconf))
2208	<	yyerror("Ignoring connect block -- no OpenSSL support");
2209	<	#else
2210	<	if (IsConfCryptLink(yy_aconf) && !yy_aconf->rsa_public_key)
2211	<	yyerror("Ignoring connect block -- missing key");
2212	<	#endif
2213	<	if (yy_aconf->host == NULL)
2214	<	yyerror("Ignoring connect block -- missing host");
2215	<	else if (!IsConfCryptLink(yy_aconf) &&
2216	<	(!yy_aconf->passwd || !yy_aconf->spasswd))
2217	<	yyerror("Ignoring connect block -- missing password");
2218	<	}
2219	<
2220	<
2221	<	/* XXX
2222	<	* This fixes a try_connections() core (caused by invalid class_ptr
2223	<	* pointers) reported by metalrock. That's an ugly fix, but there
2224	<	* is currently no better way. The entire config subsystem needs an
2225	<	* rewrite ASAP. make_conf_item() shouldn't really add things onto
2226	<	* a doubly linked list immediately without any sanity checks!  -Michael
2227	<	*/
2228	<	delete_conf_item(yy_conf);
2229	<
2230	<	yy_aconf = NULL;
2231	<	yy_conf = NULL;
2232	<	}
2233	<
2234	<	/*
2235	<	* yy_conf is still pointing at the server that is having
2236	<	* a connect block built for it. This means, y_aconf->name
2237	<	* points to the actual irc name this server will be known as.
2238	<	* Now this new server has a set or even just one hub_mask (or leaf_mask)
2239	<	* given in the link list at yy_hconf. Fill in the HUB confs
2240	<	* from this link list now.
2241	<	*/
2242	<	DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
2243	<	{
2244	<	struct ConfItem *new_hub_conf;
2245	<	struct MatchItem *match_item;
2063	>	struct MaskItem *conf = NULL;
2064	>	struct addrinfo hints, *res;
2065
2066	<	yy_hconf = ptr->data;
2066	>	if (conf_parser_ctx.pass != 2)
2067	>	break;
2068
2069	<	/* yy_conf == NULL is a fatal error for this connect block! */
2070	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2071	<	{
2252	<	new_hub_conf = make_conf_item(HUB_TYPE);
2253	<	match_item = (struct MatchItem *)map_to_conf(new_hub_conf);
2254	<	DupString(new_hub_conf->name, yy_conf->name);
2255	<	if (yy_hconf->user != NULL)
2256	<	DupString(match_item->user, yy_hconf->user);
2257	<	else
2258	<	DupString(match_item->user, "*");
2259	<	if (yy_hconf->host != NULL)
2260	<	DupString(match_item->host, yy_hconf->host);
2261	<	else
2262	<	DupString(match_item->host, "*");
2263	<	}
2264	<	dlinkDelete(&yy_hconf->node, &hub_conf_list);
2265	<	free_collect_item(yy_hconf);
2266	<	}
2069	>	if (!block_state.name.buf[0] ||
2070	>	!block_state.host.buf[0])
2071	>	break;
2072
2073	<	/* Ditto for the LEAF confs */
2073	>	if (!block_state.rpass.buf[0] ||
2074	>	!block_state.spass.buf[0])
2075	>	break;
2076
2077	<	DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
2078	<	{
2079	<	struct ConfItem *new_leaf_conf;
2273	<	struct MatchItem *match_item;
2077	>	if (has_wildcards(block_state.name.buf) ||
2078	>	has_wildcards(block_state.host.buf))
2079	>	break;
2080
2081	<	yy_lconf = ptr->data;
2081	>	conf = conf_make(CONF_SERVER);
2082	>	conf->port = block_state.port.value;
2083	>	conf->flags = block_state.flags.value;
2084	>	conf->aftype = block_state.aftype.value;
2085	>	conf->host = xstrdup(block_state.host.buf);
2086	>	conf->name = xstrdup(block_state.name.buf);
2087	>	conf->passwd = xstrdup(block_state.rpass.buf);
2088	>	conf->spasswd = xstrdup(block_state.spass.buf);
2089
2090	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2091	<	{
2092	<	new_leaf_conf = make_conf_item(LEAF_TYPE);
2093	<	match_item = (struct MatchItem *)map_to_conf(new_leaf_conf);
2094	<	DupString(new_leaf_conf->name, yy_conf->name);
2095	<	if (yy_lconf->user != NULL)
2096	<	DupString(match_item->user, yy_lconf->user);
2097	<	else
2098	<	DupString(match_item->user, "*");
2099	<	if (yy_lconf->host != NULL)
2100	<	DupString(match_item->host, yy_lconf->host);
2101	<	else
2102	<	DupString(match_item->host, "*");
2103	<	}
2104	<	dlinkDelete(&yy_lconf->node, &leaf_conf_list);
2105	<	free_collect_item(yy_lconf);
2106	<	}
2107	<	MyFree(class_name);
2108	<	class_name = NULL;
2109	<	yy_conf = NULL;
2110	<	yy_aconf = NULL;
2090	>	if (block_state.cert.buf[0])
2091	>	conf->certfp = xstrdup(block_state.cert.buf);
2092	>
2093	>	if (block_state.ciph.buf[0])
2094	>	conf->cipher_list = xstrdup(block_state.ciph.buf);
2095	>
2096	>	dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
2097	>	dlinkMoveList(&block_state.hub.list, &conf->hub_list);
2098	>
2099	>	if (block_state.bind.buf[0])
2100	>	{
2101	>	memset(&hints, 0, sizeof(hints));
2102	>
2103	>	hints.ai_family   = AF_UNSPEC;
2104	>	hints.ai_socktype = SOCK_STREAM;
2105	>	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2106	>
2107	>	if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2108	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2109	>	else
2110	>	{
2111	>	assert(res != NULL);
2112	>
2113	>	memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2114	>	conf->bind.ss.ss_family = res->ai_family;
2115	>	conf->bind.ss_len = res->ai_addrlen;
2116	>	freeaddrinfo(res);
2117	>	}
2118		}
2119	+
2120	+	conf_add_class_to_conf(conf, block_state.class.buf);
2121	+	lookup_confhost(conf);
2122		};
2123
2301	–	connect_name_b: | connect_name_t;
2124		connect_items:  connect_items connect_item | connect_item;
2125		connect_item:   connect_name | connect_host | connect_vhost |
2126		connect_send_password | connect_accept_password |
2127	<	connect_aftype | connect_port |
2127	>	connect_ssl_certificate_fingerprint |
2128	>	connect_aftype | connect_port | connect_ssl_cipher_list |
2129		connect_flags | connect_hub_mask | connect_leaf_mask |
2130		connect_class | connect_encrypted |
2308	–	connect_rsa_public_key_file | connect_cipher_preference |
2131		error ';' ;
2132
2133		connect_name: NAME '=' QSTRING ';'
2134		{
2135		if (conf_parser_ctx.pass == 2)
2136	<	{
2315	<	if (yy_conf->name != NULL)
2316	<	yyerror("Multiple connect name entry");
2317	<
2318	<	MyFree(yy_conf->name);
2319	<	DupString(yy_conf->name, yylval.string);
2320	<	}
2136	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2137		};
2138
2139	<	connect_name_t: QSTRING
2139	>	connect_host: HOST '=' QSTRING ';'
2140		{
2141		if (conf_parser_ctx.pass == 2)
2142	<	{
2327	<	if (yy_conf->name != NULL)
2328	<	yyerror("Multiple connect name entry");
2329	<
2330	<	MyFree(yy_conf->name);
2331	<	DupString(yy_conf->name, yylval.string);
2332	<	}
2142	>	strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2143		};
2144
2145	<	connect_host: HOST '=' QSTRING ';'
2145	>	connect_vhost: VHOST '=' QSTRING ';'
2146		{
2147		if (conf_parser_ctx.pass == 2)
2148	<	{
2339	<	MyFree(yy_aconf->host);
2340	<	DupString(yy_aconf->host, yylval.string);
2341	<	}
2148	>	strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2149		};
2150
2151	<	connect_vhost: VHOST '=' QSTRING ';'
2151	>	connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2152		{
2153	<	if (conf_parser_ctx.pass == 2)
2154	<	{
2348	<	struct addrinfo hints, *res;
2349	<
2350	<	memset(&hints, 0, sizeof(hints));
2351	<
2352	<	hints.ai_family   = AF_UNSPEC;
2353	<	hints.ai_socktype = SOCK_STREAM;
2354	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2355	<
2356	<	if (getaddrinfo(yylval.string, NULL, &hints, &res))
2357	<	ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
2358	<	else
2359	<	{
2360	<	assert(res != NULL);
2153	>	if (conf_parser_ctx.pass != 2)
2154	>	break;
2155
2156	<	memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
2157	<	yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
2158	<	yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
2159	<	freeaddrinfo(res);
2160	<	}
2161	<	}
2156	>	if ($3[0] == ':')
2157	>	conf_error_report("Server passwords cannot begin with a colon");
2158	>	else if (strchr($3, ' ') != NULL)
2159	>	conf_error_report("Server passwords cannot contain spaces");
2160	>	else
2161	>	strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
2162		};
2163	<
2164	<	connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2163	>
2164	>	connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2165		{
2166	<	if (conf_parser_ctx.pass == 2)
2167	<	{
2374	<	if ($3[0] == ':')
2375	<	yyerror("Server passwords cannot begin with a colon");
2376	<	else if (strchr($3, ' ') != NULL)
2377	<	yyerror("Server passwords cannot contain spaces");
2378	<	else {
2379	<	if (yy_aconf->spasswd != NULL)
2380	<	memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
2166	>	if (conf_parser_ctx.pass != 2)
2167	>	break;
2168
2169	<	MyFree(yy_aconf->spasswd);
2170	<	DupString(yy_aconf->spasswd, yylval.string);
2171	<	}
2172	<	}
2169	>	if ($3[0] == ':')
2170	>	conf_error_report("Server passwords cannot begin with a colon");
2171	>	else if (strchr($3, ' ') != NULL)
2172	>	conf_error_report("Server passwords cannot contain spaces");
2173	>	else
2174	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2175		};
2176
2177	<	connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2177	>	connect_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
2178		{
2179		if (conf_parser_ctx.pass == 2)
2180	<	{
2392	<	if ($3[0] == ':')
2393	<	yyerror("Server passwords cannot begin with a colon");
2394	<	else if (strchr($3, ' ') != NULL)
2395	<	yyerror("Server passwords cannot contain spaces");
2396	<	else {
2397	<	if (yy_aconf->passwd != NULL)
2398	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
2399	<
2400	<	MyFree(yy_aconf->passwd);
2401	<	DupString(yy_aconf->passwd, yylval.string);
2402	<	}
2403	<	}
2180	>	strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
2181		};
2182
2183		connect_port: PORT '=' NUMBER ';'
2184		{
2185		if (conf_parser_ctx.pass == 2)
2186	<	yy_aconf->port = $3;
2186	>	block_state.port.value = $3;
2187		};
2188
2189		connect_aftype: AFTYPE '=' T_IPV4 ';'
2190		{
2191		if (conf_parser_ctx.pass == 2)
2192	<	yy_aconf->aftype = AF_INET;
2192	>	block_state.aftype.value = AF_INET;
2193		} | AFTYPE '=' T_IPV6 ';'
2194		{
2195		#ifdef IPV6
2196		if (conf_parser_ctx.pass == 2)
2197	<	yy_aconf->aftype = AF_INET6;
2197	>	block_state.aftype.value = AF_INET6;
2198		#endif
2199		};
2200
2201		connect_flags: IRCD_FLAGS
2202		{
2203	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2204		} '='  connect_flags_items ';';
2205
2206		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2207	<	connect_flags_item: NOT  { not_atom = 1; } connect_flags_item_atom
2430	<	|  { not_atom = 0; } connect_flags_item_atom;
2431	<
2432	<	connect_flags_item_atom: COMPRESSED
2207	>	connect_flags_item: AUTOCONN
2208		{
2209		if (conf_parser_ctx.pass == 2)
2210	<	#ifndef HAVE_LIBZ
2211	<	yyerror("Ignoring flags = compressed; -- no zlib support");
2437	<	#else
2438	<	{
2439	<	if (not_atom)ClearConfCompressed(yy_aconf);
2440	<	else SetConfCompressed(yy_aconf);
2441	<	}
2442	<	#endif
2443	<	} | CRYPTLINK
2444	<	{
2445	<	if (conf_parser_ctx.pass == 2)
2446	<	{
2447	<	if (not_atom)ClearConfCryptLink(yy_aconf);
2448	<	else SetConfCryptLink(yy_aconf);
2449	<	}
2450	<	} | AUTOCONN
2451	<	{
2452	<	if (conf_parser_ctx.pass == 2)
2453	<	{
2454	<	if (not_atom)ClearConfAllowAutoConn(yy_aconf);
2455	<	else SetConfAllowAutoConn(yy_aconf);
2456	<	}
2457	<	} | BURST_AWAY
2210	>	block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2211	>	} | T_SSL
2212		{
2213		if (conf_parser_ctx.pass == 2)
2214	<	{
2461	<	if (not_atom)ClearConfAwayBurst(yy_aconf);
2462	<	else SetConfAwayBurst(yy_aconf);
2463	<	}
2464	<	} | TOPICBURST
2465	<	{
2466	<	if (conf_parser_ctx.pass == 2)
2467	<	{
2468	<	if (not_atom)ClearConfTopicBurst(yy_aconf);
2469	<	else SetConfTopicBurst(yy_aconf);
2470	<	}
2471	<	}
2472	<	;
2473	<
2474	<	connect_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
2475	<	{
2476	<	#ifdef HAVE_LIBCRYPTO
2477	<	if (conf_parser_ctx.pass == 2)
2478	<	{
2479	<	BIO *file;
2480	<
2481	<	if (yy_aconf->rsa_public_key != NULL)
2482	<	{
2483	<	RSA_free(yy_aconf->rsa_public_key);
2484	<	yy_aconf->rsa_public_key = NULL;
2485	<	}
2486	<
2487	<	if (yy_aconf->rsa_public_key_file != NULL)
2488	<	{
2489	<	MyFree(yy_aconf->rsa_public_key_file);
2490	<	yy_aconf->rsa_public_key_file = NULL;
2491	<	}
2492	<
2493	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
2494	<
2495	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
2496	<	{
2497	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
2498	<	break;
2499	<	}
2500	<
2501	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
2502	<
2503	<	if (yy_aconf->rsa_public_key == NULL)
2504	<	{
2505	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
2506	<	break;
2507	<	}
2508	<
2509	<	BIO_set_close(file, BIO_CLOSE);
2510	<	BIO_free(file);
2511	<	}
2512	<	#endif /* HAVE_LIBCRYPTO */
2214	>	block_state.flags.value |= CONF_FLAGS_SSL;
2215		};
2216
2217		connect_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 2517 | Line 2219 | connect_encrypted: ENCRYPTED '=' TBOOL '
2219		if (conf_parser_ctx.pass == 2)
2220		{
2221		if (yylval.number)
2222	<	yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
2222	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
2223		else
2224	<	yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
2224	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
2225		}
2226		};
2227
2228	<	connect_hub_mask: HUB_MASK '=' QSTRING ';'
2228	>	connect_hub_mask: HUB_MASK '=' QSTRING ';'
2229		{
2230		if (conf_parser_ctx.pass == 2)
2231	<	{
2530	<	struct CollectItem *yy_tmp;
2531	<
2532	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2533	<	DupString(yy_tmp->host, yylval.string);
2534	<	DupString(yy_tmp->user, "*");
2535	<	dlinkAdd(yy_tmp, &yy_tmp->node, &hub_conf_list);
2536	<	}
2231	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2232		};
2233
2234	<	connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2234	>	connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2235		{
2236		if (conf_parser_ctx.pass == 2)
2237	<	{
2543	<	struct CollectItem *yy_tmp;
2544	<
2545	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2546	<	DupString(yy_tmp->host, yylval.string);
2547	<	DupString(yy_tmp->user, "*");
2548	<	dlinkAdd(yy_tmp, &yy_tmp->node, &leaf_conf_list);
2549	<	}
2237	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
2238		};
2239
2240		connect_class: CLASS '=' QSTRING ';'
2241		{
2242		if (conf_parser_ctx.pass == 2)
2243	<	{
2556	<	MyFree(class_name);
2557	<	DupString(class_name, yylval.string);
2558	<	}
2243	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2244		};
2245
2246	<	connect_cipher_preference: CIPHER_PREFERENCE '=' QSTRING ';'
2246	>	connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2247		{
2248		#ifdef HAVE_LIBCRYPTO
2249		if (conf_parser_ctx.pass == 2)
2250	<	{
2566	<	struct EncCapability *ecap;
2567	<	const char *cipher_name;
2568	<	int found = 0;
2569	<
2570	<	yy_aconf->cipher_preference = NULL;
2571	<	cipher_name = yylval.string;
2572	<
2573	<	for (ecap = CipherTable; ecap->name; ecap++)
2574	<	{
2575	<	if ((irccmp(ecap->name, cipher_name) == 0) &&
2576	<	(ecap->cap & CAP_ENC_MASK))
2577	<	{
2578	<	yy_aconf->cipher_preference = ecap;
2579	<	found = 1;
2580	<	break;
2581	<	}
2582	<	}
2583	<
2584	<	if (!found)
2585	<	yyerror("Invalid cipher");
2586	<	}
2250	>	strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2251		#else
2252		if (conf_parser_ctx.pass == 2)
2253	<	yyerror("Ignoring cipher_preference -- no OpenSSL support");
2253	>	conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
2254		#endif
2255		};
2256
2257	+
2258		/***************************************************************************
2259		*  section kill
2260		***************************************************************************/
2261		kill_entry: KILL
2262		{
2263		if (conf_parser_ctx.pass == 2)
2264	<	{
2600	<	userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
2601	<	regex_ban = 0;
2602	<	}
2264	>	reset_block_state();
2265		} '{' kill_items '}' ';'
2266		{
2267	<	if (conf_parser_ctx.pass == 2)
2606	<	{
2607	<	if (userbuf[0] && hostbuf[0])
2608	<	{
2609	<	if (regex_ban)
2610	<	{
2611	<	#ifdef HAVE_LIBPCRE
2612	<	void *exp_user = NULL;
2613	<	void *exp_host = NULL;
2614	<	const char *errptr = NULL;
2615	<
2616	<	if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
2617	<	!(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
2618	<	{
2619	<	ilog(L_ERROR, "Failed to add regular expression based K-Line: %s",
2620	<	errptr);
2621	<	break;
2622	<	}
2623	<
2624	<	yy_aconf = map_to_conf(make_conf_item(RKLINE_TYPE));
2625	<	yy_aconf->regexuser = exp_user;
2626	<	yy_aconf->regexhost = exp_host;
2627	<
2628	<	DupString(yy_aconf->user, userbuf);
2629	<	DupString(yy_aconf->host, hostbuf);
2630	<
2631	<	if (reasonbuf[0])
2632	<	DupString(yy_aconf->reason, reasonbuf);
2633	<	else
2634	<	DupString(yy_aconf->reason, "No reason");
2635	<	#else
2636	<	ilog(L_ERROR, "Failed to add regular expression based K-Line: no PCRE support");
2637	<	break;
2638	<	#endif
2639	<	}
2640	<	else
2641	<	{
2642	<	yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
2267	>	struct MaskItem *conf = NULL;
2268
2269	<	DupString(yy_aconf->user, userbuf);
2270	<	DupString(yy_aconf->host, hostbuf);
2269	>	if (conf_parser_ctx.pass != 2)
2270	>	break;
2271
2272	<	if (reasonbuf[0])
2273	<	DupString(yy_aconf->reason, reasonbuf);
2274	<	else
2650	<	DupString(yy_aconf->reason, "No reason");
2651	<	add_conf_by_address(CONF_KILL, yy_aconf);
2652	<	}
2653	<	}
2272	>	if (!block_state.user.buf[0] ||
2273	>	!block_state.host.buf[0])
2274	>	break;
2275
2276	<	yy_aconf = NULL;
2277	<	}
2278	<	};
2276	>	conf = conf_make(CONF_KLINE);
2277	>	conf->user = xstrdup(block_state.user.buf);
2278	>	conf->host = xstrdup(block_state.host.buf);
2279
2280	<	kill_type: TYPE
2281	<	{
2282	<	} '='  kill_type_items ';';
2283	<
2284	<	kill_type_items: kill_type_items ',' kill_type_item | kill_type_item;
2664	<	kill_type_item: REGEX_T
2665	<	{
2666	<	if (conf_parser_ctx.pass == 2)
2667	<	regex_ban = 1;
2280	>	if (block_state.rpass.buf[0])
2281	>	conf->reason = xstrdup(block_state.rpass.buf);
2282	>	else
2283	>	conf->reason = xstrdup(CONF_NOREASON);
2284	>	add_conf_by_address(CONF_KLINE, conf);
2285		};
2286
2287		kill_items:     kill_items kill_item | kill_item;
2288	<	kill_item:      kill_user | kill_reason | kill_type | error;
2288	>	kill_item:      kill_user | kill_reason | error;
2289
2290		kill_user: USER '=' QSTRING ';'
2291		{
2292	+
2293		if (conf_parser_ctx.pass == 2)
2294		{
2295		struct split_nuh_item nuh;
2296
2297		nuh.nuhmask  = yylval.string;
2298		nuh.nickptr  = NULL;
2299	<	nuh.userptr  = userbuf;
2300	<	nuh.hostptr  = hostbuf;
2299	>	nuh.userptr  = block_state.user.buf;
2300	>	nuh.hostptr  = block_state.host.buf;
2301
2302		nuh.nicksize = 0;
2303	<	nuh.usersize = sizeof(userbuf);
2304	<	nuh.hostsize = sizeof(hostbuf);
2303	>	nuh.usersize = sizeof(block_state.user.buf);
2304	>	nuh.hostsize = sizeof(block_state.host.buf);
2305
2306		split_nuh(&nuh);
2307		}
2308		};
2309
2310	<	kill_reason: REASON '=' QSTRING ';'
2310	>	kill_reason: REASON '=' QSTRING ';'
2311		{
2312		if (conf_parser_ctx.pass == 2)
2313	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2313	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2314		};
2315
2316		/***************************************************************************
2317		*  section deny
2318		***************************************************************************/
2319	<	deny_entry: DENY
2319	>	deny_entry: DENY
2320		{
2321		if (conf_parser_ctx.pass == 2)
2322	<	hostbuf[0] = reasonbuf[0] = '\0';
2322	>	reset_block_state();
2323		} '{' deny_items '}' ';'
2324		{
2325	<	if (conf_parser_ctx.pass == 2)
2325	>	struct MaskItem *conf = NULL;
2326	>
2327	>	if (conf_parser_ctx.pass != 2)
2328	>	break;
2329	>
2330	>	if (!block_state.addr.buf[0])
2331	>	break;
2332	>
2333	>	if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2334		{
2335	<	if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
2336	<	{
2711	<	yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
2712	<	DupString(yy_aconf->host, hostbuf);
2335	>	conf = conf_make(CONF_DLINE);
2336	>	conf->host = xstrdup(block_state.addr.buf);
2337
2338	<	if (reasonbuf[0])
2339	<	DupString(yy_aconf->reason, reasonbuf);
2340	<	else
2341	<	DupString(yy_aconf->reason, "No reason");
2342	<	add_conf_by_address(CONF_DLINE, yy_aconf);
2719	<	yy_aconf = NULL;
2720	<	}
2338	>	if (block_state.rpass.buf[0])
2339	>	conf->reason = xstrdup(block_state.rpass.buf);
2340	>	else
2341	>	conf->reason = xstrdup(CONF_NOREASON);
2342	>	add_conf_by_address(CONF_DLINE, conf);
2343		}
2344	<	};
2344	>	};
2345
2346		deny_items:     deny_items deny_item | deny_item;
2347		deny_item:      deny_ip | deny_reason | error;
#	Line 2727 | Line 2349 | deny_item:      deny_ip | deny_reason |
2349		deny_ip: IP '=' QSTRING ';'
2350		{
2351		if (conf_parser_ctx.pass == 2)
2352	<	strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
2352	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2353		};
2354
2355	<	deny_reason: REASON '=' QSTRING ';'
2355	>	deny_reason: REASON '=' QSTRING ';'
2356		{
2357		if (conf_parser_ctx.pass == 2)
2358	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2358	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2359		};
2360
2361		/***************************************************************************
#	Line 2750 | Line 2372 | exempt_ip: IP '=' QSTRING ';'
2372		{
2373		if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2374		{
2375	<	yy_aconf = map_to_conf(make_conf_item(EXEMPTDLINE_TYPE));
2376	<	DupString(yy_aconf->host, yylval.string);
2375	>	struct MaskItem *conf = conf_make(CONF_EXEMPT);
2376	>	conf->host = xstrdup(yylval.string);
2377
2378	<	add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
2757	<	yy_aconf = NULL;
2378	>	add_conf_by_address(CONF_EXEMPT, conf);
2379		}
2380		}
2381		};
#	Line 2765 | Line 2386 | exempt_ip: IP '=' QSTRING ';'
2386		gecos_entry: GECOS
2387		{
2388		if (conf_parser_ctx.pass == 2)
2389	<	{
2769	<	regex_ban = 0;
2770	<	reasonbuf[0] = gecos_name[0] = '\0';
2771	<	}
2389	>	reset_block_state();
2390		} '{' gecos_items '}' ';'
2391		{
2392	<	if (conf_parser_ctx.pass == 2)
2775	<	{
2776	<	if (gecos_name[0])
2777	<	{
2778	<	if (regex_ban)
2779	<	{
2780	<	#ifdef HAVE_LIBPCRE
2781	<	void *exp_p = NULL;
2782	<	const char *errptr = NULL;
2783	<
2784	<	if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
2785	<	{
2786	<	ilog(L_ERROR, "Failed to add regular expression based X-Line: %s",
2787	<	errptr);
2788	<	break;
2789	<	}
2790	<
2791	<	yy_conf = make_conf_item(RXLINE_TYPE);
2792	<	yy_conf->regexpname = exp_p;
2793	<	#else
2794	<	ilog(L_ERROR, "Failed to add regular expression based X-Line: no PCRE support");
2795	<	break;
2796	<	#endif
2797	<	}
2798	<	else
2799	<	yy_conf = make_conf_item(XLINE_TYPE);
2392	>	struct MaskItem *conf = NULL;
2393
2394	<	yy_match_item = map_to_conf(yy_conf);
2395	<	DupString(yy_conf->name, gecos_name);
2394	>	if (conf_parser_ctx.pass != 2)
2395	>	break;
2396
2397	<	if (reasonbuf[0])
2398	<	DupString(yy_match_item->reason, reasonbuf);
2806	<	else
2807	<	DupString(yy_match_item->reason, "No reason");
2808	<	}
2809	<	}
2810	<	};
2397	>	if (!block_state.name.buf[0])
2398	>	break;
2399
2400	<	gecos_flags: TYPE
2401	<	{
2814	<	} '='  gecos_flags_items ';';
2400	>	conf = conf_make(CONF_XLINE);
2401	>	conf->name = xstrdup(block_state.name.buf);
2402
2403	<	gecos_flags_items: gecos_flags_items ',' gecos_flags_item | gecos_flags_item;
2404	<	gecos_flags_item: REGEX_T
2405	<	{
2406	<	if (conf_parser_ctx.pass == 2)
2820	<	regex_ban = 1;
2403	>	if (block_state.rpass.buf[0])
2404	>	conf->reason = xstrdup(block_state.rpass.buf);
2405	>	else
2406	>	conf->reason = xstrdup(CONF_NOREASON);
2407		};
2408
2409		gecos_items: gecos_items gecos_item | gecos_item;
2410	<	gecos_item:  gecos_name | gecos_reason | gecos_flags | error;
2410	>	gecos_item:  gecos_name | gecos_reason | error;
2411
2412	<	gecos_name: NAME '=' QSTRING ';'
2412	>	gecos_name: NAME '=' QSTRING ';'
2413		{
2414		if (conf_parser_ctx.pass == 2)
2415	<	strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
2415	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2416		};
2417
2418	<	gecos_reason: REASON '=' QSTRING ';'
2418	>	gecos_reason: REASON '=' QSTRING ';'
2419		{
2420		if (conf_parser_ctx.pass == 2)
2421	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2421	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2422		};
2423
2424		/***************************************************************************
#	Line 2847 | Line 2433 | general_item:       general_hide_spoof_i
2433		general_max_nick_time | general_max_nick_changes |
2434		general_max_accept | general_anti_spam_exit_message_time |
2435		general_ts_warn_delta | general_ts_max_delta |
2436	<	general_kill_chase_time_limit | general_kline_with_reason |
2437	<	general_kline_reason | general_invisible_on_connect |
2436	>	general_kill_chase_time_limit |
2437	>	general_invisible_on_connect |
2438		general_warn_no_nline | general_dots_in_ident |
2439		general_stats_o_oper_only | general_stats_k_oper_only |
2440		general_pace_wait | general_stats_i_oper_only |
2441		general_pace_wait_simple | general_stats_P_oper_only |
2442	+	general_stats_u_oper_only |
2443		general_short_motd | general_no_oper_flood |
2444		general_true_no_oper_flood | general_oper_pass_resv |
2858	–	general_message_locale |
2445		general_oper_only_umodes | general_max_targets |
2446		general_use_egd | general_egdpool_path |
2447		general_oper_umodes | general_caller_id_wait |
2448		general_opers_bypass_callerid | general_default_floodcount |
2449		general_min_nonwildcard | general_min_nonwildcard_simple |
2864	–	general_servlink_path | general_disable_remote_commands |
2865	–	general_default_cipher_preference |
2866	–	general_compression_level | general_client_flood |
2450		general_throttle_time | general_havent_read_conf |
2451		general_ping_cookie |
2452	<	general_disable_auth | general_burst_away |
2453	<	general_tkline_expire_notices | general_gline_min_cidr |
2454	<	general_gline_min_cidr6 | general_use_whois_actually |
2455	<	general_reject_hold_time | general_stats_e_disabled |
2452	>	general_disable_auth |
2453	>	general_tkline_expire_notices | general_gline_enable |
2454	>	general_gline_duration | general_gline_request_duration |
2455	>	general_gline_min_cidr |
2456	>	general_gline_min_cidr6 |
2457	>	general_stats_e_disabled |
2458		general_max_watch | general_services_name |
2459	+	general_cycle_on_host_change |
2460		error;
2461
2462
#	Line 2879 | Line 2465 | general_max_watch: MAX_WATCH '=' NUMBER
2465		ConfigFileEntry.max_watch = $3;
2466		};
2467
2468	<	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2468	>	general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2469		{
2470	<	ConfigFileEntry.gline_min_cidr = $3;
2470	>	if (conf_parser_ctx.pass == 2)
2471	>	ConfigFileEntry.cycle_on_host_change = yylval.number;
2472		};
2473
2474	<	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2474	>	general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2475		{
2476	<	ConfigFileEntry.gline_min_cidr6 = $3;
2476	>	if (conf_parser_ctx.pass == 2)
2477	>	ConfigFileEntry.glines = yylval.number;
2478		};
2479
2480	<	general_burst_away: BURST_AWAY '=' TBOOL ';'
2480	>	general_gline_duration: GLINE_DURATION '=' timespec ';'
2481		{
2482	<	ConfigFileEntry.burst_away = yylval.number;
2482	>	if (conf_parser_ctx.pass == 2)
2483	>	ConfigFileEntry.gline_time = $3;
2484		};
2485
2486	<	general_use_whois_actually: USE_WHOIS_ACTUALLY '=' TBOOL ';'
2486	>	general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2487		{
2488	<	ConfigFileEntry.use_whois_actually = yylval.number;
2488	>	if (conf_parser_ctx.pass == 2)
2489	>	ConfigFileEntry.gline_request_time = $3;
2490		};
2491
2492	<	general_reject_hold_time: TREJECT_HOLD_TIME '=' timespec ';'
2492	>	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2493		{
2494	<	GlobalSetOptions.rejecttime = yylval.number;
2494	>	ConfigFileEntry.gline_min_cidr = $3;
2495	>	};
2496	>
2497	>	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2498	>	{
2499	>	ConfigFileEntry.gline_min_cidr6 = $3;
2500		};
2501
2502		general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
#	Line 2924 | Line 2519 | general_ignore_bogus_ts: IGNORE_BOGUS_TS
2519		ConfigFileEntry.ignore_bogus_ts = yylval.number;
2520		};
2521
2927	–	general_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
2928	–	{
2929	–	ConfigFileEntry.disable_remote = yylval.number;
2930	–	};
2931	–
2522		general_failed_oper_notice: FAILED_OPER_NOTICE '=' TBOOL ';'
2523		{
2524		ConfigFileEntry.failed_oper_notice = yylval.number;
#	Line 2941 | Line 2531 | general_anti_nick_flood: ANTI_NICK_FLOOD
2531
2532		general_max_nick_time: MAX_NICK_TIME '=' timespec ';'
2533		{
2534	<	ConfigFileEntry.max_nick_time = $3;
2534	>	ConfigFileEntry.max_nick_time = $3;
2535		};
2536
2537		general_max_nick_changes: MAX_NICK_CHANGES '=' NUMBER ';'
#	Line 2974 | Line 2564 | general_havent_read_conf: HAVENT_READ_CO
2564		{
2565		if (($3 > 0) && conf_parser_ctx.pass == 1)
2566		{
2567	<	ilog(L_CRIT, "You haven't read your config file properly.");
2568	<	ilog(L_CRIT, "There is a line in the example conf that will kill your server if not removed.");
2569	<	ilog(L_CRIT, "Consider actually reading/editing the conf file, and removing this line.");
2567	>	ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
2568	>	ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
2569	>	ilog(LOG_TYPE_IRCD, "Consider actually reading/editing the conf file, and removing this line.");
2570		exit(0);
2571		}
2572		};
2573
2984	–	general_kline_with_reason: KLINE_WITH_REASON '=' TBOOL ';'
2985	–	{
2986	–	ConfigFileEntry.kline_with_reason = yylval.number;
2987	–	};
2988	–
2989	–	general_kline_reason: KLINE_REASON '=' QSTRING ';'
2990	–	{
2991	–	if (conf_parser_ctx.pass == 2)
2992	–	{
2993	–	MyFree(ConfigFileEntry.kline_reason);
2994	–	DupString(ConfigFileEntry.kline_reason, yylval.string);
2995	–	}
2996	–	};
2997	–
2574		general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2575		{
2576		ConfigFileEntry.invisible_on_connect = yylval.number;
#	Line 3020 | Line 2596 | general_stats_P_oper_only: STATS_P_OPER_
2596		ConfigFileEntry.stats_P_oper_only = yylval.number;
2597		};
2598
2599	+	general_stats_u_oper_only: STATS_U_OPER_ONLY '=' TBOOL ';'
2600	+	{
2601	+	ConfigFileEntry.stats_u_oper_only = yylval.number;
2602	+	};
2603	+
2604		general_stats_k_oper_only: STATS_K_OPER_ONLY '=' TBOOL ';'
2605		{
2606		ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
#	Line 3060 | Line 2641 | general_short_motd: SHORT_MOTD '=' TBOOL
2641		{
2642		ConfigFileEntry.short_motd = yylval.number;
2643		};
2644	<
2644	>
2645		general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
2646		{
2647		ConfigFileEntry.no_oper_flood = yylval.number;
#	Line 3076 | Line 2657 | general_oper_pass_resv: OPER_PASS_RESV '
2657		ConfigFileEntry.oper_pass_resv = yylval.number;
2658		};
2659
3079	–	general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
3080	–	{
3081	–	if (conf_parser_ctx.pass == 2)
3082	–	{
3083	–	if (strlen(yylval.string) > LOCALE_LENGTH-2)
3084	–	yylval.string[LOCALE_LENGTH-1] = '\0';
3085	–
3086	–	set_locale(yylval.string);
3087	–	}
3088	–	};
3089	–
2660		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2661		{
2662		ConfigFileEntry.dots_in_ident = $3;
#	Line 3097 | Line 2667 | general_max_targets: MAX_TARGETS '=' NUM
2667		ConfigFileEntry.max_targets = $3;
2668		};
2669
3100	–	general_servlink_path: SERVLINK_PATH '=' QSTRING ';'
3101	–	{
3102	–	if (conf_parser_ctx.pass == 2)
3103	–	{
3104	–	MyFree(ConfigFileEntry.servlink_path);
3105	–	DupString(ConfigFileEntry.servlink_path, yylval.string);
3106	–	}
3107	–	};
3108	–
3109	–	general_default_cipher_preference: DEFAULT_CIPHER_PREFERENCE '=' QSTRING ';'
3110	–	{
3111	–	#ifdef HAVE_LIBCRYPTO
3112	–	if (conf_parser_ctx.pass == 2)
3113	–	{
3114	–	struct EncCapability *ecap;
3115	–	const char *cipher_name;
3116	–	int found = 0;
3117	–
3118	–	ConfigFileEntry.default_cipher_preference = NULL;
3119	–	cipher_name = yylval.string;
3120	–
3121	–	for (ecap = CipherTable; ecap->name; ecap++)
3122	–	{
3123	–	if ((irccmp(ecap->name, cipher_name) == 0) &&
3124	–	(ecap->cap & CAP_ENC_MASK))
3125	–	{
3126	–	ConfigFileEntry.default_cipher_preference = ecap;
3127	–	found = 1;
3128	–	break;
3129	–	}
3130	–	}
3131	–
3132	–	if (!found)
3133	–	yyerror("Invalid cipher");
3134	–	}
3135	–	#else
3136	–	if (conf_parser_ctx.pass == 2)
3137	–	yyerror("Ignoring default_cipher_preference -- no OpenSSL support");
3138	–	#endif
3139	–	};
3140	–
3141	–	general_compression_level: COMPRESSION_LEVEL '=' NUMBER ';'
3142	–	{
3143	–	if (conf_parser_ctx.pass == 2)
3144	–	{
3145	–	ConfigFileEntry.compression_level = $3;
3146	–	#ifndef HAVE_LIBZ
3147	–	yyerror("Ignoring compression_level -- no zlib support");
3148	–	#else
3149	–	if ((ConfigFileEntry.compression_level < 1) ||
3150	–	(ConfigFileEntry.compression_level > 9))
3151	–	{
3152	–	yyerror("Ignoring invalid compression_level, using default");
3153	–	ConfigFileEntry.compression_level = 0;
3154	–	}
3155	–	#endif
3156	–	}
3157	–	};
3158	–
2670		general_use_egd: USE_EGD '=' TBOOL ';'
2671		{
2672		ConfigFileEntry.use_egd = yylval.number;
#	Line 3166 | Line 2677 | general_egdpool_path: EGDPOOL_PATH '=' Q
2677		if (conf_parser_ctx.pass == 2)
2678		{
2679		MyFree(ConfigFileEntry.egdpool_path);
2680	<	DupString(ConfigFileEntry.egdpool_path, yylval.string);
2680	>	ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
2681		}
2682		};
2683
#	Line 3175 | Line 2686 | general_services_name: T_SERVICES_NAME '
2686		if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2687		{
2688		MyFree(ConfigFileEntry.service_name);
2689	<	DupString(ConfigFileEntry.service_name, yylval.string);
2689	>	ConfigFileEntry.service_name = xstrdup(yylval.string);
2690		}
2691		};
2692
#	Line 3191 | Line 2702 | general_disable_auth: DISABLE_AUTH '=' T
2702
2703		general_throttle_time: THROTTLE_TIME '=' timespec ';'
2704		{
2705	<	ConfigFileEntry.throttle_time = yylval.number;
2705	>	ConfigFileEntry.throttle_time = $3;
2706		};
2707
2708		general_oper_umodes: OPER_UMODES
#	Line 3206 | Line 2717 | umode_oitem:     T_BOTS
2717		} | T_CCONN
2718		{
2719		ConfigFileEntry.oper_umodes |= UMODE_CCONN;
3209	–	} | T_CCONN_FULL
3210	–	{
3211	–	ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
2720		} | T_DEAF
2721		{
2722		ConfigFileEntry.oper_umodes |= UMODE_DEAF;
#	Line 3218 | Line 2726 | umode_oitem:     T_BOTS
2726		} | T_FULL
2727		{
2728		ConfigFileEntry.oper_umodes |= UMODE_FULL;
2729	+	} | HIDDEN
2730	+	{
2731	+	ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
2732		} | T_SKILL
2733		{
2734		ConfigFileEntry.oper_umodes |= UMODE_SKILL;
#	Line 3257 | Line 2768 | umode_oitem:     T_BOTS
2768		} | T_LOCOPS
2769		{
2770		ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
2771	+	} | T_NONONREG
2772	+	{
2773	+	ConfigFileEntry.oper_umodes |= UMODE_REGONLY;
2774	+	} | T_FARCONNECT
2775	+	{
2776	+	ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT;
2777		};
2778
2779	<	general_oper_only_umodes: OPER_ONLY_UMODES
2779	>	general_oper_only_umodes: OPER_ONLY_UMODES
2780		{
2781		ConfigFileEntry.oper_only_umodes = 0;
2782		} '='  umode_items ';' ;
2783
2784		umode_items:    umode_items ',' umode_item | umode_item;
2785	<	umode_item:     T_BOTS
2785	>	umode_item:     T_BOTS
2786		{
2787		ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
2788		} | T_CCONN
2789		{
2790		ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
3274	–	} | T_CCONN_FULL
3275	–	{
3276	–	ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
2791		} | T_DEAF
2792		{
2793		ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
#	Line 3281 | Line 2795 | umode_item:    T_BOTS
2795		{
2796		ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
2797		} | T_FULL
2798	<	{
2798	>	{
2799		ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
2800		} | T_SKILL
2801		{
2802		ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
2803	+	} | HIDDEN
2804	+	{
2805	+	ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
2806		} | T_NCHANGE
2807		{
2808		ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
#	Line 3322 | Line 2839 | umode_item:    T_BOTS
2839		} | T_LOCOPS
2840		{
2841		ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
2842	+	} | T_NONONREG
2843	+	{
2844	+	ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
2845	+	} | T_FARCONNECT
2846	+	{
2847	+	ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT;
2848		};
2849
2850		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
#	Line 3339 | Line 2862 | general_default_floodcount: DEFAULT_FLOO
2862		ConfigFileEntry.default_floodcount = $3;
2863		};
2864
3342	–	general_client_flood: T_CLIENT_FLOOD '=' sizespec ';'
3343	–	{
3344	–	ConfigFileEntry.client_flood = $3;
3345	–	};
3346	–
3347	–
3348	–	/***************************************************************************
3349	–	*  section glines
3350	–	***************************************************************************/
3351	–	gline_entry: GLINES
3352	–	{
3353	–	if (conf_parser_ctx.pass == 2)
3354	–	{
3355	–	yy_conf = make_conf_item(GDENY_TYPE);
3356	–	yy_aconf = map_to_conf(yy_conf);
3357	–	}
3358	–	} '{' gline_items '}' ';'
3359	–	{
3360	–	if (conf_parser_ctx.pass == 2)
3361	–	{
3362	–	/*
3363	–	* since we re-allocate yy_conf/yy_aconf after the end of action=, at the
3364	–	* end we will have one extra, so we should free it.
3365	–	*/
3366	–	if (yy_conf->name == NULL || yy_aconf->user == NULL)
3367	–	{
3368	–	delete_conf_item(yy_conf);
3369	–	yy_conf = NULL;
3370	–	yy_aconf = NULL;
3371	–	}
3372	–	}
3373	–	};
3374	–
3375	–	gline_items:        gline_items gline_item | gline_item;
3376	–	gline_item:         gline_enable |
3377	–	gline_duration |
3378	–	gline_logging |
3379	–	gline_user |
3380	–	gline_server |
3381	–	gline_action |
3382	–	error;
3383	–
3384	–	gline_enable: ENABLE '=' TBOOL ';'
3385	–	{
3386	–	if (conf_parser_ctx.pass == 2)
3387	–	ConfigFileEntry.glines = yylval.number;
3388	–	};
3389	–
3390	–	gline_duration: DURATION '=' timespec ';'
3391	–	{
3392	–	if (conf_parser_ctx.pass == 2)
3393	–	ConfigFileEntry.gline_time = $3;
3394	–	};
3395	–
3396	–	gline_logging: LOGGING
3397	–	{
3398	–	if (conf_parser_ctx.pass == 2)
3399	–	ConfigFileEntry.gline_logging = 0;
3400	–	} '=' gline_logging_types ';';
3401	–	gline_logging_types:     gline_logging_types ',' gline_logging_type_item | gline_logging_type_item;
3402	–	gline_logging_type_item: T_REJECT
3403	–	{
3404	–	if (conf_parser_ctx.pass == 2)
3405	–	ConfigFileEntry.gline_logging |= GDENY_REJECT;
3406	–	} | T_BLOCK
3407	–	{
3408	–	if (conf_parser_ctx.pass == 2)
3409	–	ConfigFileEntry.gline_logging |= GDENY_BLOCK;
3410	–	};
3411	–
3412	–	gline_user: USER '=' QSTRING ';'
3413	–	{
3414	–	if (conf_parser_ctx.pass == 2)
3415	–	{
3416	–	struct split_nuh_item nuh;
3417	–
3418	–	nuh.nuhmask  = yylval.string;
3419	–	nuh.nickptr  = NULL;
3420	–	nuh.userptr  = userbuf;
3421	–	nuh.hostptr  = hostbuf;
3422	–
3423	–	nuh.nicksize = 0;
3424	–	nuh.usersize = sizeof(userbuf);
3425	–	nuh.hostsize = sizeof(hostbuf);
3426	–
3427	–	split_nuh(&nuh);
3428	–
3429	–	if (yy_aconf->user == NULL)
3430	–	{
3431	–	DupString(yy_aconf->user, userbuf);
3432	–	DupString(yy_aconf->host, hostbuf);
3433	–	}
3434	–	else
3435	–	{
3436	–	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
3437	–
3438	–	DupString(yy_tmp->user, userbuf);
3439	–	DupString(yy_tmp->host, hostbuf);
3440	–
3441	–	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
3442	–	}
3443	–	}
3444	–	};
3445	–
3446	–	gline_server: NAME '=' QSTRING ';'
3447	–	{
3448	–	if (conf_parser_ctx.pass == 2)
3449	–	{
3450	–	MyFree(yy_conf->name);
3451	–	DupString(yy_conf->name, yylval.string);
3452	–	}
3453	–	};
3454	–
3455	–	gline_action: ACTION
3456	–	{
3457	–	if (conf_parser_ctx.pass == 2)
3458	–	yy_aconf->flags = 0;
3459	–	} '=' gdeny_types ';'
3460	–	{
3461	–	if (conf_parser_ctx.pass == 2)
3462	–	{
3463	–	struct CollectItem *yy_tmp = NULL;
3464	–	dlink_node *ptr, *next_ptr;
3465	–
3466	–	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3467	–	{
3468	–	struct AccessItem *new_aconf;
3469	–	struct ConfItem *new_conf;
3470	–
3471	–	yy_tmp = ptr->data;
3472	–	new_conf = make_conf_item(GDENY_TYPE);
3473	–	new_aconf = map_to_conf(new_conf);
3474	–
3475	–	new_aconf->flags = yy_aconf->flags;
3476	–
3477	–	if (yy_conf->name != NULL)
3478	–	DupString(new_conf->name, yy_conf->name);
3479	–	else
3480	–	DupString(new_conf->name, "*");
3481	–	if (yy_aconf->user != NULL)
3482	–	DupString(new_aconf->user, yy_tmp->user);
3483	–	else
3484	–	DupString(new_aconf->user, "*");
3485	–	if (yy_aconf->host != NULL)
3486	–	DupString(new_aconf->host, yy_tmp->host);
3487	–	else
3488	–	DupString(new_aconf->host, "*");
3489	–
3490	–	dlinkDelete(&yy_tmp->node, &col_conf_list);
3491	–	}
3492	–
3493	–	/*
3494	–	* In case someone has fed us with more than one action= after user/name
3495	–	* which would leak memory  -Michael
3496	–	*/
3497	–	if (yy_conf->name == NULL || yy_aconf->user == NULL)
3498	–	delete_conf_item(yy_conf);
3499	–
3500	–	yy_conf = make_conf_item(GDENY_TYPE);
3501	–	yy_aconf = map_to_conf(yy_conf);
3502	–	}
3503	–	};
3504	–
3505	–	gdeny_types: gdeny_types ',' gdeny_type_item | gdeny_type_item;
3506	–	gdeny_type_item: T_REJECT
3507	–	{
3508	–	if (conf_parser_ctx.pass == 2)
3509	–	yy_aconf->flags |= GDENY_REJECT;
3510	–	} | T_BLOCK
3511	–	{
3512	–	if (conf_parser_ctx.pass == 2)
3513	–	yy_aconf->flags |= GDENY_BLOCK;
3514	–	};
2865
2866		/***************************************************************************
2867		*  section channel
#	Line 3520 | Line 2870 | channel_entry: CHANNEL
2870		'{' channel_items '}' ';';
2871
2872		channel_items:      channel_items channel_item | channel_item;
2873	<	channel_item:       channel_disable_local_channels | channel_use_except |
2874	<	channel_use_invex | channel_use_knock |
2875	<	channel_max_bans | channel_knock_delay |
2876	<	channel_knock_delay_channel | channel_max_chans_per_user |
3527	<	channel_quiet_on_ban | channel_default_split_user_count |
2873	>	channel_item:       channel_max_bans |
2874	>	channel_knock_delay | channel_knock_delay_channel |
2875	>	channel_max_chans_per_user | channel_max_chans_per_oper |
2876	>	channel_default_split_user_count |
2877		channel_default_split_server_count |
2878	<	channel_no_create_on_split | channel_restrict_channels |
2879	<	channel_no_join_on_split | channel_burst_topicwho |
2878	>	channel_no_create_on_split |
2879	>	channel_no_join_on_split |
2880		channel_jflood_count | channel_jflood_time |
2881		channel_disable_fake_channels | error;
2882
#	Line 3536 | Line 2885 | channel_disable_fake_channels: DISABLE_F
2885		ConfigChannel.disable_fake_channels = yylval.number;
2886		};
2887
3539	–	channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
3540	–	{
3541	–	ConfigChannel.restrict_channels = yylval.number;
3542	–	};
3543	–
3544	–	channel_disable_local_channels: DISABLE_LOCAL_CHANNELS '=' TBOOL ';'
3545	–	{
3546	–	ConfigChannel.disable_local_channels = yylval.number;
3547	–	};
3548	–
3549	–	channel_use_except: USE_EXCEPT '=' TBOOL ';'
3550	–	{
3551	–	ConfigChannel.use_except = yylval.number;
3552	–	};
3553	–
3554	–	channel_use_invex: USE_INVEX '=' TBOOL ';'
3555	–	{
3556	–	ConfigChannel.use_invex = yylval.number;
3557	–	};
3558	–
3559	–	channel_use_knock: USE_KNOCK '=' TBOOL ';'
3560	–	{
3561	–	ConfigChannel.use_knock = yylval.number;
3562	–	};
3563	–
2888		channel_knock_delay: KNOCK_DELAY '=' timespec ';'
2889		{
2890		ConfigChannel.knock_delay = $3;
#	Line 3576 | Line 2900 | channel_max_chans_per_user: MAX_CHANS_PE
2900		ConfigChannel.max_chans_per_user = $3;
2901		};
2902
2903	<	channel_quiet_on_ban: QUIET_ON_BAN '=' TBOOL ';'
2903	>	channel_max_chans_per_oper: MAX_CHANS_PER_OPER '=' NUMBER ';'
2904		{
2905	<	ConfigChannel.quiet_on_ban = yylval.number;
2905	>	ConfigChannel.max_chans_per_oper = $3;
2906		};
2907
2908		channel_max_bans: MAX_BANS '=' NUMBER ';'
#	Line 3606 | Line 2930 | channel_no_join_on_split: NO_JOIN_ON_SPL
2930		ConfigChannel.no_join_on_split = yylval.number;
2931		};
2932
3609	–	channel_burst_topicwho: BURST_TOPICWHO '=' TBOOL ';'
3610	–	{
3611	–	ConfigChannel.burst_topicwho = yylval.number;
3612	–	};
3613	–
2933		channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
2934		{
2935		GlobalSetOptions.joinfloodcount = yylval.number;
#	Line 3618 | Line 2937 | channel_jflood_count: JOIN_FLOOD_COUNT '
2937
2938		channel_jflood_time: JOIN_FLOOD_TIME '=' timespec ';'
2939		{
2940	<	GlobalSetOptions.joinfloodtime = yylval.number;
2940	>	GlobalSetOptions.joinfloodtime = $3;
2941		};
2942
2943		/***************************************************************************
#	Line 3628 | Line 2947 | serverhide_entry: SERVERHIDE
2947		'{' serverhide_items '}' ';';
2948
2949		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
2950	<	serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
2950	>	serverhide_item:    serverhide_flatten_links | serverhide_disable_remote_commands |
2951	>	serverhide_hide_servers |
2952	>	serverhide_hide_services |
2953		serverhide_links_delay |
3633	–	serverhide_disable_hidden |
2954		serverhide_hidden | serverhide_hidden_name |
2955		serverhide_hide_server_ips |
2956		error;
#	Line 3641 | Line 2961 | serverhide_flatten_links: FLATTEN_LINKS
2961		ConfigServerHide.flatten_links = yylval.number;
2962		};
2963
2964	+	serverhide_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
2965	+	{
2966	+	if (conf_parser_ctx.pass == 2)
2967	+	ConfigServerHide.disable_remote_commands = yylval.number;
2968	+	};
2969	+
2970		serverhide_hide_servers: HIDE_SERVERS '=' TBOOL ';'
2971		{
2972		if (conf_parser_ctx.pass == 2)
2973		ConfigServerHide.hide_servers = yylval.number;
2974		};
2975
2976	+	serverhide_hide_services: HIDE_SERVICES '=' TBOOL ';'
2977	+	{
2978	+	if (conf_parser_ctx.pass == 2)
2979	+	ConfigServerHide.hide_services = yylval.number;
2980	+	};
2981	+
2982		serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2983		{
2984		if (conf_parser_ctx.pass == 2)
2985		{
2986		MyFree(ConfigServerHide.hidden_name);
2987	<	DupString(ConfigServerHide.hidden_name, yylval.string);
2987	>	ConfigServerHide.hidden_name = xstrdup(yylval.string);
2988		}
2989		};
2990
#	Line 3676 | Line 3008 | serverhide_hidden: HIDDEN '=' TBOOL ';'
3008		ConfigServerHide.hidden = yylval.number;
3009		};
3010
3679	–	serverhide_disable_hidden: DISABLE_HIDDEN '=' TBOOL ';'
3680	–	{
3681	–	if (conf_parser_ctx.pass == 2)
3682	–	ConfigServerHide.disable_hidden = yylval.number;
3683	–	};
3684	–
3011		serverhide_hide_server_ips: HIDE_SERVER_IPS '=' TBOOL ';'
3012		{
3013		if (conf_parser_ctx.pass == 2)

Diff Legend

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