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

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

Diff Legend

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