ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/ircd_parser.y (file contents), Revision 593 by michael, Fri May 12 05:47:32 2006 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 1832 by michael, Fri Apr 19 19:16:09 2013 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  ircd_parser.y: Parses the ircd configuration file.
3	>	*  conf_parser.y: Parses the ircd configuration file.
4		*
5		*  Copyright (C) 2005 by the past and present ircd coders, and others.
6		*
#	Line 26 | Line 26
26
27		#define YY_NO_UNPUT
28		#include <sys/types.h>
29	+	#include <string.h>
30
31	+	#include "config.h"
32		#include "stdinc.h"
31	–	#include "dalloca.h"
33		#include "ircd.h"
33	–	#include "tools.h"
34		#include "list.h"
35	<	#include "s_conf.h"
35	>	#include "conf.h"
36	>	#include "conf_class.h"
37		#include "event.h"
38	<	#include "s_log.h"
38	>	#include "log.h"
39		#include "client.h"     /* for UMODE_ALL only */
39	–	#include "pcre.h"
40		#include "irc_string.h"
41	–	#include "irc_getaddrinfo.h"
42	–	#include "sprintf_irc.h"
41		#include "memory.h"
42		#include "modules.h"
43	<	#include "s_serv.h" /* for CAP_LL / IsCapable */
43	>	#include "s_serv.h"
44		#include "hostmask.h"
45		#include "send.h"
46		#include "listener.h"
#	Line 54 | Line 52
52		#include <openssl/rsa.h>
53		#include <openssl/bio.h>
54		#include <openssl/pem.h>
55	+	#include <openssl/dh.h>
56		#endif
57
58	<	static char *class_name = NULL;
60	<	static struct ConfItem *yy_conf = NULL;
61	<	static struct AccessItem *yy_aconf = NULL;
62	<	static struct MatchItem *yy_match_item = NULL;
63	<	static struct ClassItem *yy_class = NULL;
64	<	static char *yy_class_name = NULL;
65	<
66	<	static dlink_list col_conf_list  = { NULL, NULL, 0 };
67	<	static dlink_list hub_conf_list  = { NULL, NULL, 0 };
68	<	static dlink_list leaf_conf_list = { NULL, NULL, 0 };
69	<	static unsigned int listener_flags = 0;
70	<	static unsigned int regex_ban = 0;
71	<	static char userbuf[IRCD_BUFSIZE];
72	<	static char hostbuf[IRCD_BUFSIZE];
73	<	static char reasonbuf[REASONLEN + 1];
74	<	static char gecos_name[REALLEN * 4];
75	<
76	<	extern dlink_list gdeny_items; /* XXX */
77	<
78	<	static char *resv_reason = NULL;
79	<	static char *listener_address = NULL;
80	<	static int not_atom = 0;
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	<	};
58	>	#include "rsa.h"
59
60	<	static void
61	<	free_collect_item(struct CollectItem *item)
60	>	int yylex(void);
61	>
62	>	static struct
63		{
64	<	MyFree(item->name);
65	<	MyFree(item->user);
66	<	MyFree(item->host);
67	<	MyFree(item->passwd);
68	<	#ifdef HAVE_LIBCRYPTO
69	<	MyFree(item->rsa_public_key_file);
70	<	#endif
71	<	MyFree(item);
72	<	}
64	>	struct {
65	>	dlink_list list;
66	>	} mask,
67	>	leaf,
68	>	hub;
69	>
70	>	struct {
71	>	char buf[IRCD_BUFSIZE];
72	>	} name,
73	>	user,
74	>	host,
75	>	addr,
76	>	bind,
77	>	file,
78	>	ciph,
79	>	rpass,
80	>	spass,
81	>	class;
82	>
83	>	struct {
84	>	unsigned int value;
85	>	} flags,
86	>	modes,
87	>	size,
88	>	type,
89	>	port,
90	>	aftype,
91	>	ping_freq,
92	>	max_perip,
93	>	con_freq,
94	>	min_idle,
95	>	max_idle,
96	>	max_total,
97	>	max_global,
98	>	max_local,
99	>	max_ident,
100	>	max_sendq,
101	>	max_recvq,
102	>	cidr_bitlen_ipv4,
103	>	cidr_bitlen_ipv6,
104	>	number_per_cidr;
105	>	} block_state;
106
107		static void
108	<	unhook_hub_leaf_confs(void)
108	>	reset_block_state(void)
109		{
110	<	dlink_node *ptr;
114	<	dlink_node *next_ptr;
115	<	struct CollectItem *yy_hconf;
116	<	struct CollectItem *yy_lconf;
110	>	dlink_node *ptr = NULL, *ptr_next = NULL;
111
112	<	DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
112	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.mask.list.head)
113		{
114	<	yy_hconf = ptr->data;
115	<	dlinkDelete(&yy_hconf->node, &hub_conf_list);
116	<	free_collect_item(yy_hconf);
114	>	MyFree(ptr->data);
115	>	dlinkDelete(ptr, &block_state.mask.list);
116	>	free_dlink_node(ptr);
117		}
118
119	<	DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
119	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
120		{
121	<	yy_lconf = ptr->data;
122	<	dlinkDelete(&yy_lconf->node, &leaf_conf_list);
123	<	free_collect_item(yy_lconf);
121	>	MyFree(ptr->data);
122	>	dlinkDelete(ptr, &block_state.leaf.list);
123	>	free_dlink_node(ptr);
124		}
125	+
126	+	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.hub.list.head)
127	+	{
128	+	MyFree(ptr->data);
129	+	dlinkDelete(ptr, &block_state.hub.list);
130	+	free_dlink_node(ptr);
131	+	}
132	+
133	+	memset(&block_state, 0, sizeof(block_state));
134		}
135
136		%}
#	Line 138 | Line 141 | unhook_hub_leaf_confs(void)
141		}
142
143		%token  ACCEPT_PASSWORD
141	–	%token  ACTION
144		%token  ADMIN
145		%token  AFTYPE
144	–	%token  T_ALLOW
146		%token  ANTI_NICK_FLOOD
147		%token  ANTI_SPAM_EXIT_MESSAGE_TIME
148		%token  AUTOCONN
149	<	%token  T_BLOCK
149	<	%token  BURST_AWAY
150	<	%token  BURST_TOPICWHO
151	<	%token  BYTES KBYTES MBYTES GBYTES TBYTES
149	>	%token  BYTES KBYTES MBYTES
150		%token  CALLER_ID_WAIT
151		%token  CAN_FLOOD
154	–	%token  CAN_IDLE
152		%token  CHANNEL
153		%token  CIDR_BITLEN_IPV4
154		%token  CIDR_BITLEN_IPV6
158	–	%token  CIPHER_PREFERENCE
155		%token  CLASS
160	–	%token  COMPRESSED
161	–	%token  COMPRESSION_LEVEL
156		%token  CONNECT
157		%token  CONNECTFREQ
164	–	%token  CRYPTLINK
165	–	%token  DEFAULT_CIPHER_PREFERENCE
158		%token  DEFAULT_FLOODCOUNT
159		%token  DEFAULT_SPLIT_SERVER_COUNT
160		%token  DEFAULT_SPLIT_USER_COUNT
#	Line 170 | Line 162 | unhook_hub_leaf_confs(void)
162		%token  DESCRIPTION
163		%token  DIE
164		%token  DISABLE_AUTH
165	<	%token  DISABLE_HIDDEN
174	<	%token  DISABLE_LOCAL_CHANNELS
165	>	%token  DISABLE_FAKE_CHANNELS
166		%token  DISABLE_REMOTE_COMMANDS
176	–	%token  DOT_IN_IP6_ADDR
167		%token  DOTS_IN_IDENT
178	–	%token  DURATION
168		%token  EGDPOOL_PATH
169		%token  EMAIL
181	–	%token  ENABLE
170		%token  ENCRYPTED
171		%token  EXCEED_LIMIT
172		%token  EXEMPT
173		%token  FAILED_OPER_NOTICE
186	–	%token  FAKENAME
174		%token  IRCD_FLAGS
175		%token  FLATTEN_LINKS
189	–	%token  FFAILED_OPERLOG
190	–	%token  FKILLLOG
191	–	%token  FKLINELOG
192	–	%token  FGLINELOG
193	–	%token  FIOERRLOG
194	–	%token  FOPERLOG
195	–	%token  FOPERSPYLOG
196	–	%token  FUSERLOG
176		%token  GECOS
177		%token  GENERAL
178		%token  GLINE
179	<	%token  GLINES
179	>	%token  GLINE_DURATION
180	>	%token  GLINE_ENABLE
181		%token  GLINE_EXEMPT
182	<	%token  GLINE_LOG
203	<	%token  GLINE_TIME
182	>	%token  GLINE_REQUEST_DURATION
183		%token  GLINE_MIN_CIDR
184		%token  GLINE_MIN_CIDR6
185		%token  GLOBAL_KILL
#	Line 208 | Line 187 | unhook_hub_leaf_confs(void)
187		%token  NEED_IDENT
188		%token  HAVENT_READ_CONF
189		%token  HIDDEN
211	–	%token  HIDDEN_ADMIN
190		%token  HIDDEN_NAME
213	–	%token  HIDDEN_OPER
191		%token  HIDE_SERVER_IPS
192		%token  HIDE_SERVERS
193		%token  HIDE_SPOOF_IPS
194		%token  HOST
195		%token  HUB
196		%token  HUB_MASK
220	–	%token  IDLETIME
197		%token  IGNORE_BOGUS_TS
198		%token  INVISIBLE_ON_CONNECT
199		%token  IP
#	Line 225 | Line 201 | unhook_hub_leaf_confs(void)
201		%token  KILL_CHASE_TIME_LIMIT
202		%token  KLINE
203		%token  KLINE_EXEMPT
228	–	%token  KLINE_REASON
229	–	%token  KLINE_WITH_REASON
204		%token  KNOCK_DELAY
205		%token  KNOCK_DELAY_CHANNEL
232	–	%token  LAZYLINK
206		%token  LEAF_MASK
207		%token  LINKS_DELAY
208		%token  LISTEN
209		%token  T_LOG
237	–	%token  LOGGING
238	–	%token  LOG_LEVEL
210		%token  MAX_ACCEPT
211		%token  MAX_BANS
212	+	%token  MAX_CHANS_PER_OPER
213		%token  MAX_CHANS_PER_USER
214		%token  MAX_GLOBAL
215		%token  MAX_IDENT
216		%token  MAX_LOCAL
217		%token  MAX_NICK_CHANGES
218	+	%token  MAX_NICK_LENGTH
219		%token  MAX_NICK_TIME
220		%token  MAX_NUMBER
221		%token  MAX_TARGETS
222	<	%token  MESSAGE_LOCALE
222	>	%token  MAX_TOPIC_LENGTH
223	>	%token  MAX_WATCH
224		%token  MIN_NONWILDCARD
225		%token  MIN_NONWILDCARD_SIMPLE
226	+	%token  MIN_IDLE
227	+	%token  MAX_IDLE
228	+	%token  RANDOM_IDLE
229	+	%token  HIDE_IDLE_FROM_OPERS
230		%token  MODULE
231		%token  MODULES
232		%token  NAME
#	Line 261 | Line 239 | unhook_hub_leaf_confs(void)
239		%token  NO_JOIN_ON_SPLIT
240		%token  NO_OPER_FLOOD
241		%token  NO_TILDE
264	–	%token  NOT
242		%token  NUMBER
266	–	%token  NUMBER_PER_IDENT
243		%token  NUMBER_PER_CIDR
244		%token  NUMBER_PER_IP
269	–	%token  NUMBER_PER_IP_GLOBAL
245		%token  OPERATOR
246		%token  OPERS_BYPASS_CALLERID
272	–	%token  OPER_LOG
247		%token  OPER_ONLY_UMODES
248		%token  OPER_PASS_RESV
249		%token  OPER_SPY_T
#	Line 282 | Line 256 | unhook_hub_leaf_confs(void)
256		%token  PATH
257		%token  PING_COOKIE
258		%token  PING_TIME
285	–	%token  PING_WARNING
259		%token  PORT
260		%token  QSTRING
261		%token  QUIET_ON_BAN
#	Line 291 | Line 264 | unhook_hub_leaf_confs(void)
264		%token  REDIRSERV
265		%token  REGEX_T
266		%token  REHASH
294	–	%token  TREJECT_HOLD_TIME
267		%token  REMOTE
268		%token  REMOTEBAN
269		%token  RESTRICT_CHANNELS
298	–	%token  RESTRICTED
270		%token  RSA_PRIVATE_KEY_FILE
271		%token  RSA_PUBLIC_KEY_FILE
272		%token  SSL_CERTIFICATE_FILE
273	+	%token  SSL_DH_PARAM_FILE
274	+	%token  T_SSL_CLIENT_METHOD
275	+	%token  T_SSL_SERVER_METHOD
276	+	%token  T_SSLV3
277	+	%token  T_TLSV1
278		%token  RESV
279		%token  RESV_EXEMPT
280	<	%token  SECONDS MINUTES HOURS DAYS WEEKS
280	>	%token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
281		%token  SENDQ
282		%token  SEND_PASSWORD
283		%token  SERVERHIDE
284		%token  SERVERINFO
309	–	%token  SERVLINK_PATH
285		%token  IRCD_SID
286		%token  TKLINE_EXPIRE_NOTICES
287		%token  T_SHARED
288		%token  T_CLUSTER
289		%token  TYPE
290		%token  SHORT_MOTD
316	–	%token  SILENT
291		%token  SPOOF
292		%token  SPOOF_NOTICE
293		%token  STATS_E_DISABLED
#	Line 323 | Line 297 | unhook_hub_leaf_confs(void)
297		%token  STATS_P_OPER_ONLY
298		%token  TBOOL
299		%token  TMASKED
326	–	%token  T_REJECT
300		%token  TS_MAX_DELTA
301		%token  TS_WARN_DELTA
302		%token  TWODOTS
#	Line 332 | Line 305 | unhook_hub_leaf_confs(void)
305		%token  T_SOFTCALLERID
306		%token  T_CALLERID
307		%token  T_CCONN
308	<	%token  T_CLIENT_FLOOD
308	>	%token  T_CCONN_FULL
309	>	%token  T_SSL_CIPHER_LIST
310		%token  T_DEAF
311		%token  T_DEBUG
312	<	%token  T_DRONE
312	>	%token  T_DLINE
313		%token  T_EXTERNAL
314		%token  T_FULL
315		%token  T_INVISIBLE
316		%token  T_IPV4
317		%token  T_IPV6
318		%token  T_LOCOPS
345	–	%token  T_LOGPATH
346	–	%token  T_L_CRIT
347	–	%token  T_L_DEBUG
348	–	%token  T_L_ERROR
349	–	%token  T_L_INFO
350	–	%token  T_L_NOTICE
351	–	%token  T_L_TRACE
352	–	%token  T_L_WARN
319		%token  T_MAX_CLIENTS
320		%token  T_NCHANGE
321		%token  T_OPERWALL
322	+	%token  T_RECVQ
323		%token  T_REJ
324	+	%token  T_SERVER
325		%token  T_SERVNOTICE
326	+	%token  T_SET
327		%token  T_SKILL
328		%token  T_SPY
329		%token  T_SSL
330		%token  T_UMODES
331		%token  T_UNAUTH
332	+	%token  T_UNDLINE
333	+	%token  T_UNLIMITED
334		%token  T_UNRESV
335		%token  T_UNXLINE
336	+	%token  T_GLOBOPS
337		%token  T_WALLOP
338	+	%token  T_WEBIRC
339	+	%token  T_RESTART
340	+	%token  T_SERVICE
341	+	%token  T_SERVICES_NAME
342		%token  THROTTLE_TIME
367	–	%token  TOPICBURST
343		%token  TRUE_NO_OPER_FLOOD
369	–	%token  TKLINE
370	–	%token  TXLINE
371	–	%token  TRESV
344		%token  UNKLINE
345		%token  USER
346		%token  USE_EGD
375	–	%token  USE_EXCEPT
376	–	%token  USE_INVEX
377	–	%token  USE_KNOCK
347		%token  USE_LOGGING
379	–	%token  USE_WHOIS_ACTUALLY
348		%token  VHOST
349		%token  VHOST6
350		%token  XLINE
383	–	%token  WARN
351		%token  WARN_NO_NLINE
352	+	%token  T_SIZE
353	+	%token  T_FILE
354
355		%type <string> QSTRING
356		%type <number> NUMBER
#	Line 405 | Line 374 | conf_item:        admin_entry
374		| serverinfo_entry
375		| serverhide_entry
376		| resv_entry
377	+	| service_entry
378		| shared_entry
379		| cluster_entry
380		| connect_entry
#	Line 412 | Line 382 | conf_item:        admin_entry
382		| deny_entry
383		| exempt_entry
384		| general_entry
415	–	| gline_entry
385		| gecos_entry
386		| modules_entry
387		| error ';'
#	Line 445 | Line 414 | timespec:      NUMBER timespec_
414		{
415		$$ = $1 * 60 * 60 * 24 * 7 + $3;
416		}
417	+	| NUMBER MONTHS timespec_
418	+	{
419	+	$$ = $1 * 60 * 60 * 24 * 7 * 4 + $3;
420	+	}
421	+	| NUMBER YEARS timespec_
422	+	{
423	+	$$ = $1 * 60 * 60 * 24 * 365 + $3;
424	+	}
425		;
426
427		sizespec_:      { $$ = 0; } | sizespec;
#	Line 466 | Line 443 | modules_item:   modules_module | modules
443
444		modules_module: MODULE '=' QSTRING ';'
445		{
446	<	#ifndef STATIC_MODULES /* NOOP in the static case */
447	<	if (ypass == 2)
471	<	{
472	<	char *m_bn;
473	<
474	<	m_bn = basename(yylval.string);
475	<
476	<	/* I suppose we should just ignore it if it is already loaded(since
477	<	* otherwise we would flood the opers on rehash) -A1kmm.
478	<	*/
479	<	add_conf_module(yylval.string);
480	<	}
481	<	#endif
446	>	if (conf_parser_ctx.pass == 2)
447	>	add_conf_module(libio_basename(yylval.string));
448		};
449
450		modules_path: PATH '=' QSTRING ';'
451		{
452	<	#ifndef STATIC_MODULES
487	<	if (ypass == 2)
452	>	if (conf_parser_ctx.pass == 2)
453		mod_add_path(yylval.string);
489	–	#endif
454		};
455
492	–	/***************************************************************************
493	–	*  section serverinfo
494	–	***************************************************************************/
495	–	serverinfo_entry: SERVERINFO
496	–	'{' serverinfo_items '}' ';';
456
457	<	serverinfo_items:       serverinfo_items serverinfo_item |
458	<	serverinfo_item ;
457	>	serverinfo_entry: SERVERINFO '{' serverinfo_items '}' ';';
458	>
459	>	serverinfo_items:       serverinfo_items serverinfo_item | serverinfo_item ;
460		serverinfo_item:        serverinfo_name | serverinfo_vhost |
461		serverinfo_hub | serverinfo_description |
462		serverinfo_network_name | serverinfo_network_desc |
463	<	serverinfo_max_clients |
463	>	serverinfo_max_clients | serverinfo_max_nick_length |
464	>	serverinfo_max_topic_length | serverinfo_ssl_dh_param_file |
465		serverinfo_rsa_private_key_file | serverinfo_vhost6 |
466		serverinfo_sid | serverinfo_ssl_certificate_file |
467	+	serverinfo_ssl_client_method | serverinfo_ssl_server_method |
468	+	serverinfo_ssl_cipher_list |
469		error ';' ;
470
471	+
472	+	serverinfo_ssl_client_method: T_SSL_CLIENT_METHOD '=' client_method_types ';' ;
473	+	serverinfo_ssl_server_method: T_SSL_SERVER_METHOD '=' server_method_types ';' ;
474	+
475	+	client_method_types: client_method_types ',' client_method_type_item | client_method_type_item;
476	+	client_method_type_item: T_SSLV3
477	+	{
478	+	#ifdef HAVE_LIBCRYPTO
479	+	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
480	+	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv3);
481	+	#endif
482	+	} | T_TLSV1
483	+	{
484	+	#ifdef HAVE_LIBCRYPTO
485	+	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
486	+	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_TLSv1);
487	+	#endif
488	+	};
489	+
490	+	server_method_types: server_method_types ',' server_method_type_item | server_method_type_item;
491	+	server_method_type_item: T_SSLV3
492	+	{
493	+	#ifdef HAVE_LIBCRYPTO
494	+	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
495	+	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
496	+	#endif
497	+	} | T_TLSV1
498	+	{
499	+	#ifdef HAVE_LIBCRYPTO
500	+	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
501	+	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
502	+	#endif
503	+	};
504	+
505		serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
506		{
507		#ifdef HAVE_LIBCRYPTO
508	<	if (ypass == 2 && ServerInfo.ctx)
508	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
509		{
510		if (!ServerInfo.rsa_private_key_file)
511		{
512	<	yyerror("No rsa_private_key_file specified, SSL disabled");
512	>	conf_error_report("No rsa_private_key_file specified, SSL disabled");
513		break;
514		}
515
516	<	if (SSL_CTX_use_certificate_file(ServerInfo.ctx,
517	<	yylval.string, SSL_FILETYPE_PEM) <= 0)
516	>	if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
517	>	SSL_FILETYPE_PEM) <= 0 ||
518	>	SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
519	>	SSL_FILETYPE_PEM) <= 0)
520		{
521	<	yyerror(ERR_lib_error_string(ERR_get_error()));
521	>	report_crypto_errors();
522	>	conf_error_report("Could not open/read certificate file");
523		break;
524		}
525
526	<	if (SSL_CTX_use_PrivateKey_file(ServerInfo.ctx,
527	<	ServerInfo.rsa_private_key_file, SSL_FILETYPE_PEM) <= 0)
526	>	if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
527	>	SSL_FILETYPE_PEM) <= 0 ||
528	>	SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
529	>	SSL_FILETYPE_PEM) <= 0)
530		{
531	<	yyerror(ERR_lib_error_string(ERR_get_error()));
531	>	report_crypto_errors();
532	>	conf_error_report("Could not read RSA private key");
533		break;
534		}
535
536	<	if (!SSL_CTX_check_private_key(ServerInfo.ctx))
536	>	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
537	>	!SSL_CTX_check_private_key(ServerInfo.client_ctx))
538		{
539	<	yyerror("RSA private key does not match the SSL certificate public key!");
539	>	report_crypto_errors();
540	>	conf_error_report("Could not read RSA private key");
541		break;
542		}
543		}
#	Line 542 | Line 547 | serverinfo_ssl_certificate_file: SSL_CER
547		serverinfo_rsa_private_key_file: RSA_PRIVATE_KEY_FILE '=' QSTRING ';'
548		{
549		#ifdef HAVE_LIBCRYPTO
550	<	if (ypass == 1)
550	>	if (conf_parser_ctx.pass == 1)
551		{
552		BIO *file;
553
#	Line 558 | Line 563 | serverinfo_rsa_private_key_file: RSA_PRI
563		ServerInfo.rsa_private_key_file = NULL;
564		}
565
566	<	DupString(ServerInfo.rsa_private_key_file, yylval.string);
566	>	ServerInfo.rsa_private_key_file = xstrdup(yylval.string);
567
568		if ((file = BIO_new_file(yylval.string, "r")) == NULL)
569		{
570	<	yyerror("File open failed, ignoring");
570	>	conf_error_report("File open failed, ignoring");
571		break;
572		}
573
574	<	ServerInfo.rsa_private_key = (RSA *)PEM_read_bio_RSAPrivateKey(file, NULL,
570	<	0, NULL);
574	>	ServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
575
576		BIO_set_close(file, BIO_CLOSE);
577		BIO_free(file);
578
579		if (ServerInfo.rsa_private_key == NULL)
580		{
581	<	yyerror("Couldn't extract key, ignoring");
581	>	conf_error_report("Couldn't extract key, ignoring");
582		break;
583		}
584
#	Line 583 | Line 587 | serverinfo_rsa_private_key_file: RSA_PRI
587		RSA_free(ServerInfo.rsa_private_key);
588		ServerInfo.rsa_private_key = NULL;
589
590	<	yyerror("Invalid key, ignoring");
590	>	conf_error_report("Invalid key, ignoring");
591		break;
592		}
593
#	Line 593 | Line 597 | serverinfo_rsa_private_key_file: RSA_PRI
597		RSA_free(ServerInfo.rsa_private_key);
598		ServerInfo.rsa_private_key = NULL;
599
600	<	yyerror("Not a 2048 bit key, ignoring");
600	>	conf_error_report("Not a 2048 bit key, ignoring");
601	>	}
602	>	}
603	>	#endif
604	>	};
605	>
606	>	serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
607	>	{
608	>	/* TBD - XXX: error reporting */
609	>	#ifdef HAVE_LIBCRYPTO
610	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
611	>	{
612	>	BIO *file = BIO_new_file(yylval.string, "r");
613	>
614	>	if (file)
615	>	{
616	>	DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
617	>
618	>	BIO_free(file);
619	>
620	>	if (dh)
621	>	{
622	>	if (DH_size(dh) < 128)
623	>	conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
624	>	else
625	>	SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
626	>
627	>	DH_free(dh);
628	>	}
629		}
630		}
631		#endif
632		};
633
634	+	serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
635	+	{
636	+	#ifdef HAVE_LIBCRYPTO
637	+	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
638	+	SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
639	+	#endif
640	+	};
641	+
642		serverinfo_name: NAME '=' QSTRING ';'
643		{
644		/* this isn't rehashable */
645	<	if (ypass == 2)
645	>	if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
646		{
647	<	if (ServerInfo.name == NULL)
647	>	if (valid_servname(yylval.string))
648	>	ServerInfo.name = xstrdup(yylval.string);
649	>	else
650		{
651	<	/* the ircd will exit() in main() if we dont set one */
652	<	if (strlen(yylval.string) <= HOSTLEN)
611	<	DupString(ServerInfo.name, yylval.string);
651	>	conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
652	>	exit(0);
653		}
654		}
655		};
#	Line 616 | Line 657 | serverinfo_name: NAME '=' QSTRING ';'
657		serverinfo_sid: IRCD_SID '=' QSTRING ';'
658		{
659		/* this isn't rehashable */
660	<	if (ypass == 2 && !ServerInfo.sid)
660	>	if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
661		{
662		if (valid_sid(yylval.string))
663	<	DupString(ServerInfo.sid, yylval.string);
663	>	ServerInfo.sid = xstrdup(yylval.string);
664		else
665		{
666	<	ilog(L_ERROR, "Ignoring config file entry SID -- invalid SID. Aborting.");
666	>	conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
667		exit(0);
668		}
669		}
#	Line 630 | Line 671 | serverinfo_sid: IRCD_SID '=' QSTRING ';'
671
672		serverinfo_description: DESCRIPTION '=' QSTRING ';'
673		{
674	<	if (ypass == 2)
674	>	if (conf_parser_ctx.pass == 2)
675		{
676		MyFree(ServerInfo.description);
677	<	DupString(ServerInfo.description,yylval.string);
677	>	ServerInfo.description = xstrdup(yylval.string);
678		}
679		};
680
681		serverinfo_network_name: NETWORK_NAME '=' QSTRING ';'
682		{
683	<	if (ypass == 2)
683	>	if (conf_parser_ctx.pass == 2)
684		{
685		char *p;
686
#	Line 647 | Line 688 | serverinfo_network_name: NETWORK_NAME '=
688		p = '\0';
689
690		MyFree(ServerInfo.network_name);
691	<	DupString(ServerInfo.network_name, yylval.string);
691	>	ServerInfo.network_name = xstrdup(yylval.string);
692		}
693		};
694
695		serverinfo_network_desc: NETWORK_DESC '=' QSTRING ';'
696		{
697	<	if (ypass == 2)
697	>	if (conf_parser_ctx.pass == 2)
698		{
699		MyFree(ServerInfo.network_desc);
700	<	DupString(ServerInfo.network_desc, yylval.string);
700	>	ServerInfo.network_desc = xstrdup(yylval.string);
701		}
702		};
703
704		serverinfo_vhost: VHOST '=' QSTRING ';'
705		{
706	<	if (ypass == 2 && *yylval.string != '*')
706	>	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
707		{
708		struct addrinfo hints, *res;
709
#	Line 672 | Line 713 | serverinfo_vhost: VHOST '=' QSTRING ';'
713		hints.ai_socktype = SOCK_STREAM;
714		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
715
716	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
717	<	ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
716	>	if (getaddrinfo(yylval.string, NULL, &hints, &res))
717	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
718		else
719		{
720		assert(res != NULL);
#	Line 681 | Line 722 | serverinfo_vhost: VHOST '=' QSTRING ';'
722		memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
723		ServerInfo.ip.ss.ss_family = res->ai_family;
724		ServerInfo.ip.ss_len = res->ai_addrlen;
725	<	irc_freeaddrinfo(res);
725	>	freeaddrinfo(res);
726
727		ServerInfo.specific_ipv4_vhost = 1;
728		}
#	Line 691 | Line 732 | serverinfo_vhost: VHOST '=' QSTRING ';'
732		serverinfo_vhost6: VHOST6 '=' QSTRING ';'
733		{
734		#ifdef IPV6
735	<	if (ypass == 2 && *yylval.string != '*')
735	>	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
736		{
737		struct addrinfo hints, *res;
738
#	Line 701 | Line 742 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
742		hints.ai_socktype = SOCK_STREAM;
743		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
744
745	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
746	<	ilog(L_ERROR, "Invalid netmask for server vhost6(%s)", yylval.string);
745	>	if (getaddrinfo(yylval.string, NULL, &hints, &res))
746	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
747		else
748		{
749		assert(res != NULL);
#	Line 710 | Line 751 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
751		memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
752		ServerInfo.ip6.ss.ss_family = res->ai_family;
753		ServerInfo.ip6.ss_len = res->ai_addrlen;
754	<	irc_freeaddrinfo(res);
754	>	freeaddrinfo(res);
755
756		ServerInfo.specific_ipv6_vhost = 1;
757		}
#	Line 720 | Line 761 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
761
762		serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
763		{
764	<	if (ypass == 2)
764	>	if (conf_parser_ctx.pass != 2)
765	>	break;
766	>
767	>	if ($3 < MAXCLIENTS_MIN)
768		{
769	<	recalc_fdlimit(NULL);
769	>	char buf[IRCD_BUFSIZE];
770
771	<	if ($3 < MAXCLIENTS_MIN)
772	<	{
773	<	char buf[IRCD_BUFSIZE];
774	<	ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
775	<	yyerror(buf);
776	<	}
777	<	else if ($3 > MAXCLIENTS_MAX)
778	<	{
779	<	char buf[IRCD_BUFSIZE];
780	<	ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
781	<	yyerror(buf);
738	<	}
739	<	else
740	<	ServerInfo.max_clients = $3;
771	>	snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
772	>	conf_error_report(buf);
773	>	ServerInfo.max_clients = MAXCLIENTS_MIN;
774	>	}
775	>	else if ($3 > MAXCLIENTS_MAX)
776	>	{
777	>	char buf[IRCD_BUFSIZE];
778	>
779	>	snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
780	>	conf_error_report(buf);
781	>	ServerInfo.max_clients = MAXCLIENTS_MAX;
782		}
783	+	else
784	+	ServerInfo.max_clients = $3;
785		};
786
787	<	serverinfo_hub: HUB '=' TBOOL ';'
787	>	serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
788		{
789	<	if (ypass == 2)
789	>	if (conf_parser_ctx.pass != 2)
790	>	break;
791	>
792	>	if ($3 < 9)
793		{
794	<	if (yylval.number)
795	<	{
796	<	/* Don't become a hub if we have a lazylink active. */
797	<	if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL))
798	<	{
799	<	sendto_realops_flags(UMODE_ALL, L_ALL,
754	<	"Ignoring config file line hub=yes; "
755	<	"due to active LazyLink (%s)", uplink->name);
756	<	}
757	<	else
758	<	{
759	<	ServerInfo.hub = 1;
760	<	uplink = NULL;
761	<	delete_capability("HUB");
762	<	add_capability("HUB", CAP_HUB, 1);
763	<	}
764	<	}
765	<	else if (ServerInfo.hub)
766	<	{
767	<	dlink_node *ptr = NULL;
794	>	conf_error_report("max_nick_length too low, setting to 9");
795	>	ServerInfo.max_nick_length = 9;
796	>	}
797	>	else if ($3 > NICKLEN)
798	>	{
799	>	char buf[IRCD_BUFSIZE];
800
801	<	ServerInfo.hub = 0;
802	<	delete_capability("HUB");
801	>	snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
802	>	conf_error_report(buf);
803	>	ServerInfo.max_nick_length = NICKLEN;
804	>	}
805	>	else
806	>	ServerInfo.max_nick_length = $3;
807	>	};
808
809	<	/* Don't become a leaf if we have a lazylink active. */
810	<	DLINK_FOREACH(ptr, serv_list.head)
811	<	{
812	<	const struct Client *acptr = ptr->data;
813	<	if (MyConnect(acptr) && IsCapable(acptr, CAP_LL))
814	<	{
815	<	sendto_realops_flags(UMODE_ALL, L_ALL,
816	<	"Ignoring config file line hub=no; "
817	<	"due to active LazyLink (%s)",
818	<	acptr->name);
819	<	add_capability("HUB", CAP_HUB, 1);
820	<	ServerInfo.hub = 1;
821	<	break;
822	<	}
823	<	}
824	<	}
809	>	serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
810	>	{
811	>	if (conf_parser_ctx.pass != 2)
812	>	break;
813	>
814	>	if ($3 < 80)
815	>	{
816	>	conf_error_report("max_topic_length too low, setting to 80");
817	>	ServerInfo.max_topic_length = 80;
818	>	}
819	>	else if ($3 > TOPICLEN)
820	>	{
821	>	char buf[IRCD_BUFSIZE];
822	>
823	>	snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
824	>	conf_error_report(buf);
825	>	ServerInfo.max_topic_length = TOPICLEN;
826		}
827	+	else
828	+	ServerInfo.max_topic_length = $3;
829	+	};
830	+
831	+	serverinfo_hub: HUB '=' TBOOL ';'
832	+	{
833	+	if (conf_parser_ctx.pass == 2)
834	+	ServerInfo.hub = yylval.number;
835		};
836
837		/***************************************************************************
#	Line 799 | Line 845 | admin_item:  admin_name | admin_descript
845
846		admin_name: NAME '=' QSTRING ';'
847		{
848	<	if (ypass == 2)
848	>	if (conf_parser_ctx.pass == 2)
849		{
850		MyFree(AdminInfo.name);
851	<	DupString(AdminInfo.name, yylval.string);
851	>	AdminInfo.name = xstrdup(yylval.string);
852		}
853		};
854
855		admin_email: EMAIL '=' QSTRING ';'
856		{
857	<	if (ypass == 2)
857	>	if (conf_parser_ctx.pass == 2)
858		{
859		MyFree(AdminInfo.email);
860	<	DupString(AdminInfo.email, yylval.string);
860	>	AdminInfo.email = xstrdup(yylval.string);
861		}
862		};
863
864		admin_description: DESCRIPTION '=' QSTRING ';'
865		{
866	<	if (ypass == 2)
866	>	if (conf_parser_ctx.pass == 2)
867		{
868		MyFree(AdminInfo.description);
869	<	DupString(AdminInfo.description, yylval.string);
869	>	AdminInfo.description = xstrdup(yylval.string);
870		}
871		};
872
873		/***************************************************************************
874		*  section logging
875		***************************************************************************/
876	<	/* XXX */
877	<	logging_entry:          LOGGING  '{' logging_items '}' ';' ;
832	<
833	<	logging_items:          logging_items logging_item |
834	<	logging_item ;
876	>	logging_entry:          T_LOG  '{' logging_items '}' ';' ;
877	>	logging_items:          logging_items logging_item | logging_item ;
878
879	<	logging_item:           logging_path | logging_oper_log |
837	<	logging_log_level |
838	<	logging_use_logging | logging_fuserlog |
839	<	logging_foperlog | logging_fglinelog |
840	<	logging_fklinelog | logging_killlog |
841	<	logging_foperspylog | logging_ioerrlog |
842	<	logging_ffailed_operlog |
879	>	logging_item:           logging_use_logging | logging_file_entry |
880		error ';' ;
881
882	<	logging_path:           T_LOGPATH '=' QSTRING ';'
846	<	{
847	<	};
848	<
849	<	logging_oper_log:       OPER_LOG '=' QSTRING ';'
850	<	{
851	<	};
852	<
853	<	logging_fuserlog: FUSERLOG '=' QSTRING ';'
882	>	logging_use_logging: USE_LOGGING '=' TBOOL ';'
883		{
884	<	if (ypass == 2)
885	<	strlcpy(ConfigLoggingEntry.userlog, yylval.string,
857	<	sizeof(ConfigLoggingEntry.userlog));
884	>	if (conf_parser_ctx.pass == 2)
885	>	ConfigLoggingEntry.use_logging = yylval.number;
886		};
887
888	<	logging_ffailed_operlog: FFAILED_OPERLOG '=' QSTRING ';'
888	>	logging_file_entry:
889		{
890	<	if (ypass == 2)
891	<	strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
892	<	sizeof(ConfigLoggingEntry.failed_operlog));
865	<	};
866	<
867	<	logging_foperlog: FOPERLOG '=' QSTRING ';'
890	>	if (conf_parser_ctx.pass == 2)
891	>	reset_block_state();
892	>	} T_FILE  '{' logging_file_items '}' ';'
893		{
894	<	if (ypass == 2)
895	<	strlcpy(ConfigLoggingEntry.operlog, yylval.string,
871	<	sizeof(ConfigLoggingEntry.operlog));
872	<	};
894	>	if (conf_parser_ctx.pass != 2)
895	>	break;
896
897	<	logging_foperspylog: FOPERSPYLOG '=' QSTRING ';'
898	<	{
899	<	if (ypass == 2)
877	<	strlcpy(ConfigLoggingEntry.operspylog, yylval.string,
878	<	sizeof(ConfigLoggingEntry.operspylog));
897	>	if (block_state.type.value && block_state.file.buf[0])
898	>	log_set_file(block_state.type.value, block_state.size.value,
899	>	block_state.file.buf);
900		};
901
902	<	logging_fglinelog: FGLINELOG '=' QSTRING ';'
903	<	{
883	<	if (ypass == 2)
884	<	strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
885	<	sizeof(ConfigLoggingEntry.glinelog));
886	<	};
902	>	logging_file_items: logging_file_items logging_file_item |
903	>	logging_file_item ;
904
905	<	logging_fklinelog: FKLINELOG '=' QSTRING ';'
906	<	{
890	<	if (ypass == 2)
891	<	strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
892	<	sizeof(ConfigLoggingEntry.klinelog));
893	<	};
905	>	logging_file_item:  logging_file_name | logging_file_type |
906	>	logging_file_size | error ';' ;
907
908	<	logging_ioerrlog: FIOERRLOG '=' QSTRING ';'
908	>	logging_file_name: NAME '=' QSTRING ';'
909		{
910	<	if (ypass == 2)
911	<	strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
899	<	sizeof(ConfigLoggingEntry.ioerrlog));
900	<	};
910	>	if (conf_parser_ctx.pass != 2)
911	>	break;
912
913	<	logging_killlog: FKILLLOG '=' QSTRING ';'
913	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
914	>	}
915	>
916	>	logging_file_size: T_SIZE '=' sizespec ';'
917		{
918	<	if (ypass == 2)
919	<	strlcpy(ConfigLoggingEntry.killlog, yylval.string,
920	<	sizeof(ConfigLoggingEntry.killlog));
918	>	block_state.size.value = $3;
919	>	} | T_SIZE '=' T_UNLIMITED ';'
920	>	{
921	>	block_state.size.value = 0;
922		};
923
924	<	logging_log_level: LOG_LEVEL '=' T_L_CRIT ';'
910	<	{
911	<	if (ypass == 2)
912	<	set_log_level(L_CRIT);
913	<	} | LOG_LEVEL '=' T_L_ERROR ';'
914	<	{
915	<	if (ypass == 2)
916	<	set_log_level(L_ERROR);
917	<	} | LOG_LEVEL '=' T_L_WARN ';'
918	<	{
919	<	if (ypass == 2)
920	<	set_log_level(L_WARN);
921	<	} | LOG_LEVEL '=' T_L_NOTICE ';'
922	<	{
923	<	if (ypass == 2)
924	<	set_log_level(L_NOTICE);
925	<	} | LOG_LEVEL '=' T_L_TRACE ';'
926	<	{
927	<	if (ypass == 2)
928	<	set_log_level(L_TRACE);
929	<	} | LOG_LEVEL '=' T_L_INFO ';'
930	<	{
931	<	if (ypass == 2)
932	<	set_log_level(L_INFO);
933	<	} | LOG_LEVEL '=' T_L_DEBUG ';'
924	>	logging_file_type: TYPE
925		{
926	<	if (ypass == 2)
927	<	set_log_level(L_DEBUG);
928	<	};
926	>	if (conf_parser_ctx.pass == 2)
927	>	block_state.type.value = 0;
928	>	} '='  logging_file_type_items ';' ;
929
930	<	logging_use_logging: USE_LOGGING '=' TBOOL ';'
930	>	logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
931	>	logging_file_type_item:  USER
932		{
933	<	if (ypass == 2)
934	<	ConfigLoggingEntry.use_logging = yylval.number;
933	>	if (conf_parser_ctx.pass == 2)
934	>	block_state.type.value = LOG_TYPE_USER;
935	>	} | OPERATOR
936	>	{
937	>	if (conf_parser_ctx.pass == 2)
938	>	block_state.type.value = LOG_TYPE_OPER;
939	>	} | GLINE
940	>	{
941	>	if (conf_parser_ctx.pass == 2)
942	>	block_state.type.value = LOG_TYPE_GLINE;
943	>	} | T_DLINE
944	>	{
945	>	if (conf_parser_ctx.pass == 2)
946	>	block_state.type.value = LOG_TYPE_DLINE;
947	>	} | KLINE
948	>	{
949	>	if (conf_parser_ctx.pass == 2)
950	>	block_state.type.value = LOG_TYPE_KLINE;
951	>	} | KILL
952	>	{
953	>	if (conf_parser_ctx.pass == 2)
954	>	block_state.type.value = LOG_TYPE_KILL;
955	>	} | T_DEBUG
956	>	{
957	>	if (conf_parser_ctx.pass == 2)
958	>	block_state.type.value = LOG_TYPE_DEBUG;
959		};
960
961	+
962		/***************************************************************************
963		* section oper
964		***************************************************************************/
965		oper_entry: OPERATOR
966		{
967	<	if (ypass == 2)
968	<	{
969	<	yy_conf = make_conf_item(OPER_TYPE);
970	<	yy_aconf = map_to_conf(yy_conf);
971	<	SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
972	<	}
956	<	else
957	<	{
958	<	MyFree(class_name);
959	<	class_name = NULL;
960	<	}
961	<	} oper_name_b '{' oper_items '}' ';'
967	>	if (conf_parser_ctx.pass != 2)
968	>	break;
969	>
970	>	reset_block_state();
971	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
972	>	} '{' oper_items '}' ';'
973		{
974	<	if (ypass == 2)
964	<	{
965	<	struct CollectItem *yy_tmp;
966	<	dlink_node *ptr;
967	<	dlink_node *next_ptr;
974	>	dlink_node *ptr = NULL;
975
976	<	conf_add_class_to_conf(yy_conf, class_name);
976	>	if (conf_parser_ctx.pass != 2)
977	>	break;
978
979	<	/* Now, make sure there is a copy of the "base" given oper
980	<	* block in each of the collected copies
981	<	*/
979	>	if (!block_state.name.buf[0])
980	>	break;
981	>	#ifdef HAVE_LIBCRYPTO
982	>	if (!(block_state.file.buf[0] ||
983	>	block_state.rpass.buf[0]))
984	>	break;
985	>	#else
986	>	if (!block_state.rpass.buf[0])
987	>	break;
988	>	#endif
989
990	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
991	<	{
992	<	struct AccessItem *new_aconf;
993	<	struct ConfItem *new_conf;
979	<	yy_tmp = ptr->data;
990	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
991	>	{
992	>	struct MaskItem *conf = NULL;
993	>	struct split_nuh_item nuh;
994
995	<	new_conf = make_conf_item(OPER_TYPE);
996	<	new_aconf = (struct AccessItem *)map_to_conf(new_conf);
995	>	nuh.nuhmask  = ptr->data;
996	>	nuh.nickptr  = NULL;
997	>	nuh.userptr  = block_state.user.buf;
998	>	nuh.hostptr  = block_state.host.buf;
999	>	nuh.nicksize = 0;
1000	>	nuh.usersize = sizeof(block_state.user.buf);
1001	>	nuh.hostsize = sizeof(block_state.host.buf);
1002	>	split_nuh(&nuh);
1003
1004	<	new_aconf->flags = yy_aconf->flags;
1004	>	conf        = conf_make(CONF_OPER);
1005	>	conf->name  = xstrdup(block_state.name.buf);
1006	>	conf->user  = xstrdup(block_state.user.buf);
1007	>	conf->host  = xstrdup(block_state.host.buf);
1008	>
1009	>	if (block_state.rpass.buf[0])
1010	>	conf->passwd = xstrdup(block_state.rpass.buf);
1011	>
1012	>	conf->flags = block_state.flags.value;
1013	>	conf->modes = block_state.modes.value;
1014	>	conf->port  = block_state.port.value;
1015	>	conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
1016
1017	<	if (yy_conf->name != NULL)
987	<	DupString(new_conf->name, yy_conf->name);
988	<	if (yy_tmp->user != NULL)
989	<	DupString(new_aconf->user, yy_tmp->user);
990	<	else
991	<	DupString(new_aconf->user, "*");
992	<	if (yy_tmp->host != NULL)
993	<	DupString(new_aconf->host, yy_tmp->host);
994	<	else
995	<	DupString(new_aconf->host, "*");
996	<	conf_add_class_to_conf(new_conf, class_name);
997	<	if (yy_aconf->passwd != NULL)
998	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1017	>	conf_add_class_to_conf(conf, block_state.class.buf);
1018
1000	–	new_aconf->port = yy_aconf->port;
1019		#ifdef HAVE_LIBCRYPTO
1020	<	if (yy_aconf->rsa_public_key_file != NULL)
1021	<	{
1022	<	BIO *file;
1023	<
1006	<	DupString(new_aconf->rsa_public_key_file,
1007	<	yy_aconf->rsa_public_key_file);
1008	<
1009	<	file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
1010	<	new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
1011	<	NULL, 0, NULL);
1012	<	BIO_set_close(file, BIO_CLOSE);
1013	<	BIO_free(file);
1014	<	}
1015	<	#endif
1020	>	if (block_state.file.buf[0])
1021	>	{
1022	>	BIO *file = NULL;
1023	>	RSA *pkey = NULL;
1024
1025	<	#ifdef HAVE_LIBCRYPTO
1018	<	if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
1019	<	&& yy_tmp->host)
1020	<	#else
1021	<	if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
1022	<	#endif
1025	>	if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
1026		{
1027	<	conf_add_class_to_conf(new_conf, class_name);
1028	<	if (yy_tmp->name != NULL)
1026	<	DupString(new_conf->name, yy_tmp->name);
1027	>	conf_error_report("Ignoring rsa_public_key_file -- file doesn't exist");
1028	>	break;
1029		}
1030
1031	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1032	<	free_collect_item(yy_tmp);
1031	<	}
1032	<
1033	<	yy_conf = NULL;
1034	<	yy_aconf = NULL;
1035	<
1031	>	if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
1032	>	conf_error_report("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1033
1034	<	MyFree(class_name);
1035	<	class_name = NULL;
1034	>	conf->rsa_public_key = pkey;
1035	>	BIO_set_close(file, BIO_CLOSE);
1036	>	BIO_free(file);
1037	>	}
1038	>	#endif /* HAVE_LIBCRYPTO */
1039		}
1040	<	};
1040	>	};
1041
1042	–	oper_name_b: | oper_name_t;
1042		oper_items:     oper_items oper_item | oper_item;
1043	<	oper_item:      oper_name | oper_user | oper_password | oper_hidden_admin |
1044	<	oper_hidden_oper | oper_umodes |
1045	<	oper_class | oper_global_kill | oper_remote |
1047	<	oper_kline | oper_xline | oper_unkline |
1048	<	oper_gline | oper_nick_changes | oper_remoteban |
1049	<	oper_die | oper_rehash | oper_admin | oper_operwall |
1050	<	oper_encrypted | oper_rsa_public_key_file |
1051	<	oper_flags | error ';' ;
1043	>	oper_item:      oper_name | oper_user | oper_password |
1044	>	oper_umodes | oper_class | oper_encrypted |
1045	>	oper_rsa_public_key_file | oper_flags | error ';' ;
1046
1047		oper_name: NAME '=' QSTRING ';'
1048		{
1049	<	if (ypass == 2)
1050	<	{
1057	<	if (strlen(yylval.string) > OPERNICKLEN)
1058	<	yylval.string[OPERNICKLEN] = '\0';
1059	<
1060	<	MyFree(yy_conf->name);
1061	<	DupString(yy_conf->name, yylval.string);
1062	<	}
1063	<	};
1064	<
1065	<	oper_name_t: QSTRING
1066	<	{
1067	<	if (ypass == 2)
1068	<	{
1069	<	if (strlen(yylval.string) > OPERNICKLEN)
1070	<	yylval.string[OPERNICKLEN] = '\0';
1071	<
1072	<	MyFree(yy_conf->name);
1073	<	DupString(yy_conf->name, yylval.string);
1074	<	}
1049	>	if (conf_parser_ctx.pass == 2)
1050	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1051		};
1052
1053		oper_user: USER '=' QSTRING ';'
1054		{
1055	<	if (ypass == 2)
1056	<	{
1081	<	struct split_nuh_item nuh;
1082	<
1083	<	nuh.nuhmask  = yylval.string;
1084	<	nuh.nickptr  = NULL;
1085	<	nuh.userptr  = userbuf;
1086	<	nuh.hostptr  = hostbuf;
1087	<
1088	<	nuh.nicksize = 0;
1089	<	nuh.usersize = sizeof(userbuf);
1090	<	nuh.hostsize = sizeof(hostbuf);
1091	<
1092	<	split_nuh(&nuh);
1093	<
1094	<	if (yy_aconf->user == NULL)
1095	<	{
1096	<	DupString(yy_aconf->user, userbuf);
1097	<	DupString(yy_aconf->host, hostbuf);
1098	<	}
1099	<	else
1100	<	{
1101	<	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
1102	<
1103	<	DupString(yy_tmp->user, userbuf);
1104	<	DupString(yy_tmp->host, hostbuf);
1105	<
1106	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1107	<	}
1108	<	}
1055	>	if (conf_parser_ctx.pass == 2)
1056	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1057		};
1058
1059		oper_password: PASSWORD '=' QSTRING ';'
1060		{
1061	<	if (ypass == 2)
1062	<	{
1115	<	if (yy_aconf->passwd != NULL)
1116	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1117	<
1118	<	MyFree(yy_aconf->passwd);
1119	<	DupString(yy_aconf->passwd, yylval.string);
1120	<	}
1061	>	if (conf_parser_ctx.pass == 2)
1062	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1063		};
1064
1065		oper_encrypted: ENCRYPTED '=' TBOOL ';'
1066		{
1067	<	if (ypass == 2)
1067	>	if (conf_parser_ctx.pass == 2)
1068		{
1069		if (yylval.number)
1070	<	SetConfEncrypted(yy_aconf);
1070	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1071		else
1072	<	ClearConfEncrypted(yy_aconf);
1072	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1073		}
1074		};
1075
1076		oper_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
1077		{
1078	<	#ifdef HAVE_LIBCRYPTO
1079	<	if (ypass == 2)
1138	<	{
1139	<	BIO *file;
1140	<
1141	<	if (yy_aconf->rsa_public_key != NULL)
1142	<	{
1143	<	RSA_free(yy_aconf->rsa_public_key);
1144	<	yy_aconf->rsa_public_key = NULL;
1145	<	}
1146	<
1147	<	if (yy_aconf->rsa_public_key_file != NULL)
1148	<	{
1149	<	MyFree(yy_aconf->rsa_public_key_file);
1150	<	yy_aconf->rsa_public_key_file = NULL;
1151	<	}
1152	<
1153	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
1154	<	file = BIO_new_file(yylval.string, "r");
1155	<
1156	<	if (file == NULL)
1157	<	{
1158	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
1159	<	break;
1160	<	}
1161	<
1162	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
1163	<
1164	<	if (yy_aconf->rsa_public_key == NULL)
1165	<	{
1166	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1167	<	break;
1168	<	}
1169	<
1170	<	BIO_set_close(file, BIO_CLOSE);
1171	<	BIO_free(file);
1172	<	}
1173	<	#endif /* HAVE_LIBCRYPTO */
1078	>	if (conf_parser_ctx.pass == 2)
1079	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
1080		};
1081
1082		oper_class: CLASS '=' QSTRING ';'
1083		{
1084	<	if (ypass == 2)
1085	<	{
1180	<	MyFree(class_name);
1181	<	DupString(class_name, yylval.string);
1182	<	}
1084	>	if (conf_parser_ctx.pass == 2)
1085	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1086		};
1087
1088		oper_umodes: T_UMODES
1089		{
1090	<	if (ypass == 2)
1091	<	yy_aconf->modes = 0;
1090	>	if (conf_parser_ctx.pass == 2)
1091	>	block_state.modes.value = 0;
1092		} '='  oper_umodes_items ';' ;
1093
1094		oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1095		oper_umodes_item:  T_BOTS
1096		{
1097	<	if (ypass == 2)
1098	<	yy_aconf->modes |= UMODE_BOTS;
1097	>	if (conf_parser_ctx.pass == 2)
1098	>	block_state.modes.value |= UMODE_BOTS;
1099		} | T_CCONN
1100		{
1101	<	if (ypass == 2)
1102	<	yy_aconf->modes |= UMODE_CCONN;
1101	>	if (conf_parser_ctx.pass == 2)
1102	>	block_state.modes.value |= UMODE_CCONN;
1103	>	} | T_CCONN_FULL
1104	>	{
1105	>	if (conf_parser_ctx.pass == 2)
1106	>	block_state.modes.value |= UMODE_CCONN_FULL;
1107		} | T_DEAF
1108		{
1109	<	if (ypass == 2)
1110	<	yy_aconf->modes |= UMODE_DEAF;
1109	>	if (conf_parser_ctx.pass == 2)
1110	>	block_state.modes.value |= UMODE_DEAF;
1111		} | T_DEBUG
1112		{
1113	<	if (ypass == 2)
1114	<	yy_aconf->modes |= UMODE_DEBUG;
1113	>	if (conf_parser_ctx.pass == 2)
1114	>	block_state.modes.value |= UMODE_DEBUG;
1115		} | T_FULL
1116		{
1117	<	if (ypass == 2)
1118	<	yy_aconf->modes |= UMODE_FULL;
1117	>	if (conf_parser_ctx.pass == 2)
1118	>	block_state.modes.value |= UMODE_FULL;
1119	>	} | HIDDEN
1120	>	{
1121	>	if (conf_parser_ctx.pass == 2)
1122	>	block_state.modes.value |= UMODE_HIDDEN;
1123		} | T_SKILL
1124		{
1125	<	if (ypass == 2)
1126	<	yy_aconf->modes |= UMODE_SKILL;
1125	>	if (conf_parser_ctx.pass == 2)
1126	>	block_state.modes.value |= UMODE_SKILL;
1127		} | T_NCHANGE
1128		{
1129	<	if (ypass == 2)
1130	<	yy_aconf->modes |= UMODE_NCHANGE;
1129	>	if (conf_parser_ctx.pass == 2)
1130	>	block_state.modes.value |= UMODE_NCHANGE;
1131		} | T_REJ
1132		{
1133	<	if (ypass == 2)
1134	<	yy_aconf->modes |= UMODE_REJ;
1133	>	if (conf_parser_ctx.pass == 2)
1134	>	block_state.modes.value |= UMODE_REJ;
1135		} | T_UNAUTH
1136		{
1137	<	if (ypass == 2)
1138	<	yy_aconf->modes |= UMODE_UNAUTH;
1137	>	if (conf_parser_ctx.pass == 2)
1138	>	block_state.modes.value |= UMODE_UNAUTH;
1139		} | T_SPY
1140		{
1141	<	if (ypass == 2)
1142	<	yy_aconf->modes |= UMODE_SPY;
1141	>	if (conf_parser_ctx.pass == 2)
1142	>	block_state.modes.value |= UMODE_SPY;
1143		} | T_EXTERNAL
1144		{
1145	<	if (ypass == 2)
1146	<	yy_aconf->modes |= UMODE_EXTERNAL;
1145	>	if (conf_parser_ctx.pass == 2)
1146	>	block_state.modes.value |= UMODE_EXTERNAL;
1147		} | T_OPERWALL
1148		{
1149	<	if (ypass == 2)
1150	<	yy_aconf->modes |= UMODE_OPERWALL;
1149	>	if (conf_parser_ctx.pass == 2)
1150	>	block_state.modes.value |= UMODE_OPERWALL;
1151		} | T_SERVNOTICE
1152		{
1153	<	if (ypass == 2)
1154	<	yy_aconf->modes |= UMODE_SERVNOTICE;
1153	>	if (conf_parser_ctx.pass == 2)
1154	>	block_state.modes.value |= UMODE_SERVNOTICE;
1155		} | T_INVISIBLE
1156		{
1157	<	if (ypass == 2)
1158	<	yy_aconf->modes |= UMODE_INVISIBLE;
1157	>	if (conf_parser_ctx.pass == 2)
1158	>	block_state.modes.value |= UMODE_INVISIBLE;
1159		} | T_WALLOP
1160		{
1161	<	if (ypass == 2)
1162	<	yy_aconf->modes |= UMODE_WALLOP;
1161	>	if (conf_parser_ctx.pass == 2)
1162	>	block_state.modes.value |= UMODE_WALLOP;
1163		} | T_SOFTCALLERID
1164		{
1165	<	if (ypass == 2)
1166	<	yy_aconf->modes |= UMODE_SOFTCALLERID;
1165	>	if (conf_parser_ctx.pass == 2)
1166	>	block_state.modes.value |= UMODE_SOFTCALLERID;
1167		} | T_CALLERID
1168		{
1169	<	if (ypass == 2)
1170	<	yy_aconf->modes |= UMODE_CALLERID;
1169	>	if (conf_parser_ctx.pass == 2)
1170	>	block_state.modes.value |= UMODE_CALLERID;
1171		} | T_LOCOPS
1172		{
1173	<	if (ypass == 2)
1174	<	yy_aconf->modes |= UMODE_LOCOPS;
1264	<	};
1265	<
1266	<	oper_global_kill: GLOBAL_KILL '=' TBOOL ';'
1267	<	{
1268	<	if (ypass == 2)
1269	<	{
1270	<	if (yylval.number)
1271	<	yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1272	<	else
1273	<	yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1274	<	}
1275	<	};
1276	<
1277	<	oper_remote: REMOTE '=' TBOOL ';'
1278	<	{
1279	<	if (ypass == 2)
1280	<	{
1281	<	if (yylval.number)
1282	<	yy_aconf->port |= OPER_FLAG_REMOTE;
1283	<	else
1284	<	yy_aconf->port &= ~OPER_FLAG_REMOTE;
1285	<	}
1286	<	};
1287	<
1288	<	oper_remoteban: REMOTEBAN '=' TBOOL ';'
1289	<	{
1290	<	if (ypass == 2)
1291	<	{
1292	<	if (yylval.number)
1293	<	yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1294	<	else
1295	<	yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1296	<	}
1297	<	};
1298	<
1299	<	oper_kline: KLINE '=' TBOOL ';'
1300	<	{
1301	<	if (ypass == 2)
1302	<	{
1303	<	if (yylval.number)
1304	<	yy_aconf->port |= OPER_FLAG_K;
1305	<	else
1306	<	yy_aconf->port &= ~OPER_FLAG_K;
1307	<	}
1308	<	};
1309	<
1310	<	oper_xline: XLINE '=' TBOOL ';'
1311	<	{
1312	<	if (ypass == 2)
1313	<	{
1314	<	if (yylval.number)
1315	<	yy_aconf->port |= OPER_FLAG_X;
1316	<	else
1317	<	yy_aconf->port &= ~OPER_FLAG_X;
1318	<	}
1319	<	};
1320	<
1321	<	oper_unkline: UNKLINE '=' TBOOL ';'
1322	<	{
1323	<	if (ypass == 2)
1324	<	{
1325	<	if (yylval.number)
1326	<	yy_aconf->port |= OPER_FLAG_UNKLINE;
1327	<	else
1328	<	yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1329	<	}
1330	<	};
1331	<
1332	<	oper_gline: GLINE '=' TBOOL ';'
1333	<	{
1334	<	if (ypass == 2)
1335	<	{
1336	<	if (yylval.number)
1337	<	yy_aconf->port |= OPER_FLAG_GLINE;
1338	<	else
1339	<	yy_aconf->port &= ~OPER_FLAG_GLINE;
1340	<	}
1341	<	};
1342	<
1343	<	oper_nick_changes: NICK_CHANGES '=' TBOOL ';'
1344	<	{
1345	<	if (ypass == 2)
1346	<	{
1347	<	if (yylval.number)
1348	<	yy_aconf->port |= OPER_FLAG_N;
1349	<	else
1350	<	yy_aconf->port &= ~OPER_FLAG_N;
1351	<	}
1352	<	};
1353	<
1354	<	oper_die: DIE '=' TBOOL ';'
1355	<	{
1356	<	if (ypass == 2)
1357	<	{
1358	<	if (yylval.number)
1359	<	yy_aconf->port |= OPER_FLAG_DIE;
1360	<	else
1361	<	yy_aconf->port &= ~OPER_FLAG_DIE;
1362	<	}
1363	<	};
1364	<
1365	<	oper_rehash: REHASH '=' TBOOL ';'
1366	<	{
1367	<	if (ypass == 2)
1368	<	{
1369	<	if (yylval.number)
1370	<	yy_aconf->port |= OPER_FLAG_REHASH;
1371	<	else
1372	<	yy_aconf->port &= ~OPER_FLAG_REHASH;
1373	<	}
1374	<	};
1375	<
1376	<	oper_admin: ADMIN '=' TBOOL ';'
1377	<	{
1378	<	if (ypass == 2)
1379	<	{
1380	<	if (yylval.number)
1381	<	yy_aconf->port |= OPER_FLAG_ADMIN;
1382	<	else
1383	<	yy_aconf->port &= ~OPER_FLAG_ADMIN;
1384	<	}
1385	<	};
1386	<
1387	<	oper_hidden_admin: HIDDEN_ADMIN '=' TBOOL ';'
1388	<	{
1389	<	if (ypass == 2)
1390	<	{
1391	<	if (yylval.number)
1392	<	yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1393	<	else
1394	<	yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1395	<	}
1396	<	};
1397	<
1398	<	oper_hidden_oper: HIDDEN_OPER '=' TBOOL ';'
1399	<	{
1400	<	if (ypass == 2)
1401	<	{
1402	<	if (yylval.number)
1403	<	yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1404	<	else
1405	<	yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1406	<	}
1407	<	};
1408	<
1409	<	oper_operwall: T_OPERWALL '=' TBOOL ';'
1410	<	{
1411	<	if (ypass == 2)
1412	<	{
1413	<	if (yylval.number)
1414	<	yy_aconf->port |= OPER_FLAG_OPERWALL;
1415	<	else
1416	<	yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1417	<	}
1173	>	if (conf_parser_ctx.pass == 2)
1174	>	block_state.modes.value |= UMODE_LOCOPS;
1175		};
1176
1177		oper_flags: IRCD_FLAGS
1178		{
1179	+	if (conf_parser_ctx.pass == 2)
1180	+	block_state.port.value = 0;
1181		} '='  oper_flags_items ';';
1182
1183		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1184	<	oper_flags_item: NOT { not_atom = 1; } oper_flags_item_atom
1426	<	| { not_atom = 0; } oper_flags_item_atom;
1427	<
1428	<	oper_flags_item_atom: GLOBAL_KILL
1184	>	oper_flags_item: GLOBAL_KILL
1185		{
1186	<	if (ypass == 2)
1187	<	{
1432	<	if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1433	<	else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1434	<	}
1186	>	if (conf_parser_ctx.pass == 2)
1187	>	block_state.port.value |= OPER_FLAG_GLOBAL_KILL;
1188		} | REMOTE
1189		{
1190	<	if (ypass == 2)
1191	<	{
1439	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
1440	<	else yy_aconf->port |= OPER_FLAG_REMOTE;
1441	<	}
1190	>	if (conf_parser_ctx.pass == 2)
1191	>	block_state.port.value |= OPER_FLAG_REMOTE;
1192		} | KLINE
1193		{
1194	<	if (ypass == 2)
1195	<	{
1446	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
1447	<	else yy_aconf->port |= OPER_FLAG_K;
1448	<	}
1194	>	if (conf_parser_ctx.pass == 2)
1195	>	block_state.port.value |= OPER_FLAG_K;
1196		} | UNKLINE
1197		{
1198	<	if (ypass == 2)
1199	<	{
1200	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1201	<	else yy_aconf->port |= OPER_FLAG_UNKLINE;
1202	<	}
1198	>	if (conf_parser_ctx.pass == 2)
1199	>	block_state.port.value |= OPER_FLAG_UNKLINE;
1200	>	} | T_DLINE
1201	>	{
1202	>	if (conf_parser_ctx.pass == 2)
1203	>	block_state.port.value |= OPER_FLAG_DLINE;
1204	>	} | T_UNDLINE
1205	>	{
1206	>	if (conf_parser_ctx.pass == 2)
1207	>	block_state.port.value |= OPER_FLAG_UNDLINE;
1208		} | XLINE
1209		{
1210	<	if (ypass == 2)
1211	<	{
1460	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
1461	<	else yy_aconf->port |= OPER_FLAG_X;
1462	<	}
1210	>	if (conf_parser_ctx.pass == 2)
1211	>	block_state.port.value |= OPER_FLAG_X;
1212		} | GLINE
1213		{
1214	<	if (ypass == 2)
1215	<	{
1467	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
1468	<	else yy_aconf->port |= OPER_FLAG_GLINE;
1469	<	}
1214	>	if (conf_parser_ctx.pass == 2)
1215	>	block_state.port.value |= OPER_FLAG_GLINE;
1216		} | DIE
1217		{
1218	<	if (ypass == 2)
1219	<	{
1220	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
1221	<	else yy_aconf->port |= OPER_FLAG_DIE;
1222	<	}
1218	>	if (conf_parser_ctx.pass == 2)
1219	>	block_state.port.value |= OPER_FLAG_DIE;
1220	>	} | T_RESTART
1221	>	{
1222	>	if (conf_parser_ctx.pass == 2)
1223	>	block_state.port.value |= OPER_FLAG_RESTART;
1224		} | REHASH
1225		{
1226	<	if (ypass == 2)
1227	<	{
1481	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
1482	<	else yy_aconf->port |= OPER_FLAG_REHASH;
1483	<	}
1226	>	if (conf_parser_ctx.pass == 2)
1227	>	block_state.port.value |= OPER_FLAG_REHASH;
1228		} | ADMIN
1229		{
1230	<	if (ypass == 2)
1231	<	{
1488	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_ADMIN;
1489	<	else yy_aconf->port |= OPER_FLAG_ADMIN;
1490	<	}
1491	<	} | HIDDEN_ADMIN
1492	<	{
1493	<	if (ypass == 2)
1494	<	{
1495	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1496	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1497	<	}
1230	>	if (conf_parser_ctx.pass == 2)
1231	>	block_state.port.value |= OPER_FLAG_ADMIN;
1232		} | NICK_CHANGES
1233		{
1234	<	if (ypass == 2)
1235	<	{
1502	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
1503	<	else yy_aconf->port |= OPER_FLAG_N;
1504	<	}
1234	>	if (conf_parser_ctx.pass == 2)
1235	>	block_state.port.value |= OPER_FLAG_N;
1236		} | T_OPERWALL
1237		{
1238	<	if (ypass == 2)
1239	<	{
1240	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1510	<	else yy_aconf->port |= OPER_FLAG_OPERWALL;
1511	<	}
1512	<	} | OPER_SPY_T
1238	>	if (conf_parser_ctx.pass == 2)
1239	>	block_state.port.value |= OPER_FLAG_OPERWALL;
1240	>	} | T_GLOBOPS
1241		{
1242	<	if (ypass == 2)
1243	<	{
1244	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
1517	<	else yy_aconf->port |= OPER_FLAG_OPER_SPY;
1518	<	}
1519	<	} | HIDDEN_OPER
1242	>	if (conf_parser_ctx.pass == 2)
1243	>	block_state.port.value |= OPER_FLAG_GLOBOPS;
1244	>	} | OPER_SPY_T
1245		{
1246	<	if (ypass == 2)
1247	<	{
1523	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1524	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1525	<	}
1246	>	if (conf_parser_ctx.pass == 2)
1247	>	block_state.port.value |= OPER_FLAG_OPER_SPY;
1248		} | REMOTEBAN
1249		{
1250	<	if (ypass == 2)
1251	<	{
1252	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1253	<	else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1254	<	}
1255	<	} | ENCRYPTED
1250	>	if (conf_parser_ctx.pass == 2)
1251	>	block_state.port.value |= OPER_FLAG_REMOTEBAN;
1252	>	} | T_SET
1253	>	{
1254	>	if (conf_parser_ctx.pass == 2)
1255	>	block_state.port.value |= OPER_FLAG_SET;
1256	>	} | MODULE
1257		{
1258	<	if (ypass == 2)
1259	<	{
1537	<	if (not_atom) ClearConfEncrypted(yy_aconf);
1538	<	else SetConfEncrypted(yy_aconf);
1539	<	}
1258	>	if (conf_parser_ctx.pass == 2)
1259	>	block_state.port.value |= OPER_FLAG_MODULE;
1260		};
1261
1262
#	Line 1545 | Line 1265 | oper_flags_item_atom: GLOBAL_KILL
1265		***************************************************************************/
1266		class_entry: CLASS
1267		{
1268	<	if (ypass == 1)
1269	<	{
1550	<	yy_conf = make_conf_item(CLASS_TYPE);
1551	<	yy_class = (struct ClassItem *)map_to_conf(yy_conf);
1552	<	}
1553	<	} class_name_b '{' class_items '}' ';'
1554	<	{
1555	<	if (ypass == 1)
1556	<	{
1557	<	struct ConfItem *cconf;
1558	<	struct ClassItem *class = NULL;
1268	>	if (conf_parser_ctx.pass != 1)
1269	>	break;
1270
1271	<	if (yy_class_name == NULL)
1561	<	{
1562	<	delete_conf_item(yy_conf);
1563	<	}
1564	<	else
1565	<	{
1566	<	cconf = find_exact_name_conf(CLASS_TYPE, yy_class_name, NULL, NULL);
1567	<
1568	<	if (cconf != NULL)                /* The class existed already */
1569	<	{
1570	<	rebuild_cidr_class(cconf, yy_class);
1571	<	class = (struct ClassItem *) map_to_conf(cconf);
1572	<	*class = *yy_class;
1573	<	delete_conf_item(yy_conf);
1271	>	reset_block_state();
1272
1273	<	MyFree(cconf->name);            /* Allows case change of class name */
1274	<	cconf->name = yy_class_name;
1275	<	}
1276	<	else      /* Brand new class */
1277	<	{
1278	<	MyFree(yy_conf->name);          /* just in case it was allocated */
1279	<	yy_conf->name = yy_class_name;
1280	<	}
1281	<	}
1282	<	yy_class_name = NULL;
1283	<	}
1273	>	block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1274	>	block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1275	>	block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1276	>	block_state.max_sendq.value = DEFAULT_SENDQ;
1277	>	block_state.max_recvq.value = DEFAULT_RECVQ;
1278	>	} '{' class_items '}' ';'
1279	>	{
1280	>	struct ClassItem *class = NULL;
1281	>
1282	>	if (conf_parser_ctx.pass != 1)
1283	>	break;
1284	>
1285	>	if (!block_state.class.buf[0])
1286	>	break;
1287	>
1288	>	if (!(class = class_find(block_state.class.buf, 0)))
1289	>	class = class_make();
1290	>
1291	>	class->active = 1;
1292	>	MyFree(class->name);
1293	>	class->name = xstrdup(block_state.class.buf);
1294	>	class->ping_freq = block_state.ping_freq.value;
1295	>	class->max_perip = block_state.max_perip.value;
1296	>	class->con_freq = block_state.con_freq.value;
1297	>	class->max_total = block_state.max_total.value;
1298	>	class->max_global = block_state.max_global.value;
1299	>	class->max_local = block_state.max_local.value;
1300	>	class->max_ident = block_state.max_ident.value;
1301	>	class->max_sendq = block_state.max_sendq.value;
1302	>	class->max_recvq = block_state.max_recvq.value;
1303	>
1304	>	if (block_state.min_idle.value > block_state.max_idle.value)
1305	>	{
1306	>	block_state.min_idle.value = 0;
1307	>	block_state.max_idle.value = 0;
1308	>	block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
1309	>	}
1310	>
1311	>	class->flags = block_state.flags.value;
1312	>	class->min_idle = block_state.min_idle.value;
1313	>	class->max_idle = block_state.max_idle.value;
1314	>
1315	>	if (class->number_per_cidr && block_state.number_per_cidr.value)
1316	>	if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
1317	>	(class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
1318	>	if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
1319	>	(class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
1320	>	rebuild_cidr_list(class);
1321	>
1322	>	class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1323	>	class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1324	>	class->number_per_cidr = block_state.number_per_cidr.value;
1325		};
1326
1588	–	class_name_b: | class_name_t;
1589	–
1327		class_items:    class_items class_item | class_item;
1328		class_item:     class_name |
1329		class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1330		class_ping_time |
1594	–	class_ping_warning |
1331		class_number_per_cidr |
1332		class_number_per_ip |
1333		class_connectfreq |
#	Line 1599 | Line 1335 | class_item:     class_name |
1335		class_max_global |
1336		class_max_local |
1337		class_max_ident |
1338	<	class_sendq |
1338	>	class_sendq | class_recvq |
1339	>	class_min_idle |
1340	>	class_max_idle |
1341	>	class_flags |
1342		error ';' ;
1343
1344		class_name: NAME '=' QSTRING ';'
1345		{
1346	<	if (ypass == 1)
1347	<	{
1609	<	MyFree(yy_class_name);
1610	<	DupString(yy_class_name, yylval.string);
1611	<	}
1612	<	};
1613	<
1614	<	class_name_t: QSTRING
1615	<	{
1616	<	if (ypass == 1)
1617	<	{
1618	<	MyFree(yy_class_name);
1619	<	DupString(yy_class_name, yylval.string);
1620	<	}
1346	>	if (conf_parser_ctx.pass == 1)
1347	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1348		};
1349
1350		class_ping_time: PING_TIME '=' timespec ';'
1351		{
1352	<	if (ypass == 1)
1353	<	PingFreq(yy_class) = $3;
1627	<	};
1628	<
1629	<	class_ping_warning: PING_WARNING '=' timespec ';'
1630	<	{
1631	<	if (ypass == 1)
1632	<	PingWarning(yy_class) = $3;
1352	>	if (conf_parser_ctx.pass == 1)
1353	>	block_state.ping_freq.value = $3;
1354		};
1355
1356		class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1357		{
1358	<	if (ypass == 1)
1359	<	MaxPerIp(yy_class) = $3;
1358	>	if (conf_parser_ctx.pass == 1)
1359	>	block_state.max_perip.value = $3;
1360		};
1361
1362		class_connectfreq: CONNECTFREQ '=' timespec ';'
1363		{
1364	<	if (ypass == 1)
1365	<	ConFreq(yy_class) = $3;
1364	>	if (conf_parser_ctx.pass == 1)
1365	>	block_state.con_freq.value = $3;
1366		};
1367
1368		class_max_number: MAX_NUMBER '=' NUMBER ';'
1369		{
1370	<	if (ypass == 1)
1371	<	MaxTotal(yy_class) = $3;
1370	>	if (conf_parser_ctx.pass == 1)
1371	>	block_state.max_total.value = $3;
1372		};
1373
1374		class_max_global: MAX_GLOBAL '=' NUMBER ';'
1375		{
1376	<	if (ypass == 1)
1377	<	MaxGlobal(yy_class) = $3;
1376	>	if (conf_parser_ctx.pass == 1)
1377	>	block_state.max_global.value = $3;
1378		};
1379
1380		class_max_local: MAX_LOCAL '=' NUMBER ';'
1381		{
1382	<	if (ypass == 1)
1383	<	MaxLocal(yy_class) = $3;
1382	>	if (conf_parser_ctx.pass == 1)
1383	>	block_state.max_local.value = $3;
1384		};
1385
1386		class_max_ident: MAX_IDENT '=' NUMBER ';'
1387		{
1388	<	if (ypass == 1)
1389	<	MaxIdent(yy_class) = $3;
1388	>	if (conf_parser_ctx.pass == 1)
1389	>	block_state.max_ident.value = $3;
1390		};
1391
1392		class_sendq: SENDQ '=' sizespec ';'
1393		{
1394	<	if (ypass == 1)
1395	<	MaxSendq(yy_class) = $3;
1394	>	if (conf_parser_ctx.pass == 1)
1395	>	block_state.max_sendq.value = $3;
1396	>	};
1397	>
1398	>	class_recvq: T_RECVQ '=' sizespec ';'
1399	>	{
1400	>	if (conf_parser_ctx.pass == 1)
1401	>	if ($3 >= CLIENT_FLOOD_MIN && $3 <= CLIENT_FLOOD_MAX)
1402	>	block_state.max_recvq.value = $3;
1403		};
1404
1405		class_cidr_bitlen_ipv4: CIDR_BITLEN_IPV4 '=' NUMBER ';'
1406		{
1407	<	if (ypass == 1)
1408	<	CidrBitlenIPV4(yy_class) = $3;
1407	>	if (conf_parser_ctx.pass == 1)
1408	>	block_state.cidr_bitlen_ipv4.value = $3 > 32 ? 32 : $3;
1409		};
1410
1411		class_cidr_bitlen_ipv6: CIDR_BITLEN_IPV6 '=' NUMBER ';'
1412		{
1413	<	if (ypass == 1)
1414	<	CidrBitlenIPV6(yy_class) = $3;
1413	>	if (conf_parser_ctx.pass == 1)
1414	>	block_state.cidr_bitlen_ipv6.value = $3 > 128 ? 128 : $3;
1415		};
1416
1417		class_number_per_cidr: NUMBER_PER_CIDR '=' NUMBER ';'
1418		{
1419	<	if (ypass == 1)
1420	<	NumberPerCidr(yy_class) = $3;
1419	>	if (conf_parser_ctx.pass == 1)
1420	>	block_state.number_per_cidr.value = $3;
1421	>	};
1422	>
1423	>	class_min_idle: MIN_IDLE '=' timespec ';'
1424	>	{
1425	>	if (conf_parser_ctx.pass != 1)
1426	>	break;
1427	>
1428	>	block_state.min_idle.value = $3;
1429	>	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1430	>	};
1431	>
1432	>	class_max_idle: MAX_IDLE '=' timespec ';'
1433	>	{
1434	>	if (conf_parser_ctx.pass != 1)
1435	>	break;
1436	>
1437	>	block_state.max_idle.value = $3;
1438	>	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1439		};
1440
1441	+	class_flags: IRCD_FLAGS
1442	+	{
1443	+	if (conf_parser_ctx.pass == 1)
1444	+	block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1445	+	} '='  class_flags_items ';';
1446	+
1447	+	class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1448	+	class_flags_item: RANDOM_IDLE
1449	+	{
1450	+	if (conf_parser_ctx.pass == 1)
1451	+	block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
1452	+	} | HIDE_IDLE_FROM_OPERS
1453	+	{
1454	+	if (conf_parser_ctx.pass == 1)
1455	+	block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
1456	+	};
1457	+
1458	+
1459		/***************************************************************************
1460		*  section listen
1461		***************************************************************************/
1462		listen_entry: LISTEN
1463		{
1464	<	if (ypass == 2)
1465	<	{
1466	<	listener_address = NULL;
1703	<	listener_flags = 0;
1704	<	}
1705	<	} '{' listen_items '}' ';'
1706	<	{
1707	<	if (ypass == 2)
1708	<	{
1709	<	MyFree(listener_address);
1710	<	listener_address = NULL;
1711	<	}
1712	<	};
1464	>	if (conf_parser_ctx.pass == 2)
1465	>	reset_block_state();
1466	>	} '{' listen_items '}' ';';
1467
1468		listen_flags: IRCD_FLAGS
1469		{
1470	<	listener_flags = 0;
1470	>	block_state.flags.value = 0;
1471		} '='  listen_flags_items ';';
1472
1473		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1474		listen_flags_item: T_SSL
1475		{
1476	<	if (ypass == 2)
1477	<	listener_flags |= LISTENER_SSL;
1476	>	if (conf_parser_ctx.pass == 2)
1477	>	block_state.flags.value |= LISTENER_SSL;
1478		} | HIDDEN
1479		{
1480	<	if (ypass == 2)
1481	<	listener_flags |= LISTENER_HIDDEN;
1480	>	if (conf_parser_ctx.pass == 2)
1481	>	block_state.flags.value |= LISTENER_HIDDEN;
1482	>	} | T_SERVER
1483	>	{
1484	>	if (conf_parser_ctx.pass == 2)
1485	>	block_state.flags.value |= LISTENER_SERVER;
1486		};
1487
1488		listen_items:   listen_items listen_item | listen_item;
1489		listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';';
1490
1491	<	listen_port: PORT '=' port_items { listener_flags = 0; } ';';
1491	>	listen_port: PORT '=' port_items { block_state.flags.value = 0; } ';';
1492
1493		port_items: port_items ',' port_item | port_item;
1494
1495		port_item: NUMBER
1496		{
1497	<	if (ypass == 2)
1497	>	if (conf_parser_ctx.pass == 2)
1498		{
1499	<	if ((listener_flags & LISTENER_SSL))
1499	>	if (block_state.flags.value & LISTENER_SSL)
1500		#ifdef HAVE_LIBCRYPTO
1501	<	if (!ServerInfo.ctx)
1501	>	if (!ServerInfo.server_ctx)
1502		#endif
1503		{
1504	<	yyerror("SSL not available - port closed");
1504	>	conf_error_report("SSL not available - port closed");
1505		break;
1506		}
1507	<	add_listener($1, listener_address, listener_flags);
1507	>	add_listener($1, block_state.addr.buf, block_state.flags.value);
1508		}
1509		} | NUMBER TWODOTS NUMBER
1510		{
1511	<	if (ypass == 2)
1511	>	if (conf_parser_ctx.pass == 2)
1512		{
1513		int i;
1514
1515	<	if ((listener_flags & LISTENER_SSL))
1515	>	if (block_state.flags.value & LISTENER_SSL)
1516		#ifdef HAVE_LIBCRYPTO
1517	<	if (!ServerInfo.ctx)
1517	>	if (!ServerInfo.server_ctx)
1518		#endif
1519		{
1520	<	yyerror("SSL not available - port closed");
1520	>	conf_error_report("SSL not available - port closed");
1521		break;
1522		}
1523
1524		for (i = $1; i <= $3; ++i)
1525	<	add_listener(i, listener_address, listener_flags);
1525	>	add_listener(i, block_state.addr.buf, block_state.flags.value);
1526		}
1527		};
1528
1529		listen_address: IP '=' QSTRING ';'
1530		{
1531	<	if (ypass == 2)
1532	<	{
1775	<	MyFree(listener_address);
1776	<	DupString(listener_address, yylval.string);
1777	<	}
1531	>	if (conf_parser_ctx.pass == 2)
1532	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1533		};
1534
1535		listen_host: HOST '=' QSTRING ';'
1536		{
1537	<	if (ypass == 2)
1538	<	{
1784	<	MyFree(listener_address);
1785	<	DupString(listener_address, yylval.string);
1786	<	}
1537	>	if (conf_parser_ctx.pass == 2)
1538	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1539		};
1540
1541		/***************************************************************************
#	Line 1791 | Line 1543 | listen_host: HOST '=' QSTRING ';'
1543		***************************************************************************/
1544		auth_entry: IRCD_AUTH
1545		{
1546	<	if (ypass == 2)
1547	<	{
1796	<	yy_conf = make_conf_item(CLIENT_TYPE);
1797	<	yy_aconf = map_to_conf(yy_conf);
1798	<	}
1799	<	else
1800	<	{
1801	<	MyFree(class_name);
1802	<	class_name = NULL;
1803	<	}
1546	>	if (conf_parser_ctx.pass == 2)
1547	>	reset_block_state();
1548		} '{' auth_items '}' ';'
1549		{
1550	<	if (ypass == 2)
1807	<	{
1808	<	struct CollectItem *yy_tmp = NULL;
1809	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1810	<
1811	<	if (yy_aconf->user && yy_aconf->host)
1812	<	{
1813	<	conf_add_class_to_conf(yy_conf, class_name);
1814	<	add_conf_by_address(CONF_CLIENT, yy_aconf);
1815	<	}
1816	<	else
1817	<	delete_conf_item(yy_conf);
1818	<
1819	<	/* copy over settings from first struct */
1820	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
1821	<	{
1822	<	struct AccessItem *new_aconf;
1823	<	struct ConfItem *new_conf;
1550	>	dlink_node *ptr = NULL;
1551
1552	<	new_conf = make_conf_item(CLIENT_TYPE);
1553	<	new_aconf = map_to_conf(new_conf);
1552	>	if (conf_parser_ctx.pass != 2)
1553	>	break;
1554
1555	<	yy_tmp = ptr->data;
1829	<
1830	<	assert(yy_tmp->user && yy_tmp->host);
1831	<
1832	<	if (yy_aconf->passwd != NULL)
1833	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1834	<	if (yy_conf->name != NULL)
1835	<	DupString(new_conf->name, yy_conf->name);
1836	<	if (yy_aconf->passwd != NULL)
1837	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1838	<
1839	<	new_aconf->flags = yy_aconf->flags;
1840	<	new_aconf->port  = yy_aconf->port;
1841	<
1842	<	DupString(new_aconf->user, yy_tmp->user);
1843	<	collapse(new_aconf->user);
1844	<
1845	<	DupString(new_aconf->host, yy_tmp->host);
1846	<	collapse(new_aconf->host);
1847	<
1848	<	conf_add_class_to_conf(new_conf, class_name);
1849	<	add_conf_by_address(CONF_CLIENT, new_aconf);
1850	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1851	<	free_collect_item(yy_tmp);
1852	<	}
1853	<
1854	<	MyFree(class_name);
1855	<	class_name = NULL;
1856	<	yy_conf = NULL;
1857	<	yy_aconf = NULL;
1858	<	}
1859	<	};
1860	<
1861	<	auth_items:     auth_items auth_item | auth_item;
1862	<	auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1863	<	auth_kline_exempt | auth_need_ident |
1864	<	auth_exceed_limit | auth_no_tilde | auth_gline_exempt |
1865	<	auth_spoof | auth_spoof_notice |
1866	<	auth_redir_serv | auth_redir_port | auth_can_flood |
1867	<	auth_need_password | auth_encrypted | error ';' ;
1868	<
1869	<	auth_user: USER '=' QSTRING ';'
1870	<	{
1871	<	if (ypass == 2)
1555	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
1556		{
1557	<	struct CollectItem *yy_tmp = NULL;
1557	>	struct MaskItem *conf = NULL;
1558		struct split_nuh_item nuh;
1559
1560	<	nuh.nuhmask  = yylval.string;
1560	>	nuh.nuhmask  = ptr->data;
1561		nuh.nickptr  = NULL;
1562	<	nuh.userptr  = userbuf;
1563	<	nuh.hostptr  = hostbuf;
1880	<
1562	>	nuh.userptr  = block_state.user.buf;
1563	>	nuh.hostptr  = block_state.host.buf;
1564		nuh.nicksize = 0;
1565	<	nuh.usersize = sizeof(userbuf);
1566	<	nuh.hostsize = sizeof(hostbuf);
1884	<
1565	>	nuh.usersize = sizeof(block_state.user.buf);
1566	>	nuh.hostsize = sizeof(block_state.host.buf);
1567		split_nuh(&nuh);
1568
1569	<	if (yy_aconf->user == NULL)
1570	<	{
1571	<	DupString(yy_aconf->user, userbuf);
1572	<	DupString(yy_aconf->host, hostbuf);
1573	<	}
1574	<	else
1575	<	{
1576	<	yy_tmp = MyMalloc(sizeof(struct CollectItem));
1569	>	conf        = conf_make(CONF_CLIENT);
1570	>	conf->user  = xstrdup(collapse(block_state.user.buf));
1571	>	conf->host  = xstrdup(collapse(block_state.host.buf));
1572	>
1573	>	if (block_state.rpass.buf[0])
1574	>	conf->passwd = xstrdup(block_state.rpass.buf);
1575	>	if (block_state.name.buf[0])
1576	>	conf->passwd = xstrdup(block_state.name.buf);
1577
1578	<	DupString(yy_tmp->user, userbuf);
1579	<	DupString(yy_tmp->host, hostbuf);
1578	>	conf->flags = block_state.flags.value;
1579	>	conf->port  = block_state.port.value;
1580
1581	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1582	<	}
1581	>	conf_add_class_to_conf(conf, block_state.class.buf);
1582	>	add_conf_by_address(CONF_CLIENT, conf);
1583		}
1584	<	};
1584	>	};
1585
1586	<	/* XXX - IP/IPV6 tags don't exist anymore - put IP/IPV6 into user. */
1586	>	auth_items:     auth_items auth_item | auth_item;
1587	>	auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1588	>	auth_spoof | auth_redir_serv | auth_redir_port |
1589	>	auth_encrypted | error ';' ;
1590
1591	<	auth_passwd: PASSWORD '=' QSTRING ';'
1591	>	auth_user: USER '=' QSTRING ';'
1592		{
1593	<	if (ypass == 2)
1594	<	{
1910	<	/* be paranoid */
1911	<	if (yy_aconf->passwd != NULL)
1912	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1913	<
1914	<	MyFree(yy_aconf->passwd);
1915	<	DupString(yy_aconf->passwd, yylval.string);
1916	<	}
1593	>	if (conf_parser_ctx.pass == 2)
1594	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1595		};
1596
1597	<	auth_spoof_notice: SPOOF_NOTICE '=' TBOOL ';'
1597	>	auth_passwd: PASSWORD '=' QSTRING ';'
1598		{
1599	<	if (ypass == 2)
1600	<	{
1923	<	if (yylval.number)
1924	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1925	<	else
1926	<	yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1927	<	}
1599	>	if (conf_parser_ctx.pass == 2)
1600	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1601		};
1602
1603		auth_class: CLASS '=' QSTRING ';'
1604		{
1605	<	if (ypass == 2)
1606	<	{
1934	<	MyFree(class_name);
1935	<	DupString(class_name, yylval.string);
1936	<	}
1605	>	if (conf_parser_ctx.pass == 2)
1606	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1607		};
1608
1609		auth_encrypted: ENCRYPTED '=' TBOOL ';'
1610		{
1611	<	if (ypass == 2)
1611	>	if (conf_parser_ctx.pass == 2)
1612		{
1613		if (yylval.number)
1614	<	SetConfEncrypted(yy_aconf);
1614	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1615		else
1616	<	ClearConfEncrypted(yy_aconf);
1616	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1617		}
1618		};
1619
1620		auth_flags: IRCD_FLAGS
1621		{
1622	+	if (conf_parser_ctx.pass == 2)
1623	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
1624		} '='  auth_flags_items ';';
1625
1626		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1627	<	auth_flags_item: NOT { not_atom = 1; } auth_flags_item_atom
1956	<	| { not_atom = 0; } auth_flags_item_atom;
1957	<
1958	<	auth_flags_item_atom: SPOOF_NOTICE
1627	>	auth_flags_item: SPOOF_NOTICE
1628		{
1629	<	if (ypass == 2)
1630	<	{
1962	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1963	<	else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1964	<	}
1965	<
1629	>	if (conf_parser_ctx.pass == 2)
1630	>	block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1631		} | EXCEED_LIMIT
1632		{
1633	<	if (ypass == 2)
1634	<	{
1970	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
1971	<	else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1972	<	}
1633	>	if (conf_parser_ctx.pass == 2)
1634	>	block_state.flags.value |= CONF_FLAGS_NOLIMIT;
1635		} | KLINE_EXEMPT
1636		{
1637	<	if (ypass == 2)
1638	<	{
1977	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
1978	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1979	<	}
1637	>	if (conf_parser_ctx.pass == 2)
1638	>	block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1639		} | NEED_IDENT
1640		{
1641	<	if (ypass == 2)
1642	<	{
1984	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
1985	<	else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
1986	<	}
1641	>	if (conf_parser_ctx.pass == 2)
1642	>	block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
1643		} | CAN_FLOOD
1644		{
1645	<	if (ypass == 2)
1646	<	{
1991	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
1992	<	else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
1993	<	}
1994	<	} | CAN_IDLE
1995	<	{
1996	<	if (ypass == 2)
1997	<	{
1998	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_IDLE_LINED;
1999	<	else yy_aconf->flags |= CONF_FLAGS_IDLE_LINED;
2000	<	}
1645	>	if (conf_parser_ctx.pass == 2)
1646	>	block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
1647		} | NO_TILDE
1648		{
1649	<	if (ypass == 2)
1650	<	{
2005	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
2006	<	else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
2007	<	}
1649	>	if (conf_parser_ctx.pass == 2)
1650	>	block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1651		} | GLINE_EXEMPT
1652		{
1653	<	if (ypass == 2)
1654	<	{
2012	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
2013	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
2014	<	}
1653	>	if (conf_parser_ctx.pass == 2)
1654	>	block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
1655		} | RESV_EXEMPT
1656		{
1657	<	if (ypass == 2)
1658	<	{
1659	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
2020	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
2021	<	}
2022	<	} | NEED_PASSWORD
1657	>	if (conf_parser_ctx.pass == 2)
1658	>	block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
1659	>	} | T_WEBIRC
1660		{
1661	<	if (ypass == 2)
1662	<	{
1663	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
2027	<	else yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
2028	<	}
2029	<	};
2030	<
2031	<	auth_kline_exempt: KLINE_EXEMPT '=' TBOOL ';'
2032	<	{
2033	<	if (ypass == 2)
2034	<	{
2035	<	if (yylval.number)
2036	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
2037	<	else
2038	<	yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
2039	<	}
2040	<	};
2041	<
2042	<	auth_need_ident: NEED_IDENT '=' TBOOL ';'
2043	<	{
2044	<	if (ypass == 2)
2045	<	{
2046	<	if (yylval.number)
2047	<	yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
2048	<	else
2049	<	yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
2050	<	}
2051	<	};
2052	<
2053	<	auth_exceed_limit: EXCEED_LIMIT '=' TBOOL ';'
2054	<	{
2055	<	if (ypass == 2)
2056	<	{
2057	<	if (yylval.number)
2058	<	yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
2059	<	else
2060	<	yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
2061	<	}
2062	<	};
2063	<
2064	<	auth_can_flood: CAN_FLOOD '=' TBOOL ';'
2065	<	{
2066	<	if (ypass == 2)
2067	<	{
2068	<	if (yylval.number)
2069	<	yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
2070	<	else
2071	<	yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
2072	<	}
2073	<	};
2074	<
2075	<	auth_no_tilde: NO_TILDE '=' TBOOL ';'
1661	>	if (conf_parser_ctx.pass == 2)
1662	>	block_state.flags.value |= CONF_FLAGS_WEBIRC;
1663	>	} | NEED_PASSWORD
1664		{
1665	<	if (ypass == 2)
1666	<	{
2079	<	if (yylval.number)
2080	<	yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
2081	<	else
2082	<	yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
2083	<	}
1665	>	if (conf_parser_ctx.pass == 2)
1666	>	block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1667		};
1668
2086	–	auth_gline_exempt: GLINE_EXEMPT '=' TBOOL ';'
2087	–	{
2088	–	if (ypass == 2)
2089	–	{
2090	–	if (yylval.number)
2091	–	yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
2092	–	else
2093	–	yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
2094	–	}
2095	–	};
2096	–
2097	–	/* XXX - need check for illegal hostnames here */
1669		auth_spoof: SPOOF '=' QSTRING ';'
1670		{
1671	<	if (ypass == 2)
1672	<	{
2102	<	MyFree(yy_conf->name);
1671	>	if (conf_parser_ctx.pass != 2)
1672	>	break;
1673
1674	<	if (strlen(yylval.string) < HOSTLEN)
1675	<	{
1676	<	DupString(yy_conf->name, yylval.string);
1677	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
2108	<	}
2109	<	else
2110	<	{
2111	<	ilog(L_ERROR, "Spoofs must be less than %d..ignoring it", HOSTLEN);
2112	<	yy_conf->name = NULL;
2113	<	}
1674	>	if (strlen(yylval.string) <= HOSTLEN && valid_hostname(yylval.string))
1675	>	{
1676	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1677	>	block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
1678		}
1679	+	else
1680	+	ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
1681		};
1682
1683		auth_redir_serv: REDIRSERV '=' QSTRING ';'
1684		{
1685	<	if (ypass == 2)
1686	<	{
1687	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1688	<	MyFree(yy_conf->name);
1689	<	DupString(yy_conf->name, yylval.string);
2124	<	}
1685	>	if (conf_parser_ctx.pass != 2)
1686	>	break;
1687	>
1688	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1689	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1690		};
1691
1692		auth_redir_port: REDIRPORT '=' NUMBER ';'
1693		{
1694	<	if (ypass == 2)
1695	<	{
2131	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
2132	<	yy_aconf->port = $3;
2133	<	}
2134	<	};
1694	>	if (conf_parser_ctx.pass != 2)
1695	>	break;
1696
1697	<	auth_need_password: NEED_PASSWORD '=' TBOOL ';'
1698	<	{
2138	<	if (ypass == 2)
2139	<	{
2140	<	if (yylval.number)
2141	<	yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
2142	<	else
2143	<	yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
2144	<	}
1697	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1698	>	block_state.port.value = $3;
1699		};
1700
1701
#	Line 2150 | Line 1704 | auth_need_password: NEED_PASSWORD '=' TB
1704		***************************************************************************/
1705		resv_entry: RESV
1706		{
1707	<	if (ypass == 2)
1708	<	{
1709	<	MyFree(resv_reason);
1710	<	resv_reason = NULL;
1711	<	}
1707	>	if (conf_parser_ctx.pass != 2)
1708	>	break;
1709	>
1710	>	reset_block_state();
1711	>	strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
1712		} '{' resv_items '}' ';'
1713		{
1714	<	if (ypass == 2)
1715	<	{
1716	<	MyFree(resv_reason);
1717	<	resv_reason = NULL;
2164	<	}
1714	>	if (IsChanPrefix(block_state.name.buf[0]))
1715	>	create_channel_resv(block_state.name.buf, block_state.rpass.buf);
1716	>	else if (block_state.name.buf[0])
1717	>	create_nick_resv(block_state.name.buf, block_state.rpass.buf);
1718		};
1719
1720		resv_items:     resv_items resv_item | resv_item;
1721	<	resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
1721	>	resv_item:      resv_reason | resv_channel | resv_nick | error ';' ;
1722
1723	<	resv_creason: REASON '=' QSTRING ';'
1723	>	resv_reason: REASON '=' QSTRING ';'
1724		{
1725	<	if (ypass == 2)
1726	<	{
2174	<	MyFree(resv_reason);
2175	<	DupString(resv_reason, yylval.string);
2176	<	}
1725	>	if (conf_parser_ctx.pass == 2)
1726	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1727		};
1728
1729		resv_channel: CHANNEL '=' QSTRING ';'
1730		{
1731	<	if (ypass == 2)
1732	<	{
2183	<	if (IsChanPrefix(*yylval.string))
2184	<	{
2185	<	char def_reason[] = "No reason";
2186	<
2187	<	create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
2188	<	}
2189	<	}
2190	<	/* ignore it for now.. but we really should make a warning if
2191	<	* its an erroneous name --fl_ */
1731	>	if (conf_parser_ctx.pass == 2)
1732	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1733		};
1734
1735		resv_nick: NICK '=' QSTRING ';'
1736		{
1737	<	if (ypass == 2)
1738	<	{
1739	<	char def_reason[] = "No reason";
1737	>	if (conf_parser_ctx.pass == 2)
1738	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1739	>	};
1740
1741	<	create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1741	>	/***************************************************************************
1742	>	*  section service
1743	>	***************************************************************************/
1744	>	service_entry: T_SERVICE '{' service_items '}' ';';
1745	>
1746	>	service_items:     service_items service_item | service_item;
1747	>	service_item:      service_name | error;
1748	>
1749	>	service_name: NAME '=' QSTRING ';'
1750	>	{
1751	>	if (conf_parser_ctx.pass == 2)
1752	>	{
1753	>	if (valid_servname(yylval.string))
1754	>	{
1755	>	struct MaskItem *conf = conf_make(CONF_SERVICE);
1756	>	conf->name = xstrdup(yylval.string);
1757	>	}
1758		}
1759		};
1760
#	Line 2206 | Line 1763 | resv_nick: NICK '=' QSTRING ';'
1763		***************************************************************************/
1764		shared_entry: T_SHARED
1765		{
1766	<	if (ypass == 2)
1767	<	{
1768	<	yy_conf = make_conf_item(ULINE_TYPE);
1769	<	yy_match_item = map_to_conf(yy_conf);
1770	<	yy_match_item->action = SHARED_ALL;
1771	<	}
1766	>	if (conf_parser_ctx.pass != 2)
1767	>	break;
1768	>
1769	>	reset_block_state();
1770	>
1771	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1772	>	strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
1773	>	strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
1774	>	block_state.flags.value = SHARED_ALL;
1775		} '{' shared_items '}' ';'
1776		{
1777	<	if (ypass == 2)
1778	<	{
1779	<	yy_conf = NULL;
1780	<	}
1777	>	struct MaskItem *conf = NULL;
1778	>
1779	>	if (conf_parser_ctx.pass != 2)
1780	>	break;
1781	>
1782	>	conf = conf_make(CONF_ULINE);
1783	>	conf->flags = block_state.flags.value;
1784	>	conf->name = xstrdup(block_state.name.buf);
1785	>	conf->user = xstrdup(block_state.user.buf);
1786	>	conf->user = xstrdup(block_state.host.buf);
1787		};
1788
1789		shared_items: shared_items shared_item | shared_item;
#	Line 2225 | Line 1791 | shared_item:  shared_name | shared_user
1791
1792		shared_name: NAME '=' QSTRING ';'
1793		{
1794	<	if (ypass == 2)
1795	<	{
2230	<	MyFree(yy_conf->name);
2231	<	DupString(yy_conf->name, yylval.string);
2232	<	}
1794	>	if (conf_parser_ctx.pass == 2)
1795	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1796		};
1797
1798		shared_user: USER '=' QSTRING ';'
1799		{
1800	<	if (ypass == 2)
1800	>	if (conf_parser_ctx.pass == 2)
1801		{
1802		struct split_nuh_item nuh;
1803
1804		nuh.nuhmask  = yylval.string;
1805		nuh.nickptr  = NULL;
1806	<	nuh.userptr  = userbuf;
1807	<	nuh.hostptr  = hostbuf;
1806	>	nuh.userptr  = block_state.user.buf;
1807	>	nuh.hostptr  = block_state.host.buf;
1808
1809		nuh.nicksize = 0;
1810	<	nuh.usersize = sizeof(userbuf);
1811	<	nuh.hostsize = sizeof(hostbuf);
1810	>	nuh.usersize = sizeof(block_state.user.buf);
1811	>	nuh.hostsize = sizeof(block_state.host.buf);
1812
1813		split_nuh(&nuh);
2251	–
2252	–	DupString(yy_match_item->user, userbuf);
2253	–	DupString(yy_match_item->host, hostbuf);
1814		}
1815		};
1816
1817		shared_type: TYPE
1818		{
1819	<	if (ypass == 2)
1820	<	yy_match_item->action = 0;
1819	>	if (conf_parser_ctx.pass == 2)
1820	>	block_state.flags.value = 0;
1821		} '=' shared_types ';' ;
1822
1823		shared_types: shared_types ',' shared_type_item | shared_type_item;
1824		shared_type_item: KLINE
1825		{
1826	<	if (ypass == 2)
1827	<	yy_match_item->action |= SHARED_KLINE;
2268	<	} | TKLINE
2269	<	{
2270	<	if (ypass == 2)
2271	<	yy_match_item->action |= SHARED_TKLINE;
1826	>	if (conf_parser_ctx.pass == 2)
1827	>	block_state.flags.value |= SHARED_KLINE;
1828		} | UNKLINE
1829		{
1830	<	if (ypass == 2)
1831	<	yy_match_item->action |= SHARED_UNKLINE;
1832	<	} | XLINE
1830	>	if (conf_parser_ctx.pass == 2)
1831	>	block_state.flags.value |= SHARED_UNKLINE;
1832	>	} | T_DLINE
1833	>	{
1834	>	if (conf_parser_ctx.pass == 2)
1835	>	block_state.flags.value |= SHARED_DLINE;
1836	>	} | T_UNDLINE
1837		{
1838	<	if (ypass == 2)
1839	<	yy_match_item->action |= SHARED_XLINE;
1840	<	} | TXLINE
1838	>	if (conf_parser_ctx.pass == 2)
1839	>	block_state.flags.value |= SHARED_UNDLINE;
1840	>	} | XLINE
1841		{
1842	<	if (ypass == 2)
1843	<	yy_match_item->action |= SHARED_TXLINE;
1842	>	if (conf_parser_ctx.pass == 2)
1843	>	block_state.flags.value |= SHARED_XLINE;
1844		} | T_UNXLINE
1845		{
1846	<	if (ypass == 2)
1847	<	yy_match_item->action |= SHARED_UNXLINE;
1846	>	if (conf_parser_ctx.pass == 2)
1847	>	block_state.flags.value |= SHARED_UNXLINE;
1848		} | RESV
1849		{
1850	<	if (ypass == 2)
1851	<	yy_match_item->action |= SHARED_RESV;
2292	<	} | TRESV
2293	<	{
2294	<	if (ypass == 2)
2295	<	yy_match_item->action |= SHARED_TRESV;
1850	>	if (conf_parser_ctx.pass == 2)
1851	>	block_state.flags.value |= SHARED_RESV;
1852		} | T_UNRESV
1853		{
1854	<	if (ypass == 2)
1855	<	yy_match_item->action |= SHARED_UNRESV;
1854	>	if (conf_parser_ctx.pass == 2)
1855	>	block_state.flags.value |= SHARED_UNRESV;
1856		} | T_LOCOPS
1857		{
1858	<	if (ypass == 2)
1859	<	yy_match_item->action |= SHARED_LOCOPS;
1858	>	if (conf_parser_ctx.pass == 2)
1859	>	block_state.flags.value |= SHARED_LOCOPS;
1860		} | T_ALL
1861		{
1862	<	if (ypass == 2)
1863	<	yy_match_item->action = SHARED_ALL;
1862	>	if (conf_parser_ctx.pass == 2)
1863	>	block_state.flags.value = SHARED_ALL;
1864		};
1865
1866		/***************************************************************************
#	Line 2312 | Line 1868 | shared_type_item: KLINE
1868		***************************************************************************/
1869		cluster_entry: T_CLUSTER
1870		{
1871	<	if (ypass == 2)
1872	<	{
1873	<	yy_conf = make_conf_item(CLUSTER_TYPE);
1874	<	yy_conf->flags = SHARED_ALL;
1875	<	}
1871	>	if (conf_parser_ctx.pass != 2)
1872	>	break;
1873	>
1874	>	reset_block_state();
1875	>
1876	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1877	>	block_state.flags.value = SHARED_ALL;
1878		} '{' cluster_items '}' ';'
1879		{
1880	<	if (ypass == 2)
1881	<	{
1882	<	if (yy_conf->name == NULL)
1883	<	DupString(yy_conf->name, "*");
1884	<	yy_conf = NULL;
1885	<	}
1880	>	struct MaskItem *conf = NULL;
1881	>
1882	>	if (conf_parser_ctx.pass != 2)
1883	>	break;
1884	>
1885	>	conf = conf_make(CONF_CLUSTER);
1886	>	conf->flags = block_state.flags.value;
1887	>	conf->name = xstrdup(block_state.name.buf);
1888		};
1889
1890		cluster_items:  cluster_items cluster_item | cluster_item;
#	Line 2332 | Line 1892 | cluster_item:  cluster_name | cluster_typ
1892
1893		cluster_name: NAME '=' QSTRING ';'
1894		{
1895	<	if (ypass == 2)
1896	<	DupString(yy_conf->name, yylval.string);
1895	>	if (conf_parser_ctx.pass == 2)
1896	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1897		};
1898
1899		cluster_type: TYPE
1900		{
1901	<	if (ypass == 2)
1902	<	yy_conf->flags = 0;
1901	>	if (conf_parser_ctx.pass == 2)
1902	>	block_state.flags.value = 0;
1903		} '=' cluster_types ';' ;
1904
1905		cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1906		cluster_type_item: KLINE
1907		{
1908	<	if (ypass == 2)
1909	<	yy_conf->flags |= SHARED_KLINE;
2350	<	} | TKLINE
2351	<	{
2352	<	if (ypass == 2)
2353	<	yy_conf->flags |= SHARED_TKLINE;
1908	>	if (conf_parser_ctx.pass == 2)
1909	>	block_state.flags.value |= SHARED_KLINE;
1910		} | UNKLINE
1911		{
1912	<	if (ypass == 2)
1913	<	yy_conf->flags |= SHARED_UNKLINE;
1914	<	} | XLINE
1912	>	if (conf_parser_ctx.pass == 2)
1913	>	block_state.flags.value |= SHARED_UNKLINE;
1914	>	} | T_DLINE
1915	>	{
1916	>	if (conf_parser_ctx.pass == 2)
1917	>	block_state.flags.value |= SHARED_DLINE;
1918	>	} | T_UNDLINE
1919		{
1920	<	if (ypass == 2)
1921	<	yy_conf->flags |= SHARED_XLINE;
1922	<	} | TXLINE
1920	>	if (conf_parser_ctx.pass == 2)
1921	>	block_state.flags.value |= SHARED_UNDLINE;
1922	>	} | XLINE
1923		{
1924	<	if (ypass == 2)
1925	<	yy_conf->flags |= SHARED_TXLINE;
1924	>	if (conf_parser_ctx.pass == 2)
1925	>	block_state.flags.value |= SHARED_XLINE;
1926		} | T_UNXLINE
1927		{
1928	<	if (ypass == 2)
1929	<	yy_conf->flags |= SHARED_UNXLINE;
1928	>	if (conf_parser_ctx.pass == 2)
1929	>	block_state.flags.value |= SHARED_UNXLINE;
1930		} | RESV
1931		{
1932	<	if (ypass == 2)
1933	<	yy_conf->flags |= SHARED_RESV;
2374	<	} | TRESV
2375	<	{
2376	<	if (ypass == 2)
2377	<	yy_conf->flags |= SHARED_TRESV;
1932	>	if (conf_parser_ctx.pass == 2)
1933	>	block_state.flags.value |= SHARED_RESV;
1934		} | T_UNRESV
1935		{
1936	<	if (ypass == 2)
1937	<	yy_conf->flags |= SHARED_UNRESV;
1936	>	if (conf_parser_ctx.pass == 2)
1937	>	block_state.flags.value |= SHARED_UNRESV;
1938		} | T_LOCOPS
1939		{
1940	<	if (ypass == 2)
1941	<	yy_conf->flags |= SHARED_LOCOPS;
1940	>	if (conf_parser_ctx.pass == 2)
1941	>	block_state.flags.value |= SHARED_LOCOPS;
1942		} | T_ALL
1943		{
1944	<	if (ypass == 2)
1945	<	yy_conf->flags = SHARED_ALL;
1944	>	if (conf_parser_ctx.pass == 2)
1945	>	block_state.flags.value = SHARED_ALL;
1946		};
1947
1948		/***************************************************************************
#	Line 2394 | Line 1950 | cluster_type_item: KLINE
1950		***************************************************************************/
1951		connect_entry: CONNECT
1952		{
2397	–	if (ypass == 2)
2398	–	{
2399	–	yy_conf = make_conf_item(SERVER_TYPE);
2400	–	yy_aconf = (struct AccessItem *)map_to_conf(yy_conf);
2401	–	yy_aconf->passwd = NULL;
2402	–	/* defaults */
2403	–	yy_aconf->port = PORTNUM;
1953
1954	<	if (ConfigFileEntry.burst_away)
1955	<	yy_aconf->flags = CONF_FLAGS_BURST_AWAY;
2407	<	}
2408	<	else
2409	<	{
2410	<	MyFree(class_name);
2411	<	class_name = NULL;
2412	<	}
2413	<	} connect_name_b '{' connect_items '}' ';'
2414	<	{
2415	<	if (ypass == 2)
2416	<	{
2417	<	struct CollectItem *yy_hconf=NULL;
2418	<	struct CollectItem *yy_lconf=NULL;
2419	<	dlink_node *ptr;
2420	<	dlink_node *next_ptr;
2421	<	#ifdef HAVE_LIBCRYPTO
2422	<	if (yy_aconf->host &&
2423	<	((yy_aconf->passwd && yy_aconf->spasswd) ||
2424	<	(yy_aconf->rsa_public_key && IsConfCryptLink(yy_aconf))))
2425	<	#else /* !HAVE_LIBCRYPTO */
2426	<	if (yy_aconf->host && !IsConfCryptLink(yy_aconf) &&
2427	<	yy_aconf->passwd && yy_aconf->spasswd)
2428	<	#endif /* !HAVE_LIBCRYPTO */
2429	<	{
2430	<	if (conf_add_server(yy_conf, class_name) == -1)
2431	<	{
2432	<	delete_conf_item(yy_conf);
2433	<	yy_conf = NULL;
2434	<	yy_aconf = NULL;
2435	<	}
2436	<	}
2437	<	else
2438	<	{
2439	<	/* Even if yy_conf ->name is NULL
2440	<	* should still unhook any hub/leaf confs still pending
2441	<	*/
2442	<	unhook_hub_leaf_confs();
2443	<
2444	<	if (yy_conf->name != NULL)
2445	<	{
2446	<	#ifndef HAVE_LIBCRYPTO
2447	<	if (IsConfCryptLink(yy_aconf))
2448	<	yyerror("Ignoring connect block -- no OpenSSL support");
2449	<	#else
2450	<	if (IsConfCryptLink(yy_aconf) && !yy_aconf->rsa_public_key)
2451	<	yyerror("Ignoring connect block -- missing key");
2452	<	#endif
2453	<	if (yy_aconf->host == NULL)
2454	<	yyerror("Ignoring connect block -- missing host");
2455	<	else if (!IsConfCryptLink(yy_aconf) &&
2456	<	(!yy_aconf->passwd || !yy_aconf->spasswd))
2457	<	yyerror("Ignoring connect block -- missing password");
2458	<	}
2459	<
2460	<
2461	<	/* XXX
2462	<	* This fixes a try_connections() core (caused by invalid class_ptr
2463	<	* pointers) reported by metalrock. That's an ugly fix, but there
2464	<	* is currently no better way. The entire config subsystem needs an
2465	<	* rewrite ASAP. make_conf_item() shouldn't really add things onto
2466	<	* a doubly linked list immediately without any sanity checks!  -Michael
2467	<	*/
2468	<	delete_conf_item(yy_conf);
2469	<
2470	<	yy_aconf = NULL;
2471	<	yy_conf = NULL;
2472	<	}
2473	<
2474	<	/*
2475	<	* yy_conf is still pointing at the server that is having
2476	<	* a connect block built for it. This means, y_aconf->name
2477	<	* points to the actual irc name this server will be known as.
2478	<	* Now this new server has a set or even just one hub_mask (or leaf_mask)
2479	<	* given in the link list at yy_hconf. Fill in the HUB confs
2480	<	* from this link list now.
2481	<	*/
2482	<	DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
2483	<	{
2484	<	struct ConfItem *new_hub_conf;
2485	<	struct MatchItem *match_item;
1954	>	if (conf_parser_ctx.pass != 2)
1955	>	break;
1956
1957	<	yy_hconf = ptr->data;
1957	>	reset_block_state();
1958	>	block_state.port.value = PORTNUM;
1959	>	} '{' connect_items '}' ';'
1960	>	{
1961	>	struct MaskItem *conf = NULL;
1962	>	struct addrinfo hints, *res;
1963	>
1964	>	if (conf_parser_ctx.pass != 2)
1965	>	break;
1966	>
1967	>	if (!block_state.name.buf[0] ||
1968	>	!block_state.host.buf[0])
1969	>	break;
1970	>
1971	>	if (!(block_state.rpass.buf[0] ||
1972	>	block_state.spass.buf[0]))
1973	>	break;
1974	>
1975	>	if (has_wildcards(block_state.name.buf) ||
1976	>	has_wildcards(block_state.host.buf))
1977	>	break;
1978	>
1979	>	conf = conf_make(CONF_SERVER);
1980	>	conf->port = block_state.port.value;
1981	>	conf->flags = block_state.flags.value;
1982	>	conf->aftype = block_state.aftype.value;
1983	>	conf->host = xstrdup(block_state.host.buf);
1984	>	conf->name = xstrdup(block_state.name.buf);
1985	>	conf->passwd = xstrdup(block_state.rpass.buf);
1986	>	conf->spasswd = xstrdup(block_state.spass.buf);
1987	>	conf->cipher_list = xstrdup(block_state.ciph.buf);
1988
1989	<	/* yy_conf == NULL is a fatal error for this connect block! */
1990	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2491	<	{
2492	<	new_hub_conf = make_conf_item(HUB_TYPE);
2493	<	match_item = (struct MatchItem *)map_to_conf(new_hub_conf);
2494	<	DupString(new_hub_conf->name, yy_conf->name);
2495	<	if (yy_hconf->user != NULL)
2496	<	DupString(match_item->user, yy_hconf->user);
2497	<	else
2498	<	DupString(match_item->user, "*");
2499	<	if (yy_hconf->host != NULL)
2500	<	DupString(match_item->host, yy_hconf->host);
2501	<	else
2502	<	DupString(match_item->host, "*");
2503	<	}
2504	<	dlinkDelete(&yy_hconf->node, &hub_conf_list);
2505	<	free_collect_item(yy_hconf);
2506	<	}
1989	>	dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
1990	>	dlinkMoveList(&block_state.hub.list, &conf->hub_list);
1991
1992	<	/* Ditto for the LEAF confs */
1992	>	if (block_state.bind.buf[0])
1993	>	{
1994	>	memset(&hints, 0, sizeof(hints));
1995
1996	<	DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
1997	<	{
1998	<	struct ConfItem *new_leaf_conf;
2513	<	struct MatchItem *match_item;
1996	>	hints.ai_family   = AF_UNSPEC;
1997	>	hints.ai_socktype = SOCK_STREAM;
1998	>	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
1999
2000	<	yy_lconf = ptr->data;
2000	>	if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2001	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2002	>	else
2003	>	{
2004	>	assert(res != NULL);
2005
2006	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2007	<	{
2008	<	new_leaf_conf = make_conf_item(LEAF_TYPE);
2009	<	match_item = (struct MatchItem *)map_to_conf(new_leaf_conf);
2010	<	DupString(new_leaf_conf->name, yy_conf->name);
2522	<	if (yy_lconf->user != NULL)
2523	<	DupString(match_item->user, yy_lconf->user);
2524	<	else
2525	<	DupString(match_item->user, "*");
2526	<	if (yy_lconf->host != NULL)
2527	<	DupString(match_item->host, yy_lconf->host);
2528	<	else
2529	<	DupString(match_item->host, "*");
2530	<	}
2531	<	dlinkDelete(&yy_lconf->node, &leaf_conf_list);
2532	<	free_collect_item(yy_lconf);
2533	<	}
2534	<	MyFree(class_name);
2535	<	class_name = NULL;
2536	<	yy_conf = NULL;
2537	<	yy_aconf = NULL;
2006	>	memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2007	>	conf->bind.ss.ss_family = res->ai_family;
2008	>	conf->bind.ss_len = res->ai_addrlen;
2009	>	freeaddrinfo(res);
2010	>	}
2011		}
2012	+
2013	+	conf_add_class_to_conf(conf, block_state.class.buf);
2014	+	lookup_confhost(conf);
2015		};
2016
2541	–	connect_name_b: | connect_name_t;
2017		connect_items:  connect_items connect_item | connect_item;
2018		connect_item:   connect_name | connect_host | connect_vhost |
2019		connect_send_password | connect_accept_password |
2020	<	connect_aftype | connect_port |
2021	<	connect_fakename | connect_flags | connect_hub_mask |
2022	<	connect_leaf_mask | connect_class | connect_auto |
2023	<	connect_encrypted | connect_compressed | connect_cryptlink |
2549	<	connect_rsa_public_key_file | connect_cipher_preference |
2550	<	connect_topicburst | error ';' ;
2020	>	connect_aftype | connect_port | connect_ssl_cipher_list |
2021	>	connect_flags | connect_hub_mask | connect_leaf_mask |
2022	>	connect_class | connect_encrypted |
2023	>	error ';' ;
2024
2025		connect_name: NAME '=' QSTRING ';'
2026		{
2027	<	if (ypass == 2)
2028	<	{
2556	<	if (yy_conf->name != NULL)
2557	<	yyerror("Multiple connect name entry");
2558	<
2559	<	MyFree(yy_conf->name);
2560	<	DupString(yy_conf->name, yylval.string);
2561	<	}
2562	<	};
2563	<
2564	<	connect_name_t: QSTRING
2565	<	{
2566	<	if (ypass == 2)
2567	<	{
2568	<	if (yy_conf->name != NULL)
2569	<	yyerror("Multiple connect name entry");
2570	<
2571	<	MyFree(yy_conf->name);
2572	<	DupString(yy_conf->name, yylval.string);
2573	<	}
2027	>	if (conf_parser_ctx.pass == 2)
2028	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2029		};
2030
2031		connect_host: HOST '=' QSTRING ';'
2032		{
2033	<	if (ypass == 2)
2034	<	{
2580	<	MyFree(yy_aconf->host);
2581	<	DupString(yy_aconf->host, yylval.string);
2582	<	}
2033	>	if (conf_parser_ctx.pass == 2)
2034	>	strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2035		};
2036
2037		connect_vhost: VHOST '=' QSTRING ';'
2038		{
2039	<	if (ypass == 2)
2040	<	{
2589	<	struct addrinfo hints, *res;
2590	<
2591	<	memset(&hints, 0, sizeof(hints));
2592	<
2593	<	hints.ai_family   = AF_UNSPEC;
2594	<	hints.ai_socktype = SOCK_STREAM;
2595	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2596	<
2597	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
2598	<	ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
2599	<	else
2600	<	{
2601	<	assert(res != NULL);
2602	<
2603	<	memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
2604	<	yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
2605	<	yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
2606	<	irc_freeaddrinfo(res);
2607	<	}
2608	<	}
2039	>	if (conf_parser_ctx.pass == 2)
2040	>	strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2041		};
2042
2043		connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2044		{
2045	<	if (ypass == 2)
2046	<	{
2615	<	if ($3[0] == ':')
2616	<	yyerror("Server passwords cannot begin with a colon");
2617	<	else if (strchr($3, ' ') != NULL)
2618	<	yyerror("Server passwords cannot contain spaces");
2619	<	else {
2620	<	if (yy_aconf->spasswd != NULL)
2621	<	memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
2045	>	if (conf_parser_ctx.pass != 2)
2046	>	break;
2047
2048	<	MyFree(yy_aconf->spasswd);
2049	<	DupString(yy_aconf->spasswd, yylval.string);
2050	<	}
2051	<	}
2048	>	if ($3[0] == ':')
2049	>	conf_error_report("Server passwords cannot begin with a colon");
2050	>	else if (strchr($3, ' ') != NULL)
2051	>	conf_error_report("Server passwords cannot contain spaces");
2052	>	else
2053	>	strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
2054		};
2055
2056		connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2057		{
2058	<	if (ypass == 2)
2059	<	{
2633	<	if ($3[0] == ':')
2634	<	yyerror("Server passwords cannot begin with a colon");
2635	<	else if (strchr($3, ' ') != NULL)
2636	<	yyerror("Server passwords cannot contain spaces");
2637	<	else {
2638	<	if (yy_aconf->passwd != NULL)
2639	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
2058	>	if (conf_parser_ctx.pass != 2)
2059	>	break;
2060
2061	<	MyFree(yy_aconf->passwd);
2062	<	DupString(yy_aconf->passwd, yylval.string);
2063	<	}
2064	<	}
2061	>	if ($3[0] == ':')
2062	>	conf_error_report("Server passwords cannot begin with a colon");
2063	>	else if (strchr($3, ' ') != NULL)
2064	>	conf_error_report("Server passwords cannot contain spaces");
2065	>	else
2066	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2067		};
2068
2069		connect_port: PORT '=' NUMBER ';'
2070		{
2071	<	if (ypass == 2)
2072	<	yy_aconf->port = $3;
2071	>	if (conf_parser_ctx.pass == 2)
2072	>	block_state.port.value = $3;
2073		};
2074
2075		connect_aftype: AFTYPE '=' T_IPV4 ';'
2076		{
2077	<	if (ypass == 2)
2078	<	yy_aconf->aftype = AF_INET;
2077	>	if (conf_parser_ctx.pass == 2)
2078	>	block_state.aftype.value = AF_INET;
2079		} | AFTYPE '=' T_IPV6 ';'
2080		{
2081		#ifdef IPV6
2082	<	if (ypass == 2)
2083	<	yy_aconf->aftype = AF_INET6;
2082	>	if (conf_parser_ctx.pass == 2)
2083	>	block_state.aftype.value = AF_INET6;
2084		#endif
2085		};
2086
2665	–	connect_fakename: FAKENAME '=' QSTRING ';'
2666	–	{
2667	–	if (ypass == 2)
2668	–	{
2669	–	MyFree(yy_aconf->fakename);
2670	–	DupString(yy_aconf->fakename, yylval.string);
2671	–	}
2672	–	};
2673	–
2087		connect_flags: IRCD_FLAGS
2088		{
2089	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2090		} '='  connect_flags_items ';';
2091
2092		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2093	<	connect_flags_item: NOT  { not_atom = 1; } connect_flags_item_atom
2680	<	|  { not_atom = 0; } connect_flags_item_atom;
2681	<
2682	<	connect_flags_item_atom: LAZYLINK
2093	>	connect_flags_item: AUTOCONN
2094		{
2095	<	if (ypass == 2)
2096	<	{
2097	<	if (not_atom)ClearConfLazyLink(yy_aconf);
2687	<	else SetConfLazyLink(yy_aconf);
2688	<	}
2689	<	} | COMPRESSED
2095	>	if (conf_parser_ctx.pass == 2)
2096	>	block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2097	>	} | T_SSL
2098		{
2099	<	if (ypass == 2)
2100	<	#ifndef HAVE_LIBZ
2693	<	yyerror("Ignoring flags = compressed; -- no zlib support");
2694	<	#else
2695	<	{
2696	<	if (not_atom)ClearConfCompressed(yy_aconf);
2697	<	else SetConfCompressed(yy_aconf);
2698	<	}
2699	<	#endif
2700	<	} | CRYPTLINK
2701	<	{
2702	<	if (ypass == 2)
2703	<	{
2704	<	if (not_atom)ClearConfCryptLink(yy_aconf);
2705	<	else SetConfCryptLink(yy_aconf);
2706	<	}
2707	<	} | AUTOCONN
2708	<	{
2709	<	if (ypass == 2)
2710	<	{
2711	<	if (not_atom)ClearConfAllowAutoConn(yy_aconf);
2712	<	else SetConfAllowAutoConn(yy_aconf);
2713	<	}
2714	<	} | BURST_AWAY
2715	<	{
2716	<	if (ypass == 2)
2717	<	{
2718	<	if (not_atom)ClearConfAwayBurst(yy_aconf);
2719	<	else SetConfAwayBurst(yy_aconf);
2720	<	}
2721	<	} | TOPICBURST
2722	<	{
2723	<	if (ypass == 2)
2724	<	{
2725	<	if (not_atom)ClearConfTopicBurst(yy_aconf);
2726	<	else SetConfTopicBurst(yy_aconf);
2727	<	}
2728	<	}
2729	<	;
2730	<
2731	<	connect_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
2732	<	{
2733	<	#ifdef HAVE_LIBCRYPTO
2734	<	if (ypass == 2)
2735	<	{
2736	<	BIO *file;
2737	<
2738	<	if (yy_aconf->rsa_public_key != NULL)
2739	<	{
2740	<	RSA_free(yy_aconf->rsa_public_key);
2741	<	yy_aconf->rsa_public_key = NULL;
2742	<	}
2743	<
2744	<	if (yy_aconf->rsa_public_key_file != NULL)
2745	<	{
2746	<	MyFree(yy_aconf->rsa_public_key_file);
2747	<	yy_aconf->rsa_public_key_file = NULL;
2748	<	}
2749	<
2750	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
2751	<
2752	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
2753	<	{
2754	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
2755	<	break;
2756	<	}
2757	<
2758	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
2759	<
2760	<	if (yy_aconf->rsa_public_key == NULL)
2761	<	{
2762	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
2763	<	break;
2764	<	}
2765	<
2766	<	BIO_set_close(file, BIO_CLOSE);
2767	<	BIO_free(file);
2768	<	}
2769	<	#endif /* HAVE_LIBCRYPTO */
2099	>	if (conf_parser_ctx.pass == 2)
2100	>	block_state.flags.value |= CONF_FLAGS_SSL;
2101		};
2102
2103		connect_encrypted: ENCRYPTED '=' TBOOL ';'
2104		{
2105	<	if (ypass == 2)
2775	<	{
2776	<	if (yylval.number)
2777	<	yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
2778	<	else
2779	<	yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
2780	<	}
2781	<	};
2782	<
2783	<	connect_cryptlink: CRYPTLINK '=' TBOOL ';'
2784	<	{
2785	<	if (ypass == 2)
2786	<	{
2787	<	if (yylval.number)
2788	<	yy_aconf->flags |= CONF_FLAGS_CRYPTLINK;
2789	<	else
2790	<	yy_aconf->flags &= ~CONF_FLAGS_CRYPTLINK;
2791	<	}
2792	<	};
2793	<
2794	<	connect_compressed: COMPRESSED '=' TBOOL ';'
2795	<	{
2796	<	if (ypass == 2)
2105	>	if (conf_parser_ctx.pass == 2)
2106		{
2107		if (yylval.number)
2108	<	#ifndef HAVE_LIBZ
2800	<	yyerror("Ignoring compressed=yes; -- no zlib support");
2801	<	#else
2802	<	yy_aconf->flags |= CONF_FLAGS_COMPRESSED;
2803	<	#endif
2108	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
2109		else
2110	<	yy_aconf->flags &= ~CONF_FLAGS_COMPRESSED;
2806	<	}
2807	<	};
2808	<
2809	<	connect_auto: AUTOCONN '=' TBOOL ';'
2810	<	{
2811	<	if (ypass == 2)
2812	<	{
2813	<	if (yylval.number)
2814	<	yy_aconf->flags |= CONF_FLAGS_ALLOW_AUTO_CONN;
2815	<	else
2816	<	yy_aconf->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN;
2817	<	}
2818	<	};
2819	<
2820	<	connect_topicburst: TOPICBURST '=' TBOOL ';'
2821	<	{
2822	<	if (ypass == 2)
2823	<	{
2824	<	if (yylval.number)
2825	<	SetConfTopicBurst(yy_aconf);
2826	<	else
2827	<	ClearConfTopicBurst(yy_aconf);
2110	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
2111		}
2112		};
2113
2114		connect_hub_mask: HUB_MASK '=' QSTRING ';'
2115		{
2116	<	if (ypass == 2)
2117	<	{
2835	<	struct CollectItem *yy_tmp;
2836	<
2837	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2838	<	DupString(yy_tmp->host, yylval.string);
2839	<	DupString(yy_tmp->user, "*");
2840	<	dlinkAdd(yy_tmp, &yy_tmp->node, &hub_conf_list);
2841	<	}
2116	>	if (conf_parser_ctx.pass == 2)
2117	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2118		};
2119
2120		connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2121		{
2122	<	if (ypass == 2)
2123	<	{
2848	<	struct CollectItem *yy_tmp;
2849	<
2850	<	yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2851	<	DupString(yy_tmp->host, yylval.string);
2852	<	DupString(yy_tmp->user, "*");
2853	<	dlinkAdd(yy_tmp, &yy_tmp->node, &leaf_conf_list);
2854	<	}
2122	>	if (conf_parser_ctx.pass == 2)
2123	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
2124		};
2125
2126		connect_class: CLASS '=' QSTRING ';'
2127		{
2128	<	if (ypass == 2)
2129	<	{
2861	<	MyFree(class_name);
2862	<	DupString(class_name, yylval.string);
2863	<	}
2128	>	if (conf_parser_ctx.pass == 2)
2129	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2130		};
2131
2132	<	connect_cipher_preference: CIPHER_PREFERENCE '=' QSTRING ';'
2132	>	connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2133		{
2134		#ifdef HAVE_LIBCRYPTO
2135	<	if (ypass == 2)
2136	<	{
2871	<	struct EncCapability *ecap;
2872	<	const char *cipher_name;
2873	<	int found = 0;
2874	<
2875	<	yy_aconf->cipher_preference = NULL;
2876	<	cipher_name = yylval.string;
2877	<
2878	<	for (ecap = CipherTable; ecap->name; ecap++)
2879	<	{
2880	<	if ((irccmp(ecap->name, cipher_name) == 0) &&
2881	<	(ecap->cap & CAP_ENC_MASK))
2882	<	{
2883	<	yy_aconf->cipher_preference = ecap;
2884	<	found = 1;
2885	<	break;
2886	<	}
2887	<	}
2888	<
2889	<	if (!found)
2890	<	yyerror("Invalid cipher");
2891	<	}
2135	>	if (conf_parser_ctx.pass == 2)
2136	>	strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2137		#else
2138	<	if (ypass == 2)
2139	<	yyerror("Ignoring cipher_preference -- no OpenSSL support");
2138	>	if (conf_parser_ctx.pass == 2)
2139	>	conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
2140		#endif
2141		};
2142
2143	+
2144		/***************************************************************************
2145		*  section kill
2146		***************************************************************************/
2147		kill_entry: KILL
2148		{
2149	<	if (ypass == 2)
2150	<	{
2905	<	userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
2906	<	regex_ban = 0;
2907	<	}
2149	>	if (conf_parser_ctx.pass == 2)
2150	>	reset_block_state();
2151		} '{' kill_items '}' ';'
2152		{
2153	<	if (ypass == 2)
2911	<	{
2912	<	if (userbuf[0] && hostbuf[0])
2913	<	{
2914	<	if (regex_ban)
2915	<	{
2916	<	pcre *exp_user = NULL;
2917	<	pcre *exp_host = NULL;
2918	<	const char *errptr = NULL;
2919	<
2920	<	if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
2921	<	!(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
2922	<	{
2923	<	ilog(L_ERROR, "Failed to add regular expression based K-Line: %s", errptr);
2924	<	break;
2925	<	}
2926	<
2927	<	yy_conf = make_conf_item(RKLINE_TYPE);
2928	<	yy_aconf->regexuser = exp_user;
2929	<	yy_aconf->regexhost = exp_host;
2153	>	struct MaskItem *conf = NULL;
2154
2155	<	DupString(yy_aconf->user, userbuf);
2156	<	DupString(yy_aconf->host, hostbuf);
2155	>	if (conf_parser_ctx.pass != 2)
2156	>	break;
2157
2158	<	if (reasonbuf[0])
2159	<	DupString(yy_aconf->reason, reasonbuf);
2160	<	else
2937	<	DupString(yy_aconf->reason, "No reason");
2938	<	}
2939	<	else
2940	<	{
2941	<	yy_conf = make_conf_item(KLINE_TYPE);
2942	<	yy_aconf = map_to_conf(yy_conf);
2158	>	if (!block_state.user.buf[0] ||
2159	>	!block_state.host.buf[0])
2160	>	break;
2161
2944	–	DupString(yy_aconf->user, userbuf);
2945	–	DupString(yy_aconf->host, hostbuf);
2162
2163	<	if (reasonbuf[0])
2164	<	DupString(yy_aconf->reason, reasonbuf);
2165	<	else
2166	<	DupString(yy_aconf->reason, "No reason");
2167	<	add_conf_by_address(CONF_KILL, yy_aconf);
2168	<	}
2163	>	if (block_state.port.value == 1)
2164	>	{
2165	>	#ifdef HAVE_LIBPCRE
2166	>	void *exp_user = NULL;
2167	>	void *exp_host = NULL;
2168	>	const char *errptr = NULL;
2169	>
2170	>	if (!(exp_user = ircd_pcre_compile(block_state.user.buf, &errptr)) ||
2171	>	!(exp_host = ircd_pcre_compile(block_state.host.buf, &errptr)))
2172	>	{
2173	>	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: %s",
2174	>	errptr);
2175	>	break;
2176		}
2177	+
2178	+	conf = conf_make(CONF_RKLINE);
2179	+	conf->regexuser = exp_user;
2180	+	conf->regexhost = exp_host;
2181	+
2182	+	conf->user = xstrdup(block_state.user.buf);
2183	+	conf->host = xstrdup(block_state.host.buf);
2184	+
2185	+	if (block_state.rpass.buf[0])
2186	+	conf->reason = xstrdup(block_state.rpass.buf);
2187		else
2188	<	delete_conf_item(yy_conf);
2188	>	conf->reason = xstrdup(CONF_NOREASON);
2189	>	#else
2190	>	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: no PCRE support");
2191	>	break;
2192	>	#endif
2193	>	}
2194	>	else
2195	>	{
2196	>	conf = conf_make(CONF_KLINE);
2197	>
2198	>	conf->user = xstrdup(block_state.user.buf);
2199	>	conf->host = xstrdup(block_state.host.buf);
2200
2201	<	yy_conf = NULL;
2202	<	yy_aconf = NULL;
2201	>	if (block_state.rpass.buf[0])
2202	>	conf->reason = xstrdup(block_state.rpass.buf);
2203	>	else
2204	>	conf->reason = xstrdup(CONF_NOREASON);
2205	>	add_conf_by_address(CONF_KLINE, conf);
2206		}
2207		};
2208
2209		kill_type: TYPE
2210		{
2211	+	if (conf_parser_ctx.pass == 2)
2212	+	block_state.port.value = 0;
2213		} '='  kill_type_items ';';
2214
2215		kill_type_items: kill_type_items ',' kill_type_item | kill_type_item;
2216		kill_type_item: REGEX_T
2217		{
2218	<	if (ypass == 2)
2219	<	regex_ban = 1;
2218	>	if (conf_parser_ctx.pass == 2)
2219	>	block_state.port.value = 1;
2220		};
2221
2222		kill_items:     kill_items kill_item | kill_item;
#	Line 2975 | Line 2224 | kill_item:      kill_user | kill_reason
2224
2225		kill_user: USER '=' QSTRING ';'
2226		{
2227	<	if (ypass == 2)
2227	>
2228	>	if (conf_parser_ctx.pass == 2)
2229		{
2230		struct split_nuh_item nuh;
2231
2232		nuh.nuhmask  = yylval.string;
2233		nuh.nickptr  = NULL;
2234	<	nuh.userptr  = userbuf;
2235	<	nuh.hostptr  = hostbuf;
2234	>	nuh.userptr  = block_state.user.buf;
2235	>	nuh.hostptr  = block_state.host.buf;
2236
2237		nuh.nicksize = 0;
2238	<	nuh.usersize = sizeof(userbuf);
2239	<	nuh.hostsize = sizeof(hostbuf);
2238	>	nuh.usersize = sizeof(block_state.user.buf);
2239	>	nuh.hostsize = sizeof(block_state.host.buf);
2240
2241		split_nuh(&nuh);
2242		}
#	Line 2994 | Line 2244 | kill_user: USER '=' QSTRING ';'
2244
2245		kill_reason: REASON '=' QSTRING ';'
2246		{
2247	<	if (ypass == 2)
2248	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2247	>	if (conf_parser_ctx.pass == 2)
2248	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2249		};
2250
2251		/***************************************************************************
#	Line 3003 | Line 2253 | kill_reason: REASON '=' QSTRING ';'
2253		***************************************************************************/
2254		deny_entry: DENY
2255		{
2256	<	if (ypass == 2)
2257	<	{
3008	<	yy_conf = make_conf_item(DLINE_TYPE);
3009	<	yy_aconf = map_to_conf(yy_conf);
3010	<	/* default reason */
3011	<	DupString(yy_aconf->reason, "No reason");
3012	<	}
2256	>	if (conf_parser_ctx.pass == 2)
2257	>	reset_block_state();
2258		} '{' deny_items '}' ';'
2259		{
2260	<	if (ypass == 2)
2260	>	struct MaskItem *conf = NULL;
2261	>
2262	>	if (conf_parser_ctx.pass != 2)
2263	>	break;
2264	>
2265	>	if (!block_state.addr.buf[0])
2266	>	break;
2267	>
2268	>	if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2269		{
2270	<	if (yy_aconf->host && parse_netmask(yy_aconf->host, NULL, NULL) != HM_HOST)
2271	<	add_conf_by_address(CONF_DLINE, yy_aconf);
2270	>	conf = conf_make(CONF_DLINE);
2271	>	conf->host = xstrdup(block_state.addr.buf);
2272	>
2273	>	if (block_state.rpass.buf[0])
2274	>	conf->reason = xstrdup(block_state.rpass.buf);
2275		else
2276	<	delete_conf_item(yy_conf);
2277	<	yy_conf = NULL;
3022	<	yy_aconf = NULL;
2276	>	conf->reason = xstrdup(CONF_NOREASON);
2277	>	add_conf_by_address(CONF_DLINE, conf);
2278		}
2279		};
2280
#	Line 3028 | Line 2283 | deny_item:      deny_ip | deny_reason |
2283
2284		deny_ip: IP '=' QSTRING ';'
2285		{
2286	<	if (ypass == 2)
2287	<	{
3033	<	MyFree(yy_aconf->host);
3034	<	DupString(yy_aconf->host, yylval.string);
3035	<	}
2286	>	if (conf_parser_ctx.pass == 2)
2287	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2288		};
2289
2290		deny_reason: REASON '=' QSTRING ';'
2291		{
2292	<	if (ypass == 2)
2293	<	{
3042	<	MyFree(yy_aconf->reason);
3043	<	DupString(yy_aconf->reason, yylval.string);
3044	<	}
2292	>	if (conf_parser_ctx.pass == 2)
2293	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2294		};
2295
2296		/***************************************************************************
#	Line 3054 | Line 2303 | exempt_item:      exempt_ip | error;
2303
2304		exempt_ip: IP '=' QSTRING ';'
2305		{
2306	<	if (ypass == 2)
2306	>	if (conf_parser_ctx.pass == 2)
2307		{
2308		if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2309		{
2310	<	yy_conf = make_conf_item(EXEMPTDLINE_TYPE);
2311	<	yy_aconf = map_to_conf(yy_conf);
3063	<	DupString(yy_aconf->host, yylval.string);
2310	>	struct MaskItem *conf = conf_make(CONF_EXEMPT);
2311	>	conf->host = xstrdup(yylval.string);
2312
2313	<	add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
3066	<
3067	<	yy_conf = NULL;
3068	<	yy_aconf = NULL;
2313	>	add_conf_by_address(CONF_EXEMPT, conf);
2314		}
2315		}
2316		};
#	Line 3075 | Line 2320 | exempt_ip: IP '=' QSTRING ';'
2320		***************************************************************************/
2321		gecos_entry: GECOS
2322		{
2323	<	if (ypass == 2)
2324	<	{
3080	<	regex_ban = 0;
3081	<	reasonbuf[0] = gecos_name[0] = '\0';
3082	<	}
2323	>	if (conf_parser_ctx.pass == 2)
2324	>	reset_block_state();
2325		} '{' gecos_items '}' ';'
2326		{
2327	<	if (ypass == 2)
3086	<	{
3087	<	if (gecos_name[0])
3088	<	{
3089	<	if (regex_ban)
3090	<	{
3091	<	pcre *exp_p = NULL;
3092	<	const char *errptr = NULL;
2327	>	struct MaskItem *conf = NULL;
2328
2329	<	if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
2330	<	{
3096	<	ilog(L_ERROR, "Failed to add regular expression based X-Line: %s", errptr);
3097	<	break;
3098	<	}
2329	>	if (conf_parser_ctx.pass != 2)
2330	>	break;
2331
2332	<	yy_conf = make_conf_item(RXLINE_TYPE);
2333	<	yy_conf->regexpname = exp_p;
3102	<	}
3103	<	else
3104	<	yy_conf = make_conf_item(XLINE_TYPE);
2332	>	if (!block_state.name.buf[0])
2333	>	break;
2334
2335	<	yy_match_item = map_to_conf(yy_conf);
2336	<	DupString(yy_conf->name, gecos_name);
2335	>	if (block_state.port.value == 1)
2336	>	{
2337	>	#ifdef HAVE_LIBPCRE
2338	>	void *exp_p = NULL;
2339	>	const char *errptr = NULL;
2340
2341	<	if (reasonbuf[0])
2342	<	DupString(yy_match_item->reason, reasonbuf);
2343	<	else
2344	<	DupString(yy_match_item->reason, "No reason");
2341	>	if (!(exp_p = ircd_pcre_compile(block_state.name.buf, &errptr)))
2342	>	{
2343	>	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: %s",
2344	>	errptr);
2345	>	break;
2346		}
2347	+
2348	+	conf = conf_make(CONF_RXLINE);
2349	+	conf->regexuser = exp_p;
2350	+	#else
2351	+	conf_error_report("Failed to add regular expression based X-Line: no PCRE support");
2352	+	break;
2353	+	#endif
2354		}
2355	+	else
2356	+	conf = conf_make(CONF_XLINE);
2357	+
2358	+	conf->name = xstrdup(block_state.name.buf);
2359	+
2360	+	if (block_state.rpass.buf[0])
2361	+	conf->reason = xstrdup(block_state.rpass.buf);
2362	+	else
2363	+	conf->reason = xstrdup(CONF_NOREASON);
2364		};
2365
2366		gecos_flags: TYPE
2367		{
2368	+	if (conf_parser_ctx.pass == 2)
2369	+	block_state.port.value = 0;
2370		} '='  gecos_flags_items ';';
2371
2372		gecos_flags_items: gecos_flags_items ',' gecos_flags_item | gecos_flags_item;
2373		gecos_flags_item: REGEX_T
2374		{
2375	<	if (ypass == 2)
2376	<	regex_ban = 1;
2375	>	if (conf_parser_ctx.pass == 2)
2376	>	block_state.port.value = 1;
2377		};
2378
2379		gecos_items: gecos_items gecos_item | gecos_item;
#	Line 3130 | Line 2381 | gecos_item:  gecos_name | gecos_reason |
2381
2382		gecos_name: NAME '=' QSTRING ';'
2383		{
2384	<	if (ypass == 2)
2385	<	strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
2384	>	if (conf_parser_ctx.pass == 2)
2385	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2386		};
2387
2388		gecos_reason: REASON '=' QSTRING ';'
2389		{
2390	<	if (ypass == 2)
2391	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2390	>	if (conf_parser_ctx.pass == 2)
2391	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2392		};
2393
2394		/***************************************************************************
#	Line 3152 | Line 2403 | general_item:       general_hide_spoof_i
2403		general_max_nick_time | general_max_nick_changes |
2404		general_max_accept | general_anti_spam_exit_message_time |
2405		general_ts_warn_delta | general_ts_max_delta |
2406	<	general_kill_chase_time_limit | general_kline_with_reason |
2407	<	general_kline_reason | general_invisible_on_connect |
2406	>	general_kill_chase_time_limit |
2407	>	general_invisible_on_connect |
2408		general_warn_no_nline | general_dots_in_ident |
2409		general_stats_o_oper_only | general_stats_k_oper_only |
2410		general_pace_wait | general_stats_i_oper_only |
2411		general_pace_wait_simple | general_stats_P_oper_only |
2412		general_short_motd | general_no_oper_flood |
2413		general_true_no_oper_flood | general_oper_pass_resv |
3163	–	general_idletime | general_message_locale |
2414		general_oper_only_umodes | general_max_targets |
2415		general_use_egd | general_egdpool_path |
2416		general_oper_umodes | general_caller_id_wait |
2417		general_opers_bypass_callerid | general_default_floodcount |
2418		general_min_nonwildcard | general_min_nonwildcard_simple |
2419	<	general_servlink_path | general_disable_remote_commands |
3170	<	general_default_cipher_preference |
3171	<	general_compression_level | general_client_flood |
2419	>	general_disable_remote_commands |
2420		general_throttle_time | general_havent_read_conf |
2421	<	general_dot_in_ip6_addr | general_ping_cookie |
2422	<	general_disable_auth | general_burst_away |
2423	<	general_tkline_expire_notices | general_gline_min_cidr |
2424	<	general_gline_min_cidr6 | general_use_whois_actually |
2425	<	general_reject_hold_time | general_stats_e_disabled |
2421	>	general_ping_cookie |
2422	>	general_disable_auth |
2423	>	general_tkline_expire_notices | general_gline_enable |
2424	>	general_gline_duration | general_gline_request_duration |
2425	>	general_gline_min_cidr |
2426	>	general_gline_min_cidr6 |
2427	>	general_stats_e_disabled |
2428	>	general_max_watch | general_services_name |
2429		error;
2430
2431
2432	+	general_max_watch: MAX_WATCH '=' NUMBER ';'
2433	+	{
2434	+	ConfigFileEntry.max_watch = $3;
2435	+	};
2436
2437	<	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2437	>	general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2438		{
2439	<	ConfigFileEntry.gline_min_cidr = $3;
2439	>	if (conf_parser_ctx.pass == 2)
2440	>	ConfigFileEntry.glines = yylval.number;
2441		};
2442
2443	<	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2443	>	general_gline_duration: GLINE_DURATION '=' timespec ';'
2444		{
2445	<	ConfigFileEntry.gline_min_cidr6 = $3;
2445	>	if (conf_parser_ctx.pass == 2)
2446	>	ConfigFileEntry.gline_time = $3;
2447		};
2448
2449	<	general_burst_away: BURST_AWAY '=' TBOOL ';'
2449	>	general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2450		{
2451	<	ConfigFileEntry.burst_away = yylval.number;
2451	>	if (conf_parser_ctx.pass == 2)
2452	>	ConfigFileEntry.gline_request_time = $3;
2453		};
2454
2455	<	general_use_whois_actually: USE_WHOIS_ACTUALLY '=' TBOOL ';'
2455	>	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2456		{
2457	<	ConfigFileEntry.use_whois_actually = yylval.number;
2457	>	ConfigFileEntry.gline_min_cidr = $3;
2458		};
2459
2460	<	general_reject_hold_time: TREJECT_HOLD_TIME '=' timespec ';'
2460	>	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2461		{
2462	<	GlobalSetOptions.rejecttime = yylval.number;
2462	>	ConfigFileEntry.gline_min_cidr6 = $3;
2463		};
2464
2465		general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
#	Line 3209 | Line 2467 | general_tkline_expire_notices: TKLINE_EX
2467		ConfigFileEntry.tkline_expire_notices = yylval.number;
2468		};
2469
2470	<	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' NUMBER ';'
2470	>	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2471		{
2472		ConfigFileEntry.kill_chase_time_limit = $3;
2473		};
#	Line 3266 | Line 2524 | general_ts_warn_delta: TS_WARN_DELTA '='
2524
2525		general_ts_max_delta: TS_MAX_DELTA '=' timespec ';'
2526		{
2527	<	if (ypass == 2)
2527	>	if (conf_parser_ctx.pass == 2)
2528		ConfigFileEntry.ts_max_delta = $3;
2529		};
2530
2531		general_havent_read_conf: HAVENT_READ_CONF '=' NUMBER ';'
2532		{
2533	<	if (($3 > 0) && ypass == 1)
2533	>	if (($3 > 0) && conf_parser_ctx.pass == 1)
2534		{
2535	<	ilog(L_CRIT, "You haven't read your config file properly.");
2536	<	ilog(L_CRIT, "There is a line in the example conf that will kill your server if not removed.");
2537	<	ilog(L_CRIT, "Consider actually reading/editing the conf file, and removing this line.");
2535	>	ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
2536	>	ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
2537	>	ilog(LOG_TYPE_IRCD, "Consider actually reading/editing the conf file, and removing this line.");
2538		exit(0);
2539		}
2540		};
2541
3284	–	general_kline_with_reason: KLINE_WITH_REASON '=' TBOOL ';'
3285	–	{
3286	–	ConfigFileEntry.kline_with_reason = yylval.number;
3287	–	};
3288	–
3289	–	general_kline_reason: KLINE_REASON '=' QSTRING ';'
3290	–	{
3291	–	if (ypass == 2)
3292	–	{
3293	–	MyFree(ConfigFileEntry.kline_reason);
3294	–	DupString(ConfigFileEntry.kline_reason, yylval.string);
3295	–	}
3296	–	};
3297	–
2542		general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2543		{
2544		ConfigFileEntry.invisible_on_connect = yylval.number;
#	Line 3376 | Line 2620 | general_oper_pass_resv: OPER_PASS_RESV '
2620		ConfigFileEntry.oper_pass_resv = yylval.number;
2621		};
2622
3379	–	general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
3380	–	{
3381	–	if (ypass == 2)
3382	–	{
3383	–	if (strlen(yylval.string) > LOCALE_LENGTH-2)
3384	–	yylval.string[LOCALE_LENGTH-1] = '\0';
3385	–
3386	–	set_locale(yylval.string);
3387	–	}
3388	–	};
3389	–
3390	–	general_idletime: IDLETIME '=' timespec ';'
3391	–	{
3392	–	ConfigFileEntry.idletime = $3;
3393	–	};
3394	–
2623		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2624		{
2625		ConfigFileEntry.dots_in_ident = $3;
#	Line 3402 | Line 2630 | general_max_targets: MAX_TARGETS '=' NUM
2630		ConfigFileEntry.max_targets = $3;
2631		};
2632
2633	<	general_servlink_path: SERVLINK_PATH '=' QSTRING ';'
3406	<	{
3407	<	if (ypass == 2)
3408	<	{
3409	<	MyFree(ConfigFileEntry.servlink_path);
3410	<	DupString(ConfigFileEntry.servlink_path, yylval.string);
3411	<	}
3412	<	};
3413	<
3414	<	general_default_cipher_preference: DEFAULT_CIPHER_PREFERENCE '=' QSTRING ';'
2633	>	general_use_egd: USE_EGD '=' TBOOL ';'
2634		{
2635	<	#ifdef HAVE_LIBCRYPTO
3417	<	if (ypass == 2)
3418	<	{
3419	<	struct EncCapability *ecap;
3420	<	const char *cipher_name;
3421	<	int found = 0;
3422	<
3423	<	ConfigFileEntry.default_cipher_preference = NULL;
3424	<	cipher_name = yylval.string;
3425	<
3426	<	for (ecap = CipherTable; ecap->name; ecap++)
3427	<	{
3428	<	if ((irccmp(ecap->name, cipher_name) == 0) &&
3429	<	(ecap->cap & CAP_ENC_MASK))
3430	<	{
3431	<	ConfigFileEntry.default_cipher_preference = ecap;
3432	<	found = 1;
3433	<	break;
3434	<	}
3435	<	}
3436	<
3437	<	if (!found)
3438	<	yyerror("Invalid cipher");
3439	<	}
3440	<	#else
3441	<	if (ypass == 2)
3442	<	yyerror("Ignoring default_cipher_preference -- no OpenSSL support");
3443	<	#endif
2635	>	ConfigFileEntry.use_egd = yylval.number;
2636		};
2637
2638	<	general_compression_level: COMPRESSION_LEVEL '=' NUMBER ';'
2638	>	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
2639		{
2640	<	if (ypass == 2)
2640	>	if (conf_parser_ctx.pass == 2)
2641		{
2642	<	ConfigFileEntry.compression_level = $3;
2643	<	#ifndef HAVE_LIBZ
3452	<	yyerror("Ignoring compression_level -- no zlib support");
3453	<	#else
3454	<	if ((ConfigFileEntry.compression_level < 1) ||
3455	<	(ConfigFileEntry.compression_level > 9))
3456	<	{
3457	<	yyerror("Ignoring invalid compression_level, using default");
3458	<	ConfigFileEntry.compression_level = 0;
3459	<	}
3460	<	#endif
2642	>	MyFree(ConfigFileEntry.egdpool_path);
2643	>	ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
2644		}
2645		};
2646
2647	<	general_use_egd: USE_EGD '=' TBOOL ';'
3465	<	{
3466	<	ConfigFileEntry.use_egd = yylval.number;
3467	<	};
3468	<
3469	<	general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
2647	>	general_services_name: T_SERVICES_NAME '=' QSTRING ';'
2648		{
2649	<	if (ypass == 2)
2649	>	if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2650		{
2651	<	MyFree(ConfigFileEntry.egdpool_path);
2652	<	DupString(ConfigFileEntry.egdpool_path, yylval.string);
2651	>	MyFree(ConfigFileEntry.service_name);
2652	>	ConfigFileEntry.service_name = xstrdup(yylval.string);
2653		}
2654		};
2655
#	Line 3502 | Line 2680 | umode_oitem:     T_BOTS
2680		} | T_CCONN
2681		{
2682		ConfigFileEntry.oper_umodes |= UMODE_CCONN;
2683	+	} | T_CCONN_FULL
2684	+	{
2685	+	ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
2686		} | T_DEAF
2687		{
2688		ConfigFileEntry.oper_umodes |= UMODE_DEAF;
#	Line 3511 | Line 2692 | umode_oitem:     T_BOTS
2692		} | T_FULL
2693		{
2694		ConfigFileEntry.oper_umodes |= UMODE_FULL;
2695	+	} | HIDDEN
2696	+	{
2697	+	ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
2698		} | T_SKILL
2699		{
2700		ConfigFileEntry.oper_umodes |= UMODE_SKILL;
#	Line 3564 | Line 2748 | umode_item:    T_BOTS
2748		} | T_CCONN
2749		{
2750		ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
2751	+	} | T_CCONN_FULL
2752	+	{
2753	+	ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
2754		} | T_DEAF
2755		{
2756		ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
#	Line 3576 | Line 2763 | umode_item:    T_BOTS
2763		} | T_SKILL
2764		{
2765		ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
2766	+	} | HIDDEN
2767	+	{
2768	+	ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
2769		} | T_NCHANGE
2770		{
2771		ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
#	Line 3629 | Line 2819 | general_default_floodcount: DEFAULT_FLOO
2819		ConfigFileEntry.default_floodcount = $3;
2820		};
2821
3632	–	general_client_flood: T_CLIENT_FLOOD '=' sizespec ';'
3633	–	{
3634	–	ConfigFileEntry.client_flood = $3;
3635	–	};
3636	–
3637	–	general_dot_in_ip6_addr: DOT_IN_IP6_ADDR '=' TBOOL ';'
3638	–	{
3639	–	ConfigFileEntry.dot_in_ip6_addr = yylval.number;
3640	–	};
3641	–
3642	–	/***************************************************************************
3643	–	*  section glines
3644	–	***************************************************************************/
3645	–	gline_entry: GLINES
3646	–	{
3647	–	if (ypass == 2)
3648	–	{
3649	–	yy_conf = make_conf_item(GDENY_TYPE);
3650	–	yy_aconf = map_to_conf(yy_conf);
3651	–	}
3652	–	} '{' gline_items '}' ';'
3653	–	{
3654	–	if (ypass == 2)
3655	–	{
3656	–	/*
3657	–	* since we re-allocate yy_conf/yy_aconf after the end of action=, at the
3658	–	* end we will have one extra, so we should free it.
3659	–	*/
3660	–	if (yy_conf->name == NULL || yy_aconf->user == NULL)
3661	–	{
3662	–	delete_conf_item(yy_conf);
3663	–	yy_conf = NULL;
3664	–	yy_aconf = NULL;
3665	–	}
3666	–	}
3667	–	};
3668	–
3669	–	gline_items:        gline_items gline_item | gline_item;
3670	–	gline_item:         gline_enable |
3671	–	gline_duration |
3672	–	gline_logging |
3673	–	gline_user |
3674	–	gline_server |
3675	–	gline_action |
3676	–	error;
3677	–
3678	–	gline_enable: ENABLE '=' TBOOL ';'
3679	–	{
3680	–	if (ypass == 2)
3681	–	ConfigFileEntry.glines = yylval.number;
3682	–	};
3683	–
3684	–	gline_duration: DURATION '=' timespec ';'
3685	–	{
3686	–	if (ypass == 2)
3687	–	ConfigFileEntry.gline_time = $3;
3688	–	};
3689	–
3690	–	gline_logging: LOGGING
3691	–	{
3692	–	if (ypass == 2)
3693	–	ConfigFileEntry.gline_logging = 0;
3694	–	} '=' gline_logging_types ';';
3695	–	gline_logging_types:     gline_logging_types ',' gline_logging_type_item | gline_logging_type_item;
3696	–	gline_logging_type_item: T_REJECT
3697	–	{
3698	–	if (ypass == 2)
3699	–	ConfigFileEntry.gline_logging |= GDENY_REJECT;
3700	–	} | T_BLOCK
3701	–	{
3702	–	if (ypass == 2)
3703	–	ConfigFileEntry.gline_logging |= GDENY_BLOCK;
3704	–	};
3705	–
3706	–	gline_user: USER '=' QSTRING ';'
3707	–	{
3708	–	if (ypass == 2)
3709	–	{
3710	–	struct split_nuh_item nuh;
3711	–
3712	–	nuh.nuhmask  = yylval.string;
3713	–	nuh.nickptr  = NULL;
3714	–	nuh.userptr  = userbuf;
3715	–	nuh.hostptr  = hostbuf;
3716	–
3717	–	nuh.nicksize = 0;
3718	–	nuh.usersize = sizeof(userbuf);
3719	–	nuh.hostsize = sizeof(hostbuf);
3720	–
3721	–	split_nuh(&nuh);
3722	–
3723	–	if (yy_aconf->user == NULL)
3724	–	{
3725	–	DupString(yy_aconf->user, userbuf);
3726	–	DupString(yy_aconf->host, hostbuf);
3727	–	}
3728	–	else
3729	–	{
3730	–	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
3731	–
3732	–	DupString(yy_tmp->user, userbuf);
3733	–	DupString(yy_tmp->host, hostbuf);
3734	–
3735	–	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
3736	–	}
3737	–	}
3738	–	};
3739	–
3740	–	gline_server: NAME '=' QSTRING ';'
3741	–	{
3742	–	if (ypass == 2)
3743	–	{
3744	–	MyFree(yy_conf->name);
3745	–	DupString(yy_conf->name, yylval.string);
3746	–	}
3747	–	};
3748	–
3749	–	gline_action: ACTION
3750	–	{
3751	–	if (ypass == 2)
3752	–	yy_aconf->flags = 0;
3753	–	} '=' gdeny_types ';'
3754	–	{
3755	–	if (ypass == 2)
3756	–	{
3757	–	struct CollectItem *yy_tmp = NULL;
3758	–	dlink_node *ptr, *next_ptr;
3759	–
3760	–	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3761	–	{
3762	–	struct AccessItem *new_aconf;
3763	–	struct ConfItem *new_conf;
3764	–
3765	–	yy_tmp = ptr->data;
3766	–	new_conf = make_conf_item(GDENY_TYPE);
3767	–	new_aconf = map_to_conf(new_conf);
3768	–
3769	–	new_aconf->flags = yy_aconf->flags;
3770	–
3771	–	if (yy_conf->name != NULL)
3772	–	DupString(new_conf->name, yy_conf->name);
3773	–	else
3774	–	DupString(new_conf->name, "*");
3775	–	if (yy_aconf->user != NULL)
3776	–	DupString(new_aconf->user, yy_tmp->user);
3777	–	else
3778	–	DupString(new_aconf->user, "*");
3779	–	if (yy_aconf->host != NULL)
3780	–	DupString(new_aconf->host, yy_tmp->host);
3781	–	else
3782	–	DupString(new_aconf->host, "*");
3783	–
3784	–	dlinkDelete(&yy_tmp->node, &col_conf_list);
3785	–	}
3786	–
3787	–	/*
3788	–	* In case someone has fed us with more than one action= after user/name
3789	–	* which would leak memory  -Michael
3790	–	*/
3791	–	if (yy_conf->name == NULL || yy_aconf->user == NULL)
3792	–	delete_conf_item(yy_conf);
3793	–
3794	–	yy_conf = make_conf_item(GDENY_TYPE);
3795	–	yy_aconf = map_to_conf(yy_conf);
3796	–	}
3797	–	};
3798	–
3799	–	gdeny_types: gdeny_types ',' gdeny_type_item | gdeny_type_item;
3800	–	gdeny_type_item: T_REJECT
3801	–	{
3802	–	if (ypass == 2)
3803	–	yy_aconf->flags |= GDENY_REJECT;
3804	–	} | T_BLOCK
3805	–	{
3806	–	if (ypass == 2)
3807	–	yy_aconf->flags |= GDENY_BLOCK;
3808	–	};
2822
2823		/***************************************************************************
2824		*  section channel
#	Line 3814 | Line 2827 | channel_entry: CHANNEL
2827		'{' channel_items '}' ';';
2828
2829		channel_items:      channel_items channel_item | channel_item;
2830	<	channel_item:       channel_disable_local_channels | channel_use_except |
2831	<	channel_use_invex | channel_use_knock |
2832	<	channel_max_bans | channel_knock_delay |
3820	<	channel_knock_delay_channel | channel_max_chans_per_user |
2830	>	channel_item:       channel_max_bans |
2831	>	channel_knock_delay | channel_knock_delay_channel |
2832	>	channel_max_chans_per_user | channel_max_chans_per_oper |
2833		channel_quiet_on_ban | channel_default_split_user_count |
2834		channel_default_split_server_count |
2835		channel_no_create_on_split | channel_restrict_channels |
2836	<	channel_no_join_on_split | channel_burst_topicwho |
2836	>	channel_no_join_on_split |
2837		channel_jflood_count | channel_jflood_time |
2838	<	error;
3827	<
3828	<	channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
3829	<	{
3830	<	ConfigChannel.restrict_channels = yylval.number;
3831	<	};
3832	<
3833	<	channel_disable_local_channels: DISABLE_LOCAL_CHANNELS '=' TBOOL ';'
3834	<	{
3835	<	ConfigChannel.disable_local_channels = yylval.number;
3836	<	};
3837	<
3838	<	channel_use_except: USE_EXCEPT '=' TBOOL ';'
3839	<	{
3840	<	ConfigChannel.use_except = yylval.number;
3841	<	};
2838	>	channel_disable_fake_channels | error;
2839
2840	<	channel_use_invex: USE_INVEX '=' TBOOL ';'
2840	>	channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
2841		{
2842	<	ConfigChannel.use_invex = yylval.number;
2842	>	ConfigChannel.disable_fake_channels = yylval.number;
2843		};
2844
2845	<	channel_use_knock: USE_KNOCK '=' TBOOL ';'
2845	>	channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
2846		{
2847	<	ConfigChannel.use_knock = yylval.number;
2847	>	ConfigChannel.restrict_channels = yylval.number;
2848		};
2849
2850		channel_knock_delay: KNOCK_DELAY '=' timespec ';'
#	Line 3865 | Line 2862 | channel_max_chans_per_user: MAX_CHANS_PE
2862		ConfigChannel.max_chans_per_user = $3;
2863		};
2864
2865	+	channel_max_chans_per_oper: MAX_CHANS_PER_OPER '=' NUMBER ';'
2866	+	{
2867	+	ConfigChannel.max_chans_per_oper = $3;
2868	+	};
2869	+
2870		channel_quiet_on_ban: QUIET_ON_BAN '=' TBOOL ';'
2871		{
2872		ConfigChannel.quiet_on_ban = yylval.number;
#	Line 3895 | Line 2897 | channel_no_join_on_split: NO_JOIN_ON_SPL
2897		ConfigChannel.no_join_on_split = yylval.number;
2898		};
2899
3898	–	channel_burst_topicwho: BURST_TOPICWHO '=' TBOOL ';'
3899	–	{
3900	–	ConfigChannel.burst_topicwho = yylval.number;
3901	–	};
3902	–
2900		channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
2901		{
2902		GlobalSetOptions.joinfloodcount = yylval.number;
#	Line 3919 | Line 2916 | serverhide_entry: SERVERHIDE
2916		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
2917		serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
2918		serverhide_links_delay |
3922	–	serverhide_disable_hidden |
2919		serverhide_hidden | serverhide_hidden_name |
2920		serverhide_hide_server_ips |
2921		error;
2922
2923		serverhide_flatten_links: FLATTEN_LINKS '=' TBOOL ';'
2924		{
2925	<	if (ypass == 2)
2925	>	if (conf_parser_ctx.pass == 2)
2926		ConfigServerHide.flatten_links = yylval.number;
2927		};
2928
2929		serverhide_hide_servers: HIDE_SERVERS '=' TBOOL ';'
2930		{
2931	<	if (ypass == 2)
2931	>	if (conf_parser_ctx.pass == 2)
2932		ConfigServerHide.hide_servers = yylval.number;
2933		};
2934
2935		serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2936		{
2937	<	if (ypass == 2)
2937	>	if (conf_parser_ctx.pass == 2)
2938		{
2939		MyFree(ConfigServerHide.hidden_name);
2940	<	DupString(ConfigServerHide.hidden_name, yylval.string);
2940	>	ConfigServerHide.hidden_name = xstrdup(yylval.string);
2941		}
2942		};
2943
2944		serverhide_links_delay: LINKS_DELAY '=' timespec ';'
2945		{
2946	<	if (ypass == 2)
2946	>	if (conf_parser_ctx.pass == 2)
2947		{
2948		if (($3 > 0) && ConfigServerHide.links_disabled == 1)
2949		{
#	Line 3961 | Line 2957 | serverhide_links_delay: LINKS_DELAY '='
2957
2958		serverhide_hidden: HIDDEN '=' TBOOL ';'
2959		{
2960	<	if (ypass == 2)
2960	>	if (conf_parser_ctx.pass == 2)
2961		ConfigServerHide.hidden = yylval.number;
2962		};
2963
3968	–	serverhide_disable_hidden: DISABLE_HIDDEN '=' TBOOL ';'
3969	–	{
3970	–	if (ypass == 2)
3971	–	ConfigServerHide.disable_hidden = yylval.number;
3972	–	};
3973	–
2964		serverhide_hide_server_ips: HIDE_SERVER_IPS '=' TBOOL ';'
2965		{
2966	<	if (ypass == 2)
2966	>	if (conf_parser_ctx.pass == 2)
2967		ConfigServerHide.hide_server_ips = yylval.number;
2968		};

Diff Legend

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