ViewVC Help

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

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

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

Diff Legend

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