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 1851 by michael, Wed Apr 24 18:31:06 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
#	Line 216 | Line 210 | unhook_hub_leaf_confs(void)
210		%token  T_LOG
211		%token  MAX_ACCEPT
212		%token  MAX_BANS
213	+	%token  MAX_CHANS_PER_OPER
214		%token  MAX_CHANS_PER_USER
215		%token  MAX_GLOBAL
216		%token  MAX_IDENT
217		%token  MAX_LOCAL
218		%token  MAX_NICK_CHANGES
219	+	%token  MAX_NICK_LENGTH
220		%token  MAX_NICK_TIME
221		%token  MAX_NUMBER
222		%token  MAX_TARGETS
223	+	%token  MAX_TOPIC_LENGTH
224		%token  MAX_WATCH
228	–	%token  MESSAGE_LOCALE
225		%token  MIN_NONWILDCARD
226		%token  MIN_NONWILDCARD_SIMPLE
227	+	%token  MIN_IDLE
228	+	%token  MAX_IDLE
229	+	%token  RANDOM_IDLE
230	+	%token  HIDE_IDLE_FROM_OPERS
231		%token  MODULE
232		%token  MODULES
233		%token  NAME
#	Line 241 | Line 241 | unhook_hub_leaf_confs(void)
241		%token  NO_OPER_FLOOD
242		%token  NO_TILDE
243		%token  NUMBER
244	–	%token  NUMBER_PER_IDENT
244		%token  NUMBER_PER_CIDR
245		%token  NUMBER_PER_IP
247	–	%token  NUMBER_PER_IP_GLOBAL
246		%token  OPERATOR
247		%token  OPERS_BYPASS_CALLERID
248		%token  OPER_ONLY_UMODES
#	Line 259 | Line 257 | unhook_hub_leaf_confs(void)
257		%token  PATH
258		%token  PING_COOKIE
259		%token  PING_TIME
262	–	%token  PING_WARNING
260		%token  PORT
261		%token  QSTRING
262		%token  QUIET_ON_BAN
#	Line 268 | Line 265 | unhook_hub_leaf_confs(void)
265		%token  REDIRSERV
266		%token  REGEX_T
267		%token  REHASH
271	–	%token  TREJECT_HOLD_TIME
268		%token  REMOTE
269		%token  REMOTEBAN
270		%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 329 | Line 320 | unhook_hub_leaf_confs(void)
320		%token  T_MAX_CLIENTS
321		%token  T_NCHANGE
322		%token  T_OPERWALL
323	+	%token  T_RECVQ
324		%token  T_REJ
325		%token  T_SERVER
326		%token  T_SERVNOTICE
327	+	%token  T_SET
328		%token  T_SKILL
329		%token  T_SPY
330		%token  T_SSL
#	Line 343 | Line 336 | unhook_hub_leaf_confs(void)
336		%token  T_UNXLINE
337		%token  T_GLOBOPS
338		%token  T_WALLOP
339	+	%token  T_WEBIRC
340		%token  T_RESTART
341		%token  T_SERVICE
342		%token  T_SERVICES_NAME
343		%token  THROTTLE_TIME
350	–	%token  TOPICBURST
344		%token  TRUE_NO_OPER_FLOOD
352	–	%token  TKLINE
353	–	%token  TXLINE
354	–	%token  TRESV
345		%token  UNKLINE
346		%token  USER
347		%token  USE_EGD
358	–	%token  USE_EXCEPT
359	–	%token  USE_INVEX
360	–	%token  USE_KNOCK
348		%token  USE_LOGGING
362	–	%token  USE_WHOIS_ACTUALLY
349		%token  VHOST
350		%token  VHOST6
351		%token  XLINE
366	–	%token  WARN
352		%token  WARN_NO_NLINE
353		%token  T_SIZE
354		%token  T_FILE
#	Line 398 | Line 383 | conf_item:        admin_entry
383		| deny_entry
384		| exempt_entry
385		| general_entry
401	–	| gline_entry
386		| gecos_entry
387		| modules_entry
388		| error ';'
#	Line 431 | Line 415 | timespec:      NUMBER timespec_
415		{
416		$$ = $1 * 60 * 60 * 24 * 7 + $3;
417		}
418	+	| NUMBER MONTHS timespec_
419	+	{
420	+	$$ = $1 * 60 * 60 * 24 * 7 * 4 + $3;
421	+	}
422	+	| NUMBER YEARS timespec_
423	+	{
424	+	$$ = $1 * 60 * 60 * 24 * 365 + $3;
425	+	}
426		;
427
428		sizespec_:      { $$ = 0; } | sizespec;
#	Line 469 | Line 461 | serverinfo_items:       serverinfo_items
461		serverinfo_item:        serverinfo_name | serverinfo_vhost |
462		serverinfo_hub | serverinfo_description |
463		serverinfo_network_name | serverinfo_network_desc |
464	<	serverinfo_max_clients | serverinfo_ssl_dh_param_file |
464	>	serverinfo_max_clients | serverinfo_max_nick_length |
465	>	serverinfo_max_topic_length | serverinfo_ssl_dh_param_file |
466		serverinfo_rsa_private_key_file | serverinfo_vhost6 |
467		serverinfo_sid | serverinfo_ssl_certificate_file |
468		serverinfo_ssl_client_method | serverinfo_ssl_server_method |
#	Line 517 | Line 510 | serverinfo_ssl_certificate_file: SSL_CER
510		{
511		if (!ServerInfo.rsa_private_key_file)
512		{
513	<	yyerror("No rsa_private_key_file specified, SSL disabled");
513	>	conf_error_report("No rsa_private_key_file specified, SSL disabled");
514		break;
515		}
516
#	Line 526 | Line 519 | serverinfo_ssl_certificate_file: SSL_CER
519		SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
520		SSL_FILETYPE_PEM) <= 0)
521		{
522	<	yyerror(ERR_lib_error_string(ERR_get_error()));
522	>	report_crypto_errors();
523	>	conf_error_report("Could not open/read certificate file");
524		break;
525		}
526
#	Line 535 | Line 529 | serverinfo_ssl_certificate_file: SSL_CER
529		SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
530		SSL_FILETYPE_PEM) <= 0)
531		{
532	<	yyerror(ERR_lib_error_string(ERR_get_error()));
532	>	report_crypto_errors();
533	>	conf_error_report("Could not read RSA private key");
534		break;
535		}
536
537		if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
538		!SSL_CTX_check_private_key(ServerInfo.client_ctx))
539		{
540	<	yyerror(ERR_lib_error_string(ERR_get_error()));
540	>	report_crypto_errors();
541	>	conf_error_report("Could not read RSA private key");
542		break;
543		}
544		}
#	Line 568 | Line 564 | serverinfo_rsa_private_key_file: RSA_PRI
564		ServerInfo.rsa_private_key_file = NULL;
565		}
566
567	<	DupString(ServerInfo.rsa_private_key_file, yylval.string);
567	>	ServerInfo.rsa_private_key_file = xstrdup(yylval.string);
568
569		if ((file = BIO_new_file(yylval.string, "r")) == NULL)
570		{
571	<	yyerror("File open failed, ignoring");
571	>	conf_error_report("File open failed, ignoring");
572		break;
573		}
574
#	Line 583 | Line 579 | serverinfo_rsa_private_key_file: RSA_PRI
579
580		if (ServerInfo.rsa_private_key == NULL)
581		{
582	<	yyerror("Couldn't extract key, ignoring");
582	>	conf_error_report("Couldn't extract key, ignoring");
583		break;
584		}
585
#	Line 592 | Line 588 | serverinfo_rsa_private_key_file: RSA_PRI
588		RSA_free(ServerInfo.rsa_private_key);
589		ServerInfo.rsa_private_key = NULL;
590
591	<	yyerror("Invalid key, ignoring");
591	>	conf_error_report("Invalid key, ignoring");
592		break;
593		}
594
#	Line 602 | Line 598 | serverinfo_rsa_private_key_file: RSA_PRI
598		RSA_free(ServerInfo.rsa_private_key);
599		ServerInfo.rsa_private_key = NULL;
600
601	<	yyerror("Not a 2048 bit key, ignoring");
601	>	conf_error_report("Not a 2048 bit key, ignoring");
602		}
603		}
604		#endif
#	Line 625 | Line 621 | serverinfo_ssl_dh_param_file: SSL_DH_PAR
621		if (dh)
622		{
623		if (DH_size(dh) < 128)
624	<	ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
624	>	conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
625		else
626		SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
627
#	Line 650 | Line 646 | serverinfo_name: NAME '=' QSTRING ';'
646		if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
647		{
648		if (valid_servname(yylval.string))
649	<	DupString(ServerInfo.name, yylval.string);
649	>	ServerInfo.name = xstrdup(yylval.string);
650		else
651		{
652	<	ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::name -- invalid name. Aborting.");
652	>	conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
653		exit(0);
654		}
655		}
#	Line 665 | Line 661 | serverinfo_sid: IRCD_SID '=' QSTRING ';'
661		if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
662		{
663		if (valid_sid(yylval.string))
664	<	DupString(ServerInfo.sid, yylval.string);
664	>	ServerInfo.sid = xstrdup(yylval.string);
665		else
666		{
667	<	ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::sid -- invalid SID. Aborting.");
667	>	conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
668		exit(0);
669		}
670		}
#	Line 679 | Line 675 | serverinfo_description: DESCRIPTION '='
675		if (conf_parser_ctx.pass == 2)
676		{
677		MyFree(ServerInfo.description);
678	<	DupString(ServerInfo.description,yylval.string);
678	>	ServerInfo.description = xstrdup(yylval.string);
679		}
680		};
681
#	Line 693 | Line 689 | serverinfo_network_name: NETWORK_NAME '=
689		p = '\0';
690
691		MyFree(ServerInfo.network_name);
692	<	DupString(ServerInfo.network_name, yylval.string);
692	>	ServerInfo.network_name = xstrdup(yylval.string);
693		}
694		};
695
#	Line 702 | Line 698 | serverinfo_network_desc: NETWORK_DESC '=
698		if (conf_parser_ctx.pass == 2)
699		{
700		MyFree(ServerInfo.network_desc);
701	<	DupString(ServerInfo.network_desc, yylval.string);
701	>	ServerInfo.network_desc = xstrdup(yylval.string);
702		}
703		};
704
#	Line 766 | Line 762 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
762
763		serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
764		{
765	<	if (conf_parser_ctx.pass == 2)
765	>	if (conf_parser_ctx.pass != 2)
766	>	break;
767	>
768	>	if ($3 < MAXCLIENTS_MIN)
769		{
770	<	recalc_fdlimit(NULL);
770	>	char buf[IRCD_BUFSIZE];
771
772	<	if ($3 < MAXCLIENTS_MIN)
773	<	{
774	<	char buf[IRCD_BUFSIZE];
775	<	ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
776	<	yyerror(buf);
777	<	}
778	<	else if ($3 > MAXCLIENTS_MAX)
779	<	{
780	<	char buf[IRCD_BUFSIZE];
781	<	ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
782	<	yyerror(buf);
783	<	}
784	<	else
785	<	ServerInfo.max_clients = $3;
772	>	snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
773	>	conf_error_report(buf);
774	>	ServerInfo.max_clients = MAXCLIENTS_MIN;
775	>	}
776	>	else if ($3 > MAXCLIENTS_MAX)
777	>	{
778	>	char buf[IRCD_BUFSIZE];
779	>
780	>	snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
781	>	conf_error_report(buf);
782	>	ServerInfo.max_clients = MAXCLIENTS_MAX;
783	>	}
784	>	else
785	>	ServerInfo.max_clients = $3;
786	>	};
787	>
788	>	serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
789	>	{
790	>	if (conf_parser_ctx.pass != 2)
791	>	break;
792	>
793	>	if ($3 < 9)
794	>	{
795	>	conf_error_report("max_nick_length too low, setting to 9");
796	>	ServerInfo.max_nick_length = 9;
797	>	}
798	>	else if ($3 > NICKLEN)
799	>	{
800	>	char buf[IRCD_BUFSIZE];
801	>
802	>	snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
803	>	conf_error_report(buf);
804	>	ServerInfo.max_nick_length = NICKLEN;
805		}
806	+	else
807	+	ServerInfo.max_nick_length = $3;
808	+	};
809	+
810	+	serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
811	+	{
812	+	if (conf_parser_ctx.pass != 2)
813	+	break;
814	+
815	+	if ($3 < 80)
816	+	{
817	+	conf_error_report("max_topic_length too low, setting to 80");
818	+	ServerInfo.max_topic_length = 80;
819	+	}
820	+	else if ($3 > TOPICLEN)
821	+	{
822	+	char buf[IRCD_BUFSIZE];
823	+
824	+	snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
825	+	conf_error_report(buf);
826	+	ServerInfo.max_topic_length = TOPICLEN;
827	+	}
828	+	else
829	+	ServerInfo.max_topic_length = $3;
830		};
831
832		serverinfo_hub: HUB '=' TBOOL ';'
#	Line 807 | Line 849 | admin_name: NAME '=' QSTRING ';'
849		if (conf_parser_ctx.pass == 2)
850		{
851		MyFree(AdminInfo.name);
852	<	DupString(AdminInfo.name, yylval.string);
852	>	AdminInfo.name = xstrdup(yylval.string);
853		}
854		};
855
#	Line 816 | Line 858 | admin_email: EMAIL '=' QSTRING ';'
858		if (conf_parser_ctx.pass == 2)
859		{
860		MyFree(AdminInfo.email);
861	<	DupString(AdminInfo.email, yylval.string);
861	>	AdminInfo.email = xstrdup(yylval.string);
862		}
863		};
864
#	Line 825 | Line 867 | admin_description: DESCRIPTION '=' QSTRI
867		if (conf_parser_ctx.pass == 2)
868		{
869		MyFree(AdminInfo.description);
870	<	DupString(AdminInfo.description, yylval.string);
870	>	AdminInfo.description = xstrdup(yylval.string);
871		}
872		};
873
#	Line 846 | Line 888 | logging_use_logging: USE_LOGGING '=' TBO
888
889		logging_file_entry:
890		{
891	<	lfile[0] = '\0';
892	<	ltype = 0;
851	<	lsize = 0;
891	>	if (conf_parser_ctx.pass == 2)
892	>	reset_block_state();
893		} T_FILE  '{' logging_file_items '}' ';'
894		{
895	<	if (conf_parser_ctx.pass == 2 && ltype > 0)
896	<	log_add_file(ltype, lsize, lfile);
895	>	if (conf_parser_ctx.pass != 2)
896	>	break;
897	>
898	>	if (block_state.type.value && block_state.file.buf[0])
899	>	log_set_file(block_state.type.value, block_state.size.value,
900	>	block_state.file.buf);
901		};
902
903		logging_file_items: logging_file_items logging_file_item |
#	Line 863 | Line 908 | logging_file_item:  logging_file_name |
908
909		logging_file_name: NAME '=' QSTRING ';'
910		{
911	<	strlcpy(lfile, yylval.string, sizeof(lfile));
911	>	if (conf_parser_ctx.pass != 2)
912	>	break;
913	>
914	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
915		}
916
917		logging_file_size: T_SIZE '=' sizespec ';'
918		{
919	<	lsize = $3;
919	>	block_state.size.value = $3;
920		} | T_SIZE '=' T_UNLIMITED ';'
921		{
922	<	lsize = 0;
922	>	block_state.size.value = 0;
923		};
924
925		logging_file_type: TYPE
926		{
927		if (conf_parser_ctx.pass == 2)
928	<	ltype = 0;
928	>	block_state.type.value = 0;
929		} '='  logging_file_type_items ';' ;
930
931		logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
932		logging_file_type_item:  USER
933		{
934		if (conf_parser_ctx.pass == 2)
935	<	ltype = LOG_TYPE_USER;
935	>	block_state.type.value = LOG_TYPE_USER;
936		} | OPERATOR
937		{
938		if (conf_parser_ctx.pass == 2)
939	<	ltype = LOG_TYPE_OPER;
939	>	block_state.type.value = LOG_TYPE_OPER;
940		} | GLINE
941		{
942		if (conf_parser_ctx.pass == 2)
943	<	ltype = LOG_TYPE_GLINE;
943	>	block_state.type.value = LOG_TYPE_GLINE;
944		} | T_DLINE
945		{
946		if (conf_parser_ctx.pass == 2)
947	<	ltype = LOG_TYPE_DLINE;
947	>	block_state.type.value = LOG_TYPE_DLINE;
948		} | KLINE
949		{
950		if (conf_parser_ctx.pass == 2)
951	<	ltype = LOG_TYPE_KLINE;
951	>	block_state.type.value = LOG_TYPE_KLINE;
952		} | KILL
953		{
954		if (conf_parser_ctx.pass == 2)
955	<	ltype = LOG_TYPE_KILL;
955	>	block_state.type.value = LOG_TYPE_KILL;
956		} | T_DEBUG
957		{
958		if (conf_parser_ctx.pass == 2)
959	<	ltype = LOG_TYPE_DEBUG;
959	>	block_state.type.value = LOG_TYPE_DEBUG;
960		};
961
962
#	Line 917 | Line 965 | logging_file_type_item:  USER
965		***************************************************************************/
966		oper_entry: OPERATOR
967		{
968	<	if (conf_parser_ctx.pass == 2)
969	<	{
970	<	yy_conf = make_conf_item(OPER_TYPE);
971	<	yy_aconf = map_to_conf(yy_conf);
972	<	SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
925	<	}
926	<	else
927	<	{
928	<	MyFree(class_name);
929	<	class_name = NULL;
930	<	}
968	>	if (conf_parser_ctx.pass != 2)
969	>	break;
970	>
971	>	reset_block_state();
972	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
973		} '{' oper_items '}' ';'
974		{
975	<	if (conf_parser_ctx.pass == 2)
976	<	{
977	<	struct CollectItem *yy_tmp;
978	<	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);
975	>	dlink_node *ptr = NULL;
976	>
977	>	if (conf_parser_ctx.pass != 2)
978	>	break;
979
980	<	new_aconf->port = yy_aconf->port;
980	>	if (!block_state.name.buf[0])
981	>	break;
982		#ifdef HAVE_LIBCRYPTO
983	<	if (yy_aconf->rsa_public_key_file != NULL)
984	<	{
985	<	BIO *file;
983	>	if (!(block_state.file.buf[0] ||
984	>	block_state.rpass.buf[0]))
985	>	break;
986	>	#else
987	>	if (!block_state.rpass.buf[0])
988	>	break;
989	>	#endif
990
991	<	DupString(new_aconf->rsa_public_key_file,
992	<	yy_aconf->rsa_public_key_file);
991	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
992	>	{
993	>	struct MaskItem *conf = NULL;
994	>	struct split_nuh_item nuh;
995
996	<	file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
997	<	new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
998	<	NULL, 0, NULL);
999	<	BIO_set_close(file, BIO_CLOSE);
1000	<	BIO_free(file);
1001	<	}
1002	<	#endif
996	>	nuh.nuhmask  = ptr->data;
997	>	nuh.nickptr  = NULL;
998	>	nuh.userptr  = block_state.user.buf;
999	>	nuh.hostptr  = block_state.host.buf;
1000	>	nuh.nicksize = 0;
1001	>	nuh.usersize = sizeof(block_state.user.buf);
1002	>	nuh.hostsize = sizeof(block_state.host.buf);
1003	>	split_nuh(&nuh);
1004	>
1005	>	conf        = conf_make(CONF_OPER);
1006	>	conf->name  = xstrdup(block_state.name.buf);
1007	>	conf->user  = xstrdup(block_state.user.buf);
1008	>	conf->host  = xstrdup(block_state.host.buf);
1009	>
1010	>	if (block_state.rpass.buf[0])
1011	>	conf->passwd = xstrdup(block_state.rpass.buf);
1012	>
1013	>	conf->flags = block_state.flags.value;
1014	>	conf->modes = block_state.modes.value;
1015	>	conf->port  = block_state.port.value;
1016	>	conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
1017	>
1018	>	conf_add_class_to_conf(conf, block_state.class.buf);
1019
1020		#ifdef HAVE_LIBCRYPTO
1021	<	if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
1022	<	&& yy_tmp->host)
1023	<	#else
1024	<	if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
1025	<	#endif
1021	>	if (block_state.file.buf[0])
1022	>	{
1023	>	BIO *file = NULL;
1024	>	RSA *pkey = NULL;
1025	>
1026	>	if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
1027		{
1028	<	conf_add_class_to_conf(new_conf, class_name);
1029	<	if (yy_tmp->name != NULL)
1000	<	DupString(new_conf->name, yy_tmp->name);
1028	>	conf_error_report("Ignoring rsa_public_key_file -- file doesn't exist");
1029	>	break;
1030		}
1031
1032	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1033	<	free_collect_item(yy_tmp);
1005	<	}
1006	<
1007	<	yy_conf = NULL;
1008	<	yy_aconf = NULL;
1032	>	if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
1033	>	conf_error_report("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1034
1035	<
1036	<	MyFree(class_name);
1037	<	class_name = NULL;
1035	>	conf->rsa_public_key = pkey;
1036	>	BIO_set_close(file, BIO_CLOSE);
1037	>	BIO_free(file);
1038	>	}
1039	>	#endif /* HAVE_LIBCRYPTO */
1040		}
1041	<	};
1041	>	};
1042
1043		oper_items:     oper_items oper_item | oper_item;
1044		oper_item:      oper_name | oper_user | oper_password |
#	Line 1021 | Line 1048 | oper_item:      oper_name | oper_user |
1048		oper_name: NAME '=' QSTRING ';'
1049		{
1050		if (conf_parser_ctx.pass == 2)
1051	<	{
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	<	}
1051	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1052		};
1053
1054		oper_user: USER '=' QSTRING ';'
1055		{
1056		if (conf_parser_ctx.pass == 2)
1057	<	{
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	<	}
1057	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1058		};
1059
1060		oper_password: PASSWORD '=' QSTRING ';'
1061		{
1062		if (conf_parser_ctx.pass == 2)
1063	<	{
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	<	}
1063	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1064		};
1065
1066		oper_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 1084 | Line 1068 | oper_encrypted: ENCRYPTED '=' TBOOL ';'
1068		if (conf_parser_ctx.pass == 2)
1069		{
1070		if (yylval.number)
1071	<	SetConfEncrypted(yy_aconf);
1071	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1072		else
1073	<	ClearConfEncrypted(yy_aconf);
1073	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1074		}
1075		};
1076
1077		oper_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
1078		{
1095	–	#ifdef HAVE_LIBCRYPTO
1079		if (conf_parser_ctx.pass == 2)
1080	<	{
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 */
1080	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
1081		};
1082
1083		oper_class: CLASS '=' QSTRING ';'
1084		{
1085		if (conf_parser_ctx.pass == 2)
1086	<	{
1139	<	MyFree(class_name);
1140	<	DupString(class_name, yylval.string);
1141	<	}
1086	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1087		};
1088
1089		oper_umodes: T_UMODES
1090		{
1091		if (conf_parser_ctx.pass == 2)
1092	<	yy_aconf->modes = 0;
1092	>	block_state.modes.value = 0;
1093		} '='  oper_umodes_items ';' ;
1094
1095		oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1096		oper_umodes_item:  T_BOTS
1097		{
1098		if (conf_parser_ctx.pass == 2)
1099	<	yy_aconf->modes |= UMODE_BOTS;
1099	>	block_state.modes.value |= UMODE_BOTS;
1100		} | T_CCONN
1101		{
1102		if (conf_parser_ctx.pass == 2)
1103	<	yy_aconf->modes |= UMODE_CCONN;
1103	>	block_state.modes.value |= UMODE_CCONN;
1104		} | T_CCONN_FULL
1105		{
1106		if (conf_parser_ctx.pass == 2)
1107	<	yy_aconf->modes |= UMODE_CCONN_FULL;
1107	>	block_state.modes.value |= UMODE_CCONN_FULL;
1108		} | T_DEAF
1109		{
1110		if (conf_parser_ctx.pass == 2)
1111	<	yy_aconf->modes |= UMODE_DEAF;
1111	>	block_state.modes.value |= UMODE_DEAF;
1112		} | T_DEBUG
1113		{
1114		if (conf_parser_ctx.pass == 2)
1115	<	yy_aconf->modes |= UMODE_DEBUG;
1115	>	block_state.modes.value |= UMODE_DEBUG;
1116		} | T_FULL
1117		{
1118		if (conf_parser_ctx.pass == 2)
1119	<	yy_aconf->modes |= UMODE_FULL;
1119	>	block_state.modes.value |= UMODE_FULL;
1120		} | HIDDEN
1121		{
1122		if (conf_parser_ctx.pass == 2)
1123	<	yy_aconf->modes |= UMODE_HIDDEN;
1123	>	block_state.modes.value |= UMODE_HIDDEN;
1124		} | T_SKILL
1125		{
1126		if (conf_parser_ctx.pass == 2)
1127	<	yy_aconf->modes |= UMODE_SKILL;
1127	>	block_state.modes.value |= UMODE_SKILL;
1128		} | T_NCHANGE
1129		{
1130		if (conf_parser_ctx.pass == 2)
1131	<	yy_aconf->modes |= UMODE_NCHANGE;
1131	>	block_state.modes.value |= UMODE_NCHANGE;
1132		} | T_REJ
1133		{
1134		if (conf_parser_ctx.pass == 2)
1135	<	yy_aconf->modes |= UMODE_REJ;
1135	>	block_state.modes.value |= UMODE_REJ;
1136		} | T_UNAUTH
1137		{
1138		if (conf_parser_ctx.pass == 2)
1139	<	yy_aconf->modes |= UMODE_UNAUTH;
1139	>	block_state.modes.value |= UMODE_UNAUTH;
1140		} | T_SPY
1141		{
1142		if (conf_parser_ctx.pass == 2)
1143	<	yy_aconf->modes |= UMODE_SPY;
1143	>	block_state.modes.value |= UMODE_SPY;
1144		} | T_EXTERNAL
1145		{
1146		if (conf_parser_ctx.pass == 2)
1147	<	yy_aconf->modes |= UMODE_EXTERNAL;
1147	>	block_state.modes.value |= UMODE_EXTERNAL;
1148		} | T_OPERWALL
1149		{
1150		if (conf_parser_ctx.pass == 2)
1151	<	yy_aconf->modes |= UMODE_OPERWALL;
1151	>	block_state.modes.value |= UMODE_OPERWALL;
1152		} | T_SERVNOTICE
1153		{
1154		if (conf_parser_ctx.pass == 2)
1155	<	yy_aconf->modes |= UMODE_SERVNOTICE;
1155	>	block_state.modes.value |= UMODE_SERVNOTICE;
1156		} | T_INVISIBLE
1157		{
1158		if (conf_parser_ctx.pass == 2)
1159	<	yy_aconf->modes |= UMODE_INVISIBLE;
1159	>	block_state.modes.value |= UMODE_INVISIBLE;
1160		} | T_WALLOP
1161		{
1162		if (conf_parser_ctx.pass == 2)
1163	<	yy_aconf->modes |= UMODE_WALLOP;
1163	>	block_state.modes.value |= UMODE_WALLOP;
1164		} | T_SOFTCALLERID
1165		{
1166		if (conf_parser_ctx.pass == 2)
1167	<	yy_aconf->modes |= UMODE_SOFTCALLERID;
1167	>	block_state.modes.value |= UMODE_SOFTCALLERID;
1168		} | T_CALLERID
1169		{
1170		if (conf_parser_ctx.pass == 2)
1171	<	yy_aconf->modes |= UMODE_CALLERID;
1171	>	block_state.modes.value |= UMODE_CALLERID;
1172		} | T_LOCOPS
1173		{
1174		if (conf_parser_ctx.pass == 2)
1175	<	yy_aconf->modes |= UMODE_LOCOPS;
1175	>	block_state.modes.value |= UMODE_LOCOPS;
1176		};
1177
1178		oper_flags: IRCD_FLAGS
1179		{
1180		if (conf_parser_ctx.pass == 2)
1181	<	yy_aconf->port = 0;
1181	>	block_state.port.value = 0;
1182		} '='  oper_flags_items ';';
1183
1184		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1185		oper_flags_item: GLOBAL_KILL
1186		{
1187		if (conf_parser_ctx.pass == 2)
1188	<	yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1188	>	block_state.port.value |= OPER_FLAG_GLOBAL_KILL;
1189		} | REMOTE
1190		{
1191		if (conf_parser_ctx.pass == 2)
1192	<	yy_aconf->port |= OPER_FLAG_REMOTE;
1192	>	block_state.port.value |= OPER_FLAG_REMOTE;
1193		} | KLINE
1194		{
1195		if (conf_parser_ctx.pass == 2)
1196	<	yy_aconf->port |= OPER_FLAG_K;
1196	>	block_state.port.value |= OPER_FLAG_K;
1197		} | UNKLINE
1198		{
1199		if (conf_parser_ctx.pass == 2)
1200	<	yy_aconf->port |= OPER_FLAG_UNKLINE;
1200	>	block_state.port.value |= OPER_FLAG_UNKLINE;
1201		} | T_DLINE
1202		{
1203		if (conf_parser_ctx.pass == 2)
1204	<	yy_aconf->port |= OPER_FLAG_DLINE;
1204	>	block_state.port.value |= OPER_FLAG_DLINE;
1205		} | T_UNDLINE
1206		{
1207		if (conf_parser_ctx.pass == 2)
1208	<	yy_aconf->port |= OPER_FLAG_UNDLINE;
1208	>	block_state.port.value |= OPER_FLAG_UNDLINE;
1209		} | XLINE
1210		{
1211		if (conf_parser_ctx.pass == 2)
1212	<	yy_aconf->port |= OPER_FLAG_X;
1212	>	block_state.port.value |= OPER_FLAG_X;
1213		} | GLINE
1214		{
1215		if (conf_parser_ctx.pass == 2)
1216	<	yy_aconf->port |= OPER_FLAG_GLINE;
1216	>	block_state.port.value |= OPER_FLAG_GLINE;
1217		} | DIE
1218		{
1219		if (conf_parser_ctx.pass == 2)
1220	<	yy_aconf->port |= OPER_FLAG_DIE;
1220	>	block_state.port.value |= OPER_FLAG_DIE;
1221		} | T_RESTART
1222		{
1223		if (conf_parser_ctx.pass == 2)
1224	<	yy_aconf->port |= OPER_FLAG_RESTART;
1224	>	block_state.port.value |= OPER_FLAG_RESTART;
1225		} | REHASH
1226		{
1227		if (conf_parser_ctx.pass == 2)
1228	<	yy_aconf->port |= OPER_FLAG_REHASH;
1228	>	block_state.port.value |= OPER_FLAG_REHASH;
1229		} | ADMIN
1230		{
1231		if (conf_parser_ctx.pass == 2)
1232	<	yy_aconf->port |= OPER_FLAG_ADMIN;
1232	>	block_state.port.value |= OPER_FLAG_ADMIN;
1233		} | NICK_CHANGES
1234		{
1235		if (conf_parser_ctx.pass == 2)
1236	<	yy_aconf->port |= OPER_FLAG_N;
1236	>	block_state.port.value |= OPER_FLAG_N;
1237		} | T_OPERWALL
1238		{
1239		if (conf_parser_ctx.pass == 2)
1240	<	yy_aconf->port |= OPER_FLAG_OPERWALL;
1240	>	block_state.port.value |= OPER_FLAG_OPERWALL;
1241		} | T_GLOBOPS
1242		{
1243		if (conf_parser_ctx.pass == 2)
1244	<	yy_aconf->port |= OPER_FLAG_GLOBOPS;
1244	>	block_state.port.value |= OPER_FLAG_GLOBOPS;
1245		} | OPER_SPY_T
1246		{
1247		if (conf_parser_ctx.pass == 2)
1248	<	yy_aconf->port |= OPER_FLAG_OPER_SPY;
1248	>	block_state.port.value |= OPER_FLAG_OPER_SPY;
1249		} | REMOTEBAN
1250		{
1251		if (conf_parser_ctx.pass == 2)
1252	<	yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1252	>	block_state.port.value |= OPER_FLAG_REMOTEBAN;
1253	>	} | T_SET
1254	>	{
1255	>	if (conf_parser_ctx.pass == 2)
1256	>	block_state.port.value |= OPER_FLAG_SET;
1257		} | MODULE
1258		{
1259		if (conf_parser_ctx.pass == 2)
1260	<	yy_aconf->port |= OPER_FLAG_MODULE;
1260	>	block_state.port.value |= OPER_FLAG_MODULE;
1261		};
1262
1263
#	Line 1317 | Line 1266 | oper_flags_item: GLOBAL_KILL
1266		***************************************************************************/
1267		class_entry: CLASS
1268		{
1269	<	if (conf_parser_ctx.pass == 1)
1270	<	{
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;
1269	>	if (conf_parser_ctx.pass != 1)
1270	>	break;
1271
1272	<	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;
1272	>	reset_block_state();
1273
1274	<	rebuild_cidr_class(cconf, yy_class);
1275	<
1276	<	class = map_to_conf(cconf);
1277	<
1278	<	user_count = class->curr_user_count;
1279	<	memcpy(class, yy_class, sizeof(*class));
1280	<	class->curr_user_count = user_count;
1281	<	class->active = 1;
1274	>	block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1275	>	block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1276	>	block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1277	>	block_state.max_sendq.value = DEFAULT_SENDQ;
1278	>	block_state.max_recvq.value = DEFAULT_RECVQ;
1279	>	} '{' class_items '}' ';'
1280	>	{
1281	>	struct ClassItem *class = NULL;
1282
1283	<	delete_conf_item(yy_conf);
1283	>	if (conf_parser_ctx.pass != 1)
1284	>	break;
1285
1286	<	MyFree(cconf->name);            /* Allows case change of class name */
1287	<	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	<	}
1286	>	if (!block_state.class.buf[0])
1287	>	break;
1288
1289	<	yy_class_name = NULL;
1290	<	}
1289	>	if (!(class = class_find(block_state.class.buf, 0)))
1290	>	class = class_make();
1291	>
1292	>	class->active = 1;
1293	>	MyFree(class->name);
1294	>	class->name = xstrdup(block_state.class.buf);
1295	>	class->ping_freq = block_state.ping_freq.value;
1296	>	class->max_perip = block_state.max_perip.value;
1297	>	class->con_freq = block_state.con_freq.value;
1298	>	class->max_total = block_state.max_total.value;
1299	>	class->max_global = block_state.max_global.value;
1300	>	class->max_local = block_state.max_local.value;
1301	>	class->max_ident = block_state.max_ident.value;
1302	>	class->max_sendq = block_state.max_sendq.value;
1303	>	class->max_recvq = block_state.max_recvq.value;
1304	>
1305	>	if (block_state.min_idle.value > block_state.max_idle.value)
1306	>	{
1307	>	block_state.min_idle.value = 0;
1308	>	block_state.max_idle.value = 0;
1309	>	block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
1310	>	}
1311	>
1312	>	class->flags = block_state.flags.value;
1313	>	class->min_idle = block_state.min_idle.value;
1314	>	class->max_idle = block_state.max_idle.value;
1315	>
1316	>	if (class->number_per_cidr && block_state.number_per_cidr.value)
1317	>	if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
1318	>	(class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
1319	>	if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
1320	>	(class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
1321	>	rebuild_cidr_list(class);
1322	>
1323	>	class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1324	>	class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1325	>	class->number_per_cidr = block_state.number_per_cidr.value;
1326		};
1327
1328		class_items:    class_items class_item | class_item;
1329		class_item:     class_name |
1330		class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1331		class_ping_time |
1372	–	class_ping_warning |
1332		class_number_per_cidr |
1333		class_number_per_ip |
1334		class_connectfreq |
#	Line 1377 | Line 1336 | class_item:     class_name |
1336		class_max_global |
1337		class_max_local |
1338		class_max_ident |
1339	<	class_sendq |
1339	>	class_sendq | class_recvq |
1340	>	class_min_idle |
1341	>	class_max_idle |
1342	>	class_flags |
1343		error ';' ;
1344
1345		class_name: NAME '=' QSTRING ';'
1346		{
1347		if (conf_parser_ctx.pass == 1)
1348	<	{
1387	<	MyFree(yy_class_name);
1388	<	DupString(yy_class_name, yylval.string);
1389	<	}
1348	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1349		};
1350
1351		class_ping_time: PING_TIME '=' timespec ';'
1352		{
1353		if (conf_parser_ctx.pass == 1)
1354	<	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;
1354	>	block_state.ping_freq.value = $3;
1355		};
1356
1357		class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1358		{
1359		if (conf_parser_ctx.pass == 1)
1360	<	MaxPerIp(yy_class) = $3;
1360	>	block_state.max_perip.value = $3;
1361		};
1362
1363		class_connectfreq: CONNECTFREQ '=' timespec ';'
1364		{
1365		if (conf_parser_ctx.pass == 1)
1366	<	ConFreq(yy_class) = $3;
1366	>	block_state.con_freq.value = $3;
1367		};
1368
1369		class_max_number: MAX_NUMBER '=' NUMBER ';'
1370		{
1371		if (conf_parser_ctx.pass == 1)
1372	<	MaxTotal(yy_class) = $3;
1372	>	block_state.max_total.value = $3;
1373		};
1374
1375		class_max_global: MAX_GLOBAL '=' NUMBER ';'
1376		{
1377		if (conf_parser_ctx.pass == 1)
1378	<	MaxGlobal(yy_class) = $3;
1378	>	block_state.max_global.value = $3;
1379		};
1380
1381		class_max_local: MAX_LOCAL '=' NUMBER ';'
1382		{
1383		if (conf_parser_ctx.pass == 1)
1384	<	MaxLocal(yy_class) = $3;
1384	>	block_state.max_local.value = $3;
1385		};
1386
1387		class_max_ident: MAX_IDENT '=' NUMBER ';'
1388		{
1389		if (conf_parser_ctx.pass == 1)
1390	<	MaxIdent(yy_class) = $3;
1390	>	block_state.max_ident.value = $3;
1391		};
1392
1393		class_sendq: SENDQ '=' sizespec ';'
1394		{
1395		if (conf_parser_ctx.pass == 1)
1396	<	MaxSendq(yy_class) = $3;
1396	>	block_state.max_sendq.value = $3;
1397	>	};
1398	>
1399	>	class_recvq: T_RECVQ '=' sizespec ';'
1400	>	{
1401	>	if (conf_parser_ctx.pass == 1)
1402	>	if ($3 >= CLIENT_FLOOD_MIN && $3 <= CLIENT_FLOOD_MAX)
1403	>	block_state.max_recvq.value = $3;
1404		};
1405
1406		class_cidr_bitlen_ipv4: CIDR_BITLEN_IPV4 '=' NUMBER ';'
1407		{
1408		if (conf_parser_ctx.pass == 1)
1409	<	CidrBitlenIPV4(yy_class) = $3;
1409	>	block_state.cidr_bitlen_ipv4.value = $3 > 32 ? 32 : $3;
1410		};
1411
1412		class_cidr_bitlen_ipv6: CIDR_BITLEN_IPV6 '=' NUMBER ';'
1413		{
1414		if (conf_parser_ctx.pass == 1)
1415	<	CidrBitlenIPV6(yy_class) = $3;
1415	>	block_state.cidr_bitlen_ipv6.value = $3 > 128 ? 128 : $3;
1416		};
1417
1418		class_number_per_cidr: NUMBER_PER_CIDR '=' NUMBER ';'
1419		{
1420		if (conf_parser_ctx.pass == 1)
1421	<	NumberPerCidr(yy_class) = $3;
1421	>	block_state.number_per_cidr.value = $3;
1422		};
1423
1424	+	class_min_idle: MIN_IDLE '=' timespec ';'
1425	+	{
1426	+	if (conf_parser_ctx.pass != 1)
1427	+	break;
1428	+
1429	+	block_state.min_idle.value = $3;
1430	+	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1431	+	};
1432	+
1433	+	class_max_idle: MAX_IDLE '=' timespec ';'
1434	+	{
1435	+	if (conf_parser_ctx.pass != 1)
1436	+	break;
1437	+
1438	+	block_state.max_idle.value = $3;
1439	+	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1440	+	};
1441	+
1442	+	class_flags: IRCD_FLAGS
1443	+	{
1444	+	if (conf_parser_ctx.pass == 1)
1445	+	block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1446	+	} '='  class_flags_items ';';
1447	+
1448	+	class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1449	+	class_flags_item: RANDOM_IDLE
1450	+	{
1451	+	if (conf_parser_ctx.pass == 1)
1452	+	block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
1453	+	} | HIDE_IDLE_FROM_OPERS
1454	+	{
1455	+	if (conf_parser_ctx.pass == 1)
1456	+	block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
1457	+	};
1458	+
1459	+
1460		/***************************************************************************
1461		*  section listen
1462		***************************************************************************/
1463		listen_entry: LISTEN
1464		{
1465		if (conf_parser_ctx.pass == 2)
1466	<	{
1467	<	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	<	};
1466	>	reset_block_state();
1467	>	} '{' listen_items '}' ';';
1468
1469		listen_flags: IRCD_FLAGS
1470		{
1471	<	listener_flags = 0;
1471	>	block_state.flags.value = 0;
1472		} '='  listen_flags_items ';';
1473
1474		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1475		listen_flags_item: T_SSL
1476		{
1477		if (conf_parser_ctx.pass == 2)
1478	<	listener_flags |= LISTENER_SSL;
1478	>	block_state.flags.value |= LISTENER_SSL;
1479		} | HIDDEN
1480		{
1481		if (conf_parser_ctx.pass == 2)
1482	<	listener_flags |= LISTENER_HIDDEN;
1482	>	block_state.flags.value |= LISTENER_HIDDEN;
1483		} | T_SERVER
1484		{
1485		if (conf_parser_ctx.pass == 2)
1486	<	listener_flags |= LISTENER_SERVER;
1486	>	block_state.flags.value |= LISTENER_SERVER;
1487		};
1488
1503	–
1504	–
1489		listen_items:   listen_items listen_item | listen_item;
1490		listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';';
1491
1492	<	listen_port: PORT '=' port_items { listener_flags = 0; } ';';
1492	>	listen_port: PORT '=' port_items { block_state.flags.value = 0; } ';';
1493
1494		port_items: port_items ',' port_item | port_item;
1495
#	Line 1513 | Line 1497 | port_item: NUMBER
1497		{
1498		if (conf_parser_ctx.pass == 2)
1499		{
1500	<	if ((listener_flags & LISTENER_SSL))
1500	>	if (block_state.flags.value & LISTENER_SSL)
1501		#ifdef HAVE_LIBCRYPTO
1502		if (!ServerInfo.server_ctx)
1503		#endif
1504		{
1505	<	yyerror("SSL not available - port closed");
1505	>	conf_error_report("SSL not available - port closed");
1506		break;
1507		}
1508	<	add_listener($1, listener_address, listener_flags);
1508	>	add_listener($1, block_state.addr.buf, block_state.flags.value);
1509		}
1510		} | NUMBER TWODOTS NUMBER
1511		{
#	Line 1529 | Line 1513 | port_item: NUMBER
1513		{
1514		int i;
1515
1516	<	if ((listener_flags & LISTENER_SSL))
1516	>	if (block_state.flags.value & LISTENER_SSL)
1517		#ifdef HAVE_LIBCRYPTO
1518		if (!ServerInfo.server_ctx)
1519		#endif
1520		{
1521	<	yyerror("SSL not available - port closed");
1521	>	conf_error_report("SSL not available - port closed");
1522		break;
1523		}
1524
1525		for (i = $1; i <= $3; ++i)
1526	<	add_listener(i, listener_address, listener_flags);
1526	>	add_listener(i, block_state.addr.buf, block_state.flags.value);
1527		}
1528		};
1529
1530		listen_address: IP '=' QSTRING ';'
1531		{
1532		if (conf_parser_ctx.pass == 2)
1533	<	{
1550	<	MyFree(listener_address);
1551	<	DupString(listener_address, yylval.string);
1552	<	}
1533	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1534		};
1535
1536		listen_host: HOST '=' QSTRING ';'
1537		{
1538		if (conf_parser_ctx.pass == 2)
1539	<	{
1559	<	MyFree(listener_address);
1560	<	DupString(listener_address, yylval.string);
1561	<	}
1539	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1540		};
1541
1542		/***************************************************************************
#	Line 1567 | Line 1545 | listen_host: HOST '=' QSTRING ';'
1545		auth_entry: IRCD_AUTH
1546		{
1547		if (conf_parser_ctx.pass == 2)
1548	<	{
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	<	}
1548	>	reset_block_state();
1549		} '{' auth_items '}' ';'
1550		{
1551	<	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);
1551	>	dlink_node *ptr = NULL;
1552
1553	<	yy_tmp = ptr->data;
1553	>	if (conf_parser_ctx.pass != 2)
1554	>	break;
1555
1556	<	assert(yy_tmp->user && yy_tmp->host);
1557	<
1558	<	if (yy_aconf->passwd != NULL)
1559	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1609	<	if (yy_conf->name != NULL)
1610	<	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;
1556	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
1557	>	{
1558	>	struct MaskItem *conf = NULL;
1559	>	struct split_nuh_item nuh;
1560
1561	<	DupString(new_aconf->user, yy_tmp->user);
1562	<	collapse(new_aconf->user);
1561	>	nuh.nuhmask  = ptr->data;
1562	>	nuh.nickptr  = NULL;
1563	>	nuh.userptr  = block_state.user.buf;
1564	>	nuh.hostptr  = block_state.host.buf;
1565	>	nuh.nicksize = 0;
1566	>	nuh.usersize = sizeof(block_state.user.buf);
1567	>	nuh.hostsize = sizeof(block_state.host.buf);
1568	>	split_nuh(&nuh);
1569
1570	<	DupString(new_aconf->host, yy_tmp->host);
1571	<	collapse(new_aconf->host);
1570	>	conf        = conf_make(CONF_CLIENT);
1571	>	conf->user  = xstrdup(collapse(block_state.user.buf));
1572	>	conf->host  = xstrdup(collapse(block_state.host.buf));
1573	>
1574	>	if (block_state.rpass.buf[0])
1575	>	conf->passwd = xstrdup(block_state.rpass.buf);
1576	>	if (block_state.name.buf[0])
1577	>	conf->passwd = xstrdup(block_state.name.buf);
1578
1579	<	conf_add_class_to_conf(new_conf, class_name);
1580	<	add_conf_by_address(CONF_CLIENT, new_aconf);
1625	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1626	<	free_collect_item(yy_tmp);
1627	<	}
1579	>	conf->flags = block_state.flags.value;
1580	>	conf->port  = block_state.port.value;
1581
1582	<	MyFree(class_name);
1583	<	class_name = NULL;
1631	<	yy_conf = NULL;
1632	<	yy_aconf = NULL;
1582	>	conf_add_class_to_conf(conf, block_state.class.buf);
1583	>	add_conf_by_address(CONF_CLIENT, conf);
1584		}
1585		};
1586
#	Line 1641 | Line 1592 | auth_item:      auth_user | auth_passwd
1592		auth_user: USER '=' QSTRING ';'
1593		{
1594		if (conf_parser_ctx.pass == 2)
1595	<	{
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	<	}
1595	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1596		};
1597
1676	–	/* XXX - IP/IPV6 tags don't exist anymore - put IP/IPV6 into user. */
1677	–
1598		auth_passwd: PASSWORD '=' QSTRING ';'
1599		{
1600		if (conf_parser_ctx.pass == 2)
1601	<	{
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	<	}
1601	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1602		};
1603
1604		auth_class: CLASS '=' QSTRING ';'
1605		{
1606		if (conf_parser_ctx.pass == 2)
1607	<	{
1695	<	MyFree(class_name);
1696	<	DupString(class_name, yylval.string);
1697	<	}
1607	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1608		};
1609
1610		auth_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 1702 | Line 1612 | auth_encrypted: ENCRYPTED '=' TBOOL ';'
1612		if (conf_parser_ctx.pass == 2)
1613		{
1614		if (yylval.number)
1615	<	SetConfEncrypted(yy_aconf);
1615	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1616		else
1617	<	ClearConfEncrypted(yy_aconf);
1617	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1618		}
1619		};
1620
1621		auth_flags: IRCD_FLAGS
1622		{
1623	+	if (conf_parser_ctx.pass == 2)
1624	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
1625		} '='  auth_flags_items ';';
1626
1627		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1628		auth_flags_item: SPOOF_NOTICE
1629		{
1630		if (conf_parser_ctx.pass == 2)
1631	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1631	>	block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1632		} | EXCEED_LIMIT
1633		{
1634		if (conf_parser_ctx.pass == 2)
1635	<	yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1635	>	block_state.flags.value |= CONF_FLAGS_NOLIMIT;
1636		} | KLINE_EXEMPT
1637		{
1638		if (conf_parser_ctx.pass == 2)
1639	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1639	>	block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1640		} | NEED_IDENT
1641		{
1642		if (conf_parser_ctx.pass == 2)
1643	<	yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
1643	>	block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
1644		} | CAN_FLOOD
1645		{
1646		if (conf_parser_ctx.pass == 2)
1647	<	yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
1647	>	block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
1648		} | NO_TILDE
1649		{
1650		if (conf_parser_ctx.pass == 2)
1651	<	yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1651	>	block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1652		} | GLINE_EXEMPT
1653		{
1654		if (conf_parser_ctx.pass == 2)
1655	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
1655	>	block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
1656		} | RESV_EXEMPT
1657		{
1658		if (conf_parser_ctx.pass == 2)
1659	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
1659	>	block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
1660	>	} | T_WEBIRC
1661	>	{
1662	>	if (conf_parser_ctx.pass == 2)
1663	>	block_state.flags.value |= CONF_FLAGS_WEBIRC;
1664		} | NEED_PASSWORD
1665		{
1666		if (conf_parser_ctx.pass == 2)
1667	<	yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
1667	>	block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1668		};
1669
1754	–	/* XXX - need check for illegal hostnames here */
1670		auth_spoof: SPOOF '=' QSTRING ';'
1671		{
1672	<	if (conf_parser_ctx.pass == 2)
1673	<	{
1759	<	MyFree(yy_conf->name);
1672	>	if (conf_parser_ctx.pass != 2)
1673	>	break;
1674
1675	<	if (strlen(yylval.string) < HOSTLEN)
1676	<	{
1677	<	DupString(yy_conf->name, yylval.string);
1678	<	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	<	}
1675	>	if (strlen(yylval.string) <= HOSTLEN && valid_hostname(yylval.string))
1676	>	{
1677	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1678	>	block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
1679		}
1680	+	else
1681	+	ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
1682		};
1683
1684		auth_redir_serv: REDIRSERV '=' QSTRING ';'
1685		{
1686	<	if (conf_parser_ctx.pass == 2)
1687	<	{
1688	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1689	<	MyFree(yy_conf->name);
1690	<	DupString(yy_conf->name, yylval.string);
1781	<	}
1686	>	if (conf_parser_ctx.pass != 2)
1687	>	break;
1688	>
1689	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1690	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1691		};
1692
1693		auth_redir_port: REDIRPORT '=' NUMBER ';'
1694		{
1695	<	if (conf_parser_ctx.pass == 2)
1696	<	{
1697	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1698	<	yy_aconf->port = $3;
1699	<	}
1695	>	if (conf_parser_ctx.pass != 2)
1696	>	break;
1697	>
1698	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1699	>	block_state.port.value = $3;
1700		};
1701
1702
#	Line 1796 | Line 1705 | auth_redir_port: REDIRPORT '=' NUMBER ';
1705		***************************************************************************/
1706		resv_entry: RESV
1707		{
1708	<	if (conf_parser_ctx.pass == 2)
1709	<	{
1710	<	MyFree(resv_reason);
1711	<	resv_reason = NULL;
1712	<	}
1708	>	if (conf_parser_ctx.pass != 2)
1709	>	break;
1710	>
1711	>	reset_block_state();
1712	>	strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
1713		} '{' resv_items '}' ';'
1714		{
1715	<	if (conf_parser_ctx.pass == 2)
1716	<	{
1717	<	MyFree(resv_reason);
1718	<	resv_reason = NULL;
1810	<	}
1715	>	if (IsChanPrefix(block_state.name.buf[0]))
1716	>	create_channel_resv(block_state.name.buf, block_state.rpass.buf);
1717	>	else if (block_state.name.buf[0])
1718	>	create_nick_resv(block_state.name.buf, block_state.rpass.buf);
1719		};
1720
1721		resv_items:     resv_items resv_item | resv_item;
1722	<	resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
1722	>	resv_item:      resv_reason | resv_channel | resv_nick | error ';' ;
1723
1724	<	resv_creason: REASON '=' QSTRING ';'
1724	>	resv_reason: REASON '=' QSTRING ';'
1725		{
1726		if (conf_parser_ctx.pass == 2)
1727	<	{
1820	<	MyFree(resv_reason);
1821	<	DupString(resv_reason, yylval.string);
1822	<	}
1727	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1728		};
1729
1730		resv_channel: CHANNEL '=' QSTRING ';'
1731		{
1732		if (conf_parser_ctx.pass == 2)
1733	<	{
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_ */
1733	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1734		};
1735
1736		resv_nick: NICK '=' QSTRING ';'
1737		{
1738		if (conf_parser_ctx.pass == 2)
1739	<	{
1844	<	char def_reason[] = "No reason";
1845	<
1846	<	create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1847	<	}
1739	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1740		};
1741
1742		/***************************************************************************
#	Line 1861 | Line 1753 | service_name: NAME '=' QSTRING ';'
1753		{
1754		if (valid_servname(yylval.string))
1755		{
1756	<	yy_conf = make_conf_item(SERVICE_TYPE);
1757	<	DupString(yy_conf->name, yylval.string);
1756	>	struct MaskItem *conf = conf_make(CONF_SERVICE);
1757	>	conf->name = xstrdup(yylval.string);
1758		}
1759		}
1760		};
#	Line 1872 | Line 1764 | service_name: NAME '=' QSTRING ';'
1764		***************************************************************************/
1765		shared_entry: T_SHARED
1766		{
1767	<	if (conf_parser_ctx.pass == 2)
1768	<	{
1769	<	yy_conf = make_conf_item(ULINE_TYPE);
1770	<	yy_match_item = map_to_conf(yy_conf);
1771	<	yy_match_item->action = SHARED_ALL;
1772	<	}
1767	>	if (conf_parser_ctx.pass != 2)
1768	>	break;
1769	>
1770	>	reset_block_state();
1771	>
1772	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1773	>	strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
1774	>	strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
1775	>	block_state.flags.value = SHARED_ALL;
1776		} '{' shared_items '}' ';'
1777		{
1778	<	if (conf_parser_ctx.pass == 2)
1779	<	{
1780	<	yy_conf = NULL;
1781	<	}
1778	>	struct MaskItem *conf = NULL;
1779	>
1780	>	if (conf_parser_ctx.pass != 2)
1781	>	break;
1782	>
1783	>	conf = conf_make(CONF_ULINE);
1784	>	conf->flags = block_state.flags.value;
1785	>	conf->name = xstrdup(block_state.name.buf);
1786	>	conf->user = xstrdup(block_state.user.buf);
1787	>	conf->user = xstrdup(block_state.host.buf);
1788		};
1789
1790		shared_items: shared_items shared_item | shared_item;
#	Line 1892 | Line 1793 | shared_item:  shared_name | shared_user
1793		shared_name: NAME '=' QSTRING ';'
1794		{
1795		if (conf_parser_ctx.pass == 2)
1796	<	{
1896	<	MyFree(yy_conf->name);
1897	<	DupString(yy_conf->name, yylval.string);
1898	<	}
1796	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1797		};
1798
1799		shared_user: USER '=' QSTRING ';'
#	Line 1906 | Line 1804 | shared_user: USER '=' QSTRING ';'
1804
1805		nuh.nuhmask  = yylval.string;
1806		nuh.nickptr  = NULL;
1807	<	nuh.userptr  = userbuf;
1808	<	nuh.hostptr  = hostbuf;
1807	>	nuh.userptr  = block_state.user.buf;
1808	>	nuh.hostptr  = block_state.host.buf;
1809
1810		nuh.nicksize = 0;
1811	<	nuh.usersize = sizeof(userbuf);
1812	<	nuh.hostsize = sizeof(hostbuf);
1811	>	nuh.usersize = sizeof(block_state.user.buf);
1812	>	nuh.hostsize = sizeof(block_state.host.buf);
1813
1814		split_nuh(&nuh);
1917	–
1918	–	DupString(yy_match_item->user, userbuf);
1919	–	DupString(yy_match_item->host, hostbuf);
1815		}
1816		};
1817
1818		shared_type: TYPE
1819		{
1820		if (conf_parser_ctx.pass == 2)
1821	<	yy_match_item->action = 0;
1821	>	block_state.flags.value = 0;
1822		} '=' shared_types ';' ;
1823
1824		shared_types: shared_types ',' shared_type_item | shared_type_item;
1825		shared_type_item: KLINE
1826		{
1827		if (conf_parser_ctx.pass == 2)
1828	<	yy_match_item->action |= SHARED_KLINE;
1828	>	block_state.flags.value |= SHARED_KLINE;
1829		} | UNKLINE
1830		{
1831		if (conf_parser_ctx.pass == 2)
1832	<	yy_match_item->action |= SHARED_UNKLINE;
1832	>	block_state.flags.value |= SHARED_UNKLINE;
1833		} | T_DLINE
1834		{
1835		if (conf_parser_ctx.pass == 2)
1836	<	yy_match_item->action |= SHARED_DLINE;
1836	>	block_state.flags.value |= SHARED_DLINE;
1837		} | T_UNDLINE
1838		{
1839		if (conf_parser_ctx.pass == 2)
1840	<	yy_match_item->action |= SHARED_UNDLINE;
1840	>	block_state.flags.value |= SHARED_UNDLINE;
1841		} | XLINE
1842		{
1843		if (conf_parser_ctx.pass == 2)
1844	<	yy_match_item->action |= SHARED_XLINE;
1844	>	block_state.flags.value |= SHARED_XLINE;
1845		} | T_UNXLINE
1846		{
1847		if (conf_parser_ctx.pass == 2)
1848	<	yy_match_item->action |= SHARED_UNXLINE;
1848	>	block_state.flags.value |= SHARED_UNXLINE;
1849		} | RESV
1850		{
1851		if (conf_parser_ctx.pass == 2)
1852	<	yy_match_item->action |= SHARED_RESV;
1852	>	block_state.flags.value |= SHARED_RESV;
1853		} | T_UNRESV
1854		{
1855		if (conf_parser_ctx.pass == 2)
1856	<	yy_match_item->action |= SHARED_UNRESV;
1856	>	block_state.flags.value |= SHARED_UNRESV;
1857		} | T_LOCOPS
1858		{
1859		if (conf_parser_ctx.pass == 2)
1860	<	yy_match_item->action |= SHARED_LOCOPS;
1860	>	block_state.flags.value |= SHARED_LOCOPS;
1861		} | T_ALL
1862		{
1863		if (conf_parser_ctx.pass == 2)
1864	<	yy_match_item->action = SHARED_ALL;
1864	>	block_state.flags.value = SHARED_ALL;
1865		};
1866
1867		/***************************************************************************
#	Line 1974 | Line 1869 | shared_type_item: KLINE
1869		***************************************************************************/
1870		cluster_entry: T_CLUSTER
1871		{
1872	<	if (conf_parser_ctx.pass == 2)
1873	<	{
1874	<	yy_conf = make_conf_item(CLUSTER_TYPE);
1875	<	yy_conf->flags = SHARED_ALL;
1876	<	}
1872	>	if (conf_parser_ctx.pass != 2)
1873	>	break;
1874	>
1875	>	reset_block_state();
1876	>
1877	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1878	>	block_state.flags.value = SHARED_ALL;
1879		} '{' cluster_items '}' ';'
1880		{
1881	<	if (conf_parser_ctx.pass == 2)
1882	<	{
1883	<	if (yy_conf->name == NULL)
1884	<	DupString(yy_conf->name, "*");
1885	<	yy_conf = NULL;
1886	<	}
1881	>	struct MaskItem *conf = NULL;
1882	>
1883	>	if (conf_parser_ctx.pass != 2)
1884	>	break;
1885	>
1886	>	conf = conf_make(CONF_CLUSTER);
1887	>	conf->flags = block_state.flags.value;
1888	>	conf->name = xstrdup(block_state.name.buf);
1889		};
1890
1891		cluster_items:  cluster_items cluster_item | cluster_item;
#	Line 1995 | Line 1894 | cluster_item:  cluster_name | cluster_typ
1894		cluster_name: NAME '=' QSTRING ';'
1895		{
1896		if (conf_parser_ctx.pass == 2)
1897	<	DupString(yy_conf->name, yylval.string);
1897	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1898		};
1899
1900		cluster_type: TYPE
1901		{
1902		if (conf_parser_ctx.pass == 2)
1903	<	yy_conf->flags = 0;
1903	>	block_state.flags.value = 0;
1904		} '=' cluster_types ';' ;
1905
1906		cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1907		cluster_type_item: KLINE
1908		{
1909		if (conf_parser_ctx.pass == 2)
1910	<	yy_conf->flags |= SHARED_KLINE;
1910	>	block_state.flags.value |= SHARED_KLINE;
1911		} | UNKLINE
1912		{
1913		if (conf_parser_ctx.pass == 2)
1914	<	yy_conf->flags |= SHARED_UNKLINE;
1914	>	block_state.flags.value |= SHARED_UNKLINE;
1915		} | T_DLINE
1916		{
1917		if (conf_parser_ctx.pass == 2)
1918	<	yy_conf->flags |= SHARED_DLINE;
1918	>	block_state.flags.value |= SHARED_DLINE;
1919		} | T_UNDLINE
1920		{
1921		if (conf_parser_ctx.pass == 2)
1922	<	yy_conf->flags |= SHARED_UNDLINE;
1922	>	block_state.flags.value |= SHARED_UNDLINE;
1923		} | XLINE
1924		{
1925		if (conf_parser_ctx.pass == 2)
1926	<	yy_conf->flags |= SHARED_XLINE;
1926	>	block_state.flags.value |= SHARED_XLINE;
1927		} | T_UNXLINE
1928		{
1929		if (conf_parser_ctx.pass == 2)
1930	<	yy_conf->flags |= SHARED_UNXLINE;
1930	>	block_state.flags.value |= SHARED_UNXLINE;
1931		} | RESV
1932		{
1933		if (conf_parser_ctx.pass == 2)
1934	<	yy_conf->flags |= SHARED_RESV;
1934	>	block_state.flags.value |= SHARED_RESV;
1935		} | T_UNRESV
1936		{
1937		if (conf_parser_ctx.pass == 2)
1938	<	yy_conf->flags |= SHARED_UNRESV;
1938	>	block_state.flags.value |= SHARED_UNRESV;
1939		} | T_LOCOPS
1940		{
1941		if (conf_parser_ctx.pass == 2)
1942	<	yy_conf->flags |= SHARED_LOCOPS;
1942	>	block_state.flags.value |= SHARED_LOCOPS;
1943		} | T_ALL
1944		{
1945		if (conf_parser_ctx.pass == 2)
1946	<	yy_conf->flags = SHARED_ALL;
1946	>	block_state.flags.value = SHARED_ALL;
1947		};
1948
1949		/***************************************************************************
#	Line 2052 | Line 1951 | cluster_type_item: KLINE
1951		***************************************************************************/
1952		connect_entry: CONNECT
1953		{
2055	–	if (conf_parser_ctx.pass == 2)
2056	–	{
2057	–	yy_conf = make_conf_item(SERVER_TYPE);
2058	–	yy_aconf = map_to_conf(yy_conf);
1954
1955	<	/* defaults */
1956	<	yy_aconf->port = PORTNUM;
1957	<	}
1958	<	else
1959	<	{
2065	<	MyFree(class_name);
2066	<	class_name = NULL;
2067	<	}
1955	>	if (conf_parser_ctx.pass != 2)
1956	>	break;
1957	>
1958	>	reset_block_state();
1959	>	block_state.port.value = PORTNUM;
1960		} '{' connect_items '}' ';'
1961		{
1962	<	if (conf_parser_ctx.pass == 2)
1963	<	{
2072	<	struct CollectItem *yy_hconf=NULL;
2073	<	struct CollectItem *yy_lconf=NULL;
2074	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1962	>	struct MaskItem *conf = NULL;
1963	>	struct addrinfo hints, *res;
1964
1965	<	if (yy_aconf->host &&
1966	<	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	<	}
1965	>	if (conf_parser_ctx.pass != 2)
1966	>	break;
1967
1968	+	if (!block_state.name.buf[0] ||
1969	+	!block_state.host.buf[0])
1970	+	break;
1971	+
1972	+	if (!(block_state.rpass.buf[0] ||
1973	+	block_state.spass.buf[0]))
1974	+	break;
1975	+
1976	+	if (has_wildcards(block_state.name.buf) ||
1977	+	has_wildcards(block_state.host.buf))
1978	+	break;
1979	+
1980	+	conf = conf_make(CONF_SERVER);
1981	+	conf->port = block_state.port.value;
1982	+	conf->flags = block_state.flags.value;
1983	+	conf->aftype = block_state.aftype.value;
1984	+	conf->host = xstrdup(block_state.host.buf);
1985	+	conf->name = xstrdup(block_state.name.buf);
1986	+	conf->passwd = xstrdup(block_state.rpass.buf);
1987	+	conf->spasswd = xstrdup(block_state.spass.buf);
1988	+	conf->cipher_list = xstrdup(block_state.ciph.buf);
1989
1990	<	/* XXX
1991	<	* 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;
1990	>	dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
1991	>	dlinkMoveList(&block_state.hub.list, &conf->hub_list);
1992
1993	<	/* yy_conf == NULL is a fatal error for this connect block! */
1994	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
1995	<	{
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 */
1993	>	if (block_state.bind.buf[0])
1994	>	{
1995	>	memset(&hints, 0, sizeof(hints));
1996
1997	<	DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
1998	<	{
1999	<	struct ConfItem *new_leaf_conf;
2154	<	struct MatchItem *match_item;
1997	>	hints.ai_family   = AF_UNSPEC;
1998	>	hints.ai_socktype = SOCK_STREAM;
1999	>	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2000
2001	<	yy_lconf = ptr->data;
2001	>	if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2002	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2003	>	else
2004	>	{
2005	>	assert(res != NULL);
2006
2007	<	if ((yy_conf != NULL) && (yy_conf->name != NULL))
2008	<	{
2009	<	new_leaf_conf = make_conf_item(LEAF_TYPE);
2010	<	match_item = (struct MatchItem *)map_to_conf(new_leaf_conf);
2011	<	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;
2007	>	memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2008	>	conf->bind.ss.ss_family = res->ai_family;
2009	>	conf->bind.ss_len = res->ai_addrlen;
2010	>	freeaddrinfo(res);
2011	>	}
2012		}
2013	+
2014	+	conf_add_class_to_conf(conf, block_state.class.buf);
2015	+	lookup_confhost(conf);
2016		};
2017
2018		connect_items:  connect_items connect_item | connect_item;
#	Line 2190 | Line 2026 | connect_item:   connect_name | connect_h
2026		connect_name: NAME '=' QSTRING ';'
2027		{
2028		if (conf_parser_ctx.pass == 2)
2029	<	{
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	<	}
2029	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2030		};
2031
2032		connect_host: HOST '=' QSTRING ';'
2033		{
2034		if (conf_parser_ctx.pass == 2)
2035	<	{
2206	<	MyFree(yy_aconf->host);
2207	<	DupString(yy_aconf->host, yylval.string);
2208	<	}
2035	>	strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2036		};
2037
2038		connect_vhost: VHOST '=' QSTRING ';'
2039		{
2040		if (conf_parser_ctx.pass == 2)
2041	<	{
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	<	}
2041	>	strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2042		};
2043
2044		connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2045		{
2046	<	if (conf_parser_ctx.pass == 2)
2047	<	{
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));
2046	>	if (conf_parser_ctx.pass != 2)
2047	>	break;
2048
2049	<	MyFree(yy_aconf->spasswd);
2050	<	DupString(yy_aconf->spasswd, yylval.string);
2051	<	}
2052	<	}
2049	>	if ($3[0] == ':')
2050	>	conf_error_report("Server passwords cannot begin with a colon");
2051	>	else if (strchr($3, ' ') != NULL)
2052	>	conf_error_report("Server passwords cannot contain spaces");
2053	>	else
2054	>	strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
2055		};
2056
2057		connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2058		{
2059	<	if (conf_parser_ctx.pass == 2)
2060	<	{
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));
2059	>	if (conf_parser_ctx.pass != 2)
2060	>	break;
2061
2062	<	MyFree(yy_aconf->passwd);
2063	<	DupString(yy_aconf->passwd, yylval.string);
2064	<	}
2065	<	}
2062	>	if ($3[0] == ':')
2063	>	conf_error_report("Server passwords cannot begin with a colon");
2064	>	else if (strchr($3, ' ') != NULL)
2065	>	conf_error_report("Server passwords cannot contain spaces");
2066	>	else
2067	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2068		};
2069
2070		connect_port: PORT '=' NUMBER ';'
2071		{
2072		if (conf_parser_ctx.pass == 2)
2073	<	yy_aconf->port = $3;
2073	>	block_state.port.value = $3;
2074		};
2075
2076		connect_aftype: AFTYPE '=' T_IPV4 ';'
2077		{
2078		if (conf_parser_ctx.pass == 2)
2079	<	yy_aconf->aftype = AF_INET;
2079	>	block_state.aftype.value = AF_INET;
2080		} | AFTYPE '=' T_IPV6 ';'
2081		{
2082		#ifdef IPV6
2083		if (conf_parser_ctx.pass == 2)
2084	<	yy_aconf->aftype = AF_INET6;
2084	>	block_state.aftype.value = AF_INET6;
2085		#endif
2086		};
2087
2088		connect_flags: IRCD_FLAGS
2089		{
2090	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2091		} '='  connect_flags_items ';';
2092
2093		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2094		connect_flags_item: AUTOCONN
2095		{
2096		if (conf_parser_ctx.pass == 2)
2097	<	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);
2097	>	block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2098		} | T_SSL
2099		{
2100		if (conf_parser_ctx.pass == 2)
2101	<	SetConfSSL(yy_aconf);
2101	>	block_state.flags.value |= CONF_FLAGS_SSL;
2102		};
2103
2104		connect_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 2316 | Line 2106 | connect_encrypted: ENCRYPTED '=' TBOOL '
2106		if (conf_parser_ctx.pass == 2)
2107		{
2108		if (yylval.number)
2109	<	yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
2109	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
2110		else
2111	<	yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
2111	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
2112		}
2113		};
2114
2115		connect_hub_mask: HUB_MASK '=' QSTRING ';'
2116		{
2117		if (conf_parser_ctx.pass == 2)
2118	<	{
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	<	}
2118	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2119		};
2120
2121		connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2122		{
2123		if (conf_parser_ctx.pass == 2)
2124	<	{
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	<	}
2124	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
2125		};
2126
2127		connect_class: CLASS '=' QSTRING ';'
2128		{
2129		if (conf_parser_ctx.pass == 2)
2130	<	{
2355	<	MyFree(class_name);
2356	<	DupString(class_name, yylval.string);
2357	<	}
2130	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2131		};
2132
2133		connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2134		{
2135		#ifdef HAVE_LIBCRYPTO
2136		if (conf_parser_ctx.pass == 2)
2137	<	{
2365	<	MyFree(yy_aconf->cipher_list);
2366	<	DupString(yy_aconf->cipher_list, yylval.string);
2367	<	}
2137	>	strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2138		#else
2139		if (conf_parser_ctx.pass == 2)
2140	<	yyerror("Ignoring connect::ciphers -- no OpenSSL support");
2140	>	conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
2141		#endif
2142		};
2143
#	Line 2378 | Line 2148 | connect_ssl_cipher_list: T_SSL_CIPHER_LI
2148		kill_entry: KILL
2149		{
2150		if (conf_parser_ctx.pass == 2)
2151	<	{
2382	<	userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
2383	<	regex_ban = 0;
2384	<	}
2151	>	reset_block_state();
2152		} '{' kill_items '}' ';'
2153		{
2154	<	if (conf_parser_ctx.pass == 2)
2154	>	struct MaskItem *conf = NULL;
2155	>
2156	>	if (conf_parser_ctx.pass != 2)
2157	>	break;
2158	>
2159	>	if (!block_state.user.buf[0] ||
2160	>	!block_state.host.buf[0])
2161	>	break;
2162	>
2163	>
2164	>	if (block_state.port.value == 1)
2165		{
2389	–	if (userbuf[0] && hostbuf[0])
2390	–	{
2391	–	if (regex_ban)
2392	–	{
2166		#ifdef HAVE_LIBPCRE
2167	<	void *exp_user = NULL;
2168	<	void *exp_host = NULL;
2169	<	const char *errptr = NULL;
2170	<
2171	<	if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
2172	<	!(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
2173	<	{
2174	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: %s",
2175	<	errptr);
2176	<	break;
2177	<	}
2405	<
2406	<	yy_aconf = map_to_conf(make_conf_item(RKLINE_TYPE));
2407	<	yy_aconf->regexuser = exp_user;
2408	<	yy_aconf->regexhost = exp_host;
2167	>	void *exp_user = NULL;
2168	>	void *exp_host = NULL;
2169	>	const char *errptr = NULL;
2170	>
2171	>	if (!(exp_user = ircd_pcre_compile(block_state.user.buf, &errptr)) ||
2172	>	!(exp_host = ircd_pcre_compile(block_state.host.buf, &errptr)))
2173	>	{
2174	>	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: %s",
2175	>	errptr);
2176	>	break;
2177	>	}
2178
2179	<	DupString(yy_aconf->user, userbuf);
2180	<	DupString(yy_aconf->host, hostbuf);
2179	>	conf = conf_make(CONF_RKLINE);
2180	>	conf->regexuser = exp_user;
2181	>	conf->regexhost = exp_host;
2182
2183	<	if (reasonbuf[0])
2184	<	DupString(yy_aconf->reason, reasonbuf);
2185	<	else
2186	<	DupString(yy_aconf->reason, "No reason");
2183	>	conf->user = xstrdup(block_state.user.buf);
2184	>	conf->host = xstrdup(block_state.host.buf);
2185	>
2186	>	if (block_state.rpass.buf[0])
2187	>	conf->reason = xstrdup(block_state.rpass.buf);
2188	>	else
2189	>	conf->reason = xstrdup(CONF_NOREASON);
2190		#else
2191	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: no PCRE support");
2192	<	break;
2191	>	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: no PCRE support");
2192	>	break;
2193		#endif
2194	<	}
2195	<	else
2196	<	{
2197	<	yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
2194	>	}
2195	>	else
2196	>	{
2197	>	conf = conf_make(CONF_KLINE);
2198
2199	<	DupString(yy_aconf->user, userbuf);
2200	<	DupString(yy_aconf->host, hostbuf);
2199	>	conf->user = xstrdup(block_state.user.buf);
2200	>	conf->host = xstrdup(block_state.host.buf);
2201
2202	<	if (reasonbuf[0])
2203	<	DupString(yy_aconf->reason, reasonbuf);
2204	<	else
2205	<	DupString(yy_aconf->reason, "No reason");
2206	<	add_conf_by_address(CONF_KILL, yy_aconf);
2434	<	}
2435	<	}
2436	<
2437	<	yy_aconf = NULL;
2202	>	if (block_state.rpass.buf[0])
2203	>	conf->reason = xstrdup(block_state.rpass.buf);
2204	>	else
2205	>	conf->reason = xstrdup(CONF_NOREASON);
2206	>	add_conf_by_address(CONF_KLINE, conf);
2207		}
2208		};
2209
2210		kill_type: TYPE
2211		{
2212	+	if (conf_parser_ctx.pass == 2)
2213	+	block_state.port.value = 0;
2214		} '='  kill_type_items ';';
2215
2216		kill_type_items: kill_type_items ',' kill_type_item | kill_type_item;
2217		kill_type_item: REGEX_T
2218		{
2219		if (conf_parser_ctx.pass == 2)
2220	<	regex_ban = 1;
2220	>	block_state.port.value = 1;
2221		};
2222
2223		kill_items:     kill_items kill_item | kill_item;
#	Line 2454 | Line 2225 | kill_item:      kill_user | kill_reason
2225
2226		kill_user: USER '=' QSTRING ';'
2227		{
2228	+
2229		if (conf_parser_ctx.pass == 2)
2230		{
2231		struct split_nuh_item nuh;
2232
2233		nuh.nuhmask  = yylval.string;
2234		nuh.nickptr  = NULL;
2235	<	nuh.userptr  = userbuf;
2236	<	nuh.hostptr  = hostbuf;
2235	>	nuh.userptr  = block_state.user.buf;
2236	>	nuh.hostptr  = block_state.host.buf;
2237
2238		nuh.nicksize = 0;
2239	<	nuh.usersize = sizeof(userbuf);
2240	<	nuh.hostsize = sizeof(hostbuf);
2239	>	nuh.usersize = sizeof(block_state.user.buf);
2240	>	nuh.hostsize = sizeof(block_state.host.buf);
2241
2242		split_nuh(&nuh);
2243		}
#	Line 2474 | Line 2246 | kill_user: USER '=' QSTRING ';'
2246		kill_reason: REASON '=' QSTRING ';'
2247		{
2248		if (conf_parser_ctx.pass == 2)
2249	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2249	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2250		};
2251
2252		/***************************************************************************
#	Line 2483 | Line 2255 | kill_reason: REASON '=' QSTRING ';'
2255		deny_entry: DENY
2256		{
2257		if (conf_parser_ctx.pass == 2)
2258	<	hostbuf[0] = reasonbuf[0] = '\0';
2258	>	reset_block_state();
2259		} '{' deny_items '}' ';'
2260		{
2261	<	if (conf_parser_ctx.pass == 2)
2261	>	struct MaskItem *conf = NULL;
2262	>
2263	>	if (conf_parser_ctx.pass != 2)
2264	>	break;
2265	>
2266	>	if (!block_state.addr.buf[0])
2267	>	break;
2268	>
2269	>	if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2270		{
2271	<	if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
2272	<	{
2493	<	yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
2494	<	DupString(yy_aconf->host, hostbuf);
2271	>	conf = conf_make(CONF_DLINE);
2272	>	conf->host = xstrdup(block_state.addr.buf);
2273
2274	<	if (reasonbuf[0])
2275	<	DupString(yy_aconf->reason, reasonbuf);
2276	<	else
2277	<	DupString(yy_aconf->reason, "No reason");
2278	<	add_conf_by_address(CONF_DLINE, yy_aconf);
2501	<	yy_aconf = NULL;
2502	<	}
2274	>	if (block_state.rpass.buf[0])
2275	>	conf->reason = xstrdup(block_state.rpass.buf);
2276	>	else
2277	>	conf->reason = xstrdup(CONF_NOREASON);
2278	>	add_conf_by_address(CONF_DLINE, conf);
2279		}
2280		};
2281
#	Line 2509 | Line 2285 | deny_item:      deny_ip | deny_reason |
2285		deny_ip: IP '=' QSTRING ';'
2286		{
2287		if (conf_parser_ctx.pass == 2)
2288	<	strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
2288	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2289		};
2290
2291		deny_reason: REASON '=' QSTRING ';'
2292		{
2293		if (conf_parser_ctx.pass == 2)
2294	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2294	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2295		};
2296
2297		/***************************************************************************
#	Line 2532 | Line 2308 | exempt_ip: IP '=' QSTRING ';'
2308		{
2309		if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2310		{
2311	<	yy_aconf = map_to_conf(make_conf_item(EXEMPTDLINE_TYPE));
2312	<	DupString(yy_aconf->host, yylval.string);
2311	>	struct MaskItem *conf = conf_make(CONF_EXEMPT);
2312	>	conf->host = xstrdup(yylval.string);
2313
2314	<	add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
2539	<	yy_aconf = NULL;
2314	>	add_conf_by_address(CONF_EXEMPT, conf);
2315		}
2316		}
2317		};
#	Line 2547 | Line 2322 | exempt_ip: IP '=' QSTRING ';'
2322		gecos_entry: GECOS
2323		{
2324		if (conf_parser_ctx.pass == 2)
2325	<	{
2551	<	regex_ban = 0;
2552	<	reasonbuf[0] = gecos_name[0] = '\0';
2553	<	}
2325	>	reset_block_state();
2326		} '{' gecos_items '}' ';'
2327		{
2328	<	if (conf_parser_ctx.pass == 2)
2328	>	struct MaskItem *conf = NULL;
2329	>
2330	>	if (conf_parser_ctx.pass != 2)
2331	>	break;
2332	>
2333	>	if (!block_state.name.buf[0])
2334	>	break;
2335	>
2336	>	if (block_state.port.value == 1)
2337		{
2558	–	if (gecos_name[0])
2559	–	{
2560	–	if (regex_ban)
2561	–	{
2338		#ifdef HAVE_LIBPCRE
2339	<	void *exp_p = NULL;
2340	<	const char *errptr = NULL;
2339	>	void *exp_p = NULL;
2340	>	const char *errptr = NULL;
2341
2342	<	if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
2343	<	{
2344	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: %s",
2345	<	errptr);
2346	<	break;
2347	<	}
2342	>	if (!(exp_p = ircd_pcre_compile(block_state.name.buf, &errptr)))
2343	>	{
2344	>	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: %s",
2345	>	errptr);
2346	>	break;
2347	>	}
2348
2349	<	yy_conf = make_conf_item(RXLINE_TYPE);
2350	<	yy_conf->regexpname = exp_p;
2349	>	conf = conf_make(CONF_RXLINE);
2350	>	conf->regexuser = exp_p;
2351		#else
2352	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: no PCRE support");
2353	<	break;
2352	>	conf_error_report("Failed to add regular expression based X-Line: no PCRE support");
2353	>	break;
2354		#endif
2355	<	}
2356	<	else
2357	<	yy_conf = make_conf_item(XLINE_TYPE);
2355	>	}
2356	>	else
2357	>	conf = conf_make(CONF_XLINE);
2358
2359	<	yy_match_item = map_to_conf(yy_conf);
2584	<	DupString(yy_conf->name, gecos_name);
2359	>	conf->name = xstrdup(block_state.name.buf);
2360
2361	<	if (reasonbuf[0])
2362	<	DupString(yy_match_item->reason, reasonbuf);
2363	<	else
2364	<	DupString(yy_match_item->reason, "No reason");
2590	<	}
2591	<	}
2361	>	if (block_state.rpass.buf[0])
2362	>	conf->reason = xstrdup(block_state.rpass.buf);
2363	>	else
2364	>	conf->reason = xstrdup(CONF_NOREASON);
2365		};
2366
2367		gecos_flags: TYPE
2368		{
2369	+	if (conf_parser_ctx.pass == 2)
2370	+	block_state.port.value = 0;
2371		} '='  gecos_flags_items ';';
2372
2373		gecos_flags_items: gecos_flags_items ',' gecos_flags_item | gecos_flags_item;
2374		gecos_flags_item: REGEX_T
2375		{
2376		if (conf_parser_ctx.pass == 2)
2377	<	regex_ban = 1;
2377	>	block_state.port.value = 1;
2378		};
2379
2380		gecos_items: gecos_items gecos_item | gecos_item;
#	Line 2608 | Line 2383 | gecos_item:  gecos_name | gecos_reason |
2383		gecos_name: NAME '=' QSTRING ';'
2384		{
2385		if (conf_parser_ctx.pass == 2)
2386	<	strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
2386	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2387		};
2388
2389		gecos_reason: REASON '=' QSTRING ';'
2390		{
2391		if (conf_parser_ctx.pass == 2)
2392	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2392	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2393		};
2394
2395		/***************************************************************************
#	Line 2629 | Line 2404 | general_item:       general_hide_spoof_i
2404		general_max_nick_time | general_max_nick_changes |
2405		general_max_accept | general_anti_spam_exit_message_time |
2406		general_ts_warn_delta | general_ts_max_delta |
2407	<	general_kill_chase_time_limit | general_kline_with_reason |
2408	<	general_kline_reason | general_invisible_on_connect |
2407	>	general_kill_chase_time_limit |
2408	>	general_invisible_on_connect |
2409		general_warn_no_nline | general_dots_in_ident |
2410		general_stats_o_oper_only | general_stats_k_oper_only |
2411		general_pace_wait | general_stats_i_oper_only |
2412		general_pace_wait_simple | general_stats_P_oper_only |
2413		general_short_motd | general_no_oper_flood |
2414		general_true_no_oper_flood | general_oper_pass_resv |
2640	–	general_message_locale |
2415		general_oper_only_umodes | general_max_targets |
2416		general_use_egd | general_egdpool_path |
2417		general_oper_umodes | general_caller_id_wait |
2418		general_opers_bypass_callerid | general_default_floodcount |
2419		general_min_nonwildcard | general_min_nonwildcard_simple |
2420		general_disable_remote_commands |
2647	–	general_client_flood |
2421		general_throttle_time | general_havent_read_conf |
2422		general_ping_cookie |
2423		general_disable_auth |
2424	<	general_tkline_expire_notices | general_gline_min_cidr |
2425	<	general_gline_min_cidr6 | general_use_whois_actually |
2426	<	general_reject_hold_time | general_stats_e_disabled |
2424	>	general_tkline_expire_notices | general_gline_enable |
2425	>	general_gline_duration | general_gline_request_duration |
2426	>	general_gline_min_cidr |
2427	>	general_gline_min_cidr6 |
2428	>	general_stats_e_disabled |
2429		general_max_watch | general_services_name |
2430		error;
2431
#	Line 2660 | Line 2435 | general_max_watch: MAX_WATCH '=' NUMBER
2435		ConfigFileEntry.max_watch = $3;
2436		};
2437
2438	<	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2438	>	general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2439		{
2440	<	ConfigFileEntry.gline_min_cidr = $3;
2440	>	if (conf_parser_ctx.pass == 2)
2441	>	ConfigFileEntry.glines = yylval.number;
2442		};
2443
2444	<	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2444	>	general_gline_duration: GLINE_DURATION '=' timespec ';'
2445		{
2446	<	ConfigFileEntry.gline_min_cidr6 = $3;
2446	>	if (conf_parser_ctx.pass == 2)
2447	>	ConfigFileEntry.gline_time = $3;
2448		};
2449
2450	<	general_use_whois_actually: USE_WHOIS_ACTUALLY '=' TBOOL ';'
2450	>	general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2451		{
2452	<	ConfigFileEntry.use_whois_actually = yylval.number;
2452	>	if (conf_parser_ctx.pass == 2)
2453	>	ConfigFileEntry.gline_request_time = $3;
2454		};
2455
2456	<	general_reject_hold_time: TREJECT_HOLD_TIME '=' timespec ';'
2456	>	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2457		{
2458	<	GlobalSetOptions.rejecttime = yylval.number;
2458	>	ConfigFileEntry.gline_min_cidr = $3;
2459	>	};
2460	>
2461	>	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2462	>	{
2463	>	ConfigFileEntry.gline_min_cidr6 = $3;
2464		};
2465
2466		general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
#	Line 2757 | Line 2540 | general_havent_read_conf: HAVENT_READ_CO
2540		}
2541		};
2542
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	–
2543		general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2544		{
2545		ConfigFileEntry.invisible_on_connect = yylval.number;
#	Line 2852 | Line 2621 | general_oper_pass_resv: OPER_PASS_RESV '
2621		ConfigFileEntry.oper_pass_resv = yylval.number;
2622		};
2623
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	–
2624		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2625		{
2626		ConfigFileEntry.dots_in_ident = $3;
#	Line 2883 | Line 2641 | general_egdpool_path: EGDPOOL_PATH '=' Q
2641		if (conf_parser_ctx.pass == 2)
2642		{
2643		MyFree(ConfigFileEntry.egdpool_path);
2644	<	DupString(ConfigFileEntry.egdpool_path, yylval.string);
2644	>	ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
2645		}
2646		};
2647
#	Line 2892 | Line 2650 | general_services_name: T_SERVICES_NAME '
2650		if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2651		{
2652		MyFree(ConfigFileEntry.service_name);
2653	<	DupString(ConfigFileEntry.service_name, yylval.string);
2653	>	ConfigFileEntry.service_name = xstrdup(yylval.string);
2654		}
2655		};
2656
#	Line 3062 | Line 2820 | general_default_floodcount: DEFAULT_FLOO
2820		ConfigFileEntry.default_floodcount = $3;
2821		};
2822
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	–	};
2823
2824		/***************************************************************************
2825		*  section channel
#	Line 3243 | Line 2828 | channel_entry: CHANNEL
2828		'{' channel_items '}' ';';
2829
2830		channel_items:      channel_items channel_item | channel_item;
2831	<	channel_item:       channel_disable_local_channels | channel_use_except |
2832	<	channel_use_invex | channel_use_knock |
2833	<	channel_max_bans | channel_knock_delay |
3249	<	channel_knock_delay_channel | channel_max_chans_per_user |
2831	>	channel_item:       channel_max_bans |
2832	>	channel_knock_delay | channel_knock_delay_channel |
2833	>	channel_max_chans_per_user | channel_max_chans_per_oper |
2834		channel_quiet_on_ban | channel_default_split_user_count |
2835		channel_default_split_server_count |
2836		channel_no_create_on_split | channel_restrict_channels |
2837	<	channel_no_join_on_split | channel_burst_topicwho |
2837	>	channel_no_join_on_split |
2838		channel_jflood_count | channel_jflood_time |
2839		channel_disable_fake_channels | error;
2840
#	Line 3264 | Line 2848 | channel_restrict_channels: RESTRICT_CHAN
2848		ConfigChannel.restrict_channels = yylval.number;
2849		};
2850
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	–
2851		channel_knock_delay: KNOCK_DELAY '=' timespec ';'
2852		{
2853		ConfigChannel.knock_delay = $3;
#	Line 3299 | Line 2863 | channel_max_chans_per_user: MAX_CHANS_PE
2863		ConfigChannel.max_chans_per_user = $3;
2864		};
2865
2866	+	channel_max_chans_per_oper: MAX_CHANS_PER_OPER '=' NUMBER ';'
2867	+	{
2868	+	ConfigChannel.max_chans_per_oper = $3;
2869	+	};
2870	+
2871		channel_quiet_on_ban: QUIET_ON_BAN '=' TBOOL ';'
2872		{
2873		ConfigChannel.quiet_on_ban = yylval.number;
#	Line 3329 | Line 2898 | channel_no_join_on_split: NO_JOIN_ON_SPL
2898		ConfigChannel.no_join_on_split = yylval.number;
2899		};
2900
3332	–	channel_burst_topicwho: BURST_TOPICWHO '=' TBOOL ';'
3333	–	{
3334	–	ConfigChannel.burst_topicwho = yylval.number;
3335	–	};
3336	–
2901		channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
2902		{
2903		GlobalSetOptions.joinfloodcount = yylval.number;
#	Line 3352 | Line 2916 | serverhide_entry: SERVERHIDE
2916
2917		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
2918		serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
2919	+	serverhide_hide_services |
2920		serverhide_links_delay |
3356	–	serverhide_disable_hidden |
2921		serverhide_hidden | serverhide_hidden_name |
2922		serverhide_hide_server_ips |
2923		error;
#	Line 3370 | Line 2934 | serverhide_hide_servers: HIDE_SERVERS '=
2934		ConfigServerHide.hide_servers = yylval.number;
2935		};
2936
2937	+	serverhide_hide_services: HIDE_SERVICES '=' TBOOL ';'
2938	+	{
2939	+	if (conf_parser_ctx.pass == 2)
2940	+	ConfigServerHide.hide_services = yylval.number;
2941	+	};
2942	+
2943		serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2944		{
2945		if (conf_parser_ctx.pass == 2)
2946		{
2947		MyFree(ConfigServerHide.hidden_name);
2948	<	DupString(ConfigServerHide.hidden_name, yylval.string);
2948	>	ConfigServerHide.hidden_name = xstrdup(yylval.string);
2949		}
2950		};
2951
#	Line 3399 | Line 2969 | serverhide_hidden: HIDDEN '=' TBOOL ';'
2969		ConfigServerHide.hidden = yylval.number;
2970		};
2971
3402	–	serverhide_disable_hidden: DISABLE_HIDDEN '=' TBOOL ';'
3403	–	{
3404	–	if (conf_parser_ctx.pass == 2)
3405	–	ConfigServerHide.disable_hidden = yylval.number;
3406	–	};
3407	–
2972		serverhide_hide_server_ips: HIDE_SERVER_IPS '=' TBOOL ';'
2973		{
2974		if (conf_parser_ctx.pass == 2)

Diff Legend

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