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

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

Diff Legend

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