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/conf_parser.y (file contents), Revision 1352 by michael, Fri Apr 13 09:57:08 2012 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 5004 by michael, Tue Dec 9 14:17:18 2014 UTC

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

Diff Legend

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