ViewVC Help

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

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

Comparing:
ircd-hybrid-7.3/src/ircd_parser.y (file contents), Revision 1029 by michael, Sun Nov 8 13:10:50 2009 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 7032 by michael, Sun Jan 3 14:34:39 2016 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-2016 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 "irc_getaddrinfo.h"
41	–	#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;
59	<	static struct ConfItem *yy_conf = NULL;
60	<	static struct AccessItem *yy_aconf = NULL;
61	<	static struct MatchItem *yy_match_item = NULL;
62	<	static struct ClassItem *yy_class = NULL;
63	<	static char *yy_class_name = NULL;
64	<
65	<	static dlink_list col_conf_list  = { NULL, NULL, 0 };
66	<	static dlink_list hub_conf_list  = { NULL, NULL, 0 };
67	<	static dlink_list leaf_conf_list = { NULL, NULL, 0 };
68	<	static unsigned int listener_flags = 0;
69	<	static unsigned int regex_ban = 0;
70	<	static char userbuf[IRCD_BUFSIZE];
71	<	static char hostbuf[IRCD_BUFSIZE];
72	<	static char reasonbuf[REASONLEN + 1];
73	<	static char gecos_name[REALLEN * 4];
74	<
75	<	static char *resv_reason = NULL;
76	<	static char *listener_address = NULL;
77	<	static int not_atom = 0;
78	<
79	<	struct CollectItem
80	<	{
81	<	dlink_node node;
82	<	char *name;
83	<	char *user;
84	<	char *host;
85	<	char *passwd;
86	<	int  port;
87	<	int  flags;
88	<	#ifdef HAVE_LIBCRYPTO
89	<	char *rsa_public_key_file;
90	<	RSA *rsa_public_key;
91	<	#endif
92	<	};
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	>	xfree(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	>	xfree(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	>	xfree(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
151	–	%token  CAN_IDLE
169		%token  CHANNEL
170	<	%token  CIDR_BITLEN_IPV4
171	<	%token  CIDR_BITLEN_IPV6
155	<	%token  CIPHER_PREFERENCE
170	>	%token  CIDR_BITLEN_IPV4
171	>	%token  CIDR_BITLEN_IPV6
172		%token  CLASS
173	<	%token  COMPRESSED
158	<	%token  COMPRESSION_LEVEL
173	>	%token  CLOSE
174		%token  CONNECT
175		%token  CONNECTFREQ
176	<	%token  CRYPTLINK
162	<	%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
171	–	%token  DISABLE_HIDDEN
172	–	%token  DISABLE_LOCAL_CHANNELS
186		%token  DISABLE_REMOTE_COMMANDS
187	<	%token  DOT_IN_IP6_ADDR
187	>	%token  DLINE_MIN_CIDR
188	>	%token  DLINE_MIN_CIDR6
189		%token  DOTS_IN_IDENT
176	–	%token  DURATION
177	–	%token  EGDPOOL_PATH
190		%token  EMAIL
179	–	%token  ENABLE
191		%token  ENCRYPTED
192		%token  EXCEED_LIMIT
193		%token  EXEMPT
194		%token  FAILED_OPER_NOTICE
184	–	%token  FAKENAME
185	–	%token  IRCD_FLAGS
195		%token  FLATTEN_LINKS
196	<	%token  FFAILED_OPERLOG
197	<	%token  FKILLLOG
189	<	%token  FKLINELOG
190	<	%token  FGLINELOG
191	<	%token  FIOERRLOG
192	<	%token  FOPERLOG
193	<	%token  FOPERSPYLOG
194	<	%token  FUSERLOG
196	>	%token  FLATTEN_LINKS_DELAY
197	>	%token  FLATTEN_LINKS_FILE
198		%token  GECOS
199		%token  GENERAL
197	–	%token  GLINE
198	–	%token  GLINES
199	–	%token  GLINE_EXEMPT
200	–	%token  GLINE_LOG
201	–	%token  GLINE_TIME
202	–	%token  GLINE_MIN_CIDR
203	–	%token  GLINE_MIN_CIDR6
204	–	%token  GLOBAL_KILL
205	–	%token  IRCD_AUTH
206	–	%token  NEED_IDENT
207	–	%token  HAVENT_READ_CONF
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
218	–	%token  IDLETIME
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
231	–	%token  LINKS_DELAY
231		%token  LISTEN
232	<	%token  T_LOG
234	<	%token  LOGGING
235	<	%token  LOG_LEVEL
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
257	–	%token  NICK_CHANGES
258	–	%token  NO_CREATE_ON_SPLIT
259	–	%token  NO_JOIN_ON_SPLIT
259		%token  NO_OPER_FLOOD
260		%token  NO_TILDE
262	–	%token  NOT
261		%token  NUMBER
264	–	%token  NUMBER_PER_IDENT
262		%token  NUMBER_PER_CIDR
263		%token  NUMBER_PER_IP
267	–	%token  NUMBER_PER_IP_GLOBAL
268	–	%token  OPERATOR
269	–	%token  OPERS_BYPASS_CALLERID
270	–	%token  OPER_LOG
264		%token  OPER_ONLY_UMODES
272	–	%token  OPER_PASS_RESV
273	–	%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
283	–	%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
290	–	%token  REGEX_T
280		%token  REHASH
292	–	%token  TREJECT_HOLD_TIME
281		%token  REMOTE
282		%token  REMOTEBAN
295	–	%token  RESTRICT_CHANNELS
296	–	%token  RESTRICTED
297	–	%token  RSA_PRIVATE_KEY_FILE
298	–	%token  RSA_PUBLIC_KEY_FILE
299	–	%token  SSL_CERTIFICATE_FILE
300	–	%token  T_SSL_CONNECTION_METHOD
301	–	%token  T_SSLV3
302	–	%token  T_TLSV1
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
310	–	%token  SERVLINK_PATH
311	–	%token  IRCD_SID
312	–	%token  TKLINE_EXPIRE_NOTICES
313	–	%token  T_SHARED
314	–	%token  T_CLUSTER
315	–	%token  TYPE
291		%token  SHORT_MOTD
317	–	%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
326	<	%token  TMASKED
327	<	%token  T_REJECT
328	<	%token  TS_MAX_DELTA
329	<	%token  TS_WARN_DELTA
330	<	%token  TWODOTS
307	>	%token  STATS_U_OPER_ONLY
308		%token  T_ALL
309		%token  T_BOTS
333	–	%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_DRONE
316	>	%token  T_DLINE
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_LOGPATH
348	<	%token  T_L_CRIT
349	<	%token  T_L_DEBUG
350	<	%token  T_L_ERROR
351	<	%token  T_L_INFO
352	<	%token  T_L_NOTICE
353	<	%token  T_L_TRACE
354	<	%token  T_L_WARN
355	<	%token  T_MAX_CLIENTS
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
353		%token  T_WALLOP
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
376	–	%token  USER
377	–	%token  USE_EGD
378	–	%token  USE_EXCEPT
379	–	%token  USE_INVEX
380	–	%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
387	<	%token  WARN_NO_NLINE
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
418	<	| 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	<	}
443	<	| NUMBER DAYS timespec_
444	<	{
445	<	$$ = $1 * 60 * 60 * 24 + $3;
446	<	}
447	<	| NUMBER WEEKS timespec_
448	<	{
449	<	$$ = $1 * 60 * 60 * 24 * 7 + $3;
450	<	}
451	<	;
452	<
453	<	sizespec_:      { $$ = 0; } | sizespec;
454	<	sizespec:       NUMBER sizespec_ { $$ = $1 + $2; }
455	<	| NUMBER BYTES sizespec_ { $$ = $1 + $3; }
456	<	| NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; }
457	<	| NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
458	<	;
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
465	<	'{' 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 ';' ;
440
441		modules_module: MODULE '=' QSTRING ';'
442		{
472	–	#ifndef STATIC_MODULES /* NOOP in the static case */
443		if (conf_parser_ctx.pass == 2)
444		add_conf_module(libio_basename(yylval.string));
475	–	#endif
445		};
446
447		modules_path: PATH '=' QSTRING ';'
448		{
480	–	#ifndef STATIC_MODULES
449		if (conf_parser_ctx.pass == 2)
450		mod_add_path(yylval.string);
483	–	#endif
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 ';' ;
468	<
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
500	–	serverinfo_ssl_connection_method: T_SSL_CONNECTION_METHOD
501	–	{
502	–	#ifdef HAVE_LIBCRYPTO
503	–	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
504	–	ServerInfo.tls_version = 0;
505	–	#endif
506	–	} '=' method_types ';'
507	–	{
508	–	#ifdef HAVE_LIBCRYPTO
509	–	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
510	–	{
511	–	if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_SSLV3))
512	–	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
513	–	if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_TLSV1))
514	–	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
515	–	}
516	–	#endif
517	–	};
518	–
519	–	method_types: method_types ',' method_type_item | method_type_item;
520	–	method_type_item: T_SSLV3
521	–	{
522	–	#ifdef HAVE_LIBCRYPTO
523	–	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
524	–	ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_SSLV3;
525	–	#endif
526	–	} | T_TLSV1
527	–	{
528	–	#ifdef HAVE_LIBCRYPTO
529	–	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
530	–	ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_TLSV1;
531	–	#endif
532	–	};
479
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 568 | 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	>	xfree(ConfigServerInfo.rsa_private_key_file);
537	>	ConfigServerInfo.rsa_private_key_file = NULL;
538	>	}
539
540	<	if (ServerInfo.rsa_private_key_file)
540	>	ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
541	>
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);
610	<	ServerInfo.rsa_private_key = NULL;
611	<
612	<	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)
618	<	{
619	<	RSA_free(ServerInfo.rsa_private_key);
620	<	ServerInfo.rsa_private_key = NULL;
621	<
622	<	yyerror("Not a 2048 bit key, ignoring");
623	<	}
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)
659	>	/* This isn't rehashable */
660	>	if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.name)
661		{
662	<	if (ServerInfo.name == NULL)
662	>	if (valid_servname(yylval.string))
663	>	ConfigServerInfo.name = xstrdup(yylval.string);
664	>	else
665		{
666	<	/* the ircd will exit() in main() if we dont set one */
667	<	if (strlen(yylval.string) <= HOSTLEN)
637	<	DupString(ServerInfo.name, yylval.string);
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(L_ERROR, "Ignoring config file entry 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 658 | 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	>	xfree(ConfigServerInfo.description);
692	>	ConfigServerInfo.description = xstrdup(yylval.string);
693	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
694		}
695		};
696
#	Line 669 | 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	>	xfree(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	>	xfree(ConfigServerInfo.network_desc);
717	>	ConfigServerInfo.network_desc = xstrdup(yylval.string);
718		};
719
720		serverinfo_vhost: VHOST '=' QSTRING ';'
#	Line 698 | Line 729 | serverinfo_vhost: VHOST '=' QSTRING ';'
729		hints.ai_socktype = SOCK_STREAM;
730		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
731
732	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
733	<	ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
732	>	if (getaddrinfo(yylval.string, NULL, &hints, &res))
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;
741	<	irc_freeaddrinfo(res);
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		{
719	–	#ifdef IPV6
750		if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
751		{
752		struct addrinfo hints, *res;
#	Line 727 | Line 757 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
757		hints.ai_socktype = SOCK_STREAM;
758		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
759
760	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
761	<	ilog(L_ERROR, "Invalid netmask for server vhost6(%s)", yylval.string);
760	>	if (getaddrinfo(yylval.string, NULL, &hints, &res))
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;
769	<	irc_freeaddrinfo(res);
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		}
744	–	#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];
756	<	ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
757	<	yyerror(buf);
758	<	}
759	<	else if ($3 > MAXCLIENTS_MAX)
760	<	{
761	<	char buf[IRCD_BUFSIZE];
762	<	ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
763	<	yyerror(buf);
764	<	}
765	<	else
766	<	ServerInfo.max_clients = $3;
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_hub: HUB '=' TBOOL ';'
801	>	serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
802		{
803	<	if (conf_parser_ctx.pass == 2)
803	>	if (conf_parser_ctx.pass != 2)
804	>	break;
805	>
806	>	if ($3 < 9)
807		{
808	<	if (yylval.number)
809	<	{
810	<	ServerInfo.hub = 1;
811	<	delete_capability("HUB");
812	<	add_capability("HUB", CAP_HUB, 1);
813	<	}
780	<	else if (ServerInfo.hub)
781	<	{
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	<	ServerInfo.hub = 0;
816	<	delete_capability("HUB");
817	<	}
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 ';'
846	+	{
847	+	if (conf_parser_ctx.pass == 2)
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	>	xfree(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	>	xfree(ConfigAdminInfo.email);
878	>	ConfigAdminInfo.email = xstrdup(yylval.string);
879		};
880
881		admin_description: DESCRIPTION '=' QSTRING ';'
882		{
883	<	if (conf_parser_ctx.pass == 2)
884	<	{
885	<	MyFree(AdminInfo.description);
886	<	DupString(AdminInfo.description, yylval.string);
887	<	}
883	>	if (conf_parser_ctx.pass != 2)
884	>	break;
885	>
886	>	xfree(ConfigAdminInfo.description);
887	>	ConfigAdminInfo.description = xstrdup(yylval.string);
888		};
889
890	+
891		/***************************************************************************
892	<	*  section logging
892	>	* motd {} section
893		***************************************************************************/
894	<	/* XXX */
895	<	logging_entry:          LOGGING  '{' logging_items '}' ';' ;
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	<	logging_items:          logging_items logging_item |
903	<	logging_item ;
902	>	if (conf_parser_ctx.pass != 2)
903	>	break;
904
905	<	logging_item:           logging_path | logging_oper_log |
906	<	logging_log_level |
836	<	logging_use_logging | logging_fuserlog |
837	<	logging_foperlog | logging_fglinelog |
838	<	logging_fklinelog | logging_killlog |
839	<	logging_foperspylog | logging_ioerrlog |
840	<	logging_ffailed_operlog |
841	<	error ';' ;
905	>	if (!block_state.file.buf[0])
906	>	break;
907
908	<	logging_path:           T_LOGPATH '=' QSTRING ';'
909	<	{
910	<	};
908	>	DLINK_FOREACH(node, block_state.mask.list.head)
909	>	motd_add(node->data, block_state.file.buf);
910	>	};
911
912	<	logging_oper_log:       OPER_LOG '=' QSTRING ';'
913	<	{
849	<	};
912	>	motd_items: motd_items motd_item | motd_item;
913	>	motd_item:  motd_mask | motd_file | error ';' ;
914
915	<	logging_fuserlog: FUSERLOG '=' QSTRING ';'
915	>	motd_mask: MASK '=' QSTRING ';'
916		{
917		if (conf_parser_ctx.pass == 2)
918	<	strlcpy(ConfigLoggingEntry.userlog, yylval.string,
855	<	sizeof(ConfigLoggingEntry.userlog));
918	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
919		};
920
921	<	logging_ffailed_operlog: FFAILED_OPERLOG '=' QSTRING ';'
921	>	motd_file: T_FILE '=' QSTRING ';'
922		{
923		if (conf_parser_ctx.pass == 2)
924	<	strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
862	<	sizeof(ConfigLoggingEntry.failed_operlog));
924	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
925		};
926
927	<	logging_foperlog: FOPERLOG '=' QSTRING ';'
927	>
928	>	/***************************************************************************
929	>	* pseudo {} section
930	>	***************************************************************************/
931	>	pseudo_entry: T_PSEUDO
932		{
933		if (conf_parser_ctx.pass == 2)
934	<	strlcpy(ConfigLoggingEntry.operlog, yylval.string,
935	<	sizeof(ConfigLoggingEntry.operlog));
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	<	logging_foperspylog: FOPERSPYLOG '=' QSTRING ';'
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(ConfigLoggingEntry.operspylog, yylval.string,
876	<	sizeof(ConfigLoggingEntry.operspylog));
956	>	strlcpy(block_state.command.buf, yylval.string, sizeof(block_state.command.buf));
957		};
958
959	<	logging_fglinelog: FGLINELOG '=' QSTRING ';'
959	>	pseudo_name: NAME '=' QSTRING ';'
960		{
961		if (conf_parser_ctx.pass == 2)
962	<	strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
883	<	sizeof(ConfigLoggingEntry.glinelog));
962	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
963		};
964
965	<	logging_fklinelog: FKLINELOG '=' QSTRING ';'
965	>	pseudo_prepend: T_PREPEND '=' QSTRING ';'
966		{
967		if (conf_parser_ctx.pass == 2)
968	<	strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
890	<	sizeof(ConfigLoggingEntry.klinelog));
968	>	strlcpy(block_state.prepend.buf, yylval.string, sizeof(block_state.prepend.buf));
969		};
970
971	<	logging_ioerrlog: FIOERRLOG '=' QSTRING ';'
971	>	pseudo_target: T_TARGET '=' QSTRING ';'
972		{
973		if (conf_parser_ctx.pass == 2)
974	<	strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
975	<	sizeof(ConfigLoggingEntry.ioerrlog));
974	>	{
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	<	logging_killlog: FKILLLOG '=' QSTRING ';'
989	>
990	>	/***************************************************************************
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_file_entry |
997	>	error ';' ;
998	>
999	>	logging_use_logging: USE_LOGGING '=' TBOOL ';'
1000		{
1001		if (conf_parser_ctx.pass == 2)
1002	<	strlcpy(ConfigLoggingEntry.killlog, yylval.string,
904	<	sizeof(ConfigLoggingEntry.killlog));
1002	>	ConfigLog.use_logging = yylval.number;
1003		};
1004
1005	<	logging_log_level: LOG_LEVEL '=' T_L_CRIT ';'
1006	<	{
1005	>	logging_file_entry:
1006	>	{
1007		if (conf_parser_ctx.pass == 2)
1008	<	set_log_level(L_CRIT);
1009	<	} | LOG_LEVEL '=' T_L_ERROR ';'
1008	>	reset_block_state();
1009	>	} T_FILE  '{' logging_file_items '}' ';'
1010	>	{
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 |
1020	>	logging_file_item ;
1021	>
1022	>	logging_file_item:  logging_file_name | logging_file_type |
1023	>	logging_file_size | error ';' ;
1024	>
1025	>	logging_file_name: NAME '=' QSTRING ';'
1026	>	{
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	>	block_state.size.value = $3;
1036	>	} | T_SIZE '=' T_UNLIMITED ';'
1037	>	{
1038	>	block_state.size.value = 0;
1039	>	};
1040	>
1041	>	logging_file_type: TYPE
1042		{
1043		if (conf_parser_ctx.pass == 2)
1044	<	set_log_level(L_ERROR);
1045	<	} | LOG_LEVEL '=' T_L_WARN ';'
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	<	set_log_level(L_WARN);
1052	<	} | LOG_LEVEL '=' T_L_NOTICE ';'
1051	>	block_state.type.value = LOG_TYPE_USER;
1052	>	} | OPERATOR
1053		{
1054		if (conf_parser_ctx.pass == 2)
1055	<	set_log_level(L_NOTICE);
1056	<	} | LOG_LEVEL '=' T_L_TRACE ';'
1055	>	block_state.type.value = LOG_TYPE_OPER;
1056	>	} | XLINE
1057		{
1058		if (conf_parser_ctx.pass == 2)
1059	<	set_log_level(L_TRACE);
1060	<	} | LOG_LEVEL '=' T_L_INFO ';'
1059	>	block_state.type.value = LOG_TYPE_XLINE;
1060	>	} | RESV
1061		{
1062		if (conf_parser_ctx.pass == 2)
1063	<	set_log_level(L_INFO);
1064	<	} | LOG_LEVEL '=' T_L_DEBUG ';'
1063	>	block_state.type.value = LOG_TYPE_RESV;
1064	>	} | T_DLINE
1065		{
1066		if (conf_parser_ctx.pass == 2)
1067	<	set_log_level(L_DEBUG);
1068	<	};
936	<
937	<	logging_use_logging: USE_LOGGING '=' TBOOL ';'
1067	>	block_state.type.value = LOG_TYPE_DLINE;
1068	>	} | KLINE
1069		{
1070		if (conf_parser_ctx.pass == 2)
1071	<	ConfigLoggingEntry.use_logging = yylval.number;
1072	<	};
942	<
943	<	/***************************************************************************
944	<	* section oper
945	<	***************************************************************************/
946	<	oper_entry: OPERATOR
1071	>	block_state.type.value = LOG_TYPE_KLINE;
1072	>	} | KILL
1073		{
1074		if (conf_parser_ctx.pass == 2)
1075	<	{
1076	<	yy_conf = make_conf_item(OPER_TYPE);
951	<	yy_aconf = map_to_conf(yy_conf);
952	<	SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
953	<	}
954	<	else
955	<	{
956	<	MyFree(class_name);
957	<	class_name = NULL;
958	<	}
959	<	} oper_name_b '{' oper_items '}' ';'
1075	>	block_state.type.value = LOG_TYPE_KILL;
1076	>	} | T_DEBUG
1077		{
1078		if (conf_parser_ctx.pass == 2)
1079	<	{
1080	<	struct CollectItem *yy_tmp;
964	<	dlink_node *ptr;
965	<	dlink_node *next_ptr;
1079	>	block_state.type.value = LOG_TYPE_DEBUG;
1080	>	};
1081
967	–	conf_add_class_to_conf(yy_conf, class_name);
1082
1083	<	/* Now, make sure there is a copy of the "base" given oper
1084	<	* block in each of the collected copies
1085	<	*/
1083	>	/***************************************************************************
1084	>	* operator {} section
1085	>	***************************************************************************/
1086	>	oper_entry: OPERATOR
1087	>	{
1088	>	if (conf_parser_ctx.pass != 2)
1089	>	break;
1090
1091	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
1092	<	{
1093	<	struct AccessItem *new_aconf;
1094	<	struct ConfItem *new_conf;
1095	<	yy_tmp = ptr->data;
978	<
979	<	new_conf = make_conf_item(OPER_TYPE);
980	<	new_aconf = (struct AccessItem *)map_to_conf(new_conf);
981	<
982	<	new_aconf->flags = yy_aconf->flags;
983	<
984	<	if (yy_conf->name != NULL)
985	<	DupString(new_conf->name, yy_conf->name);
986	<	if (yy_tmp->user != NULL)
987	<	DupString(new_aconf->user, yy_tmp->user);
988	<	else
989	<	DupString(new_aconf->user, "*");
990	<	if (yy_tmp->host != NULL)
991	<	DupString(new_aconf->host, yy_tmp->host);
992	<	else
993	<	DupString(new_aconf->host, "*");
994	<	conf_add_class_to_conf(new_conf, class_name);
995	<	if (yy_aconf->passwd != NULL)
996	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1091	>	reset_block_state();
1092	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1093	>	} '{' oper_items '}' ';'
1094	>	{
1095	>	dlink_node *node = NULL;
1096
1097	<	new_aconf->port = yy_aconf->port;
1098	<	#ifdef HAVE_LIBCRYPTO
1000	<	if (yy_aconf->rsa_public_key_file != NULL)
1001	<	{
1002	<	BIO *file;
1097	>	if (conf_parser_ctx.pass != 2)
1098	>	break;
1099
1100	<	DupString(new_aconf->rsa_public_key_file,
1101	<	yy_aconf->rsa_public_key_file);
1100	>	if (!block_state.name.buf[0])
1101	>	break;
1102
1103	<	file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
1104	<	new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
1009	<	NULL, 0, NULL);
1010	<	BIO_set_close(file, BIO_CLOSE);
1011	<	BIO_free(file);
1012	<	}
1013	<	#endif
1014	<
1015	<	#ifdef HAVE_LIBCRYPTO
1016	<	if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
1017	<	&& yy_tmp->host)
1018	<	#else
1019	<	if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
1020	<	#endif
1021	<	{
1022	<	conf_add_class_to_conf(new_conf, class_name);
1023	<	if (yy_tmp->name != NULL)
1024	<	DupString(new_conf->name, yy_tmp->name);
1025	<	}
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);
1036	<	class_name = NULL;
1139	>	conf_add_class_to_conf(conf, block_state.class.buf);
1140		}
1141	<	};
1141	>	};
1142
1040	–	oper_name_b: | oper_name_t;
1143		oper_items:     oper_items oper_item | oper_item;
1144	<	oper_item:      oper_name | oper_user | oper_password | oper_hidden_admin |
1145	<	oper_hidden_oper | oper_umodes |
1146	<	oper_class | oper_global_kill | oper_remote |
1147	<	oper_kline | oper_xline | oper_unkline |
1148	<	oper_gline | oper_nick_changes | oper_remoteban |
1149	<	oper_die | oper_rehash | oper_admin | oper_operwall |
1150	<	oper_encrypted | oper_rsa_public_key_file |
1151	<	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	<	{
1055	<	if (strlen(yylval.string) > OPERNICKLEN)
1056	<	yylval.string[OPERNICKLEN] = '\0';
1057	<
1058	<	MyFree(yy_conf->name);
1059	<	DupString(yy_conf->name, yylval.string);
1060	<	}
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	<	{
1067	<	if (strlen(yylval.string) > OPERNICKLEN)
1068	<	yylval.string[OPERNICKLEN] = '\0';
1069	<
1070	<	MyFree(yy_conf->name);
1071	<	DupString(yy_conf->name, yylval.string);
1072	<	}
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	<	{
1079	<	struct split_nuh_item nuh;
1080	<
1081	<	nuh.nuhmask  = yylval.string;
1082	<	nuh.nickptr  = NULL;
1083	<	nuh.userptr  = userbuf;
1084	<	nuh.hostptr  = hostbuf;
1085	<
1086	<	nuh.nicksize = 0;
1087	<	nuh.usersize = sizeof(userbuf);
1088	<	nuh.hostsize = sizeof(hostbuf);
1089	<
1090	<	split_nuh(&nuh);
1091	<
1092	<	if (yy_aconf->user == NULL)
1093	<	{
1094	<	DupString(yy_aconf->user, userbuf);
1095	<	DupString(yy_aconf->host, hostbuf);
1096	<	}
1097	<	else
1098	<	{
1099	<	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
1100	<
1101	<	DupString(yy_tmp->user, userbuf);
1102	<	DupString(yy_tmp->host, hostbuf);
1103	<
1104	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1105	<	}
1106	<	}
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	<	{
1113	<	if (yy_aconf->passwd != NULL)
1114	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1115	<
1116	<	MyFree(yy_aconf->passwd);
1117	<	DupString(yy_aconf->passwd, yylval.string);
1118	<	}
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		{
1134	–	#ifdef HAVE_LIBCRYPTO
1193		if (conf_parser_ctx.pass == 2)
1194	<	{
1195	<	BIO *file;
1138	<
1139	<	if (yy_aconf->rsa_public_key != NULL)
1140	<	{
1141	<	RSA_free(yy_aconf->rsa_public_key);
1142	<	yy_aconf->rsa_public_key = NULL;
1143	<	}
1144	<
1145	<	if (yy_aconf->rsa_public_key_file != NULL)
1146	<	{
1147	<	MyFree(yy_aconf->rsa_public_key_file);
1148	<	yy_aconf->rsa_public_key_file = NULL;
1149	<	}
1150	<
1151	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
1152	<	file = BIO_new_file(yylval.string, "r");
1153	<
1154	<	if (file == NULL)
1155	<	{
1156	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
1157	<	break;
1158	<	}
1159	<
1160	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
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;
1166	<	}
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	<	{
1178	<	MyFree(class_name);
1179	<	DupString(class_name, yylval.string);
1180	<	}
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;
1198	<	} | T_CCONN_FULL
1199	<	{
1200	<	if (conf_parser_ctx.pass == 2)
1201	<	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;
1238	<	} | T_OPERWALL
1239	<	{
1240	<	if (conf_parser_ctx.pass == 2)
1241	<	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;
1301	<	};
1267	<
1268	<	oper_global_kill: GLOBAL_KILL '=' TBOOL ';'
1300	>	block_state.modes.value |= UMODE_LOCOPS;
1301	>	} | T_NONONREG
1302		{
1303		if (conf_parser_ctx.pass == 2)
1304	<	{
1305	<	if (yylval.number)
1273	<	yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1274	<	else
1275	<	yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1276	<	}
1277	<	};
1278	<
1279	<	oper_remote: REMOTE '=' TBOOL ';'
1304	>	block_state.modes.value |= UMODE_REGONLY;
1305	>	} | T_FARCONNECT
1306		{
1307		if (conf_parser_ctx.pass == 2)
1308	<	{
1283	<	if (yylval.number)
1284	<	yy_aconf->port |= OPER_FLAG_REMOTE;
1285	<	else
1286	<	yy_aconf->port &= ~OPER_FLAG_REMOTE;
1287	<	}
1308	>	block_state.modes.value |= UMODE_FARCONNECT;
1309		};
1310
1311	<	oper_remoteban: REMOTEBAN '=' TBOOL ';'
1311	>	oper_flags: IRCD_FLAGS
1312		{
1313		if (conf_parser_ctx.pass == 2)
1314	<	{
1315	<	if (yylval.number)
1295	<	yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1296	<	else
1297	<	yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1298	<	}
1299	<	};
1314	>	block_state.port.value = 0;
1315	>	} '='  oper_flags_items ';';
1316
1317	<	oper_kline: KLINE '=' TBOOL ';'
1317	>	oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1318	>	oper_flags_item: KILL ':' REMOTE
1319		{
1320		if (conf_parser_ctx.pass == 2)
1321	<	{
1322	<	if (yylval.number)
1306	<	yy_aconf->port |= OPER_FLAG_K;
1307	<	else
1308	<	yy_aconf->port &= ~OPER_FLAG_K;
1309	<	}
1310	<	};
1311	<
1312	<	oper_xline: XLINE '=' TBOOL ';'
1321	>	block_state.port.value |= OPER_FLAG_KILL_REMOTE;
1322	>	} | KILL
1323		{
1324		if (conf_parser_ctx.pass == 2)
1325	<	{
1326	<	if (yylval.number)
1317	<	yy_aconf->port |= OPER_FLAG_X;
1318	<	else
1319	<	yy_aconf->port &= ~OPER_FLAG_X;
1320	<	}
1321	<	};
1322	<
1323	<	oper_unkline: UNKLINE '=' TBOOL ';'
1325	>	block_state.port.value |= OPER_FLAG_KILL;
1326	>	} | CONNECT ':' REMOTE
1327		{
1328		if (conf_parser_ctx.pass == 2)
1329	<	{
1330	<	if (yylval.number)
1328	<	yy_aconf->port |= OPER_FLAG_UNKLINE;
1329	<	else
1330	<	yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1331	<	}
1332	<	};
1333	<
1334	<	oper_gline: GLINE '=' TBOOL ';'
1329	>	block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
1330	>	} | CONNECT
1331		{
1332		if (conf_parser_ctx.pass == 2)
1333	<	{
1334	<	if (yylval.number)
1339	<	yy_aconf->port |= OPER_FLAG_GLINE;
1340	<	else
1341	<	yy_aconf->port &= ~OPER_FLAG_GLINE;
1342	<	}
1343	<	};
1344	<
1345	<	oper_nick_changes: NICK_CHANGES '=' TBOOL ';'
1333	>	block_state.port.value |= OPER_FLAG_CONNECT;
1334	>	} | SQUIT ':' REMOTE
1335		{
1336		if (conf_parser_ctx.pass == 2)
1337	<	{
1338	<	if (yylval.number)
1350	<	yy_aconf->port |= OPER_FLAG_N;
1351	<	else
1352	<	yy_aconf->port &= ~OPER_FLAG_N;
1353	<	}
1354	<	};
1355	<
1356	<	oper_die: DIE '=' TBOOL ';'
1337	>	block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
1338	>	} | SQUIT
1339		{
1340		if (conf_parser_ctx.pass == 2)
1341	<	{
1342	<	if (yylval.number)
1361	<	yy_aconf->port |= OPER_FLAG_DIE;
1362	<	else
1363	<	yy_aconf->port &= ~OPER_FLAG_DIE;
1364	<	}
1365	<	};
1366	<
1367	<	oper_rehash: REHASH '=' TBOOL ';'
1341	>	block_state.port.value |= OPER_FLAG_SQUIT;
1342	>	} | KLINE
1343		{
1344		if (conf_parser_ctx.pass == 2)
1345	<	{
1346	<	if (yylval.number)
1372	<	yy_aconf->port |= OPER_FLAG_REHASH;
1373	<	else
1374	<	yy_aconf->port &= ~OPER_FLAG_REHASH;
1375	<	}
1376	<	};
1377	<
1378	<	oper_admin: ADMIN '=' TBOOL ';'
1345	>	block_state.port.value |= OPER_FLAG_KLINE;
1346	>	} | UNKLINE
1347		{
1348		if (conf_parser_ctx.pass == 2)
1349	<	{
1350	<	if (yylval.number)
1383	<	yy_aconf->port |= OPER_FLAG_ADMIN;
1384	<	else
1385	<	yy_aconf->port &= ~OPER_FLAG_ADMIN;
1386	<	}
1387	<	};
1388	<
1389	<	oper_hidden_admin: HIDDEN_ADMIN '=' TBOOL ';'
1349	>	block_state.port.value |= OPER_FLAG_UNKLINE;
1350	>	} | T_DLINE
1351		{
1352		if (conf_parser_ctx.pass == 2)
1353	<	{
1354	<	if (yylval.number)
1394	<	yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1395	<	else
1396	<	yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1397	<	}
1398	<	};
1399	<
1400	<	oper_hidden_oper: HIDDEN_OPER '=' TBOOL ';'
1353	>	block_state.port.value |= OPER_FLAG_DLINE;
1354	>	} | T_UNDLINE
1355		{
1356		if (conf_parser_ctx.pass == 2)
1357	<	{
1358	<	if (yylval.number)
1405	<	yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1406	<	else
1407	<	yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1408	<	}
1409	<	};
1410	<
1411	<	oper_operwall: T_OPERWALL '=' TBOOL ';'
1357	>	block_state.port.value |= OPER_FLAG_UNDLINE;
1358	>	} | XLINE
1359		{
1360		if (conf_parser_ctx.pass == 2)
1361	<	{
1362	<	if (yylval.number)
1416	<	yy_aconf->port |= OPER_FLAG_OPERWALL;
1417	<	else
1418	<	yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1419	<	}
1420	<	};
1421	<
1422	<	oper_flags: IRCD_FLAGS
1361	>	block_state.port.value |= OPER_FLAG_XLINE;
1362	>	} | T_UNXLINE
1363		{
1364	<	} '='  oper_flags_items ';';
1365	<
1366	<	oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1427	<	oper_flags_item: NOT { not_atom = 1; } oper_flags_item_atom
1428	<	| { not_atom = 0; } oper_flags_item_atom;
1429	<
1430	<	oper_flags_item_atom: GLOBAL_KILL
1364	>	if (conf_parser_ctx.pass == 2)
1365	>	block_state.port.value |= OPER_FLAG_UNXLINE;
1366	>	} | DIE
1367		{
1368		if (conf_parser_ctx.pass == 2)
1369	<	{
1370	<	if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1435	<	else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1436	<	}
1437	<	} | REMOTE
1369	>	block_state.port.value |= OPER_FLAG_DIE;
1370	>	} | T_RESTART
1371		{
1372		if (conf_parser_ctx.pass == 2)
1373	<	{
1374	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
1442	<	else yy_aconf->port |= OPER_FLAG_REMOTE;
1443	<	}
1444	<	} | KLINE
1373	>	block_state.port.value |= OPER_FLAG_RESTART;
1374	>	} | REHASH
1375		{
1376		if (conf_parser_ctx.pass == 2)
1377	<	{
1378	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
1449	<	else yy_aconf->port |= OPER_FLAG_K;
1450	<	}
1451	<	} | UNKLINE
1377	>	block_state.port.value |= OPER_FLAG_REHASH;
1378	>	} | ADMIN
1379		{
1380		if (conf_parser_ctx.pass == 2)
1381	<	{
1382	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1456	<	else yy_aconf->port |= OPER_FLAG_UNKLINE;
1457	<	}
1458	<	} | XLINE
1381	>	block_state.port.value |= OPER_FLAG_ADMIN;
1382	>	} | T_GLOBOPS
1383		{
1384		if (conf_parser_ctx.pass == 2)
1385	<	{
1386	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
1463	<	else yy_aconf->port |= OPER_FLAG_X;
1464	<	}
1465	<	} | GLINE
1385	>	block_state.port.value |= OPER_FLAG_GLOBOPS;
1386	>	} | T_WALLOPS
1387		{
1388		if (conf_parser_ctx.pass == 2)
1389	<	{
1390	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
1470	<	else yy_aconf->port |= OPER_FLAG_GLINE;
1471	<	}
1472	<	} | DIE
1389	>	block_state.port.value |= OPER_FLAG_WALLOPS;
1390	>	} | T_LOCOPS
1391		{
1392		if (conf_parser_ctx.pass == 2)
1393	<	{
1394	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
1477	<	else yy_aconf->port |= OPER_FLAG_DIE;
1478	<	}
1479	<	} | REHASH
1393	>	block_state.port.value |= OPER_FLAG_LOCOPS;
1394	>	} | REMOTEBAN
1395		{
1396		if (conf_parser_ctx.pass == 2)
1397	<	{
1398	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
1484	<	else yy_aconf->port |= OPER_FLAG_REHASH;
1485	<	}
1486	<	} | ADMIN
1397	>	block_state.port.value |= OPER_FLAG_REMOTEBAN;
1398	>	} | T_SET
1399		{
1400		if (conf_parser_ctx.pass == 2)
1401	<	{
1402	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_ADMIN;
1491	<	else yy_aconf->port |= OPER_FLAG_ADMIN;
1492	<	}
1493	<	} | HIDDEN_ADMIN
1401	>	block_state.port.value |= OPER_FLAG_SET;
1402	>	} | MODULE
1403		{
1404		if (conf_parser_ctx.pass == 2)
1405	<	{
1406	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1498	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1499	<	}
1500	<	} | NICK_CHANGES
1405	>	block_state.port.value |= OPER_FLAG_MODULE;
1406	>	} | T_OPME
1407		{
1408		if (conf_parser_ctx.pass == 2)
1409	<	{
1410	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
1505	<	else yy_aconf->port |= OPER_FLAG_N;
1506	<	}
1507	<	} | T_OPERWALL
1409	>	block_state.port.value |= OPER_FLAG_OPME;
1410	>	} | NICK ':' RESV
1411		{
1412		if (conf_parser_ctx.pass == 2)
1413	<	{
1414	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1512	<	else yy_aconf->port |= OPER_FLAG_OPERWALL;
1513	<	}
1514	<	} | OPER_SPY_T
1413	>	block_state.port.value |= OPER_FLAG_NICK_RESV;
1414	>	} | JOIN ':' RESV
1415		{
1416		if (conf_parser_ctx.pass == 2)
1417	<	{
1418	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
1519	<	else yy_aconf->port |= OPER_FLAG_OPER_SPY;
1520	<	}
1521	<	} | HIDDEN_OPER
1417	>	block_state.port.value |= OPER_FLAG_JOIN_RESV;
1418	>	} | RESV
1419		{
1420		if (conf_parser_ctx.pass == 2)
1421	<	{
1422	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1526	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1527	<	}
1528	<	} | REMOTEBAN
1421	>	block_state.port.value |= OPER_FLAG_RESV;
1422	>	} | T_UNRESV
1423		{
1424		if (conf_parser_ctx.pass == 2)
1425	<	{
1426	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1533	<	else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1534	<	}
1535	<	} | ENCRYPTED
1425	>	block_state.port.value |= OPER_FLAG_UNRESV;
1426	>	} | CLOSE
1427		{
1428		if (conf_parser_ctx.pass == 2)
1429	<	{
1539	<	if (not_atom) ClearConfEncrypted(yy_aconf);
1540	<	else SetConfEncrypted(yy_aconf);
1541	<	}
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	<	{
1552	<	yy_conf = make_conf_item(CLASS_TYPE);
1553	<	yy_class = map_to_conf(yy_conf);
1554	<	}
1555	<	} class_name_b '{' class_items '}' ';'
1556	<	{
1557	<	if (conf_parser_ctx.pass == 1)
1558	<	{
1559	<	struct ConfItem *cconf = NULL;
1560	<	struct ClassItem *class = NULL;
1561	<
1562	<	if (yy_class_name == NULL)
1563	<	delete_conf_item(yy_conf);
1564	<	else
1565	<	{
1566	<	cconf = find_exact_name_conf(CLASS_TYPE, yy_class_name, NULL, NULL);
1567	<
1568	<	if (cconf != NULL)                /* The class existed already */
1569	<	{
1570	<	int user_count = 0;
1571	<
1572	<	rebuild_cidr_class(cconf, yy_class);
1573	<
1574	<	class = map_to_conf(cconf);
1575	<
1576	<	user_count = class->curr_user_count;
1577	<	memcpy(class, yy_class, sizeof(*class));
1578	<	class->curr_user_count = user_count;
1579	<	class->active = 1;
1438	>	if (conf_parser_ctx.pass != 1)
1439	>	break;
1440
1441	<	delete_conf_item(yy_conf);
1441	>	reset_block_state();
1442
1443	<	MyFree(cconf->name);            /* Allows case change of class name */
1444	<	cconf->name = yy_class_name;
1445	<	}
1446	<	else      /* Brand new class */
1447	<	{
1448	<	MyFree(yy_conf->name);          /* just in case it was allocated */
1449	<	yy_conf->name = yy_class_name;
1450	<	yy_class->active = 1;
1451	<	}
1452	<	}
1453	<
1454	<	yy_class_name = NULL;
1455	<	}
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	>	xfree(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
1598	–	class_name_b: | class_name_t;
1599	–
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 |
1605	<	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	<	{
1617	<	if (conf_parser_ctx.pass == 1)
1618	<	{
1619	<	MyFree(yy_class_name);
1620	<	DupString(yy_class_name, yylval.string);
1621	<	}
1622	<	};
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	<	{
1628	<	MyFree(yy_class_name);
1629	<	DupString(yy_class_name, yylval.string);
1630	<	}
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;
1713	<	listener_flags = 0;
1714	<	}
1715	<	} '{' listen_items '}' ';'
1716	<	{
1717	<	if (conf_parser_ctx.pass == 2)
1718	<	{
1719	<	MyFree(listener_address);
1720	<	listener_address = NULL;
1721	<	}
1722	<	};
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
1744	–
1745	–
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 1754 | 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	<	{
1762	<	yyerror("SSL not available - port closed");
1763	<	break;
1764	<	}
1765	<	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
1777	–	{
1778	–	yyerror("SSL not available - port closed");
1779	–	break;
1780	–	}
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	<	{
1791	<	MyFree(listener_address);
1792	<	DupString(listener_address, yylval.string);
1793	<	}
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	<	{
1800	<	MyFree(listener_address);
1801	<	DupString(listener_address, yylval.string);
1802	<	}
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	<	{
1812	<	yy_conf = make_conf_item(CLIENT_TYPE);
1813	<	yy_aconf = map_to_conf(yy_conf);
1814	<	}
1815	<	else
1816	<	{
1817	<	MyFree(class_name);
1818	<	class_name = NULL;
1819	<	}
1718	>	reset_block_state();
1719		} '{' auth_items '}' ';'
1720		{
1721	<	if (conf_parser_ctx.pass == 2)
1823	<	{
1824	<	struct CollectItem *yy_tmp = NULL;
1825	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1826	<
1827	<	if (yy_aconf->user && yy_aconf->host)
1828	<	{
1829	<	conf_add_class_to_conf(yy_conf, class_name);
1830	<	add_conf_by_address(CONF_CLIENT, yy_aconf);
1831	<	}
1832	<	else
1833	<	delete_conf_item(yy_conf);
1834	<
1835	<	/* copy over settings from first struct */
1836	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
1837	<	{
1838	<	struct AccessItem *new_aconf;
1839	<	struct ConfItem *new_conf;
1840	<
1841	<	new_conf = make_conf_item(CLIENT_TYPE);
1842	<	new_aconf = map_to_conf(new_conf);
1843	<
1844	<	yy_tmp = ptr->data;
1845	<
1846	<	assert(yy_tmp->user && yy_tmp->host);
1721	>	dlink_node *node = NULL;
1722
1723	<	if (yy_aconf->passwd != NULL)
1724	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1850	<	if (yy_conf->name != NULL)
1851	<	DupString(new_conf->name, yy_conf->name);
1852	<	if (yy_aconf->passwd != NULL)
1853	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1723	>	if (conf_parser_ctx.pass != 2)
1724	>	break;
1725
1726	<	new_aconf->flags = yy_aconf->flags;
1856	<	new_aconf->port  = yy_aconf->port;
1857	<
1858	<	DupString(new_aconf->user, yy_tmp->user);
1859	<	collapse(new_aconf->user);
1860	<
1861	<	DupString(new_aconf->host, yy_tmp->host);
1862	<	collapse(new_aconf->host);
1863	<
1864	<	conf_add_class_to_conf(new_conf, class_name);
1865	<	add_conf_by_address(CONF_CLIENT, new_aconf);
1866	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1867	<	free_collect_item(yy_tmp);
1868	<	}
1869	<
1870	<	MyFree(class_name);
1871	<	class_name = NULL;
1872	<	yy_conf = NULL;
1873	<	yy_aconf = NULL;
1874	<	}
1875	<	};
1876	<
1877	<	auth_items:     auth_items auth_item | auth_item;
1878	<	auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1879	<	auth_kline_exempt | auth_need_ident |
1880	<	auth_exceed_limit | auth_no_tilde | auth_gline_exempt |
1881	<	auth_spoof | auth_spoof_notice |
1882	<	auth_redir_serv | auth_redir_port | auth_can_flood |
1883	<	auth_need_password | auth_encrypted | error ';' ;
1884	<
1885	<	auth_user: USER '=' QSTRING ';'
1886	<	{
1887	<	if (conf_parser_ctx.pass == 2)
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;
1896	<
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);
1900	<
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	<	{
1926	<	/* be paranoid */
1927	<	if (yy_aconf->passwd != NULL)
1928	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1929	<
1930	<	MyFree(yy_aconf->passwd);
1931	<	DupString(yy_aconf->passwd, yylval.string);
1932	<	}
1771	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1772		};
1773
1774	<	auth_spoof_notice: SPOOF_NOTICE '=' TBOOL ';'
1774	>	auth_passwd: PASSWORD '=' QSTRING ';'
1775		{
1776		if (conf_parser_ctx.pass == 2)
1777	<	{
1939	<	if (yylval.number)
1940	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1941	<	else
1942	<	yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1943	<	}
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	<	{
1950	<	MyFree(class_name);
1951	<	DupString(class_name, yylval.string);
1952	<	}
1783	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1784		};
1785
1786		auth_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 1957 | 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: NOT { not_atom = 1; } auth_flags_item_atom
1972	<	| { not_atom = 0; } auth_flags_item_atom;
1973	<
1974	<	auth_flags_item_atom: SPOOF_NOTICE
1804	>	auth_flags_item: SPOOF_NOTICE
1805		{
1806		if (conf_parser_ctx.pass == 2)
1807	<	{
1978	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1979	<	else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1980	<	}
1981	<
1807	>	block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1808		} | EXCEED_LIMIT
1809		{
1810		if (conf_parser_ctx.pass == 2)
1811	<	{
1986	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
1987	<	else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1988	<	}
1811	>	block_state.flags.value |= CONF_FLAGS_NOLIMIT;
1812		} | KLINE_EXEMPT
1813		{
1814		if (conf_parser_ctx.pass == 2)
1815	<	{
1816	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
1994	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1995	<	}
1996	<	} | NEED_IDENT
1815	>	block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1816	>	} | XLINE_EXEMPT
1817		{
1818		if (conf_parser_ctx.pass == 2)
1819	<	{
1820	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
2001	<	else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
2002	<	}
2003	<	} | CAN_FLOOD
1819	>	block_state.flags.value |= CONF_FLAGS_EXEMPTXLINE;
1820	>	} | NEED_IDENT
1821		{
1822		if (conf_parser_ctx.pass == 2)
1823	<	{
1824	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
2008	<	else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
2009	<	}
2010	<	} | CAN_IDLE
1823	>	block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
1824	>	} | CAN_FLOOD
1825		{
1826		if (conf_parser_ctx.pass == 2)
1827	<	{
2014	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_IDLE_LINED;
2015	<	else yy_aconf->flags |= CONF_FLAGS_IDLE_LINED;
2016	<	}
1827	>	block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
1828		} | NO_TILDE
1829		{
1830		if (conf_parser_ctx.pass == 2)
1831	<	{
1832	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
2022	<	else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
2023	<	}
2024	<	} | GLINE_EXEMPT
1831	>	block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1832	>	} | RESV_EXEMPT
1833		{
1834		if (conf_parser_ctx.pass == 2)
1835	<	{
1836	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
2029	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
2030	<	}
2031	<	} | RESV_EXEMPT
1835	>	block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
1836	>	} | T_WEBIRC
1837		{
1838		if (conf_parser_ctx.pass == 2)
1839	<	{
2035	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
2036	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
2037	<	}
1839	>	block_state.flags.value |= CONF_FLAGS_WEBIRC;
1840		} | NEED_PASSWORD
1841		{
1842		if (conf_parser_ctx.pass == 2)
1843	<	{
2042	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
2043	<	else yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
2044	<	}
1843	>	block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1844		};
1845
1846	<	auth_kline_exempt: KLINE_EXEMPT '=' TBOOL ';'
1846	>	auth_spoof: SPOOF '=' QSTRING ';'
1847		{
1848	<	if (conf_parser_ctx.pass == 2)
1849	<	{
2051	<	if (yylval.number)
2052	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
2053	<	else
2054	<	yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
2055	<	}
2056	<	};
1848	>	if (conf_parser_ctx.pass != 2)
1849	>	break;
1850
1851	<	auth_need_ident: NEED_IDENT '=' TBOOL ';'
2059	<	{
2060	<	if (conf_parser_ctx.pass == 2)
1851	>	if (valid_hostname(yylval.string))
1852		{
1853	<	if (yylval.number)
1854	<	yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
2064	<	else
2065	<	yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
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_exceed_limit: EXCEED_LIMIT '=' TBOOL ';'
1860	>	auth_redir_serv: REDIRSERV '=' QSTRING ';'
1861		{
1862	<	if (conf_parser_ctx.pass == 2)
1863	<	{
2073	<	if (yylval.number)
2074	<	yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
2075	<	else
2076	<	yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
2077	<	}
2078	<	};
1862	>	if (conf_parser_ctx.pass != 2)
1863	>	break;
1864
1865	<	auth_can_flood: CAN_FLOOD '=' TBOOL ';'
1866	<	{
2082	<	if (conf_parser_ctx.pass == 2)
2083	<	{
2084	<	if (yylval.number)
2085	<	yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
2086	<	else
2087	<	yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
2088	<	}
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_no_tilde: NO_TILDE '=' TBOOL ';'
1869	>	auth_redir_port: REDIRPORT '=' NUMBER ';'
1870		{
1871	<	if (conf_parser_ctx.pass == 2)
1872	<	{
1873	<	if (yylval.number)
1874	<	yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1875	<	else
2098	<	yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
2099	<	}
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	<	auth_gline_exempt: GLINE_EXEMPT '=' TBOOL ';'
1878	>
1879	>	/***************************************************************************
1880	>	* resv {} section
1881	>	***************************************************************************/
1882	>	resv_entry: RESV
1883		{
1884	<	if (conf_parser_ctx.pass == 2)
1885	<	{
2106	<	if (yylval.number)
2107	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
2108	<	else
2109	<	yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
2110	<	}
2111	<	};
1884	>	if (conf_parser_ctx.pass != 2)
1885	>	break;
1886
1887	<	/* XXX - need check for illegal hostnames here */
1888	<	auth_spoof: SPOOF '=' QSTRING ';'
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	<	{
2118	<	MyFree(yy_conf->name);
1891	>	if (conf_parser_ctx.pass != 2)
1892	>	break;
1893
1894	<	if (strlen(yylval.string) < HOSTLEN)
2121	<	{
2122	<	DupString(yy_conf->name, yylval.string);
2123	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
2124	<	}
2125	<	else
2126	<	{
2127	<	ilog(L_ERROR, "Spoofs must be less than %d..ignoring it", HOSTLEN);
2128	<	yy_conf->name = NULL;
2129	<	}
2130	<	}
1894	>	create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1895		};
1896
1897	<	auth_redir_serv: REDIRSERV '=' QSTRING ';'
1897	>	resv_items:     resv_items resv_item | resv_item;
1898	>	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1899	>
1900	>	resv_mask: MASK '=' QSTRING ';'
1901		{
1902		if (conf_parser_ctx.pass == 2)
1903	<	{
2137	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
2138	<	MyFree(yy_conf->name);
2139	<	DupString(yy_conf->name, yylval.string);
2140	<	}
1903	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1904		};
1905
1906	<	auth_redir_port: REDIRPORT '=' NUMBER ';'
1906	>	resv_reason: REASON '=' QSTRING ';'
1907		{
1908		if (conf_parser_ctx.pass == 2)
1909	<	{
2147	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
2148	<	yy_aconf->port = $3;
2149	<	}
1909	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1910		};
1911
1912	<	auth_need_password: NEED_PASSWORD '=' TBOOL ';'
1912	>	resv_exempt: EXEMPT '=' QSTRING ';'
1913		{
1914		if (conf_parser_ctx.pass == 2)
1915	<	{
2156	<	if (yylval.number)
2157	<	yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
2158	<	else
2159	<	yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
2160	<	}
1915	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1916		};
1917
1918
1919		/***************************************************************************
1920	<	*  section resv
1920	>	* service {} section
1921		***************************************************************************/
1922	<	resv_entry: RESV
2168	<	{
2169	<	if (conf_parser_ctx.pass == 2)
2170	<	{
2171	<	MyFree(resv_reason);
2172	<	resv_reason = NULL;
2173	<	}
2174	<	} '{' resv_items '}' ';'
2175	<	{
2176	<	if (conf_parser_ctx.pass == 2)
2177	<	{
2178	<	MyFree(resv_reason);
2179	<	resv_reason = NULL;
2180	<	}
2181	<	};
1922	>	service_entry: T_SERVICE '{' service_items '}' ';';
1923
1924	<	resv_items:     resv_items resv_item | resv_item;
1925	<	resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
1924	>	service_items:     service_items service_item | service_item;
1925	>	service_item:      service_name | error;
1926
1927	<	resv_creason: REASON '=' QSTRING ';'
1927	>	service_name: NAME '=' QSTRING ';'
1928		{
1929	<	if (conf_parser_ctx.pass == 2)
1930	<	{
2190	<	MyFree(resv_reason);
2191	<	DupString(resv_reason, yylval.string);
2192	<	}
2193	<	};
1929	>	if (conf_parser_ctx.pass != 2)
1930	>	break;
1931
1932	<	resv_channel: CHANNEL '=' QSTRING ';'
2196	<	{
2197	<	if (conf_parser_ctx.pass == 2)
1932	>	if (valid_servname(yylval.string))
1933		{
1934	<	if (IsChanPrefix(*yylval.string))
1935	<	{
2201	<	char def_reason[] = "No reason";
2202	<
2203	<	create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
2204	<	}
1934	>	struct MaskItem *conf = conf_make(CONF_SERVICE);
1935	>	conf->name = xstrdup(yylval.string);
1936		}
2206	–	/* ignore it for now.. but we really should make a warning if
2207	–	* its an erroneous name --fl_ */
1937		};
1938
2210	–	resv_nick: NICK '=' QSTRING ';'
2211	–	{
2212	–	if (conf_parser_ctx.pass == 2)
2213	–	{
2214	–	char def_reason[] = "No reason";
2215	–
2216	–	create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
2217	–	}
2218	–	};
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 2242 | Line 1971 | shared_item:  shared_name | shared_user
1971		shared_name: NAME '=' QSTRING ';'
1972		{
1973		if (conf_parser_ctx.pass == 2)
1974	<	{
2246	<	MyFree(yy_conf->name);
2247	<	DupString(yy_conf->name, yylval.string);
2248	<	}
1974	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1975		};
1976
1977		shared_user: USER '=' QSTRING ';'
#	Line 2256 | 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);
2267	–
2268	–	DupString(yy_match_item->user, userbuf);
2269	–	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;
2308	<	} | TRESV
2309	<	{
2310	<	if (conf_parser_ctx.pass == 2)
2311	<	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;
2390	<	} | TRESV
2391	<	{
2392	<	if (conf_parser_ctx.pass == 2)
2393	<	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		{
2413	–	if (conf_parser_ctx.pass == 2)
2414	–	{
2415	–	yy_conf = make_conf_item(SERVER_TYPE);
2416	–	yy_aconf = (struct AccessItem *)map_to_conf(yy_conf);
2417	–	yy_aconf->passwd = NULL;
2418	–	/* defaults */
2419	–	yy_aconf->port = PORTNUM;
2134
2135	<	if (ConfigFileEntry.burst_away)
2136	<	yy_aconf->flags = CONF_FLAGS_BURST_AWAY;
2423	<	}
2424	<	else
2425	<	{
2426	<	MyFree(class_name);
2427	<	class_name = NULL;
2428	<	}
2429	<	} connect_name_b '{' connect_items '}' ';'
2430	<	{
2431	<	if (conf_parser_ctx.pass == 2)
2432	<	{
2433	<	struct CollectItem *yy_hconf=NULL;
2434	<	struct CollectItem *yy_lconf=NULL;
2435	<	dlink_node *ptr;
2436	<	dlink_node *next_ptr;
2437	<	#ifdef HAVE_LIBCRYPTO
2438	<	if (yy_aconf->host &&
2439	<	((yy_aconf->passwd && yy_aconf->spasswd) ||
2440	<	(yy_aconf->rsa_public_key && IsConfCryptLink(yy_aconf))))
2441	<	#else /* !HAVE_LIBCRYPTO */
2442	<	if (yy_aconf->host && !IsConfCryptLink(yy_aconf) &&
2443	<	yy_aconf->passwd && yy_aconf->spasswd)
2444	<	#endif /* !HAVE_LIBCRYPTO */
2445	<	{
2446	<	if (conf_add_server(yy_conf, class_name) == -1)
2447	<	{
2448	<	delete_conf_item(yy_conf);
2449	<	yy_conf = NULL;
2450	<	yy_aconf = NULL;
2451	<	}
2452	<	}
2453	<	else
2454	<	{
2455	<	/* Even if yy_conf ->name is NULL
2456	<	* should still unhook any hub/leaf confs still pending
2457	<	*/
2458	<	unhook_hub_leaf_confs();
2135	>	if (conf_parser_ctx.pass != 2)
2136	>	break;
2137
2138	<	if (yy_conf->name != NULL)
2139	<	{
2140	<	#ifndef HAVE_LIBCRYPTO
2141	<	if (IsConfCryptLink(yy_aconf))
2142	<	yyerror("Ignoring connect block -- no OpenSSL support");
2143	<	#else
2144	<	if (IsConfCryptLink(yy_aconf) && !yy_aconf->rsa_public_key)
2467	<	yyerror("Ignoring connect block -- missing key");
2468	<	#endif
2469	<	if (yy_aconf->host == NULL)
2470	<	yyerror("Ignoring connect block -- missing host");
2471	<	else if (!IsConfCryptLink(yy_aconf) &&
2472	<	(!yy_aconf->passwd || !yy_aconf->spasswd))
2473	<	yyerror("Ignoring connect block -- missing password");
2474	<	}
2475	<
2476	<
2477	<	/* XXX
2478	<	* This fixes a try_connections() core (caused by invalid class_ptr
2479	<	* pointers) reported by metalrock. That's an ugly fix, but there
2480	<	* is currently no better way. The entire config subsystem needs an
2481	<	* rewrite ASAP. make_conf_item() shouldn't really add things onto
2482	<	* a doubly linked list immediately without any sanity checks!  -Michael
2483	<	*/
2484	<	delete_conf_item(yy_conf);
2485	<
2486	<	yy_aconf = NULL;
2487	<	yy_conf = NULL;
2488	<	}
2489	<
2490	<	/*
2491	<	* yy_conf is still pointing at the server that is having
2492	<	* a connect block built for it. This means, y_aconf->name
2493	<	* points to the actual irc name this server will be known as.
2494	<	* Now this new server has a set or even just one hub_mask (or leaf_mask)
2495	<	* given in the link list at yy_hconf. Fill in the HUB confs
2496	<	* from this link list now.
2497	<	*/
2498	<	DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
2499	<	{
2500	<	struct ConfItem *new_hub_conf;
2501	<	struct MatchItem *match_item;
2138	>	reset_block_state();
2139	>	block_state.aftype.value = AF_INET;
2140	>	block_state.port.value = PORTNUM;
2141	>	} '{' connect_items '}' ';'
2142	>	{
2143	>	struct MaskItem *conf = NULL;
2144	>	struct addrinfo hints, *res;
2145
2146	<	yy_hconf = ptr->data;
2146	>	if (conf_parser_ctx.pass != 2)
2147	>	break;
2148
2149	<	/* yy_conf == NULL is a fatal error for this connect block! */
2150	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2151	<	{
2508	<	new_hub_conf = make_conf_item(HUB_TYPE);
2509	<	match_item = (struct MatchItem *)map_to_conf(new_hub_conf);
2510	<	DupString(new_hub_conf->name, yy_conf->name);
2511	<	if (yy_hconf->user != NULL)
2512	<	DupString(match_item->user, yy_hconf->user);
2513	<	else
2514	<	DupString(match_item->user, "*");
2515	<	if (yy_hconf->host != NULL)
2516	<	DupString(match_item->host, yy_hconf->host);
2517	<	else
2518	<	DupString(match_item->host, "*");
2519	<	}
2520	<	dlinkDelete(&yy_hconf->node, &hub_conf_list);
2521	<	free_collect_item(yy_hconf);
2522	<	}
2149	>	if (!block_state.name.buf[0] ||
2150	>	!block_state.host.buf[0])
2151	>	break;
2152
2153	<	/* Ditto for the LEAF confs */
2153	>	if (!block_state.rpass.buf[0] ||
2154	>	!block_state.spass.buf[0])
2155	>	break;
2156
2157	<	DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
2158	<	{
2159	<	struct ConfItem *new_leaf_conf;
2529	<	struct MatchItem *match_item;
2157	>	if (has_wildcards(block_state.name.buf) ||
2158	>	has_wildcards(block_state.host.buf))
2159	>	break;
2160
2161	<	yy_lconf = ptr->data;
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	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2171	<	{
2535	<	new_leaf_conf = make_conf_item(LEAF_TYPE);
2536	<	match_item = (struct MatchItem *)map_to_conf(new_leaf_conf);
2537	<	DupString(new_leaf_conf->name, yy_conf->name);
2538	<	if (yy_lconf->user != NULL)
2539	<	DupString(match_item->user, yy_lconf->user);
2540	<	else
2541	<	DupString(match_item->user, "*");
2542	<	if (yy_lconf->host != NULL)
2543	<	DupString(match_item->host, yy_lconf->host);
2544	<	else
2545	<	DupString(match_item->host, "*");
2546	<	}
2547	<	dlinkDelete(&yy_lconf->node, &leaf_conf_list);
2548	<	free_collect_item(yy_lconf);
2549	<	}
2550	<	MyFree(class_name);
2551	<	class_name = NULL;
2552	<	yy_conf = NULL;
2553	<	yy_aconf = NULL;
2554	<	}
2555	<	};
2170	>	if (block_state.cert.buf[0])
2171	>	conf->certfp = xstrdup(block_state.cert.buf);
2172
2173	<	connect_name_b: | connect_name_t;
2174	<	connect_items:  connect_items connect_item | connect_item;
2559	<	connect_item:   connect_name | connect_host | connect_vhost |
2560	<	connect_send_password | connect_accept_password |
2561	<	connect_aftype | connect_port |
2562	<	connect_fakename | connect_flags | connect_hub_mask |
2563	<	connect_leaf_mask | connect_class | connect_auto |
2564	<	connect_encrypted | connect_compressed | connect_cryptlink |
2565	<	connect_rsa_public_key_file | connect_cipher_preference |
2566	<	connect_topicburst | error ';' ;
2173	>	if (block_state.ciph.buf[0])
2174	>	conf->cipher_list = xstrdup(block_state.ciph.buf);
2175
2176	<	connect_name: NAME '=' QSTRING ';'
2177	<	{
2570	<	if (conf_parser_ctx.pass == 2)
2571	<	{
2572	<	if (yy_conf->name != NULL)
2573	<	yyerror("Multiple connect name entry");
2176	>	dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
2177	>	dlinkMoveList(&block_state.hub.list, &conf->hub_list);
2178
2179	<	MyFree(yy_conf->name);
2576	<	DupString(yy_conf->name, yylval.string);
2577	<	}
2578	<	};
2579	<
2580	<	connect_name_t: QSTRING
2581	<	{
2582	<	if (conf_parser_ctx.pass == 2)
2179	>	if (block_state.bind.buf[0])
2180		{
2584	–	if (yy_conf->name != NULL)
2585	–	yyerror("Multiple connect name entry");
2586	–
2587	–	MyFree(yy_conf->name);
2588	–	DupString(yy_conf->name, yylval.string);
2589	–	}
2590	–	};
2591	–
2592	–	connect_host: HOST '=' QSTRING ';'
2593	–	{
2594	–	if (conf_parser_ctx.pass == 2)
2595	–	{
2596	–	MyFree(yy_aconf->host);
2597	–	DupString(yy_aconf->host, yylval.string);
2598	–	}
2599	–	};
2600	–
2601	–	connect_vhost: VHOST '=' QSTRING ';'
2602	–	{
2603	–	if (conf_parser_ctx.pass == 2)
2604	–	{
2605	–	struct addrinfo hints, *res;
2606	–
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 (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
2188	<	ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
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 != NULL);
2191	>	assert(res);
2192
2193	<	memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
2194	<	yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
2195	<	yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
2196	<	irc_freeaddrinfo(res);
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		}
2625	–	};
2626	–
2627	–	connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2628	–	{
2629	–	if (conf_parser_ctx.pass == 2)
2630	–	{
2631	–	if ($3[0] == ':')
2632	–	yyerror("Server passwords cannot begin with a colon");
2633	–	else if (strchr($3, ' ') != NULL)
2634	–	yyerror("Server passwords cannot contain spaces");
2635	–	else {
2636	–	if (yy_aconf->spasswd != NULL)
2637	–	memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
2199
2200	<	MyFree(yy_aconf->spasswd);
2201	<	DupString(yy_aconf->spasswd, yylval.string);
2641	<	}
2642	<	}
2200	>	conf_add_class_to_conf(conf, block_state.class.buf);
2201	>	lookup_confhost(conf);
2202		};
2203
2204	<	connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2204	>	connect_items:  connect_items connect_item | connect_item;
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	<	{
2649	<	if ($3[0] == ':')
2650	<	yyerror("Server passwords cannot begin with a colon");
2651	<	else if (strchr($3, ' ') != NULL)
2652	<	yyerror("Server passwords cannot contain spaces");
2653	<	else {
2654	<	if (yy_aconf->passwd != NULL)
2655	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
2656	<
2657	<	MyFree(yy_aconf->passwd);
2658	<	DupString(yy_aconf->passwd, yylval.string);
2659	<	}
2660	<	}
2224	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2225		};
2226
2227	<	connect_port: PORT '=' NUMBER ';'
2227	>	connect_host: HOST '=' QSTRING ';'
2228		{
2229		if (conf_parser_ctx.pass == 2)
2230	<	yy_aconf->port = $3;
2230	>	strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2231		};
2232
2233	<	connect_aftype: AFTYPE '=' T_IPV4 ';'
2233	>	connect_vhost: VHOST '=' QSTRING ';'
2234		{
2235		if (conf_parser_ctx.pass == 2)
2236	<	yy_aconf->aftype = AF_INET;
2673	<	} | AFTYPE '=' T_IPV6 ';'
2674	<	{
2675	<	#ifdef IPV6
2676	<	if (conf_parser_ctx.pass == 2)
2677	<	yy_aconf->aftype = AF_INET6;
2678	<	#endif
2236	>	strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2237		};
2238
2239	<	connect_fakename: FAKENAME '=' QSTRING ';'
2239	>	connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2240		{
2241	<	if (conf_parser_ctx.pass == 2)
2242	<	{
2243	<	MyFree(yy_aconf->fakename);
2244	<	DupString(yy_aconf->fakename, yylval.string);
2245	<	}
2241	>	if (conf_parser_ctx.pass != 2)
2242	>	break;
2243	>
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_flags: IRCD_FLAGS
2252	>	connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2253		{
2254	<	} '='  connect_flags_items ';';
2254	>	if (conf_parser_ctx.pass != 2)
2255	>	break;
2256
2257	<	connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2258	<	connect_flags_item: NOT  { not_atom = 1; } connect_flags_item_atom
2259	<	|  { not_atom = 0; } connect_flags_item_atom;
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_flags_item_atom: COMPRESSED
2265	>	connect_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
2266		{
2267		if (conf_parser_ctx.pass == 2)
2268	<	#ifndef HAVE_LIBZ
2269	<	yyerror("Ignoring flags = compressed; -- no zlib support");
2703	<	#else
2704	<	{
2705	<	if (not_atom)ClearConfCompressed(yy_aconf);
2706	<	else SetConfCompressed(yy_aconf);
2707	<	}
2708	<	#endif
2709	<	} | CRYPTLINK
2710	<	{
2711	<	if (conf_parser_ctx.pass == 2)
2712	<	{
2713	<	if (not_atom)ClearConfCryptLink(yy_aconf);
2714	<	else SetConfCryptLink(yy_aconf);
2715	<	}
2716	<	} | AUTOCONN
2717	<	{
2718	<	if (conf_parser_ctx.pass == 2)
2719	<	{
2720	<	if (not_atom)ClearConfAllowAutoConn(yy_aconf);
2721	<	else SetConfAllowAutoConn(yy_aconf);
2722	<	}
2723	<	} | BURST_AWAY
2724	<	{
2725	<	if (conf_parser_ctx.pass == 2)
2726	<	{
2727	<	if (not_atom)ClearConfAwayBurst(yy_aconf);
2728	<	else SetConfAwayBurst(yy_aconf);
2729	<	}
2730	<	} | TOPICBURST
2731	<	{
2732	<	if (conf_parser_ctx.pass == 2)
2733	<	{
2734	<	if (not_atom)ClearConfTopicBurst(yy_aconf);
2735	<	else SetConfTopicBurst(yy_aconf);
2736	<	}
2737	<	}
2738	<	;
2268	>	strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
2269	>	};
2270
2271	<	connect_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
2271	>	connect_port: PORT '=' NUMBER ';'
2272		{
2742	–	#ifdef HAVE_LIBCRYPTO
2273		if (conf_parser_ctx.pass == 2)
2274	<	{
2745	<	BIO *file;
2746	<
2747	<	if (yy_aconf->rsa_public_key != NULL)
2748	<	{
2749	<	RSA_free(yy_aconf->rsa_public_key);
2750	<	yy_aconf->rsa_public_key = NULL;
2751	<	}
2752	<
2753	<	if (yy_aconf->rsa_public_key_file != NULL)
2754	<	{
2755	<	MyFree(yy_aconf->rsa_public_key_file);
2756	<	yy_aconf->rsa_public_key_file = NULL;
2757	<	}
2758	<
2759	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
2760	<
2761	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
2762	<	{
2763	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
2764	<	break;
2765	<	}
2766	<
2767	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
2768	<
2769	<	if (yy_aconf->rsa_public_key == NULL)
2770	<	{
2771	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
2772	<	break;
2773	<	}
2774	<
2775	<	BIO_set_close(file, BIO_CLOSE);
2776	<	BIO_free(file);
2777	<	}
2778	<	#endif /* HAVE_LIBCRYPTO */
2274	>	block_state.port.value = $3;
2275		};
2276
2277	<	connect_encrypted: ENCRYPTED '=' TBOOL ';'
2277	>	connect_aftype: AFTYPE '=' T_IPV4 ';'
2278		{
2279		if (conf_parser_ctx.pass == 2)
2280	<	{
2281	<	if (yylval.number)
2786	<	yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
2787	<	else
2788	<	yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
2789	<	}
2790	<	};
2791	<
2792	<	connect_cryptlink: CRYPTLINK '=' TBOOL ';'
2280	>	block_state.aftype.value = AF_INET;
2281	>	} | AFTYPE '=' T_IPV6 ';'
2282		{
2283		if (conf_parser_ctx.pass == 2)
2284	<	{
2796	<	if (yylval.number)
2797	<	yy_aconf->flags |= CONF_FLAGS_CRYPTLINK;
2798	<	else
2799	<	yy_aconf->flags &= ~CONF_FLAGS_CRYPTLINK;
2800	<	}
2284	>	block_state.aftype.value = AF_INET6;
2285		};
2286
2287	<	connect_compressed: COMPRESSED '=' TBOOL ';'
2287	>	connect_flags: IRCD_FLAGS
2288		{
2289	<	if (conf_parser_ctx.pass == 2)
2290	<	{
2807	<	if (yylval.number)
2808	<	#ifndef HAVE_LIBZ
2809	<	yyerror("Ignoring compressed=yes; -- no zlib support");
2810	<	#else
2811	<	yy_aconf->flags |= CONF_FLAGS_COMPRESSED;
2812	<	#endif
2813	<	else
2814	<	yy_aconf->flags &= ~CONF_FLAGS_COMPRESSED;
2815	<	}
2816	<	};
2289	>	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2290	>	} '='  connect_flags_items ';';
2291
2292	<	connect_auto: AUTOCONN '=' TBOOL ';'
2292	>	connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2293	>	connect_flags_item: AUTOCONN
2294		{
2295		if (conf_parser_ctx.pass == 2)
2296	<	{
2297	<	if (yylval.number)
2298	<	yy_aconf->flags |= CONF_FLAGS_ALLOW_AUTO_CONN;
2299	<	else
2300	<	yy_aconf->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN;
2826	<	}
2296	>	block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2297	>	} | T_SSL
2298	>	{
2299	>	if (conf_parser_ctx.pass == 2)
2300	>	block_state.flags.value |= CONF_FLAGS_SSL;
2301		};
2302
2303	<	connect_topicburst: TOPICBURST '=' TBOOL ';'
2303	>	connect_encrypted: ENCRYPTED '=' TBOOL ';'
2304		{
2305		if (conf_parser_ctx.pass == 2)
2306		{
2307		if (yylval.number)
2308	<	SetConfTopicBurst(yy_aconf);
2308	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
2309		else
2310	<	ClearConfTopicBurst(yy_aconf);
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	<	{
2844	<	struct CollectItem *yy_tmp;
2845	<
2846	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2847	<	DupString(yy_tmp->host, yylval.string);
2848	<	DupString(yy_tmp->user, "*");
2849	<	dlinkAdd(yy_tmp, &yy_tmp->node, &hub_conf_list);
2850	<	}
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	<	{
2857	<	struct CollectItem *yy_tmp;
2858	<
2859	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2860	<	DupString(yy_tmp->host, yylval.string);
2861	<	DupString(yy_tmp->user, "*");
2862	<	dlinkAdd(yy_tmp, &yy_tmp->node, &leaf_conf_list);
2863	<	}
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	<	{
2870	<	MyFree(class_name);
2871	<	DupString(class_name, yylval.string);
2872	<	}
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	<	{
2880	<	struct EncCapability *ecap;
2881	<	const char *cipher_name;
2882	<	int found = 0;
2883	<
2884	<	yy_aconf->cipher_preference = NULL;
2885	<	cipher_name = yylval.string;
2886	<
2887	<	for (ecap = CipherTable; ecap->name; ecap++)
2888	<	{
2889	<	if ((irccmp(ecap->name, cipher_name) == 0) &&
2890	<	(ecap->cap & CAP_ENC_MASK))
2891	<	{
2892	<	yy_aconf->cipher_preference = ecap;
2893	<	found = 1;
2894	<	break;
2895	<	}
2896	<	}
2897	<
2898	<	if (!found)
2899	<	yyerror("Invalid cipher");
2900	<	}
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	<	{
2914	<	userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
2915	<	regex_ban = 0;
2916	<	}
2350	>	reset_block_state();
2351		} '{' kill_items '}' ';'
2352		{
2353	<	if (conf_parser_ctx.pass == 2)
2920	<	{
2921	<	if (userbuf[0] && hostbuf[0])
2922	<	{
2923	<	if (regex_ban)
2924	<	{
2925	<	#ifdef HAVE_LIBPCRE
2926	<	void *exp_user = NULL;
2927	<	void *exp_host = NULL;
2928	<	const char *errptr = NULL;
2929	<
2930	<	if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
2931	<	!(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
2932	<	{
2933	<	ilog(L_ERROR, "Failed to add regular expression based K-Line: %s",
2934	<	errptr);
2935	<	break;
2936	<	}
2937	<
2938	<	yy_aconf = map_to_conf(make_conf_item(RKLINE_TYPE));
2939	<	yy_aconf->regexuser = exp_user;
2940	<	yy_aconf->regexhost = exp_host;
2353	>	struct MaskItem *conf = NULL;
2354
2355	<	DupString(yy_aconf->user, userbuf);
2356	<	DupString(yy_aconf->host, hostbuf);
2355	>	if (conf_parser_ctx.pass != 2)
2356	>	break;
2357
2358	<	if (reasonbuf[0])
2359	<	DupString(yy_aconf->reason, reasonbuf);
2360	<	else
2948	<	DupString(yy_aconf->reason, "No reason");
2949	<	#else
2950	<	ilog(L_ERROR, "Failed to add regular expression based K-Line: no PCRE support");
2951	<	break;
2952	<	#endif
2953	<	}
2954	<	else
2955	<	{
2956	<	yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
2358	>	if (!block_state.user.buf[0] ||
2359	>	!block_state.host.buf[0])
2360	>	break;
2361
2362	<	DupString(yy_aconf->user, userbuf);
2363	<	DupString(yy_aconf->host, hostbuf);
2364	<
2961	<	if (reasonbuf[0])
2962	<	DupString(yy_aconf->reason, reasonbuf);
2963	<	else
2964	<	DupString(yy_aconf->reason, "No reason");
2965	<	add_conf_by_address(CONF_KILL, yy_aconf);
2966	<	}
2967	<	}
2362	>	conf = conf_make(CONF_KLINE);
2363	>	conf->user = xstrdup(block_state.user.buf);
2364	>	conf->host = xstrdup(block_state.host.buf);
2365
2366	<	yy_aconf = NULL;
2367	<	}
2368	<	};
2369	<
2370	<	kill_type: TYPE
2974	<	{
2975	<	} '='  kill_type_items ';';
2976	<
2977	<	kill_type_items: kill_type_items ',' kill_type_item | kill_type_item;
2978	<	kill_type_item: REGEX_T
2979	<	{
2980	<	if (conf_parser_ctx.pass == 2)
2981	<	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	<	{
3025	<	yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
3026	<	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);
3033	<	yy_aconf = NULL;
3034	<	}
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 3041 | 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);
3071	<	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	<	{
3083	<	regex_ban = 0;
3084	<	reasonbuf[0] = gecos_name[0] = '\0';
3085	<	}
2477	>	reset_block_state();
2478		} '{' gecos_items '}' ';'
2479		{
2480	<	if (conf_parser_ctx.pass == 2)
3089	<	{
3090	<	if (gecos_name[0])
3091	<	{
3092	<	if (regex_ban)
3093	<	{
3094	<	#ifdef HAVE_LIBPCRE
3095	<	void *exp_p = NULL;
3096	<	const char *errptr = NULL;
3097	<
3098	<	if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
3099	<	{
3100	<	ilog(L_ERROR, "Failed to add regular expression based X-Line: %s",
3101	<	errptr);
3102	<	break;
3103	<	}
2480	>	struct MaskItem *conf = NULL;
2481
2482	<	yy_conf = make_conf_item(RXLINE_TYPE);
2483	<	yy_conf->regexpname = exp_p;
3107	<	#else
3108	<	ilog(L_ERROR, "Failed to add regular expression based X-Line: no PCRE support");
3109	<	break;
3110	<	#endif
3111	<	}
3112	<	else
3113	<	yy_conf = make_conf_item(XLINE_TYPE);
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);
2485	>	if (!block_state.name.buf[0])
2486	>	break;
2487
2488	<	if (reasonbuf[0])
2489	<	DupString(yy_match_item->reason, reasonbuf);
3120	<	else
3121	<	DupString(yy_match_item->reason, "No reason");
3122	<	}
3123	<	}
3124	<	};
2488	>	conf = conf_make(CONF_XLINE);
2489	>	conf->name = xstrdup(block_state.name.buf);
2490
2491	<	gecos_flags: TYPE
2492	<	{
2493	<	} '='  gecos_flags_items ';';
2494	<
3130	<	gecos_flags_items: gecos_flags_items ',' gecos_flags_item | gecos_flags_item;
3131	<	gecos_flags_item: REGEX_T
3132	<	{
3133	<	if (conf_parser_ctx.pass == 2)
3134	<	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
3156	<	'{' 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_idletime | 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 |
2542	<	general_dot_in_ip6_addr | general_ping_cookie |
2543	<	general_disable_auth | general_burst_away |
2544	<	general_tkline_expire_notices | general_gline_min_cidr |
2545	<	general_gline_min_cidr6 | general_use_whois_actually |
2546	<	general_reject_hold_time | general_stats_e_disabled |
2547	<	general_max_watch |
2548	<	error;
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 |
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_burst_away: BURST_AWAY '=' TBOOL ';'
2582	>	general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2583		{
2584	<	ConfigFileEntry.burst_away = yylval.number;
2584	>	if (conf_parser_ctx.pass == 2)
2585	>	ConfigGeneral.cycle_on_host_change = yylval.number;
2586		};
2587
2588	<	general_use_whois_actually: USE_WHOIS_ACTUALLY '=' TBOOL ';'
2588	>	general_dline_min_cidr: DLINE_MIN_CIDR '=' NUMBER ';'
2589		{
2590	<	ConfigFileEntry.use_whois_actually = yylval.number;
2590	>	ConfigGeneral.dline_min_cidr = $3;
2591		};
2592
2593	<	general_reject_hold_time: TREJECT_HOLD_TIME '=' timespec ';'
2593	>	general_dline_min_cidr6: DLINE_MIN_CIDR6 '=' NUMBER ';'
2594		{
2595	<	GlobalSetOptions.rejecttime = yylval.number;
2595	>	ConfigGeneral.dline_min_cidr6 = $3;
2596		};
2597
2598	<	general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2598	>	general_kline_min_cidr: KLINE_MIN_CIDR '=' NUMBER ';'
2599		{
2600	<	ConfigFileEntry.tkline_expire_notices = yylval.number;
2600	>	ConfigGeneral.kline_min_cidr = $3;
2601		};
2602
2603	<	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' NUMBER ';'
2603	>	general_kline_min_cidr6: KLINE_MIN_CIDR6 '=' NUMBER ';'
2604		{
2605	<	ConfigFileEntry.kill_chase_time_limit = $3;
2605	>	ConfigGeneral.kline_min_cidr6 = $3;
2606		};
2607
2608	<	general_hide_spoof_ips: HIDE_SPOOF_IPS '=' TBOOL ';'
2608	>	general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2609		{
2610	<	ConfigFileEntry.hide_spoof_ips = yylval.number;
2610	>	ConfigGeneral.tkline_expire_notices = yylval.number;
2611		};
2612
2613	<	general_ignore_bogus_ts: IGNORE_BOGUS_TS '=' TBOOL ';'
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;
3285	<	};
3286	<
3287	<	general_havent_read_conf: HAVENT_READ_CONF '=' NUMBER ';'
3288	<	{
3289	<	if (($3 > 0) && conf_parser_ctx.pass == 1)
3290	<	{
3291	<	ilog(L_CRIT, "You haven't read your config file properly.");
3292	<	ilog(L_CRIT, "There is a line in the example conf that will kill your server if not removed.");
3293	<	ilog(L_CRIT, "Consider actually reading/editing the conf file, and removing this line.");
3294	<	exit(0);
3295	<	}
2661	>	ConfigGeneral.ts_max_delta = $3;
2662		};
2663
2664	<	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)
3306	<	{
3307	<	MyFree(ConfigFileEntry.kline_reason);
3308	<	DupString(ConfigFileEntry.kline_reason, yylval.string);
3309	<	}
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;
3376	<	};
3377	<
3378	<	general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
3379	<	{
3380	<	ConfigFileEntry.no_oper_flood = yylval.number;
3381	<	};
3382	<
3383	<	general_true_no_oper_flood: TRUE_NO_OPER_FLOOD '=' TBOOL ';'
3384	<	{
3385	<	ConfigFileEntry.true_no_oper_flood = yylval.number;
3386	<	};
3387	<
3388	<	general_oper_pass_resv: OPER_PASS_RESV '=' TBOOL ';'
3389	<	{
3390	<	ConfigFileEntry.oper_pass_resv = yylval.number;
3391	<	};
3392	<
3393	<	general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
3394	<	{
3395	<	if (conf_parser_ctx.pass == 2)
3396	<	{
3397	<	if (strlen(yylval.string) > LOCALE_LENGTH-2)
3398	<	yylval.string[LOCALE_LENGTH-1] = '\0';
3399	<
3400	<	set_locale(yylval.string);
3401	<	}
2737	>	ConfigGeneral.short_motd = yylval.number;
2738		};
2739
2740	<	general_idletime: IDLETIME '=' timespec ';'
2740	>	general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
2741		{
2742	<	ConfigFileEntry.idletime = $3;
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;
3417	<	};
3418	<
3419	<	general_servlink_path: SERVLINK_PATH '=' QSTRING ';'
3420	<	{
3421	<	if (conf_parser_ctx.pass == 2)
3422	<	{
3423	<	MyFree(ConfigFileEntry.servlink_path);
3424	<	DupString(ConfigFileEntry.servlink_path, yylval.string);
3425	<	}
3426	<	};
3427	<
3428	<	general_default_cipher_preference: DEFAULT_CIPHER_PREFERENCE '=' QSTRING ';'
3429	<	{
3430	<	#ifdef HAVE_LIBCRYPTO
3431	<	if (conf_parser_ctx.pass == 2)
3432	<	{
3433	<	struct EncCapability *ecap;
3434	<	const char *cipher_name;
3435	<	int found = 0;
3436	<
3437	<	ConfigFileEntry.default_cipher_preference = NULL;
3438	<	cipher_name = yylval.string;
3439	<
3440	<	for (ecap = CipherTable; ecap->name; ecap++)
3441	<	{
3442	<	if ((irccmp(ecap->name, cipher_name) == 0) &&
3443	<	(ecap->cap & CAP_ENC_MASK))
3444	<	{
3445	<	ConfigFileEntry.default_cipher_preference = ecap;
3446	<	found = 1;
3447	<	break;
3448	<	}
3449	<	}
3450	<
3451	<	if (!found)
3452	<	yyerror("Invalid cipher");
3453	<	}
3454	<	#else
3455	<	if (conf_parser_ctx.pass == 2)
3456	<	yyerror("Ignoring default_cipher_preference -- no OpenSSL support");
3457	<	#endif
3458	<	};
3459	<
3460	<	general_compression_level: COMPRESSION_LEVEL '=' NUMBER ';'
3461	<	{
3462	<	if (conf_parser_ctx.pass == 2)
3463	<	{
3464	<	ConfigFileEntry.compression_level = $3;
3465	<	#ifndef HAVE_LIBZ
3466	<	yyerror("Ignoring compression_level -- no zlib support");
3467	<	#else
3468	<	if ((ConfigFileEntry.compression_level < 1) ||
3469	<	(ConfigFileEntry.compression_level > 9))
3470	<	{
3471	<	yyerror("Ignoring invalid compression_level, using default");
3472	<	ConfigFileEntry.compression_level = 0;
3473	<	}
3474	<	#endif
3475	<	}
3476	<	};
3477	<
3478	<	general_use_egd: USE_EGD '=' TBOOL ';'
3479	<	{
3480	<	ConfigFileEntry.use_egd = yylval.number;
2752	>	ConfigGeneral.max_targets = $3;
2753		};
2754
2755	<	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
2755	>	general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2756		{
2757	<	if (conf_parser_ctx.pass == 2)
3486	<	{
3487	<	MyFree(ConfigFileEntry.egdpool_path);
3488	<	DupString(ConfigFileEntry.egdpool_path, yylval.string);
3489	<	}
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;
3519	<	} | T_CCONN_FULL
3520	<	{
3521	<	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;
3549	<	} | T_OPERWALL
3550	<	{
3551	<	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;
3584	<	} | T_CCONN_FULL
3585	<	{
3586	<	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;
3614	<	} | T_OPERWALL
3615	<	{
3616	<	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;
3650	<	};
3651	<
3652	<	general_client_flood: T_CLIENT_FLOOD '=' sizespec ';'
3653	<	{
3654	<	ConfigFileEntry.client_flood = $3;
3655	<	};
3656	<
3657	<	general_dot_in_ip6_addr: DOT_IN_IP6_ADDR '=' TBOOL ';'
3658	<	{
3659	<	ConfigFileEntry.dot_in_ip6_addr = yylval.number;
3660	<	};
3661	<
3662	<	/***************************************************************************
3663	<	*  section glines
3664	<	***************************************************************************/
3665	<	gline_entry: GLINES
3666	<	{
3667	<	if (conf_parser_ctx.pass == 2)
3668	<	{
3669	<	yy_conf = make_conf_item(GDENY_TYPE);
3670	<	yy_aconf = map_to_conf(yy_conf);
3671	<	}
3672	<	} '{' gline_items '}' ';'
3673	<	{
3674	<	if (conf_parser_ctx.pass == 2)
3675	<	{
3676	<	/*
3677	<	* since we re-allocate yy_conf/yy_aconf after the end of action=, at the
3678	<	* end we will have one extra, so we should free it.
3679	<	*/
3680	<	if (yy_conf->name == NULL || yy_aconf->user == NULL)
3681	<	{
3682	<	delete_conf_item(yy_conf);
3683	<	yy_conf = NULL;
3684	<	yy_aconf = NULL;
3685	<	}
3686	<	}
3687	<	};
3688	<
3689	<	gline_items:        gline_items gline_item | gline_item;
3690	<	gline_item:         gline_enable |
3691	<	gline_duration |
3692	<	gline_logging |
3693	<	gline_user |
3694	<	gline_server |
3695	<	gline_action |
3696	<	error;
3697	<
3698	<	gline_enable: ENABLE '=' TBOOL ';'
3699	<	{
3700	<	if (conf_parser_ctx.pass == 2)
3701	<	ConfigFileEntry.glines = yylval.number;
3702	<	};
3703	<
3704	<	gline_duration: DURATION '=' timespec ';'
3705	<	{
3706	<	if (conf_parser_ctx.pass == 2)
3707	<	ConfigFileEntry.gline_time = $3;
3708	<	};
3709	<
3710	<	gline_logging: LOGGING
3711	<	{
3712	<	if (conf_parser_ctx.pass == 2)
3713	<	ConfigFileEntry.gline_logging = 0;
3714	<	} '=' gline_logging_types ';';
3715	<	gline_logging_types:     gline_logging_types ',' gline_logging_type_item | gline_logging_type_item;
3716	<	gline_logging_type_item: T_REJECT
3717	<	{
3718	<	if (conf_parser_ctx.pass == 2)
3719	<	ConfigFileEntry.gline_logging |= GDENY_REJECT;
3720	<	} | T_BLOCK
3721	<	{
3722	<	if (conf_parser_ctx.pass == 2)
3723	<	ConfigFileEntry.gline_logging |= GDENY_BLOCK;
3724	<	};
3725	<
3726	<	gline_user: USER '=' QSTRING ';'
3727	<	{
3728	<	if (conf_parser_ctx.pass == 2)
3729	<	{
3730	<	struct split_nuh_item nuh;
3731	<
3732	<	nuh.nuhmask  = yylval.string;
3733	<	nuh.nickptr  = NULL;
3734	<	nuh.userptr  = userbuf;
3735	<	nuh.hostptr  = hostbuf;
3736	<
3737	<	nuh.nicksize = 0;
3738	<	nuh.usersize = sizeof(userbuf);
3739	<	nuh.hostsize = sizeof(hostbuf);
3740	<
3741	<	split_nuh(&nuh);
3742	<
3743	<	if (yy_aconf->user == NULL)
3744	<	{
3745	<	DupString(yy_aconf->user, userbuf);
3746	<	DupString(yy_aconf->host, hostbuf);
3747	<	}
3748	<	else
3749	<	{
3750	<	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
3751	<
3752	<	DupString(yy_tmp->user, userbuf);
3753	<	DupString(yy_tmp->host, hostbuf);
3754	<
3755	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
3756	<	}
3757	<	}
3758	<	};
3759	<
3760	<	gline_server: NAME '=' QSTRING ';'
3761	<	{
3762	<	if (conf_parser_ctx.pass == 2)
3763	<	{
3764	<	MyFree(yy_conf->name);
3765	<	DupString(yy_conf->name, yylval.string);
3766	<	}
2929	>	ConfigGeneral.default_floodcount = $3;
2930		};
2931
3769	–	gline_action: ACTION
3770	–	{
3771	–	if (conf_parser_ctx.pass == 2)
3772	–	yy_aconf->flags = 0;
3773	–	} '=' gdeny_types ';'
3774	–	{
3775	–	if (conf_parser_ctx.pass == 2)
3776	–	{
3777	–	struct CollectItem *yy_tmp = NULL;
3778	–	dlink_node *ptr, *next_ptr;
3779	–
3780	–	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3781	–	{
3782	–	struct AccessItem *new_aconf;
3783	–	struct ConfItem *new_conf;
3784	–
3785	–	yy_tmp = ptr->data;
3786	–	new_conf = make_conf_item(GDENY_TYPE);
3787	–	new_aconf = map_to_conf(new_conf);
3788	–
3789	–	new_aconf->flags = yy_aconf->flags;
3790	–
3791	–	if (yy_conf->name != NULL)
3792	–	DupString(new_conf->name, yy_conf->name);
3793	–	else
3794	–	DupString(new_conf->name, "*");
3795	–	if (yy_aconf->user != NULL)
3796	–	DupString(new_aconf->user, yy_tmp->user);
3797	–	else
3798	–	DupString(new_aconf->user, "*");
3799	–	if (yy_aconf->host != NULL)
3800	–	DupString(new_aconf->host, yy_tmp->host);
3801	–	else
3802	–	DupString(new_aconf->host, "*");
3803	–
3804	–	dlinkDelete(&yy_tmp->node, &col_conf_list);
3805	–	}
3806	–
3807	–	/*
3808	–	* In case someone has fed us with more than one action= after user/name
3809	–	* which would leak memory  -Michael
3810	–	*/
3811	–	if (yy_conf->name == NULL || yy_aconf->user == NULL)
3812	–	delete_conf_item(yy_conf);
3813	–
3814	–	yy_conf = make_conf_item(GDENY_TYPE);
3815	–	yy_aconf = map_to_conf(yy_conf);
3816	–	}
3817	–	};
3818	–
3819	–	gdeny_types: gdeny_types ',' gdeny_type_item | gdeny_type_item;
3820	–	gdeny_type_item: T_REJECT
3821	–	{
3822	–	if (conf_parser_ctx.pass == 2)
3823	–	yy_aconf->flags |= GDENY_REJECT;
3824	–	} | T_BLOCK
3825	–	{
3826	–	if (conf_parser_ctx.pass == 2)
3827	–	yy_aconf->flags |= GDENY_BLOCK;
3828	–	};
2932
2933		/***************************************************************************
2934	<	*  section channel
2934	>	* channel {} section
2935		***************************************************************************/
2936	<	channel_entry: CHANNEL
3834	<	'{' 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 ';'
2957	>	channel_invite_client_count: INVITE_CLIENT_COUNT '=' NUMBER ';'
2958		{
2959	<	ConfigChannel.restrict_channels = yylval.number;
2959	>	ConfigChannel.invite_client_count = $3;
2960		};
2961
2962	<	channel_disable_local_channels: DISABLE_LOCAL_CHANNELS '=' TBOOL ';'
2962	>	channel_invite_client_time: INVITE_CLIENT_TIME '=' timespec ';'
2963		{
2964	<	ConfigChannel.disable_local_channels = yylval.number;
2964	>	ConfigChannel.invite_client_time = $3;
2965		};
2966
2967	<	channel_use_except: USE_EXCEPT '=' TBOOL ';'
2967	>	channel_invite_delay_channel: INVITE_DELAY_CHANNEL '=' timespec ';'
2968		{
2969	<	ConfigChannel.use_except = yylval.number;
2969	>	ConfigChannel.invite_delay_channel = $3;
2970		};
2971
2972	<	channel_use_invex: USE_INVEX '=' TBOOL ';'
2972	>	channel_knock_client_count: KNOCK_CLIENT_COUNT '=' NUMBER ';'
2973		{
2974	<	ConfigChannel.use_invex = yylval.number;
2974	>	ConfigChannel.knock_client_count = $3;
2975		};
2976
2977	<	channel_use_knock: USE_KNOCK '=' TBOOL ';'
2977	>	channel_knock_client_time: KNOCK_CLIENT_TIME '=' timespec ';'
2978		{
2979	<	ConfigChannel.use_knock = yylval.number;
3876	<	};
3877	<
3878	<	channel_knock_delay: KNOCK_DELAY '=' timespec ';'
3879	<	{
3880	<	ConfigChannel.knock_delay = $3;
2979	>	ConfigChannel.knock_client_time = $3;
2980		};
2981
2982		channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
#	Line 3885 | 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 ';'
2987	>	channel_max_channels: MAX_CHANNELS '=' NUMBER ';'
2988		{
2989	<	ConfigChannel.max_chans_per_user = $3;
3891	<	};
3892	<
3893	<	channel_quiet_on_ban: QUIET_ON_BAN '=' TBOOL ';'
3894	<	{
3895	<	ConfigChannel.quiet_on_ban = yylval.number;
2989	>	ConfigChannel.max_channels = $3;
2990		};
2991
2992		channel_max_bans: MAX_BANS '=' NUMBER ';'
#	Line 3900 | 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
3913	–	channel_no_create_on_split: NO_CREATE_ON_SPLIT '=' TBOOL ';'
3914	–	{
3915	–	ConfigChannel.no_create_on_split = yylval.number;
3916	–	};
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	>	xfree(ConfigServerHide.flatten_links_file);
3052	>	ConfigServerHide.flatten_links_file = xstrdup(yylval.string);
3053	>	}
3054		};
3055
3056	<	/***************************************************************************
3939	<	*  section serverhide
3940	<	***************************************************************************/
3941	<	serverhide_entry: SERVERHIDE
3942	<	'{' serverhide_items '}' ';';
3943	<
3944	<	serverhide_items:   serverhide_items serverhide_item | serverhide_item;
3945	<	serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
3946	<	serverhide_links_delay |
3947	<	serverhide_disable_hidden |
3948	<	serverhide_hidden | serverhide_hidden_name |
3949	<	serverhide_hide_server_ips |
3950	<	error;
3951	<
3952	<	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 3961 | 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	<	{
3968	<	MyFree(ConfigServerHide.hidden_name);
3969	<	DupString(ConfigServerHide.hidden_name, yylval.string);
3970	<	}
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	<	{
3979	<	eventAddIsh("write_links_file", write_links_file, NULL, $3);
3980	<	ConfigServerHide.links_disabled = 0;
3981	<	}
3982	<
3983	<	ConfigServerHide.links_delay = $3;
3078	>	xfree(ConfigServerHide.hidden_name);
3079	>	ConfigServerHide.hidden_name = xstrdup(yylval.string);
3080		}
3081		};
3082
#	Line 3990 | Line 3086 | serverhide_hidden: HIDDEN '=' TBOOL ';'
3086		ConfigServerHide.hidden = yylval.number;
3087		};
3088
3993	–	serverhide_disable_hidden: DISABLE_HIDDEN '=' TBOOL ';'
3994	–	{
3995	–	if (conf_parser_ctx.pass == 2)
3996	–	ConfigServerHide.disable_hidden = yylval.number;
3997	–	};
3998	–
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)