ViewVC Help

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

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

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

Comparing:
ircd-hybrid-8/src/conf_parser.y (property svn:keywords), Revision 1309 by michael, Sun Mar 25 11:24:18 2012 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (property svn:keywords), Revision 9234 by michael, Fri Jan 31 17:38:34 2020 UTC

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

Diff Legend

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