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