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/conf_parser.y (file contents), Revision 1520 by michael, Wed Sep 5 15:50:02 2012 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 9857 by michael, Fri Jan 1 04:43:22 2021 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf_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-2021 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 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
21	–	*
22	–	*  $Id$
20		*/
21
22	<	%{
22	>	/*! \file conf_parser.y
23	>	* \brief Parses the ircd configuration file.
24	>	* \version $Id$
25	>	*/
26
27	<	#define YY_NO_UNPUT
28	<	#include <sys/types.h>
29	<	#include <string.h>
27	>
28	>	%{
29
30		#include "config.h"
31		#include "stdinc.h"
32		#include "ircd.h"
33		#include "list.h"
34	+	#include "parse.h"
35		#include "conf.h"
36	+	#include "conf_class.h"
37	+	#include "conf_cluster.h"
38	+	#include "conf_gecos.h"
39	+	#include "conf_pseudo.h"
40	+	#include "conf_resv.h"
41	+	#include "conf_service.h"
42	+	#include "conf_shared.h"
43		#include "event.h"
44	+	#include "id.h"
45		#include "log.h"
38	–	#include "client.h"     /* for UMODE_ALL only */
46		#include "irc_string.h"
40	–	#include "sprintf_irc.h"
47		#include "memory.h"
48		#include "modules.h"
49	<	#include "s_serv.h"
49	>	#include "server.h"
50		#include "hostmask.h"
45	–	#include "send.h"
51		#include "listener.h"
52	<	#include "resv.h"
53	<	#include "numeric.h"
49	<	#include "s_user.h"
50	<
51	<	#ifdef HAVE_LIBCRYPTO
52	<	#include <openssl/rsa.h>
53	<	#include <openssl/bio.h>
54	<	#include <openssl/pem.h>
55	<	#include <openssl/dh.h>
56	<	#endif
52	>	#include "user.h"
53	>	#include "motd.h"
54
55		int yylex(void);
56
57	<	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 unsigned int listener_flags = 0;
66	<	static unsigned int regex_ban = 0;
67	<	static char userbuf[IRCD_BUFSIZE];
68	<	static char hostbuf[IRCD_BUFSIZE];
69	<	static char reasonbuf[REASONLEN + 1];
70	<	static char gecos_name[REALLEN * 4];
71	<	static char lfile[IRCD_BUFSIZE];
72	<	static unsigned int ltype = 0;
73	<	static unsigned int lsize = 0;
74	<	static char *resv_reason = NULL;
75	<	static char *listener_address = NULL;
76	<
77	<	struct CollectItem
78	<	{
79	<	dlink_node node;
80	<	char *name;
81	<	char *user;
82	<	char *host;
83	<	char *passwd;
84	<	int  port;
85	<	int  flags;
86	<	#ifdef HAVE_LIBCRYPTO
87	<	char *rsa_public_key_file;
88	<	RSA *rsa_public_key;
89	<	#endif
90	<	};
57	>	static struct
58	>	{
59	>	struct
60	>	{
61	>	dlink_list list;
62	>	} mask,
63	>	leaf,
64	>	hub;
65	>
66	>	struct
67	>	{
68	>	char buf[IRCD_BUFSIZE];
69	>	} name,
70	>	nick,
71	>	user,
72	>	host,
73	>	addr,
74	>	bind,
75	>	file,
76	>	ciph,
77	>	cert,
78	>	rpass,
79	>	spass,
80	>	whois,
81	>	class,
82	>	target,
83	>	prepend,
84	>	command;
85	>
86	>	struct
87	>	{
88	>	unsigned int value;
89	>	} flags,
90	>	modes,
91	>	size,
92	>	type,
93	>	port,
94	>	timeout,
95	>	aftype,
96	>	ping_freq,
97	>	max_perip_local,
98	>	max_perip_global,
99	>	con_freq,
100	>	min_idle,
101	>	max_idle,
102	>	max_total,
103	>	max_sendq,
104	>	max_recvq,
105	>	max_channels,
106	>	cidr_bitlen_ipv4,
107	>	cidr_bitlen_ipv6,
108	>	number_per_cidr;
109	>	} block_state;
110
111		static void
112	<	free_collect_item(struct CollectItem *item)
112	>	reset_block_state(void)
113		{
114	<	MyFree(item->name);
115	<	MyFree(item->user);
116	<	MyFree(item->host);
117	<	MyFree(item->passwd);
118	<	#ifdef HAVE_LIBCRYPTO
119	<	MyFree(item->rsa_public_key_file);
120	<	#endif
121	<	MyFree(item);
114	>	dlink_node *node, *node_next;
115	>	dlink_list *tab[] = { &block_state.mask.list,
116	>	&block_state.leaf.list, &block_state.hub.list, NULL };
117	>
118	>	for (dlink_list **list = tab; *list; ++list)
119	>	{
120	>	DLINK_FOREACH_SAFE(node, node_next, (*list)->head)
121	>	{
122	>	xfree(node->data);
123	>	dlinkDelete(node, *list);
124	>	free_dlink_node(node);
125	>	}
126	>	}
127	>
128	>	memset(&block_state, 0, sizeof(block_state));
129		}
130
131		%}
#	Line 118 | Line 141 | free_collect_item(struct CollectItem *it
141		%token  ANTI_NICK_FLOOD
142		%token  ANTI_SPAM_EXIT_MESSAGE_TIME
143		%token  AUTOCONN
144	+	%token  AWAY_COUNT
145	+	%token  AWAY_TIME
146	+	%token  BOT
147		%token  BYTES KBYTES MBYTES
148		%token  CALLER_ID_WAIT
149		%token  CAN_FLOOD
150		%token  CHANNEL
151	<	%token  CIDR_BITLEN_IPV4
152	<	%token  CIDR_BITLEN_IPV6
151	>	%token  CIDR_BITLEN_IPV4
152	>	%token  CIDR_BITLEN_IPV6
153		%token  CLASS
154	+	%token  CLIENT
155	+	%token  CLOSE
156		%token  CONNECT
157		%token  CONNECTFREQ
158	+	%token  CYCLE_ON_HOST_CHANGE
159		%token  DEFAULT_FLOODCOUNT
160	<	%token  DEFAULT_SPLIT_SERVER_COUNT
161	<	%token  DEFAULT_SPLIT_USER_COUNT
160	>	%token  DEFAULT_FLOODTIME
161	>	%token  DEFAULT_JOIN_FLOOD_COUNT
162	>	%token  DEFAULT_JOIN_FLOOD_TIME
163	>	%token  DEFAULT_MAX_CLIENTS
164	>	%token  DEFER
165		%token  DENY
166		%token  DESCRIPTION
167		%token  DIE
168		%token  DISABLE_AUTH
169		%token  DISABLE_FAKE_CHANNELS
170		%token  DISABLE_REMOTE_COMMANDS
171	+	%token  DLINE_MIN_CIDR
172	+	%token  DLINE_MIN_CIDR6
173		%token  DOTS_IN_IDENT
140	–	%token  EGDPOOL_PATH
174		%token  EMAIL
175	+	%token  ENABLE_EXTBANS
176		%token  ENCRYPTED
177		%token  EXCEED_LIMIT
178		%token  EXEMPT
179	+	%token  EXPIRATION
180		%token  FAILED_OPER_NOTICE
146	–	%token  IRCD_FLAGS
181		%token  FLATTEN_LINKS
182	+	%token  FLATTEN_LINKS_DELAY
183	+	%token  FLATTEN_LINKS_FILE
184		%token  GECOS
185		%token  GENERAL
150	–	%token  GLINE
151	–	%token  GLINE_DURATION
152	–	%token  GLINE_ENABLE
153	–	%token  GLINE_EXEMPT
154	–	%token  GLINE_REQUEST_DURATION
155	–	%token  GLINE_MIN_CIDR
156	–	%token  GLINE_MIN_CIDR6
157	–	%token  GLOBAL_KILL
158	–	%token  IRCD_AUTH
159	–	%token  NEED_IDENT
160	–	%token  HAVENT_READ_CONF
186		%token  HIDDEN
187	<	%token  HIDDEN_NAME
187	>	%token  HIDDEN_NAME
188	>	%token  HIDE_CHANS
189	>	%token  HIDE_IDLE
190	>	%token  HIDE_IDLE_FROM_OPERS
191		%token  HIDE_SERVER_IPS
192		%token  HIDE_SERVERS
193	<	%token  HIDE_SPOOF_IPS
193	>	%token  HIDE_SERVICES
194		%token  HOST
195		%token  HUB
196		%token  HUB_MASK
169	–	%token  IGNORE_BOGUS_TS
197		%token  INVISIBLE_ON_CONNECT
198	+	%token  INVITE_CLIENT_COUNT
199	+	%token  INVITE_CLIENT_TIME
200	+	%token  INVITE_DELAY_CHANNEL
201	+	%token  INVITE_EXPIRE_TIME
202		%token  IP
203	+	%token  IRCD_AUTH
204	+	%token  IRCD_FLAGS
205	+	%token  IRCD_SID
206	+	%token  JOIN
207		%token  KILL
208	<	%token  KILL_CHASE_TIME_LIMIT
208	>	%token  KILL_CHASE_TIME_LIMIT
209		%token  KLINE
210		%token  KLINE_EXEMPT
211	<	%token  KLINE_REASON
212	<	%token  KLINE_WITH_REASON
213	<	%token  KNOCK_DELAY
211	>	%token  KLINE_MIN_CIDR
212	>	%token  KLINE_MIN_CIDR6
213	>	%token  KNOCK_CLIENT_COUNT
214	>	%token  KNOCK_CLIENT_TIME
215		%token  KNOCK_DELAY_CHANNEL
216		%token  LEAF_MASK
181	–	%token  LINKS_DELAY
217		%token  LISTEN
218	<	%token  T_LOG
218	>	%token  MASK
219		%token  MAX_ACCEPT
220		%token  MAX_BANS
221	<	%token  MAX_CHANS_PER_OPER
222	<	%token  MAX_CHANS_PER_USER
223	<	%token  MAX_GLOBAL
224	<	%token  MAX_IDENT
225	<	%token  MAX_LOCAL
221	>	%token  MAX_BANS_LARGE
222	>	%token  MAX_CHANNELS
223	>	%token  MAX_IDLE
224	>	%token  MAX_INVITES
225	>	%token  MAX_MONITOR
226		%token  MAX_NICK_CHANGES
227	+	%token  MAX_NICK_LENGTH
228		%token  MAX_NICK_TIME
229		%token  MAX_NUMBER
230		%token  MAX_TARGETS
231	<	%token  MAX_WATCH
232	<	%token  MESSAGE_LOCALE
231	>	%token  MAX_TOPIC_LENGTH
232	>	%token  MIN_IDLE
233		%token  MIN_NONWILDCARD
234		%token  MIN_NONWILDCARD_SIMPLE
235		%token  MODULE
236		%token  MODULES
237	+	%token  MOTD
238		%token  NAME
239	+	%token  NEED_IDENT
240		%token  NEED_PASSWORD
241	<	%token  NETWORK_DESC
241	>	%token  NETWORK_DESCRIPTION
242		%token  NETWORK_NAME
243		%token  NICK
206	–	%token  NICK_CHANGES
207	–	%token  NO_CREATE_ON_SPLIT
208	–	%token  NO_JOIN_ON_SPLIT
244		%token  NO_OPER_FLOOD
245		%token  NO_TILDE
211	–	%token  NUMBER
246		%token  NUMBER_PER_CIDR
247	<	%token  NUMBER_PER_IP
248	<	%token  OPERATOR
215	<	%token  OPERS_BYPASS_CALLERID
247	>	%token  NUMBER_PER_IP_GLOBAL
248	>	%token  NUMBER_PER_IP_LOCAL
249		%token  OPER_ONLY_UMODES
217	–	%token  OPER_PASS_RESV
218	–	%token  OPER_SPY_T
250		%token  OPER_UMODES
251	<	%token  JOIN_FLOOD_COUNT
252	<	%token  JOIN_FLOOD_TIME
251	>	%token  OPERATOR
252	>	%token  OPERS_BYPASS_CALLERID
253		%token  PACE_WAIT
254		%token  PACE_WAIT_SIMPLE
255		%token  PASSWORD
256		%token  PATH
257		%token  PING_COOKIE
258		%token  PING_TIME
228	–	%token  PING_WARNING
259		%token  PORT
260	<	%token  QSTRING
231	<	%token  QUIET_ON_BAN
260	>	%token  RANDOM_IDLE
261		%token  REASON
262		%token  REDIRPORT
263		%token  REDIRSERV
235	–	%token  REGEX_T
264		%token  REHASH
237	–	%token  TREJECT_HOLD_TIME
265		%token  REMOTE
266		%token  REMOTEBAN
240	–	%token  RESTRICT_CHANNELS
241	–	%token  RSA_PRIVATE_KEY_FILE
242	–	%token  RSA_PUBLIC_KEY_FILE
243	–	%token  SSL_CERTIFICATE_FILE
244	–	%token  SSL_DH_PARAM_FILE
245	–	%token  T_SSL_CLIENT_METHOD
246	–	%token  T_SSL_SERVER_METHOD
247	–	%token  T_SSLV3
248	–	%token  T_TLSV1
267		%token  RESV
268		%token  RESV_EXEMPT
269	<	%token  SECONDS MINUTES HOURS DAYS WEEKS
270	<	%token  SENDQ
269	>	%token  RSA_PRIVATE_KEY_FILE
270	>	%token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
271		%token  SEND_PASSWORD
272	+	%token  SENDQ
273		%token  SERVERHIDE
274		%token  SERVERINFO
256	–	%token  IRCD_SID
257	–	%token  TKLINE_EXPIRE_NOTICES
258	–	%token  T_SHARED
259	–	%token  T_CLUSTER
260	–	%token  TYPE
275		%token  SHORT_MOTD
276		%token  SPOOF
277	<	%token  SPOOF_NOTICE
277	>	%token  SQUIT
278		%token  STATS_E_DISABLED
279		%token  STATS_I_OPER_ONLY
280		%token  STATS_K_OPER_ONLY
281	+	%token  STATS_M_OPER_ONLY
282		%token  STATS_O_OPER_ONLY
283		%token  STATS_P_OPER_ONLY
284	<	%token  TBOOL
270	<	%token  TMASKED
271	<	%token  TS_MAX_DELTA
272	<	%token  TS_WARN_DELTA
273	<	%token  TWODOTS
284	>	%token  STATS_U_OPER_ONLY
285		%token  T_ALL
286	<	%token  T_BOTS
276	<	%token  T_SOFTCALLERID
286	>	%token  T_BIND
287		%token  T_CALLERID
288		%token  T_CCONN
289	<	%token  T_CCONN_FULL
290	<	%token  T_SSL_CIPHER_LIST
289	>	%token  T_COMMAND
290	>	%token  T_CLUSTER
291		%token  T_DEAF
292		%token  T_DEBUG
293		%token  T_DLINE
294		%token  T_EXTERNAL
295	<	%token  T_FULL
295	>	%token  T_FARCONNECT
296	>	%token  T_FILE
297	>	%token  T_FLOOD
298	>	%token  T_GLOBOPS
299		%token  T_INVISIBLE
300		%token  T_IPV4
301		%token  T_IPV6
302		%token  T_LOCOPS
303	<	%token  T_MAX_CLIENTS
303	>	%token  T_LOG
304		%token  T_NCHANGE
305	<	%token  T_OPERWALL
305	>	%token  T_NONONREG
306	>	%token  T_OPME
307	>	%token  T_PREPEND
308	>	%token  T_PSEUDO
309		%token  T_RECVQ
310		%token  T_REJ
311	+	%token  T_RESTART
312		%token  T_SERVER
313	+	%token  T_SERVICE
314		%token  T_SERVNOTICE
315		%token  T_SET
316	+	%token  T_SHARED
317	+	%token  T_SIZE
318		%token  T_SKILL
319	+	%token  T_SOFTCALLERID
320		%token  T_SPY
321	<	%token  T_SSL
321	>	%token  T_TARGET
322	>	%token  T_TLS
323		%token  T_UMODES
302	–	%token  T_UNAUTH
324		%token  T_UNDLINE
325		%token  T_UNLIMITED
326		%token  T_UNRESV
327		%token  T_UNXLINE
307	–	%token  T_GLOBOPS
328		%token  T_WALLOP
329	<	%token  T_RESTART
330	<	%token  T_SERVICE
331	<	%token  T_SERVICES_NAME
329	>	%token  T_WALLOPS
330	>	%token  T_WEBIRC
331	>	%token  TBOOL
332	>	%token  THROTTLE_COUNT
333		%token  THROTTLE_TIME
334	<	%token  TRUE_NO_OPER_FLOOD
334	>	%token  TIMEOUT
335	>	%token  TLS_CERTIFICATE_FILE
336	>	%token  TLS_CERTIFICATE_FINGERPRINT
337	>	%token  TLS_CIPHER_LIST
338	>	%token  TLS_CIPHER_SUITES
339	>	%token  TLS_CONNECTION_REQUIRED
340	>	%token  TLS_DH_PARAM_FILE
341	>	%token  TLS_MESSAGE_DIGEST_ALGORITHM
342	>	%token  TLS_SUPPORTED_GROUPS
343	>	%token  TS_MAX_DELTA
344	>	%token  TS_WARN_DELTA
345	>	%token  TWODOTS
346	>	%token  TYPE
347		%token  UNKLINE
315	–	%token  USER
316	–	%token  USE_EGD
348		%token  USE_LOGGING
349	<	%token  USE_WHOIS_ACTUALLY
349	>	%token  USER
350		%token  VHOST
351		%token  VHOST6
352	+	%token  WARN_NO_CONNECT_BLOCK
353	+	%token  WHOIS
354	+	%token  WHOWAS_HISTORY_LENGTH
355		%token  XLINE
356	<	%token  WARN_NO_NLINE
323	<	%token  T_SIZE
324	<	%token  T_FILE
356	>	%token  XLINE_EXEMPT
357
358	<	%type <string> QSTRING
359	<	%type <number> NUMBER
360	<	%type <number> timespec
361	<	%type <number> timespec_
362	<	%type <number> sizespec
363	<	%type <number> sizespec_
358	>	%token  <string> QSTRING
359	>	%token  <number> NUMBER
360	>	%type  <number> timespec
361	>	%type  <number> timespec_
362	>	%type  <number> sizespec
363	>	%type  <number> sizespec_
364
365		%%
366	<	conf:
366	>	conf:
367		| conf conf_item
368		;
369
370		conf_item:        admin_entry
371		| logging_entry
372		| oper_entry
373	<	| channel_entry
374	<	| class_entry
373	>	| channel_entry
374	>	| class_entry
375		| listen_entry
376		| auth_entry
377		| serverinfo_entry
378	<	| serverhide_entry
378	>	| serverhide_entry
379		| resv_entry
380		| service_entry
381		| shared_entry
382	<	| cluster_entry
382	>	| cluster_entry
383		| connect_entry
384		| kill_entry
385		| deny_entry
386	<	| exempt_entry
387	<	| general_entry
386	>	| exempt_entry
387	>	| general_entry
388		| gecos_entry
389		| modules_entry
390	+	| motd_entry
391	+	| pseudo_entry
392		| error ';'
393		| error '}'
394		;
395
396
397		timespec_: { $$ = 0; } | timespec;
398	<	timespec:       NUMBER timespec_
399	<	{
400	<	$$ = $1 + $2;
401	<	}
402	<	| NUMBER SECONDS timespec_
403	<	{
404	<	$$ = $1 + $3;
405	<	}
406	<	| NUMBER MINUTES timespec_
407	<	{
408	<	$$ = $1 * 60 + $3;
409	<	}
410	<	| NUMBER HOURS timespec_
411	<	{
412	<	$$ = $1 * 60 * 60 + $3;
413	<	}
380	<	| NUMBER DAYS timespec_
381	<	{
382	<	$$ = $1 * 60 * 60 * 24 + $3;
383	<	}
384	<	| NUMBER WEEKS timespec_
385	<	{
386	<	$$ = $1 * 60 * 60 * 24 * 7 + $3;
387	<	}
388	<	;
389	<
390	<	sizespec_:      { $$ = 0; } | sizespec;
391	<	sizespec:       NUMBER sizespec_ { $$ = $1 + $2; }
392	<	| NUMBER BYTES sizespec_ { $$ = $1 + $3; }
393	<	| NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; }
394	<	| NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
395	<	;
398	>	timespec:  NUMBER timespec_         { $$ = $1 + $2; } |
399	>	NUMBER SECONDS timespec_ { $$ = $1 + $3; } |
400	>	NUMBER MINUTES timespec_ { $$ = $1 * 60 + $3; } |
401	>	NUMBER HOURS timespec_   { $$ = $1 * 60 * 60 + $3; } |
402	>	NUMBER DAYS timespec_    { $$ = $1 * 60 * 60 * 24 + $3; } |
403	>	NUMBER WEEKS timespec_   { $$ = $1 * 60 * 60 * 24 * 7 + $3; } |
404	>	NUMBER MONTHS timespec_  { $$ = $1 * 60 * 60 * 24 * 7 * 4 + $3; } |
405	>	NUMBER YEARS timespec_   { $$ = $1 * 60 * 60 * 24 * 365 + $3; }
406	>	;
407	>
408	>	sizespec_:  { $$ = 0; } | sizespec;
409	>	sizespec:   NUMBER sizespec_ { $$ = $1 + $2; } |
410	>	NUMBER BYTES sizespec_ { $$ = $1 + $3; } |
411	>	NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; } |
412	>	NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
413	>	;
414
415
416		/***************************************************************************
417	<	*  section modules
417	>	* modules {} section
418		***************************************************************************/
419	<	modules_entry: MODULES
402	<	'{' modules_items '}' ';';
419	>	modules_entry: MODULES '{' modules_items '}' ';';
420
421		modules_items:  modules_items modules_item | modules_item;
422		modules_item:   modules_module | modules_path | error ';' ;
#	Line 417 | Line 434 | modules_path: PATH '=' QSTRING ';'
434		};
435
436
437	+	/***************************************************************************
438	+	* serverinfo {} section
439	+	***************************************************************************/
440		serverinfo_entry: SERVERINFO '{' serverinfo_items '}' ';';
441
442		serverinfo_items:       serverinfo_items serverinfo_item | serverinfo_item ;
443	<	serverinfo_item:        serverinfo_name | serverinfo_vhost |
444	<	serverinfo_hub | serverinfo_description |
445	<	serverinfo_network_name | serverinfo_network_desc |
446	<	serverinfo_max_clients | serverinfo_ssl_dh_param_file |
447	<	serverinfo_rsa_private_key_file | serverinfo_vhost6 |
448	<	serverinfo_sid | serverinfo_ssl_certificate_file |
449	<	serverinfo_ssl_client_method | serverinfo_ssl_server_method |
450	<	serverinfo_ssl_cipher_list |
451	<	error ';' ;
452	<
453	<
454	<	serverinfo_ssl_client_method: T_SSL_CLIENT_METHOD '=' client_method_types ';' ;
455	<	serverinfo_ssl_server_method: T_SSL_SERVER_METHOD '=' server_method_types ';' ;
456	<
457	<	client_method_types: client_method_types ',' client_method_type_item | client_method_type_item;
458	<	client_method_type_item: T_SSLV3
459	<	{
460	<	#ifdef HAVE_LIBCRYPTO
461	<	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
462	<	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv3);
443	<	#endif
444	<	} | T_TLSV1
443	>	serverinfo_item:        serverinfo_name |
444	>	serverinfo_hub |
445	>	serverinfo_description |
446	>	serverinfo_network_name |
447	>	serverinfo_network_description |
448	>	serverinfo_default_max_clients |
449	>	serverinfo_max_nick_length |
450	>	serverinfo_max_topic_length |
451	>	serverinfo_tls_dh_param_file |
452	>	serverinfo_tls_supported_groups |
453	>	serverinfo_rsa_private_key_file |
454	>	serverinfo_sid |
455	>	serverinfo_tls_certificate_file |
456	>	serverinfo_tls_cipher_list |
457	>	serverinfo_tls_cipher_suites |
458	>	serverinfo_tls_message_digest_algorithm |
459	>	error ';' ;
460	>
461	>
462	>	serverinfo_tls_certificate_file: TLS_CERTIFICATE_FILE '=' QSTRING ';'
463		{
464	<	#ifdef HAVE_LIBCRYPTO
465	<	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
466	<	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_TLSv1);
467	<	#endif
464	>	if (conf_parser_ctx.pass == 2)
465	>	{
466	>	xfree(ConfigServerInfo.tls_certificate_file);
467	>	ConfigServerInfo.tls_certificate_file = xstrdup(yylval.string);
468	>	}
469		};
470
471	<	server_method_types: server_method_types ',' server_method_type_item | server_method_type_item;
453	<	server_method_type_item: T_SSLV3
454	<	{
455	<	#ifdef HAVE_LIBCRYPTO
456	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
457	<	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
458	<	#endif
459	<	} | T_TLSV1
471	>	serverinfo_rsa_private_key_file: RSA_PRIVATE_KEY_FILE '=' QSTRING ';'
472		{
473	<	#ifdef HAVE_LIBCRYPTO
474	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
475	<	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
476	<	#endif
473	>	if (conf_parser_ctx.pass == 2)
474	>	{
475	>	xfree(ConfigServerInfo.rsa_private_key_file);
476	>	ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
477	>	}
478		};
479
480	<	serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
480	>	serverinfo_tls_dh_param_file: TLS_DH_PARAM_FILE '=' QSTRING ';'
481		{
482	<	#ifdef HAVE_LIBCRYPTO
470	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
482	>	if (conf_parser_ctx.pass == 2)
483		{
484	<	if (!ServerInfo.rsa_private_key_file)
485	<	{
474	<	yyerror("No rsa_private_key_file specified, SSL disabled");
475	<	break;
476	<	}
477	<
478	<	if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
479	<	SSL_FILETYPE_PEM) <= 0 ||
480	<	SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
481	<	SSL_FILETYPE_PEM) <= 0)
482	<	{
483	<	yyerror(ERR_lib_error_string(ERR_get_error()));
484	<	break;
485	<	}
486	<
487	<	if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
488	<	SSL_FILETYPE_PEM) <= 0 ||
489	<	SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
490	<	SSL_FILETYPE_PEM) <= 0)
491	<	{
492	<	yyerror(ERR_lib_error_string(ERR_get_error()));
493	<	break;
494	<	}
495	<
496	<	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
497	<	!SSL_CTX_check_private_key(ServerInfo.client_ctx))
498	<	{
499	<	yyerror(ERR_lib_error_string(ERR_get_error()));
500	<	break;
501	<	}
484	>	xfree(ConfigServerInfo.tls_dh_param_file);
485	>	ConfigServerInfo.tls_dh_param_file = xstrdup(yylval.string);
486		}
503	–	#endif
487		};
488
489	<	serverinfo_rsa_private_key_file: RSA_PRIVATE_KEY_FILE '=' QSTRING ';'
489	>	serverinfo_tls_cipher_list: TLS_CIPHER_LIST '=' QSTRING ';'
490		{
491	<	#ifdef HAVE_LIBCRYPTO
509	<	if (conf_parser_ctx.pass == 1)
491	>	if (conf_parser_ctx.pass == 2)
492		{
493	<	BIO *file;
494	<
513	<	if (ServerInfo.rsa_private_key)
514	<	{
515	<	RSA_free(ServerInfo.rsa_private_key);
516	<	ServerInfo.rsa_private_key = NULL;
517	<	}
518	<
519	<	if (ServerInfo.rsa_private_key_file)
520	<	{
521	<	MyFree(ServerInfo.rsa_private_key_file);
522	<	ServerInfo.rsa_private_key_file = NULL;
523	<	}
524	<
525	<	DupString(ServerInfo.rsa_private_key_file, yylval.string);
526	<
527	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
528	<	{
529	<	yyerror("File open failed, ignoring");
530	<	break;
531	<	}
532	<
533	<	ServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
534	<
535	<	BIO_set_close(file, BIO_CLOSE);
536	<	BIO_free(file);
537	<
538	<	if (ServerInfo.rsa_private_key == NULL)
539	<	{
540	<	yyerror("Couldn't extract key, ignoring");
541	<	break;
542	<	}
543	<
544	<	if (!RSA_check_key(ServerInfo.rsa_private_key))
545	<	{
546	<	RSA_free(ServerInfo.rsa_private_key);
547	<	ServerInfo.rsa_private_key = NULL;
548	<
549	<	yyerror("Invalid key, ignoring");
550	<	break;
551	<	}
552	<
553	<	/* require 2048 bit (256 byte) key */
554	<	if (RSA_size(ServerInfo.rsa_private_key) != 256)
555	<	{
556	<	RSA_free(ServerInfo.rsa_private_key);
557	<	ServerInfo.rsa_private_key = NULL;
558	<
559	<	yyerror("Not a 2048 bit key, ignoring");
560	<	}
493	>	xfree(ConfigServerInfo.tls_cipher_list);
494	>	ConfigServerInfo.tls_cipher_list = xstrdup(yylval.string);
495		}
562	–	#endif
496		};
497
498	<	serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
498	>	serverinfo_tls_cipher_suites: TLS_CIPHER_SUITES '=' QSTRING ';'
499		{
500	<	/* TBD - XXX: error reporting */
568	<	#ifdef HAVE_LIBCRYPTO
569	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
500	>	if (conf_parser_ctx.pass == 2)
501		{
502	<	BIO *file = BIO_new_file(yylval.string, "r");
503	<
573	<	if (file)
574	<	{
575	<	DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
576	<
577	<	BIO_free(file);
578	<
579	<	if (dh)
580	<	{
581	<	if (DH_size(dh) < 128)
582	<	ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
583	<	else
584	<	SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
585	<
586	<	DH_free(dh);
587	<	}
588	<	}
502	>	xfree(ConfigServerInfo.tls_cipher_suites);
503	>	ConfigServerInfo.tls_cipher_suites = xstrdup(yylval.string);
504		}
590	–	#endif
505		};
506
507	<	serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
507	>	serverinfo_tls_message_digest_algorithm: TLS_MESSAGE_DIGEST_ALGORITHM '=' QSTRING ';'
508		{
509	<	#ifdef HAVE_LIBCRYPTO
510	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
511	<	SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
512	<	#endif
509	>	if (conf_parser_ctx.pass == 2)
510	>	{
511	>	xfree(ConfigServerInfo.tls_message_digest_algorithm);
512	>	ConfigServerInfo.tls_message_digest_algorithm = xstrdup(yylval.string);
513	>	}
514	>	}
515	>
516	>	serverinfo_tls_supported_groups: TLS_SUPPORTED_GROUPS '=' QSTRING ';'
517	>	{
518	>	if (conf_parser_ctx.pass == 2)
519	>	{
520	>	xfree(ConfigServerInfo.tls_supported_groups);
521	>	ConfigServerInfo.tls_supported_groups = xstrdup(yylval.string);
522	>	}
523		};
524
525	<	serverinfo_name: NAME '=' QSTRING ';'
525	>	serverinfo_name: NAME '=' QSTRING ';'
526		{
527	<	/* this isn't rehashable */
528	<	if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
527	>	/* This isn't rehashable */
528	>	if (conf_parser_ctx.pass == 2 && ConfigServerInfo.name == NULL)
529		{
530	<	if (valid_servname(yylval.string))
531	<	DupString(ServerInfo.name, yylval.string);
530	>	if (server_valid_name(yylval.string) == true)
531	>	ConfigServerInfo.name = xstrdup(yylval.string);
532		else
533		{
534	<	ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::name -- invalid name. Aborting.");
535	<	exit(0);
534	>	conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
535	>	exit(EXIT_FAILURE);
536		}
537		}
538		};
539
540	<	serverinfo_sid: IRCD_SID '=' QSTRING ';'
540	>	serverinfo_sid: IRCD_SID '=' QSTRING ';'
541		{
542	<	/* this isn't rehashable */
543	<	if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
542	>	/* This isn't rehashable */
543	>	if (conf_parser_ctx.pass == 2 && ConfigServerInfo.sid == NULL)
544		{
545		if (valid_sid(yylval.string))
546	<	DupString(ServerInfo.sid, yylval.string);
546	>	ConfigServerInfo.sid = xstrdup(yylval.string);
547		else
548		{
549	<	ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::sid -- invalid SID. Aborting.");
550	<	exit(0);
549	>	conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
550	>	exit(EXIT_FAILURE);
551		}
552		}
553		};
#	Line 632 | Line 556 | serverinfo_description: DESCRIPTION '='
556		{
557		if (conf_parser_ctx.pass == 2)
558		{
559	<	MyFree(ServerInfo.description);
560	<	DupString(ServerInfo.description,yylval.string);
559	>	xfree(ConfigServerInfo.description);
560	>	ConfigServerInfo.description = xstrdup(yylval.string);
561	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
562		}
563		};
564
#	Line 641 | Line 566 | serverinfo_network_name: NETWORK_NAME '=
566		{
567		if (conf_parser_ctx.pass == 2)
568		{
569	<	char *p;
569	>	char *p = strchr(yylval.string, ' ');
570
571	<	if ((p = strchr(yylval.string, ' ')) != NULL)
572	<	p = '\0';
571	>	if (p)
572	>	*p = '\0';
573
574	<	MyFree(ServerInfo.network_name);
575	<	DupString(ServerInfo.network_name, yylval.string);
574	>	xfree(ConfigServerInfo.network_name);
575	>	ConfigServerInfo.network_name = xstrdup(yylval.string);
576		}
577		};
578
579	<	serverinfo_network_desc: NETWORK_DESC '=' QSTRING ';'
579	>	serverinfo_network_description: NETWORK_DESCRIPTION '=' QSTRING ';'
580		{
581	<	if (conf_parser_ctx.pass == 2)
581	>	if (conf_parser_ctx.pass != 2)
582	>	break;
583	>
584	>	xfree(ConfigServerInfo.network_description);
585	>	ConfigServerInfo.network_description = xstrdup(yylval.string);
586	>	};
587	>
588	>	serverinfo_default_max_clients: DEFAULT_MAX_CLIENTS '=' NUMBER ';'
589	>	{
590	>	if (conf_parser_ctx.pass != 2)
591	>	break;
592	>
593	>	if ($3 < 1)
594		{
595	<	MyFree(ServerInfo.network_desc);
596	<	DupString(ServerInfo.network_desc, yylval.string);
595	>	conf_error_report("default_max_clients too low, setting to 1");
596	>	ConfigServerInfo.default_max_clients = 1;
597		}
598	+	else if ($3 > MAXCLIENTS_MAX)
599	+	{
600	+	char buf[IRCD_BUFSIZE];
601	+
602	+	snprintf(buf, sizeof(buf), "default_max_clients too high, setting to %d", MAXCLIENTS_MAX);
603	+	conf_error_report(buf);
604	+
605	+	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
606	+	}
607	+	else
608	+	ConfigServerInfo.default_max_clients = $3;
609		};
610
611	<	serverinfo_vhost: VHOST '=' QSTRING ';'
611	>	serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
612		{
613	<	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
613	>	if (conf_parser_ctx.pass != 2)
614	>	break;
615	>
616	>	if ($3 < 9)
617	>	{
618	>	conf_error_report("max_nick_length too low, setting to 9");
619	>	ConfigServerInfo.max_nick_length = 9;
620	>	}
621	>	else if ($3 > NICKLEN)
622		{
623	<	struct addrinfo hints, *res;
623	>	char buf[IRCD_BUFSIZE];
624
625	<	memset(&hints, 0, sizeof(hints));
625	>	snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
626	>	conf_error_report(buf);
627
628	<	hints.ai_family   = AF_UNSPEC;
629	<	hints.ai_socktype = SOCK_STREAM;
630	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
628	>	ConfigServerInfo.max_nick_length = NICKLEN;
629	>	}
630	>	else
631	>	ConfigServerInfo.max_nick_length = $3;
632	>	};
633
634	<	if (getaddrinfo(yylval.string, NULL, &hints, &res))
635	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
636	<	else
637	<	{
679	<	assert(res != NULL);
634	>	serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
635	>	{
636	>	if (conf_parser_ctx.pass != 2)
637	>	break;
638
639	<	memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
640	<	ServerInfo.ip.ss.ss_family = res->ai_family;
641	<	ServerInfo.ip.ss_len = res->ai_addrlen;
642	<	freeaddrinfo(res);
639	>	if ($3 < 80)
640	>	{
641	>	conf_error_report("max_topic_length too low, setting to 80");
642	>	ConfigServerInfo.max_topic_length = 80;
643	>	}
644	>	else if ($3 > TOPICLEN)
645	>	{
646	>	char buf[IRCD_BUFSIZE];
647
648	<	ServerInfo.specific_ipv4_vhost = 1;
649	<	}
648	>	snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
649	>	conf_error_report(buf);
650	>
651	>	ConfigServerInfo.max_topic_length = TOPICLEN;
652		}
653	+	else
654	+	ConfigServerInfo.max_topic_length = $3;
655		};
656
657	<	serverinfo_vhost6: VHOST6 '=' QSTRING ';'
657	>	serverinfo_hub: HUB '=' TBOOL ';'
658		{
659	<	#ifdef IPV6
660	<	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
661	<	{
696	<	struct addrinfo hints, *res;
659	>	if (conf_parser_ctx.pass == 2)
660	>	ConfigServerInfo.hub = yylval.number;
661	>	};
662
698	–	memset(&hints, 0, sizeof(hints));
663
664	<	hints.ai_family   = AF_UNSPEC;
665	<	hints.ai_socktype = SOCK_STREAM;
666	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
664	>	/***************************************************************************
665	>	* admin {} section
666	>	***************************************************************************/
667	>	admin_entry: ADMIN '{' admin_items '}' ';' ;
668
669	<	if (getaddrinfo(yylval.string, NULL, &hints, &res))
670	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
671	<	else
672	<	{
673	<	assert(res != NULL);
669	>	admin_items: admin_items admin_item | admin_item;
670	>	admin_item:  admin_name |
671	>	admin_description |
672	>	admin_email |
673	>	error ';' ;
674
675	<	memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
676	<	ServerInfo.ip6.ss.ss_family = res->ai_family;
677	<	ServerInfo.ip6.ss_len = res->ai_addrlen;
678	<	freeaddrinfo(res);
675	>	admin_name: NAME '=' QSTRING ';'
676	>	{
677	>	if (conf_parser_ctx.pass != 2)
678	>	break;
679
680	<	ServerInfo.specific_ipv6_vhost = 1;
681	<	}
717	<	}
718	<	#endif
680	>	xfree(ConfigAdminInfo.name);
681	>	ConfigAdminInfo.name = xstrdup(yylval.string);
682		};
683
684	<	serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
684	>	admin_email: EMAIL '=' QSTRING ';'
685	>	{
686	>	if (conf_parser_ctx.pass != 2)
687	>	break;
688	>
689	>	xfree(ConfigAdminInfo.email);
690	>	ConfigAdminInfo.email = xstrdup(yylval.string);
691	>	};
692	>
693	>	admin_description: DESCRIPTION '=' QSTRING ';'
694	>	{
695	>	if (conf_parser_ctx.pass != 2)
696	>	break;
697	>
698	>	xfree(ConfigAdminInfo.description);
699	>	ConfigAdminInfo.description = xstrdup(yylval.string);
700	>	};
701	>
702	>
703	>	/***************************************************************************
704	>	* motd {} section
705	>	***************************************************************************/
706	>	motd_entry: MOTD
707		{
708		if (conf_parser_ctx.pass == 2)
709	<	{
710	<	recalc_fdlimit(NULL);
709	>	reset_block_state();
710	>	} '{' motd_items '}' ';'
711	>	{
712	>	dlink_node *node;
713
714	<	if ($3 < MAXCLIENTS_MIN)
715	<	{
716	<	char buf[IRCD_BUFSIZE];
717	<	ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
718	<	yyerror(buf);
719	<	}
720	<	else if ($3 > MAXCLIENTS_MAX)
721	<	{
722	<	char buf[IRCD_BUFSIZE];
723	<	ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
724	<	yyerror(buf);
725	<	}
726	<	else
727	<	ServerInfo.max_clients = $3;
728	<	}
714	>	if (conf_parser_ctx.pass != 2)
715	>	break;
716	>
717	>	if (!block_state.file.buf[0])
718	>	break;
719	>
720	>	DLINK_FOREACH(node, block_state.mask.list.head)
721	>	motd_add(node->data, block_state.file.buf);
722	>	};
723	>
724	>	motd_items: motd_items motd_item | motd_item;
725	>	motd_item:  motd_mask | motd_file | error ';' ;
726	>
727	>	motd_mask: MASK '=' QSTRING ';'
728	>	{
729	>	if (conf_parser_ctx.pass == 2)
730	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
731		};
732
733	<	serverinfo_hub: HUB '=' TBOOL ';'
733	>	motd_file: T_FILE '=' QSTRING ';'
734		{
735		if (conf_parser_ctx.pass == 2)
736	<	ServerInfo.hub = yylval.number;
736	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
737		};
738
739	+
740		/***************************************************************************
741	<	* admin section
741	>	* pseudo {} section
742		***************************************************************************/
743	<	admin_entry: ADMIN  '{' admin_items '}' ';' ;
743	>	pseudo_entry: T_PSEUDO
744	>	{
745	>	if (conf_parser_ctx.pass == 2)
746	>	reset_block_state();
747	>	} '{' pseudo_items '}' ';'
748	>	{
749	>	if (conf_parser_ctx.pass != 2)
750	>	break;
751
752	<	admin_items: admin_items admin_item | admin_item;
753	<	admin_item:  admin_name | admin_description |
754	<	admin_email | error ';' ;
752	>	if (!block_state.command.buf[0] ||
753	>	!block_state.name.buf[0] ||
754	>	!block_state.nick.buf[0] ||
755	>	!block_state.host.buf[0])
756	>	break;
757	>
758	>	pseudo_register(block_state.name.buf, block_state.nick.buf, block_state.host.buf,
759	>	block_state.prepend.buf, block_state.command.buf);
760	>	};
761	>
762	>	pseudo_items: pseudo_items pseudo_item | pseudo_item;
763	>	pseudo_item:  pseudo_command | pseudo_prepend | pseudo_name | pseudo_target | error ';' ;
764
765	<	admin_name: NAME '=' QSTRING ';'
765	>	pseudo_command: T_COMMAND '=' QSTRING ';'
766		{
767		if (conf_parser_ctx.pass == 2)
768	<	{
763	<	MyFree(AdminInfo.name);
764	<	DupString(AdminInfo.name, yylval.string);
765	<	}
768	>	strlcpy(block_state.command.buf, yylval.string, sizeof(block_state.command.buf));
769		};
770
771	<	admin_email: EMAIL '=' QSTRING ';'
771	>	pseudo_name: NAME '=' QSTRING ';'
772		{
773		if (conf_parser_ctx.pass == 2)
774	<	{
772	<	MyFree(AdminInfo.email);
773	<	DupString(AdminInfo.email, yylval.string);
774	<	}
774	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
775		};
776
777	<	admin_description: DESCRIPTION '=' QSTRING ';'
777	>	pseudo_prepend: T_PREPEND '=' QSTRING ';'
778	>	{
779	>	if (conf_parser_ctx.pass == 2)
780	>	strlcpy(block_state.prepend.buf, yylval.string, sizeof(block_state.prepend.buf));
781	>	};
782	>
783	>	pseudo_target: T_TARGET '=' QSTRING ';'
784		{
785		if (conf_parser_ctx.pass == 2)
786		{
787	<	MyFree(AdminInfo.description);
788	<	DupString(AdminInfo.description, yylval.string);
787	>	struct split_nuh_item nuh;
788	>
789	>	nuh.nuhmask  = yylval.string;
790	>	nuh.nickptr  = NULL;
791	>	nuh.userptr  = block_state.nick.buf;
792	>	nuh.hostptr  = block_state.host.buf;
793	>	nuh.nicksize = 0;
794	>	nuh.usersize = sizeof(block_state.nick.buf);
795	>	nuh.hostsize = sizeof(block_state.host.buf);
796	>
797	>	split_nuh(&nuh);
798		}
799		};
800
801	+
802		/***************************************************************************
803	<	*  section logging
803	>	* log {} section
804		***************************************************************************/
805	<	logging_entry:          T_LOG  '{' logging_items '}' ';' ;
805	>	logging_entry:          T_LOG '{' logging_items '}' ';' ;
806		logging_items:          logging_items logging_item | logging_item ;
807
808	<	logging_item:           logging_use_logging | logging_file_entry |
809	<	error ';' ;
808	>	logging_item:           logging_use_logging | logging_file_entry |
809	>	error ';' ;
810
811		logging_use_logging: USE_LOGGING '=' TBOOL ';'
812		{
813		if (conf_parser_ctx.pass == 2)
814	<	ConfigLoggingEntry.use_logging = yylval.number;
814	>	ConfigLog.use_logging = yylval.number;
815		};
816
817		logging_file_entry:
818		{
819	<	lfile[0] = '\0';
820	<	ltype = 0;
805	<	lsize = 0;
819	>	if (conf_parser_ctx.pass == 2)
820	>	reset_block_state();
821		} T_FILE  '{' logging_file_items '}' ';'
822		{
823	<	if (conf_parser_ctx.pass == 2 && ltype > 0)
824	<	log_add_file(ltype, lsize, lfile);
823	>	if (conf_parser_ctx.pass != 2)
824	>	break;
825	>
826	>	if (block_state.type.value && block_state.file.buf[0])
827	>	log_set_file(block_state.type.value, block_state.size.value,
828	>	block_state.file.buf);
829		};
830
831		logging_file_items: logging_file_items logging_file_item |
#	Line 817 | Line 836 | logging_file_item:  logging_file_name |
836
837		logging_file_name: NAME '=' QSTRING ';'
838		{
839	<	strlcpy(lfile, yylval.string, sizeof(lfile));
839	>	if (conf_parser_ctx.pass != 2)
840	>	break;
841	>
842	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
843		}
844
845		logging_file_size: T_SIZE '=' sizespec ';'
846		{
847	<	lsize = $3;
847	>	block_state.size.value = $3;
848		} | T_SIZE '=' T_UNLIMITED ';'
849		{
850	<	lsize = 0;
850	>	block_state.size.value = 0;
851		};
852
853		logging_file_type: TYPE
854		{
855		if (conf_parser_ctx.pass == 2)
856	<	ltype = 0;
857	<	} '='  logging_file_type_items ';' ;
856	>	block_state.type.value = 0;
857	>	} '=' logging_file_type_items ';' ;
858
859		logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
860		logging_file_type_item:  USER
861		{
862		if (conf_parser_ctx.pass == 2)
863	<	ltype = LOG_TYPE_USER;
863	>	block_state.type.value = LOG_TYPE_USER;
864		} | OPERATOR
865		{
866		if (conf_parser_ctx.pass == 2)
867	<	ltype = LOG_TYPE_OPER;
868	<	} | GLINE
867	>	block_state.type.value = LOG_TYPE_OPER;
868	>	} | XLINE
869	>	{
870	>	if (conf_parser_ctx.pass == 2)
871	>	block_state.type.value = LOG_TYPE_XLINE;
872	>	} | RESV
873		{
874		if (conf_parser_ctx.pass == 2)
875	<	ltype = LOG_TYPE_GLINE;
875	>	block_state.type.value = LOG_TYPE_RESV;
876		} | T_DLINE
877		{
878		if (conf_parser_ctx.pass == 2)
879	<	ltype = LOG_TYPE_DLINE;
879	>	block_state.type.value = LOG_TYPE_DLINE;
880		} | KLINE
881		{
882		if (conf_parser_ctx.pass == 2)
883	<	ltype = LOG_TYPE_KLINE;
883	>	block_state.type.value = LOG_TYPE_KLINE;
884		} | KILL
885		{
886		if (conf_parser_ctx.pass == 2)
887	<	ltype = LOG_TYPE_KILL;
887	>	block_state.type.value = LOG_TYPE_KILL;
888		} | T_DEBUG
889		{
890		if (conf_parser_ctx.pass == 2)
891	<	ltype = LOG_TYPE_DEBUG;
891	>	block_state.type.value = LOG_TYPE_DEBUG;
892		};
893
894
895		/***************************************************************************
896	<	* section oper
896	>	* operator {} section
897		***************************************************************************/
898	<	oper_entry: OPERATOR
898	>	oper_entry: OPERATOR
899		{
900	<	if (conf_parser_ctx.pass == 2)
901	<	{
902	<	yy_conf = make_conf_item(OPER_TYPE);
903	<	yy_aconf = map_to_conf(yy_conf);
904	<	SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
879	<	}
880	<	else
881	<	{
882	<	MyFree(class_name);
883	<	class_name = NULL;
884	<	}
900	>	if (conf_parser_ctx.pass != 2)
901	>	break;
902	>
903	>	reset_block_state();
904	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
905		} '{' oper_items '}' ';'
906		{
907	<	if (conf_parser_ctx.pass == 2)
888	<	{
889	<	struct CollectItem *yy_tmp;
890	<	dlink_node *ptr;
891	<	dlink_node *next_ptr;
907	>	dlink_node *node;
908
909	<	conf_add_class_to_conf(yy_conf, class_name);
909	>	if (conf_parser_ctx.pass != 2)
910	>	break;
911
912	<	/* Now, make sure there is a copy of the "base" given oper
913	<	* block in each of the collected copies
897	<	*/
912	>	if (!block_state.name.buf[0])
913	>	break;
914
915	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
916	<	{
901	<	struct AccessItem *new_aconf;
902	<	struct ConfItem *new_conf;
903	<	yy_tmp = ptr->data;
904	<
905	<	new_conf = make_conf_item(OPER_TYPE);
906	<	new_aconf = (struct AccessItem *)map_to_conf(new_conf);
907	<
908	<	new_aconf->flags = yy_aconf->flags;
909	<
910	<	if (yy_conf->name != NULL)
911	<	DupString(new_conf->name, yy_conf->name);
912	<	if (yy_tmp->user != NULL)
913	<	DupString(new_aconf->user, yy_tmp->user);
914	<	else
915	<	DupString(new_aconf->user, "*");
916	<	if (yy_tmp->host != NULL)
917	<	DupString(new_aconf->host, yy_tmp->host);
918	<	else
919	<	DupString(new_aconf->host, "*");
920	<
921	<	new_aconf->type = parse_netmask(new_aconf->host, &new_aconf->addr,
922	<	&new_aconf->bits);
923	<
924	<	conf_add_class_to_conf(new_conf, class_name);
925	<	if (yy_aconf->passwd != NULL)
926	<	DupString(new_aconf->passwd, yy_aconf->passwd);
927	<
928	<	new_aconf->port = yy_aconf->port;
929	<	#ifdef HAVE_LIBCRYPTO
930	<	if (yy_aconf->rsa_public_key_file != NULL)
931	<	{
932	<	BIO *file;
933	<
934	<	DupString(new_aconf->rsa_public_key_file,
935	<	yy_aconf->rsa_public_key_file);
936	<
937	<	file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
938	<	new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
939	<	NULL, 0, NULL);
940	<	BIO_set_close(file, BIO_CLOSE);
941	<	BIO_free(file);
942	<	}
943	<	#endif
915	>	if (!block_state.rpass.buf[0])
916	>	break;
917
918	<	#ifdef HAVE_LIBCRYPTO
919	<	if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
920	<	&& yy_tmp->host)
921	<	#else
949	<	if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
950	<	#endif
951	<	{
952	<	conf_add_class_to_conf(new_conf, class_name);
953	<	if (yy_tmp->name != NULL)
954	<	DupString(new_conf->name, yy_tmp->name);
955	<	}
918	>	DLINK_FOREACH(node, block_state.mask.list.head)
919	>	{
920	>	struct split_nuh_item nuh;
921	>	char *s = node->data;
922
923	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
924	<	free_collect_item(yy_tmp);
959	<	}
923	>	if (EmptyString(s))
924	>	continue;
925
926	<	yy_conf = NULL;
927	<	yy_aconf = NULL;
926	>	nuh.nuhmask  = s;
927	>	nuh.nickptr  = NULL;
928	>	nuh.userptr  = block_state.user.buf;
929	>	nuh.hostptr  = block_state.host.buf;
930
931	+	nuh.nicksize = 0;
932	+	nuh.usersize = sizeof(block_state.user.buf);
933	+	nuh.hostsize = sizeof(block_state.host.buf);
934
935	<	MyFree(class_name);
936	<	class_name = NULL;
935	>	split_nuh(&nuh);
936	>
937	>	struct MaskItem *conf = conf_make(CONF_OPER);
938	>	conf->addr = xcalloc(sizeof(*conf->addr));
939	>	conf->name = xstrdup(block_state.name.buf);
940	>	conf->user = xstrdup(block_state.user.buf);
941	>	conf->host = xstrdup(block_state.host.buf);
942	>
943	>	if (block_state.cert.buf[0])
944	>	conf->certfp = xstrdup(block_state.cert.buf);
945	>
946	>	if (block_state.rpass.buf[0])
947	>	conf->passwd = xstrdup(block_state.rpass.buf);
948	>
949	>	if (block_state.whois.buf[0])
950	>	conf->whois = xstrdup(block_state.whois.buf);
951	>
952	>	conf->flags = block_state.flags.value;
953	>	conf->modes = block_state.modes.value;
954	>	conf->port  = block_state.port.value;
955	>	conf->htype = parse_netmask(conf->host, conf->addr, &conf->bits);
956	>
957	>	conf_add_class_to_conf(conf, block_state.class.buf);
958		}
959	<	};
959	>	};
960
961		oper_items:     oper_items oper_item | oper_item;
962	<	oper_item:      oper_name | oper_user | oper_password |
963	<	oper_umodes | oper_class | oper_encrypted |
964	<	oper_rsa_public_key_file | oper_flags | error ';' ;
962	>	oper_item:      oper_name |
963	>	oper_user |
964	>	oper_password |
965	>	oper_whois |
966	>	oper_umodes |
967	>	oper_class |
968	>	oper_encrypted |
969	>	oper_tls_certificate_fingerprint |
970	>	oper_tls_connection_required |
971	>	oper_flags |
972	>	error ';' ;
973
974		oper_name: NAME '=' QSTRING ';'
975		{
976		if (conf_parser_ctx.pass == 2)
977	<	{
979	<	MyFree(yy_conf->name);
980	<	DupString(yy_conf->name, yylval.string);
981	<	}
977	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
978		};
979
980		oper_user: USER '=' QSTRING ';'
981		{
982		if (conf_parser_ctx.pass == 2)
983	<	{
988	<	struct split_nuh_item nuh;
989	<
990	<	nuh.nuhmask  = yylval.string;
991	<	nuh.nickptr  = NULL;
992	<	nuh.userptr  = userbuf;
993	<	nuh.hostptr  = hostbuf;
994	<
995	<	nuh.nicksize = 0;
996	<	nuh.usersize = sizeof(userbuf);
997	<	nuh.hostsize = sizeof(hostbuf);
998	<
999	<	split_nuh(&nuh);
1000	<
1001	<	if (yy_aconf->user == NULL)
1002	<	{
1003	<	DupString(yy_aconf->user, userbuf);
1004	<	DupString(yy_aconf->host, hostbuf);
1005	<
1006	<	yy_aconf->type = parse_netmask(yy_aconf->host, &yy_aconf->addr,
1007	<	&yy_aconf->bits);
1008	<	}
1009	<	else
1010	<	{
1011	<	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
1012	<
1013	<	DupString(yy_tmp->user, userbuf);
1014	<	DupString(yy_tmp->host, hostbuf);
1015	<
1016	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1017	<	}
1018	<	}
983	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
984		};
985
986		oper_password: PASSWORD '=' QSTRING ';'
987		{
988		if (conf_parser_ctx.pass == 2)
989	<	{
1025	<	if (yy_aconf->passwd != NULL)
1026	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1027	<
1028	<	MyFree(yy_aconf->passwd);
1029	<	DupString(yy_aconf->passwd, yylval.string);
1030	<	}
989	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
990		};
991
992	<	oper_encrypted: ENCRYPTED '=' TBOOL ';'
992	>	oper_whois: WHOIS '=' QSTRING ';'
993		{
994		if (conf_parser_ctx.pass == 2)
995	<	{
1037	<	if (yylval.number)
1038	<	SetConfEncrypted(yy_aconf);
1039	<	else
1040	<	ClearConfEncrypted(yy_aconf);
1041	<	}
995	>	strlcpy(block_state.whois.buf, yylval.string, sizeof(block_state.whois.buf));
996		};
997
998	<	oper_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
998	>	oper_encrypted: ENCRYPTED '=' TBOOL ';'
999		{
1000	<	#ifdef HAVE_LIBCRYPTO
1001	<	if (conf_parser_ctx.pass == 2)
1048	<	{
1049	<	BIO *file;
1000	>	if (conf_parser_ctx.pass != 2)
1001	>	break;
1002
1003	<	if (yy_aconf->rsa_public_key != NULL)
1004	<	{
1005	<	RSA_free(yy_aconf->rsa_public_key);
1006	<	yy_aconf->rsa_public_key = NULL;
1007	<	}
1056	<
1057	<	if (yy_aconf->rsa_public_key_file != NULL)
1058	<	{
1059	<	MyFree(yy_aconf->rsa_public_key_file);
1060	<	yy_aconf->rsa_public_key_file = NULL;
1061	<	}
1062	<
1063	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
1064	<	file = BIO_new_file(yylval.string, "r");
1065	<
1066	<	if (file == NULL)
1067	<	{
1068	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
1069	<	break;
1070	<	}
1003	>	if (yylval.number)
1004	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1005	>	else
1006	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1007	>	};
1008
1009	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
1009	>	oper_tls_certificate_fingerprint: TLS_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
1010	>	{
1011	>	if (conf_parser_ctx.pass == 2)
1012	>	strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
1013	>	};
1014
1015	<	if (yy_aconf->rsa_public_key == NULL)
1016	<	{
1017	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1018	<	break;
1078	<	}
1015	>	oper_tls_connection_required: TLS_CONNECTION_REQUIRED '=' TBOOL ';'
1016	>	{
1017	>	if (conf_parser_ctx.pass != 2)
1018	>	break;
1019
1020	<	BIO_set_close(file, BIO_CLOSE);
1021	<	BIO_free(file);
1022	<	}
1023	<	#endif /* HAVE_LIBCRYPTO */
1020	>	if (yylval.number)
1021	>	block_state.flags.value |= CONF_FLAGS_TLS;
1022	>	else
1023	>	block_state.flags.value &= ~CONF_FLAGS_TLS;
1024		};
1025
1026		oper_class: CLASS '=' QSTRING ';'
1027		{
1028		if (conf_parser_ctx.pass == 2)
1029	<	{
1090	<	MyFree(class_name);
1091	<	DupString(class_name, yylval.string);
1092	<	}
1029	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1030		};
1031
1032		oper_umodes: T_UMODES
1033		{
1034		if (conf_parser_ctx.pass == 2)
1035	<	yy_aconf->modes = 0;
1036	<	} '='  oper_umodes_items ';' ;
1035	>	block_state.modes.value = 0;
1036	>	} '=' oper_umodes_items ';' ;
1037
1038		oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1039	<	oper_umodes_item:  T_BOTS
1039	>	oper_umodes_item: BOT
1040		{
1041		if (conf_parser_ctx.pass == 2)
1042	<	yy_aconf->modes |= UMODE_BOTS;
1042	>	block_state.modes.value |= UMODE_BOT;
1043		} | T_CCONN
1044		{
1045		if (conf_parser_ctx.pass == 2)
1046	<	yy_aconf->modes |= UMODE_CCONN;
1110	<	} | T_CCONN_FULL
1111	<	{
1112	<	if (conf_parser_ctx.pass == 2)
1113	<	yy_aconf->modes |= UMODE_CCONN_FULL;
1046	>	block_state.modes.value |= UMODE_CCONN;
1047		} | T_DEAF
1048		{
1049		if (conf_parser_ctx.pass == 2)
1050	<	yy_aconf->modes |= UMODE_DEAF;
1050	>	block_state.modes.value |= UMODE_DEAF;
1051		} | T_DEBUG
1052		{
1053		if (conf_parser_ctx.pass == 2)
1054	<	yy_aconf->modes |= UMODE_DEBUG;
1055	<	} | T_FULL
1054	>	block_state.modes.value |= UMODE_DEBUG;
1055	>	} | T_FLOOD
1056		{
1057		if (conf_parser_ctx.pass == 2)
1058	<	yy_aconf->modes |= UMODE_FULL;
1058	>	block_state.modes.value |= UMODE_FLOOD;
1059		} | HIDDEN
1060		{
1061		if (conf_parser_ctx.pass == 2)
1062	<	yy_aconf->modes |= UMODE_HIDDEN;
1062	>	block_state.modes.value |= UMODE_HIDDEN;
1063	>	} | HIDE_CHANS
1064	>	{
1065	>	if (conf_parser_ctx.pass == 2)
1066	>	block_state.modes.value |= UMODE_HIDECHANS;
1067	>	} | HIDE_IDLE
1068	>	{
1069	>	if (conf_parser_ctx.pass == 2)
1070	>	block_state.modes.value |= UMODE_HIDEIDLE;
1071		} | T_SKILL
1072		{
1073		if (conf_parser_ctx.pass == 2)
1074	<	yy_aconf->modes |= UMODE_SKILL;
1074	>	block_state.modes.value |= UMODE_SKILL;
1075		} | T_NCHANGE
1076		{
1077		if (conf_parser_ctx.pass == 2)
1078	<	yy_aconf->modes |= UMODE_NCHANGE;
1078	>	block_state.modes.value |= UMODE_NCHANGE;
1079		} | T_REJ
1080		{
1081		if (conf_parser_ctx.pass == 2)
1082	<	yy_aconf->modes |= UMODE_REJ;
1142	<	} | T_UNAUTH
1143	<	{
1144	<	if (conf_parser_ctx.pass == 2)
1145	<	yy_aconf->modes |= UMODE_UNAUTH;
1082	>	block_state.modes.value |= UMODE_REJ;
1083		} | T_SPY
1084		{
1085		if (conf_parser_ctx.pass == 2)
1086	<	yy_aconf->modes |= UMODE_SPY;
1086	>	block_state.modes.value |= UMODE_SPY;
1087		} | T_EXTERNAL
1088		{
1089		if (conf_parser_ctx.pass == 2)
1090	<	yy_aconf->modes |= UMODE_EXTERNAL;
1154	<	} | T_OPERWALL
1155	<	{
1156	<	if (conf_parser_ctx.pass == 2)
1157	<	yy_aconf->modes |= UMODE_OPERWALL;
1090	>	block_state.modes.value |= UMODE_EXTERNAL;
1091		} | T_SERVNOTICE
1092		{
1093		if (conf_parser_ctx.pass == 2)
1094	<	yy_aconf->modes |= UMODE_SERVNOTICE;
1094	>	block_state.modes.value |= UMODE_SERVNOTICE;
1095		} | T_INVISIBLE
1096		{
1097		if (conf_parser_ctx.pass == 2)
1098	<	yy_aconf->modes |= UMODE_INVISIBLE;
1098	>	block_state.modes.value |= UMODE_INVISIBLE;
1099		} | T_WALLOP
1100		{
1101		if (conf_parser_ctx.pass == 2)
1102	<	yy_aconf->modes |= UMODE_WALLOP;
1102	>	block_state.modes.value |= UMODE_WALLOP;
1103		} | T_SOFTCALLERID
1104		{
1105		if (conf_parser_ctx.pass == 2)
1106	<	yy_aconf->modes |= UMODE_SOFTCALLERID;
1106	>	block_state.modes.value |= UMODE_SOFTCALLERID;
1107		} | T_CALLERID
1108		{
1109		if (conf_parser_ctx.pass == 2)
1110	<	yy_aconf->modes |= UMODE_CALLERID;
1110	>	block_state.modes.value |= UMODE_CALLERID;
1111		} | T_LOCOPS
1112		{
1113		if (conf_parser_ctx.pass == 2)
1114	<	yy_aconf->modes |= UMODE_LOCOPS;
1114	>	block_state.modes.value |= UMODE_LOCOPS;
1115	>	} | T_NONONREG
1116	>	{
1117	>	if (conf_parser_ctx.pass == 2)
1118	>	block_state.modes.value |= UMODE_REGONLY;
1119	>	} | T_FARCONNECT
1120	>	{
1121	>	if (conf_parser_ctx.pass == 2)
1122	>	block_state.modes.value |= UMODE_FARCONNECT;
1123	>	} | EXPIRATION
1124	>	{
1125	>	if (conf_parser_ctx.pass == 2)
1126	>	block_state.modes.value |= UMODE_EXPIRATION;
1127		};
1128
1129		oper_flags: IRCD_FLAGS
1130		{
1131		if (conf_parser_ctx.pass == 2)
1132	<	yy_aconf->port = 0;
1133	<	} '='  oper_flags_items ';';
1132	>	block_state.port.value = 0;
1133	>	} '=' oper_flags_items ';';
1134
1135		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1136	<	oper_flags_item: GLOBAL_KILL
1136	>	oper_flags_item: KILL ':' REMOTE
1137		{
1138		if (conf_parser_ctx.pass == 2)
1139	<	yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1140	<	} | REMOTE
1139	>	block_state.port.value |= OPER_FLAG_KILL_REMOTE;
1140	>	} | KILL
1141		{
1142		if (conf_parser_ctx.pass == 2)
1143	<	yy_aconf->port |= OPER_FLAG_REMOTE;
1143	>	block_state.port.value |= OPER_FLAG_KILL;
1144	>	} | CONNECT ':' REMOTE
1145	>	{
1146	>	if (conf_parser_ctx.pass == 2)
1147	>	block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
1148	>	} | CONNECT
1149	>	{
1150	>	if (conf_parser_ctx.pass == 2)
1151	>	block_state.port.value |= OPER_FLAG_CONNECT;
1152	>	} | SQUIT ':' REMOTE
1153	>	{
1154	>	if (conf_parser_ctx.pass == 2)
1155	>	block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
1156	>	} | SQUIT
1157	>	{
1158	>	if (conf_parser_ctx.pass == 2)
1159	>	block_state.port.value |= OPER_FLAG_SQUIT;
1160		} | KLINE
1161		{
1162		if (conf_parser_ctx.pass == 2)
1163	<	yy_aconf->port |= OPER_FLAG_K;
1163	>	block_state.port.value |= OPER_FLAG_KLINE;
1164		} | UNKLINE
1165		{
1166		if (conf_parser_ctx.pass == 2)
1167	<	yy_aconf->port |= OPER_FLAG_UNKLINE;
1167	>	block_state.port.value |= OPER_FLAG_UNKLINE;
1168		} | T_DLINE
1169		{
1170		if (conf_parser_ctx.pass == 2)
1171	<	yy_aconf->port |= OPER_FLAG_DLINE;
1171	>	block_state.port.value |= OPER_FLAG_DLINE;
1172		} | T_UNDLINE
1173		{
1174		if (conf_parser_ctx.pass == 2)
1175	<	yy_aconf->port |= OPER_FLAG_UNDLINE;
1175	>	block_state.port.value |= OPER_FLAG_UNDLINE;
1176		} | XLINE
1177		{
1178		if (conf_parser_ctx.pass == 2)
1179	<	yy_aconf->port |= OPER_FLAG_X;
1180	<	} | GLINE
1179	>	block_state.port.value |= OPER_FLAG_XLINE;
1180	>	} | T_UNXLINE
1181		{
1182		if (conf_parser_ctx.pass == 2)
1183	<	yy_aconf->port |= OPER_FLAG_GLINE;
1183	>	block_state.port.value |= OPER_FLAG_UNXLINE;
1184		} | DIE
1185		{
1186		if (conf_parser_ctx.pass == 2)
1187	<	yy_aconf->port |= OPER_FLAG_DIE;
1187	>	block_state.port.value |= OPER_FLAG_DIE;
1188		} | T_RESTART
1189		{
1190		if (conf_parser_ctx.pass == 2)
1191	<	yy_aconf->port |= OPER_FLAG_RESTART;
1192	<	} | REHASH
1191	>	block_state.port.value |= OPER_FLAG_RESTART;
1192	>	} | REHASH ':' REMOTE
1193		{
1194		if (conf_parser_ctx.pass == 2)
1195	<	yy_aconf->port |= OPER_FLAG_REHASH;
1196	<	} | ADMIN
1195	>	block_state.port.value |= OPER_FLAG_REHASH_REMOTE;
1196	>	} | REHASH
1197		{
1198		if (conf_parser_ctx.pass == 2)
1199	<	yy_aconf->port |= OPER_FLAG_ADMIN;
1200	<	} | NICK_CHANGES
1199	>	block_state.port.value |= OPER_FLAG_REHASH;
1200	>	} | ADMIN
1201		{
1202		if (conf_parser_ctx.pass == 2)
1203	<	yy_aconf->port |= OPER_FLAG_N;
1204	<	} | T_OPERWALL
1203	>	block_state.port.value |= OPER_FLAG_ADMIN;
1204	>	} | T_GLOBOPS
1205		{
1206		if (conf_parser_ctx.pass == 2)
1207	<	yy_aconf->port |= OPER_FLAG_OPERWALL;
1208	<	} | T_GLOBOPS
1207	>	block_state.port.value |= OPER_FLAG_GLOBOPS;
1208	>	} | T_WALLOPS
1209		{
1210		if (conf_parser_ctx.pass == 2)
1211	<	yy_aconf->port |= OPER_FLAG_GLOBOPS;
1212	<	} | OPER_SPY_T
1211	>	block_state.port.value |= OPER_FLAG_WALLOPS;
1212	>	} | T_LOCOPS
1213		{
1214		if (conf_parser_ctx.pass == 2)
1215	<	yy_aconf->port |= OPER_FLAG_OPER_SPY;
1215	>	block_state.port.value |= OPER_FLAG_LOCOPS;
1216		} | REMOTEBAN
1217		{
1218		if (conf_parser_ctx.pass == 2)
1219	<	yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1219	>	block_state.port.value |= OPER_FLAG_REMOTEBAN;
1220		} | T_SET
1221		{
1222		if (conf_parser_ctx.pass == 2)
1223	<	yy_aconf->port |= OPER_FLAG_SET;
1223	>	block_state.port.value |= OPER_FLAG_SET;
1224		} | MODULE
1225		{
1226		if (conf_parser_ctx.pass == 2)
1227	<	yy_aconf->port |= OPER_FLAG_MODULE;
1227	>	block_state.port.value |= OPER_FLAG_MODULE;
1228	>	} | T_OPME
1229	>	{
1230	>	if (conf_parser_ctx.pass == 2)
1231	>	block_state.port.value |= OPER_FLAG_OPME;
1232	>	} | NICK ':' RESV
1233	>	{
1234	>	if (conf_parser_ctx.pass == 2)
1235	>	block_state.port.value |= OPER_FLAG_NICK_RESV;
1236	>	} | JOIN ':' RESV
1237	>	{
1238	>	if (conf_parser_ctx.pass == 2)
1239	>	block_state.port.value |= OPER_FLAG_JOIN_RESV;
1240	>	} | RESV
1241	>	{
1242	>	if (conf_parser_ctx.pass == 2)
1243	>	block_state.port.value |= OPER_FLAG_RESV;
1244	>	} | T_UNRESV
1245	>	{
1246	>	if (conf_parser_ctx.pass == 2)
1247	>	block_state.port.value |= OPER_FLAG_UNRESV;
1248	>	} | CLOSE
1249	>	{
1250	>	if (conf_parser_ctx.pass == 2)
1251	>	block_state.port.value |= OPER_FLAG_CLOSE;
1252		};
1253
1254
1255		/***************************************************************************
1256	<	*  section class
1256	>	* class {} section
1257		***************************************************************************/
1258		class_entry: CLASS
1259		{
1260	<	if (conf_parser_ctx.pass == 1)
1261	<	{
1262	<	yy_conf = make_conf_item(CLASS_TYPE);
1263	<	yy_class = map_to_conf(yy_conf);
1264	<	}
1260	>	if (conf_parser_ctx.pass != 1)
1261	>	break;
1262	>
1263	>	reset_block_state();
1264	>
1265	>	block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1266	>	block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1267	>	block_state.max_sendq.value = DEFAULT_SENDQ;
1268	>	block_state.max_recvq.value = DEFAULT_RECVQ;
1269		} '{' class_items '}' ';'
1270		{
1271	<	if (conf_parser_ctx.pass == 1)
1272	<	{
1284	<	struct ConfItem *cconf = NULL;
1285	<	struct ClassItem *class = NULL;
1271	>	if (conf_parser_ctx.pass != 1)
1272	>	break;
1273
1274	<	if (yy_class_name == NULL)
1275	<	delete_conf_item(yy_conf);
1289	<	else
1290	<	{
1291	<	cconf = find_exact_name_conf(CLASS_TYPE, NULL, yy_class_name, NULL, NULL);
1274	>	if (!block_state.class.buf[0])
1275	>	break;
1276
1277	<	if (cconf != NULL)                /* The class existed already */
1278	<	{
1279	<	int user_count = 0;
1280	<
1281	<	rebuild_cidr_class(cconf, yy_class);
1282	<
1283	<	class = map_to_conf(cconf);
1284	<
1285	<	user_count = class->curr_user_count;
1286	<	memcpy(class, yy_class, sizeof(*class));
1287	<	class->curr_user_count = user_count;
1288	<	class->active = 1;
1289	<
1290	<	delete_conf_item(yy_conf);
1291	<
1292	<	MyFree(cconf->name);            /* Allows case change of class name */
1293	<	cconf->name = yy_class_name;
1294	<	}
1295	<	else      /* Brand new class */
1296	<	{
1297	<	MyFree(yy_conf->name);          /* just in case it was allocated */
1298	<	yy_conf->name = yy_class_name;
1299	<	yy_class->active = 1;
1300	<	}
1301	<	}
1277	>	struct ClassItem *class = class_find(block_state.class.buf, false);
1278	>	if (class == NULL)
1279	>	class = class_make();
1280	>
1281	>	class->active = true;
1282	>	xfree(class->name);
1283	>	class->name = xstrdup(block_state.class.buf);
1284	>	class->ping_freq = block_state.ping_freq.value;
1285	>	class->max_perip_local = block_state.max_perip_local.value;
1286	>	class->max_perip_global = block_state.max_perip_global.value;
1287	>	class->con_freq = block_state.con_freq.value;
1288	>	class->max_total = block_state.max_total.value;
1289	>	class->max_sendq = block_state.max_sendq.value;
1290	>	class->max_recvq = block_state.max_recvq.value;
1291	>	class->max_channels = block_state.max_channels.value;
1292	>
1293	>	if (block_state.min_idle.value > block_state.max_idle.value)
1294	>	{
1295	>	block_state.min_idle.value = 0;
1296	>	block_state.max_idle.value = 0;
1297	>	block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
1298	>	}
1299	>
1300	>	class->flags = block_state.flags.value;
1301	>	class->min_idle = block_state.min_idle.value;
1302	>	class->max_idle = block_state.max_idle.value;
1303	>
1304	>	bool diff = (class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value ||
1305	>	class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value);
1306	>	class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1307	>	class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1308	>	class->number_per_cidr = block_state.number_per_cidr.value;
1309
1310	<	yy_class_name = NULL;
1311	<	}
1310	>	if (diff)
1311	>	class_ip_limit_rebuild(class);
1312		};
1313
1314		class_items:    class_items class_item | class_item;
1315		class_item:     class_name |
1316	<	class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1316	>	class_cidr_bitlen_ipv4 |
1317	>	class_cidr_bitlen_ipv6 |
1318		class_ping_time |
1319	<	class_ping_warning |
1320	<	class_number_per_cidr |
1321	<	class_number_per_ip |
1319	>	class_number_per_cidr |
1320	>	class_number_per_ip_local |
1321	>	class_number_per_ip_global |
1322		class_connectfreq |
1323	+	class_max_channels |
1324		class_max_number |
1325	<	class_max_global |
1326	<	class_max_local |
1327	<	class_max_ident |
1328	<	class_sendq | class_recvq |
1329	<	error ';' ;
1325	>	class_sendq |
1326	>	class_recvq |
1327	>	class_min_idle |
1328	>	class_max_idle |
1329	>	class_flags |
1330	>	error ';' ;
1331
1332	<	class_name: NAME '=' QSTRING ';'
1332	>	class_name: NAME '=' QSTRING ';'
1333		{
1334		if (conf_parser_ctx.pass == 1)
1335	<	{
1342	<	MyFree(yy_class_name);
1343	<	DupString(yy_class_name, yylval.string);
1344	<	}
1335	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1336		};
1337
1338		class_ping_time: PING_TIME '=' timespec ';'
1339		{
1340		if (conf_parser_ctx.pass == 1)
1341	<	yy_class->ping_freq = $3;
1341	>	block_state.ping_freq.value = $3;
1342		};
1343
1344	<	class_ping_warning: PING_WARNING '=' timespec ';'
1344	>	class_number_per_ip_local: NUMBER_PER_IP_LOCAL '=' NUMBER ';'
1345		{
1346		if (conf_parser_ctx.pass == 1)
1347	<	yy_class->ping_warning = $3;
1347	>	block_state.max_perip_local.value = $3;
1348		};
1349
1350	<	class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1350	>	class_number_per_ip_global: NUMBER_PER_IP_GLOBAL '=' NUMBER ';'
1351		{
1352		if (conf_parser_ctx.pass == 1)
1353	<	yy_class->max_perip = $3;
1353	>	block_state.max_perip_global.value = $3;
1354		};
1355
1356		class_connectfreq: CONNECTFREQ '=' timespec ';'
1357		{
1358		if (conf_parser_ctx.pass == 1)
1359	<	yy_class->con_freq = $3;
1359	>	block_state.con_freq.value = $3;
1360		};
1361
1362	<	class_max_number: MAX_NUMBER '=' NUMBER ';'
1362	>	class_max_channels: MAX_CHANNELS '=' NUMBER ';'
1363		{
1364		if (conf_parser_ctx.pass == 1)
1365	<	yy_class->max_total = $3;
1365	>	block_state.max_channels.value = $3;
1366		};
1367
1368	<	class_max_global: MAX_GLOBAL '=' NUMBER ';'
1368	>	class_max_number: MAX_NUMBER '=' NUMBER ';'
1369		{
1370		if (conf_parser_ctx.pass == 1)
1371	<	yy_class->max_global = $3;
1371	>	block_state.max_total.value = $3;
1372		};
1373
1374	<	class_max_local: MAX_LOCAL '=' NUMBER ';'
1374	>	class_sendq: SENDQ '=' sizespec ';'
1375		{
1376		if (conf_parser_ctx.pass == 1)
1377	<	yy_class->max_local = $3;
1377	>	block_state.max_sendq.value = $3;
1378		};
1379
1380	<	class_max_ident: MAX_IDENT '=' NUMBER ';'
1380	>	class_recvq: T_RECVQ '=' sizespec ';'
1381		{
1382		if (conf_parser_ctx.pass == 1)
1383	<	yy_class->max_ident = $3;
1383	>	if ($3 >= CLIENT_FLOOD_MIN && $3 <= CLIENT_FLOOD_MAX)
1384	>	block_state.max_recvq.value = $3;
1385		};
1386
1387	<	class_sendq: SENDQ '=' sizespec ';'
1387	>	class_cidr_bitlen_ipv4: CIDR_BITLEN_IPV4 '=' NUMBER ';'
1388		{
1389		if (conf_parser_ctx.pass == 1)
1390	<	yy_class->max_sendq = $3;
1390	>	block_state.cidr_bitlen_ipv4.value = $3 > 32 ? 32 : $3;
1391		};
1392
1393	<	class_recvq: T_RECVQ '=' sizespec ';'
1393	>	class_cidr_bitlen_ipv6: CIDR_BITLEN_IPV6 '=' NUMBER ';'
1394		{
1395		if (conf_parser_ctx.pass == 1)
1396	<	if ($3 >= CLIENT_FLOOD_MIN && $3 <= CLIENT_FLOOD_MAX)
1405	<	yy_class->max_recvq = $3;
1396	>	block_state.cidr_bitlen_ipv6.value = $3 > 128 ? 128 : $3;
1397		};
1398
1399	<	class_cidr_bitlen_ipv4: CIDR_BITLEN_IPV4 '=' NUMBER ';'
1399	>	class_number_per_cidr: NUMBER_PER_CIDR '=' NUMBER ';'
1400		{
1401		if (conf_parser_ctx.pass == 1)
1402	<	yy_class->cidr_bitlen_ipv4 = $3 > 32 ? 32 : $3;
1402	>	block_state.number_per_cidr.value = $3;
1403		};
1404
1405	<	class_cidr_bitlen_ipv6: CIDR_BITLEN_IPV6 '=' NUMBER ';'
1405	>	class_min_idle: MIN_IDLE '=' timespec ';'
1406		{
1407	<	if (conf_parser_ctx.pass == 1)
1408	<	yy_class->cidr_bitlen_ipv6 = $3 > 128 ? 128 : $3;
1407	>	if (conf_parser_ctx.pass != 1)
1408	>	break;
1409	>
1410	>	block_state.min_idle.value = $3;
1411	>	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1412		};
1413
1414	<	class_number_per_cidr: NUMBER_PER_CIDR '=' NUMBER ';'
1414	>	class_max_idle: MAX_IDLE '=' timespec ';'
1415	>	{
1416	>	if (conf_parser_ctx.pass != 1)
1417	>	break;
1418	>
1419	>	block_state.max_idle.value = $3;
1420	>	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1421	>	};
1422	>
1423	>	class_flags: IRCD_FLAGS
1424		{
1425		if (conf_parser_ctx.pass == 1)
1426	<	yy_class->number_per_cidr = $3;
1426	>	block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1427	>	} '=' class_flags_items ';';
1428	>
1429	>	class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1430	>	class_flags_item: RANDOM_IDLE
1431	>	{
1432	>	if (conf_parser_ctx.pass == 1)
1433	>	block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
1434	>	} | HIDE_IDLE_FROM_OPERS
1435	>	{
1436	>	if (conf_parser_ctx.pass == 1)
1437	>	block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
1438		};
1439
1440	+
1441		/***************************************************************************
1442	<	*  section listen
1442	>	* listen {} section
1443		***************************************************************************/
1444		listen_entry: LISTEN
1445		{
1446		if (conf_parser_ctx.pass == 2)
1447	<	{
1448	<	listener_address = NULL;
1434	<	listener_flags = 0;
1435	<	}
1436	<	} '{' listen_items '}' ';'
1437	<	{
1438	<	if (conf_parser_ctx.pass == 2)
1439	<	{
1440	<	MyFree(listener_address);
1441	<	listener_address = NULL;
1442	<	}
1443	<	};
1447	>	reset_block_state();
1448	>	} '{' listen_items '}' ';';
1449
1450		listen_flags: IRCD_FLAGS
1451		{
1452	<	listener_flags = 0;
1453	<	} '='  listen_flags_items ';';
1452	>	block_state.flags.value = 0;
1453	>	} '=' listen_flags_items ';';
1454
1455		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1456	<	listen_flags_item: T_SSL
1456	>	listen_flags_item: T_TLS
1457		{
1458		if (conf_parser_ctx.pass == 2)
1459	<	listener_flags |= LISTENER_SSL;
1459	>	block_state.flags.value |= LISTENER_TLS;
1460		} | HIDDEN
1461		{
1462		if (conf_parser_ctx.pass == 2)
1463	<	listener_flags |= LISTENER_HIDDEN;
1463	>	block_state.flags.value |= LISTENER_HIDDEN;
1464		} | T_SERVER
1465		{
1466		if (conf_parser_ctx.pass == 2)
1467	<	listener_flags |= LISTENER_SERVER;
1467	>	block_state.flags.value |= LISTENER_SERVER;
1468	>	} | CLIENT
1469	>	{
1470	>	if (conf_parser_ctx.pass == 2)
1471	>	block_state.flags.value |= LISTENER_CLIENT;
1472	>	} | DEFER
1473	>	{
1474	>	if (conf_parser_ctx.pass == 2)
1475	>	block_state.flags.value |= LISTENER_DEFER;
1476		};
1477
1465	–
1466	–
1478		listen_items:   listen_items listen_item | listen_item;
1479		listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';';
1480
1481	<	listen_port: PORT '=' port_items { listener_flags = 0; } ';';
1481	>	listen_port: PORT '=' port_items { block_state.flags.value = 0; } ';';
1482
1483		port_items: port_items ',' port_item | port_item;
1484
#	Line 1475 | Line 1486 | port_item: NUMBER
1486		{
1487		if (conf_parser_ctx.pass == 2)
1488		{
1489	<	if ((listener_flags & LISTENER_SSL))
1490	<	#ifdef HAVE_LIBCRYPTO
1491	<	if (!ServerInfo.server_ctx)
1489	>	#ifndef HAVE_TLS
1490	>	if (block_state.flags.value & LISTENER_TLS)
1491	>	{
1492	>	conf_error_report("TLS not available - port closed");
1493	>	break;
1494	>	}
1495		#endif
1496	<	{
1483	<	yyerror("SSL not available - port closed");
1484	<	break;
1485	<	}
1486	<	add_listener($1, listener_address, listener_flags);
1496	>	listener_add($1, block_state.addr.buf, block_state.flags.value);
1497		}
1498		} | NUMBER TWODOTS NUMBER
1499		{
1500		if (conf_parser_ctx.pass == 2)
1501		{
1502	<	int i;
1503	<
1504	<	if ((listener_flags & LISTENER_SSL))
1505	<	#ifdef HAVE_LIBCRYPTO
1506	<	if (!ServerInfo.server_ctx)
1502	>	#ifndef HAVE_TLS
1503	>	if (block_state.flags.value & LISTENER_TLS)
1504	>	{
1505	>	conf_error_report("TLS not available - port closed");
1506	>	break;
1507	>	}
1508		#endif
1498	–	{
1499	–	yyerror("SSL not available - port closed");
1500	–	break;
1501	–	}
1509
1510	<	for (i = $1; i <= $3; ++i)
1511	<	add_listener(i, listener_address, listener_flags);
1510	>	for (int i = $1; i <= $3; ++i)
1511	>	listener_add(i, block_state.addr.buf, block_state.flags.value);
1512		}
1513		};
1514
1515		listen_address: IP '=' QSTRING ';'
1516		{
1517		if (conf_parser_ctx.pass == 2)
1518	<	{
1512	<	MyFree(listener_address);
1513	<	DupString(listener_address, yylval.string);
1514	<	}
1518	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1519		};
1520
1521		listen_host: HOST '=' QSTRING ';'
1522		{
1523		if (conf_parser_ctx.pass == 2)
1524	<	{
1521	<	MyFree(listener_address);
1522	<	DupString(listener_address, yylval.string);
1523	<	}
1524	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1525		};
1526
1527	+
1528		/***************************************************************************
1529	<	*  section auth
1529	>	* auth {} section
1530		***************************************************************************/
1531		auth_entry: IRCD_AUTH
1532		{
1533		if (conf_parser_ctx.pass == 2)
1534	<	{
1533	<	yy_conf = make_conf_item(CLIENT_TYPE);
1534	<	yy_aconf = map_to_conf(yy_conf);
1535	<	}
1536	<	else
1537	<	{
1538	<	MyFree(class_name);
1539	<	class_name = NULL;
1540	<	}
1534	>	reset_block_state();
1535		} '{' auth_items '}' ';'
1536		{
1537	<	if (conf_parser_ctx.pass == 2)
1544	<	{
1545	<	struct CollectItem *yy_tmp = NULL;
1546	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1547	<
1548	<	if (yy_aconf->user && yy_aconf->host)
1549	<	{
1550	<	conf_add_class_to_conf(yy_conf, class_name);
1551	<	add_conf_by_address(CONF_CLIENT, yy_aconf);
1552	<	}
1553	<	else
1554	<	delete_conf_item(yy_conf);
1555	<
1556	<	/* copy over settings from first struct */
1557	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
1558	<	{
1559	<	struct AccessItem *new_aconf;
1560	<	struct ConfItem *new_conf;
1537	>	dlink_node *node;
1538
1539	<	new_conf = make_conf_item(CLIENT_TYPE);
1540	<	new_aconf = map_to_conf(new_conf);
1539	>	if (conf_parser_ctx.pass != 2)
1540	>	break;
1541
1542	<	yy_tmp = ptr->data;
1542	>	DLINK_FOREACH(node, block_state.mask.list.head)
1543	>	{
1544	>	struct split_nuh_item nuh;
1545	>	char *s = node->data;
1546
1547	<	assert(yy_tmp->user && yy_tmp->host);
1547	>	if (EmptyString(s))
1548	>	continue;
1549
1550	<	if (yy_aconf->passwd != NULL)
1551	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1552	<	if (yy_conf->name != NULL)
1553	<	DupString(new_conf->name, yy_conf->name);
1573	<	if (yy_aconf->passwd != NULL)
1574	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1550	>	nuh.nuhmask  = s;
1551	>	nuh.nickptr  = NULL;
1552	>	nuh.userptr  = block_state.user.buf;
1553	>	nuh.hostptr  = block_state.host.buf;
1554
1555	<	new_aconf->flags = yy_aconf->flags;
1556	<	new_aconf->port  = yy_aconf->port;
1555	>	nuh.nicksize = 0;
1556	>	nuh.usersize = sizeof(block_state.user.buf);
1557	>	nuh.hostsize = sizeof(block_state.host.buf);
1558
1559	<	DupString(new_aconf->user, yy_tmp->user);
1580	<	collapse(new_aconf->user);
1559	>	split_nuh(&nuh);
1560
1561	<	DupString(new_aconf->host, yy_tmp->host);
1562	<	collapse(new_aconf->host);
1561	>	struct MaskItem *conf = conf_make(CONF_CLIENT);
1562	>	conf->user = xstrdup(block_state.user.buf);
1563	>	conf->host = xstrdup(block_state.host.buf);
1564	>
1565	>	if (block_state.rpass.buf[0])
1566	>	conf->passwd = xstrdup(block_state.rpass.buf);
1567	>	if (block_state.name.buf[0])
1568	>	conf->name = xstrdup(block_state.name.buf);
1569
1570	<	conf_add_class_to_conf(new_conf, class_name);
1571	<	add_conf_by_address(CONF_CLIENT, new_aconf);
1587	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1588	<	free_collect_item(yy_tmp);
1589	<	}
1570	>	conf->flags = block_state.flags.value;
1571	>	conf->port = block_state.port.value;
1572
1573	<	MyFree(class_name);
1574	<	class_name = NULL;
1593	<	yy_conf = NULL;
1594	<	yy_aconf = NULL;
1573	>	conf_add_class_to_conf(conf, block_state.class.buf);
1574	>	add_conf_by_address(CONF_CLIENT, conf);
1575		}
1576	<	};
1576	>	};
1577
1578		auth_items:     auth_items auth_item | auth_item;
1579	<	auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1580	<	auth_spoof | auth_redir_serv | auth_redir_port |
1581	<	auth_encrypted | error ';' ;
1579	>	auth_item:      auth_user |
1580	>	auth_passwd |
1581	>	auth_class |
1582	>	auth_flags |
1583	>	auth_spoof |
1584	>	auth_redir_serv |
1585	>	auth_redir_port |
1586	>	auth_encrypted |
1587	>	error ';' ;
1588
1589		auth_user: USER '=' QSTRING ';'
1590		{
1591		if (conf_parser_ctx.pass == 2)
1592	<	{
1607	<	struct CollectItem *yy_tmp = NULL;
1608	<	struct split_nuh_item nuh;
1609	<
1610	<	nuh.nuhmask  = yylval.string;
1611	<	nuh.nickptr  = NULL;
1612	<	nuh.userptr  = userbuf;
1613	<	nuh.hostptr  = hostbuf;
1614	<
1615	<	nuh.nicksize = 0;
1616	<	nuh.usersize = sizeof(userbuf);
1617	<	nuh.hostsize = sizeof(hostbuf);
1618	<
1619	<	split_nuh(&nuh);
1620	<
1621	<	if (yy_aconf->user == NULL)
1622	<	{
1623	<	DupString(yy_aconf->user, userbuf);
1624	<	DupString(yy_aconf->host, hostbuf);
1625	<	}
1626	<	else
1627	<	{
1628	<	yy_tmp = MyMalloc(sizeof(struct CollectItem));
1629	<
1630	<	DupString(yy_tmp->user, userbuf);
1631	<	DupString(yy_tmp->host, hostbuf);
1632	<
1633	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1634	<	}
1635	<	}
1592	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1593		};
1594
1595		auth_passwd: PASSWORD '=' QSTRING ';'
1596		{
1597		if (conf_parser_ctx.pass == 2)
1598	<	{
1642	<	/* be paranoid */
1643	<	if (yy_aconf->passwd != NULL)
1644	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1645	<
1646	<	MyFree(yy_aconf->passwd);
1647	<	DupString(yy_aconf->passwd, yylval.string);
1648	<	}
1598	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1599		};
1600
1601		auth_class: CLASS '=' QSTRING ';'
1602		{
1603		if (conf_parser_ctx.pass == 2)
1604	<	{
1655	<	MyFree(class_name);
1656	<	DupString(class_name, yylval.string);
1657	<	}
1604	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1605		};
1606
1607		auth_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 1662 | Line 1609 | auth_encrypted: ENCRYPTED '=' TBOOL ';'
1609		if (conf_parser_ctx.pass == 2)
1610		{
1611		if (yylval.number)
1612	<	SetConfEncrypted(yy_aconf);
1612	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1613		else
1614	<	ClearConfEncrypted(yy_aconf);
1614	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1615		}
1616		};
1617
1618		auth_flags: IRCD_FLAGS
1619		{
1620	<	} '='  auth_flags_items ';';
1620	>	if (conf_parser_ctx.pass == 2)
1621	>	block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
1622	>	} '=' auth_flags_items ';';
1623
1624		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1625	<	auth_flags_item: SPOOF_NOTICE
1625	>	auth_flags_item: EXCEED_LIMIT
1626		{
1627		if (conf_parser_ctx.pass == 2)
1628	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1629	<	} | EXCEED_LIMIT
1628	>	block_state.flags.value |= CONF_FLAGS_NOLIMIT;
1629	>	} | KLINE_EXEMPT
1630		{
1631		if (conf_parser_ctx.pass == 2)
1632	<	yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1633	<	} | KLINE_EXEMPT
1632	>	block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1633	>	} | XLINE_EXEMPT
1634		{
1635		if (conf_parser_ctx.pass == 2)
1636	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1636	>	block_state.flags.value |= CONF_FLAGS_EXEMPTXLINE;
1637		} | NEED_IDENT
1638		{
1639		if (conf_parser_ctx.pass == 2)
1640	<	yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
1640	>	block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
1641		} | CAN_FLOOD
1642		{
1643		if (conf_parser_ctx.pass == 2)
1644	<	yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
1644	>	block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
1645		} | NO_TILDE
1646		{
1647		if (conf_parser_ctx.pass == 2)
1648	<	yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1649	<	} | GLINE_EXEMPT
1648	>	block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1649	>	} | RESV_EXEMPT
1650		{
1651		if (conf_parser_ctx.pass == 2)
1652	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
1653	<	} | RESV_EXEMPT
1652	>	block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
1653	>	} | T_WEBIRC
1654		{
1655		if (conf_parser_ctx.pass == 2)
1656	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
1656	>	block_state.flags.value |= CONF_FLAGS_WEBIRC;
1657		} | NEED_PASSWORD
1658		{
1659		if (conf_parser_ctx.pass == 2)
1660	<	yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
1660	>	block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1661		};
1662
1663	<	/* XXX - need check for illegal hostnames here */
1715	<	auth_spoof: SPOOF '=' QSTRING ';'
1663	>	auth_spoof: SPOOF '=' QSTRING ';'
1664		{
1665	<	if (conf_parser_ctx.pass == 2)
1666	<	{
1719	<	MyFree(yy_conf->name);
1665	>	if (conf_parser_ctx.pass != 2)
1666	>	break;
1667
1668	<	if (strlen(yylval.string) < HOSTLEN)
1669	<	{
1670	<	DupString(yy_conf->name, yylval.string);
1671	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
1725	<	}
1726	<	else
1727	<	{
1728	<	ilog(LOG_TYPE_IRCD, "Spoofs must be less than %d..ignoring it", HOSTLEN);
1729	<	yy_conf->name = NULL;
1730	<	}
1668	>	if (valid_hostname(yylval.string))
1669	>	{
1670	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1671	>	block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
1672		}
1673	+	else
1674	+	ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
1675		};
1676
1677		auth_redir_serv: REDIRSERV '=' QSTRING ';'
1678		{
1679	<	if (conf_parser_ctx.pass == 2)
1680	<	{
1681	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1682	<	MyFree(yy_conf->name);
1683	<	DupString(yy_conf->name, yylval.string);
1741	<	}
1679	>	if (conf_parser_ctx.pass != 2)
1680	>	break;
1681	>
1682	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1683	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1684		};
1685
1686		auth_redir_port: REDIRPORT '=' NUMBER ';'
1687		{
1688	<	if (conf_parser_ctx.pass == 2)
1689	<	{
1690	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1691	<	yy_aconf->port = $3;
1692	<	}
1688	>	if (conf_parser_ctx.pass != 2)
1689	>	break;
1690	>
1691	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1692	>	block_state.port.value = $3;
1693		};
1694
1695
1696		/***************************************************************************
1697	<	*  section resv
1697	>	* resv {} section
1698		***************************************************************************/
1699		resv_entry: RESV
1700		{
1701	<	if (conf_parser_ctx.pass == 2)
1702	<	{
1703	<	MyFree(resv_reason);
1704	<	resv_reason = NULL;
1705	<	}
1701	>	if (conf_parser_ctx.pass != 2)
1702	>	break;
1703	>
1704	>	reset_block_state();
1705	>	strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
1706		} '{' resv_items '}' ';'
1707		{
1708	<	if (conf_parser_ctx.pass == 2)
1709	<	{
1710	<	MyFree(resv_reason);
1711	<	resv_reason = NULL;
1770	<	}
1708	>	if (conf_parser_ctx.pass != 2)
1709	>	break;
1710	>
1711	>	resv_make(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1712		};
1713
1714	<	resv_items:     resv_items resv_item | resv_item;
1715	<	resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
1714	>	resv_items:     resv_items resv_item | resv_item;
1715	>	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1716
1717	<	resv_creason: REASON '=' QSTRING ';'
1717	>	resv_mask: MASK '=' QSTRING ';'
1718		{
1719		if (conf_parser_ctx.pass == 2)
1720	<	{
1780	<	MyFree(resv_reason);
1781	<	DupString(resv_reason, yylval.string);
1782	<	}
1720	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1721		};
1722
1723	<	resv_channel: CHANNEL '=' QSTRING ';'
1723	>	resv_reason: REASON '=' QSTRING ';'
1724		{
1725		if (conf_parser_ctx.pass == 2)
1726	<	{
1789	<	if (IsChanPrefix(*yylval.string))
1790	<	{
1791	<	char def_reason[] = "No reason";
1792	<
1793	<	create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1794	<	}
1795	<	}
1796	<	/* ignore it for now.. but we really should make a warning if
1797	<	* its an erroneous name --fl_ */
1726	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1727		};
1728
1729	<	resv_nick: NICK '=' QSTRING ';'
1729	>	resv_exempt: EXEMPT '=' QSTRING ';'
1730		{
1731		if (conf_parser_ctx.pass == 2)
1732	<	{
1804	<	char def_reason[] = "No reason";
1805	<
1806	<	create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1807	<	}
1732	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1733		};
1734
1735	+
1736		/***************************************************************************
1737	<	*  section service
1737	>	* service {} section
1738		***************************************************************************/
1739		service_entry: T_SERVICE '{' service_items '}' ';';
1740
#	Line 1817 | Line 1743 | service_item:      service_name | error;
1743
1744		service_name: NAME '=' QSTRING ';'
1745		{
1746	<	if (conf_parser_ctx.pass == 2)
1746	>	if (conf_parser_ctx.pass != 2)
1747	>	break;
1748	>
1749	>	if (server_valid_name(yylval.string) == true)
1750		{
1751	<	if (valid_servname(yylval.string))
1752	<	{
1824	<	yy_conf = make_conf_item(SERVICE_TYPE);
1825	<	DupString(yy_conf->name, yylval.string);
1826	<	}
1751	>	struct ServiceItem *service = service_make();
1752	>	service->name = xstrdup(yylval.string);
1753		}
1754		};
1755
1756	+
1757		/***************************************************************************
1758	<	*  section shared, for sharing remote klines etc.
1758	>	* shared {} section, for sharing remote klines etc.
1759		***************************************************************************/
1760		shared_entry: T_SHARED
1761		{
1762	<	if (conf_parser_ctx.pass == 2)
1763	<	{
1764	<	yy_conf = make_conf_item(ULINE_TYPE);
1765	<	yy_match_item = map_to_conf(yy_conf);
1766	<	yy_match_item->action = SHARED_ALL;
1767	<	}
1762	>	if (conf_parser_ctx.pass != 2)
1763	>	break;
1764	>
1765	>	reset_block_state();
1766	>
1767	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1768	>	strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
1769	>	strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
1770	>	block_state.flags.value = SHARED_ALL;
1771		} '{' shared_items '}' ';'
1772		{
1773	<	if (conf_parser_ctx.pass == 2)
1774	<	{
1775	<	yy_conf = NULL;
1776	<	}
1773	>	if (conf_parser_ctx.pass != 2)
1774	>	break;
1775	>
1776	>	struct SharedItem *shared = shared_make();
1777	>	shared->type = block_state.flags.value;
1778	>	shared->server = xstrdup(block_state.name.buf);
1779	>	shared->user = xstrdup(block_state.user.buf);
1780	>	shared->host = xstrdup(block_state.host.buf);
1781		};
1782
1783		shared_items: shared_items shared_item | shared_item;
#	Line 1852 | Line 1786 | shared_item:  shared_name | shared_user
1786		shared_name: NAME '=' QSTRING ';'
1787		{
1788		if (conf_parser_ctx.pass == 2)
1789	<	{
1856	<	MyFree(yy_conf->name);
1857	<	DupString(yy_conf->name, yylval.string);
1858	<	}
1789	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1790		};
1791
1792		shared_user: USER '=' QSTRING ';'
#	Line 1866 | Line 1797 | shared_user: USER '=' QSTRING ';'
1797
1798		nuh.nuhmask  = yylval.string;
1799		nuh.nickptr  = NULL;
1800	<	nuh.userptr  = userbuf;
1801	<	nuh.hostptr  = hostbuf;
1800	>	nuh.userptr  = block_state.user.buf;
1801	>	nuh.hostptr  = block_state.host.buf;
1802
1803		nuh.nicksize = 0;
1804	<	nuh.usersize = sizeof(userbuf);
1805	<	nuh.hostsize = sizeof(hostbuf);
1804	>	nuh.usersize = sizeof(block_state.user.buf);
1805	>	nuh.hostsize = sizeof(block_state.host.buf);
1806
1807		split_nuh(&nuh);
1877	–
1878	–	DupString(yy_match_item->user, userbuf);
1879	–	DupString(yy_match_item->host, hostbuf);
1808		}
1809		};
1810
1811		shared_type: TYPE
1812		{
1813		if (conf_parser_ctx.pass == 2)
1814	<	yy_match_item->action = 0;
1814	>	block_state.flags.value = 0;
1815		} '=' shared_types ';' ;
1816
1817		shared_types: shared_types ',' shared_type_item | shared_type_item;
1818		shared_type_item: KLINE
1819		{
1820		if (conf_parser_ctx.pass == 2)
1821	<	yy_match_item->action |= SHARED_KLINE;
1821	>	block_state.flags.value |= SHARED_KLINE;
1822		} | UNKLINE
1823		{
1824		if (conf_parser_ctx.pass == 2)
1825	<	yy_match_item->action |= SHARED_UNKLINE;
1825	>	block_state.flags.value |= SHARED_UNKLINE;
1826		} | T_DLINE
1827		{
1828		if (conf_parser_ctx.pass == 2)
1829	<	yy_match_item->action |= SHARED_DLINE;
1829	>	block_state.flags.value |= SHARED_DLINE;
1830		} | T_UNDLINE
1831		{
1832		if (conf_parser_ctx.pass == 2)
1833	<	yy_match_item->action |= SHARED_UNDLINE;
1833	>	block_state.flags.value |= SHARED_UNDLINE;
1834		} | XLINE
1835		{
1836		if (conf_parser_ctx.pass == 2)
1837	<	yy_match_item->action |= SHARED_XLINE;
1837	>	block_state.flags.value |= SHARED_XLINE;
1838		} | T_UNXLINE
1839		{
1840		if (conf_parser_ctx.pass == 2)
1841	<	yy_match_item->action |= SHARED_UNXLINE;
1841	>	block_state.flags.value |= SHARED_UNXLINE;
1842		} | RESV
1843		{
1844		if (conf_parser_ctx.pass == 2)
1845	<	yy_match_item->action |= SHARED_RESV;
1845	>	block_state.flags.value |= SHARED_RESV;
1846		} | T_UNRESV
1847		{
1848		if (conf_parser_ctx.pass == 2)
1849	<	yy_match_item->action |= SHARED_UNRESV;
1849	>	block_state.flags.value |= SHARED_UNRESV;
1850		} | T_LOCOPS
1851		{
1852		if (conf_parser_ctx.pass == 2)
1853	<	yy_match_item->action |= SHARED_LOCOPS;
1853	>	block_state.flags.value |= SHARED_LOCOPS;
1854		} | T_ALL
1855		{
1856		if (conf_parser_ctx.pass == 2)
1857	<	yy_match_item->action = SHARED_ALL;
1857	>	block_state.flags.value = SHARED_ALL;
1858		};
1859
1860	+
1861		/***************************************************************************
1862	<	*  section cluster
1862	>	* cluster {} section
1863		***************************************************************************/
1864		cluster_entry: T_CLUSTER
1865		{
1866	<	if (conf_parser_ctx.pass == 2)
1867	<	{
1868	<	yy_conf = make_conf_item(CLUSTER_TYPE);
1869	<	yy_conf->flags = SHARED_ALL;
1870	<	}
1866	>	if (conf_parser_ctx.pass != 2)
1867	>	break;
1868	>
1869	>	reset_block_state();
1870	>
1871	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1872	>	block_state.flags.value = CLUSTER_ALL;
1873		} '{' cluster_items '}' ';'
1874		{
1875	<	if (conf_parser_ctx.pass == 2)
1876	<	{
1877	<	if (yy_conf->name == NULL)
1878	<	DupString(yy_conf->name, "*");
1879	<	yy_conf = NULL;
1880	<	}
1875	>	if (conf_parser_ctx.pass != 2)
1876	>	break;
1877	>
1878	>	struct ClusterItem *cluster = cluster_make();
1879	>	cluster->type = block_state.flags.value;
1880	>	cluster->server = xstrdup(block_state.name.buf);
1881		};
1882
1883	<	cluster_items:  cluster_items cluster_item | cluster_item;
1884	<	cluster_item:   cluster_name | cluster_type | error ';' ;
1883	>	cluster_items:  cluster_items cluster_item | cluster_item;
1884	>	cluster_item:   cluster_name | cluster_type | error ';' ;
1885
1886		cluster_name: NAME '=' QSTRING ';'
1887		{
1888		if (conf_parser_ctx.pass == 2)
1889	<	DupString(yy_conf->name, yylval.string);
1889	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1890		};
1891
1892		cluster_type: TYPE
1893		{
1894		if (conf_parser_ctx.pass == 2)
1895	<	yy_conf->flags = 0;
1895	>	block_state.flags.value = 0;
1896		} '=' cluster_types ';' ;
1897
1898	<	cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1898	>	cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1899		cluster_type_item: KLINE
1900		{
1901		if (conf_parser_ctx.pass == 2)
1902	<	yy_conf->flags |= SHARED_KLINE;
1902	>	block_state.flags.value |= CLUSTER_KLINE;
1903		} | UNKLINE
1904		{
1905		if (conf_parser_ctx.pass == 2)
1906	<	yy_conf->flags |= SHARED_UNKLINE;
1906	>	block_state.flags.value |= CLUSTER_UNKLINE;
1907		} | T_DLINE
1908		{
1909		if (conf_parser_ctx.pass == 2)
1910	<	yy_conf->flags |= SHARED_DLINE;
1910	>	block_state.flags.value |= CLUSTER_DLINE;
1911		} | T_UNDLINE
1912		{
1913		if (conf_parser_ctx.pass == 2)
1914	<	yy_conf->flags |= SHARED_UNDLINE;
1914	>	block_state.flags.value |= CLUSTER_UNDLINE;
1915		} | XLINE
1916		{
1917		if (conf_parser_ctx.pass == 2)
1918	<	yy_conf->flags |= SHARED_XLINE;
1918	>	block_state.flags.value |= CLUSTER_XLINE;
1919		} | T_UNXLINE
1920		{
1921		if (conf_parser_ctx.pass == 2)
1922	<	yy_conf->flags |= SHARED_UNXLINE;
1922	>	block_state.flags.value |= CLUSTER_UNXLINE;
1923		} | RESV
1924		{
1925		if (conf_parser_ctx.pass == 2)
1926	<	yy_conf->flags |= SHARED_RESV;
1926	>	block_state.flags.value |= CLUSTER_RESV;
1927		} | T_UNRESV
1928		{
1929		if (conf_parser_ctx.pass == 2)
1930	<	yy_conf->flags |= SHARED_UNRESV;
1930	>	block_state.flags.value |= CLUSTER_UNRESV;
1931		} | T_LOCOPS
1932		{
1933		if (conf_parser_ctx.pass == 2)
1934	<	yy_conf->flags |= SHARED_LOCOPS;
1934	>	block_state.flags.value |= CLUSTER_LOCOPS;
1935		} | T_ALL
1936		{
1937		if (conf_parser_ctx.pass == 2)
1938	<	yy_conf->flags = SHARED_ALL;
1938	>	block_state.flags.value = CLUSTER_ALL;
1939		};
1940
1941	+
1942		/***************************************************************************
1943	<	*  section connect
1943	>	* connect {}  section
1944		***************************************************************************/
1945	<	connect_entry: CONNECT
1945	>	connect_entry: CONNECT
1946		{
2015	–	if (conf_parser_ctx.pass == 2)
2016	–	{
2017	–	yy_conf = make_conf_item(SERVER_TYPE);
2018	–	yy_aconf = map_to_conf(yy_conf);
1947
1948	<	/* defaults */
1949	<	yy_aconf->port = PORTNUM;
1950	<	}
1951	<	else
1952	<	{
1953	<	MyFree(class_name);
1954	<	class_name = NULL;
2027	<	}
1948	>	if (conf_parser_ctx.pass != 2)
1949	>	break;
1950	>
1951	>	reset_block_state();
1952	>	block_state.aftype.value = AF_INET;
1953	>	block_state.port.value = PORTNUM;
1954	>	block_state.timeout.value = CONNECTTIMEOUT;
1955		} '{' connect_items '}' ';'
1956		{
1957	<	if (conf_parser_ctx.pass == 2)
1957	>	struct addrinfo hints, *res;
1958	>
1959	>	if (conf_parser_ctx.pass != 2)
1960	>	break;
1961	>
1962	>	if (!block_state.name.buf[0] ||
1963	>	!block_state.host.buf[0])
1964	>	break;
1965	>
1966	>	if (!block_state.rpass.buf[0] ||
1967	>	!block_state.spass.buf[0])
1968	>	break;
1969	>
1970	>	if (server_valid_name(block_state.name.buf) == false)
1971	>	break;
1972	>
1973	>	if (has_wildcards(block_state.name.buf) ||
1974	>	has_wildcards(block_state.host.buf))
1975	>	break;
1976	>
1977	>	struct MaskItem *conf = conf_make(CONF_SERVER);
1978	>	conf->addr = xcalloc(sizeof(*conf->addr));
1979	>	conf->port = block_state.port.value;
1980	>	conf->timeout = block_state.timeout.value;
1981	>	conf->flags = block_state.flags.value;
1982	>	conf->aftype = block_state.aftype.value;
1983	>	conf->host = xstrdup(block_state.host.buf);
1984	>	conf->name = xstrdup(block_state.name.buf);
1985	>	conf->passwd = xstrdup(block_state.rpass.buf);
1986	>	conf->spasswd = xstrdup(block_state.spass.buf);
1987	>
1988	>	if (block_state.cert.buf[0])
1989	>	conf->certfp = xstrdup(block_state.cert.buf);
1990	>
1991	>	if (block_state.ciph.buf[0])
1992	>	conf->cipher_list = xstrdup(block_state.ciph.buf);
1993	>
1994	>	dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
1995	>	dlinkMoveList(&block_state.hub.list, &conf->hub_list);
1996	>
1997	>	if (block_state.bind.buf[0])
1998		{
1999	<	if (yy_aconf->host && yy_aconf->passwd && yy_aconf->spasswd)
2000	<	{
2001	<	if (conf_add_server(yy_conf, class_name) == -1)
2002	<	delete_conf_item(yy_conf);
2003	<	}
1999	>	memset(&hints, 0, sizeof(hints));
2000	>
2001	>	hints.ai_family   = AF_UNSPEC;
2002	>	hints.ai_socktype = SOCK_STREAM;
2003	>	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2004	>
2005	>	if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2006	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server bind(%s)", block_state.bind.buf);
2007		else
2008		{
2009	<	if (yy_conf->name != NULL)
2010	<	{
2011	<	if (yy_aconf->host == NULL)
2042	<	yyerror("Ignoring connect block -- missing host");
2043	<	else if (!yy_aconf->passwd || !yy_aconf->spasswd)
2044	<	yyerror("Ignoring connect block -- missing password");
2045	<	}
2046	<
2047	<	/* XXX
2048	<	* This fixes a try_connections() core (caused by invalid class_ptr
2049	<	* pointers) reported by metalrock. That's an ugly fix, but there
2050	<	* is currently no better way. The entire config subsystem needs an
2051	<	* rewrite ASAP. make_conf_item() shouldn't really add things onto
2052	<	* a doubly linked list immediately without any sanity checks!  -Michael
2053	<	*/
2054	<	delete_conf_item(yy_conf);
2055	<	}
2009	>	assert(res);
2010	>
2011	>	conf->bind = xcalloc(sizeof(*conf->bind));
2012
2013	<	MyFree(class_name);
2014	<	class_name = NULL;
2015	<	yy_conf = NULL;
2016	<	yy_aconf = NULL;
2013	>	memcpy(conf->bind, res->ai_addr, res->ai_addrlen);
2014	>	conf->bind->ss_len = res->ai_addrlen;
2015	>	freeaddrinfo(res);
2016	>	}
2017		}
2018	+
2019	+	conf_add_class_to_conf(conf, block_state.class.buf);
2020	+	conf_dns_lookup(conf);
2021		};
2022
2023		connect_items:  connect_items connect_item | connect_item;
2024	<	connect_item:   connect_name | connect_host | connect_vhost |
2025	<	connect_send_password | connect_accept_password |
2026	<	connect_aftype | connect_port | connect_ssl_cipher_list |
2027	<	connect_flags | connect_hub_mask | connect_leaf_mask |
2028	<	connect_class | connect_encrypted |
2024	>	connect_item:   connect_name |
2025	>	connect_host |
2026	>	connect_timeout |
2027	>	connect_bind |
2028	>	connect_send_password |
2029	>	connect_accept_password |
2030	>	connect_tls_certificate_fingerprint |
2031	>	connect_aftype |
2032	>	connect_port |
2033	>	connect_tls_cipher_list |
2034	>	connect_flags |
2035	>	connect_hub_mask |
2036	>	connect_leaf_mask |
2037	>	connect_class |
2038	>	connect_encrypted |
2039		error ';' ;
2040
2041		connect_name: NAME '=' QSTRING ';'
2042		{
2043		if (conf_parser_ctx.pass == 2)
2044	<	{
2076	<	MyFree(yy_conf->name);
2077	<	DupString(yy_conf->name, yylval.string);
2078	<	}
2044	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2045		};
2046
2047	<	connect_host: HOST '=' QSTRING ';'
2047	>	connect_host: HOST '=' QSTRING ';'
2048		{
2049		if (conf_parser_ctx.pass == 2)
2050	<	{
2085	<	MyFree(yy_aconf->host);
2086	<	DupString(yy_aconf->host, yylval.string);
2087	<	}
2050	>	strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2051		};
2052
2053	<	connect_vhost: VHOST '=' QSTRING ';'
2053	>	connect_timeout: TIMEOUT '=' timespec ';'
2054		{
2055		if (conf_parser_ctx.pass == 2)
2056	<	{
2057	<	struct addrinfo hints, *res;
2095	<
2096	<	memset(&hints, 0, sizeof(hints));
2097	<
2098	<	hints.ai_family   = AF_UNSPEC;
2099	<	hints.ai_socktype = SOCK_STREAM;
2100	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2101	<
2102	<	if (getaddrinfo(yylval.string, NULL, &hints, &res))
2103	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
2104	<	else
2105	<	{
2106	<	assert(res != NULL);
2056	>	block_state.timeout.value = $3;
2057	>	};
2058
2059	<	memcpy(&yy_aconf->bind, res->ai_addr, res->ai_addrlen);
2060	<	yy_aconf->bind.ss.ss_family = res->ai_family;
2061	<	yy_aconf->bind.ss_len = res->ai_addrlen;
2062	<	freeaddrinfo(res);
2112	<	}
2113	<	}
2059	>	connect_bind: T_BIND '=' QSTRING ';'
2060	>	{
2061	>	if (conf_parser_ctx.pass == 2)
2062	>	strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2063		};
2064	<
2064	>
2065		connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2066		{
2067	<	if (conf_parser_ctx.pass == 2)
2068	<	{
2120	<	if ($3[0] == ':')
2121	<	yyerror("Server passwords cannot begin with a colon");
2122	<	else if (strchr($3, ' ') != NULL)
2123	<	yyerror("Server passwords cannot contain spaces");
2124	<	else {
2125	<	if (yy_aconf->spasswd != NULL)
2126	<	memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
2067	>	if (conf_parser_ctx.pass != 2)
2068	>	break;
2069
2070	<	MyFree(yy_aconf->spasswd);
2071	<	DupString(yy_aconf->spasswd, yylval.string);
2072	<	}
2073	<	}
2070	>	if (*yylval.string == ':')
2071	>	conf_error_report("Server passwords cannot begin with a colon");
2072	>	else if (strchr(yylval.string, ' '))
2073	>	conf_error_report("Server passwords cannot contain spaces");
2074	>	else
2075	>	strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
2076		};
2077
2078		connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2079		{
2080	<	if (conf_parser_ctx.pass == 2)
2081	<	{
2138	<	if ($3[0] == ':')
2139	<	yyerror("Server passwords cannot begin with a colon");
2140	<	else if (strchr($3, ' ') != NULL)
2141	<	yyerror("Server passwords cannot contain spaces");
2142	<	else {
2143	<	if (yy_aconf->passwd != NULL)
2144	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
2080	>	if (conf_parser_ctx.pass != 2)
2081	>	break;
2082
2083	<	MyFree(yy_aconf->passwd);
2084	<	DupString(yy_aconf->passwd, yylval.string);
2085	<	}
2086	<	}
2083	>	if (*yylval.string == ':')
2084	>	conf_error_report("Server passwords cannot begin with a colon");
2085	>	else if (strchr(yylval.string, ' '))
2086	>	conf_error_report("Server passwords cannot contain spaces");
2087	>	else
2088	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2089	>	};
2090	>
2091	>	connect_tls_certificate_fingerprint: TLS_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
2092	>	{
2093	>	if (conf_parser_ctx.pass == 2)
2094	>	strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
2095		};
2096
2097		connect_port: PORT '=' NUMBER ';'
2098		{
2099		if (conf_parser_ctx.pass == 2)
2100	<	yy_aconf->port = $3;
2100	>	block_state.port.value = $3;
2101		};
2102
2103		connect_aftype: AFTYPE '=' T_IPV4 ';'
2104		{
2105		if (conf_parser_ctx.pass == 2)
2106	<	yy_aconf->aftype = AF_INET;
2106	>	block_state.aftype.value = AF_INET;
2107		} | AFTYPE '=' T_IPV6 ';'
2108		{
2164	–	#ifdef IPV6
2109		if (conf_parser_ctx.pass == 2)
2110	<	yy_aconf->aftype = AF_INET6;
2167	<	#endif
2110	>	block_state.aftype.value = AF_INET6;
2111		};
2112
2113		connect_flags: IRCD_FLAGS
2114		{
2115	<	} '='  connect_flags_items ';';
2115	>	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2116	>	} '=' connect_flags_items ';';
2117
2118		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2119		connect_flags_item: AUTOCONN
2120		{
2121		if (conf_parser_ctx.pass == 2)
2122	<	SetConfAllowAutoConn(yy_aconf);
2123	<	} | T_SSL
2122	>	block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2123	>	} | T_TLS
2124		{
2125		if (conf_parser_ctx.pass == 2)
2126	<	SetConfSSL(yy_aconf);
2126	>	block_state.flags.value |= CONF_FLAGS_TLS;
2127		};
2128
2129		connect_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 2187 | Line 2131 | connect_encrypted: ENCRYPTED '=' TBOOL '
2131		if (conf_parser_ctx.pass == 2)
2132		{
2133		if (yylval.number)
2134	<	yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
2134	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
2135		else
2136	<	yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
2136	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
2137		}
2138		};
2139
2140	<	connect_hub_mask: HUB_MASK '=' QSTRING ';'
2140	>	connect_hub_mask: HUB_MASK '=' QSTRING ';'
2141		{
2142		if (conf_parser_ctx.pass == 2)
2143	<	{
2200	<	char *mask;
2201	<
2202	<	DupString(mask, yylval.string);
2203	<	dlinkAdd(mask, make_dlink_node(), &yy_aconf->hub_list);
2204	<	}
2143	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2144		};
2145
2146	<	connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2146	>	connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2147		{
2148		if (conf_parser_ctx.pass == 2)
2149	<	{
2211	<	char *mask;
2212	<
2213	<	DupString(mask, yylval.string);
2214	<	dlinkAdd(mask, make_dlink_node(), &yy_aconf->leaf_list);
2215	<	}
2149	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
2150		};
2151
2152		connect_class: CLASS '=' QSTRING ';'
2153		{
2154		if (conf_parser_ctx.pass == 2)
2155	<	{
2222	<	MyFree(class_name);
2223	<	DupString(class_name, yylval.string);
2224	<	}
2155	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2156		};
2157
2158	<	connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2158	>	connect_tls_cipher_list: TLS_CIPHER_LIST '=' QSTRING ';'
2159		{
2160	<	#ifdef HAVE_LIBCRYPTO
2160	>	#ifdef HAVE_TLS
2161		if (conf_parser_ctx.pass == 2)
2162	<	{
2232	<	MyFree(yy_aconf->cipher_list);
2233	<	DupString(yy_aconf->cipher_list, yylval.string);
2234	<	}
2162	>	strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2163		#else
2164		if (conf_parser_ctx.pass == 2)
2165	<	yyerror("Ignoring connect::ciphers -- no OpenSSL support");
2165	>	conf_error_report("Ignoring connect::tls_cipher_list -- no TLS support");
2166		#endif
2167		};
2168
2169
2170		/***************************************************************************
2171	<	*  section kill
2171	>	* kill {} section
2172		***************************************************************************/
2173		kill_entry: KILL
2174		{
2175		if (conf_parser_ctx.pass == 2)
2176	<	{
2249	<	userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
2250	<	regex_ban = 0;
2251	<	}
2176	>	reset_block_state();
2177		} '{' kill_items '}' ';'
2178		{
2179	<	if (conf_parser_ctx.pass == 2)
2180	<	{
2256	<	if (userbuf[0] && hostbuf[0])
2257	<	{
2258	<	if (regex_ban)
2259	<	{
2260	<	#ifdef HAVE_LIBPCRE
2261	<	void *exp_user = NULL;
2262	<	void *exp_host = NULL;
2263	<	const char *errptr = NULL;
2264	<
2265	<	if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
2266	<	!(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
2267	<	{
2268	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: %s",
2269	<	errptr);
2270	<	break;
2271	<	}
2272	<
2273	<	yy_aconf = map_to_conf(make_conf_item(RKLINE_TYPE));
2274	<	yy_aconf->regexuser = exp_user;
2275	<	yy_aconf->regexhost = exp_host;
2276	<
2277	<	DupString(yy_aconf->user, userbuf);
2278	<	DupString(yy_aconf->host, hostbuf);
2279	<
2280	<	if (reasonbuf[0])
2281	<	DupString(yy_aconf->reason, reasonbuf);
2282	<	else
2283	<	DupString(yy_aconf->reason, "No reason");
2284	<	#else
2285	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: no PCRE support");
2286	<	break;
2287	<	#endif
2288	<	}
2289	<	else
2290	<	{
2291	<	find_and_delete_temporary(userbuf, hostbuf, CONF_KLINE);
2292	<
2293	<	yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
2294	<
2295	<	DupString(yy_aconf->user, userbuf);
2296	<	DupString(yy_aconf->host, hostbuf);
2297	<
2298	<	if (reasonbuf[0])
2299	<	DupString(yy_aconf->reason, reasonbuf);
2300	<	else
2301	<	DupString(yy_aconf->reason, "No reason");
2302	<	add_conf_by_address(CONF_KLINE, yy_aconf);
2303	<	}
2304	<	}
2305	<
2306	<	yy_aconf = NULL;
2307	<	}
2308	<	};
2179	>	if (conf_parser_ctx.pass != 2)
2180	>	break;
2181
2182	<	kill_type: TYPE
2183	<	{
2184	<	} '='  kill_type_items ';';
2182	>	if (!block_state.user.buf[0] ||
2183	>	!block_state.host.buf[0])
2184	>	break;
2185	>
2186	>	struct MaskItem *conf = conf_make(CONF_KLINE);
2187	>	conf->user = xstrdup(block_state.user.buf);
2188	>	conf->host = xstrdup(block_state.host.buf);
2189
2190	<	kill_type_items: kill_type_items ',' kill_type_item | kill_type_item;
2191	<	kill_type_item: REGEX_T
2192	<	{
2193	<	if (conf_parser_ctx.pass == 2)
2194	<	regex_ban = 1;
2190	>	if (block_state.rpass.buf[0])
2191	>	conf->reason = xstrdup(block_state.rpass.buf);
2192	>	else
2193	>	conf->reason = xstrdup(CONF_NOREASON);
2194	>	add_conf_by_address(CONF_KLINE, conf);
2195		};
2196
2197		kill_items:     kill_items kill_item | kill_item;
2198	<	kill_item:      kill_user | kill_reason | kill_type | error;
2198	>	kill_item:      kill_user | kill_reason | error;
2199
2200		kill_user: USER '=' QSTRING ';'
2201		{
2202	+
2203		if (conf_parser_ctx.pass == 2)
2204		{
2205		struct split_nuh_item nuh;
2206
2207		nuh.nuhmask  = yylval.string;
2208		nuh.nickptr  = NULL;
2209	<	nuh.userptr  = userbuf;
2210	<	nuh.hostptr  = hostbuf;
2209	>	nuh.userptr  = block_state.user.buf;
2210	>	nuh.hostptr  = block_state.host.buf;
2211
2212		nuh.nicksize = 0;
2213	<	nuh.usersize = sizeof(userbuf);
2214	<	nuh.hostsize = sizeof(hostbuf);
2213	>	nuh.usersize = sizeof(block_state.user.buf);
2214	>	nuh.hostsize = sizeof(block_state.host.buf);
2215
2216		split_nuh(&nuh);
2217		}
2218		};
2219
2220	<	kill_reason: REASON '=' QSTRING ';'
2220	>	kill_reason: REASON '=' QSTRING ';'
2221		{
2222		if (conf_parser_ctx.pass == 2)
2223	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2223	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2224		};
2225
2226	+
2227		/***************************************************************************
2228	<	*  section deny
2228	>	* deny {} section
2229		***************************************************************************/
2230	<	deny_entry: DENY
2230	>	deny_entry: DENY
2231		{
2232		if (conf_parser_ctx.pass == 2)
2233	<	hostbuf[0] = reasonbuf[0] = '\0';
2233	>	reset_block_state();
2234		} '{' deny_items '}' ';'
2235		{
2236	<	if (conf_parser_ctx.pass == 2)
2237	<	{
2360	<	if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
2361	<	{
2362	<	find_and_delete_temporary(NULL, hostbuf, CONF_DLINE);
2236	>	if (conf_parser_ctx.pass != 2)
2237	>	break;
2238
2239	<	yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
2240	<	DupString(yy_aconf->host, hostbuf);
2239	>	if (!block_state.addr.buf[0])
2240	>	break;
2241
2242	<	if (reasonbuf[0])
2243	<	DupString(yy_aconf->reason, reasonbuf);
2244	<	else
2245	<	DupString(yy_aconf->reason, "No reason");
2246	<	add_conf_by_address(CONF_DLINE, yy_aconf);
2247	<	yy_aconf = NULL;
2248	<	}
2242	>	if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2243	>	{
2244	>	struct MaskItem *conf = conf_make(CONF_DLINE);
2245	>	conf->host = xstrdup(block_state.addr.buf);
2246	>
2247	>	if (block_state.rpass.buf[0])
2248	>	conf->reason = xstrdup(block_state.rpass.buf);
2249	>	else
2250	>	conf->reason = xstrdup(CONF_NOREASON);
2251	>	add_conf_by_address(CONF_DLINE, conf);
2252		}
2253	<	};
2253	>	};
2254
2255		deny_items:     deny_items deny_item | deny_item;
2256		deny_item:      deny_ip | deny_reason | error;
#	Line 2380 | Line 2258 | deny_item:      deny_ip | deny_reason |
2258		deny_ip: IP '=' QSTRING ';'
2259		{
2260		if (conf_parser_ctx.pass == 2)
2261	<	strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
2261	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2262		};
2263
2264	<	deny_reason: REASON '=' QSTRING ';'
2264	>	deny_reason: REASON '=' QSTRING ';'
2265		{
2266		if (conf_parser_ctx.pass == 2)
2267	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2267	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2268		};
2269
2270	+
2271		/***************************************************************************
2272	<	*  section exempt
2272	>	* exempt {} section
2273		***************************************************************************/
2274		exempt_entry: EXEMPT '{' exempt_items '}' ';';
2275
2276	<	exempt_items:     exempt_items exempt_item | exempt_item;
2277	<	exempt_item:      exempt_ip | error;
2276	>	exempt_items: exempt_items exempt_item | exempt_item;
2277	>	exempt_item:  exempt_ip | error;
2278
2279		exempt_ip: IP '=' QSTRING ';'
2280		{
2281		if (conf_parser_ctx.pass == 2)
2282		{
2283	<	if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2283	>	if (*yylval.string && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2284		{
2285	<	yy_aconf = map_to_conf(make_conf_item(EXEMPTDLINE_TYPE));
2286	<	DupString(yy_aconf->host, yylval.string);
2285	>	struct MaskItem *conf = conf_make(CONF_EXEMPT);
2286	>	conf->host = xstrdup(yylval.string);
2287
2288	<	add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
2410	<	yy_aconf = NULL;
2288	>	add_conf_by_address(CONF_EXEMPT, conf);
2289		}
2290		}
2291		};
2292
2293		/***************************************************************************
2294	<	*  section gecos
2294	>	* gecos {} section
2295		***************************************************************************/
2296		gecos_entry: GECOS
2297		{
2298		if (conf_parser_ctx.pass == 2)
2299	<	{
2422	<	regex_ban = 0;
2423	<	reasonbuf[0] = gecos_name[0] = '\0';
2424	<	}
2299	>	reset_block_state();
2300		} '{' gecos_items '}' ';'
2301		{
2302	<	if (conf_parser_ctx.pass == 2)
2303	<	{
2429	<	if (gecos_name[0])
2430	<	{
2431	<	if (regex_ban)
2432	<	{
2433	<	#ifdef HAVE_LIBPCRE
2434	<	void *exp_p = NULL;
2435	<	const char *errptr = NULL;
2436	<
2437	<	if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
2438	<	{
2439	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: %s",
2440	<	errptr);
2441	<	break;
2442	<	}
2302	>	if (conf_parser_ctx.pass != 2)
2303	>	break;
2304
2305	<	yy_conf = make_conf_item(RXLINE_TYPE);
2306	<	yy_conf->regexpname = exp_p;
2446	<	#else
2447	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: no PCRE support");
2448	<	break;
2449	<	#endif
2450	<	}
2451	<	else
2452	<	yy_conf = make_conf_item(XLINE_TYPE);
2453	<
2454	<	yy_match_item = map_to_conf(yy_conf);
2455	<	DupString(yy_conf->name, gecos_name);
2456	<
2457	<	if (reasonbuf[0])
2458	<	DupString(yy_match_item->reason, reasonbuf);
2459	<	else
2460	<	DupString(yy_match_item->reason, "No reason");
2461	<	}
2462	<	}
2463	<	};
2305	>	if (!block_state.name.buf[0])
2306	>	break;
2307
2308	<	gecos_flags: TYPE
2309	<	{
2467	<	} '='  gecos_flags_items ';';
2308	>	struct GecosItem *gecos = gecos_make();
2309	>	gecos->mask = xstrdup(block_state.name.buf);
2310
2311	<	gecos_flags_items: gecos_flags_items ',' gecos_flags_item | gecos_flags_item;
2312	<	gecos_flags_item: REGEX_T
2313	<	{
2314	<	if (conf_parser_ctx.pass == 2)
2473	<	regex_ban = 1;
2311	>	if (block_state.rpass.buf[0])
2312	>	gecos->reason = xstrdup(block_state.rpass.buf);
2313	>	else
2314	>	gecos->reason = xstrdup(CONF_NOREASON);
2315		};
2316
2317		gecos_items: gecos_items gecos_item | gecos_item;
2318	<	gecos_item:  gecos_name | gecos_reason | gecos_flags | error;
2318	>	gecos_item:  gecos_name | gecos_reason | error;
2319
2320	<	gecos_name: NAME '=' QSTRING ';'
2320	>	gecos_name: NAME '=' QSTRING ';'
2321		{
2322		if (conf_parser_ctx.pass == 2)
2323	<	strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
2323	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2324		};
2325
2326	<	gecos_reason: REASON '=' QSTRING ';'
2326	>	gecos_reason: REASON '=' QSTRING ';'
2327		{
2328		if (conf_parser_ctx.pass == 2)
2329	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2329	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2330		};
2331
2332	+
2333		/***************************************************************************
2334	<	*  section general
2334	>	* general {} section
2335		***************************************************************************/
2336	<	general_entry: GENERAL
2495	<	'{' general_items '}' ';';
2336	>	general_entry: GENERAL '{' general_items '}' ';';
2337
2338		general_items:      general_items general_item | general_item;
2339	<	general_item:       general_hide_spoof_ips | general_ignore_bogus_ts |
2340	<	general_failed_oper_notice | general_anti_nick_flood |
2341	<	general_max_nick_time | general_max_nick_changes |
2342	<	general_max_accept | general_anti_spam_exit_message_time |
2343	<	general_ts_warn_delta | general_ts_max_delta |
2344	<	general_kill_chase_time_limit | general_kline_with_reason |
2345	<	general_kline_reason | general_invisible_on_connect |
2346	<	general_warn_no_nline | general_dots_in_ident |
2347	<	general_stats_o_oper_only | general_stats_k_oper_only |
2348	<	general_pace_wait | general_stats_i_oper_only |
2349	<	general_pace_wait_simple | general_stats_P_oper_only |
2350	<	general_short_motd | general_no_oper_flood |
2351	<	general_true_no_oper_flood | general_oper_pass_resv |
2352	<	general_message_locale |
2353	<	general_oper_only_umodes | general_max_targets |
2354	<	general_use_egd | general_egdpool_path |
2355	<	general_oper_umodes | general_caller_id_wait |
2356	<	general_opers_bypass_callerid | general_default_floodcount |
2357	<	general_min_nonwildcard | general_min_nonwildcard_simple |
2358	<	general_disable_remote_commands |
2359	<	general_throttle_time | general_havent_read_conf |
2339	>	general_item:       general_away_count |
2340	>	general_away_time |
2341	>	general_failed_oper_notice |
2342	>	general_anti_nick_flood |
2343	>	general_max_nick_time |
2344	>	general_max_nick_changes |
2345	>	general_max_accept |
2346	>	general_whowas_history_length |
2347	>	general_anti_spam_exit_message_time |
2348	>	general_ts_warn_delta |
2349	>	general_ts_max_delta |
2350	>	general_kill_chase_time_limit |
2351	>	general_invisible_on_connect |
2352	>	general_warn_no_connect_block |
2353	>	general_dots_in_ident |
2354	>	general_stats_i_oper_only |
2355	>	general_stats_k_oper_only |
2356	>	general_stats_m_oper_only |
2357	>	general_stats_o_oper_only |
2358	>	general_stats_P_oper_only |
2359	>	general_stats_u_oper_only |
2360	>	general_pace_wait |
2361	>	general_pace_wait_simple |
2362	>	general_short_motd |
2363	>	general_no_oper_flood |
2364	>	general_oper_only_umodes |
2365	>	general_max_targets |
2366	>	general_oper_umodes |
2367	>	general_caller_id_wait |
2368	>	general_opers_bypass_callerid |
2369	>	general_default_floodcount |
2370	>	general_default_floodtime |
2371	>	general_min_nonwildcard |
2372	>	general_min_nonwildcard_simple |
2373	>	general_throttle_count |
2374	>	general_throttle_time |
2375		general_ping_cookie |
2376	<	general_disable_auth |
2377	<	general_tkline_expire_notices | general_gline_enable |
2378	<	general_gline_duration | general_gline_request_duration |
2379	<	general_gline_min_cidr |
2380	<	general_gline_min_cidr6 | general_use_whois_actually |
2381	<	general_reject_hold_time | general_stats_e_disabled |
2382	<	general_max_watch | general_services_name |
2383	<	error;
2376	>	general_disable_auth |
2377	>	general_dline_min_cidr |
2378	>	general_dline_min_cidr6 |
2379	>	general_kline_min_cidr |
2380	>	general_kline_min_cidr6 |
2381	>	general_stats_e_disabled |
2382	>	general_max_monitor |
2383	>	general_cycle_on_host_change |
2384	>	error;
2385
2386
2387	<	general_max_watch: MAX_WATCH '=' NUMBER ';'
2387	>	general_away_count: AWAY_COUNT '=' NUMBER ';'
2388		{
2389	<	ConfigFileEntry.max_watch = $3;
2389	>	ConfigGeneral.away_count = $3;
2390		};
2391
2392	<	general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2392	>	general_away_time: AWAY_TIME '=' timespec ';'
2393		{
2394	<	if (conf_parser_ctx.pass == 2)
2538	<	ConfigFileEntry.glines = yylval.number;
2394	>	ConfigGeneral.away_time = $3;
2395		};
2396
2397	<	general_gline_duration: GLINE_DURATION '=' timespec ';'
2397	>	general_max_monitor: MAX_MONITOR '=' NUMBER ';'
2398		{
2399	<	if (conf_parser_ctx.pass == 2)
2544	<	ConfigFileEntry.gline_time = $3;
2399	>	ConfigGeneral.max_monitor = $3;
2400		};
2401
2402	<	general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2402	>	general_whowas_history_length: WHOWAS_HISTORY_LENGTH '=' NUMBER ';'
2403		{
2404	<	if (conf_parser_ctx.pass == 2)
2550	<	ConfigFileEntry.gline_request_time = $3;
2404	>	ConfigGeneral.whowas_history_length = $3;
2405		};
2406
2407	<	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2407	>	general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2408		{
2409	<	ConfigFileEntry.gline_min_cidr = $3;
2409	>	ConfigGeneral.cycle_on_host_change = yylval.number;
2410		};
2411
2412	<	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2412	>	general_dline_min_cidr: DLINE_MIN_CIDR '=' NUMBER ';'
2413		{
2414	<	ConfigFileEntry.gline_min_cidr6 = $3;
2414	>	ConfigGeneral.dline_min_cidr = $3;
2415		};
2416
2417	<	general_use_whois_actually: USE_WHOIS_ACTUALLY '=' TBOOL ';'
2417	>	general_dline_min_cidr6: DLINE_MIN_CIDR6 '=' NUMBER ';'
2418		{
2419	<	ConfigFileEntry.use_whois_actually = yylval.number;
2419	>	ConfigGeneral.dline_min_cidr6 = $3;
2420		};
2421
2422	<	general_reject_hold_time: TREJECT_HOLD_TIME '=' timespec ';'
2422	>	general_kline_min_cidr: KLINE_MIN_CIDR '=' NUMBER ';'
2423		{
2424	<	GlobalSetOptions.rejecttime = yylval.number;
2424	>	ConfigGeneral.kline_min_cidr = $3;
2425		};
2426
2427	<	general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2427	>	general_kline_min_cidr6: KLINE_MIN_CIDR6 '=' NUMBER ';'
2428		{
2429	<	ConfigFileEntry.tkline_expire_notices = yylval.number;
2429	>	ConfigGeneral.kline_min_cidr6 = $3;
2430		};
2431
2432		general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2433		{
2434	<	ConfigFileEntry.kill_chase_time_limit = $3;
2581	<	};
2582	<
2583	<	general_hide_spoof_ips: HIDE_SPOOF_IPS '=' TBOOL ';'
2584	<	{
2585	<	ConfigFileEntry.hide_spoof_ips = yylval.number;
2586	<	};
2587	<
2588	<	general_ignore_bogus_ts: IGNORE_BOGUS_TS '=' TBOOL ';'
2589	<	{
2590	<	ConfigFileEntry.ignore_bogus_ts = yylval.number;
2591	<	};
2592	<
2593	<	general_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
2594	<	{
2595	<	ConfigFileEntry.disable_remote = yylval.number;
2434	>	ConfigGeneral.kill_chase_time_limit = $3;
2435		};
2436
2437		general_failed_oper_notice: FAILED_OPER_NOTICE '=' TBOOL ';'
2438		{
2439	<	ConfigFileEntry.failed_oper_notice = yylval.number;
2439	>	ConfigGeneral.failed_oper_notice = yylval.number;
2440		};
2441
2442		general_anti_nick_flood: ANTI_NICK_FLOOD '=' TBOOL ';'
2443		{
2444	<	ConfigFileEntry.anti_nick_flood = yylval.number;
2444	>	ConfigGeneral.anti_nick_flood = yylval.number;
2445		};
2446
2447		general_max_nick_time: MAX_NICK_TIME '=' timespec ';'
2448		{
2449	<	ConfigFileEntry.max_nick_time = $3;
2449	>	ConfigGeneral.max_nick_time = $3;
2450		};
2451
2452		general_max_nick_changes: MAX_NICK_CHANGES '=' NUMBER ';'
2453		{
2454	<	ConfigFileEntry.max_nick_changes = $3;
2454	>	ConfigGeneral.max_nick_changes = $3;
2455		};
2456
2457		general_max_accept: MAX_ACCEPT '=' NUMBER ';'
2458		{
2459	<	ConfigFileEntry.max_accept = $3;
2459	>	ConfigGeneral.max_accept = $3;
2460		};
2461
2462		general_anti_spam_exit_message_time: ANTI_SPAM_EXIT_MESSAGE_TIME '=' timespec ';'
2463		{
2464	<	ConfigFileEntry.anti_spam_exit_message_time = $3;
2464	>	ConfigGeneral.anti_spam_exit_message_time = $3;
2465		};
2466
2467		general_ts_warn_delta: TS_WARN_DELTA '=' timespec ';'
2468		{
2469	<	ConfigFileEntry.ts_warn_delta = $3;
2469	>	ConfigGeneral.ts_warn_delta = $3;
2470		};
2471
2472		general_ts_max_delta: TS_MAX_DELTA '=' timespec ';'
2473		{
2474	<	if (conf_parser_ctx.pass == 2)
2636	<	ConfigFileEntry.ts_max_delta = $3;
2637	<	};
2638	<
2639	<	general_havent_read_conf: HAVENT_READ_CONF '=' NUMBER ';'
2640	<	{
2641	<	if (($3 > 0) && conf_parser_ctx.pass == 1)
2642	<	{
2643	<	ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
2644	<	ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
2645	<	ilog(LOG_TYPE_IRCD, "Consider actually reading/editing the conf file, and removing this line.");
2646	<	exit(0);
2647	<	}
2474	>	ConfigGeneral.ts_max_delta = $3;
2475		};
2476
2477	<	general_kline_with_reason: KLINE_WITH_REASON '=' TBOOL ';'
2477	>	general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2478		{
2479	<	ConfigFileEntry.kline_with_reason = yylval.number;
2479	>	ConfigGeneral.invisible_on_connect = yylval.number;
2480		};
2481
2482	<	general_kline_reason: KLINE_REASON '=' QSTRING ';'
2482	>	general_warn_no_connect_block: WARN_NO_CONNECT_BLOCK '=' TBOOL ';'
2483		{
2484	<	if (conf_parser_ctx.pass == 2)
2658	<	{
2659	<	MyFree(ConfigFileEntry.kline_reason);
2660	<	DupString(ConfigFileEntry.kline_reason, yylval.string);
2661	<	}
2484	>	ConfigGeneral.warn_no_connect_block = yylval.number;
2485		};
2486
2487	<	general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2487	>	general_stats_e_disabled: STATS_E_DISABLED '=' TBOOL ';'
2488		{
2489	<	ConfigFileEntry.invisible_on_connect = yylval.number;
2489	>	ConfigGeneral.stats_e_disabled = yylval.number;
2490		};
2491
2492	<	general_warn_no_nline: WARN_NO_NLINE '=' TBOOL ';'
2492	>	general_stats_m_oper_only: STATS_M_OPER_ONLY '=' TBOOL ';'
2493		{
2494	<	ConfigFileEntry.warn_no_nline = yylval.number;
2494	>	ConfigGeneral.stats_m_oper_only = yylval.number;
2495		};
2496
2497	<	general_stats_e_disabled: STATS_E_DISABLED '=' TBOOL ';'
2497	>	general_stats_o_oper_only: STATS_O_OPER_ONLY '=' TBOOL ';'
2498		{
2499	<	ConfigFileEntry.stats_e_disabled = yylval.number;
2499	>	ConfigGeneral.stats_o_oper_only = yylval.number;
2500		};
2501
2502	<	general_stats_o_oper_only: STATS_O_OPER_ONLY '=' TBOOL ';'
2502	>	general_stats_P_oper_only: STATS_P_OPER_ONLY '=' TBOOL ';'
2503		{
2504	<	ConfigFileEntry.stats_o_oper_only = yylval.number;
2504	>	ConfigGeneral.stats_P_oper_only = yylval.number;
2505		};
2506
2507	<	general_stats_P_oper_only: STATS_P_OPER_ONLY '=' TBOOL ';'
2507	>	general_stats_u_oper_only: STATS_U_OPER_ONLY '=' TBOOL ';'
2508		{
2509	<	ConfigFileEntry.stats_P_oper_only = yylval.number;
2509	>	ConfigGeneral.stats_u_oper_only = yylval.number;
2510		};
2511
2512		general_stats_k_oper_only: STATS_K_OPER_ONLY '=' TBOOL ';'
2513		{
2514	<	ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
2692	<	} | STATS_K_OPER_ONLY '=' TMASKED ';'
2693	<	{
2694	<	ConfigFileEntry.stats_k_oper_only = 1;
2514	>	ConfigGeneral.stats_k_oper_only = yylval.number;
2515		};
2516
2517		general_stats_i_oper_only: STATS_I_OPER_ONLY '=' TBOOL ';'
2518		{
2519	<	ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
2700	<	} | STATS_I_OPER_ONLY '=' TMASKED ';'
2701	<	{
2702	<	ConfigFileEntry.stats_i_oper_only = 1;
2519	>	ConfigGeneral.stats_i_oper_only = yylval.number;
2520		};
2521
2522		general_pace_wait: PACE_WAIT '=' timespec ';'
2523		{
2524	<	ConfigFileEntry.pace_wait = $3;
2524	>	ConfigGeneral.pace_wait = $3;
2525		};
2526
2527		general_caller_id_wait: CALLER_ID_WAIT '=' timespec ';'
2528		{
2529	<	ConfigFileEntry.caller_id_wait = $3;
2529	>	ConfigGeneral.caller_id_wait = $3;
2530		};
2531
2532		general_opers_bypass_callerid: OPERS_BYPASS_CALLERID '=' TBOOL ';'
2533		{
2534	<	ConfigFileEntry.opers_bypass_callerid = yylval.number;
2534	>	ConfigGeneral.opers_bypass_callerid = yylval.number;
2535		};
2536
2537		general_pace_wait_simple: PACE_WAIT_SIMPLE '=' timespec ';'
2538		{
2539	<	ConfigFileEntry.pace_wait_simple = $3;
2539	>	ConfigGeneral.pace_wait_simple = $3;
2540		};
2541
2542		general_short_motd: SHORT_MOTD '=' TBOOL ';'
2543		{
2544	<	ConfigFileEntry.short_motd = yylval.number;
2728	<	};
2729	<
2730	<	general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
2731	<	{
2732	<	ConfigFileEntry.no_oper_flood = yylval.number;
2733	<	};
2734	<
2735	<	general_true_no_oper_flood: TRUE_NO_OPER_FLOOD '=' TBOOL ';'
2736	<	{
2737	<	ConfigFileEntry.true_no_oper_flood = yylval.number;
2738	<	};
2739	<
2740	<	general_oper_pass_resv: OPER_PASS_RESV '=' TBOOL ';'
2741	<	{
2742	<	ConfigFileEntry.oper_pass_resv = yylval.number;
2544	>	ConfigGeneral.short_motd = yylval.number;
2545		};
2546
2547	<	general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
2547	>	general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
2548		{
2549	<	if (conf_parser_ctx.pass == 2)
2748	<	{
2749	<	if (strlen(yylval.string) > LOCALE_LENGTH-2)
2750	<	yylval.string[LOCALE_LENGTH-1] = '\0';
2751	<
2752	<	set_locale(yylval.string);
2753	<	}
2549	>	ConfigGeneral.no_oper_flood = yylval.number;
2550		};
2551
2552		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2553		{
2554	<	ConfigFileEntry.dots_in_ident = $3;
2554	>	ConfigGeneral.dots_in_ident = $3;
2555		};
2556
2557		general_max_targets: MAX_TARGETS '=' NUMBER ';'
2558		{
2559	<	ConfigFileEntry.max_targets = $3;
2559	>	ConfigGeneral.max_targets = $3;
2560		};
2561
2562	<	general_use_egd: USE_EGD '=' TBOOL ';'
2767	<	{
2768	<	ConfigFileEntry.use_egd = yylval.number;
2769	<	};
2770	<
2771	<	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
2772	<	{
2773	<	if (conf_parser_ctx.pass == 2)
2774	<	{
2775	<	MyFree(ConfigFileEntry.egdpool_path);
2776	<	DupString(ConfigFileEntry.egdpool_path, yylval.string);
2777	<	}
2778	<	};
2779	<
2780	<	general_services_name: T_SERVICES_NAME '=' QSTRING ';'
2562	>	general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2563		{
2564	<	if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2783	<	{
2784	<	MyFree(ConfigFileEntry.service_name);
2785	<	DupString(ConfigFileEntry.service_name, yylval.string);
2786	<	}
2564	>	ConfigGeneral.ping_cookie = yylval.number;
2565		};
2566
2567	<	general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2567	>	general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2568		{
2569	<	ConfigFileEntry.ping_cookie = yylval.number;
2569	>	ConfigGeneral.disable_auth = yylval.number;
2570		};
2571
2572	<	general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2572	>	general_throttle_count: THROTTLE_COUNT '=' NUMBER ';'
2573		{
2574	<	ConfigFileEntry.disable_auth = yylval.number;
2574	>	ConfigGeneral.throttle_count = $3;
2575		};
2576
2577		general_throttle_time: THROTTLE_TIME '=' timespec ';'
2578		{
2579	<	ConfigFileEntry.throttle_time = yylval.number;
2579	>	ConfigGeneral.throttle_time = $3;
2580		};
2581
2582		general_oper_umodes: OPER_UMODES
2583		{
2584	<	ConfigFileEntry.oper_umodes = 0;
2585	<	} '='  umode_oitems ';' ;
2584	>	ConfigGeneral.oper_umodes = 0;
2585	>	} '=' umode_oitems ';' ;
2586
2587		umode_oitems:    umode_oitems ',' umode_oitem | umode_oitem;
2588	<	umode_oitem:     T_BOTS
2588	>	umode_oitem: BOT
2589		{
2590	<	ConfigFileEntry.oper_umodes |= UMODE_BOTS;
2590	>	ConfigGeneral.oper_umodes |= UMODE_BOT;
2591		} | T_CCONN
2592		{
2593	<	ConfigFileEntry.oper_umodes |= UMODE_CCONN;
2816	<	} | T_CCONN_FULL
2817	<	{
2818	<	ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
2593	>	ConfigGeneral.oper_umodes |= UMODE_CCONN;
2594		} | T_DEAF
2595		{
2596	<	ConfigFileEntry.oper_umodes |= UMODE_DEAF;
2596	>	ConfigGeneral.oper_umodes |= UMODE_DEAF;
2597		} | T_DEBUG
2598		{
2599	<	ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
2600	<	} | T_FULL
2599	>	ConfigGeneral.oper_umodes |= UMODE_DEBUG;
2600	>	} | T_FLOOD
2601		{
2602	<	ConfigFileEntry.oper_umodes |= UMODE_FULL;
2602	>	ConfigGeneral.oper_umodes |= UMODE_FLOOD;
2603		} | HIDDEN
2604		{
2605	<	ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
2605	>	ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
2606	>	} | HIDE_CHANS
2607	>	{
2608	>	ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
2609	>	} | HIDE_IDLE
2610	>	{
2611	>	ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
2612		} | T_SKILL
2613		{
2614	<	ConfigFileEntry.oper_umodes |= UMODE_SKILL;
2614	>	ConfigGeneral.oper_umodes |= UMODE_SKILL;
2615		} | T_NCHANGE
2616		{
2617	<	ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
2617	>	ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
2618		} | T_REJ
2619		{
2620	<	ConfigFileEntry.oper_umodes |= UMODE_REJ;
2840	<	} | T_UNAUTH
2841	<	{
2842	<	ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
2620	>	ConfigGeneral.oper_umodes |= UMODE_REJ;
2621		} | T_SPY
2622		{
2623	<	ConfigFileEntry.oper_umodes |= UMODE_SPY;
2623	>	ConfigGeneral.oper_umodes |= UMODE_SPY;
2624		} | T_EXTERNAL
2625		{
2626	<	ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
2849	<	} | T_OPERWALL
2850	<	{
2851	<	ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
2626	>	ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
2627		} | T_SERVNOTICE
2628		{
2629	<	ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
2629	>	ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
2630		} | T_INVISIBLE
2631		{
2632	<	ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
2632	>	ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
2633		} | T_WALLOP
2634		{
2635	<	ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
2635	>	ConfigGeneral.oper_umodes |= UMODE_WALLOP;
2636		} | T_SOFTCALLERID
2637		{
2638	<	ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
2638	>	ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
2639		} | T_CALLERID
2640		{
2641	<	ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
2641	>	ConfigGeneral.oper_umodes |= UMODE_CALLERID;
2642		} | T_LOCOPS
2643		{
2644	<	ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
2644	>	ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
2645	>	} | T_NONONREG
2646	>	{
2647	>	ConfigGeneral.oper_umodes |= UMODE_REGONLY;
2648	>	} | T_FARCONNECT
2649	>	{
2650	>	ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
2651	>	} | EXPIRATION
2652	>	{
2653	>	ConfigGeneral.oper_umodes |= UMODE_EXPIRATION;
2654		};
2655
2656	<	general_oper_only_umodes: OPER_ONLY_UMODES
2656	>	general_oper_only_umodes: OPER_ONLY_UMODES
2657		{
2658	<	ConfigFileEntry.oper_only_umodes = 0;
2659	<	} '='  umode_items ';' ;
2658	>	ConfigGeneral.oper_only_umodes = 0;
2659	>	} '=' umode_items ';' ;
2660
2661	<	umode_items:    umode_items ',' umode_item | umode_item;
2662	<	umode_item:     T_BOTS
2661	>	umode_items:  umode_items ',' umode_item | umode_item;
2662	>	umode_item: BOT
2663		{
2664	<	ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
2664	>	ConfigGeneral.oper_only_umodes |= UMODE_BOT;
2665		} | T_CCONN
2666		{
2667	<	ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
2884	<	} | T_CCONN_FULL
2885	<	{
2886	<	ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
2667	>	ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
2668		} | T_DEAF
2669		{
2670	<	ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
2670	>	ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
2671		} | T_DEBUG
2672		{
2673	<	ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
2674	<	} | T_FULL
2675	<	{
2676	<	ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
2673	>	ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
2674	>	} | T_FLOOD
2675	>	{
2676	>	ConfigGeneral.oper_only_umodes |= UMODE_FLOOD;
2677		} | T_SKILL
2678		{
2679	<	ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
2679	>	ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
2680		} | HIDDEN
2681		{
2682	<	ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
2682	>	ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
2683		} | T_NCHANGE
2684		{
2685	<	ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
2685	>	ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
2686		} | T_REJ
2687		{
2688	<	ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
2908	<	} | T_UNAUTH
2909	<	{
2910	<	ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
2688	>	ConfigGeneral.oper_only_umodes |= UMODE_REJ;
2689		} | T_SPY
2690		{
2691	<	ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
2691	>	ConfigGeneral.oper_only_umodes |= UMODE_SPY;
2692		} | T_EXTERNAL
2693		{
2694	<	ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
2917	<	} | T_OPERWALL
2918	<	{
2919	<	ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
2694	>	ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
2695		} | T_SERVNOTICE
2696		{
2697	<	ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
2697	>	ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
2698		} | T_INVISIBLE
2699		{
2700	<	ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
2700	>	ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
2701		} | T_WALLOP
2702		{
2703	<	ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
2703	>	ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
2704		} | T_SOFTCALLERID
2705		{
2706	<	ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
2706	>	ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
2707		} | T_CALLERID
2708		{
2709	<	ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
2709	>	ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
2710		} | T_LOCOPS
2711		{
2712	<	ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
2712	>	ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
2713	>	} | T_NONONREG
2714	>	{
2715	>	ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
2716	>	} | T_FARCONNECT
2717	>	{
2718	>	ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
2719	>	} | EXPIRATION
2720	>	{
2721	>	ConfigGeneral.oper_only_umodes |= UMODE_EXPIRATION;
2722		};
2723
2724		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
2725		{
2726	<	ConfigFileEntry.min_nonwildcard = $3;
2726	>	ConfigGeneral.min_nonwildcard = $3;
2727		};
2728
2729		general_min_nonwildcard_simple: MIN_NONWILDCARD_SIMPLE '=' NUMBER ';'
2730		{
2731	<	ConfigFileEntry.min_nonwildcard_simple = $3;
2731	>	ConfigGeneral.min_nonwildcard_simple = $3;
2732		};
2733
2734		general_default_floodcount: DEFAULT_FLOODCOUNT '=' NUMBER ';'
2735		{
2736	<	ConfigFileEntry.default_floodcount = $3;
2736	>	ConfigGeneral.default_floodcount = $3;
2737	>	};
2738	>
2739	>	general_default_floodtime: DEFAULT_FLOODTIME '=' timespec ';'
2740	>	{
2741	>	ConfigGeneral.default_floodtime = $3;
2742		};
2743
2744
2745		/***************************************************************************
2746	<	*  section channel
2746	>	* channel {} section
2747		***************************************************************************/
2748	<	channel_entry: CHANNEL
2960	<	'{' channel_items '}' ';';
2748	>	channel_entry: CHANNEL '{' channel_items '}' ';';
2749
2750		channel_items:      channel_items channel_item | channel_item;
2751		channel_item:       channel_max_bans |
2752	<	channel_knock_delay | channel_knock_delay_channel |
2753	<	channel_max_chans_per_user | channel_max_chans_per_oper |
2754	<	channel_quiet_on_ban | channel_default_split_user_count |
2755	<	channel_default_split_server_count |
2756	<	channel_no_create_on_split | channel_restrict_channels |
2757	<	channel_no_join_on_split |
2758	<	channel_jflood_count | channel_jflood_time |
2759	<	channel_disable_fake_channels | error;
2752	>	channel_max_bans_large |
2753	>	channel_invite_client_count |
2754	>	channel_invite_client_time |
2755	>	channel_invite_delay_channel |
2756	>	channel_invite_expire_time |
2757	>	channel_knock_client_count |
2758	>	channel_knock_client_time |
2759	>	channel_knock_delay_channel |
2760	>	channel_max_channels |
2761	>	channel_max_invites |
2762	>	channel_default_join_flood_count |
2763	>	channel_default_join_flood_time |
2764	>	channel_disable_fake_channels |
2765	>	channel_enable_extbans |
2766	>	error;
2767	>
2768	>	channel_enable_extbans: ENABLE_EXTBANS '=' TBOOL ';'
2769	>	{
2770	>	ConfigChannel.enable_extbans = yylval.number;
2771	>	};
2772
2773		channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
2774		{
2775		ConfigChannel.disable_fake_channels = yylval.number;
2776		};
2777
2778	<	channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
2778	>	channel_invite_client_count: INVITE_CLIENT_COUNT '=' NUMBER ';'
2779		{
2780	<	ConfigChannel.restrict_channels = yylval.number;
2780	>	ConfigChannel.invite_client_count = $3;
2781		};
2782
2783	<	channel_knock_delay: KNOCK_DELAY '=' timespec ';'
2783	>	channel_invite_client_time: INVITE_CLIENT_TIME '=' timespec ';'
2784		{
2785	<	ConfigChannel.knock_delay = $3;
2785	>	ConfigChannel.invite_client_time = $3;
2786		};
2787
2788	<	channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
2788	>	channel_invite_delay_channel: INVITE_DELAY_CHANNEL '=' timespec ';'
2789		{
2790	<	ConfigChannel.knock_delay_channel = $3;
2790	>	ConfigChannel.invite_delay_channel = $3;
2791		};
2792
2793	<	channel_max_chans_per_user: MAX_CHANS_PER_USER '=' NUMBER ';'
2793	>	channel_invite_expire_time: INVITE_EXPIRE_TIME '=' timespec ';'
2794		{
2795	<	ConfigChannel.max_chans_per_user = $3;
2795	>	ConfigChannel.invite_expire_time = $3;
2796		};
2797
2798	<	channel_max_chans_per_oper: MAX_CHANS_PER_OPER '=' NUMBER ';'
2798	>	channel_knock_client_count: KNOCK_CLIENT_COUNT '=' NUMBER ';'
2799		{
2800	<	ConfigChannel.max_chans_per_oper = $3;
2800	>	ConfigChannel.knock_client_count = $3;
2801		};
2802
2803	<	channel_quiet_on_ban: QUIET_ON_BAN '=' TBOOL ';'
2803	>	channel_knock_client_time: KNOCK_CLIENT_TIME '=' timespec ';'
2804		{
2805	<	ConfigChannel.quiet_on_ban = yylval.number;
2805	>	ConfigChannel.knock_client_time = $3;
2806		};
2807
2808	<	channel_max_bans: MAX_BANS '=' NUMBER ';'
2808	>	channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
2809		{
2810	<	ConfigChannel.max_bans = $3;
2810	>	ConfigChannel.knock_delay_channel = $3;
2811		};
2812
2813	<	channel_default_split_user_count: DEFAULT_SPLIT_USER_COUNT '=' NUMBER ';'
2813	>	channel_max_channels: MAX_CHANNELS '=' NUMBER ';'
2814		{
2815	<	ConfigChannel.default_split_user_count = $3;
2815	>	ConfigChannel.max_channels = $3;
2816		};
2817
2818	<	channel_default_split_server_count: DEFAULT_SPLIT_SERVER_COUNT '=' NUMBER ';'
2818	>	channel_max_invites: MAX_INVITES '=' NUMBER ';'
2819		{
2820	<	ConfigChannel.default_split_server_count = $3;
2820	>	ConfigChannel.max_invites = $3;
2821		};
2822
2823	<	channel_no_create_on_split: NO_CREATE_ON_SPLIT '=' TBOOL ';'
2823	>	channel_max_bans: MAX_BANS '=' NUMBER ';'
2824		{
2825	<	ConfigChannel.no_create_on_split = yylval.number;
2825	>	ConfigChannel.max_bans = $3;
2826		};
2827
2828	<	channel_no_join_on_split: NO_JOIN_ON_SPLIT '=' TBOOL ';'
2828	>	channel_max_bans_large: MAX_BANS_LARGE '=' NUMBER ';'
2829		{
2830	<	ConfigChannel.no_join_on_split = yylval.number;
2830	>	ConfigChannel.max_bans_large = $3;
2831		};
2832
2833	<	channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
2833	>	channel_default_join_flood_count: DEFAULT_JOIN_FLOOD_COUNT '=' NUMBER ';'
2834		{
2835	<	GlobalSetOptions.joinfloodcount = yylval.number;
2835	>	ConfigChannel.default_join_flood_count = yylval.number;
2836		};
2837
2838	<	channel_jflood_time: JOIN_FLOOD_TIME '=' timespec ';'
2838	>	channel_default_join_flood_time: DEFAULT_JOIN_FLOOD_TIME '=' timespec ';'
2839		{
2840	<	GlobalSetOptions.joinfloodtime = yylval.number;
2840	>	ConfigChannel.default_join_flood_time = $3;
2841		};
2842
2843	+
2844		/***************************************************************************
2845	<	*  section serverhide
2845	>	* serverhide {} section
2846		***************************************************************************/
2847	<	serverhide_entry: SERVERHIDE
3047	<	'{' serverhide_items '}' ';';
2847	>	serverhide_entry: SERVERHIDE '{' serverhide_items '}' ';';
2848
2849		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
2850	<	serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
2851	<	serverhide_links_delay |
2852	<	serverhide_hidden | serverhide_hidden_name |
2853	<	serverhide_hide_server_ips |
2850	>	serverhide_item:    serverhide_flatten_links |
2851	>	serverhide_flatten_links_delay |
2852	>	serverhide_flatten_links_file |
2853	>	serverhide_disable_remote_commands |
2854	>	serverhide_hide_servers |
2855	>	serverhide_hide_services |
2856	>	serverhide_hidden |
2857	>	serverhide_hidden_name |
2858	>	serverhide_hide_server_ips |
2859		error;
2860
2861		serverhide_flatten_links: FLATTEN_LINKS '=' TBOOL ';'
#	Line 3059 | Line 2864 | serverhide_flatten_links: FLATTEN_LINKS
2864		ConfigServerHide.flatten_links = yylval.number;
2865		};
2866
2867	<	serverhide_hide_servers: HIDE_SERVERS '=' TBOOL ';'
2867	>	serverhide_flatten_links_delay: FLATTEN_LINKS_DELAY '=' timespec ';'
2868		{
2869		if (conf_parser_ctx.pass == 2)
2870	<	ConfigServerHide.hide_servers = yylval.number;
2870	>	{
2871	>	if ($3 > 0)
2872	>	{
2873	>	event_write_links_file.when = $3;
2874	>	event_add(&event_write_links_file, NULL);
2875	>	}
2876	>	else
2877	>	event_delete(&event_write_links_file);
2878	>
2879	>	ConfigServerHide.flatten_links_delay = $3;
2880	>	}
2881		};
2882
2883	<	serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2883	>	serverhide_flatten_links_file: FLATTEN_LINKS_FILE '=' QSTRING ';'
2884		{
2885		if (conf_parser_ctx.pass == 2)
2886		{
2887	<	MyFree(ConfigServerHide.hidden_name);
2888	<	DupString(ConfigServerHide.hidden_name, yylval.string);
2887	>	xfree(ConfigServerHide.flatten_links_file);
2888	>	ConfigServerHide.flatten_links_file = xstrdup(yylval.string);
2889		}
2890		};
2891
2892	<	serverhide_links_delay: LINKS_DELAY '=' timespec ';'
2892	>	serverhide_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
2893		{
2894		if (conf_parser_ctx.pass == 2)
2895	<	{
2896	<	if (($3 > 0) && ConfigServerHide.links_disabled == 1)
2897	<	{
2898	<	eventAddIsh("write_links_file", write_links_file, NULL, $3);
2899	<	ConfigServerHide.links_disabled = 0;
2900	<	}
2895	>	ConfigServerHide.disable_remote_commands = yylval.number;
2896	>	};
2897	>
2898	>	serverhide_hide_servers: HIDE_SERVERS '=' TBOOL ';'
2899	>	{
2900	>	if (conf_parser_ctx.pass == 2)
2901	>	ConfigServerHide.hide_servers = yylval.number;
2902	>	};
2903	>
2904	>	serverhide_hide_services: HIDE_SERVICES '=' TBOOL ';'
2905	>	{
2906	>	if (conf_parser_ctx.pass == 2)
2907	>	ConfigServerHide.hide_services = yylval.number;
2908	>	};
2909
2910	<	ConfigServerHide.links_delay = $3;
2910	>	serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2911	>	{
2912	>	if (conf_parser_ctx.pass == 2)
2913	>	{
2914	>	xfree(ConfigServerHide.hidden_name);
2915	>	ConfigServerHide.hidden_name = xstrdup(yylval.string);
2916		}
2917		};
2918

Comparing:
ircd-hybrid-8/src/conf_parser.y (property svn:keywords), Revision 1520 by michael, Wed Sep 5 15:50:02 2012 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (property svn:keywords), Revision 9857 by michael, Fri Jan 1 04:43:22 2021 UTC

#	Line 1 | Line 1
1	<	Id Revision
1	>	Id

Diff Legend

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