ViewVC Help

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

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

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

Diff Legend

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