ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/conf_parser.y (file contents), Revision 1416 by michael, Sat May 26 11:45:43 2012 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 4499 by michael, Sat Aug 16 18:29:23 2014 UTC

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

Diff Legend

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