ViewVC Help

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

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

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

Diff Legend

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