ViewVC Help

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

root/svn/ircd-hybrid/releases/8.1.0beta2/src/conf_parser.y

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

Diff Legend

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