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

Diff Legend

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