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 1329 by michael, Sun Apr 1 12:02:12 2012 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 2012 by michael, Sun May 12 14:47:26 2013 UTC

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

Diff Legend

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