ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/conf_parser.y (file contents), Revision 1352 by michael, Fri Apr 13 09:57:08 2012 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 1858 by michael, Thu Apr 25 15:00:52 2013 UTC

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

Diff Legend

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