ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/ircd_parser.y (file contents), Revision 1306 by michael, Sat Mar 24 07:43:04 2012 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 4565 by michael, Sun Aug 24 10:27:40 2014 UTC

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

Diff Legend

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