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

Diff Legend

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