ViewVC Help

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

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

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

Diff Legend

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