ViewVC Help

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

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

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

Diff Legend

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