ViewVC Help

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

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

Comparing:
ircd-hybrid/src/ircd_parser.y (file contents), Revision 1028 by michael, Sun Nov 8 13:03:38 2009 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 4967 by michael, Mon Dec 1 14:34:29 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 "irc_getaddrinfo.h"
41	–	#include "sprintf_irc.h"
45		#include "memory.h"
46		#include "modules.h"
47	<	#include "s_serv.h"
47	>	#include "server.h"
48		#include "hostmask.h"
49		#include "send.h"
50		#include "listener.h"
51		#include "resv.h"
52		#include "numeric.h"
53	<	#include "s_user.h"
53	>	#include "user.h"
54	>	#include "motd.h"
55
56		#ifdef HAVE_LIBCRYPTO
57		#include <openssl/rsa.h>
58		#include <openssl/bio.h>
59		#include <openssl/pem.h>
60	+	#include <openssl/dh.h>
61		#endif
62
63	<	static char *class_name = NULL;
59	<	static struct ConfItem *yy_conf = NULL;
60	<	static struct AccessItem *yy_aconf = NULL;
61	<	static struct MatchItem *yy_match_item = NULL;
62	<	static struct ClassItem *yy_class = NULL;
63	<	static char *yy_class_name = NULL;
64	<
65	<	static dlink_list col_conf_list  = { NULL, NULL, 0 };
66	<	static dlink_list hub_conf_list  = { NULL, NULL, 0 };
67	<	static dlink_list leaf_conf_list = { NULL, NULL, 0 };
68	<	static unsigned int listener_flags = 0;
69	<	static unsigned int regex_ban = 0;
70	<	static char userbuf[IRCD_BUFSIZE];
71	<	static char hostbuf[IRCD_BUFSIZE];
72	<	static char reasonbuf[REASONLEN + 1];
73	<	static char gecos_name[REALLEN * 4];
74	<
75	<	static char *resv_reason = NULL;
76	<	static char *listener_address = NULL;
77	<	static int not_atom = 0;
78	<
79	<	struct CollectItem
80	<	{
81	<	dlink_node node;
82	<	char *name;
83	<	char *user;
84	<	char *host;
85	<	char *passwd;
86	<	int  port;
87	<	int  flags;
88	<	#ifdef HAVE_LIBCRYPTO
89	<	char *rsa_public_key_file;
90	<	RSA *rsa_public_key;
91	<	#endif
92	<	};
63	>	#include "rsa.h"
64
65	<	static void
66	<	free_collect_item(struct CollectItem *item)
65	>	int yylex(void);
66	>
67	>	static struct
68		{
69	<	MyFree(item->name);
70	<	MyFree(item->user);
71	<	MyFree(item->host);
72	<	MyFree(item->passwd);
73	<	#ifdef HAVE_LIBCRYPTO
74	<	MyFree(item->rsa_public_key_file);
75	<	#endif
76	<	MyFree(item);
77	<	}
69	>	struct
70	>	{
71	>	dlink_list list;
72	>	} mask,
73	>	leaf,
74	>	hub;
75	>
76	>	struct
77	>	{
78	>	char buf[IRCD_BUFSIZE];
79	>	} name,
80	>	nick,
81	>	user,
82	>	host,
83	>	addr,
84	>	bind,
85	>	file,
86	>	ciph,
87	>	cert,
88	>	rpass,
89	>	spass,
90	>	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;
125	<	dlink_node *next_ptr;
126	<	struct CollectItem *yy_hconf;
127	<	struct CollectItem *yy_lconf;
124	>	dlink_node *node = NULL, *node_next = NULL;
125	>
126	>	DLINK_FOREACH_SAFE(node, node_next, block_state.mask.list.head)
127	>	{
128	>	MyFree(node->data);
129	>	dlinkDelete(node, &block_state.mask.list);
130	>	free_dlink_node(node);
131	>	}
132
133	<	DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
133	>	DLINK_FOREACH_SAFE(node, node_next, block_state.leaf.list.head)
134		{
135	<	yy_hconf = ptr->data;
136	<	dlinkDelete(&yy_hconf->node, &hub_conf_list);
137	<	free_collect_item(yy_hconf);
135	>	MyFree(node->data);
136	>	dlinkDelete(node, &block_state.leaf.list);
137	>	free_dlink_node(node);
138		}
139
140	<	DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
140	>	DLINK_FOREACH_SAFE(node, node_next, block_state.hub.list.head)
141		{
142	<	yy_lconf = ptr->data;
143	<	dlinkDelete(&yy_lconf->node, &leaf_conf_list);
144	<	free_collect_item(yy_lconf);
142	>	MyFree(node->data);
143	>	dlinkDelete(node, &block_state.hub.list);
144	>	free_dlink_node(node);
145		}
146	+
147	+	memset(&block_state, 0, sizeof(block_state));
148		}
149
150		%}
#	Line 135 | Line 155 | unhook_hub_leaf_confs(void)
155		}
156
157		%token  ACCEPT_PASSWORD
138	–	%token  ACTION
158		%token  ADMIN
159		%token  AFTYPE
141	–	%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
148	<	%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
151	–	%token  CAN_IDLE
168		%token  CHANNEL
169	<	%token  CIDR_BITLEN_IPV4
170	<	%token  CIDR_BITLEN_IPV6
155	<	%token  CIPHER_PREFERENCE
169	>	%token  CIDR_BITLEN_IPV4
170	>	%token  CIDR_BITLEN_IPV6
171		%token  CLASS
157	–	%token  COMPRESSED
158	–	%token  COMPRESSION_LEVEL
172		%token  CONNECT
173		%token  CONNECTFREQ
174	<	%token  CRYPTLINK
162	<	%token  DEFAULT_CIPHER_PREFERENCE
174	>	%token  CYCLE_ON_HOST_CHANGE
175		%token  DEFAULT_FLOODCOUNT
176		%token  DEFAULT_SPLIT_SERVER_COUNT
177		%token  DEFAULT_SPLIT_USER_COUNT
#	Line 168 | Line 180 | unhook_hub_leaf_confs(void)
180		%token  DIE
181		%token  DISABLE_AUTH
182		%token  DISABLE_FAKE_CHANNELS
171	–	%token  DISABLE_HIDDEN
172	–	%token  DISABLE_LOCAL_CHANNELS
183		%token  DISABLE_REMOTE_COMMANDS
174	–	%token  DOT_IN_IP6_ADDR
184		%token  DOTS_IN_IDENT
176	–	%token  DURATION
185		%token  EGDPOOL_PATH
186		%token  EMAIL
179	–	%token  ENABLE
187		%token  ENCRYPTED
188		%token  EXCEED_LIMIT
189		%token  EXEMPT
190		%token  FAILED_OPER_NOTICE
184	–	%token  FAKENAME
185	–	%token  IRCD_FLAGS
191		%token  FLATTEN_LINKS
187	–	%token  FFAILED_OPERLOG
188	–	%token  FKILLLOG
189	–	%token  FKLINELOG
190	–	%token  FGLINELOG
191	–	%token  FIOERRLOG
192	–	%token  FOPERLOG
193	–	%token  FOPERSPYLOG
194	–	%token  FUSERLOG
192		%token  GECOS
193		%token  GENERAL
194		%token  GLINE
195	<	%token  GLINES
195	>	%token  GLINE_DURATION
196	>	%token  GLINE_ENABLE
197		%token  GLINE_EXEMPT
200	–	%token  GLINE_LOG
201	–	%token  GLINE_TIME
198		%token  GLINE_MIN_CIDR
199		%token  GLINE_MIN_CIDR6
200	+	%token  GLINE_REQUEST_DURATION
201		%token  GLOBAL_KILL
205	–	%token  IRCD_AUTH
206	–	%token  NEED_IDENT
202		%token  HAVENT_READ_CONF
203		%token  HIDDEN
204	<	%token  HIDDEN_ADMIN
205	<	%token  HIDDEN_NAME
206	<	%token  HIDDEN_OPER
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
218	–	%token  IDLETIME
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
228	<	%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
234	<	%token  LOGGING
235	<	%token  LOG_LEVEL
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
257	–	%token  NICK_CHANGES
262		%token  NO_CREATE_ON_SPLIT
263		%token  NO_JOIN_ON_SPLIT
264		%token  NO_OPER_FLOOD
265		%token  NO_TILDE
262	–	%token  NOT
266		%token  NUMBER
264	–	%token  NUMBER_PER_IDENT
267		%token  NUMBER_PER_CIDR
268		%token  NUMBER_PER_IP
267	–	%token  NUMBER_PER_IP_GLOBAL
268	–	%token  OPERATOR
269	–	%token  OPERS_BYPASS_CALLERID
270	–	%token  OPER_LOG
269		%token  OPER_ONLY_UMODES
270		%token  OPER_PASS_RESV
273	–	%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
283	–	%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
290	–	%token  REGEX_T
286		%token  REHASH
292	–	%token  TREJECT_HOLD_TIME
287		%token  REMOTE
288		%token  REMOTEBAN
295	–	%token  RESTRICT_CHANNELS
296	–	%token  RESTRICTED
297	–	%token  RSA_PRIVATE_KEY_FILE
298	–	%token  RSA_PUBLIC_KEY_FILE
299	–	%token  SSL_CERTIFICATE_FILE
300	–	%token  T_SSL_CONNECTION_METHOD
301	–	%token  T_SSLV3
302	–	%token  T_TLSV1
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
310	–	%token  SERVLINK_PATH
311	–	%token  IRCD_SID
312	–	%token  TKLINE_EXPIRE_NOTICES
313	–	%token  T_SHARED
314	–	%token  T_CLUSTER
315	–	%token  TYPE
298		%token  SHORT_MOTD
317	–	%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
326	<	%token  TMASKED
327	<	%token  T_REJECT
328	<	%token  TS_MAX_DELTA
329	<	%token  TS_WARN_DELTA
330	<	%token  TWODOTS
313	>	%token  STATS_U_OPER_ONLY
314		%token  T_ALL
315		%token  T_BOTS
333	–	%token  T_SOFTCALLERID
316		%token  T_CALLERID
317		%token  T_CCONN
318	<	%token  T_CCONN_FULL
319	<	%token  T_CLIENT_FLOOD
318	>	%token  T_COMMAND
319	>	%token  T_CLUSTER
320		%token  T_DEAF
321		%token  T_DEBUG
322	<	%token  T_DRONE
322	>	%token  T_DLINE
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_LOGPATH
348	<	%token  T_L_CRIT
349	<	%token  T_L_DEBUG
350	<	%token  T_L_ERROR
351	<	%token  T_L_INFO
352	<	%token  T_L_NOTICE
353	<	%token  T_L_TRACE
354	<	%token  T_L_WARN
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
359		%token  T_WALLOP
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
376	–	%token  USER
373		%token  USE_EGD
378	–	%token  USE_EXCEPT
379	–	%token  USE_INVEX
380	–	%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
386	–	%token  WARN
387	–	%token  WARN_NO_NLINE
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
418	<	| 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	<	}
443	<	| NUMBER DAYS timespec_
444	<	{
445	<	$$ = $1 * 60 * 60 * 24 + $3;
446	<	}
447	<	| NUMBER WEEKS timespec_
448	<	{
449	<	$$ = $1 * 60 * 60 * 24 * 7 + $3;
450	<	}
451	<	;
452	<
453	<	sizespec_:      { $$ = 0; } | sizespec;
454	<	sizespec:       NUMBER sizespec_ { $$ = $1 + $2; }
455	<	| NUMBER BYTES sizespec_ { $$ = $1 + $3; }
456	<	| NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; }
457	<	| NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
458	<	;
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 469 | Line 447 | modules_item:   modules_module | modules
447
448		modules_module: MODULE '=' QSTRING ';'
449		{
472	–	#ifndef STATIC_MODULES /* NOOP in the static case */
450		if (conf_parser_ctx.pass == 2)
451		add_conf_module(libio_basename(yylval.string));
475	–	#endif
452		};
453
454		modules_path: PATH '=' QSTRING ';'
455		{
480	–	#ifndef STATIC_MODULES
456		if (conf_parser_ctx.pass == 2)
457		mod_add_path(yylval.string);
483	–	#endif
458		};
459
460
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 |
468	<	serverinfo_rsa_private_key_file | serverinfo_vhost6 |
469	<	serverinfo_sid | serverinfo_ssl_certificate_file |
470	<	serverinfo_ssl_connection_method |
471	<	error ';' ;
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
483
500	–	serverinfo_ssl_connection_method: T_SSL_CONNECTION_METHOD
501	–	{
502	–	#ifdef HAVE_LIBCRYPTO
503	–	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
504	–	ServerInfo.tls_version = 0;
505	–	#endif
506	–	} '=' method_types ';'
507	–	{
508	–	#ifdef HAVE_LIBCRYPTO
509	–	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
510	–	{
511	–	if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_SSLV3))
512	–	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
513	–	if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_TLSV1))
514	–	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
515	–	}
516	–	#endif
517	–	};
518	–
519	–	method_types: method_types ',' method_type_item | method_type_item;
520	–	method_type_item: T_SSLV3
521	–	{
522	–	#ifdef HAVE_LIBCRYPTO
523	–	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
524	–	ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_SSLV3;
525	–	#endif
526	–	} | T_TLSV1
527	–	{
528	–	#ifdef HAVE_LIBCRYPTO
529	–	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
530	–	ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_TLSV1;
531	–	#endif
532	–	};
533	–
484		serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
485		{
486		#ifdef HAVE_LIBCRYPTO
487	<	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
487	>	if (conf_parser_ctx.pass == 2)
488		{
489	<	if (!ServerInfo.rsa_private_key_file)
489	>	if (!ConfigServerInfo.rsa_private_key_file)
490		{
491	<	yyerror("No rsa_private_key_file specified, SSL disabled");
491	>	conf_error_report("No rsa_private_key_file specified, SSL disabled");
492		break;
493		}
494
495	<	if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
496	<	SSL_FILETYPE_PEM) <= 0)
495	>	if (SSL_CTX_use_certificate_chain_file(ConfigServerInfo.server_ctx, yylval.string) <= 0 ||
496	>	SSL_CTX_use_certificate_chain_file(ConfigServerInfo.client_ctx, yylval.string) <= 0)
497		{
498	<	yyerror(ERR_lib_error_string(ERR_get_error()));
498	>	report_crypto_errors();
499	>	conf_error_report("Could not open/read certificate file");
500		break;
501		}
502
503	<	if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
503	>	if (SSL_CTX_use_PrivateKey_file(ConfigServerInfo.server_ctx, ConfigServerInfo.rsa_private_key_file,
504	>	SSL_FILETYPE_PEM) <= 0 ||
505	>	SSL_CTX_use_PrivateKey_file(ConfigServerInfo.client_ctx, ConfigServerInfo.rsa_private_key_file,
506		SSL_FILETYPE_PEM) <= 0)
507		{
508	<	yyerror(ERR_lib_error_string(ERR_get_error()));
508	>	report_crypto_errors();
509	>	conf_error_report("Could not read RSA private key");
510		break;
511		}
512
513	<	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx))
513	>	if (!SSL_CTX_check_private_key(ConfigServerInfo.server_ctx) ||
514	>	!SSL_CTX_check_private_key(ConfigServerInfo.client_ctx))
515		{
516	<	yyerror(ERR_lib_error_string(ERR_get_error()));
516	>	report_crypto_errors();
517	>	conf_error_report("Could not read RSA private key");
518		break;
519		}
520		}
#	Line 568 | Line 524 | serverinfo_ssl_certificate_file: SSL_CER
524		serverinfo_rsa_private_key_file: RSA_PRIVATE_KEY_FILE '=' QSTRING ';'
525		{
526		#ifdef HAVE_LIBCRYPTO
527	<	if (conf_parser_ctx.pass == 1)
527	>	BIO *file = NULL;
528	>
529	>	if (conf_parser_ctx.pass != 1)
530	>	break;
531	>
532	>	if (ConfigServerInfo.rsa_private_key)
533		{
534	<	BIO *file;
534	>	RSA_free(ConfigServerInfo.rsa_private_key);
535	>	ConfigServerInfo.rsa_private_key = NULL;
536	>	}
537
538	<	if (ServerInfo.rsa_private_key)
539	<	{
540	<	RSA_free(ServerInfo.rsa_private_key);
541	<	ServerInfo.rsa_private_key = NULL;
542	<	}
538	>	if (ConfigServerInfo.rsa_private_key_file)
539	>	{
540	>	MyFree(ConfigServerInfo.rsa_private_key_file);
541	>	ConfigServerInfo.rsa_private_key_file = NULL;
542	>	}
543	>
544	>	ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
545	>
546	>	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
547	>	{
548	>	conf_error_report("File open failed, ignoring");
549	>	break;
550	>	}
551	>
552	>	ConfigServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
553
554	<	if (ServerInfo.rsa_private_key_file)
554	>	BIO_set_close(file, BIO_CLOSE);
555	>	BIO_free(file);
556	>
557	>	if (ConfigServerInfo.rsa_private_key == NULL)
558	>	{
559	>	conf_error_report("Couldn't extract key, ignoring");
560	>	break;
561	>	}
562	>
563	>	if (!RSA_check_key(ConfigServerInfo.rsa_private_key))
564	>	{
565	>	RSA_free(ConfigServerInfo.rsa_private_key);
566	>	ConfigServerInfo.rsa_private_key = NULL;
567	>
568	>	conf_error_report("Invalid key, ignoring");
569	>	break;
570	>	}
571	>
572	>	if (RSA_size(ConfigServerInfo.rsa_private_key) < 128)
573	>	{
574	>	RSA_free(ConfigServerInfo.rsa_private_key);
575	>	ConfigServerInfo.rsa_private_key = NULL;
576	>
577	>	conf_error_report("Ignoring serverinfo::rsa_private_key_file -- need at least a 1024 bit key size");
578	>	}
579	>	#endif
580	>	};
581	>
582	>	serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
583	>	{
584	>	#ifdef HAVE_LIBCRYPTO
585	>	if (conf_parser_ctx.pass == 2)
586	>	{
587	>	BIO *file = BIO_new_file(yylval.string, "r");
588	>
589	>	if (file)
590		{
591	<	MyFree(ServerInfo.rsa_private_key_file);
592	<	ServerInfo.rsa_private_key_file = NULL;
591	>	DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
592	>
593	>	BIO_free(file);
594	>
595	>	if (dh)
596	>	{
597	>	if (DH_size(dh) < 128)
598	>	conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
599	>	else
600	>	SSL_CTX_set_tmp_dh(ConfigServerInfo.server_ctx, dh);
601	>
602	>	DH_free(dh);
603	>	}
604		}
605	+	else
606	+	conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- could not open/read Diffie-Hellman parameter file");
607	+	}
608	+	#endif
609	+	};
610
611	<	DupString(ServerInfo.rsa_private_key_file, yylval.string);
611	>	serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
612	>	{
613	>	#ifdef HAVE_LIBCRYPTO
614	>	if (conf_parser_ctx.pass == 2)
615	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, yylval.string);
616	>	#endif
617	>	};
618
619	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
619	>	serverinfo_ssl_message_digest_algorithm: SSL_MESSAGE_DIGEST_ALGORITHM '=' QSTRING ';'
620	>	{
621	>	#ifdef HAVE_LIBCRYPTO
622	>	if (conf_parser_ctx.pass == 2)
623	>	{
624	>	if ((ConfigServerInfo.message_digest_algorithm = EVP_get_digestbyname(yylval.string)) == NULL)
625		{
626	<	yyerror("File open failed, ignoring");
627	<	break;
626	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
627	>	conf_error_report("Ignoring serverinfo::ssl_message_digest_algorithm -- unknown message digest algorithm");
628		}
629	+	}
630	+	#endif
631	+	}
632
633	<	ServerInfo.rsa_private_key = (RSA *)PEM_read_bio_RSAPrivateKey(file, NULL,
634	<	0, NULL);
635	<
636	<	BIO_set_close(file, BIO_CLOSE);
637	<	BIO_free(file);
633	>	serverinfo_ssl_dh_elliptic_curve: SSL_DH_ELLIPTIC_CURVE '=' QSTRING ';'
634	>	{
635	>	#ifdef HAVE_LIBCRYPTO
636	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
637	>	int nid = 0;
638	>	EC_KEY *key = NULL;
639
640	<	if (ServerInfo.rsa_private_key == NULL)
640	>	if (conf_parser_ctx.pass == 2)
641	>	{
642	>	if ((nid = OBJ_sn2nid(yylval.string)) == 0)
643		{
644	<	yyerror("Couldn't extract key, ignoring");
645	<	break;
644	>	conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- unknown curve name");
645	>	break;
646		}
647
648	<	if (!RSA_check_key(ServerInfo.rsa_private_key))
648	>	if ((key = EC_KEY_new_by_curve_name(nid)) == NULL)
649		{
650	<	RSA_free(ServerInfo.rsa_private_key);
610	<	ServerInfo.rsa_private_key = NULL;
611	<
612	<	yyerror("Invalid key, ignoring");
650	>	conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- could not create curve");
651		break;
652		}
653
654	<	/* require 2048 bit (256 byte) key */
655	<	if (RSA_size(ServerInfo.rsa_private_key) != 256)
656	<	{
657	<	RSA_free(ServerInfo.rsa_private_key);
620	<	ServerInfo.rsa_private_key = NULL;
621	<
622	<	yyerror("Not a 2048 bit key, ignoring");
623	<	}
624	<	}
654	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
655	>	EC_KEY_free(key);
656	>	}
657	>	#endif
658		#endif
659		};
660
661	<	serverinfo_name: NAME '=' QSTRING ';'
661	>	serverinfo_name: NAME '=' QSTRING ';'
662		{
663		/* this isn't rehashable */
664	<	if (conf_parser_ctx.pass == 2)
664	>	if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.name)
665		{
666	<	if (ServerInfo.name == NULL)
666	>	if (valid_servname(yylval.string))
667	>	ConfigServerInfo.name = xstrdup(yylval.string);
668	>	else
669		{
670	<	/* the ircd will exit() in main() if we dont set one */
671	<	if (strlen(yylval.string) <= HOSTLEN)
637	<	DupString(ServerInfo.name, yylval.string);
670	>	conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
671	>	exit(0);
672		}
673		}
674		};
675
676	<	serverinfo_sid: IRCD_SID '=' QSTRING ';'
676	>	serverinfo_sid: IRCD_SID '=' QSTRING ';'
677		{
678		/* this isn't rehashable */
679	<	if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
679	>	if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.sid)
680		{
681		if (valid_sid(yylval.string))
682	<	DupString(ServerInfo.sid, yylval.string);
682	>	ConfigServerInfo.sid = xstrdup(yylval.string);
683		else
684		{
685	<	ilog(L_ERROR, "Ignoring config file entry SID -- invalid SID. Aborting.");
685	>	conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
686		exit(0);
687		}
688		}
#	Line 658 | Line 692 | serverinfo_description: DESCRIPTION '='
692		{
693		if (conf_parser_ctx.pass == 2)
694		{
695	<	MyFree(ServerInfo.description);
696	<	DupString(ServerInfo.description,yylval.string);
695	>	MyFree(ConfigServerInfo.description);
696	>	ConfigServerInfo.description = xstrdup(yylval.string);
697	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
698		}
699		};
700
#	Line 669 | Line 704 | serverinfo_network_name: NETWORK_NAME '=
704		{
705		char *p;
706
707	<	if ((p = strchr(yylval.string, ' ')) != NULL)
708	<	p = '\0';
707	>	if ((p = strchr(yylval.string, ' ')))
708	>	*p = '\0';
709
710	<	MyFree(ServerInfo.network_name);
711	<	DupString(ServerInfo.network_name, yylval.string);
710	>	MyFree(ConfigServerInfo.network_name);
711	>	ConfigServerInfo.network_name = xstrdup(yylval.string);
712		}
713		};
714
715		serverinfo_network_desc: NETWORK_DESC '=' QSTRING ';'
716		{
717	<	if (conf_parser_ctx.pass == 2)
718	<	{
719	<	MyFree(ServerInfo.network_desc);
720	<	DupString(ServerInfo.network_desc, yylval.string);
721	<	}
717	>	if (conf_parser_ctx.pass != 2)
718	>	break;
719	>
720	>	MyFree(ConfigServerInfo.network_desc);
721	>	ConfigServerInfo.network_desc = xstrdup(yylval.string);
722		};
723
724		serverinfo_vhost: VHOST '=' QSTRING ';'
#	Line 698 | Line 733 | serverinfo_vhost: VHOST '=' QSTRING ';'
733		hints.ai_socktype = SOCK_STREAM;
734		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
735
736	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
737	<	ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
736	>	if (getaddrinfo(yylval.string, NULL, &hints, &res))
737	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
738		else
739		{
740	<	assert(res != NULL);
740	>	assert(res);
741
742	<	memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
743	<	ServerInfo.ip.ss.ss_family = res->ai_family;
744	<	ServerInfo.ip.ss_len = res->ai_addrlen;
745	<	irc_freeaddrinfo(res);
742	>	memcpy(&ConfigServerInfo.ip, res->ai_addr, res->ai_addrlen);
743	>	ConfigServerInfo.ip.ss.ss_family = res->ai_family;
744	>	ConfigServerInfo.ip.ss_len = res->ai_addrlen;
745	>	freeaddrinfo(res);
746
747	<	ServerInfo.specific_ipv4_vhost = 1;
747	>	ConfigServerInfo.specific_ipv4_vhost = 1;
748		}
749		}
750		};
751
752		serverinfo_vhost6: VHOST6 '=' QSTRING ';'
753		{
719	–	#ifdef IPV6
754		if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
755		{
756		struct addrinfo hints, *res;
#	Line 727 | Line 761 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
761		hints.ai_socktype = SOCK_STREAM;
762		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
763
764	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
765	<	ilog(L_ERROR, "Invalid netmask for server vhost6(%s)", yylval.string);
764	>	if (getaddrinfo(yylval.string, NULL, &hints, &res))
765	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
766		else
767		{
768	<	assert(res != NULL);
768	>	assert(res);
769
770	<	memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
771	<	ServerInfo.ip6.ss.ss_family = res->ai_family;
772	<	ServerInfo.ip6.ss_len = res->ai_addrlen;
773	<	irc_freeaddrinfo(res);
770	>	memcpy(&ConfigServerInfo.ip6, res->ai_addr, res->ai_addrlen);
771	>	ConfigServerInfo.ip6.ss.ss_family = res->ai_family;
772	>	ConfigServerInfo.ip6.ss_len = res->ai_addrlen;
773	>	freeaddrinfo(res);
774
775	<	ServerInfo.specific_ipv6_vhost = 1;
775	>	ConfigServerInfo.specific_ipv6_vhost = 1;
776		}
777		}
744	–	#endif
778		};
779
780		serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
781		{
782	<	if (conf_parser_ctx.pass == 2)
782	>	if (conf_parser_ctx.pass != 2)
783	>	break;
784	>
785	>	if ($3 < MAXCLIENTS_MIN)
786		{
787	<	recalc_fdlimit(NULL);
787	>	char buf[IRCD_BUFSIZE] = "";
788
789	<	if ($3 < MAXCLIENTS_MIN)
790	<	{
791	<	char buf[IRCD_BUFSIZE];
792	<	ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
793	<	yyerror(buf);
794	<	}
795	<	else if ($3 > MAXCLIENTS_MAX)
796	<	{
797	<	char buf[IRCD_BUFSIZE];
798	<	ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
799	<	yyerror(buf);
764	<	}
765	<	else
766	<	ServerInfo.max_clients = $3;
789	>	snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
790	>	conf_error_report(buf);
791	>	ConfigServerInfo.max_clients = MAXCLIENTS_MIN;
792	>	}
793	>	else if ($3 > MAXCLIENTS_MAX)
794	>	{
795	>	char buf[IRCD_BUFSIZE] = "";
796	>
797	>	snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
798	>	conf_error_report(buf);
799	>	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
800		}
801	+	else
802	+	ConfigServerInfo.max_clients = $3;
803		};
804
805	<	serverinfo_hub: HUB '=' TBOOL ';'
805	>	serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
806		{
807	<	if (conf_parser_ctx.pass == 2)
807	>	if (conf_parser_ctx.pass != 2)
808	>	break;
809	>
810	>	if ($3 < 9)
811		{
812	<	if (yylval.number)
813	<	{
814	<	ServerInfo.hub = 1;
815	<	delete_capability("HUB");
816	<	add_capability("HUB", CAP_HUB, 1);
817	<	}
780	<	else if (ServerInfo.hub)
781	<	{
812	>	conf_error_report("max_nick_length too low, setting to 9");
813	>	ConfigServerInfo.max_nick_length = 9;
814	>	}
815	>	else if ($3 > NICKLEN)
816	>	{
817	>	char buf[IRCD_BUFSIZE] = "";
818
819	<	ServerInfo.hub = 0;
820	<	delete_capability("HUB");
821	<	}
819	>	snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
820	>	conf_error_report(buf);
821	>	ConfigServerInfo.max_nick_length = NICKLEN;
822		}
823	+	else
824	+	ConfigServerInfo.max_nick_length = $3;
825	+	};
826	+
827	+	serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
828	+	{
829	+	if (conf_parser_ctx.pass != 2)
830	+	break;
831	+
832	+	if ($3 < 80)
833	+	{
834	+	conf_error_report("max_topic_length too low, setting to 80");
835	+	ConfigServerInfo.max_topic_length = 80;
836	+	}
837	+	else if ($3 > TOPICLEN)
838	+	{
839	+	char buf[IRCD_BUFSIZE] = "";
840	+
841	+	snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
842	+	conf_error_report(buf);
843	+	ConfigServerInfo.max_topic_length = TOPICLEN;
844	+	}
845	+	else
846	+	ConfigServerInfo.max_topic_length = $3;
847	+	};
848	+
849	+	serverinfo_hub: HUB '=' TBOOL ';'
850	+	{
851	+	if (conf_parser_ctx.pass == 2)
852	+	ConfigServerInfo.hub = yylval.number;
853		};
854
855		/***************************************************************************
#	Line 792 | Line 858 | serverinfo_hub: HUB '=' TBOOL ';'
858		admin_entry: ADMIN  '{' admin_items '}' ';' ;
859
860		admin_items: admin_items admin_item | admin_item;
861	<	admin_item:  admin_name | admin_description |
862	<	admin_email | error ';' ;
861	>	admin_item:  admin_name |
862	>	admin_description |
863	>	admin_email |
864	>	error ';' ;
865
866	<	admin_name: NAME '=' QSTRING ';'
866	>	admin_name: NAME '=' QSTRING ';'
867		{
868	<	if (conf_parser_ctx.pass == 2)
869	<	{
870	<	MyFree(AdminInfo.name);
871	<	DupString(AdminInfo.name, yylval.string);
872	<	}
868	>	if (conf_parser_ctx.pass != 2)
869	>	break;
870	>
871	>	MyFree(ConfigAdminInfo.name);
872	>	ConfigAdminInfo.name = xstrdup(yylval.string);
873		};
874
875		admin_email: EMAIL '=' QSTRING ';'
876		{
877	<	if (conf_parser_ctx.pass == 2)
878	<	{
879	<	MyFree(AdminInfo.email);
880	<	DupString(AdminInfo.email, yylval.string);
881	<	}
877	>	if (conf_parser_ctx.pass != 2)
878	>	break;
879	>
880	>	MyFree(ConfigAdminInfo.email);
881	>	ConfigAdminInfo.email = xstrdup(yylval.string);
882		};
883
884		admin_description: DESCRIPTION '=' QSTRING ';'
885		{
886	<	if (conf_parser_ctx.pass == 2)
887	<	{
888	<	MyFree(AdminInfo.description);
889	<	DupString(AdminInfo.description, yylval.string);
890	<	}
886	>	if (conf_parser_ctx.pass != 2)
887	>	break;
888	>
889	>	MyFree(ConfigAdminInfo.description);
890	>	ConfigAdminInfo.description = xstrdup(yylval.string);
891		};
892
893		/***************************************************************************
894	<	*  section logging
894	>	* motd section
895		***************************************************************************/
896	<	/* XXX */
897	<	logging_entry:          LOGGING  '{' logging_items '}' ';' ;
896	>	motd_entry: MOTD
897	>	{
898	>	if (conf_parser_ctx.pass == 2)
899	>	reset_block_state();
900	>	} '{' motd_items '}' ';'
901	>	{
902	>	dlink_node *node = NULL;
903
904	<	logging_items:          logging_items logging_item |
905	<	logging_item ;
904	>	if (conf_parser_ctx.pass != 2)
905	>	break;
906
907	<	logging_item:           logging_path | logging_oper_log |
908	<	logging_log_level |
836	<	logging_use_logging | logging_fuserlog |
837	<	logging_foperlog | logging_fglinelog |
838	<	logging_fklinelog | logging_killlog |
839	<	logging_foperspylog | logging_ioerrlog |
840	<	logging_ffailed_operlog |
841	<	error ';' ;
907	>	if (!block_state.file.buf[0])
908	>	break;
909
910	<	logging_path:           T_LOGPATH '=' QSTRING ';'
911	<	{
912	<	};
910	>	DLINK_FOREACH(node, block_state.mask.list.head)
911	>	motd_add(node->data, block_state.file.buf);
912	>	};
913
914	<	logging_oper_log:       OPER_LOG '=' QSTRING ';'
915	<	{
849	<	};
914	>	motd_items: motd_items motd_item | motd_item;
915	>	motd_item:  motd_mask | motd_file | error ';' ;
916
917	<	logging_fuserlog: FUSERLOG '=' QSTRING ';'
917	>	motd_mask: MASK '=' QSTRING ';'
918		{
919		if (conf_parser_ctx.pass == 2)
920	<	strlcpy(ConfigLoggingEntry.userlog, yylval.string,
855	<	sizeof(ConfigLoggingEntry.userlog));
920	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
921		};
922
923	<	logging_ffailed_operlog: FFAILED_OPERLOG '=' QSTRING ';'
923	>	motd_file: T_FILE '=' QSTRING ';'
924		{
925		if (conf_parser_ctx.pass == 2)
926	<	strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
862	<	sizeof(ConfigLoggingEntry.failed_operlog));
926	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
927		};
928
929	<	logging_foperlog: FOPERLOG '=' QSTRING ';'
929	>	/***************************************************************************
930	>	* pseudo section
931	>	***************************************************************************/
932	>	pseudo_entry: T_PSEUDO
933		{
934		if (conf_parser_ctx.pass == 2)
935	<	strlcpy(ConfigLoggingEntry.operlog, yylval.string,
936	<	sizeof(ConfigLoggingEntry.operlog));
935	>	reset_block_state();
936	>	} '{' pseudo_items '}' ';'
937	>	{
938	>	if (conf_parser_ctx.pass != 2)
939	>	break;
940	>
941	>	if (!block_state.command.buf[0] ||
942	>	!block_state.name.buf[0] ||
943	>	!block_state.nick.buf[0] ||
944	>	!block_state.host.buf[0])
945	>	break;
946	>
947	>	pseudo_register(block_state.name.buf, block_state.nick.buf, block_state.host.buf,
948	>	block_state.prepend.buf, block_state.command.buf);
949		};
950
951	<	logging_foperspylog: FOPERSPYLOG '=' QSTRING ';'
951	>	pseudo_items: pseudo_items pseudo_item | pseudo_item;
952	>	pseudo_item:  pseudo_command | pseudo_prepend | pseudo_name | pseudo_target | error ';' ;
953	>
954	>	pseudo_command: T_COMMAND '=' QSTRING ';'
955		{
956		if (conf_parser_ctx.pass == 2)
957	<	strlcpy(ConfigLoggingEntry.operspylog, yylval.string,
876	<	sizeof(ConfigLoggingEntry.operspylog));
957	>	strlcpy(block_state.command.buf, yylval.string, sizeof(block_state.command.buf));
958		};
959
960	<	logging_fglinelog: FGLINELOG '=' QSTRING ';'
960	>	pseudo_name: NAME '=' QSTRING ';'
961		{
962		if (conf_parser_ctx.pass == 2)
963	<	strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
883	<	sizeof(ConfigLoggingEntry.glinelog));
963	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
964		};
965
966	<	logging_fklinelog: FKLINELOG '=' QSTRING ';'
966	>	pseudo_prepend: T_PREPEND '=' QSTRING ';'
967		{
968		if (conf_parser_ctx.pass == 2)
969	<	strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
890	<	sizeof(ConfigLoggingEntry.klinelog));
969	>	strlcpy(block_state.prepend.buf, yylval.string, sizeof(block_state.prepend.buf));
970		};
971
972	<	logging_ioerrlog: FIOERRLOG '=' QSTRING ';'
972	>	pseudo_target: T_TARGET '=' QSTRING ';'
973		{
974		if (conf_parser_ctx.pass == 2)
975	<	strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
976	<	sizeof(ConfigLoggingEntry.ioerrlog));
975	>	{
976	>	struct split_nuh_item nuh;
977	>
978	>	nuh.nuhmask  = yylval.string;
979	>	nuh.nickptr  = NULL;
980	>	nuh.userptr  = block_state.user.buf;
981	>	nuh.hostptr  = block_state.host.buf;
982	>	nuh.nicksize = 0;
983	>	nuh.usersize = sizeof(block_state.nick.buf);
984	>	nuh.hostsize = sizeof(block_state.host.buf);
985	>	split_nuh(&nuh);
986	>
987	>	strlcpy(block_state.nick.buf, nuh.userptr, sizeof(block_state.nick.buf));
988	>	strlcpy(block_state.host.buf, nuh.hostptr, sizeof(block_state.host.buf));
989	>	}
990		};
991
992	<	logging_killlog: FKILLLOG '=' QSTRING ';'
992	>	/***************************************************************************
993	>	*  section logging
994	>	***************************************************************************/
995	>	logging_entry:          T_LOG  '{' logging_items '}' ';' ;
996	>	logging_items:          logging_items logging_item | logging_item ;
997	>
998	>	logging_item:           logging_use_logging | logging_file_entry |
999	>	error ';' ;
1000	>
1001	>	logging_use_logging: USE_LOGGING '=' TBOOL ';'
1002		{
1003		if (conf_parser_ctx.pass == 2)
1004	<	strlcpy(ConfigLoggingEntry.killlog, yylval.string,
904	<	sizeof(ConfigLoggingEntry.killlog));
1004	>	ConfigLog.use_logging = yylval.number;
1005		};
1006
1007	<	logging_log_level: LOG_LEVEL '=' T_L_CRIT ';'
1008	<	{
1007	>	logging_file_entry:
1008	>	{
1009		if (conf_parser_ctx.pass == 2)
1010	<	set_log_level(L_CRIT);
1011	<	} | LOG_LEVEL '=' T_L_ERROR ';'
1010	>	reset_block_state();
1011	>	} T_FILE  '{' logging_file_items '}' ';'
1012	>	{
1013	>	if (conf_parser_ctx.pass != 2)
1014	>	break;
1015	>
1016	>	if (block_state.type.value && block_state.file.buf[0])
1017	>	log_set_file(block_state.type.value, block_state.size.value,
1018	>	block_state.file.buf);
1019	>	};
1020	>
1021	>	logging_file_items: logging_file_items logging_file_item |
1022	>	logging_file_item ;
1023	>
1024	>	logging_file_item:  logging_file_name | logging_file_type |
1025	>	logging_file_size | error ';' ;
1026	>
1027	>	logging_file_name: NAME '=' QSTRING ';'
1028	>	{
1029	>	if (conf_parser_ctx.pass != 2)
1030	>	break;
1031	>
1032	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
1033	>	}
1034	>
1035	>	logging_file_size: T_SIZE '=' sizespec ';'
1036	>	{
1037	>	block_state.size.value = $3;
1038	>	} | T_SIZE '=' T_UNLIMITED ';'
1039	>	{
1040	>	block_state.size.value = 0;
1041	>	};
1042	>
1043	>	logging_file_type: TYPE
1044		{
1045		if (conf_parser_ctx.pass == 2)
1046	<	set_log_level(L_ERROR);
1047	<	} | LOG_LEVEL '=' T_L_WARN ';'
1046	>	block_state.type.value = 0;
1047	>	} '='  logging_file_type_items ';' ;
1048	>
1049	>	logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
1050	>	logging_file_type_item:  USER
1051		{
1052		if (conf_parser_ctx.pass == 2)
1053	<	set_log_level(L_WARN);
1054	<	} | LOG_LEVEL '=' T_L_NOTICE ';'
1053	>	block_state.type.value = LOG_TYPE_USER;
1054	>	} | OPERATOR
1055		{
1056		if (conf_parser_ctx.pass == 2)
1057	<	set_log_level(L_NOTICE);
1058	<	} | LOG_LEVEL '=' T_L_TRACE ';'
1057	>	block_state.type.value = LOG_TYPE_OPER;
1058	>	} | GLINE
1059		{
1060		if (conf_parser_ctx.pass == 2)
1061	<	set_log_level(L_TRACE);
1062	<	} | LOG_LEVEL '=' T_L_INFO ';'
1061	>	block_state.type.value = LOG_TYPE_GLINE;
1062	>	} | XLINE
1063		{
1064		if (conf_parser_ctx.pass == 2)
1065	<	set_log_level(L_INFO);
1066	<	} | LOG_LEVEL '=' T_L_DEBUG ';'
1065	>	block_state.type.value = LOG_TYPE_XLINE;
1066	>	} | RESV
1067		{
1068		if (conf_parser_ctx.pass == 2)
1069	<	set_log_level(L_DEBUG);
1070	<	};
1071	<
1072	<	logging_use_logging: USE_LOGGING '=' TBOOL ';'
1069	>	block_state.type.value = LOG_TYPE_RESV;
1070	>	} | T_DLINE
1071	>	{
1072	>	if (conf_parser_ctx.pass == 2)
1073	>	block_state.type.value = LOG_TYPE_DLINE;
1074	>	} | KLINE
1075	>	{
1076	>	if (conf_parser_ctx.pass == 2)
1077	>	block_state.type.value = LOG_TYPE_KLINE;
1078	>	} | KILL
1079	>	{
1080	>	if (conf_parser_ctx.pass == 2)
1081	>	block_state.type.value = LOG_TYPE_KILL;
1082	>	} | T_DEBUG
1083		{
1084		if (conf_parser_ctx.pass == 2)
1085	<	ConfigLoggingEntry.use_logging = yylval.number;
1085	>	block_state.type.value = LOG_TYPE_DEBUG;
1086		};
1087
1088	+
1089		/***************************************************************************
1090		* section oper
1091		***************************************************************************/
1092	<	oper_entry: OPERATOR
1092	>	oper_entry: OPERATOR
1093		{
1094	<	if (conf_parser_ctx.pass == 2)
1095	<	{
1096	<	yy_conf = make_conf_item(OPER_TYPE);
1097	<	yy_aconf = map_to_conf(yy_conf);
1098	<	SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
1099	<	}
954	<	else
955	<	{
956	<	MyFree(class_name);
957	<	class_name = NULL;
958	<	}
959	<	} oper_name_b '{' oper_items '}' ';'
1094	>	if (conf_parser_ctx.pass != 2)
1095	>	break;
1096	>
1097	>	reset_block_state();
1098	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1099	>	} '{' oper_items '}' ';'
1100		{
1101	<	if (conf_parser_ctx.pass == 2)
1101	>	dlink_node *node = NULL;
1102	>
1103	>	if (conf_parser_ctx.pass != 2)
1104	>	break;
1105	>
1106	>	if (!block_state.name.buf[0])
1107	>	break;
1108	>	#ifdef HAVE_LIBCRYPTO
1109	>	if (!block_state.file.buf[0] &&
1110	>	!block_state.rpass.buf[0])
1111	>	break;
1112	>	#else
1113	>	if (!block_state.rpass.buf[0])
1114	>	break;
1115	>	#endif
1116	>
1117	>	DLINK_FOREACH(node, block_state.mask.list.head)
1118		{
1119	<	struct CollectItem *yy_tmp;
1120	<	dlink_node *ptr;
965	<	dlink_node *next_ptr;
1119	>	struct MaskItem *conf = NULL;
1120	>	struct split_nuh_item nuh;
1121
1122	<	conf_add_class_to_conf(yy_conf, class_name);
1122	>	nuh.nuhmask  = node->data;
1123	>	nuh.nickptr  = NULL;
1124	>	nuh.userptr  = block_state.user.buf;
1125	>	nuh.hostptr  = block_state.host.buf;
1126	>	nuh.nicksize = 0;
1127	>	nuh.usersize = sizeof(block_state.user.buf);
1128	>	nuh.hostsize = sizeof(block_state.host.buf);
1129	>	split_nuh(&nuh);
1130
1131	<	/* Now, make sure there is a copy of the "base" given oper
1132	<	* block in each of the collected copies
1133	<	*/
1131	>	conf         = conf_make(CONF_OPER);
1132	>	conf->name   = xstrdup(block_state.name.buf);
1133	>	conf->user   = xstrdup(block_state.user.buf);
1134	>	conf->host   = xstrdup(block_state.host.buf);
1135	>
1136	>	if (block_state.cert.buf[0])
1137	>	conf->certfp = xstrdup(block_state.cert.buf);
1138	>
1139	>	if (block_state.rpass.buf[0])
1140	>	conf->passwd = xstrdup(block_state.rpass.buf);
1141	>
1142	>	conf->flags = block_state.flags.value;
1143	>	conf->modes = block_state.modes.value;
1144	>	conf->port  = block_state.port.value;
1145	>	conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
1146
1147	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
974	<	{
975	<	struct AccessItem *new_aconf;
976	<	struct ConfItem *new_conf;
977	<	yy_tmp = ptr->data;
978	<
979	<	new_conf = make_conf_item(OPER_TYPE);
980	<	new_aconf = (struct AccessItem *)map_to_conf(new_conf);
981	<
982	<	new_aconf->flags = yy_aconf->flags;
983	<
984	<	if (yy_conf->name != NULL)
985	<	DupString(new_conf->name, yy_conf->name);
986	<	if (yy_tmp->user != NULL)
987	<	DupString(new_aconf->user, yy_tmp->user);
988	<	else
989	<	DupString(new_aconf->user, "*");
990	<	if (yy_tmp->host != NULL)
991	<	DupString(new_aconf->host, yy_tmp->host);
992	<	else
993	<	DupString(new_aconf->host, "*");
994	<	conf_add_class_to_conf(new_conf, class_name);
995	<	if (yy_aconf->passwd != NULL)
996	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1147	>	conf_add_class_to_conf(conf, block_state.class.buf);
1148
998	–	new_aconf->port = yy_aconf->port;
1149		#ifdef HAVE_LIBCRYPTO
1150	<	if (yy_aconf->rsa_public_key_file != NULL)
1151	<	{
1152	<	BIO *file;
1153	<
1004	<	DupString(new_aconf->rsa_public_key_file,
1005	<	yy_aconf->rsa_public_key_file);
1150	>	if (block_state.file.buf[0])
1151	>	{
1152	>	BIO *file = NULL;
1153	>	RSA *pkey = NULL;
1154
1155	<	file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
1156	<	new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
1157	<	NULL, 0, NULL);
1158	<	BIO_set_close(file, BIO_CLOSE);
1011	<	BIO_free(file);
1155	>	if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
1156	>	{
1157	>	ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- file doesn't exist");
1158	>	break;
1159		}
1013	–	#endif
1160
1161	<	#ifdef HAVE_LIBCRYPTO
1162	<	if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
1163	<	&& yy_tmp->host)
1018	<	#else
1019	<	if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
1020	<	#endif
1161	>	if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
1162	>	ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key invalid; check key syntax");
1163	>	else
1164		{
1165	<	conf_add_class_to_conf(new_conf, class_name);
1166	<	if (yy_tmp->name != NULL)
1167	<	DupString(new_conf->name, yy_tmp->name);
1165	>	if (RSA_size(pkey) > 128)
1166	>	ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key size must be 1024 or below");
1167	>	else
1168	>	conf->rsa_public_key = pkey;
1169		}
1170
1171	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1172	<	free_collect_item(yy_tmp);
1171	>	BIO_set_close(file, BIO_CLOSE);
1172	>	BIO_free(file);
1173		}
1174	<
1031	<	yy_conf = NULL;
1032	<	yy_aconf = NULL;
1033	<
1034	<
1035	<	MyFree(class_name);
1036	<	class_name = NULL;
1174	>	#endif /* HAVE_LIBCRYPTO */
1175		}
1176	<	};
1176	>	};
1177
1040	–	oper_name_b: | oper_name_t;
1178		oper_items:     oper_items oper_item | oper_item;
1179	<	oper_item:      oper_name | oper_user | oper_password | oper_hidden_admin |
1180	<	oper_hidden_oper | oper_umodes |
1181	<	oper_class | oper_global_kill | oper_remote |
1182	<	oper_kline | oper_xline | oper_unkline |
1183	<	oper_gline | oper_nick_changes | oper_remoteban |
1184	<	oper_die | oper_rehash | oper_admin | oper_operwall |
1185	<	oper_encrypted | oper_rsa_public_key_file |
1186	<	oper_flags | error ';' ;
1179	>	oper_item:      oper_name |
1180	>	oper_user |
1181	>	oper_password |
1182	>	oper_umodes |
1183	>	oper_class |
1184	>	oper_encrypted |
1185	>	oper_rsa_public_key_file |
1186	>	oper_ssl_certificate_fingerprint |
1187	>	oper_ssl_connection_required |
1188	>	oper_flags |
1189	>	error ';' ;
1190
1191		oper_name: NAME '=' QSTRING ';'
1192		{
1193		if (conf_parser_ctx.pass == 2)
1194	<	{
1055	<	if (strlen(yylval.string) > OPERNICKLEN)
1056	<	yylval.string[OPERNICKLEN] = '\0';
1057	<
1058	<	MyFree(yy_conf->name);
1059	<	DupString(yy_conf->name, yylval.string);
1060	<	}
1061	<	};
1062	<
1063	<	oper_name_t: QSTRING
1064	<	{
1065	<	if (conf_parser_ctx.pass == 2)
1066	<	{
1067	<	if (strlen(yylval.string) > OPERNICKLEN)
1068	<	yylval.string[OPERNICKLEN] = '\0';
1069	<
1070	<	MyFree(yy_conf->name);
1071	<	DupString(yy_conf->name, yylval.string);
1072	<	}
1194	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1195		};
1196
1197		oper_user: USER '=' QSTRING ';'
1198		{
1199		if (conf_parser_ctx.pass == 2)
1200	<	{
1079	<	struct split_nuh_item nuh;
1080	<
1081	<	nuh.nuhmask  = yylval.string;
1082	<	nuh.nickptr  = NULL;
1083	<	nuh.userptr  = userbuf;
1084	<	nuh.hostptr  = hostbuf;
1085	<
1086	<	nuh.nicksize = 0;
1087	<	nuh.usersize = sizeof(userbuf);
1088	<	nuh.hostsize = sizeof(hostbuf);
1089	<
1090	<	split_nuh(&nuh);
1091	<
1092	<	if (yy_aconf->user == NULL)
1093	<	{
1094	<	DupString(yy_aconf->user, userbuf);
1095	<	DupString(yy_aconf->host, hostbuf);
1096	<	}
1097	<	else
1098	<	{
1099	<	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
1100	<
1101	<	DupString(yy_tmp->user, userbuf);
1102	<	DupString(yy_tmp->host, hostbuf);
1103	<
1104	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1105	<	}
1106	<	}
1200	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1201		};
1202
1203		oper_password: PASSWORD '=' QSTRING ';'
1204		{
1205		if (conf_parser_ctx.pass == 2)
1206	<	{
1113	<	if (yy_aconf->passwd != NULL)
1114	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1115	<
1116	<	MyFree(yy_aconf->passwd);
1117	<	DupString(yy_aconf->passwd, yylval.string);
1118	<	}
1206	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1207		};
1208
1209		oper_encrypted: ENCRYPTED '=' TBOOL ';'
1210		{
1211	<	if (conf_parser_ctx.pass == 2)
1212	<	{
1213	<	if (yylval.number)
1214	<	SetConfEncrypted(yy_aconf);
1215	<	else
1216	<	ClearConfEncrypted(yy_aconf);
1217	<	}
1211	>	if (conf_parser_ctx.pass != 2)
1212	>	break;
1213	>
1214	>	if (yylval.number)
1215	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1216	>	else
1217	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1218		};
1219
1220		oper_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
1221		{
1134	–	#ifdef HAVE_LIBCRYPTO
1222		if (conf_parser_ctx.pass == 2)
1223	<	{
1224	<	BIO *file;
1138	<
1139	<	if (yy_aconf->rsa_public_key != NULL)
1140	<	{
1141	<	RSA_free(yy_aconf->rsa_public_key);
1142	<	yy_aconf->rsa_public_key = NULL;
1143	<	}
1144	<
1145	<	if (yy_aconf->rsa_public_key_file != NULL)
1146	<	{
1147	<	MyFree(yy_aconf->rsa_public_key_file);
1148	<	yy_aconf->rsa_public_key_file = NULL;
1149	<	}
1150	<
1151	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
1152	<	file = BIO_new_file(yylval.string, "r");
1153	<
1154	<	if (file == NULL)
1155	<	{
1156	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
1157	<	break;
1158	<	}
1223	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
1224	>	};
1225
1226	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
1226	>	oper_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
1227	>	{
1228	>	if (conf_parser_ctx.pass == 2)
1229	>	strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
1230	>	};
1231
1232	<	if (yy_aconf->rsa_public_key == NULL)
1233	<	{
1234	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1235	<	break;
1166	<	}
1232	>	oper_ssl_connection_required: SSL_CONNECTION_REQUIRED '=' TBOOL ';'
1233	>	{
1234	>	if (conf_parser_ctx.pass != 2)
1235	>	break;
1236
1237	<	BIO_set_close(file, BIO_CLOSE);
1238	<	BIO_free(file);
1239	<	}
1240	<	#endif /* HAVE_LIBCRYPTO */
1237	>	if (yylval.number)
1238	>	block_state.flags.value |= CONF_FLAGS_SSL;
1239	>	else
1240	>	block_state.flags.value &= ~CONF_FLAGS_SSL;
1241		};
1242
1243		oper_class: CLASS '=' QSTRING ';'
1244		{
1245		if (conf_parser_ctx.pass == 2)
1246	<	{
1178	<	MyFree(class_name);
1179	<	DupString(class_name, yylval.string);
1180	<	}
1246	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1247		};
1248
1249		oper_umodes: T_UMODES
1250		{
1251		if (conf_parser_ctx.pass == 2)
1252	<	yy_aconf->modes = 0;
1252	>	block_state.modes.value = 0;
1253		} '='  oper_umodes_items ';' ;
1254
1255		oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1256		oper_umodes_item:  T_BOTS
1257		{
1258		if (conf_parser_ctx.pass == 2)
1259	<	yy_aconf->modes |= UMODE_BOTS;
1259	>	block_state.modes.value |= UMODE_BOTS;
1260		} | T_CCONN
1261		{
1262		if (conf_parser_ctx.pass == 2)
1263	<	yy_aconf->modes |= UMODE_CCONN;
1198	<	} | T_CCONN_FULL
1199	<	{
1200	<	if (conf_parser_ctx.pass == 2)
1201	<	yy_aconf->modes |= UMODE_CCONN_FULL;
1263	>	block_state.modes.value |= UMODE_CCONN;
1264		} | T_DEAF
1265		{
1266		if (conf_parser_ctx.pass == 2)
1267	<	yy_aconf->modes |= UMODE_DEAF;
1267	>	block_state.modes.value |= UMODE_DEAF;
1268		} | T_DEBUG
1269		{
1270		if (conf_parser_ctx.pass == 2)
1271	<	yy_aconf->modes |= UMODE_DEBUG;
1271	>	block_state.modes.value |= UMODE_DEBUG;
1272		} | T_FULL
1273		{
1274		if (conf_parser_ctx.pass == 2)
1275	<	yy_aconf->modes |= UMODE_FULL;
1275	>	block_state.modes.value |= UMODE_FULL;
1276	>	} | HIDDEN
1277	>	{
1278	>	if (conf_parser_ctx.pass == 2)
1279	>	block_state.modes.value |= UMODE_HIDDEN;
1280	>	} | HIDE_CHANS
1281	>	{
1282	>	if (conf_parser_ctx.pass == 2)
1283	>	block_state.modes.value |= UMODE_HIDECHANS;
1284	>	} | HIDE_IDLE
1285	>	{
1286	>	if (conf_parser_ctx.pass == 2)
1287	>	block_state.modes.value |= UMODE_HIDEIDLE;
1288		} | T_SKILL
1289		{
1290		if (conf_parser_ctx.pass == 2)
1291	<	yy_aconf->modes |= UMODE_SKILL;
1291	>	block_state.modes.value |= UMODE_SKILL;
1292		} | T_NCHANGE
1293		{
1294		if (conf_parser_ctx.pass == 2)
1295	<	yy_aconf->modes |= UMODE_NCHANGE;
1295	>	block_state.modes.value |= UMODE_NCHANGE;
1296		} | T_REJ
1297		{
1298		if (conf_parser_ctx.pass == 2)
1299	<	yy_aconf->modes |= UMODE_REJ;
1299	>	block_state.modes.value |= UMODE_REJ;
1300		} | T_UNAUTH
1301		{
1302		if (conf_parser_ctx.pass == 2)
1303	<	yy_aconf->modes |= UMODE_UNAUTH;
1303	>	block_state.modes.value |= UMODE_UNAUTH;
1304		} | T_SPY
1305		{
1306		if (conf_parser_ctx.pass == 2)
1307	<	yy_aconf->modes |= UMODE_SPY;
1307	>	block_state.modes.value |= UMODE_SPY;
1308		} | T_EXTERNAL
1309		{
1310		if (conf_parser_ctx.pass == 2)
1311	<	yy_aconf->modes |= UMODE_EXTERNAL;
1238	<	} | T_OPERWALL
1239	<	{
1240	<	if (conf_parser_ctx.pass == 2)
1241	<	yy_aconf->modes |= UMODE_OPERWALL;
1311	>	block_state.modes.value |= UMODE_EXTERNAL;
1312		} | T_SERVNOTICE
1313		{
1314		if (conf_parser_ctx.pass == 2)
1315	<	yy_aconf->modes |= UMODE_SERVNOTICE;
1315	>	block_state.modes.value |= UMODE_SERVNOTICE;
1316		} | T_INVISIBLE
1317		{
1318		if (conf_parser_ctx.pass == 2)
1319	<	yy_aconf->modes |= UMODE_INVISIBLE;
1319	>	block_state.modes.value |= UMODE_INVISIBLE;
1320		} | T_WALLOP
1321		{
1322		if (conf_parser_ctx.pass == 2)
1323	<	yy_aconf->modes |= UMODE_WALLOP;
1323	>	block_state.modes.value |= UMODE_WALLOP;
1324		} | T_SOFTCALLERID
1325		{
1326		if (conf_parser_ctx.pass == 2)
1327	<	yy_aconf->modes |= UMODE_SOFTCALLERID;
1327	>	block_state.modes.value |= UMODE_SOFTCALLERID;
1328		} | T_CALLERID
1329		{
1330		if (conf_parser_ctx.pass == 2)
1331	<	yy_aconf->modes |= UMODE_CALLERID;
1331	>	block_state.modes.value |= UMODE_CALLERID;
1332		} | T_LOCOPS
1333		{
1334		if (conf_parser_ctx.pass == 2)
1335	<	yy_aconf->modes |= UMODE_LOCOPS;
1336	<	};
1267	<
1268	<	oper_global_kill: GLOBAL_KILL '=' TBOOL ';'
1335	>	block_state.modes.value |= UMODE_LOCOPS;
1336	>	} | T_NONONREG
1337		{
1338		if (conf_parser_ctx.pass == 2)
1339	<	{
1340	<	if (yylval.number)
1273	<	yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1274	<	else
1275	<	yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1276	<	}
1277	<	};
1278	<
1279	<	oper_remote: REMOTE '=' TBOOL ';'
1339	>	block_state.modes.value |= UMODE_REGONLY;
1340	>	} | T_FARCONNECT
1341		{
1342		if (conf_parser_ctx.pass == 2)
1343	<	{
1283	<	if (yylval.number)
1284	<	yy_aconf->port |= OPER_FLAG_REMOTE;
1285	<	else
1286	<	yy_aconf->port &= ~OPER_FLAG_REMOTE;
1287	<	}
1343	>	block_state.modes.value |= UMODE_FARCONNECT;
1344		};
1345
1346	<	oper_remoteban: REMOTEBAN '=' TBOOL ';'
1291	<	{
1292	<	if (conf_parser_ctx.pass == 2)
1293	<	{
1294	<	if (yylval.number)
1295	<	yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1296	<	else
1297	<	yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1298	<	}
1299	<	};
1300	<
1301	<	oper_kline: KLINE '=' TBOOL ';'
1302	<	{
1303	<	if (conf_parser_ctx.pass == 2)
1304	<	{
1305	<	if (yylval.number)
1306	<	yy_aconf->port |= OPER_FLAG_K;
1307	<	else
1308	<	yy_aconf->port &= ~OPER_FLAG_K;
1309	<	}
1310	<	};
1311	<
1312	<	oper_xline: XLINE '=' TBOOL ';'
1313	<	{
1314	<	if (conf_parser_ctx.pass == 2)
1315	<	{
1316	<	if (yylval.number)
1317	<	yy_aconf->port |= OPER_FLAG_X;
1318	<	else
1319	<	yy_aconf->port &= ~OPER_FLAG_X;
1320	<	}
1321	<	};
1322	<
1323	<	oper_unkline: UNKLINE '=' TBOOL ';'
1324	<	{
1325	<	if (conf_parser_ctx.pass == 2)
1326	<	{
1327	<	if (yylval.number)
1328	<	yy_aconf->port |= OPER_FLAG_UNKLINE;
1329	<	else
1330	<	yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1331	<	}
1332	<	};
1333	<
1334	<	oper_gline: GLINE '=' TBOOL ';'
1346	>	oper_flags: IRCD_FLAGS
1347		{
1348		if (conf_parser_ctx.pass == 2)
1349	<	{
1350	<	if (yylval.number)
1339	<	yy_aconf->port |= OPER_FLAG_GLINE;
1340	<	else
1341	<	yy_aconf->port &= ~OPER_FLAG_GLINE;
1342	<	}
1343	<	};
1349	>	block_state.port.value = 0;
1350	>	} '='  oper_flags_items ';';
1351
1352	<	oper_nick_changes: NICK_CHANGES '=' TBOOL ';'
1352	>	oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1353	>	oper_flags_item: KILL ':' REMOTE
1354		{
1355		if (conf_parser_ctx.pass == 2)
1356	<	{
1357	<	if (yylval.number)
1350	<	yy_aconf->port |= OPER_FLAG_N;
1351	<	else
1352	<	yy_aconf->port &= ~OPER_FLAG_N;
1353	<	}
1354	<	};
1355	<
1356	<	oper_die: DIE '=' TBOOL ';'
1356	>	block_state.port.value |= OPER_FLAG_KILL_REMOTE;
1357	>	} | KILL
1358		{
1359		if (conf_parser_ctx.pass == 2)
1360	<	{
1361	<	if (yylval.number)
1361	<	yy_aconf->port |= OPER_FLAG_DIE;
1362	<	else
1363	<	yy_aconf->port &= ~OPER_FLAG_DIE;
1364	<	}
1365	<	};
1366	<
1367	<	oper_rehash: REHASH '=' TBOOL ';'
1360	>	block_state.port.value |= OPER_FLAG_KILL;
1361	>	} | CONNECT ':' REMOTE
1362		{
1363		if (conf_parser_ctx.pass == 2)
1364	<	{
1365	<	if (yylval.number)
1372	<	yy_aconf->port |= OPER_FLAG_REHASH;
1373	<	else
1374	<	yy_aconf->port &= ~OPER_FLAG_REHASH;
1375	<	}
1376	<	};
1377	<
1378	<	oper_admin: ADMIN '=' TBOOL ';'
1364	>	block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
1365	>	} | CONNECT
1366		{
1367		if (conf_parser_ctx.pass == 2)
1368	<	{
1369	<	if (yylval.number)
1383	<	yy_aconf->port |= OPER_FLAG_ADMIN;
1384	<	else
1385	<	yy_aconf->port &= ~OPER_FLAG_ADMIN;
1386	<	}
1387	<	};
1388	<
1389	<	oper_hidden_admin: HIDDEN_ADMIN '=' TBOOL ';'
1368	>	block_state.port.value |= OPER_FLAG_CONNECT;
1369	>	} | SQUIT ':' REMOTE
1370		{
1371		if (conf_parser_ctx.pass == 2)
1372	<	{
1373	<	if (yylval.number)
1394	<	yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1395	<	else
1396	<	yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1397	<	}
1398	<	};
1399	<
1400	<	oper_hidden_oper: HIDDEN_OPER '=' TBOOL ';'
1372	>	block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
1373	>	} | SQUIT
1374		{
1375		if (conf_parser_ctx.pass == 2)
1376	<	{
1377	<	if (yylval.number)
1405	<	yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1406	<	else
1407	<	yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1408	<	}
1409	<	};
1410	<
1411	<	oper_operwall: T_OPERWALL '=' TBOOL ';'
1376	>	block_state.port.value |= OPER_FLAG_SQUIT;
1377	>	} | KLINE
1378		{
1379		if (conf_parser_ctx.pass == 2)
1380	<	{
1381	<	if (yylval.number)
1416	<	yy_aconf->port |= OPER_FLAG_OPERWALL;
1417	<	else
1418	<	yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1419	<	}
1420	<	};
1421	<
1422	<	oper_flags: IRCD_FLAGS
1423	<	{
1424	<	} '='  oper_flags_items ';';
1425	<
1426	<	oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1427	<	oper_flags_item: NOT { not_atom = 1; } oper_flags_item_atom
1428	<	| { not_atom = 0; } oper_flags_item_atom;
1429	<
1430	<	oper_flags_item_atom: GLOBAL_KILL
1380	>	block_state.port.value |= OPER_FLAG_KLINE;
1381	>	} | UNKLINE
1382		{
1383		if (conf_parser_ctx.pass == 2)
1384	<	{
1385	<	if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1435	<	else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1436	<	}
1437	<	} | REMOTE
1384	>	block_state.port.value |= OPER_FLAG_UNKLINE;
1385	>	} | T_DLINE
1386		{
1387		if (conf_parser_ctx.pass == 2)
1388	<	{
1389	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
1442	<	else yy_aconf->port |= OPER_FLAG_REMOTE;
1443	<	}
1444	<	} | KLINE
1388	>	block_state.port.value |= OPER_FLAG_DLINE;
1389	>	} | T_UNDLINE
1390		{
1391		if (conf_parser_ctx.pass == 2)
1392	<	{
1393	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
1449	<	else yy_aconf->port |= OPER_FLAG_K;
1450	<	}
1451	<	} | UNKLINE
1392	>	block_state.port.value |= OPER_FLAG_UNDLINE;
1393	>	} | XLINE
1394		{
1395		if (conf_parser_ctx.pass == 2)
1396	<	{
1397	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1456	<	else yy_aconf->port |= OPER_FLAG_UNKLINE;
1457	<	}
1458	<	} | XLINE
1396	>	block_state.port.value |= OPER_FLAG_XLINE;
1397	>	} | T_UNXLINE
1398		{
1399		if (conf_parser_ctx.pass == 2)
1400	<	{
1462	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
1463	<	else yy_aconf->port |= OPER_FLAG_X;
1464	<	}
1400	>	block_state.port.value |= OPER_FLAG_UNXLINE;
1401		} | GLINE
1402		{
1403		if (conf_parser_ctx.pass == 2)
1404	<	{
1469	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
1470	<	else yy_aconf->port |= OPER_FLAG_GLINE;
1471	<	}
1404	>	block_state.port.value |= OPER_FLAG_GLINE;
1405		} | DIE
1406		{
1407		if (conf_parser_ctx.pass == 2)
1408	<	{
1409	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
1410	<	else yy_aconf->port |= OPER_FLAG_DIE;
1411	<	}
1408	>	block_state.port.value |= OPER_FLAG_DIE;
1409	>	} | T_RESTART
1410	>	{
1411	>	if (conf_parser_ctx.pass == 2)
1412	>	block_state.port.value |= OPER_FLAG_RESTART;
1413		} | REHASH
1414		{
1415		if (conf_parser_ctx.pass == 2)
1416	<	{
1483	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
1484	<	else yy_aconf->port |= OPER_FLAG_REHASH;
1485	<	}
1416	>	block_state.port.value |= OPER_FLAG_REHASH;
1417		} | ADMIN
1418		{
1419		if (conf_parser_ctx.pass == 2)
1420	<	{
1421	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_ADMIN;
1491	<	else yy_aconf->port |= OPER_FLAG_ADMIN;
1492	<	}
1493	<	} | HIDDEN_ADMIN
1420	>	block_state.port.value |= OPER_FLAG_ADMIN;
1421	>	} | T_GLOBOPS
1422		{
1423		if (conf_parser_ctx.pass == 2)
1424	<	{
1425	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1498	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1499	<	}
1500	<	} | NICK_CHANGES
1424	>	block_state.port.value |= OPER_FLAG_GLOBOPS;
1425	>	} | T_WALLOPS
1426		{
1427		if (conf_parser_ctx.pass == 2)
1428	<	{
1429	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
1505	<	else yy_aconf->port |= OPER_FLAG_N;
1506	<	}
1507	<	} | T_OPERWALL
1428	>	block_state.port.value |= OPER_FLAG_WALLOPS;
1429	>	} | T_LOCOPS
1430		{
1431		if (conf_parser_ctx.pass == 2)
1432	<	{
1433	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1512	<	else yy_aconf->port |= OPER_FLAG_OPERWALL;
1513	<	}
1514	<	} | OPER_SPY_T
1432	>	block_state.port.value |= OPER_FLAG_LOCOPS;
1433	>	} | REMOTEBAN
1434		{
1435		if (conf_parser_ctx.pass == 2)
1436	<	{
1437	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
1519	<	else yy_aconf->port |= OPER_FLAG_OPER_SPY;
1520	<	}
1521	<	} | HIDDEN_OPER
1436	>	block_state.port.value |= OPER_FLAG_REMOTEBAN;
1437	>	} | T_SET
1438		{
1439		if (conf_parser_ctx.pass == 2)
1440	<	{
1441	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1526	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1527	<	}
1528	<	} | REMOTEBAN
1529	<	{
1530	<	if (conf_parser_ctx.pass == 2)
1531	<	{
1532	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1533	<	else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1534	<	}
1535	<	} | ENCRYPTED
1440	>	block_state.port.value |= OPER_FLAG_SET;
1441	>	} | MODULE
1442		{
1443		if (conf_parser_ctx.pass == 2)
1444	<	{
1539	<	if (not_atom) ClearConfEncrypted(yy_aconf);
1540	<	else SetConfEncrypted(yy_aconf);
1541	<	}
1444	>	block_state.port.value |= OPER_FLAG_MODULE;
1445		};
1446
1447
#	Line 1547 | Line 1450 | oper_flags_item_atom: GLOBAL_KILL
1450		***************************************************************************/
1451		class_entry: CLASS
1452		{
1453	<	if (conf_parser_ctx.pass == 1)
1454	<	{
1552	<	yy_conf = make_conf_item(CLASS_TYPE);
1553	<	yy_class = map_to_conf(yy_conf);
1554	<	}
1555	<	} class_name_b '{' class_items '}' ';'
1556	<	{
1557	<	if (conf_parser_ctx.pass == 1)
1558	<	{
1559	<	struct ConfItem *cconf = NULL;
1560	<	struct ClassItem *class = NULL;
1561	<
1562	<	if (yy_class_name == NULL)
1563	<	delete_conf_item(yy_conf);
1564	<	else
1565	<	{
1566	<	cconf = find_exact_name_conf(CLASS_TYPE, yy_class_name, NULL, NULL);
1567	<
1568	<	if (cconf != NULL)                /* The class existed already */
1569	<	{
1570	<	int user_count = 0;
1571	<
1572	<	rebuild_cidr_class(cconf, yy_class);
1453	>	if (conf_parser_ctx.pass != 1)
1454	>	break;
1455
1456	<	class = map_to_conf(cconf);
1456	>	reset_block_state();
1457
1458	<	user_count = class->curr_user_count;
1459	<	memcpy(class, yy_class, sizeof(*class));
1460	<	class->curr_user_count = user_count;
1461	<	class->active = 1;
1462	<
1463	<	delete_conf_item(yy_conf);
1464	<
1465	<	MyFree(cconf->name);            /* Allows case change of class name */
1466	<	cconf->name = yy_class_name;
1467	<	}
1468	<	else      /* Brand new class */
1469	<	{
1470	<	MyFree(yy_conf->name);          /* just in case it was allocated */
1471	<	yy_conf->name = yy_class_name;
1472	<	yy_class->active = 1;
1473	<	}
1474	<	}
1475	<
1476	<	yy_class_name = NULL;
1477	<	}
1458	>	block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1459	>	block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1460	>	block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1461	>	block_state.max_sendq.value = DEFAULT_SENDQ;
1462	>	block_state.max_recvq.value = DEFAULT_RECVQ;
1463	>	} '{' class_items '}' ';'
1464	>	{
1465	>	struct ClassItem *class = NULL;
1466	>
1467	>	if (conf_parser_ctx.pass != 1)
1468	>	break;
1469	>
1470	>	if (!block_state.class.buf[0])
1471	>	break;
1472	>
1473	>	if (!(class = class_find(block_state.class.buf, 0)))
1474	>	class = class_make();
1475	>
1476	>	class->active = 1;
1477	>	MyFree(class->name);
1478	>	class->name = xstrdup(block_state.class.buf);
1479	>	class->ping_freq = block_state.ping_freq.value;
1480	>	class->max_perip = block_state.max_perip.value;
1481	>	class->con_freq = block_state.con_freq.value;
1482	>	class->max_total = block_state.max_total.value;
1483	>	class->max_global = block_state.max_global.value;
1484	>	class->max_local = block_state.max_local.value;
1485	>	class->max_ident = block_state.max_ident.value;
1486	>	class->max_sendq = block_state.max_sendq.value;
1487	>	class->max_recvq = block_state.max_recvq.value;
1488	>	class->max_channels = block_state.max_channels.value;
1489	>
1490	>	if (block_state.min_idle.value > block_state.max_idle.value)
1491	>	{
1492	>	block_state.min_idle.value = 0;
1493	>	block_state.max_idle.value = 0;
1494	>	block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
1495	>	}
1496	>
1497	>	class->flags = block_state.flags.value;
1498	>	class->min_idle = block_state.min_idle.value;
1499	>	class->max_idle = block_state.max_idle.value;
1500	>
1501	>	if (class->number_per_cidr && block_state.number_per_cidr.value)
1502	>	if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
1503	>	(class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.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	>	rebuild_cidr_list(class);
1507	>
1508	>	class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1509	>	class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1510	>	class->number_per_cidr = block_state.number_per_cidr.value;
1511		};
1512
1598	–	class_name_b: | class_name_t;
1599	–
1513		class_items:    class_items class_item | class_item;
1514		class_item:     class_name |
1515	<	class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1515	>	class_cidr_bitlen_ipv4 |
1516	>	class_cidr_bitlen_ipv6 |
1517		class_ping_time |
1518	<	class_ping_warning |
1605	<	class_number_per_cidr |
1518	>	class_number_per_cidr |
1519		class_number_per_ip |
1520		class_connectfreq |
1521	+	class_max_channels |
1522		class_max_number |
1523	<	class_max_global |
1524	<	class_max_local |
1525	<	class_max_ident |
1526	<	class_sendq |
1527	<	error ';' ;
1523	>	class_max_global |
1524	>	class_max_local |
1525	>	class_max_ident |
1526	>	class_sendq | class_recvq |
1527	>	class_min_idle |
1528	>	class_max_idle |
1529	>	class_flags |
1530	>	error ';' ;
1531
1532	<	class_name: NAME '=' QSTRING ';'
1532	>	class_name: NAME '=' QSTRING ';'
1533		{
1534		if (conf_parser_ctx.pass == 1)
1535	<	{
1619	<	MyFree(yy_class_name);
1620	<	DupString(yy_class_name, yylval.string);
1621	<	}
1622	<	};
1623	<
1624	<	class_name_t: QSTRING
1625	<	{
1626	<	if (conf_parser_ctx.pass == 1)
1627	<	{
1628	<	MyFree(yy_class_name);
1629	<	DupString(yy_class_name, yylval.string);
1630	<	}
1535	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1536		};
1537
1538		class_ping_time: PING_TIME '=' timespec ';'
1539		{
1540		if (conf_parser_ctx.pass == 1)
1541	<	PingFreq(yy_class) = $3;
1541	>	block_state.ping_freq.value = $3;
1542		};
1543
1544	<	class_ping_warning: PING_WARNING '=' timespec ';'
1544	>	class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1545		{
1546		if (conf_parser_ctx.pass == 1)
1547	<	PingWarning(yy_class) = $3;
1547	>	block_state.max_perip.value = $3;
1548		};
1549
1550	<	class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1550	>	class_connectfreq: CONNECTFREQ '=' timespec ';'
1551		{
1552		if (conf_parser_ctx.pass == 1)
1553	<	MaxPerIp(yy_class) = $3;
1553	>	block_state.con_freq.value = $3;
1554		};
1555
1556	<	class_connectfreq: CONNECTFREQ '=' timespec ';'
1556	>	class_max_channels: MAX_CHANNELS '=' NUMBER ';'
1557		{
1558		if (conf_parser_ctx.pass == 1)
1559	<	ConFreq(yy_class) = $3;
1559	>	block_state.max_channels.value = $3;
1560		};
1561
1562		class_max_number: MAX_NUMBER '=' NUMBER ';'
1563		{
1564		if (conf_parser_ctx.pass == 1)
1565	<	MaxTotal(yy_class) = $3;
1565	>	block_state.max_total.value = $3;
1566		};
1567
1568		class_max_global: MAX_GLOBAL '=' NUMBER ';'
1569		{
1570		if (conf_parser_ctx.pass == 1)
1571	<	MaxGlobal(yy_class) = $3;
1571	>	block_state.max_global.value = $3;
1572		};
1573
1574		class_max_local: MAX_LOCAL '=' NUMBER ';'
1575		{
1576		if (conf_parser_ctx.pass == 1)
1577	<	MaxLocal(yy_class) = $3;
1577	>	block_state.max_local.value = $3;
1578		};
1579
1580		class_max_ident: MAX_IDENT '=' NUMBER ';'
1581		{
1582		if (conf_parser_ctx.pass == 1)
1583	<	MaxIdent(yy_class) = $3;
1583	>	block_state.max_ident.value = $3;
1584		};
1585
1586		class_sendq: SENDQ '=' sizespec ';'
1587		{
1588		if (conf_parser_ctx.pass == 1)
1589	<	MaxSendq(yy_class) = $3;
1589	>	block_state.max_sendq.value = $3;
1590	>	};
1591	>
1592	>	class_recvq: T_RECVQ '=' sizespec ';'
1593	>	{
1594	>	if (conf_parser_ctx.pass == 1)
1595	>	if ($3 >= CLIENT_FLOOD_MIN && $3 <= CLIENT_FLOOD_MAX)
1596	>	block_state.max_recvq.value = $3;
1597		};
1598
1599		class_cidr_bitlen_ipv4: CIDR_BITLEN_IPV4 '=' NUMBER ';'
1600		{
1601		if (conf_parser_ctx.pass == 1)
1602	<	CidrBitlenIPV4(yy_class) = $3;
1602	>	block_state.cidr_bitlen_ipv4.value = $3 > 32 ? 32 : $3;
1603		};
1604
1605		class_cidr_bitlen_ipv6: CIDR_BITLEN_IPV6 '=' NUMBER ';'
1606		{
1607		if (conf_parser_ctx.pass == 1)
1608	<	CidrBitlenIPV6(yy_class) = $3;
1608	>	block_state.cidr_bitlen_ipv6.value = $3 > 128 ? 128 : $3;
1609		};
1610
1611		class_number_per_cidr: NUMBER_PER_CIDR '=' NUMBER ';'
1612		{
1613		if (conf_parser_ctx.pass == 1)
1614	<	NumberPerCidr(yy_class) = $3;
1614	>	block_state.number_per_cidr.value = $3;
1615	>	};
1616	>
1617	>	class_min_idle: MIN_IDLE '=' timespec ';'
1618	>	{
1619	>	if (conf_parser_ctx.pass != 1)
1620	>	break;
1621	>
1622	>	block_state.min_idle.value = $3;
1623	>	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1624		};
1625
1626	+	class_max_idle: MAX_IDLE '=' timespec ';'
1627	+	{
1628	+	if (conf_parser_ctx.pass != 1)
1629	+	break;
1630	+
1631	+	block_state.max_idle.value = $3;
1632	+	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1633	+	};
1634	+
1635	+	class_flags: IRCD_FLAGS
1636	+	{
1637	+	if (conf_parser_ctx.pass == 1)
1638	+	block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1639	+	} '='  class_flags_items ';';
1640	+
1641	+	class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1642	+	class_flags_item: RANDOM_IDLE
1643	+	{
1644	+	if (conf_parser_ctx.pass == 1)
1645	+	block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
1646	+	} | HIDE_IDLE_FROM_OPERS
1647	+	{
1648	+	if (conf_parser_ctx.pass == 1)
1649	+	block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
1650	+	};
1651	+
1652	+
1653		/***************************************************************************
1654		*  section listen
1655		***************************************************************************/
1656		listen_entry: LISTEN
1657		{
1658		if (conf_parser_ctx.pass == 2)
1659	<	{
1660	<	listener_address = NULL;
1713	<	listener_flags = 0;
1714	<	}
1715	<	} '{' listen_items '}' ';'
1716	<	{
1717	<	if (conf_parser_ctx.pass == 2)
1718	<	{
1719	<	MyFree(listener_address);
1720	<	listener_address = NULL;
1721	<	}
1722	<	};
1659	>	reset_block_state();
1660	>	} '{' listen_items '}' ';';
1661
1662		listen_flags: IRCD_FLAGS
1663		{
1664	<	listener_flags = 0;
1664	>	block_state.flags.value = 0;
1665		} '='  listen_flags_items ';';
1666
1667		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1668		listen_flags_item: T_SSL
1669		{
1670		if (conf_parser_ctx.pass == 2)
1671	<	listener_flags |= LISTENER_SSL;
1671	>	block_state.flags.value |= LISTENER_SSL;
1672		} | HIDDEN
1673		{
1674		if (conf_parser_ctx.pass == 2)
1675	<	listener_flags |= LISTENER_HIDDEN;
1675	>	block_state.flags.value |= LISTENER_HIDDEN;
1676		} | T_SERVER
1677		{
1678		if (conf_parser_ctx.pass == 2)
1679	<	listener_flags |= LISTENER_SERVER;
1679	>	block_state.flags.value |= LISTENER_SERVER;
1680		};
1681
1744	–
1745	–
1682		listen_items:   listen_items listen_item | listen_item;
1683		listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';';
1684
1685	<	listen_port: PORT '=' port_items { listener_flags = 0; } ';';
1685	>	listen_port: PORT '=' port_items { block_state.flags.value = 0; } ';';
1686
1687		port_items: port_items ',' port_item | port_item;
1688
#	Line 1754 | Line 1690 | port_item: NUMBER
1690		{
1691		if (conf_parser_ctx.pass == 2)
1692		{
1693	<	if ((listener_flags & LISTENER_SSL))
1694	<	#ifdef HAVE_LIBCRYPTO
1695	<	if (!ServerInfo.server_ctx)
1693	>	#ifndef HAVE_LIBCRYPTO
1694	>	if (block_state.flags.value & LISTENER_SSL)
1695	>	{
1696	>	conf_error_report("SSL not available - port closed");
1697	>	break;
1698	>	}
1699		#endif
1700	<	{
1762	<	yyerror("SSL not available - port closed");
1763	<	break;
1764	<	}
1765	<	add_listener($1, listener_address, listener_flags);
1700	>	add_listener($1, block_state.addr.buf, block_state.flags.value);
1701		}
1702		} | NUMBER TWODOTS NUMBER
1703		{
1704		if (conf_parser_ctx.pass == 2)
1705		{
1706	<	int i;
1707	<
1708	<	if ((listener_flags & LISTENER_SSL))
1709	<	#ifdef HAVE_LIBCRYPTO
1710	<	if (!ServerInfo.server_ctx)
1706	>	#ifndef HAVE_LIBCRYPTO
1707	>	if (block_state.flags.value & LISTENER_SSL)
1708	>	{
1709	>	conf_error_report("SSL not available - port closed");
1710	>	break;
1711	>	}
1712		#endif
1777	–	{
1778	–	yyerror("SSL not available - port closed");
1779	–	break;
1780	–	}
1713
1714	<	for (i = $1; i <= $3; ++i)
1715	<	add_listener(i, listener_address, listener_flags);
1714	>	for (int i = $1; i <= $3; ++i)
1715	>	add_listener(i, block_state.addr.buf, block_state.flags.value);
1716		}
1717		};
1718
1719		listen_address: IP '=' QSTRING ';'
1720		{
1721		if (conf_parser_ctx.pass == 2)
1722	<	{
1791	<	MyFree(listener_address);
1792	<	DupString(listener_address, yylval.string);
1793	<	}
1722	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1723		};
1724
1725		listen_host: HOST '=' QSTRING ';'
1726		{
1727		if (conf_parser_ctx.pass == 2)
1728	<	{
1800	<	MyFree(listener_address);
1801	<	DupString(listener_address, yylval.string);
1802	<	}
1728	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1729		};
1730
1731		/***************************************************************************
#	Line 1808 | Line 1734 | listen_host: HOST '=' QSTRING ';'
1734		auth_entry: IRCD_AUTH
1735		{
1736		if (conf_parser_ctx.pass == 2)
1737	<	{
1812	<	yy_conf = make_conf_item(CLIENT_TYPE);
1813	<	yy_aconf = map_to_conf(yy_conf);
1814	<	}
1815	<	else
1816	<	{
1817	<	MyFree(class_name);
1818	<	class_name = NULL;
1819	<	}
1737	>	reset_block_state();
1738		} '{' auth_items '}' ';'
1739		{
1740	<	if (conf_parser_ctx.pass == 2)
1823	<	{
1824	<	struct CollectItem *yy_tmp = NULL;
1825	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1826	<
1827	<	if (yy_aconf->user && yy_aconf->host)
1828	<	{
1829	<	conf_add_class_to_conf(yy_conf, class_name);
1830	<	add_conf_by_address(CONF_CLIENT, yy_aconf);
1831	<	}
1832	<	else
1833	<	delete_conf_item(yy_conf);
1834	<
1835	<	/* copy over settings from first struct */
1836	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
1837	<	{
1838	<	struct AccessItem *new_aconf;
1839	<	struct ConfItem *new_conf;
1840	<
1841	<	new_conf = make_conf_item(CLIENT_TYPE);
1842	<	new_aconf = map_to_conf(new_conf);
1843	<
1844	<	yy_tmp = ptr->data;
1740	>	dlink_node *node = NULL;
1741
1742	<	assert(yy_tmp->user && yy_tmp->host);
1742	>	if (conf_parser_ctx.pass != 2)
1743	>	break;
1744
1745	<	if (yy_aconf->passwd != NULL)
1849	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1850	<	if (yy_conf->name != NULL)
1851	<	DupString(new_conf->name, yy_conf->name);
1852	<	if (yy_aconf->passwd != NULL)
1853	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1854	<
1855	<	new_aconf->flags = yy_aconf->flags;
1856	<	new_aconf->port  = yy_aconf->port;
1857	<
1858	<	DupString(new_aconf->user, yy_tmp->user);
1859	<	collapse(new_aconf->user);
1860	<
1861	<	DupString(new_aconf->host, yy_tmp->host);
1862	<	collapse(new_aconf->host);
1863	<
1864	<	conf_add_class_to_conf(new_conf, class_name);
1865	<	add_conf_by_address(CONF_CLIENT, new_aconf);
1866	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1867	<	free_collect_item(yy_tmp);
1868	<	}
1869	<
1870	<	MyFree(class_name);
1871	<	class_name = NULL;
1872	<	yy_conf = NULL;
1873	<	yy_aconf = NULL;
1874	<	}
1875	<	};
1876	<
1877	<	auth_items:     auth_items auth_item | auth_item;
1878	<	auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1879	<	auth_kline_exempt | auth_need_ident |
1880	<	auth_exceed_limit | auth_no_tilde | auth_gline_exempt |
1881	<	auth_spoof | auth_spoof_notice |
1882	<	auth_redir_serv | auth_redir_port | auth_can_flood |
1883	<	auth_need_password | auth_encrypted | error ';' ;
1884	<
1885	<	auth_user: USER '=' QSTRING ';'
1886	<	{
1887	<	if (conf_parser_ctx.pass == 2)
1745	>	DLINK_FOREACH(node, block_state.mask.list.head)
1746		{
1747	<	struct CollectItem *yy_tmp = NULL;
1747	>	struct MaskItem *conf = NULL;
1748		struct split_nuh_item nuh;
1749
1750	<	nuh.nuhmask  = yylval.string;
1750	>	nuh.nuhmask  = node->data;
1751		nuh.nickptr  = NULL;
1752	<	nuh.userptr  = userbuf;
1753	<	nuh.hostptr  = hostbuf;
1896	<
1752	>	nuh.userptr  = block_state.user.buf;
1753	>	nuh.hostptr  = block_state.host.buf;
1754		nuh.nicksize = 0;
1755	<	nuh.usersize = sizeof(userbuf);
1756	<	nuh.hostsize = sizeof(hostbuf);
1900	<
1755	>	nuh.usersize = sizeof(block_state.user.buf);
1756	>	nuh.hostsize = sizeof(block_state.host.buf);
1757		split_nuh(&nuh);
1758
1759	<	if (yy_aconf->user == NULL)
1760	<	{
1761	<	DupString(yy_aconf->user, userbuf);
1762	<	DupString(yy_aconf->host, hostbuf);
1763	<	}
1764	<	else
1765	<	{
1766	<	yy_tmp = MyMalloc(sizeof(struct CollectItem));
1759	>	conf        = conf_make(CONF_CLIENT);
1760	>	conf->user  = xstrdup(block_state.user.buf);
1761	>	conf->host  = xstrdup(block_state.host.buf);
1762	>
1763	>	if (block_state.rpass.buf[0])
1764	>	conf->passwd = xstrdup(block_state.rpass.buf);
1765	>	if (block_state.name.buf[0])
1766	>	conf->name = xstrdup(block_state.name.buf);
1767
1768	<	DupString(yy_tmp->user, userbuf);
1769	<	DupString(yy_tmp->host, hostbuf);
1768	>	conf->flags = block_state.flags.value;
1769	>	conf->port  = block_state.port.value;
1770
1771	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1772	<	}
1771	>	conf_add_class_to_conf(conf, block_state.class.buf);
1772	>	add_conf_by_address(CONF_CLIENT, conf);
1773		}
1774		};
1775
1776	<	/* XXX - IP/IPV6 tags don't exist anymore - put IP/IPV6 into user. */
1776	>	auth_items:     auth_items auth_item | auth_item;
1777	>	auth_item:      auth_user |
1778	>	auth_passwd |
1779	>	auth_class |
1780	>	auth_flags |
1781	>	auth_spoof |
1782	>	auth_redir_serv |
1783	>	auth_redir_port |
1784	>	auth_encrypted |
1785	>	error ';' ;
1786
1787	<	auth_passwd: PASSWORD '=' QSTRING ';'
1787	>	auth_user: USER '=' QSTRING ';'
1788		{
1789		if (conf_parser_ctx.pass == 2)
1790	<	{
1926	<	/* be paranoid */
1927	<	if (yy_aconf->passwd != NULL)
1928	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1929	<
1930	<	MyFree(yy_aconf->passwd);
1931	<	DupString(yy_aconf->passwd, yylval.string);
1932	<	}
1790	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1791		};
1792
1793	<	auth_spoof_notice: SPOOF_NOTICE '=' TBOOL ';'
1793	>	auth_passwd: PASSWORD '=' QSTRING ';'
1794		{
1795		if (conf_parser_ctx.pass == 2)
1796	<	{
1939	<	if (yylval.number)
1940	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1941	<	else
1942	<	yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1943	<	}
1796	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1797		};
1798
1799		auth_class: CLASS '=' QSTRING ';'
1800		{
1801		if (conf_parser_ctx.pass == 2)
1802	<	{
1950	<	MyFree(class_name);
1951	<	DupString(class_name, yylval.string);
1952	<	}
1802	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1803		};
1804
1805		auth_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 1957 | Line 1807 | auth_encrypted: ENCRYPTED '=' TBOOL ';'
1807		if (conf_parser_ctx.pass == 2)
1808		{
1809		if (yylval.number)
1810	<	SetConfEncrypted(yy_aconf);
1810	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1811		else
1812	<	ClearConfEncrypted(yy_aconf);
1812	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1813		}
1814		};
1815
1816		auth_flags: IRCD_FLAGS
1817		{
1818	+	if (conf_parser_ctx.pass == 2)
1819	+	block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
1820		} '='  auth_flags_items ';';
1821
1822		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1823	<	auth_flags_item: NOT { not_atom = 1; } auth_flags_item_atom
1972	<	| { not_atom = 0; } auth_flags_item_atom;
1973	<
1974	<	auth_flags_item_atom: SPOOF_NOTICE
1823	>	auth_flags_item: SPOOF_NOTICE
1824		{
1825		if (conf_parser_ctx.pass == 2)
1826	<	{
1978	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1979	<	else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1980	<	}
1981	<
1826	>	block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1827		} | EXCEED_LIMIT
1828		{
1829		if (conf_parser_ctx.pass == 2)
1830	<	{
1986	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
1987	<	else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1988	<	}
1830	>	block_state.flags.value |= CONF_FLAGS_NOLIMIT;
1831		} | KLINE_EXEMPT
1832		{
1833		if (conf_parser_ctx.pass == 2)
1834	<	{
1993	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
1994	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1995	<	}
1834	>	block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1835		} | NEED_IDENT
1836		{
1837		if (conf_parser_ctx.pass == 2)
1838	<	{
2000	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
2001	<	else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
2002	<	}
1838	>	block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
1839		} | CAN_FLOOD
1840		{
1841		if (conf_parser_ctx.pass == 2)
1842	<	{
2007	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
2008	<	else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
2009	<	}
2010	<	} | CAN_IDLE
2011	<	{
2012	<	if (conf_parser_ctx.pass == 2)
2013	<	{
2014	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_IDLE_LINED;
2015	<	else yy_aconf->flags |= CONF_FLAGS_IDLE_LINED;
2016	<	}
1842	>	block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
1843		} | NO_TILDE
1844		{
1845		if (conf_parser_ctx.pass == 2)
1846	<	{
2021	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
2022	<	else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
2023	<	}
1846	>	block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1847		} | GLINE_EXEMPT
1848		{
1849		if (conf_parser_ctx.pass == 2)
1850	<	{
2028	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
2029	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
2030	<	}
1850	>	block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
1851		} | RESV_EXEMPT
1852		{
1853		if (conf_parser_ctx.pass == 2)
1854	<	{
1855	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
2036	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
2037	<	}
2038	<	} | NEED_PASSWORD
1854	>	block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
1855	>	} | T_WEBIRC
1856		{
1857		if (conf_parser_ctx.pass == 2)
1858	<	{
1859	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
2043	<	else yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
2044	<	}
2045	<	};
2046	<
2047	<	auth_kline_exempt: KLINE_EXEMPT '=' TBOOL ';'
1858	>	block_state.flags.value |= CONF_FLAGS_WEBIRC;
1859	>	} | NEED_PASSWORD
1860		{
1861		if (conf_parser_ctx.pass == 2)
1862	<	{
2051	<	if (yylval.number)
2052	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
2053	<	else
2054	<	yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
2055	<	}
1862	>	block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1863		};
1864
1865	<	auth_need_ident: NEED_IDENT '=' TBOOL ';'
1865	>	auth_spoof: SPOOF '=' QSTRING ';'
1866		{
1867	<	if (conf_parser_ctx.pass == 2)
1868	<	{
2062	<	if (yylval.number)
2063	<	yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
2064	<	else
2065	<	yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
2066	<	}
2067	<	};
1867	>	if (conf_parser_ctx.pass != 2)
1868	>	break;
1869
1870	<	auth_exceed_limit: EXCEED_LIMIT '=' TBOOL ';'
2070	<	{
2071	<	if (conf_parser_ctx.pass == 2)
1870	>	if (valid_hostname(yylval.string))
1871		{
1872	<	if (yylval.number)
1873	<	yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
2075	<	else
2076	<	yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
1872	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1873	>	block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
1874		}
1875	+	else
1876	+	ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
1877		};
1878
1879	<	auth_can_flood: CAN_FLOOD '=' TBOOL ';'
1879	>	auth_redir_serv: REDIRSERV '=' QSTRING ';'
1880		{
1881	<	if (conf_parser_ctx.pass == 2)
1882	<	{
1883	<	if (yylval.number)
1884	<	yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
1885	<	else
2087	<	yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
2088	<	}
1881	>	if (conf_parser_ctx.pass != 2)
1882	>	break;
1883	>
1884	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1885	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1886		};
1887
1888	<	auth_no_tilde: NO_TILDE '=' TBOOL ';'
1888	>	auth_redir_port: REDIRPORT '=' NUMBER ';'
1889		{
1890	<	if (conf_parser_ctx.pass == 2)
1891	<	{
1892	<	if (yylval.number)
1893	<	yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1894	<	else
2098	<	yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
2099	<	}
1890	>	if (conf_parser_ctx.pass != 2)
1891	>	break;
1892	>
1893	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1894	>	block_state.port.value = $3;
1895		};
1896
1897	<	auth_gline_exempt: GLINE_EXEMPT '=' TBOOL ';'
1897	>
1898	>	/***************************************************************************
1899	>	*  section resv
1900	>	***************************************************************************/
1901	>	resv_entry: RESV
1902		{
1903	<	if (conf_parser_ctx.pass == 2)
1904	<	{
2106	<	if (yylval.number)
2107	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
2108	<	else
2109	<	yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
2110	<	}
2111	<	};
1903	>	if (conf_parser_ctx.pass != 2)
1904	>	break;
1905
1906	<	/* XXX - need check for illegal hostnames here */
1907	<	auth_spoof: SPOOF '=' QSTRING ';'
1906	>	reset_block_state();
1907	>	strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
1908	>	} '{' resv_items '}' ';'
1909		{
1910	<	if (conf_parser_ctx.pass == 2)
1911	<	{
2118	<	MyFree(yy_conf->name);
1910	>	if (conf_parser_ctx.pass != 2)
1911	>	break;
1912
1913	<	if (strlen(yylval.string) < HOSTLEN)
2121	<	{
2122	<	DupString(yy_conf->name, yylval.string);
2123	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
2124	<	}
2125	<	else
2126	<	{
2127	<	ilog(L_ERROR, "Spoofs must be less than %d..ignoring it", HOSTLEN);
2128	<	yy_conf->name = NULL;
2129	<	}
2130	<	}
1913	>	create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1914		};
1915
1916	<	auth_redir_serv: REDIRSERV '=' QSTRING ';'
1916	>	resv_items:     resv_items resv_item | resv_item;
1917	>	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1918	>
1919	>	resv_mask: MASK '=' QSTRING ';'
1920		{
1921		if (conf_parser_ctx.pass == 2)
1922	<	{
2137	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
2138	<	MyFree(yy_conf->name);
2139	<	DupString(yy_conf->name, yylval.string);
2140	<	}
1922	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1923		};
1924
1925	<	auth_redir_port: REDIRPORT '=' NUMBER ';'
1925	>	resv_reason: REASON '=' QSTRING ';'
1926		{
1927		if (conf_parser_ctx.pass == 2)
1928	<	{
2147	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
2148	<	yy_aconf->port = $3;
2149	<	}
1928	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1929		};
1930
1931	<	auth_need_password: NEED_PASSWORD '=' TBOOL ';'
1931	>	resv_exempt: EXEMPT '=' QSTRING ';'
1932		{
1933		if (conf_parser_ctx.pass == 2)
1934	<	{
2156	<	if (yylval.number)
2157	<	yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
2158	<	else
2159	<	yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
2160	<	}
1934	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1935		};
1936
1937
1938		/***************************************************************************
1939	<	*  section resv
1939	>	*  section service
1940		***************************************************************************/
1941	<	resv_entry: RESV
2168	<	{
2169	<	if (conf_parser_ctx.pass == 2)
2170	<	{
2171	<	MyFree(resv_reason);
2172	<	resv_reason = NULL;
2173	<	}
2174	<	} '{' resv_items '}' ';'
2175	<	{
2176	<	if (conf_parser_ctx.pass == 2)
2177	<	{
2178	<	MyFree(resv_reason);
2179	<	resv_reason = NULL;
2180	<	}
2181	<	};
2182	<
2183	<	resv_items:     resv_items resv_item | resv_item;
2184	<	resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
1941	>	service_entry: T_SERVICE '{' service_items '}' ';';
1942
1943	<	resv_creason: REASON '=' QSTRING ';'
1944	<	{
2188	<	if (conf_parser_ctx.pass == 2)
2189	<	{
2190	<	MyFree(resv_reason);
2191	<	DupString(resv_reason, yylval.string);
2192	<	}
2193	<	};
1943	>	service_items:     service_items service_item | service_item;
1944	>	service_item:      service_name | error;
1945
1946	<	resv_channel: CHANNEL '=' QSTRING ';'
1946	>	service_name: NAME '=' QSTRING ';'
1947		{
1948	<	if (conf_parser_ctx.pass == 2)
1949	<	{
2199	<	if (IsChanPrefix(*yylval.string))
2200	<	{
2201	<	char def_reason[] = "No reason";
2202	<
2203	<	create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
2204	<	}
2205	<	}
2206	<	/* ignore it for now.. but we really should make a warning if
2207	<	* its an erroneous name --fl_ */
2208	<	};
1948	>	if (conf_parser_ctx.pass != 2)
1949	>	break;
1950
1951	<	resv_nick: NICK '=' QSTRING ';'
2211	<	{
2212	<	if (conf_parser_ctx.pass == 2)
1951	>	if (valid_servname(yylval.string))
1952		{
1953	<	char def_reason[] = "No reason";
1954	<
2216	<	create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1953	>	struct MaskItem *conf = conf_make(CONF_SERVICE);
1954	>	conf->name = xstrdup(yylval.string);
1955		}
1956		};
1957
#	Line 2222 | Line 1960 | resv_nick: NICK '=' QSTRING ';'
1960		***************************************************************************/
1961		shared_entry: T_SHARED
1962		{
1963	<	if (conf_parser_ctx.pass == 2)
1964	<	{
1965	<	yy_conf = make_conf_item(ULINE_TYPE);
1966	<	yy_match_item = map_to_conf(yy_conf);
1967	<	yy_match_item->action = SHARED_ALL;
1968	<	}
1963	>	if (conf_parser_ctx.pass != 2)
1964	>	break;
1965	>
1966	>	reset_block_state();
1967	>
1968	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1969	>	strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
1970	>	strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
1971	>	block_state.flags.value = SHARED_ALL;
1972		} '{' shared_items '}' ';'
1973		{
1974	<	if (conf_parser_ctx.pass == 2)
1975	<	{
1976	<	yy_conf = NULL;
1977	<	}
1974	>	struct MaskItem *conf = NULL;
1975	>
1976	>	if (conf_parser_ctx.pass != 2)
1977	>	break;
1978	>
1979	>	conf = conf_make(CONF_ULINE);
1980	>	conf->flags = block_state.flags.value;
1981	>	conf->name = xstrdup(block_state.name.buf);
1982	>	conf->user = xstrdup(block_state.user.buf);
1983	>	conf->host = xstrdup(block_state.host.buf);
1984		};
1985
1986		shared_items: shared_items shared_item | shared_item;
#	Line 2242 | Line 1989 | shared_item:  shared_name | shared_user
1989		shared_name: NAME '=' QSTRING ';'
1990		{
1991		if (conf_parser_ctx.pass == 2)
1992	<	{
2246	<	MyFree(yy_conf->name);
2247	<	DupString(yy_conf->name, yylval.string);
2248	<	}
1992	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1993		};
1994
1995		shared_user: USER '=' QSTRING ';'
#	Line 2256 | Line 2000 | shared_user: USER '=' QSTRING ';'
2000
2001		nuh.nuhmask  = yylval.string;
2002		nuh.nickptr  = NULL;
2003	<	nuh.userptr  = userbuf;
2004	<	nuh.hostptr  = hostbuf;
2003	>	nuh.userptr  = block_state.user.buf;
2004	>	nuh.hostptr  = block_state.host.buf;
2005
2006		nuh.nicksize = 0;
2007	<	nuh.usersize = sizeof(userbuf);
2008	<	nuh.hostsize = sizeof(hostbuf);
2007	>	nuh.usersize = sizeof(block_state.user.buf);
2008	>	nuh.hostsize = sizeof(block_state.host.buf);
2009
2010		split_nuh(&nuh);
2267	–
2268	–	DupString(yy_match_item->user, userbuf);
2269	–	DupString(yy_match_item->host, hostbuf);
2011		}
2012		};
2013
2014		shared_type: TYPE
2015		{
2016		if (conf_parser_ctx.pass == 2)
2017	<	yy_match_item->action = 0;
2017	>	block_state.flags.value = 0;
2018		} '=' shared_types ';' ;
2019
2020		shared_types: shared_types ',' shared_type_item | shared_type_item;
2021		shared_type_item: KLINE
2022		{
2023		if (conf_parser_ctx.pass == 2)
2024	<	yy_match_item->action |= SHARED_KLINE;
2025	<	} | TKLINE
2024	>	block_state.flags.value |= SHARED_KLINE;
2025	>	} | UNKLINE
2026		{
2027		if (conf_parser_ctx.pass == 2)
2028	<	yy_match_item->action |= SHARED_TKLINE;
2029	<	} | UNKLINE
2028	>	block_state.flags.value |= SHARED_UNKLINE;
2029	>	} | T_DLINE
2030		{
2031		if (conf_parser_ctx.pass == 2)
2032	<	yy_match_item->action |= SHARED_UNKLINE;
2033	<	} | XLINE
2032	>	block_state.flags.value |= SHARED_DLINE;
2033	>	} | T_UNDLINE
2034		{
2035		if (conf_parser_ctx.pass == 2)
2036	<	yy_match_item->action |= SHARED_XLINE;
2037	<	} | TXLINE
2036	>	block_state.flags.value |= SHARED_UNDLINE;
2037	>	} | XLINE
2038		{
2039		if (conf_parser_ctx.pass == 2)
2040	<	yy_match_item->action |= SHARED_TXLINE;
2040	>	block_state.flags.value |= SHARED_XLINE;
2041		} | T_UNXLINE
2042		{
2043		if (conf_parser_ctx.pass == 2)
2044	<	yy_match_item->action |= SHARED_UNXLINE;
2044	>	block_state.flags.value |= SHARED_UNXLINE;
2045		} | RESV
2046		{
2047		if (conf_parser_ctx.pass == 2)
2048	<	yy_match_item->action |= SHARED_RESV;
2308	<	} | TRESV
2309	<	{
2310	<	if (conf_parser_ctx.pass == 2)
2311	<	yy_match_item->action |= SHARED_TRESV;
2048	>	block_state.flags.value |= SHARED_RESV;
2049		} | T_UNRESV
2050		{
2051		if (conf_parser_ctx.pass == 2)
2052	<	yy_match_item->action |= SHARED_UNRESV;
2052	>	block_state.flags.value |= SHARED_UNRESV;
2053		} | T_LOCOPS
2054		{
2055		if (conf_parser_ctx.pass == 2)
2056	<	yy_match_item->action |= SHARED_LOCOPS;
2056	>	block_state.flags.value |= SHARED_LOCOPS;
2057		} | T_ALL
2058		{
2059		if (conf_parser_ctx.pass == 2)
2060	<	yy_match_item->action = SHARED_ALL;
2060	>	block_state.flags.value = SHARED_ALL;
2061		};
2062
2063		/***************************************************************************
#	Line 2328 | Line 2065 | shared_type_item: KLINE
2065		***************************************************************************/
2066		cluster_entry: T_CLUSTER
2067		{
2068	<	if (conf_parser_ctx.pass == 2)
2069	<	{
2070	<	yy_conf = make_conf_item(CLUSTER_TYPE);
2071	<	yy_conf->flags = SHARED_ALL;
2072	<	}
2068	>	if (conf_parser_ctx.pass != 2)
2069	>	break;
2070	>
2071	>	reset_block_state();
2072	>
2073	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
2074	>	block_state.flags.value = SHARED_ALL;
2075		} '{' cluster_items '}' ';'
2076		{
2077	<	if (conf_parser_ctx.pass == 2)
2078	<	{
2079	<	if (yy_conf->name == NULL)
2080	<	DupString(yy_conf->name, "*");
2081	<	yy_conf = NULL;
2082	<	}
2077	>	struct MaskItem *conf = NULL;
2078	>
2079	>	if (conf_parser_ctx.pass != 2)
2080	>	break;
2081	>
2082	>	conf = conf_make(CONF_CLUSTER);
2083	>	conf->flags = block_state.flags.value;
2084	>	conf->name = xstrdup(block_state.name.buf);
2085		};
2086
2087	<	cluster_items:  cluster_items cluster_item | cluster_item;
2088	<	cluster_item:   cluster_name | cluster_type | error ';' ;
2087	>	cluster_items:  cluster_items cluster_item | cluster_item;
2088	>	cluster_item:   cluster_name | cluster_type | error ';' ;
2089
2090		cluster_name: NAME '=' QSTRING ';'
2091		{
2092		if (conf_parser_ctx.pass == 2)
2093	<	DupString(yy_conf->name, yylval.string);
2093	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2094		};
2095
2096		cluster_type: TYPE
2097		{
2098		if (conf_parser_ctx.pass == 2)
2099	<	yy_conf->flags = 0;
2099	>	block_state.flags.value = 0;
2100		} '=' cluster_types ';' ;
2101
2102	<	cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
2102	>	cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
2103		cluster_type_item: KLINE
2104		{
2105		if (conf_parser_ctx.pass == 2)
2106	<	yy_conf->flags |= SHARED_KLINE;
2107	<	} | TKLINE
2106	>	block_state.flags.value |= SHARED_KLINE;
2107	>	} | UNKLINE
2108		{
2109		if (conf_parser_ctx.pass == 2)
2110	<	yy_conf->flags |= SHARED_TKLINE;
2111	<	} | UNKLINE
2110	>	block_state.flags.value |= SHARED_UNKLINE;
2111	>	} | T_DLINE
2112		{
2113		if (conf_parser_ctx.pass == 2)
2114	<	yy_conf->flags |= SHARED_UNKLINE;
2115	<	} | XLINE
2114	>	block_state.flags.value |= SHARED_DLINE;
2115	>	} | T_UNDLINE
2116		{
2117		if (conf_parser_ctx.pass == 2)
2118	<	yy_conf->flags |= SHARED_XLINE;
2119	<	} | TXLINE
2118	>	block_state.flags.value |= SHARED_UNDLINE;
2119	>	} | XLINE
2120		{
2121		if (conf_parser_ctx.pass == 2)
2122	<	yy_conf->flags |= SHARED_TXLINE;
2122	>	block_state.flags.value |= SHARED_XLINE;
2123		} | T_UNXLINE
2124		{
2125		if (conf_parser_ctx.pass == 2)
2126	<	yy_conf->flags |= SHARED_UNXLINE;
2126	>	block_state.flags.value |= SHARED_UNXLINE;
2127		} | RESV
2128		{
2129		if (conf_parser_ctx.pass == 2)
2130	<	yy_conf->flags |= SHARED_RESV;
2390	<	} | TRESV
2391	<	{
2392	<	if (conf_parser_ctx.pass == 2)
2393	<	yy_conf->flags |= SHARED_TRESV;
2130	>	block_state.flags.value |= SHARED_RESV;
2131		} | T_UNRESV
2132		{
2133		if (conf_parser_ctx.pass == 2)
2134	<	yy_conf->flags |= SHARED_UNRESV;
2134	>	block_state.flags.value |= SHARED_UNRESV;
2135		} | T_LOCOPS
2136		{
2137		if (conf_parser_ctx.pass == 2)
2138	<	yy_conf->flags |= SHARED_LOCOPS;
2138	>	block_state.flags.value |= SHARED_LOCOPS;
2139		} | T_ALL
2140		{
2141		if (conf_parser_ctx.pass == 2)
2142	<	yy_conf->flags = SHARED_ALL;
2142	>	block_state.flags.value = SHARED_ALL;
2143		};
2144
2145		/***************************************************************************
2146		*  section connect
2147		***************************************************************************/
2148	<	connect_entry: CONNECT
2148	>	connect_entry: CONNECT
2149		{
2413	–	if (conf_parser_ctx.pass == 2)
2414	–	{
2415	–	yy_conf = make_conf_item(SERVER_TYPE);
2416	–	yy_aconf = (struct AccessItem *)map_to_conf(yy_conf);
2417	–	yy_aconf->passwd = NULL;
2418	–	/* defaults */
2419	–	yy_aconf->port = PORTNUM;
2150
2151	<	if (ConfigFileEntry.burst_away)
2152	<	yy_aconf->flags = CONF_FLAGS_BURST_AWAY;
2423	<	}
2424	<	else
2425	<	{
2426	<	MyFree(class_name);
2427	<	class_name = NULL;
2428	<	}
2429	<	} connect_name_b '{' connect_items '}' ';'
2430	<	{
2431	<	if (conf_parser_ctx.pass == 2)
2432	<	{
2433	<	struct CollectItem *yy_hconf=NULL;
2434	<	struct CollectItem *yy_lconf=NULL;
2435	<	dlink_node *ptr;
2436	<	dlink_node *next_ptr;
2437	<	#ifdef HAVE_LIBCRYPTO
2438	<	if (yy_aconf->host &&
2439	<	((yy_aconf->passwd && yy_aconf->spasswd) ||
2440	<	(yy_aconf->rsa_public_key && IsConfCryptLink(yy_aconf))))
2441	<	#else /* !HAVE_LIBCRYPTO */
2442	<	if (yy_aconf->host && !IsConfCryptLink(yy_aconf) &&
2443	<	yy_aconf->passwd && yy_aconf->spasswd)
2444	<	#endif /* !HAVE_LIBCRYPTO */
2445	<	{
2446	<	if (conf_add_server(yy_conf, class_name) == -1)
2447	<	{
2448	<	delete_conf_item(yy_conf);
2449	<	yy_conf = NULL;
2450	<	yy_aconf = NULL;
2451	<	}
2452	<	}
2453	<	else
2454	<	{
2455	<	/* Even if yy_conf ->name is NULL
2456	<	* should still unhook any hub/leaf confs still pending
2457	<	*/
2458	<	unhook_hub_leaf_confs();
2151	>	if (conf_parser_ctx.pass != 2)
2152	>	break;
2153
2154	<	if (yy_conf->name != NULL)
2155	<	{
2156	<	#ifndef HAVE_LIBCRYPTO
2157	<	if (IsConfCryptLink(yy_aconf))
2158	<	yyerror("Ignoring connect block -- no OpenSSL support");
2159	<	#else
2160	<	if (IsConfCryptLink(yy_aconf) && !yy_aconf->rsa_public_key)
2467	<	yyerror("Ignoring connect block -- missing key");
2468	<	#endif
2469	<	if (yy_aconf->host == NULL)
2470	<	yyerror("Ignoring connect block -- missing host");
2471	<	else if (!IsConfCryptLink(yy_aconf) &&
2472	<	(!yy_aconf->passwd || !yy_aconf->spasswd))
2473	<	yyerror("Ignoring connect block -- missing password");
2474	<	}
2475	<
2476	<
2477	<	/* XXX
2478	<	* This fixes a try_connections() core (caused by invalid class_ptr
2479	<	* pointers) reported by metalrock. That's an ugly fix, but there
2480	<	* is currently no better way. The entire config subsystem needs an
2481	<	* rewrite ASAP. make_conf_item() shouldn't really add things onto
2482	<	* a doubly linked list immediately without any sanity checks!  -Michael
2483	<	*/
2484	<	delete_conf_item(yy_conf);
2485	<
2486	<	yy_aconf = NULL;
2487	<	yy_conf = NULL;
2488	<	}
2489	<
2490	<	/*
2491	<	* yy_conf is still pointing at the server that is having
2492	<	* a connect block built for it. This means, y_aconf->name
2493	<	* points to the actual irc name this server will be known as.
2494	<	* Now this new server has a set or even just one hub_mask (or leaf_mask)
2495	<	* given in the link list at yy_hconf. Fill in the HUB confs
2496	<	* from this link list now.
2497	<	*/
2498	<	DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
2499	<	{
2500	<	struct ConfItem *new_hub_conf;
2501	<	struct MatchItem *match_item;
2502	<
2503	<	yy_hconf = ptr->data;
2504	<
2505	<	/* yy_conf == NULL is a fatal error for this connect block! */
2506	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2507	<	{
2508	<	new_hub_conf = make_conf_item(HUB_TYPE);
2509	<	match_item = (struct MatchItem *)map_to_conf(new_hub_conf);
2510	<	DupString(new_hub_conf->name, yy_conf->name);
2511	<	if (yy_hconf->user != NULL)
2512	<	DupString(match_item->user, yy_hconf->user);
2513	<	else
2514	<	DupString(match_item->user, "*");
2515	<	if (yy_hconf->host != NULL)
2516	<	DupString(match_item->host, yy_hconf->host);
2517	<	else
2518	<	DupString(match_item->host, "*");
2519	<	}
2520	<	dlinkDelete(&yy_hconf->node, &hub_conf_list);
2521	<	free_collect_item(yy_hconf);
2522	<	}
2154	>	reset_block_state();
2155	>	block_state.aftype.value = AF_INET;
2156	>	block_state.port.value = PORTNUM;
2157	>	} '{' connect_items '}' ';'
2158	>	{
2159	>	struct MaskItem *conf = NULL;
2160	>	struct addrinfo hints, *res;
2161
2162	<	/* Ditto for the LEAF confs */
2162	>	if (conf_parser_ctx.pass != 2)
2163	>	break;
2164
2165	<	DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
2166	<	{
2167	<	struct ConfItem *new_leaf_conf;
2529	<	struct MatchItem *match_item;
2165	>	if (!block_state.name.buf[0] ||
2166	>	!block_state.host.buf[0])
2167	>	break;
2168
2169	<	yy_lconf = ptr->data;
2169	>	if (!block_state.rpass.buf[0] ||
2170	>	!block_state.spass.buf[0])
2171	>	break;
2172
2173	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2174	<	{
2175	<	new_leaf_conf = make_conf_item(LEAF_TYPE);
2536	<	match_item = (struct MatchItem *)map_to_conf(new_leaf_conf);
2537	<	DupString(new_leaf_conf->name, yy_conf->name);
2538	<	if (yy_lconf->user != NULL)
2539	<	DupString(match_item->user, yy_lconf->user);
2540	<	else
2541	<	DupString(match_item->user, "*");
2542	<	if (yy_lconf->host != NULL)
2543	<	DupString(match_item->host, yy_lconf->host);
2544	<	else
2545	<	DupString(match_item->host, "*");
2546	<	}
2547	<	dlinkDelete(&yy_lconf->node, &leaf_conf_list);
2548	<	free_collect_item(yy_lconf);
2549	<	}
2550	<	MyFree(class_name);
2551	<	class_name = NULL;
2552	<	yy_conf = NULL;
2553	<	yy_aconf = NULL;
2554	<	}
2555	<	};
2173	>	if (has_wildcards(block_state.name.buf) ||
2174	>	has_wildcards(block_state.host.buf))
2175	>	break;
2176
2177	<	connect_name_b: | connect_name_t;
2178	<	connect_items:  connect_items connect_item | connect_item;
2179	<	connect_item:   connect_name | connect_host | connect_vhost |
2180	<	connect_send_password | connect_accept_password |
2181	<	connect_aftype | connect_port |
2182	<	connect_fakename | connect_flags | connect_hub_mask |
2183	<	connect_leaf_mask | connect_class | connect_auto |
2184	<	connect_encrypted | connect_compressed | connect_cryptlink |
2565	<	connect_rsa_public_key_file | connect_cipher_preference |
2566	<	connect_topicburst | error ';' ;
2567	<
2568	<	connect_name: NAME '=' QSTRING ';'
2569	<	{
2570	<	if (conf_parser_ctx.pass == 2)
2571	<	{
2572	<	if (yy_conf->name != NULL)
2573	<	yyerror("Multiple connect name entry");
2574	<
2575	<	MyFree(yy_conf->name);
2576	<	DupString(yy_conf->name, yylval.string);
2577	<	}
2578	<	};
2177	>	conf = conf_make(CONF_SERVER);
2178	>	conf->port = block_state.port.value;
2179	>	conf->flags = block_state.flags.value;
2180	>	conf->aftype = block_state.aftype.value;
2181	>	conf->host = xstrdup(block_state.host.buf);
2182	>	conf->name = xstrdup(block_state.name.buf);
2183	>	conf->passwd = xstrdup(block_state.rpass.buf);
2184	>	conf->spasswd = xstrdup(block_state.spass.buf);
2185
2186	<	connect_name_t: QSTRING
2187	<	{
2582	<	if (conf_parser_ctx.pass == 2)
2583	<	{
2584	<	if (yy_conf->name != NULL)
2585	<	yyerror("Multiple connect name entry");
2186	>	if (block_state.cert.buf[0])
2187	>	conf->certfp = xstrdup(block_state.cert.buf);
2188
2189	<	MyFree(yy_conf->name);
2190	<	DupString(yy_conf->name, yylval.string);
2589	<	}
2590	<	};
2189	>	if (block_state.ciph.buf[0])
2190	>	conf->cipher_list = xstrdup(block_state.ciph.buf);
2191
2192	<	connect_host: HOST '=' QSTRING ';'
2193	<	{
2594	<	if (conf_parser_ctx.pass == 2)
2595	<	{
2596	<	MyFree(yy_aconf->host);
2597	<	DupString(yy_aconf->host, yylval.string);
2598	<	}
2599	<	};
2192	>	dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
2193	>	dlinkMoveList(&block_state.hub.list, &conf->hub_list);
2194
2195	<	connect_vhost: VHOST '=' QSTRING ';'
2602	<	{
2603	<	if (conf_parser_ctx.pass == 2)
2195	>	if (block_state.bind.buf[0])
2196		{
2605	–	struct addrinfo hints, *res;
2606	–
2197		memset(&hints, 0, sizeof(hints));
2198
2199		hints.ai_family   = AF_UNSPEC;
2200		hints.ai_socktype = SOCK_STREAM;
2201		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2202
2203	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
2204	<	ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
2203	>	if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2204	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2205		else
2206		{
2207	<	assert(res != NULL);
2207	>	assert(res);
2208
2209	<	memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
2210	<	yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
2211	<	yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
2212	<	irc_freeaddrinfo(res);
2209	>	memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2210	>	conf->bind.ss.ss_family = res->ai_family;
2211	>	conf->bind.ss_len = res->ai_addrlen;
2212	>	freeaddrinfo(res);
2213		}
2214		}
2625	–	};
2626	–
2627	–	connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2628	–	{
2629	–	if (conf_parser_ctx.pass == 2)
2630	–	{
2631	–	if ($3[0] == ':')
2632	–	yyerror("Server passwords cannot begin with a colon");
2633	–	else if (strchr($3, ' ') != NULL)
2634	–	yyerror("Server passwords cannot contain spaces");
2635	–	else {
2636	–	if (yy_aconf->spasswd != NULL)
2637	–	memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
2215
2216	<	MyFree(yy_aconf->spasswd);
2217	<	DupString(yy_aconf->spasswd, yylval.string);
2641	<	}
2642	<	}
2216	>	conf_add_class_to_conf(conf, block_state.class.buf);
2217	>	lookup_confhost(conf);
2218		};
2219
2220	<	connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2220	>	connect_items:  connect_items connect_item | connect_item;
2221	>	connect_item:   connect_name |
2222	>	connect_host |
2223	>	connect_vhost |
2224	>	connect_send_password |
2225	>	connect_accept_password |
2226	>	connect_ssl_certificate_fingerprint |
2227	>	connect_aftype |
2228	>	connect_port |
2229	>	connect_ssl_cipher_list |
2230	>	connect_flags |
2231	>	connect_hub_mask |
2232	>	connect_leaf_mask |
2233	>	connect_class |
2234	>	connect_encrypted |
2235	>	error ';' ;
2236	>
2237	>	connect_name: NAME '=' QSTRING ';'
2238		{
2239		if (conf_parser_ctx.pass == 2)
2240	<	{
2649	<	if ($3[0] == ':')
2650	<	yyerror("Server passwords cannot begin with a colon");
2651	<	else if (strchr($3, ' ') != NULL)
2652	<	yyerror("Server passwords cannot contain spaces");
2653	<	else {
2654	<	if (yy_aconf->passwd != NULL)
2655	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
2656	<
2657	<	MyFree(yy_aconf->passwd);
2658	<	DupString(yy_aconf->passwd, yylval.string);
2659	<	}
2660	<	}
2240	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2241		};
2242
2243	<	connect_port: PORT '=' NUMBER ';'
2243	>	connect_host: HOST '=' QSTRING ';'
2244		{
2245		if (conf_parser_ctx.pass == 2)
2246	<	yy_aconf->port = $3;
2246	>	strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2247		};
2248
2249	<	connect_aftype: AFTYPE '=' T_IPV4 ';'
2670	<	{
2671	<	if (conf_parser_ctx.pass == 2)
2672	<	yy_aconf->aftype = AF_INET;
2673	<	} | AFTYPE '=' T_IPV6 ';'
2249	>	connect_vhost: VHOST '=' QSTRING ';'
2250		{
2675	–	#ifdef IPV6
2251		if (conf_parser_ctx.pass == 2)
2252	<	yy_aconf->aftype = AF_INET6;
2678	<	#endif
2252	>	strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2253		};
2254
2255	<	connect_fakename: FAKENAME '=' QSTRING ';'
2255	>	connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2256		{
2257	<	if (conf_parser_ctx.pass == 2)
2258	<	{
2259	<	MyFree(yy_aconf->fakename);
2260	<	DupString(yy_aconf->fakename, yylval.string);
2261	<	}
2257	>	if (conf_parser_ctx.pass != 2)
2258	>	break;
2259	>
2260	>	if ($3[0] == ':')
2261	>	conf_error_report("Server passwords cannot begin with a colon");
2262	>	else if (strchr($3, ' '))
2263	>	conf_error_report("Server passwords cannot contain spaces");
2264	>	else
2265	>	strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
2266		};
2267
2268	<	connect_flags: IRCD_FLAGS
2268	>	connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2269		{
2270	<	} '='  connect_flags_items ';';
2270	>	if (conf_parser_ctx.pass != 2)
2271	>	break;
2272
2273	<	connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2274	<	connect_flags_item: NOT  { not_atom = 1; } connect_flags_item_atom
2275	<	|  { not_atom = 0; } connect_flags_item_atom;
2273	>	if ($3[0] == ':')
2274	>	conf_error_report("Server passwords cannot begin with a colon");
2275	>	else if (strchr($3, ' '))
2276	>	conf_error_report("Server passwords cannot contain spaces");
2277	>	else
2278	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2279	>	};
2280
2281	<	connect_flags_item_atom: COMPRESSED
2281	>	connect_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
2282		{
2283		if (conf_parser_ctx.pass == 2)
2284	<	#ifndef HAVE_LIBZ
2285	<	yyerror("Ignoring flags = compressed; -- no zlib support");
2703	<	#else
2704	<	{
2705	<	if (not_atom)ClearConfCompressed(yy_aconf);
2706	<	else SetConfCompressed(yy_aconf);
2707	<	}
2708	<	#endif
2709	<	} | CRYPTLINK
2710	<	{
2711	<	if (conf_parser_ctx.pass == 2)
2712	<	{
2713	<	if (not_atom)ClearConfCryptLink(yy_aconf);
2714	<	else SetConfCryptLink(yy_aconf);
2715	<	}
2716	<	} | AUTOCONN
2717	<	{
2718	<	if (conf_parser_ctx.pass == 2)
2719	<	{
2720	<	if (not_atom)ClearConfAllowAutoConn(yy_aconf);
2721	<	else SetConfAllowAutoConn(yy_aconf);
2722	<	}
2723	<	} | BURST_AWAY
2724	<	{
2725	<	if (conf_parser_ctx.pass == 2)
2726	<	{
2727	<	if (not_atom)ClearConfAwayBurst(yy_aconf);
2728	<	else SetConfAwayBurst(yy_aconf);
2729	<	}
2730	<	} | TOPICBURST
2731	<	{
2732	<	if (conf_parser_ctx.pass == 2)
2733	<	{
2734	<	if (not_atom)ClearConfTopicBurst(yy_aconf);
2735	<	else SetConfTopicBurst(yy_aconf);
2736	<	}
2737	<	}
2738	<	;
2284	>	strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
2285	>	};
2286
2287	<	connect_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
2287	>	connect_port: PORT '=' NUMBER ';'
2288		{
2742	–	#ifdef HAVE_LIBCRYPTO
2289		if (conf_parser_ctx.pass == 2)
2290	<	{
2745	<	BIO *file;
2746	<
2747	<	if (yy_aconf->rsa_public_key != NULL)
2748	<	{
2749	<	RSA_free(yy_aconf->rsa_public_key);
2750	<	yy_aconf->rsa_public_key = NULL;
2751	<	}
2752	<
2753	<	if (yy_aconf->rsa_public_key_file != NULL)
2754	<	{
2755	<	MyFree(yy_aconf->rsa_public_key_file);
2756	<	yy_aconf->rsa_public_key_file = NULL;
2757	<	}
2758	<
2759	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
2760	<
2761	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
2762	<	{
2763	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
2764	<	break;
2765	<	}
2766	<
2767	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
2768	<
2769	<	if (yy_aconf->rsa_public_key == NULL)
2770	<	{
2771	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
2772	<	break;
2773	<	}
2774	<
2775	<	BIO_set_close(file, BIO_CLOSE);
2776	<	BIO_free(file);
2777	<	}
2778	<	#endif /* HAVE_LIBCRYPTO */
2290	>	block_state.port.value = $3;
2291		};
2292
2293	<	connect_encrypted: ENCRYPTED '=' TBOOL ';'
2293	>	connect_aftype: AFTYPE '=' T_IPV4 ';'
2294		{
2295		if (conf_parser_ctx.pass == 2)
2296	<	{
2297	<	if (yylval.number)
2786	<	yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
2787	<	else
2788	<	yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
2789	<	}
2790	<	};
2791	<
2792	<	connect_cryptlink: CRYPTLINK '=' TBOOL ';'
2296	>	block_state.aftype.value = AF_INET;
2297	>	} | AFTYPE '=' T_IPV6 ';'
2298		{
2299		if (conf_parser_ctx.pass == 2)
2300	<	{
2796	<	if (yylval.number)
2797	<	yy_aconf->flags |= CONF_FLAGS_CRYPTLINK;
2798	<	else
2799	<	yy_aconf->flags &= ~CONF_FLAGS_CRYPTLINK;
2800	<	}
2300	>	block_state.aftype.value = AF_INET6;
2301		};
2302
2303	<	connect_compressed: COMPRESSED '=' TBOOL ';'
2303	>	connect_flags: IRCD_FLAGS
2304		{
2305	<	if (conf_parser_ctx.pass == 2)
2306	<	{
2807	<	if (yylval.number)
2808	<	#ifndef HAVE_LIBZ
2809	<	yyerror("Ignoring compressed=yes; -- no zlib support");
2810	<	#else
2811	<	yy_aconf->flags |= CONF_FLAGS_COMPRESSED;
2812	<	#endif
2813	<	else
2814	<	yy_aconf->flags &= ~CONF_FLAGS_COMPRESSED;
2815	<	}
2816	<	};
2305	>	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2306	>	} '='  connect_flags_items ';';
2307
2308	<	connect_auto: AUTOCONN '=' TBOOL ';'
2308	>	connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2309	>	connect_flags_item: AUTOCONN
2310		{
2311		if (conf_parser_ctx.pass == 2)
2312	<	{
2313	<	if (yylval.number)
2314	<	yy_aconf->flags |= CONF_FLAGS_ALLOW_AUTO_CONN;
2315	<	else
2316	<	yy_aconf->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN;
2826	<	}
2312	>	block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2313	>	} | T_SSL
2314	>	{
2315	>	if (conf_parser_ctx.pass == 2)
2316	>	block_state.flags.value |= CONF_FLAGS_SSL;
2317		};
2318
2319	<	connect_topicburst: TOPICBURST '=' TBOOL ';'
2319	>	connect_encrypted: ENCRYPTED '=' TBOOL ';'
2320		{
2321		if (conf_parser_ctx.pass == 2)
2322		{
2323		if (yylval.number)
2324	<	SetConfTopicBurst(yy_aconf);
2324	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
2325		else
2326	<	ClearConfTopicBurst(yy_aconf);
2326	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
2327		}
2328		};
2329
2330	<	connect_hub_mask: HUB_MASK '=' QSTRING ';'
2330	>	connect_hub_mask: HUB_MASK '=' QSTRING ';'
2331		{
2332		if (conf_parser_ctx.pass == 2)
2333	<	{
2844	<	struct CollectItem *yy_tmp;
2845	<
2846	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2847	<	DupString(yy_tmp->host, yylval.string);
2848	<	DupString(yy_tmp->user, "*");
2849	<	dlinkAdd(yy_tmp, &yy_tmp->node, &hub_conf_list);
2850	<	}
2333	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2334		};
2335
2336	<	connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2336	>	connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2337		{
2338		if (conf_parser_ctx.pass == 2)
2339	<	{
2857	<	struct CollectItem *yy_tmp;
2858	<
2859	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2860	<	DupString(yy_tmp->host, yylval.string);
2861	<	DupString(yy_tmp->user, "*");
2862	<	dlinkAdd(yy_tmp, &yy_tmp->node, &leaf_conf_list);
2863	<	}
2339	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
2340		};
2341
2342		connect_class: CLASS '=' QSTRING ';'
2343		{
2344		if (conf_parser_ctx.pass == 2)
2345	<	{
2870	<	MyFree(class_name);
2871	<	DupString(class_name, yylval.string);
2872	<	}
2345	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2346		};
2347
2348	<	connect_cipher_preference: CIPHER_PREFERENCE '=' QSTRING ';'
2348	>	connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2349		{
2350		#ifdef HAVE_LIBCRYPTO
2351		if (conf_parser_ctx.pass == 2)
2352	<	{
2880	<	struct EncCapability *ecap;
2881	<	const char *cipher_name;
2882	<	int found = 0;
2883	<
2884	<	yy_aconf->cipher_preference = NULL;
2885	<	cipher_name = yylval.string;
2886	<
2887	<	for (ecap = CipherTable; ecap->name; ecap++)
2888	<	{
2889	<	if ((irccmp(ecap->name, cipher_name) == 0) &&
2890	<	(ecap->cap & CAP_ENC_MASK))
2891	<	{
2892	<	yy_aconf->cipher_preference = ecap;
2893	<	found = 1;
2894	<	break;
2895	<	}
2896	<	}
2897	<
2898	<	if (!found)
2899	<	yyerror("Invalid cipher");
2900	<	}
2352	>	strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2353		#else
2354		if (conf_parser_ctx.pass == 2)
2355	<	yyerror("Ignoring cipher_preference -- no OpenSSL support");
2355	>	conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
2356		#endif
2357		};
2358
2359	+
2360		/***************************************************************************
2361		*  section kill
2362		***************************************************************************/
2363		kill_entry: KILL
2364		{
2365		if (conf_parser_ctx.pass == 2)
2366	<	{
2914	<	userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
2915	<	regex_ban = 0;
2916	<	}
2366	>	reset_block_state();
2367		} '{' kill_items '}' ';'
2368		{
2369	<	if (conf_parser_ctx.pass == 2)
2920	<	{
2921	<	if (userbuf[0] && hostbuf[0])
2922	<	{
2923	<	if (regex_ban)
2924	<	{
2925	<	#ifdef HAVE_LIBPCRE
2926	<	void *exp_user = NULL;
2927	<	void *exp_host = NULL;
2928	<	const char *errptr = NULL;
2929	<
2930	<	if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
2931	<	!(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
2932	<	{
2933	<	ilog(L_ERROR, "Failed to add regular expression based K-Line: %s",
2934	<	errptr);
2935	<	break;
2936	<	}
2937	<
2938	<	yy_aconf = map_to_conf(make_conf_item(RKLINE_TYPE));
2939	<	yy_aconf->regexuser = exp_user;
2940	<	yy_aconf->regexhost = exp_host;
2941	<
2942	<	DupString(yy_aconf->user, userbuf);
2943	<	DupString(yy_aconf->host, hostbuf);
2369	>	struct MaskItem *conf = NULL;
2370
2371	<	if (reasonbuf[0])
2372	<	DupString(yy_aconf->reason, reasonbuf);
2947	<	else
2948	<	DupString(yy_aconf->reason, "No reason");
2949	<	#else
2950	<	ilog(L_ERROR, "Failed to add regular expression based K-Line: no PCRE support");
2951	<	break;
2952	<	#endif
2953	<	}
2954	<	else
2955	<	{
2956	<	yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
2371	>	if (conf_parser_ctx.pass != 2)
2372	>	break;
2373
2374	<	DupString(yy_aconf->user, userbuf);
2375	<	DupString(yy_aconf->host, hostbuf);
2374	>	if (!block_state.user.buf[0] ||
2375	>	!block_state.host.buf[0])
2376	>	break;
2377
2378	<	if (reasonbuf[0])
2379	<	DupString(yy_aconf->reason, reasonbuf);
2380	<	else
2964	<	DupString(yy_aconf->reason, "No reason");
2965	<	add_conf_by_address(CONF_KILL, yy_aconf);
2966	<	}
2967	<	}
2378	>	conf = conf_make(CONF_KLINE);
2379	>	conf->user = xstrdup(block_state.user.buf);
2380	>	conf->host = xstrdup(block_state.host.buf);
2381
2382	<	yy_aconf = NULL;
2383	<	}
2384	<	};
2385	<
2386	<	kill_type: TYPE
2974	<	{
2975	<	} '='  kill_type_items ';';
2976	<
2977	<	kill_type_items: kill_type_items ',' kill_type_item | kill_type_item;
2978	<	kill_type_item: REGEX_T
2979	<	{
2980	<	if (conf_parser_ctx.pass == 2)
2981	<	regex_ban = 1;
2382	>	if (block_state.rpass.buf[0])
2383	>	conf->reason = xstrdup(block_state.rpass.buf);
2384	>	else
2385	>	conf->reason = xstrdup(CONF_NOREASON);
2386	>	add_conf_by_address(CONF_KLINE, conf);
2387		};
2388
2389		kill_items:     kill_items kill_item | kill_item;
2390	<	kill_item:      kill_user | kill_reason | kill_type | error;
2390	>	kill_item:      kill_user | kill_reason | error;
2391
2392		kill_user: USER '=' QSTRING ';'
2393		{
2394	+
2395		if (conf_parser_ctx.pass == 2)
2396		{
2397		struct split_nuh_item nuh;
2398
2399		nuh.nuhmask  = yylval.string;
2400		nuh.nickptr  = NULL;
2401	<	nuh.userptr  = userbuf;
2402	<	nuh.hostptr  = hostbuf;
2401	>	nuh.userptr  = block_state.user.buf;
2402	>	nuh.hostptr  = block_state.host.buf;
2403
2404		nuh.nicksize = 0;
2405	<	nuh.usersize = sizeof(userbuf);
2406	<	nuh.hostsize = sizeof(hostbuf);
2405	>	nuh.usersize = sizeof(block_state.user.buf);
2406	>	nuh.hostsize = sizeof(block_state.host.buf);
2407
2408		split_nuh(&nuh);
2409		}
2410		};
2411
2412	<	kill_reason: REASON '=' QSTRING ';'
2412	>	kill_reason: REASON '=' QSTRING ';'
2413		{
2414		if (conf_parser_ctx.pass == 2)
2415	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2415	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2416		};
2417
2418		/***************************************************************************
2419		*  section deny
2420		***************************************************************************/
2421	<	deny_entry: DENY
2421	>	deny_entry: DENY
2422		{
2423		if (conf_parser_ctx.pass == 2)
2424	<	hostbuf[0] = reasonbuf[0] = '\0';
2424	>	reset_block_state();
2425		} '{' deny_items '}' ';'
2426		{
2427	<	if (conf_parser_ctx.pass == 2)
2427	>	struct MaskItem *conf = NULL;
2428	>
2429	>	if (conf_parser_ctx.pass != 2)
2430	>	break;
2431	>
2432	>	if (!block_state.addr.buf[0])
2433	>	break;
2434	>
2435	>	if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2436		{
2437	<	if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
2438	<	{
3025	<	yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
3026	<	DupString(yy_aconf->host, hostbuf);
2437	>	conf = conf_make(CONF_DLINE);
2438	>	conf->host = xstrdup(block_state.addr.buf);
2439
2440	<	if (reasonbuf[0])
2441	<	DupString(yy_aconf->reason, reasonbuf);
2442	<	else
2443	<	DupString(yy_aconf->reason, "No reason");
2444	<	add_conf_by_address(CONF_DLINE, yy_aconf);
3033	<	yy_aconf = NULL;
3034	<	}
2440	>	if (block_state.rpass.buf[0])
2441	>	conf->reason = xstrdup(block_state.rpass.buf);
2442	>	else
2443	>	conf->reason = xstrdup(CONF_NOREASON);
2444	>	add_conf_by_address(CONF_DLINE, conf);
2445		}
2446	<	};
2446	>	};
2447
2448		deny_items:     deny_items deny_item | deny_item;
2449		deny_item:      deny_ip | deny_reason | error;
#	Line 3041 | Line 2451 | deny_item:      deny_ip | deny_reason |
2451		deny_ip: IP '=' QSTRING ';'
2452		{
2453		if (conf_parser_ctx.pass == 2)
2454	<	strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
2454	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2455		};
2456
2457	<	deny_reason: REASON '=' QSTRING ';'
2457	>	deny_reason: REASON '=' QSTRING ';'
2458		{
2459		if (conf_parser_ctx.pass == 2)
2460	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2460	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2461		};
2462
2463		/***************************************************************************
#	Line 3064 | Line 2474 | exempt_ip: IP '=' QSTRING ';'
2474		{
2475		if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2476		{
2477	<	yy_aconf = map_to_conf(make_conf_item(EXEMPTDLINE_TYPE));
2478	<	DupString(yy_aconf->host, yylval.string);
2477	>	struct MaskItem *conf = conf_make(CONF_EXEMPT);
2478	>	conf->host = xstrdup(yylval.string);
2479
2480	<	add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
3071	<	yy_aconf = NULL;
2480	>	add_conf_by_address(CONF_EXEMPT, conf);
2481		}
2482		}
2483		};
#	Line 3079 | Line 2488 | exempt_ip: IP '=' QSTRING ';'
2488		gecos_entry: GECOS
2489		{
2490		if (conf_parser_ctx.pass == 2)
2491	<	{
3083	<	regex_ban = 0;
3084	<	reasonbuf[0] = gecos_name[0] = '\0';
3085	<	}
2491	>	reset_block_state();
2492		} '{' gecos_items '}' ';'
2493		{
2494	<	if (conf_parser_ctx.pass == 2)
3089	<	{
3090	<	if (gecos_name[0])
3091	<	{
3092	<	if (regex_ban)
3093	<	{
3094	<	#ifdef HAVE_LIBPCRE
3095	<	void *exp_p = NULL;
3096	<	const char *errptr = NULL;
3097	<
3098	<	if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
3099	<	{
3100	<	ilog(L_ERROR, "Failed to add regular expression based X-Line: %s",
3101	<	errptr);
3102	<	break;
3103	<	}
3104	<
3105	<	yy_conf = make_conf_item(RXLINE_TYPE);
3106	<	yy_conf->regexpname = exp_p;
3107	<	#else
3108	<	ilog(L_ERROR, "Failed to add regular expression based X-Line: no PCRE support");
3109	<	break;
3110	<	#endif
3111	<	}
3112	<	else
3113	<	yy_conf = make_conf_item(XLINE_TYPE);
2494	>	struct MaskItem *conf = NULL;
2495
2496	<	yy_match_item = map_to_conf(yy_conf);
2497	<	DupString(yy_conf->name, gecos_name);
2496	>	if (conf_parser_ctx.pass != 2)
2497	>	break;
2498
2499	<	if (reasonbuf[0])
2500	<	DupString(yy_match_item->reason, reasonbuf);
3120	<	else
3121	<	DupString(yy_match_item->reason, "No reason");
3122	<	}
3123	<	}
3124	<	};
2499	>	if (!block_state.name.buf[0])
2500	>	break;
2501
2502	<	gecos_flags: TYPE
2503	<	{
3128	<	} '='  gecos_flags_items ';';
2502	>	conf = conf_make(CONF_XLINE);
2503	>	conf->name = xstrdup(block_state.name.buf);
2504
2505	<	gecos_flags_items: gecos_flags_items ',' gecos_flags_item | gecos_flags_item;
2506	<	gecos_flags_item: REGEX_T
2507	<	{
2508	<	if (conf_parser_ctx.pass == 2)
3134	<	regex_ban = 1;
2505	>	if (block_state.rpass.buf[0])
2506	>	conf->reason = xstrdup(block_state.rpass.buf);
2507	>	else
2508	>	conf->reason = xstrdup(CONF_NOREASON);
2509		};
2510
2511		gecos_items: gecos_items gecos_item | gecos_item;
2512	<	gecos_item:  gecos_name | gecos_reason | gecos_flags | error;
2512	>	gecos_item:  gecos_name | gecos_reason | error;
2513
2514	<	gecos_name: NAME '=' QSTRING ';'
2514	>	gecos_name: NAME '=' QSTRING ';'
2515		{
2516		if (conf_parser_ctx.pass == 2)
2517	<	strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
2517	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2518		};
2519
2520	<	gecos_reason: REASON '=' QSTRING ';'
2520	>	gecos_reason: REASON '=' QSTRING ';'
2521		{
2522		if (conf_parser_ctx.pass == 2)
2523	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2523	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2524		};
2525
2526		/***************************************************************************
#	Line 3156 | Line 2530 | general_entry: GENERAL
2530		'{' general_items '}' ';';
2531
2532		general_items:      general_items general_item | general_item;
2533	<	general_item:       general_hide_spoof_ips | general_ignore_bogus_ts |
2534	<	general_failed_oper_notice | general_anti_nick_flood |
2535	<	general_max_nick_time | general_max_nick_changes |
2536	<	general_max_accept | general_anti_spam_exit_message_time |
2537	<	general_ts_warn_delta | general_ts_max_delta |
2538	<	general_kill_chase_time_limit | general_kline_with_reason |
2539	<	general_kline_reason | general_invisible_on_connect |
2540	<	general_warn_no_nline | general_dots_in_ident |
2541	<	general_stats_o_oper_only | general_stats_k_oper_only |
2542	<	general_pace_wait | general_stats_i_oper_only |
2543	<	general_pace_wait_simple | general_stats_P_oper_only |
2544	<	general_short_motd | general_no_oper_flood |
2545	<	general_true_no_oper_flood | general_oper_pass_resv |
2546	<	general_idletime | general_message_locale |
2547	<	general_oper_only_umodes | general_max_targets |
2548	<	general_use_egd | general_egdpool_path |
2549	<	general_oper_umodes | general_caller_id_wait |
2550	<	general_opers_bypass_callerid | general_default_floodcount |
2551	<	general_min_nonwildcard | general_min_nonwildcard_simple |
2552	<	general_servlink_path | general_disable_remote_commands |
2553	<	general_default_cipher_preference |
2554	<	general_compression_level | general_client_flood |
2555	<	general_throttle_time | general_havent_read_conf |
2556	<	general_dot_in_ip6_addr | general_ping_cookie |
2557	<	general_disable_auth | general_burst_away |
2558	<	general_tkline_expire_notices | general_gline_min_cidr |
2559	<	general_gline_min_cidr6 | general_use_whois_actually |
2560	<	general_reject_hold_time | general_stats_e_disabled |
2561	<	general_max_watch |
2562	<	error;
2533	>	general_item:       general_away_count |
2534	>	general_away_time |
2535	>	general_ignore_bogus_ts |
2536	>	general_failed_oper_notice |
2537	>	general_anti_nick_flood |
2538	>	general_max_nick_time |
2539	>	general_max_nick_changes |
2540	>	general_max_accept |
2541	>	general_anti_spam_exit_message_time |
2542	>	general_ts_warn_delta |
2543	>	general_ts_max_delta |
2544	>	general_kill_chase_time_limit |
2545	>	general_invisible_on_connect |
2546	>	general_warn_no_connect_block |
2547	>	general_dots_in_ident |
2548	>	general_stats_o_oper_only |
2549	>	general_stats_k_oper_only |
2550	>	general_pace_wait |
2551	>	general_stats_i_oper_only |
2552	>	general_pace_wait_simple |
2553	>	general_stats_P_oper_only |
2554	>	general_stats_u_oper_only |
2555	>	general_short_motd |
2556	>	general_no_oper_flood |
2557	>	general_true_no_oper_flood |
2558	>	general_oper_pass_resv |
2559	>	general_oper_only_umodes |
2560	>	general_max_targets |
2561	>	general_oper_umodes |
2562	>	general_caller_id_wait |
2563	>	general_opers_bypass_callerid |
2564	>	general_default_floodcount |
2565	>	general_min_nonwildcard |
2566	>	general_min_nonwildcard_simple |
2567	>	general_throttle_count |
2568	>	general_throttle_time |
2569	>	general_havent_read_conf |
2570	>	general_ping_cookie |
2571	>	general_disable_auth |
2572	>	general_tkline_expire_notices |
2573	>	general_gline_enable |
2574	>	general_gline_duration |
2575	>	general_gline_request_duration |
2576	>	general_gline_min_cidr |
2577	>	general_gline_min_cidr6 |
2578	>	general_stats_e_disabled |
2579	>	general_max_watch |
2580	>	general_cycle_on_host_change |
2581	>	error;
2582
2583
2584	<	general_max_watch: MAX_WATCH '=' NUMBER ';'
2584	>	general_away_count: AWAY_COUNT '=' NUMBER ';'
2585		{
2586	<	ConfigFileEntry.max_watch = $3;
2586	>	ConfigGeneral.away_count = $3;
2587		};
2588
2589	<	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2589	>	general_away_time: AWAY_TIME '=' timespec ';'
2590		{
2591	<	ConfigFileEntry.gline_min_cidr = $3;
2591	>	ConfigGeneral.away_time = $3;
2592		};
2593
2594	<	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2594	>	general_max_watch: MAX_WATCH '=' NUMBER ';'
2595		{
2596	<	ConfigFileEntry.gline_min_cidr6 = $3;
2596	>	ConfigGeneral.max_watch = $3;
2597		};
2598
2599	<	general_burst_away: BURST_AWAY '=' TBOOL ';'
2599	>	general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2600		{
2601	<	ConfigFileEntry.burst_away = yylval.number;
2601	>	if (conf_parser_ctx.pass == 2)
2602	>	ConfigGeneral.cycle_on_host_change = yylval.number;
2603		};
2604
2605	<	general_use_whois_actually: USE_WHOIS_ACTUALLY '=' TBOOL ';'
2605	>	general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2606		{
2607	<	ConfigFileEntry.use_whois_actually = yylval.number;
2607	>	if (conf_parser_ctx.pass == 2)
2608	>	ConfigGeneral.glines = yylval.number;
2609		};
2610
2611	<	general_reject_hold_time: TREJECT_HOLD_TIME '=' timespec ';'
2611	>	general_gline_duration: GLINE_DURATION '=' timespec ';'
2612		{
2613	<	GlobalSetOptions.rejecttime = yylval.number;
2613	>	if (conf_parser_ctx.pass == 2)
2614	>	ConfigGeneral.gline_time = $3;
2615		};
2616
2617	<	general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2617	>	general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2618		{
2619	<	ConfigFileEntry.tkline_expire_notices = yylval.number;
2619	>	if (conf_parser_ctx.pass == 2)
2620	>	ConfigGeneral.gline_request_time = $3;
2621		};
2622
2623	<	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' NUMBER ';'
2623	>	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2624		{
2625	<	ConfigFileEntry.kill_chase_time_limit = $3;
2625	>	ConfigGeneral.gline_min_cidr = $3;
2626		};
2627
2628	<	general_hide_spoof_ips: HIDE_SPOOF_IPS '=' TBOOL ';'
2628	>	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2629		{
2630	<	ConfigFileEntry.hide_spoof_ips = yylval.number;
2630	>	ConfigGeneral.gline_min_cidr6 = $3;
2631		};
2632
2633	<	general_ignore_bogus_ts: IGNORE_BOGUS_TS '=' TBOOL ';'
2633	>	general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2634		{
2635	<	ConfigFileEntry.ignore_bogus_ts = yylval.number;
2635	>	ConfigGeneral.tkline_expire_notices = yylval.number;
2636		};
2637
2638	<	general_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
2638	>	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2639		{
2640	<	ConfigFileEntry.disable_remote = yylval.number;
2640	>	ConfigGeneral.kill_chase_time_limit = $3;
2641	>	};
2642	>
2643	>	general_ignore_bogus_ts: IGNORE_BOGUS_TS '=' TBOOL ';'
2644	>	{
2645	>	ConfigGeneral.ignore_bogus_ts = yylval.number;
2646		};
2647
2648		general_failed_oper_notice: FAILED_OPER_NOTICE '=' TBOOL ';'
2649		{
2650	<	ConfigFileEntry.failed_oper_notice = yylval.number;
2650	>	ConfigGeneral.failed_oper_notice = yylval.number;
2651		};
2652
2653		general_anti_nick_flood: ANTI_NICK_FLOOD '=' TBOOL ';'
2654		{
2655	<	ConfigFileEntry.anti_nick_flood = yylval.number;
2655	>	ConfigGeneral.anti_nick_flood = yylval.number;
2656		};
2657
2658		general_max_nick_time: MAX_NICK_TIME '=' timespec ';'
2659		{
2660	<	ConfigFileEntry.max_nick_time = $3;
2660	>	ConfigGeneral.max_nick_time = $3;
2661		};
2662
2663		general_max_nick_changes: MAX_NICK_CHANGES '=' NUMBER ';'
2664		{
2665	<	ConfigFileEntry.max_nick_changes = $3;
2665	>	ConfigGeneral.max_nick_changes = $3;
2666		};
2667
2668		general_max_accept: MAX_ACCEPT '=' NUMBER ';'
2669		{
2670	<	ConfigFileEntry.max_accept = $3;
2670	>	ConfigGeneral.max_accept = $3;
2671		};
2672
2673		general_anti_spam_exit_message_time: ANTI_SPAM_EXIT_MESSAGE_TIME '=' timespec ';'
2674		{
2675	<	ConfigFileEntry.anti_spam_exit_message_time = $3;
2675	>	ConfigGeneral.anti_spam_exit_message_time = $3;
2676		};
2677
2678		general_ts_warn_delta: TS_WARN_DELTA '=' timespec ';'
2679		{
2680	<	ConfigFileEntry.ts_warn_delta = $3;
2680	>	ConfigGeneral.ts_warn_delta = $3;
2681		};
2682
2683		general_ts_max_delta: TS_MAX_DELTA '=' timespec ';'
2684		{
2685		if (conf_parser_ctx.pass == 2)
2686	<	ConfigFileEntry.ts_max_delta = $3;
2686	>	ConfigGeneral.ts_max_delta = $3;
2687		};
2688
2689		general_havent_read_conf: HAVENT_READ_CONF '=' NUMBER ';'
2690		{
2691		if (($3 > 0) && conf_parser_ctx.pass == 1)
2692		{
2693	<	ilog(L_CRIT, "You haven't read your config file properly.");
2694	<	ilog(L_CRIT, "There is a line in the example conf that will kill your server if not removed.");
2695	<	ilog(L_CRIT, "Consider actually reading/editing the conf file, and removing this line.");
2693	>	ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
2694	>	ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
2695	>	ilog(LOG_TYPE_IRCD, "Consider actually reading/editing the conf file, and removing this line.");
2696		exit(0);
2697		}
2698		};
2699
3298	–	general_kline_with_reason: KLINE_WITH_REASON '=' TBOOL ';'
3299	–	{
3300	–	ConfigFileEntry.kline_with_reason = yylval.number;
3301	–	};
3302	–
3303	–	general_kline_reason: KLINE_REASON '=' QSTRING ';'
3304	–	{
3305	–	if (conf_parser_ctx.pass == 2)
3306	–	{
3307	–	MyFree(ConfigFileEntry.kline_reason);
3308	–	DupString(ConfigFileEntry.kline_reason, yylval.string);
3309	–	}
3310	–	};
3311	–
2700		general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2701		{
2702	<	ConfigFileEntry.invisible_on_connect = yylval.number;
2702	>	ConfigGeneral.invisible_on_connect = yylval.number;
2703		};
2704
2705	<	general_warn_no_nline: WARN_NO_NLINE '=' TBOOL ';'
2705	>	general_warn_no_connect_block: WARN_NO_CONNECT_BLOCK '=' TBOOL ';'
2706		{
2707	<	ConfigFileEntry.warn_no_nline = yylval.number;
2707	>	ConfigGeneral.warn_no_connect_block = yylval.number;
2708		};
2709
2710		general_stats_e_disabled: STATS_E_DISABLED '=' TBOOL ';'
2711		{
2712	<	ConfigFileEntry.stats_e_disabled = yylval.number;
2712	>	ConfigGeneral.stats_e_disabled = yylval.number;
2713		};
2714
2715		general_stats_o_oper_only: STATS_O_OPER_ONLY '=' TBOOL ';'
2716		{
2717	<	ConfigFileEntry.stats_o_oper_only = yylval.number;
2717	>	ConfigGeneral.stats_o_oper_only = yylval.number;
2718		};
2719
2720		general_stats_P_oper_only: STATS_P_OPER_ONLY '=' TBOOL ';'
2721		{
2722	<	ConfigFileEntry.stats_P_oper_only = yylval.number;
2722	>	ConfigGeneral.stats_P_oper_only = yylval.number;
2723	>	};
2724	>
2725	>	general_stats_u_oper_only: STATS_U_OPER_ONLY '=' TBOOL ';'
2726	>	{
2727	>	ConfigGeneral.stats_u_oper_only = yylval.number;
2728		};
2729
2730		general_stats_k_oper_only: STATS_K_OPER_ONLY '=' TBOOL ';'
2731		{
2732	<	ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
2732	>	ConfigGeneral.stats_k_oper_only = 2 * yylval.number;
2733		} | STATS_K_OPER_ONLY '=' TMASKED ';'
2734		{
2735	<	ConfigFileEntry.stats_k_oper_only = 1;
2735	>	ConfigGeneral.stats_k_oper_only = 1;
2736		};
2737
2738		general_stats_i_oper_only: STATS_I_OPER_ONLY '=' TBOOL ';'
2739		{
2740	<	ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
2740	>	ConfigGeneral.stats_i_oper_only = 2 * yylval.number;
2741		} | STATS_I_OPER_ONLY '=' TMASKED ';'
2742		{
2743	<	ConfigFileEntry.stats_i_oper_only = 1;
2743	>	ConfigGeneral.stats_i_oper_only = 1;
2744		};
2745
2746		general_pace_wait: PACE_WAIT '=' timespec ';'
2747		{
2748	<	ConfigFileEntry.pace_wait = $3;
2748	>	ConfigGeneral.pace_wait = $3;
2749		};
2750
2751		general_caller_id_wait: CALLER_ID_WAIT '=' timespec ';'
2752		{
2753	<	ConfigFileEntry.caller_id_wait = $3;
2753	>	ConfigGeneral.caller_id_wait = $3;
2754		};
2755
2756		general_opers_bypass_callerid: OPERS_BYPASS_CALLERID '=' TBOOL ';'
2757		{
2758	<	ConfigFileEntry.opers_bypass_callerid = yylval.number;
2758	>	ConfigGeneral.opers_bypass_callerid = yylval.number;
2759		};
2760
2761		general_pace_wait_simple: PACE_WAIT_SIMPLE '=' timespec ';'
2762		{
2763	<	ConfigFileEntry.pace_wait_simple = $3;
2763	>	ConfigGeneral.pace_wait_simple = $3;
2764		};
2765
2766		general_short_motd: SHORT_MOTD '=' TBOOL ';'
2767		{
2768	<	ConfigFileEntry.short_motd = yylval.number;
2768	>	ConfigGeneral.short_motd = yylval.number;
2769		};
2770	<
2770	>
2771		general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
2772		{
2773	<	ConfigFileEntry.no_oper_flood = yylval.number;
2773	>	ConfigGeneral.no_oper_flood = yylval.number;
2774		};
2775
2776		general_true_no_oper_flood: TRUE_NO_OPER_FLOOD '=' TBOOL ';'
2777		{
2778	<	ConfigFileEntry.true_no_oper_flood = yylval.number;
2778	>	ConfigGeneral.true_no_oper_flood = yylval.number;
2779		};
2780
2781		general_oper_pass_resv: OPER_PASS_RESV '=' TBOOL ';'
2782		{
2783	<	ConfigFileEntry.oper_pass_resv = yylval.number;
3391	<	};
3392	<
3393	<	general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
3394	<	{
3395	<	if (conf_parser_ctx.pass == 2)
3396	<	{
3397	<	if (strlen(yylval.string) > LOCALE_LENGTH-2)
3398	<	yylval.string[LOCALE_LENGTH-1] = '\0';
3399	<
3400	<	set_locale(yylval.string);
3401	<	}
3402	<	};
3403	<
3404	<	general_idletime: IDLETIME '=' timespec ';'
3405	<	{
3406	<	ConfigFileEntry.idletime = $3;
2783	>	ConfigGeneral.oper_pass_resv = yylval.number;
2784		};
2785
2786		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2787		{
2788	<	ConfigFileEntry.dots_in_ident = $3;
2788	>	ConfigGeneral.dots_in_ident = $3;
2789		};
2790
2791		general_max_targets: MAX_TARGETS '=' NUMBER ';'
2792		{
2793	<	ConfigFileEntry.max_targets = $3;
3417	<	};
3418	<
3419	<	general_servlink_path: SERVLINK_PATH '=' QSTRING ';'
3420	<	{
3421	<	if (conf_parser_ctx.pass == 2)
3422	<	{
3423	<	MyFree(ConfigFileEntry.servlink_path);
3424	<	DupString(ConfigFileEntry.servlink_path, yylval.string);
3425	<	}
2793	>	ConfigGeneral.max_targets = $3;
2794		};
2795
2796	<	general_default_cipher_preference: DEFAULT_CIPHER_PREFERENCE '=' QSTRING ';'
3429	<	{
3430	<	#ifdef HAVE_LIBCRYPTO
3431	<	if (conf_parser_ctx.pass == 2)
3432	<	{
3433	<	struct EncCapability *ecap;
3434	<	const char *cipher_name;
3435	<	int found = 0;
3436	<
3437	<	ConfigFileEntry.default_cipher_preference = NULL;
3438	<	cipher_name = yylval.string;
3439	<
3440	<	for (ecap = CipherTable; ecap->name; ecap++)
3441	<	{
3442	<	if ((irccmp(ecap->name, cipher_name) == 0) &&
3443	<	(ecap->cap & CAP_ENC_MASK))
3444	<	{
3445	<	ConfigFileEntry.default_cipher_preference = ecap;
3446	<	found = 1;
3447	<	break;
3448	<	}
3449	<	}
3450	<
3451	<	if (!found)
3452	<	yyerror("Invalid cipher");
3453	<	}
3454	<	#else
3455	<	if (conf_parser_ctx.pass == 2)
3456	<	yyerror("Ignoring default_cipher_preference -- no OpenSSL support");
3457	<	#endif
3458	<	};
3459	<
3460	<	general_compression_level: COMPRESSION_LEVEL '=' NUMBER ';'
3461	<	{
3462	<	if (conf_parser_ctx.pass == 2)
3463	<	{
3464	<	ConfigFileEntry.compression_level = $3;
3465	<	#ifndef HAVE_LIBZ
3466	<	yyerror("Ignoring compression_level -- no zlib support");
3467	<	#else
3468	<	if ((ConfigFileEntry.compression_level < 1) ||
3469	<	(ConfigFileEntry.compression_level > 9))
3470	<	{
3471	<	yyerror("Ignoring invalid compression_level, using default");
3472	<	ConfigFileEntry.compression_level = 0;
3473	<	}
3474	<	#endif
3475	<	}
3476	<	};
3477	<
3478	<	general_use_egd: USE_EGD '=' TBOOL ';'
2796	>	general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2797		{
2798	<	ConfigFileEntry.use_egd = yylval.number;
2798	>	ConfigGeneral.ping_cookie = yylval.number;
2799		};
2800
2801	<	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
3484	<	{
3485	<	if (conf_parser_ctx.pass == 2)
3486	<	{
3487	<	MyFree(ConfigFileEntry.egdpool_path);
3488	<	DupString(ConfigFileEntry.egdpool_path, yylval.string);
3489	<	}
3490	<	};
3491	<
3492	<	general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2801	>	general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2802		{
2803	<	ConfigFileEntry.ping_cookie = yylval.number;
2803	>	ConfigGeneral.disable_auth = yylval.number;
2804		};
2805
2806	<	general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2806	>	general_throttle_count: THROTTLE_COUNT '=' NUMBER ';'
2807		{
2808	<	ConfigFileEntry.disable_auth = yylval.number;
2808	>	ConfigGeneral.throttle_count = $3;
2809		};
2810
2811		general_throttle_time: THROTTLE_TIME '=' timespec ';'
2812		{
2813	<	ConfigFileEntry.throttle_time = yylval.number;
2813	>	ConfigGeneral.throttle_time = $3;
2814		};
2815
2816		general_oper_umodes: OPER_UMODES
2817		{
2818	<	ConfigFileEntry.oper_umodes = 0;
2818	>	ConfigGeneral.oper_umodes = 0;
2819		} '='  umode_oitems ';' ;
2820
2821		umode_oitems:    umode_oitems ',' umode_oitem | umode_oitem;
2822		umode_oitem:     T_BOTS
2823		{
2824	<	ConfigFileEntry.oper_umodes |= UMODE_BOTS;
2824	>	ConfigGeneral.oper_umodes |= UMODE_BOTS;
2825		} | T_CCONN
2826		{
2827	<	ConfigFileEntry.oper_umodes |= UMODE_CCONN;
3519	<	} | T_CCONN_FULL
3520	<	{
3521	<	ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
2827	>	ConfigGeneral.oper_umodes |= UMODE_CCONN;
2828		} | T_DEAF
2829		{
2830	<	ConfigFileEntry.oper_umodes |= UMODE_DEAF;
2830	>	ConfigGeneral.oper_umodes |= UMODE_DEAF;
2831		} | T_DEBUG
2832		{
2833	<	ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
2833	>	ConfigGeneral.oper_umodes |= UMODE_DEBUG;
2834		} | T_FULL
2835		{
2836	<	ConfigFileEntry.oper_umodes |= UMODE_FULL;
2836	>	ConfigGeneral.oper_umodes |= UMODE_FULL;
2837	>	} | HIDDEN
2838	>	{
2839	>	ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
2840	>	} | HIDE_CHANS
2841	>	{
2842	>	ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
2843	>	} | HIDE_IDLE
2844	>	{
2845	>	ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
2846		} | T_SKILL
2847		{
2848	<	ConfigFileEntry.oper_umodes |= UMODE_SKILL;
2848	>	ConfigGeneral.oper_umodes |= UMODE_SKILL;
2849		} | T_NCHANGE
2850		{
2851	<	ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
2851	>	ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
2852		} | T_REJ
2853		{
2854	<	ConfigFileEntry.oper_umodes |= UMODE_REJ;
2854	>	ConfigGeneral.oper_umodes |= UMODE_REJ;
2855		} | T_UNAUTH
2856		{
2857	<	ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
2857	>	ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
2858		} | T_SPY
2859		{
2860	<	ConfigFileEntry.oper_umodes |= UMODE_SPY;
2860	>	ConfigGeneral.oper_umodes |= UMODE_SPY;
2861		} | T_EXTERNAL
2862		{
2863	<	ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
3549	<	} | T_OPERWALL
3550	<	{
3551	<	ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
2863	>	ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
2864		} | T_SERVNOTICE
2865		{
2866	<	ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
2866	>	ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
2867		} | T_INVISIBLE
2868		{
2869	<	ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
2869	>	ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
2870		} | T_WALLOP
2871		{
2872	<	ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
2872	>	ConfigGeneral.oper_umodes |= UMODE_WALLOP;
2873		} | T_SOFTCALLERID
2874		{
2875	<	ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
2875	>	ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
2876		} | T_CALLERID
2877		{
2878	<	ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
2878	>	ConfigGeneral.oper_umodes |= UMODE_CALLERID;
2879		} | T_LOCOPS
2880		{
2881	<	ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
2881	>	ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
2882	>	} | T_NONONREG
2883	>	{
2884	>	ConfigGeneral.oper_umodes |= UMODE_REGONLY;
2885	>	} | T_FARCONNECT
2886	>	{
2887	>	ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
2888		};
2889
2890	<	general_oper_only_umodes: OPER_ONLY_UMODES
2890	>	general_oper_only_umodes: OPER_ONLY_UMODES
2891		{
2892	<	ConfigFileEntry.oper_only_umodes = 0;
2892	>	ConfigGeneral.oper_only_umodes = 0;
2893		} '='  umode_items ';' ;
2894
2895	<	umode_items:    umode_items ',' umode_item | umode_item;
2896	<	umode_item:     T_BOTS
2895	>	umode_items:  umode_items ',' umode_item | umode_item;
2896	>	umode_item:   T_BOTS
2897		{
2898	<	ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
2898	>	ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
2899		} | T_CCONN
2900		{
2901	<	ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
3584	<	} | T_CCONN_FULL
3585	<	{
3586	<	ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
2901	>	ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
2902		} | T_DEAF
2903		{
2904	<	ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
2904	>	ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
2905		} | T_DEBUG
2906		{
2907	<	ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
2907	>	ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
2908		} | T_FULL
2909	<	{
2910	<	ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
2909	>	{
2910	>	ConfigGeneral.oper_only_umodes |= UMODE_FULL;
2911		} | T_SKILL
2912		{
2913	<	ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
2913	>	ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
2914	>	} | HIDDEN
2915	>	{
2916	>	ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
2917		} | T_NCHANGE
2918		{
2919	<	ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
2919	>	ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
2920		} | T_REJ
2921		{
2922	<	ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
2922	>	ConfigGeneral.oper_only_umodes |= UMODE_REJ;
2923		} | T_UNAUTH
2924		{
2925	<	ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
2925	>	ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
2926		} | T_SPY
2927		{
2928	<	ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
2928	>	ConfigGeneral.oper_only_umodes |= UMODE_SPY;
2929		} | T_EXTERNAL
2930		{
2931	<	ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
3614	<	} | T_OPERWALL
3615	<	{
3616	<	ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
2931	>	ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
2932		} | T_SERVNOTICE
2933		{
2934	<	ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
2934	>	ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
2935		} | T_INVISIBLE
2936		{
2937	<	ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
2937	>	ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
2938		} | T_WALLOP
2939		{
2940	<	ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
2940	>	ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
2941		} | T_SOFTCALLERID
2942		{
2943	<	ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
2943	>	ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
2944		} | T_CALLERID
2945		{
2946	<	ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
2946	>	ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
2947		} | T_LOCOPS
2948		{
2949	<	ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
2949	>	ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
2950	>	} | T_NONONREG
2951	>	{
2952	>	ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
2953	>	} | T_FARCONNECT
2954	>	{
2955	>	ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
2956		};
2957
2958		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
2959		{
2960	<	ConfigFileEntry.min_nonwildcard = $3;
2960	>	ConfigGeneral.min_nonwildcard = $3;
2961		};
2962
2963		general_min_nonwildcard_simple: MIN_NONWILDCARD_SIMPLE '=' NUMBER ';'
2964		{
2965	<	ConfigFileEntry.min_nonwildcard_simple = $3;
2965	>	ConfigGeneral.min_nonwildcard_simple = $3;
2966		};
2967
2968		general_default_floodcount: DEFAULT_FLOODCOUNT '=' NUMBER ';'
2969		{
2970	<	ConfigFileEntry.default_floodcount = $3;
3650	<	};
3651	<
3652	<	general_client_flood: T_CLIENT_FLOOD '=' sizespec ';'
3653	<	{
3654	<	ConfigFileEntry.client_flood = $3;
3655	<	};
3656	<
3657	<	general_dot_in_ip6_addr: DOT_IN_IP6_ADDR '=' TBOOL ';'
3658	<	{
3659	<	ConfigFileEntry.dot_in_ip6_addr = yylval.number;
3660	<	};
3661	<
3662	<	/***************************************************************************
3663	<	*  section glines
3664	<	***************************************************************************/
3665	<	gline_entry: GLINES
3666	<	{
3667	<	if (conf_parser_ctx.pass == 2)
3668	<	{
3669	<	yy_conf = make_conf_item(GDENY_TYPE);
3670	<	yy_aconf = map_to_conf(yy_conf);
3671	<	}
3672	<	} '{' gline_items '}' ';'
3673	<	{
3674	<	if (conf_parser_ctx.pass == 2)
3675	<	{
3676	<	/*
3677	<	* since we re-allocate yy_conf/yy_aconf after the end of action=, at the
3678	<	* end we will have one extra, so we should free it.
3679	<	*/
3680	<	if (yy_conf->name == NULL || yy_aconf->user == NULL)
3681	<	{
3682	<	delete_conf_item(yy_conf);
3683	<	yy_conf = NULL;
3684	<	yy_aconf = NULL;
3685	<	}
3686	<	}
3687	<	};
3688	<
3689	<	gline_items:        gline_items gline_item | gline_item;
3690	<	gline_item:         gline_enable |
3691	<	gline_duration |
3692	<	gline_logging |
3693	<	gline_user |
3694	<	gline_server |
3695	<	gline_action |
3696	<	error;
3697	<
3698	<	gline_enable: ENABLE '=' TBOOL ';'
3699	<	{
3700	<	if (conf_parser_ctx.pass == 2)
3701	<	ConfigFileEntry.glines = yylval.number;
3702	<	};
3703	<
3704	<	gline_duration: DURATION '=' timespec ';'
3705	<	{
3706	<	if (conf_parser_ctx.pass == 2)
3707	<	ConfigFileEntry.gline_time = $3;
3708	<	};
3709	<
3710	<	gline_logging: LOGGING
3711	<	{
3712	<	if (conf_parser_ctx.pass == 2)
3713	<	ConfigFileEntry.gline_logging = 0;
3714	<	} '=' gline_logging_types ';';
3715	<	gline_logging_types:     gline_logging_types ',' gline_logging_type_item | gline_logging_type_item;
3716	<	gline_logging_type_item: T_REJECT
3717	<	{
3718	<	if (conf_parser_ctx.pass == 2)
3719	<	ConfigFileEntry.gline_logging |= GDENY_REJECT;
3720	<	} | T_BLOCK
3721	<	{
3722	<	if (conf_parser_ctx.pass == 2)
3723	<	ConfigFileEntry.gline_logging |= GDENY_BLOCK;
2970	>	ConfigGeneral.default_floodcount = $3;
2971		};
2972
3726	–	gline_user: USER '=' QSTRING ';'
3727	–	{
3728	–	if (conf_parser_ctx.pass == 2)
3729	–	{
3730	–	struct split_nuh_item nuh;
3731	–
3732	–	nuh.nuhmask  = yylval.string;
3733	–	nuh.nickptr  = NULL;
3734	–	nuh.userptr  = userbuf;
3735	–	nuh.hostptr  = hostbuf;
3736	–
3737	–	nuh.nicksize = 0;
3738	–	nuh.usersize = sizeof(userbuf);
3739	–	nuh.hostsize = sizeof(hostbuf);
3740	–
3741	–	split_nuh(&nuh);
3742	–
3743	–	if (yy_aconf->user == NULL)
3744	–	{
3745	–	DupString(yy_aconf->user, userbuf);
3746	–	DupString(yy_aconf->host, hostbuf);
3747	–	}
3748	–	else
3749	–	{
3750	–	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
3751	–
3752	–	DupString(yy_tmp->user, userbuf);
3753	–	DupString(yy_tmp->host, hostbuf);
3754	–
3755	–	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
3756	–	}
3757	–	}
3758	–	};
3759	–
3760	–	gline_server: NAME '=' QSTRING ';'
3761	–	{
3762	–	if (conf_parser_ctx.pass == 2)
3763	–	{
3764	–	MyFree(yy_conf->name);
3765	–	DupString(yy_conf->name, yylval.string);
3766	–	}
3767	–	};
3768	–
3769	–	gline_action: ACTION
3770	–	{
3771	–	if (conf_parser_ctx.pass == 2)
3772	–	yy_aconf->flags = 0;
3773	–	} '=' gdeny_types ';'
3774	–	{
3775	–	if (conf_parser_ctx.pass == 2)
3776	–	{
3777	–	struct CollectItem *yy_tmp = NULL;
3778	–	dlink_node *ptr, *next_ptr;
3779	–
3780	–	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3781	–	{
3782	–	struct AccessItem *new_aconf;
3783	–	struct ConfItem *new_conf;
3784	–
3785	–	yy_tmp = ptr->data;
3786	–	new_conf = make_conf_item(GDENY_TYPE);
3787	–	new_aconf = map_to_conf(new_conf);
3788	–
3789	–	new_aconf->flags = yy_aconf->flags;
3790	–
3791	–	if (yy_conf->name != NULL)
3792	–	DupString(new_conf->name, yy_conf->name);
3793	–	else
3794	–	DupString(new_conf->name, "*");
3795	–	if (yy_aconf->user != NULL)
3796	–	DupString(new_aconf->user, yy_tmp->user);
3797	–	else
3798	–	DupString(new_aconf->user, "*");
3799	–	if (yy_aconf->host != NULL)
3800	–	DupString(new_aconf->host, yy_tmp->host);
3801	–	else
3802	–	DupString(new_aconf->host, "*");
3803	–
3804	–	dlinkDelete(&yy_tmp->node, &col_conf_list);
3805	–	}
3806	–
3807	–	/*
3808	–	* In case someone has fed us with more than one action= after user/name
3809	–	* which would leak memory  -Michael
3810	–	*/
3811	–	if (yy_conf->name == NULL || yy_aconf->user == NULL)
3812	–	delete_conf_item(yy_conf);
3813	–
3814	–	yy_conf = make_conf_item(GDENY_TYPE);
3815	–	yy_aconf = map_to_conf(yy_conf);
3816	–	}
3817	–	};
3818	–
3819	–	gdeny_types: gdeny_types ',' gdeny_type_item | gdeny_type_item;
3820	–	gdeny_type_item: T_REJECT
3821	–	{
3822	–	if (conf_parser_ctx.pass == 2)
3823	–	yy_aconf->flags |= GDENY_REJECT;
3824	–	} | T_BLOCK
3825	–	{
3826	–	if (conf_parser_ctx.pass == 2)
3827	–	yy_aconf->flags |= GDENY_BLOCK;
3828	–	};
2973
2974		/***************************************************************************
2975		*  section channel
#	Line 3834 | Line 2978 | channel_entry: CHANNEL
2978		'{' channel_items '}' ';';
2979
2980		channel_items:      channel_items channel_item | channel_item;
2981	<	channel_item:       channel_disable_local_channels | channel_use_except |
2982	<	channel_use_invex | channel_use_knock |
2983	<	channel_max_bans | channel_knock_delay |
2984	<	channel_knock_delay_channel | channel_max_chans_per_user |
2985	<	channel_quiet_on_ban | channel_default_split_user_count |
2981	>	channel_item:       channel_max_bans |
2982	>	channel_invite_client_count |
2983	>	channel_invite_client_time |
2984	>	channel_knock_client_count |
2985	>	channel_knock_client_time |
2986	>	channel_knock_delay_channel |
2987	>	channel_max_channels |
2988	>	channel_default_split_user_count |
2989		channel_default_split_server_count |
2990	<	channel_no_create_on_split | channel_restrict_channels |
2991	<	channel_no_join_on_split | channel_burst_topicwho |
2992	<	channel_jflood_count | channel_jflood_time |
2993	<	channel_disable_fake_channels | error;
2990	>	channel_no_create_on_split |
2991	>	channel_no_join_on_split |
2992	>	channel_jflood_count |
2993	>	channel_jflood_time |
2994	>	channel_disable_fake_channels |
2995	>	error;
2996
2997		channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
2998		{
2999		ConfigChannel.disable_fake_channels = yylval.number;
3000		};
3001
3002	<	channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
3854	<	{
3855	<	ConfigChannel.restrict_channels = yylval.number;
3856	<	};
3857	<
3858	<	channel_disable_local_channels: DISABLE_LOCAL_CHANNELS '=' TBOOL ';'
3859	<	{
3860	<	ConfigChannel.disable_local_channels = yylval.number;
3861	<	};
3862	<
3863	<	channel_use_except: USE_EXCEPT '=' TBOOL ';'
3002	>	channel_invite_client_count: INVITE_CLIENT_COUNT '=' NUMBER ';'
3003		{
3004	<	ConfigChannel.use_except = yylval.number;
3004	>	ConfigChannel.invite_client_count = $3;
3005		};
3006
3007	<	channel_use_invex: USE_INVEX '=' TBOOL ';'
3007	>	channel_invite_client_time: INVITE_CLIENT_TIME '=' timespec ';'
3008		{
3009	<	ConfigChannel.use_invex = yylval.number;
3009	>	ConfigChannel.invite_client_time = $3;
3010		};
3011
3012	<	channel_use_knock: USE_KNOCK '=' TBOOL ';'
3012	>	channel_knock_client_count: KNOCK_CLIENT_COUNT '=' NUMBER ';'
3013		{
3014	<	ConfigChannel.use_knock = yylval.number;
3014	>	ConfigChannel.knock_client_count = $3;
3015		};
3016
3017	<	channel_knock_delay: KNOCK_DELAY '=' timespec ';'
3017	>	channel_knock_client_time: KNOCK_CLIENT_TIME '=' timespec ';'
3018		{
3019	<	ConfigChannel.knock_delay = $3;
3019	>	ConfigChannel.knock_client_time = $3;
3020		};
3021
3022		channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
#	Line 3885 | Line 3024 | channel_knock_delay_channel: KNOCK_DELAY
3024		ConfigChannel.knock_delay_channel = $3;
3025		};
3026
3027	<	channel_max_chans_per_user: MAX_CHANS_PER_USER '=' NUMBER ';'
3027	>	channel_max_channels: MAX_CHANNELS '=' NUMBER ';'
3028		{
3029	<	ConfigChannel.max_chans_per_user = $3;
3891	<	};
3892	<
3893	<	channel_quiet_on_ban: QUIET_ON_BAN '=' TBOOL ';'
3894	<	{
3895	<	ConfigChannel.quiet_on_ban = yylval.number;
3029	>	ConfigChannel.max_channels = $3;
3030		};
3031
3032		channel_max_bans: MAX_BANS '=' NUMBER ';'
#	Line 3920 | Line 3054 | channel_no_join_on_split: NO_JOIN_ON_SPL
3054		ConfigChannel.no_join_on_split = yylval.number;
3055		};
3056
3923	–	channel_burst_topicwho: BURST_TOPICWHO '=' TBOOL ';'
3924	–	{
3925	–	ConfigChannel.burst_topicwho = yylval.number;
3926	–	};
3927	–
3057		channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
3058		{
3059		GlobalSetOptions.joinfloodcount = yylval.number;
#	Line 3932 | Line 3061 | channel_jflood_count: JOIN_FLOOD_COUNT '
3061
3062		channel_jflood_time: JOIN_FLOOD_TIME '=' timespec ';'
3063		{
3064	<	GlobalSetOptions.joinfloodtime = yylval.number;
3064	>	GlobalSetOptions.joinfloodtime = $3;
3065		};
3066
3067		/***************************************************************************
#	Line 3942 | Line 3071 | serverhide_entry: SERVERHIDE
3071		'{' serverhide_items '}' ';';
3072
3073		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
3074	<	serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
3075	<	serverhide_links_delay |
3076	<	serverhide_disable_hidden |
3077	<	serverhide_hidden | serverhide_hidden_name |
3078	<	serverhide_hide_server_ips |
3074	>	serverhide_item:    serverhide_flatten_links |
3075	>	serverhide_disable_remote_commands |
3076	>	serverhide_hide_servers |
3077	>	serverhide_hide_services |
3078	>	serverhide_links_delay |
3079	>	serverhide_hidden |
3080	>	serverhide_hidden_name |
3081	>	serverhide_hide_server_ips |
3082		error;
3083
3084		serverhide_flatten_links: FLATTEN_LINKS '=' TBOOL ';'
#	Line 3955 | Line 3087 | serverhide_flatten_links: FLATTEN_LINKS
3087		ConfigServerHide.flatten_links = yylval.number;
3088		};
3089
3090	+	serverhide_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
3091	+	{
3092	+	if (conf_parser_ctx.pass == 2)
3093	+	ConfigServerHide.disable_remote_commands = yylval.number;
3094	+	};
3095	+
3096		serverhide_hide_servers: HIDE_SERVERS '=' TBOOL ';'
3097		{
3098		if (conf_parser_ctx.pass == 2)
3099		ConfigServerHide.hide_servers = yylval.number;
3100		};
3101
3102	+	serverhide_hide_services: HIDE_SERVICES '=' TBOOL ';'
3103	+	{
3104	+	if (conf_parser_ctx.pass == 2)
3105	+	ConfigServerHide.hide_services = yylval.number;
3106	+	};
3107	+
3108		serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
3109		{
3110		if (conf_parser_ctx.pass == 2)
3111		{
3112		MyFree(ConfigServerHide.hidden_name);
3113	<	DupString(ConfigServerHide.hidden_name, yylval.string);
3113	>	ConfigServerHide.hidden_name = xstrdup(yylval.string);
3114		}
3115		};
3116
#	Line 3976 | Line 3120 | serverhide_links_delay: LINKS_DELAY '='
3120		{
3121		if (($3 > 0) && ConfigServerHide.links_disabled == 1)
3122		{
3123	<	eventAddIsh("write_links_file", write_links_file, NULL, $3);
3123	>	event_write_links_file.when = $3;
3124	>	event_addish(&event_write_links_file, NULL);
3125		ConfigServerHide.links_disabled = 0;
3126		}
3127
#	Line 3990 | Line 3135 | serverhide_hidden: HIDDEN '=' TBOOL ';'
3135		ConfigServerHide.hidden = yylval.number;
3136		};
3137
3993	–	serverhide_disable_hidden: DISABLE_HIDDEN '=' TBOOL ';'
3994	–	{
3995	–	if (conf_parser_ctx.pass == 2)
3996	–	ConfigServerHide.disable_hidden = yylval.number;
3997	–	};
3998	–
3138		serverhide_hide_server_ips: HIDE_SERVER_IPS '=' TBOOL ';'
3139		{
3140		if (conf_parser_ctx.pass == 2)

Diff Legend

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