ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/ircd_parser.y (file contents), Revision 1024 by michael, Sun Nov 1 23:14:25 2009 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 9319 by michael, Sun Mar 8 12:31:12 2020 UTC

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

Comparing:
ircd-hybrid-7.2/src/ircd_parser.y (property svn:keywords), Revision 1024 by michael, Sun Nov 1 23:14:25 2009 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (property svn:keywords), Revision 9319 by michael, Sun Mar 8 12:31:12 2020 UTC

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

Diff Legend

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