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 1474 by michael, Sun Jul 22 14:44:07 2012 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 1921 by michael, Tue Apr 30 14:54:20 2013 UTC

#	Line 33 | Line 33
33		#include "ircd.h"
34		#include "list.h"
35		#include "conf.h"
36	+	#include "conf_class.h"
37		#include "event.h"
38		#include "log.h"
39		#include "client.h"     /* for UMODE_ALL only */
40		#include "irc_string.h"
40	–	#include "sprintf_irc.h"
41		#include "memory.h"
42		#include "modules.h"
43		#include "s_serv.h"
#	Line 55 | Line 55
55		#include <openssl/dh.h>
56		#endif
57
58	+	#include "rsa.h"
59	+
60		int yylex(void);
61
62	<	static char *class_name = NULL;
63	<	static struct ConfItem *yy_conf = NULL;
64	<	static struct AccessItem *yy_aconf = NULL;
65	<	static struct MatchItem *yy_match_item = NULL;
66	<	static struct ClassItem *yy_class = NULL;
67	<	static char *yy_class_name = NULL;
68	<
69	<	static dlink_list col_conf_list  = { NULL, NULL, 0 };
70	<	static unsigned int listener_flags = 0;
71	<	static unsigned int regex_ban = 0;
72	<	static char userbuf[IRCD_BUFSIZE];
73	<	static char hostbuf[IRCD_BUFSIZE];
74	<	static char reasonbuf[REASONLEN + 1];
75	<	static char gecos_name[REALLEN * 4];
76	<	static char lfile[IRCD_BUFSIZE];
77	<	static unsigned int ltype = 0;
78	<	static unsigned int lsize = 0;
79	<	static char *resv_reason = NULL;
80	<	static char *listener_address = NULL;
81	<
82	<	struct CollectItem
83	<	{
84	<	dlink_node node;
85	<	char *name;
86	<	char *user;
87	<	char *host;
88	<	char *passwd;
89	<	int  port;
90	<	int  flags;
91	<	#ifdef HAVE_LIBCRYPTO
92	<	char *rsa_public_key_file;
93	<	RSA *rsa_public_key;
94	<	#endif
95	<	};
62	>	static struct
63	>	{
64	>	struct {
65	>	dlink_list list;
66	>	} mask,
67	>	leaf,
68	>	hub;
69	>
70	>	struct {
71	>	char buf[IRCD_BUFSIZE];
72	>	} name,
73	>	user,
74	>	host,
75	>	addr,
76	>	bind,
77	>	file,
78	>	ciph,
79	>	rpass,
80	>	spass,
81	>	class;
82	>
83	>	struct {
84	>	unsigned int value;
85	>	} flags,
86	>	modes,
87	>	size,
88	>	type,
89	>	port,
90	>	aftype,
91	>	ping_freq,
92	>	max_perip,
93	>	con_freq,
94	>	min_idle,
95	>	max_idle,
96	>	max_total,
97	>	max_global,
98	>	max_local,
99	>	max_ident,
100	>	max_sendq,
101	>	max_recvq,
102	>	cidr_bitlen_ipv4,
103	>	cidr_bitlen_ipv6,
104	>	number_per_cidr;
105	>	} block_state;
106
107		static void
108	<	free_collect_item(struct CollectItem *item)
108	>	reset_block_state(void)
109		{
110	<	MyFree(item->name);
111	<	MyFree(item->user);
112	<	MyFree(item->host);
113	<	MyFree(item->passwd);
114	<	#ifdef HAVE_LIBCRYPTO
115	<	MyFree(item->rsa_public_key_file);
116	<	#endif
117	<	MyFree(item);
110	>	dlink_node *ptr = NULL, *ptr_next = NULL;
111	>
112	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.mask.list.head)
113	>	{
114	>	MyFree(ptr->data);
115	>	dlinkDelete(ptr, &block_state.mask.list);
116	>	free_dlink_node(ptr);
117	>	}
118	>
119	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
120	>	{
121	>	MyFree(ptr->data);
122	>	dlinkDelete(ptr, &block_state.leaf.list);
123	>	free_dlink_node(ptr);
124	>	}
125	>
126	>	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.hub.list.head)
127	>	{
128	>	MyFree(ptr->data);
129	>	dlinkDelete(ptr, &block_state.hub.list);
130	>	free_dlink_node(ptr);
131	>	}
132	>
133	>	memset(&block_state, 0, sizeof(block_state));
134		}
135
136		%}
#	Line 113 | Line 141 | free_collect_item(struct CollectItem *it
141		}
142
143		%token  ACCEPT_PASSWORD
116	–	%token  ACTION
144		%token  ADMIN
145		%token  AFTYPE
119	–	%token  T_ALLOW
146		%token  ANTI_NICK_FLOOD
147		%token  ANTI_SPAM_EXIT_MESSAGE_TIME
148		%token  AUTOCONN
149	<	%token  T_BLOCK
124	<	%token  BURST_AWAY
125	<	%token  BYTES KBYTES MBYTES GBYTES TBYTES
149	>	%token  BYTES KBYTES MBYTES
150		%token  CALLER_ID_WAIT
151		%token  CAN_FLOOD
152		%token  CHANNEL
#	Line 139 | Line 163 | free_collect_item(struct CollectItem *it
163		%token  DIE
164		%token  DISABLE_AUTH
165		%token  DISABLE_FAKE_CHANNELS
142	–	%token  DISABLE_HIDDEN
166		%token  DISABLE_REMOTE_COMMANDS
167		%token  DOTS_IN_IDENT
145	–	%token  DURATION
168		%token  EGDPOOL_PATH
169		%token  EMAIL
148	–	%token  ENABLE
170		%token  ENCRYPTED
171		%token  EXCEED_LIMIT
172		%token  EXEMPT
#	Line 158 | Line 179 | free_collect_item(struct CollectItem *it
179		%token  GLINE_DURATION
180		%token  GLINE_ENABLE
181		%token  GLINE_EXEMPT
161	–	%token  GLINE_TIME
182		%token  GLINE_REQUEST_DURATION
183		%token  GLINE_MIN_CIDR
184		%token  GLINE_MIN_CIDR6
#	Line 170 | Line 190 | free_collect_item(struct CollectItem *it
190		%token  HIDDEN_NAME
191		%token  HIDE_SERVER_IPS
192		%token  HIDE_SERVERS
193	+	%token  HIDE_SERVICES
194		%token  HIDE_SPOOF_IPS
195		%token  HOST
196		%token  HUB
#	Line 181 | Line 202 | free_collect_item(struct CollectItem *it
202		%token  KILL_CHASE_TIME_LIMIT
203		%token  KLINE
204		%token  KLINE_EXEMPT
184	–	%token  KLINE_REASON
185	–	%token  KLINE_WITH_REASON
205		%token  KNOCK_DELAY
206		%token  KNOCK_DELAY_CHANNEL
207		%token  LEAF_MASK
208		%token  LINKS_DELAY
209		%token  LISTEN
210		%token  T_LOG
211	+	%token  MASK
212		%token  MAX_ACCEPT
213		%token  MAX_BANS
214		%token  MAX_CHANS_PER_OPER
#	Line 197 | Line 217 | free_collect_item(struct CollectItem *it
217		%token  MAX_IDENT
218		%token  MAX_LOCAL
219		%token  MAX_NICK_CHANGES
220	+	%token  MAX_NICK_LENGTH
221		%token  MAX_NICK_TIME
222		%token  MAX_NUMBER
223		%token  MAX_TARGETS
224	+	%token  MAX_TOPIC_LENGTH
225		%token  MAX_WATCH
204	–	%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 211 | Line 236 | free_collect_item(struct CollectItem *it
236		%token  NETWORK_DESC
237		%token  NETWORK_NAME
238		%token  NICK
214	–	%token  NICK_CHANGES
239		%token  NO_CREATE_ON_SPLIT
240		%token  NO_JOIN_ON_SPLIT
241		%token  NO_OPER_FLOOD
242		%token  NO_TILDE
243		%token  NUMBER
220	–	%token  NUMBER_PER_IDENT
244		%token  NUMBER_PER_CIDR
245		%token  NUMBER_PER_IP
223	–	%token  NUMBER_PER_IP_GLOBAL
246		%token  OPERATOR
247		%token  OPERS_BYPASS_CALLERID
248		%token  OPER_ONLY_UMODES
#	Line 235 | Line 257 | free_collect_item(struct CollectItem *it
257		%token  PATH
258		%token  PING_COOKIE
259		%token  PING_TIME
238	–	%token  PING_WARNING
260		%token  PORT
261		%token  QSTRING
262		%token  QUIET_ON_BAN
263		%token  REASON
264		%token  REDIRPORT
265		%token  REDIRSERV
245	–	%token  REGEX_T
266		%token  REHASH
247	–	%token  TREJECT_HOLD_TIME
267		%token  REMOTE
268		%token  REMOTEBAN
250	–	%token  RESTRICT_CHANNELS
251	–	%token  RESTRICTED
269		%token  RSA_PRIVATE_KEY_FILE
270		%token  RSA_PUBLIC_KEY_FILE
271		%token  SSL_CERTIFICATE_FILE
#	Line 259 | Line 276 | free_collect_item(struct CollectItem *it
276		%token  T_TLSV1
277		%token  RESV
278		%token  RESV_EXEMPT
279	<	%token  SECONDS MINUTES HOURS DAYS WEEKS
279	>	%token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
280		%token  SENDQ
281		%token  SEND_PASSWORD
282		%token  SERVERHIDE
#	Line 270 | Line 287 | free_collect_item(struct CollectItem *it
287		%token  T_CLUSTER
288		%token  TYPE
289		%token  SHORT_MOTD
273	–	%token  SILENT
290		%token  SPOOF
291		%token  SPOOF_NOTICE
292		%token  STATS_E_DISABLED
#	Line 280 | Line 296 | free_collect_item(struct CollectItem *it
296		%token  STATS_P_OPER_ONLY
297		%token  TBOOL
298		%token  TMASKED
283	–	%token  T_REJECT
299		%token  TS_MAX_DELTA
300		%token  TS_WARN_DELTA
301		%token  TWODOTS
#	Line 291 | Line 306 | free_collect_item(struct CollectItem *it
306		%token  T_CCONN
307		%token  T_CCONN_FULL
308		%token  T_SSL_CIPHER_LIST
294	–	%token  T_CLIENT_FLOOD
309		%token  T_DEAF
310		%token  T_DEBUG
311		%token  T_DLINE
298	–	%token  T_DRONE
312		%token  T_EXTERNAL
313		%token  T_FULL
314		%token  T_INVISIBLE
#	Line 304 | Line 317 | free_collect_item(struct CollectItem *it
317		%token  T_LOCOPS
318		%token  T_MAX_CLIENTS
319		%token  T_NCHANGE
320	+	%token  T_NONONREG
321		%token  T_OPERWALL
322	+	%token  T_RECVQ
323		%token  T_REJ
324		%token  T_SERVER
325		%token  T_SERVNOTICE
#	Line 320 | Line 335 | free_collect_item(struct CollectItem *it
335		%token  T_UNXLINE
336		%token  T_GLOBOPS
337		%token  T_WALLOP
338	+	%token  T_WEBIRC
339		%token  T_RESTART
340		%token  T_SERVICE
341		%token  T_SERVICES_NAME
342		%token  THROTTLE_TIME
327	–	%token  TOPICBURST
343		%token  TRUE_NO_OPER_FLOOD
329	–	%token  TKLINE
330	–	%token  TXLINE
331	–	%token  TRESV
344		%token  UNKLINE
345		%token  USER
346		%token  USE_EGD
335	–	%token  USE_EXCEPT
336	–	%token  USE_INVEX
337	–	%token  USE_KNOCK
347		%token  USE_LOGGING
339	–	%token  USE_WHOIS_ACTUALLY
348		%token  VHOST
349		%token  VHOST6
350		%token  XLINE
343	–	%token  WARN
351		%token  WARN_NO_NLINE
352		%token  T_SIZE
353		%token  T_FILE
#	Line 407 | Line 414 | timespec:      NUMBER timespec_
414		{
415		$$ = $1 * 60 * 60 * 24 * 7 + $3;
416		}
417	+	| NUMBER MONTHS timespec_
418	+	{
419	+	$$ = $1 * 60 * 60 * 24 * 7 * 4 + $3;
420	+	}
421	+	| NUMBER YEARS timespec_
422	+	{
423	+	$$ = $1 * 60 * 60 * 24 * 365 + $3;
424	+	}
425		;
426
427		sizespec_:      { $$ = 0; } | sizespec;
#	Line 445 | Line 460 | serverinfo_items:       serverinfo_items
460		serverinfo_item:        serverinfo_name | serverinfo_vhost |
461		serverinfo_hub | serverinfo_description |
462		serverinfo_network_name | serverinfo_network_desc |
463	<	serverinfo_max_clients | serverinfo_ssl_dh_param_file |
463	>	serverinfo_max_clients | serverinfo_max_nick_length |
464	>	serverinfo_max_topic_length | serverinfo_ssl_dh_param_file |
465		serverinfo_rsa_private_key_file | serverinfo_vhost6 |
466		serverinfo_sid | serverinfo_ssl_certificate_file |
467		serverinfo_ssl_client_method | serverinfo_ssl_server_method |
#	Line 493 | Line 509 | serverinfo_ssl_certificate_file: SSL_CER
509		{
510		if (!ServerInfo.rsa_private_key_file)
511		{
512	<	yyerror("No rsa_private_key_file specified, SSL disabled");
512	>	conf_error_report("No rsa_private_key_file specified, SSL disabled");
513		break;
514		}
515
#	Line 502 | Line 518 | serverinfo_ssl_certificate_file: SSL_CER
518		SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
519		SSL_FILETYPE_PEM) <= 0)
520		{
521	<	yyerror(ERR_lib_error_string(ERR_get_error()));
521	>	report_crypto_errors();
522	>	conf_error_report("Could not open/read certificate file");
523		break;
524		}
525
#	Line 511 | Line 528 | serverinfo_ssl_certificate_file: SSL_CER
528		SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
529		SSL_FILETYPE_PEM) <= 0)
530		{
531	<	yyerror(ERR_lib_error_string(ERR_get_error()));
531	>	report_crypto_errors();
532	>	conf_error_report("Could not read RSA private key");
533		break;
534		}
535
536		if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
537		!SSL_CTX_check_private_key(ServerInfo.client_ctx))
538		{
539	<	yyerror(ERR_lib_error_string(ERR_get_error()));
539	>	report_crypto_errors();
540	>	conf_error_report("Could not read RSA private key");
541		break;
542		}
543		}
#	Line 544 | Line 563 | serverinfo_rsa_private_key_file: RSA_PRI
563		ServerInfo.rsa_private_key_file = NULL;
564		}
565
566	<	DupString(ServerInfo.rsa_private_key_file, yylval.string);
566	>	ServerInfo.rsa_private_key_file = xstrdup(yylval.string);
567
568		if ((file = BIO_new_file(yylval.string, "r")) == NULL)
569		{
570	<	yyerror("File open failed, ignoring");
570	>	conf_error_report("File open failed, ignoring");
571		break;
572		}
573
#	Line 559 | Line 578 | serverinfo_rsa_private_key_file: RSA_PRI
578
579		if (ServerInfo.rsa_private_key == NULL)
580		{
581	<	yyerror("Couldn't extract key, ignoring");
581	>	conf_error_report("Couldn't extract key, ignoring");
582		break;
583		}
584
#	Line 568 | Line 587 | serverinfo_rsa_private_key_file: RSA_PRI
587		RSA_free(ServerInfo.rsa_private_key);
588		ServerInfo.rsa_private_key = NULL;
589
590	<	yyerror("Invalid key, ignoring");
590	>	conf_error_report("Invalid key, ignoring");
591		break;
592		}
593
#	Line 578 | Line 597 | serverinfo_rsa_private_key_file: RSA_PRI
597		RSA_free(ServerInfo.rsa_private_key);
598		ServerInfo.rsa_private_key = NULL;
599
600	<	yyerror("Not a 2048 bit key, ignoring");
600	>	conf_error_report("Not a 2048 bit key, ignoring");
601		}
602		}
603		#endif
#	Line 601 | Line 620 | serverinfo_ssl_dh_param_file: SSL_DH_PAR
620		if (dh)
621		{
622		if (DH_size(dh) < 128)
623	<	ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
623	>	conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
624		else
625		SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
626
#	Line 626 | Line 645 | serverinfo_name: NAME '=' QSTRING ';'
645		if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
646		{
647		if (valid_servname(yylval.string))
648	<	DupString(ServerInfo.name, yylval.string);
648	>	ServerInfo.name = xstrdup(yylval.string);
649		else
650		{
651	<	ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::name -- invalid name. Aborting.");
651	>	conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
652		exit(0);
653		}
654		}
#	Line 641 | Line 660 | serverinfo_sid: IRCD_SID '=' QSTRING ';'
660		if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
661		{
662		if (valid_sid(yylval.string))
663	<	DupString(ServerInfo.sid, yylval.string);
663	>	ServerInfo.sid = xstrdup(yylval.string);
664		else
665		{
666	<	ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::sid -- invalid SID. Aborting.");
666	>	conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
667		exit(0);
668		}
669		}
#	Line 655 | Line 674 | serverinfo_description: DESCRIPTION '='
674		if (conf_parser_ctx.pass == 2)
675		{
676		MyFree(ServerInfo.description);
677	<	DupString(ServerInfo.description,yylval.string);
677	>	ServerInfo.description = xstrdup(yylval.string);
678		}
679		};
680
#	Line 669 | Line 688 | serverinfo_network_name: NETWORK_NAME '=
688		p = '\0';
689
690		MyFree(ServerInfo.network_name);
691	<	DupString(ServerInfo.network_name, yylval.string);
691	>	ServerInfo.network_name = xstrdup(yylval.string);
692		}
693		};
694
#	Line 678 | Line 697 | serverinfo_network_desc: NETWORK_DESC '=
697		if (conf_parser_ctx.pass == 2)
698		{
699		MyFree(ServerInfo.network_desc);
700	<	DupString(ServerInfo.network_desc, yylval.string);
700	>	ServerInfo.network_desc = xstrdup(yylval.string);
701		}
702		};
703
#	Line 742 | Line 761 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
761
762		serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
763		{
764	<	if (conf_parser_ctx.pass == 2)
764	>	if (conf_parser_ctx.pass != 2)
765	>	break;
766	>
767	>	if ($3 < MAXCLIENTS_MIN)
768		{
769	<	recalc_fdlimit(NULL);
769	>	char buf[IRCD_BUFSIZE];
770
771	<	if ($3 < MAXCLIENTS_MIN)
772	<	{
773	<	char buf[IRCD_BUFSIZE];
774	<	ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
775	<	yyerror(buf);
776	<	}
777	<	else if ($3 > MAXCLIENTS_MAX)
778	<	{
779	<	char buf[IRCD_BUFSIZE];
780	<	ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
781	<	yyerror(buf);
782	<	}
783	<	else
784	<	ServerInfo.max_clients = $3;
771	>	snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
772	>	conf_error_report(buf);
773	>	ServerInfo.max_clients = MAXCLIENTS_MIN;
774	>	}
775	>	else if ($3 > MAXCLIENTS_MAX)
776	>	{
777	>	char buf[IRCD_BUFSIZE];
778	>
779	>	snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
780	>	conf_error_report(buf);
781	>	ServerInfo.max_clients = MAXCLIENTS_MAX;
782	>	}
783	>	else
784	>	ServerInfo.max_clients = $3;
785	>	};
786	>
787	>	serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
788	>	{
789	>	if (conf_parser_ctx.pass != 2)
790	>	break;
791	>
792	>	if ($3 < 9)
793	>	{
794	>	conf_error_report("max_nick_length too low, setting to 9");
795	>	ServerInfo.max_nick_length = 9;
796	>	}
797	>	else if ($3 > NICKLEN)
798	>	{
799	>	char buf[IRCD_BUFSIZE];
800	>
801	>	snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
802	>	conf_error_report(buf);
803	>	ServerInfo.max_nick_length = NICKLEN;
804	>	}
805	>	else
806	>	ServerInfo.max_nick_length = $3;
807	>	};
808	>
809	>	serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
810	>	{
811	>	if (conf_parser_ctx.pass != 2)
812	>	break;
813	>
814	>	if ($3 < 80)
815	>	{
816	>	conf_error_report("max_topic_length too low, setting to 80");
817	>	ServerInfo.max_topic_length = 80;
818	>	}
819	>	else if ($3 > TOPICLEN)
820	>	{
821	>	char buf[IRCD_BUFSIZE];
822	>
823	>	snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
824	>	conf_error_report(buf);
825	>	ServerInfo.max_topic_length = TOPICLEN;
826		}
827	+	else
828	+	ServerInfo.max_topic_length = $3;
829		};
830
831		serverinfo_hub: HUB '=' TBOOL ';'
#	Line 783 | Line 848 | admin_name: NAME '=' QSTRING ';'
848		if (conf_parser_ctx.pass == 2)
849		{
850		MyFree(AdminInfo.name);
851	<	DupString(AdminInfo.name, yylval.string);
851	>	AdminInfo.name = xstrdup(yylval.string);
852		}
853		};
854
#	Line 792 | Line 857 | admin_email: EMAIL '=' QSTRING ';'
857		if (conf_parser_ctx.pass == 2)
858		{
859		MyFree(AdminInfo.email);
860	<	DupString(AdminInfo.email, yylval.string);
860	>	AdminInfo.email = xstrdup(yylval.string);
861		}
862		};
863
#	Line 801 | Line 866 | admin_description: DESCRIPTION '=' QSTRI
866		if (conf_parser_ctx.pass == 2)
867		{
868		MyFree(AdminInfo.description);
869	<	DupString(AdminInfo.description, yylval.string);
869	>	AdminInfo.description = xstrdup(yylval.string);
870		}
871		};
872
#	Line 822 | Line 887 | logging_use_logging: USE_LOGGING '=' TBO
887
888		logging_file_entry:
889		{
890	<	lfile[0] = '\0';
891	<	ltype = 0;
827	<	lsize = 0;
890	>	if (conf_parser_ctx.pass == 2)
891	>	reset_block_state();
892		} T_FILE  '{' logging_file_items '}' ';'
893		{
894	<	if (conf_parser_ctx.pass == 2 && ltype > 0)
895	<	log_add_file(ltype, lsize, lfile);
894	>	if (conf_parser_ctx.pass != 2)
895	>	break;
896	>
897	>	if (block_state.type.value && block_state.file.buf[0])
898	>	log_set_file(block_state.type.value, block_state.size.value,
899	>	block_state.file.buf);
900		};
901
902		logging_file_items: logging_file_items logging_file_item |
#	Line 839 | Line 907 | logging_file_item:  logging_file_name |
907
908		logging_file_name: NAME '=' QSTRING ';'
909		{
910	<	strlcpy(lfile, yylval.string, sizeof(lfile));
910	>	if (conf_parser_ctx.pass != 2)
911	>	break;
912	>
913	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
914		}
915
916		logging_file_size: T_SIZE '=' sizespec ';'
917		{
918	<	lsize = $3;
918	>	block_state.size.value = $3;
919		} | T_SIZE '=' T_UNLIMITED ';'
920		{
921	<	lsize = 0;
921	>	block_state.size.value = 0;
922		};
923
924		logging_file_type: TYPE
925		{
926		if (conf_parser_ctx.pass == 2)
927	<	ltype = 0;
927	>	block_state.type.value = 0;
928		} '='  logging_file_type_items ';' ;
929
930		logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
931		logging_file_type_item:  USER
932		{
933		if (conf_parser_ctx.pass == 2)
934	<	ltype = LOG_TYPE_USER;
934	>	block_state.type.value = LOG_TYPE_USER;
935		} | OPERATOR
936		{
937		if (conf_parser_ctx.pass == 2)
938	<	ltype = LOG_TYPE_OPER;
938	>	block_state.type.value = LOG_TYPE_OPER;
939		} | GLINE
940		{
941		if (conf_parser_ctx.pass == 2)
942	<	ltype = LOG_TYPE_GLINE;
942	>	block_state.type.value = LOG_TYPE_GLINE;
943		} | T_DLINE
944		{
945		if (conf_parser_ctx.pass == 2)
946	<	ltype = LOG_TYPE_DLINE;
946	>	block_state.type.value = LOG_TYPE_DLINE;
947		} | KLINE
948		{
949		if (conf_parser_ctx.pass == 2)
950	<	ltype = LOG_TYPE_KLINE;
950	>	block_state.type.value = LOG_TYPE_KLINE;
951		} | KILL
952		{
953		if (conf_parser_ctx.pass == 2)
954	<	ltype = LOG_TYPE_KILL;
954	>	block_state.type.value = LOG_TYPE_KILL;
955		} | T_DEBUG
956		{
957		if (conf_parser_ctx.pass == 2)
958	<	ltype = LOG_TYPE_DEBUG;
958	>	block_state.type.value = LOG_TYPE_DEBUG;
959		};
960
961
#	Line 893 | Line 964 | logging_file_type_item:  USER
964		***************************************************************************/
965		oper_entry: OPERATOR
966		{
967	<	if (conf_parser_ctx.pass == 2)
968	<	{
969	<	yy_conf = make_conf_item(OPER_TYPE);
970	<	yy_aconf = map_to_conf(yy_conf);
971	<	SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
901	<	}
902	<	else
903	<	{
904	<	MyFree(class_name);
905	<	class_name = NULL;
906	<	}
967	>	if (conf_parser_ctx.pass != 2)
968	>	break;
969	>
970	>	reset_block_state();
971	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
972		} '{' oper_items '}' ';'
973		{
974	<	if (conf_parser_ctx.pass == 2)
910	<	{
911	<	struct CollectItem *yy_tmp;
912	<	dlink_node *ptr;
913	<	dlink_node *next_ptr;
974	>	dlink_node *ptr = NULL;
975
976	<	conf_add_class_to_conf(yy_conf, class_name);
976	>	if (conf_parser_ctx.pass != 2)
977	>	break;
978
979	<	/* Now, make sure there is a copy of the "base" given oper
980	<	* block in each of the collected copies
981	<	*/
979	>	if (!block_state.name.buf[0])
980	>	break;
981	>	#ifdef HAVE_LIBCRYPTO
982	>	if (!(block_state.file.buf[0] ||
983	>	block_state.rpass.buf[0]))
984	>	break;
985	>	#else
986	>	if (!block_state.rpass.buf[0])
987	>	break;
988	>	#endif
989
990	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
991	<	{
992	<	struct AccessItem *new_aconf;
993	<	struct ConfItem *new_conf;
925	<	yy_tmp = ptr->data;
926	<
927	<	new_conf = make_conf_item(OPER_TYPE);
928	<	new_aconf = (struct AccessItem *)map_to_conf(new_conf);
929	<
930	<	new_aconf->flags = yy_aconf->flags;
931	<
932	<	if (yy_conf->name != NULL)
933	<	DupString(new_conf->name, yy_conf->name);
934	<	if (yy_tmp->user != NULL)
935	<	DupString(new_aconf->user, yy_tmp->user);
936	<	else
937	<	DupString(new_aconf->user, "*");
938	<	if (yy_tmp->host != NULL)
939	<	DupString(new_aconf->host, yy_tmp->host);
940	<	else
941	<	DupString(new_aconf->host, "*");
942	<
943	<	new_aconf->type = parse_netmask(new_aconf->host, &new_aconf->addr,
944	<	&new_aconf->bits);
945	<
946	<	conf_add_class_to_conf(new_conf, class_name);
947	<	if (yy_aconf->passwd != NULL)
948	<	DupString(new_aconf->passwd, yy_aconf->passwd);
990	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
991	>	{
992	>	struct MaskItem *conf = NULL;
993	>	struct split_nuh_item nuh;
994
995	<	new_aconf->port = yy_aconf->port;
996	<	#ifdef HAVE_LIBCRYPTO
997	<	if (yy_aconf->rsa_public_key_file != NULL)
998	<	{
999	<	BIO *file;
995	>	nuh.nuhmask  = ptr->data;
996	>	nuh.nickptr  = NULL;
997	>	nuh.userptr  = block_state.user.buf;
998	>	nuh.hostptr  = block_state.host.buf;
999	>	nuh.nicksize = 0;
1000	>	nuh.usersize = sizeof(block_state.user.buf);
1001	>	nuh.hostsize = sizeof(block_state.host.buf);
1002	>	split_nuh(&nuh);
1003
1004	<	DupString(new_aconf->rsa_public_key_file,
1005	<	yy_aconf->rsa_public_key_file);
1004	>	conf        = conf_make(CONF_OPER);
1005	>	conf->name  = xstrdup(block_state.name.buf);
1006	>	conf->user  = xstrdup(block_state.user.buf);
1007	>	conf->host  = xstrdup(block_state.host.buf);
1008	>
1009	>	if (block_state.rpass.buf[0])
1010	>	conf->passwd = xstrdup(block_state.rpass.buf);
1011	>
1012	>	conf->flags = block_state.flags.value;
1013	>	conf->modes = block_state.modes.value;
1014	>	conf->port  = block_state.port.value;
1015	>	conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
1016
1017	<	file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
960	<	new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
961	<	NULL, 0, NULL);
962	<	BIO_set_close(file, BIO_CLOSE);
963	<	BIO_free(file);
964	<	}
965	<	#endif
1017	>	conf_add_class_to_conf(conf, block_state.class.buf);
1018
1019		#ifdef HAVE_LIBCRYPTO
1020	<	if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
1021	<	&& yy_tmp->host)
1022	<	#else
1023	<	if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
1024	<	#endif
1020	>	if (block_state.file.buf[0])
1021	>	{
1022	>	BIO *file = NULL;
1023	>	RSA *pkey = NULL;
1024	>
1025	>	if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
1026		{
1027	<	conf_add_class_to_conf(new_conf, class_name);
1028	<	if (yy_tmp->name != NULL)
976	<	DupString(new_conf->name, yy_tmp->name);
1027	>	conf_error_report("Ignoring rsa_public_key_file -- file doesn't exist");
1028	>	break;
1029		}
1030
1031	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1032	<	free_collect_item(yy_tmp);
981	<	}
982	<
983	<	yy_conf = NULL;
984	<	yy_aconf = NULL;
985	<
1031	>	if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
1032	>	conf_error_report("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1033
1034	<	MyFree(class_name);
1035	<	class_name = NULL;
1034	>	conf->rsa_public_key = pkey;
1035	>	BIO_set_close(file, BIO_CLOSE);
1036	>	BIO_free(file);
1037	>	}
1038	>	#endif /* HAVE_LIBCRYPTO */
1039		}
1040	<	};
1040	>	};
1041
1042		oper_items:     oper_items oper_item | oper_item;
1043		oper_item:      oper_name | oper_user | oper_password |
#	Line 997 | Line 1047 | oper_item:      oper_name | oper_user |
1047		oper_name: NAME '=' QSTRING ';'
1048		{
1049		if (conf_parser_ctx.pass == 2)
1050	<	{
1001	<	MyFree(yy_conf->name);
1002	<	DupString(yy_conf->name, yylval.string);
1003	<	}
1050	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1051		};
1052
1053		oper_user: USER '=' QSTRING ';'
1054		{
1055		if (conf_parser_ctx.pass == 2)
1056	<	{
1010	<	struct split_nuh_item nuh;
1011	<
1012	<	nuh.nuhmask  = yylval.string;
1013	<	nuh.nickptr  = NULL;
1014	<	nuh.userptr  = userbuf;
1015	<	nuh.hostptr  = hostbuf;
1016	<
1017	<	nuh.nicksize = 0;
1018	<	nuh.usersize = sizeof(userbuf);
1019	<	nuh.hostsize = sizeof(hostbuf);
1020	<
1021	<	split_nuh(&nuh);
1022	<
1023	<	if (yy_aconf->user == NULL)
1024	<	{
1025	<	DupString(yy_aconf->user, userbuf);
1026	<	DupString(yy_aconf->host, hostbuf);
1027	<
1028	<	yy_aconf->type = parse_netmask(yy_aconf->host, &yy_aconf->addr,
1029	<	&yy_aconf->bits);
1030	<	}
1031	<	else
1032	<	{
1033	<	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
1034	<
1035	<	DupString(yy_tmp->user, userbuf);
1036	<	DupString(yy_tmp->host, hostbuf);
1037	<
1038	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1039	<	}
1040	<	}
1056	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1057		};
1058
1059		oper_password: PASSWORD '=' QSTRING ';'
1060		{
1061		if (conf_parser_ctx.pass == 2)
1062	<	{
1047	<	if (yy_aconf->passwd != NULL)
1048	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1049	<
1050	<	MyFree(yy_aconf->passwd);
1051	<	DupString(yy_aconf->passwd, yylval.string);
1052	<	}
1062	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1063		};
1064
1065		oper_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 1057 | Line 1067 | oper_encrypted: ENCRYPTED '=' TBOOL ';'
1067		if (conf_parser_ctx.pass == 2)
1068		{
1069		if (yylval.number)
1070	<	SetConfEncrypted(yy_aconf);
1070	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1071		else
1072	<	ClearConfEncrypted(yy_aconf);
1072	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1073		}
1074		};
1075
1076		oper_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
1077		{
1068	–	#ifdef HAVE_LIBCRYPTO
1078		if (conf_parser_ctx.pass == 2)
1079	<	{
1071	<	BIO *file;
1072	<
1073	<	if (yy_aconf->rsa_public_key != NULL)
1074	<	{
1075	<	RSA_free(yy_aconf->rsa_public_key);
1076	<	yy_aconf->rsa_public_key = NULL;
1077	<	}
1078	<
1079	<	if (yy_aconf->rsa_public_key_file != NULL)
1080	<	{
1081	<	MyFree(yy_aconf->rsa_public_key_file);
1082	<	yy_aconf->rsa_public_key_file = NULL;
1083	<	}
1084	<
1085	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
1086	<	file = BIO_new_file(yylval.string, "r");
1087	<
1088	<	if (file == NULL)
1089	<	{
1090	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
1091	<	break;
1092	<	}
1093	<
1094	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
1095	<
1096	<	if (yy_aconf->rsa_public_key == NULL)
1097	<	{
1098	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1099	<	break;
1100	<	}
1101	<
1102	<	BIO_set_close(file, BIO_CLOSE);
1103	<	BIO_free(file);
1104	<	}
1105	<	#endif /* HAVE_LIBCRYPTO */
1079	>	strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
1080		};
1081
1082		oper_class: CLASS '=' QSTRING ';'
1083		{
1084		if (conf_parser_ctx.pass == 2)
1085	<	{
1112	<	MyFree(class_name);
1113	<	DupString(class_name, yylval.string);
1114	<	}
1085	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1086		};
1087
1088		oper_umodes: T_UMODES
1089		{
1090		if (conf_parser_ctx.pass == 2)
1091	<	yy_aconf->modes = 0;
1091	>	block_state.modes.value = 0;
1092		} '='  oper_umodes_items ';' ;
1093
1094		oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1095		oper_umodes_item:  T_BOTS
1096		{
1097		if (conf_parser_ctx.pass == 2)
1098	<	yy_aconf->modes |= UMODE_BOTS;
1098	>	block_state.modes.value |= UMODE_BOTS;
1099		} | T_CCONN
1100		{
1101		if (conf_parser_ctx.pass == 2)
1102	<	yy_aconf->modes |= UMODE_CCONN;
1102	>	block_state.modes.value |= UMODE_CCONN;
1103		} | T_CCONN_FULL
1104		{
1105		if (conf_parser_ctx.pass == 2)
1106	<	yy_aconf->modes |= UMODE_CCONN_FULL;
1106	>	block_state.modes.value |= UMODE_CCONN_FULL;
1107		} | T_DEAF
1108		{
1109		if (conf_parser_ctx.pass == 2)
1110	<	yy_aconf->modes |= UMODE_DEAF;
1110	>	block_state.modes.value |= UMODE_DEAF;
1111		} | T_DEBUG
1112		{
1113		if (conf_parser_ctx.pass == 2)
1114	<	yy_aconf->modes |= UMODE_DEBUG;
1114	>	block_state.modes.value |= UMODE_DEBUG;
1115		} | T_FULL
1116		{
1117		if (conf_parser_ctx.pass == 2)
1118	<	yy_aconf->modes |= UMODE_FULL;
1118	>	block_state.modes.value |= UMODE_FULL;
1119		} | HIDDEN
1120		{
1121		if (conf_parser_ctx.pass == 2)
1122	<	yy_aconf->modes |= UMODE_HIDDEN;
1122	>	block_state.modes.value |= UMODE_HIDDEN;
1123		} | T_SKILL
1124		{
1125		if (conf_parser_ctx.pass == 2)
1126	<	yy_aconf->modes |= UMODE_SKILL;
1126	>	block_state.modes.value |= UMODE_SKILL;
1127		} | T_NCHANGE
1128		{
1129		if (conf_parser_ctx.pass == 2)
1130	<	yy_aconf->modes |= UMODE_NCHANGE;
1130	>	block_state.modes.value |= UMODE_NCHANGE;
1131		} | T_REJ
1132		{
1133		if (conf_parser_ctx.pass == 2)
1134	<	yy_aconf->modes |= UMODE_REJ;
1134	>	block_state.modes.value |= UMODE_REJ;
1135		} | T_UNAUTH
1136		{
1137		if (conf_parser_ctx.pass == 2)
1138	<	yy_aconf->modes |= UMODE_UNAUTH;
1138	>	block_state.modes.value |= UMODE_UNAUTH;
1139		} | T_SPY
1140		{
1141		if (conf_parser_ctx.pass == 2)
1142	<	yy_aconf->modes |= UMODE_SPY;
1142	>	block_state.modes.value |= UMODE_SPY;
1143		} | T_EXTERNAL
1144		{
1145		if (conf_parser_ctx.pass == 2)
1146	<	yy_aconf->modes |= UMODE_EXTERNAL;
1146	>	block_state.modes.value |= UMODE_EXTERNAL;
1147		} | T_OPERWALL
1148		{
1149		if (conf_parser_ctx.pass == 2)
1150	<	yy_aconf->modes |= UMODE_OPERWALL;
1150	>	block_state.modes.value |= UMODE_OPERWALL;
1151		} | T_SERVNOTICE
1152		{
1153		if (conf_parser_ctx.pass == 2)
1154	<	yy_aconf->modes |= UMODE_SERVNOTICE;
1154	>	block_state.modes.value |= UMODE_SERVNOTICE;
1155		} | T_INVISIBLE
1156		{
1157		if (conf_parser_ctx.pass == 2)
1158	<	yy_aconf->modes |= UMODE_INVISIBLE;
1158	>	block_state.modes.value |= UMODE_INVISIBLE;
1159		} | T_WALLOP
1160		{
1161		if (conf_parser_ctx.pass == 2)
1162	<	yy_aconf->modes |= UMODE_WALLOP;
1162	>	block_state.modes.value |= UMODE_WALLOP;
1163		} | T_SOFTCALLERID
1164		{
1165		if (conf_parser_ctx.pass == 2)
1166	<	yy_aconf->modes |= UMODE_SOFTCALLERID;
1166	>	block_state.modes.value |= UMODE_SOFTCALLERID;
1167		} | T_CALLERID
1168		{
1169		if (conf_parser_ctx.pass == 2)
1170	<	yy_aconf->modes |= UMODE_CALLERID;
1170	>	block_state.modes.value |= UMODE_CALLERID;
1171		} | T_LOCOPS
1172		{
1173		if (conf_parser_ctx.pass == 2)
1174	<	yy_aconf->modes |= UMODE_LOCOPS;
1174	>	block_state.modes.value |= UMODE_LOCOPS;
1175	>	} | T_NONONREG
1176	>	{
1177	>	if (conf_parser_ctx.pass == 2)
1178	>	block_state.modes.value |= UMODE_REGONLY;
1179		};
1180
1181		oper_flags: IRCD_FLAGS
1182		{
1183		if (conf_parser_ctx.pass == 2)
1184	<	yy_aconf->port = 0;
1184	>	block_state.port.value = 0;
1185		} '='  oper_flags_items ';';
1186
1187		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1188		oper_flags_item: GLOBAL_KILL
1189		{
1190		if (conf_parser_ctx.pass == 2)
1191	<	yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1191	>	block_state.port.value |= OPER_FLAG_GLOBAL_KILL;
1192		} | REMOTE
1193		{
1194		if (conf_parser_ctx.pass == 2)
1195	<	yy_aconf->port |= OPER_FLAG_REMOTE;
1195	>	block_state.port.value |= OPER_FLAG_REMOTE;
1196		} | KLINE
1197		{
1198		if (conf_parser_ctx.pass == 2)
1199	<	yy_aconf->port |= OPER_FLAG_K;
1199	>	block_state.port.value |= OPER_FLAG_K;
1200		} | UNKLINE
1201		{
1202		if (conf_parser_ctx.pass == 2)
1203	<	yy_aconf->port |= OPER_FLAG_UNKLINE;
1203	>	block_state.port.value |= OPER_FLAG_UNKLINE;
1204		} | T_DLINE
1205		{
1206		if (conf_parser_ctx.pass == 2)
1207	<	yy_aconf->port |= OPER_FLAG_DLINE;
1207	>	block_state.port.value |= OPER_FLAG_DLINE;
1208		} | T_UNDLINE
1209		{
1210		if (conf_parser_ctx.pass == 2)
1211	<	yy_aconf->port |= OPER_FLAG_UNDLINE;
1211	>	block_state.port.value |= OPER_FLAG_UNDLINE;
1212		} | XLINE
1213		{
1214		if (conf_parser_ctx.pass == 2)
1215	<	yy_aconf->port |= OPER_FLAG_X;
1215	>	block_state.port.value |= OPER_FLAG_X;
1216		} | GLINE
1217		{
1218		if (conf_parser_ctx.pass == 2)
1219	<	yy_aconf->port |= OPER_FLAG_GLINE;
1219	>	block_state.port.value |= OPER_FLAG_GLINE;
1220		} | DIE
1221		{
1222		if (conf_parser_ctx.pass == 2)
1223	<	yy_aconf->port |= OPER_FLAG_DIE;
1223	>	block_state.port.value |= OPER_FLAG_DIE;
1224		} | T_RESTART
1225		{
1226		if (conf_parser_ctx.pass == 2)
1227	<	yy_aconf->port |= OPER_FLAG_RESTART;
1227	>	block_state.port.value |= OPER_FLAG_RESTART;
1228		} | REHASH
1229		{
1230		if (conf_parser_ctx.pass == 2)
1231	<	yy_aconf->port |= OPER_FLAG_REHASH;
1231	>	block_state.port.value |= OPER_FLAG_REHASH;
1232		} | ADMIN
1233		{
1234		if (conf_parser_ctx.pass == 2)
1235	<	yy_aconf->port |= OPER_FLAG_ADMIN;
1261	<	} | NICK_CHANGES
1262	<	{
1263	<	if (conf_parser_ctx.pass == 2)
1264	<	yy_aconf->port |= OPER_FLAG_N;
1235	>	block_state.port.value |= OPER_FLAG_ADMIN;
1236		} | T_OPERWALL
1237		{
1238		if (conf_parser_ctx.pass == 2)
1239	<	yy_aconf->port |= OPER_FLAG_OPERWALL;
1239	>	block_state.port.value |= OPER_FLAG_OPERWALL;
1240		} | T_GLOBOPS
1241		{
1242		if (conf_parser_ctx.pass == 2)
1243	<	yy_aconf->port |= OPER_FLAG_GLOBOPS;
1243	>	block_state.port.value |= OPER_FLAG_GLOBOPS;
1244		} | OPER_SPY_T
1245		{
1246		if (conf_parser_ctx.pass == 2)
1247	<	yy_aconf->port |= OPER_FLAG_OPER_SPY;
1247	>	block_state.port.value |= OPER_FLAG_OPER_SPY;
1248		} | REMOTEBAN
1249		{
1250		if (conf_parser_ctx.pass == 2)
1251	<	yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1251	>	block_state.port.value |= OPER_FLAG_REMOTEBAN;
1252		} | T_SET
1253		{
1254		if (conf_parser_ctx.pass == 2)
1255	<	yy_aconf->port |= OPER_FLAG_SET;
1255	>	block_state.port.value |= OPER_FLAG_SET;
1256		} | MODULE
1257		{
1258		if (conf_parser_ctx.pass == 2)
1259	<	yy_aconf->port |= OPER_FLAG_MODULE;
1259	>	block_state.port.value |= OPER_FLAG_MODULE;
1260		};
1261
1262
#	Line 1294 | Line 1265 | oper_flags_item: GLOBAL_KILL
1265		***************************************************************************/
1266		class_entry: CLASS
1267		{
1268	<	if (conf_parser_ctx.pass == 1)
1269	<	{
1299	<	yy_conf = make_conf_item(CLASS_TYPE);
1300	<	yy_class = map_to_conf(yy_conf);
1301	<	}
1302	<	} '{' class_items '}' ';'
1303	<	{
1304	<	if (conf_parser_ctx.pass == 1)
1305	<	{
1306	<	struct ConfItem *cconf = NULL;
1307	<	struct ClassItem *class = NULL;
1308	<
1309	<	if (yy_class_name == NULL)
1310	<	delete_conf_item(yy_conf);
1311	<	else
1312	<	{
1313	<	cconf = find_exact_name_conf(CLASS_TYPE, NULL, yy_class_name, NULL, NULL);
1268	>	if (conf_parser_ctx.pass != 1)
1269	>	break;
1270
1271	<	if (cconf != NULL)                /* The class existed already */
1316	<	{
1317	<	int user_count = 0;
1318	<
1319	<	rebuild_cidr_class(cconf, yy_class);
1271	>	reset_block_state();
1272
1273	<	class = map_to_conf(cconf);
1273	>	block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1274	>	block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1275	>	block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1276	>	block_state.max_sendq.value = DEFAULT_SENDQ;
1277	>	block_state.max_recvq.value = DEFAULT_RECVQ;
1278	>	} '{' class_items '}' ';'
1279	>	{
1280	>	struct ClassItem *class = NULL;
1281
1282	<	user_count = class->curr_user_count;
1283	<	memcpy(class, yy_class, sizeof(*class));
1325	<	class->curr_user_count = user_count;
1326	<	class->active = 1;
1282	>	if (conf_parser_ctx.pass != 1)
1283	>	break;
1284
1285	<	delete_conf_item(yy_conf);
1285	>	if (!block_state.class.buf[0])
1286	>	break;
1287
1288	<	MyFree(cconf->name);            /* Allows case change of class name */
1289	<	cconf->name = yy_class_name;
1290	<	}
1291	<	else      /* Brand new class */
1292	<	{
1293	<	MyFree(yy_conf->name);          /* just in case it was allocated */
1294	<	yy_conf->name = yy_class_name;
1295	<	yy_class->active = 1;
1296	<	}
1297	<	}
1298	<
1299	<	yy_class_name = NULL;
1300	<	}
1288	>	if (!(class = class_find(block_state.class.buf, 0)))
1289	>	class = class_make();
1290	>
1291	>	class->active = 1;
1292	>	MyFree(class->name);
1293	>	class->name = xstrdup(block_state.class.buf);
1294	>	class->ping_freq = block_state.ping_freq.value;
1295	>	class->max_perip = block_state.max_perip.value;
1296	>	class->con_freq = block_state.con_freq.value;
1297	>	class->max_total = block_state.max_total.value;
1298	>	class->max_global = block_state.max_global.value;
1299	>	class->max_local = block_state.max_local.value;
1300	>	class->max_ident = block_state.max_ident.value;
1301	>	class->max_sendq = block_state.max_sendq.value;
1302	>	class->max_recvq = block_state.max_recvq.value;
1303	>
1304	>	if (block_state.min_idle.value > block_state.max_idle.value)
1305	>	{
1306	>	block_state.min_idle.value = 0;
1307	>	block_state.max_idle.value = 0;
1308	>	block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
1309	>	}
1310	>
1311	>	class->flags = block_state.flags.value;
1312	>	class->min_idle = block_state.min_idle.value;
1313	>	class->max_idle = block_state.max_idle.value;
1314	>
1315	>	if (class->number_per_cidr && block_state.number_per_cidr.value)
1316	>	if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
1317	>	(class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.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	>	rebuild_cidr_list(class);
1321	>
1322	>	class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1323	>	class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1324	>	class->number_per_cidr = block_state.number_per_cidr.value;
1325		};
1326
1327		class_items:    class_items class_item | class_item;
1328		class_item:     class_name |
1329		class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1330		class_ping_time |
1349	–	class_ping_warning |
1331		class_number_per_cidr |
1332		class_number_per_ip |
1333		class_connectfreq |
#	Line 1354 | Line 1335 | class_item:     class_name |
1335		class_max_global |
1336		class_max_local |
1337		class_max_ident |
1338	<	class_sendq |
1338	>	class_sendq | class_recvq |
1339	>	class_min_idle |
1340	>	class_max_idle |
1341	>	class_flags |
1342		error ';' ;
1343
1344		class_name: NAME '=' QSTRING ';'
1345		{
1346		if (conf_parser_ctx.pass == 1)
1347	<	{
1364	<	MyFree(yy_class_name);
1365	<	DupString(yy_class_name, yylval.string);
1366	<	}
1347	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1348		};
1349
1350		class_ping_time: PING_TIME '=' timespec ';'
1351		{
1352		if (conf_parser_ctx.pass == 1)
1353	<	yy_class->ping_freq = $3;
1373	<	};
1374	<
1375	<	class_ping_warning: PING_WARNING '=' timespec ';'
1376	<	{
1377	<	if (conf_parser_ctx.pass == 1)
1378	<	yy_class->ping_warning = $3;
1353	>	block_state.ping_freq.value = $3;
1354		};
1355
1356		class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1357		{
1358		if (conf_parser_ctx.pass == 1)
1359	<	yy_class->max_perip = $3;
1359	>	block_state.max_perip.value = $3;
1360		};
1361
1362		class_connectfreq: CONNECTFREQ '=' timespec ';'
1363		{
1364		if (conf_parser_ctx.pass == 1)
1365	<	yy_class->con_freq = $3;
1365	>	block_state.con_freq.value = $3;
1366		};
1367
1368		class_max_number: MAX_NUMBER '=' NUMBER ';'
1369		{
1370		if (conf_parser_ctx.pass == 1)
1371	<	yy_class->max_total = $3;
1371	>	block_state.max_total.value = $3;
1372		};
1373
1374		class_max_global: MAX_GLOBAL '=' NUMBER ';'
1375		{
1376		if (conf_parser_ctx.pass == 1)
1377	<	yy_class->max_global = $3;
1377	>	block_state.max_global.value = $3;
1378		};
1379
1380		class_max_local: MAX_LOCAL '=' NUMBER ';'
1381		{
1382		if (conf_parser_ctx.pass == 1)
1383	<	yy_class->max_local = $3;
1383	>	block_state.max_local.value = $3;
1384		};
1385
1386		class_max_ident: MAX_IDENT '=' NUMBER ';'
1387		{
1388		if (conf_parser_ctx.pass == 1)
1389	<	yy_class->max_ident = $3;
1389	>	block_state.max_ident.value = $3;
1390		};
1391
1392		class_sendq: SENDQ '=' sizespec ';'
1393		{
1394		if (conf_parser_ctx.pass == 1)
1395	<	yy_class->max_sendq = $3;
1395	>	block_state.max_sendq.value = $3;
1396	>	};
1397	>
1398	>	class_recvq: T_RECVQ '=' sizespec ';'
1399	>	{
1400	>	if (conf_parser_ctx.pass == 1)
1401	>	if ($3 >= CLIENT_FLOOD_MIN && $3 <= CLIENT_FLOOD_MAX)
1402	>	block_state.max_recvq.value = $3;
1403		};
1404
1405		class_cidr_bitlen_ipv4: CIDR_BITLEN_IPV4 '=' NUMBER ';'
1406		{
1407		if (conf_parser_ctx.pass == 1)
1408	<	yy_class->cidr_bitlen_ipv4 = $3 > 32 ? 32 : $3;
1408	>	block_state.cidr_bitlen_ipv4.value = $3 > 32 ? 32 : $3;
1409		};
1410
1411		class_cidr_bitlen_ipv6: CIDR_BITLEN_IPV6 '=' NUMBER ';'
1412		{
1413		if (conf_parser_ctx.pass == 1)
1414	<	yy_class->cidr_bitlen_ipv6 = $3 > 128 ? 128 : $3;
1414	>	block_state.cidr_bitlen_ipv6.value = $3 > 128 ? 128 : $3;
1415		};
1416
1417		class_number_per_cidr: NUMBER_PER_CIDR '=' NUMBER ';'
1418		{
1419		if (conf_parser_ctx.pass == 1)
1420	<	yy_class->number_per_cidr = $3;
1420	>	block_state.number_per_cidr.value = $3;
1421		};
1422
1423	+	class_min_idle: MIN_IDLE '=' timespec ';'
1424	+	{
1425	+	if (conf_parser_ctx.pass != 1)
1426	+	break;
1427	+
1428	+	block_state.min_idle.value = $3;
1429	+	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1430	+	};
1431	+
1432	+	class_max_idle: MAX_IDLE '=' timespec ';'
1433	+	{
1434	+	if (conf_parser_ctx.pass != 1)
1435	+	break;
1436	+
1437	+	block_state.max_idle.value = $3;
1438	+	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1439	+	};
1440	+
1441	+	class_flags: IRCD_FLAGS
1442	+	{
1443	+	if (conf_parser_ctx.pass == 1)
1444	+	block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1445	+	} '='  class_flags_items ';';
1446	+
1447	+	class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1448	+	class_flags_item: RANDOM_IDLE
1449	+	{
1450	+	if (conf_parser_ctx.pass == 1)
1451	+	block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
1452	+	} | HIDE_IDLE_FROM_OPERS
1453	+	{
1454	+	if (conf_parser_ctx.pass == 1)
1455	+	block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
1456	+	};
1457	+
1458	+
1459		/***************************************************************************
1460		*  section listen
1461		***************************************************************************/
1462		listen_entry: LISTEN
1463		{
1464		if (conf_parser_ctx.pass == 2)
1465	<	{
1466	<	listener_address = NULL;
1449	<	listener_flags = 0;
1450	<	}
1451	<	} '{' listen_items '}' ';'
1452	<	{
1453	<	if (conf_parser_ctx.pass == 2)
1454	<	{
1455	<	MyFree(listener_address);
1456	<	listener_address = NULL;
1457	<	}
1458	<	};
1465	>	reset_block_state();
1466	>	} '{' listen_items '}' ';';
1467
1468		listen_flags: IRCD_FLAGS
1469		{
1470	<	listener_flags = 0;
1470	>	block_state.flags.value = 0;
1471		} '='  listen_flags_items ';';
1472
1473		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1474		listen_flags_item: T_SSL
1475		{
1476		if (conf_parser_ctx.pass == 2)
1477	<	listener_flags |= LISTENER_SSL;
1477	>	block_state.flags.value |= LISTENER_SSL;
1478		} | HIDDEN
1479		{
1480		if (conf_parser_ctx.pass == 2)
1481	<	listener_flags |= LISTENER_HIDDEN;
1481	>	block_state.flags.value |= LISTENER_HIDDEN;
1482		} | T_SERVER
1483		{
1484		if (conf_parser_ctx.pass == 2)
1485	<	listener_flags |= LISTENER_SERVER;
1485	>	block_state.flags.value |= LISTENER_SERVER;
1486		};
1487
1480	–
1481	–
1488		listen_items:   listen_items listen_item | listen_item;
1489		listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';';
1490
1491	<	listen_port: PORT '=' port_items { listener_flags = 0; } ';';
1491	>	listen_port: PORT '=' port_items { block_state.flags.value = 0; } ';';
1492
1493		port_items: port_items ',' port_item | port_item;
1494
#	Line 1490 | Line 1496 | port_item: NUMBER
1496		{
1497		if (conf_parser_ctx.pass == 2)
1498		{
1499	<	if ((listener_flags & LISTENER_SSL))
1499	>	if (block_state.flags.value & LISTENER_SSL)
1500		#ifdef HAVE_LIBCRYPTO
1501		if (!ServerInfo.server_ctx)
1502		#endif
1503		{
1504	<	yyerror("SSL not available - port closed");
1504	>	conf_error_report("SSL not available - port closed");
1505		break;
1506		}
1507	<	add_listener($1, listener_address, listener_flags);
1507	>	add_listener($1, block_state.addr.buf, block_state.flags.value);
1508		}
1509		} | NUMBER TWODOTS NUMBER
1510		{
#	Line 1506 | Line 1512 | port_item: NUMBER
1512		{
1513		int i;
1514
1515	<	if ((listener_flags & LISTENER_SSL))
1515	>	if (block_state.flags.value & LISTENER_SSL)
1516		#ifdef HAVE_LIBCRYPTO
1517		if (!ServerInfo.server_ctx)
1518		#endif
1519		{
1520	<	yyerror("SSL not available - port closed");
1520	>	conf_error_report("SSL not available - port closed");
1521		break;
1522		}
1523
1524		for (i = $1; i <= $3; ++i)
1525	<	add_listener(i, listener_address, listener_flags);
1525	>	add_listener(i, block_state.addr.buf, block_state.flags.value);
1526		}
1527		};
1528
1529		listen_address: IP '=' QSTRING ';'
1530		{
1531		if (conf_parser_ctx.pass == 2)
1532	<	{
1527	<	MyFree(listener_address);
1528	<	DupString(listener_address, yylval.string);
1529	<	}
1532	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1533		};
1534
1535		listen_host: HOST '=' QSTRING ';'
1536		{
1537		if (conf_parser_ctx.pass == 2)
1538	<	{
1536	<	MyFree(listener_address);
1537	<	DupString(listener_address, yylval.string);
1538	<	}
1538	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1539		};
1540
1541		/***************************************************************************
#	Line 1544 | Line 1544 | listen_host: HOST '=' QSTRING ';'
1544		auth_entry: IRCD_AUTH
1545		{
1546		if (conf_parser_ctx.pass == 2)
1547	<	{
1548	<	yy_conf = make_conf_item(CLIENT_TYPE);
1549	<	yy_aconf = map_to_conf(yy_conf);
1550	<	}
1551	<	else
1552	<	{
1553	<	MyFree(class_name);
1554	<	class_name = NULL;
1555	<	}
1547	>	reset_block_state();
1548		} '{' auth_items '}' ';'
1549		{
1550	<	if (conf_parser_ctx.pass == 2)
1559	<	{
1560	<	struct CollectItem *yy_tmp = NULL;
1561	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1550	>	dlink_node *ptr = NULL;
1551
1552	<	if (yy_aconf->user && yy_aconf->host)
1553	<	{
1565	<	conf_add_class_to_conf(yy_conf, class_name);
1566	<	add_conf_by_address(CONF_CLIENT, yy_aconf);
1567	<	}
1568	<	else
1569	<	delete_conf_item(yy_conf);
1570	<
1571	<	/* copy over settings from first struct */
1572	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
1573	<	{
1574	<	struct AccessItem *new_aconf;
1575	<	struct ConfItem *new_conf;
1576	<
1577	<	new_conf = make_conf_item(CLIENT_TYPE);
1578	<	new_aconf = map_to_conf(new_conf);
1552	>	if (conf_parser_ctx.pass != 2)
1553	>	break;
1554
1555	<	yy_tmp = ptr->data;
1556	<
1557	<	assert(yy_tmp->user && yy_tmp->host);
1558	<
1584	<	if (yy_aconf->passwd != NULL)
1585	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1586	<	if (yy_conf->name != NULL)
1587	<	DupString(new_conf->name, yy_conf->name);
1588	<	if (yy_aconf->passwd != NULL)
1589	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1590	<
1591	<	new_aconf->flags = yy_aconf->flags;
1592	<	new_aconf->port  = yy_aconf->port;
1555	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
1556	>	{
1557	>	struct MaskItem *conf = NULL;
1558	>	struct split_nuh_item nuh;
1559
1560	<	DupString(new_aconf->user, yy_tmp->user);
1561	<	collapse(new_aconf->user);
1560	>	nuh.nuhmask  = ptr->data;
1561	>	nuh.nickptr  = NULL;
1562	>	nuh.userptr  = block_state.user.buf;
1563	>	nuh.hostptr  = block_state.host.buf;
1564	>	nuh.nicksize = 0;
1565	>	nuh.usersize = sizeof(block_state.user.buf);
1566	>	nuh.hostsize = sizeof(block_state.host.buf);
1567	>	split_nuh(&nuh);
1568
1569	<	DupString(new_aconf->host, yy_tmp->host);
1570	<	collapse(new_aconf->host);
1569	>	conf        = conf_make(CONF_CLIENT);
1570	>	conf->user  = xstrdup(collapse(block_state.user.buf));
1571	>	conf->host  = xstrdup(collapse(block_state.host.buf));
1572	>
1573	>	if (block_state.rpass.buf[0])
1574	>	conf->passwd = xstrdup(block_state.rpass.buf);
1575	>	if (block_state.name.buf[0])
1576	>	conf->name = xstrdup(block_state.name.buf);
1577
1578	<	conf_add_class_to_conf(new_conf, class_name);
1579	<	add_conf_by_address(CONF_CLIENT, new_aconf);
1602	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1603	<	free_collect_item(yy_tmp);
1604	<	}
1578	>	conf->flags = block_state.flags.value;
1579	>	conf->port  = block_state.port.value;
1580
1581	<	MyFree(class_name);
1582	<	class_name = NULL;
1608	<	yy_conf = NULL;
1609	<	yy_aconf = NULL;
1581	>	conf_add_class_to_conf(conf, block_state.class.buf);
1582	>	add_conf_by_address(CONF_CLIENT, conf);
1583		}
1584		};
1585
#	Line 1618 | Line 1591 | auth_item:      auth_user | auth_passwd
1591		auth_user: USER '=' QSTRING ';'
1592		{
1593		if (conf_parser_ctx.pass == 2)
1594	<	{
1622	<	struct CollectItem *yy_tmp = NULL;
1623	<	struct split_nuh_item nuh;
1624	<
1625	<	nuh.nuhmask  = yylval.string;
1626	<	nuh.nickptr  = NULL;
1627	<	nuh.userptr  = userbuf;
1628	<	nuh.hostptr  = hostbuf;
1629	<
1630	<	nuh.nicksize = 0;
1631	<	nuh.usersize = sizeof(userbuf);
1632	<	nuh.hostsize = sizeof(hostbuf);
1633	<
1634	<	split_nuh(&nuh);
1635	<
1636	<	if (yy_aconf->user == NULL)
1637	<	{
1638	<	DupString(yy_aconf->user, userbuf);
1639	<	DupString(yy_aconf->host, hostbuf);
1640	<	}
1641	<	else
1642	<	{
1643	<	yy_tmp = MyMalloc(sizeof(struct CollectItem));
1644	<
1645	<	DupString(yy_tmp->user, userbuf);
1646	<	DupString(yy_tmp->host, hostbuf);
1647	<
1648	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1649	<	}
1650	<	}
1594	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1595		};
1596
1597		auth_passwd: PASSWORD '=' QSTRING ';'
1598		{
1599		if (conf_parser_ctx.pass == 2)
1600	<	{
1657	<	/* be paranoid */
1658	<	if (yy_aconf->passwd != NULL)
1659	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1660	<
1661	<	MyFree(yy_aconf->passwd);
1662	<	DupString(yy_aconf->passwd, yylval.string);
1663	<	}
1600	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1601		};
1602
1603		auth_class: CLASS '=' QSTRING ';'
1604		{
1605		if (conf_parser_ctx.pass == 2)
1606	<	{
1670	<	MyFree(class_name);
1671	<	DupString(class_name, yylval.string);
1672	<	}
1606	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1607		};
1608
1609		auth_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 1677 | Line 1611 | auth_encrypted: ENCRYPTED '=' TBOOL ';'
1611		if (conf_parser_ctx.pass == 2)
1612		{
1613		if (yylval.number)
1614	<	SetConfEncrypted(yy_aconf);
1614	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1615		else
1616	<	ClearConfEncrypted(yy_aconf);
1616	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1617		}
1618		};
1619
1620		auth_flags: IRCD_FLAGS
1621		{
1622	+	if (conf_parser_ctx.pass == 2)
1623	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
1624		} '='  auth_flags_items ';';
1625
1626		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1627		auth_flags_item: SPOOF_NOTICE
1628		{
1629		if (conf_parser_ctx.pass == 2)
1630	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1630	>	block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1631		} | EXCEED_LIMIT
1632		{
1633		if (conf_parser_ctx.pass == 2)
1634	<	yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1634	>	block_state.flags.value |= CONF_FLAGS_NOLIMIT;
1635		} | KLINE_EXEMPT
1636		{
1637		if (conf_parser_ctx.pass == 2)
1638	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1638	>	block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1639		} | NEED_IDENT
1640		{
1641		if (conf_parser_ctx.pass == 2)
1642	<	yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
1642	>	block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
1643		} | CAN_FLOOD
1644		{
1645		if (conf_parser_ctx.pass == 2)
1646	<	yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
1646	>	block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
1647		} | NO_TILDE
1648		{
1649		if (conf_parser_ctx.pass == 2)
1650	<	yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1650	>	block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1651		} | GLINE_EXEMPT
1652		{
1653		if (conf_parser_ctx.pass == 2)
1654	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
1654	>	block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
1655		} | RESV_EXEMPT
1656		{
1657		if (conf_parser_ctx.pass == 2)
1658	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
1658	>	block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
1659	>	} | T_WEBIRC
1660	>	{
1661	>	if (conf_parser_ctx.pass == 2)
1662	>	block_state.flags.value |= CONF_FLAGS_WEBIRC;
1663		} | NEED_PASSWORD
1664		{
1665		if (conf_parser_ctx.pass == 2)
1666	<	yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
1666	>	block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1667		};
1668
1729	–	/* XXX - need check for illegal hostnames here */
1669		auth_spoof: SPOOF '=' QSTRING ';'
1670		{
1671	<	if (conf_parser_ctx.pass == 2)
1672	<	{
1734	<	MyFree(yy_conf->name);
1671	>	if (conf_parser_ctx.pass != 2)
1672	>	break;
1673
1674	<	if (strlen(yylval.string) < HOSTLEN)
1675	<	{
1676	<	DupString(yy_conf->name, yylval.string);
1677	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
1740	<	}
1741	<	else
1742	<	{
1743	<	ilog(LOG_TYPE_IRCD, "Spoofs must be less than %d..ignoring it", HOSTLEN);
1744	<	yy_conf->name = NULL;
1745	<	}
1674	>	if (strlen(yylval.string) <= HOSTLEN && valid_hostname(yylval.string))
1675	>	{
1676	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1677	>	block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
1678		}
1679	+	else
1680	+	ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
1681		};
1682
1683		auth_redir_serv: REDIRSERV '=' QSTRING ';'
1684		{
1685	<	if (conf_parser_ctx.pass == 2)
1686	<	{
1687	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1688	<	MyFree(yy_conf->name);
1689	<	DupString(yy_conf->name, yylval.string);
1756	<	}
1685	>	if (conf_parser_ctx.pass != 2)
1686	>	break;
1687	>
1688	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1689	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1690		};
1691
1692		auth_redir_port: REDIRPORT '=' NUMBER ';'
1693		{
1694	<	if (conf_parser_ctx.pass == 2)
1695	<	{
1696	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1697	<	yy_aconf->port = $3;
1698	<	}
1694	>	if (conf_parser_ctx.pass != 2)
1695	>	break;
1696	>
1697	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1698	>	block_state.port.value = $3;
1699		};
1700
1701
#	Line 1771 | Line 1704 | auth_redir_port: REDIRPORT '=' NUMBER ';
1704		***************************************************************************/
1705		resv_entry: RESV
1706		{
1707	<	if (conf_parser_ctx.pass == 2)
1708	<	{
1709	<	MyFree(resv_reason);
1710	<	resv_reason = NULL;
1711	<	}
1707	>	if (conf_parser_ctx.pass != 2)
1708	>	break;
1709	>
1710	>	reset_block_state();
1711	>	strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
1712		} '{' resv_items '}' ';'
1713		{
1714	<	if (conf_parser_ctx.pass == 2)
1715	<	{
1716	<	MyFree(resv_reason);
1717	<	resv_reason = NULL;
1785	<	}
1714	>	if (conf_parser_ctx.pass != 2)
1715	>	break;
1716	>
1717	>	create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1718		};
1719
1720		resv_items:     resv_items resv_item | resv_item;
1721	<	resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
1721	>	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1722
1723	<	resv_creason: REASON '=' QSTRING ';'
1723	>	resv_mask: MASK '=' QSTRING ';'
1724		{
1725		if (conf_parser_ctx.pass == 2)
1726	<	{
1795	<	MyFree(resv_reason);
1796	<	DupString(resv_reason, yylval.string);
1797	<	}
1726	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1727		};
1728
1729	<	resv_channel: CHANNEL '=' QSTRING ';'
1729	>	resv_reason: REASON '=' QSTRING ';'
1730		{
1731		if (conf_parser_ctx.pass == 2)
1732	<	{
1804	<	if (IsChanPrefix(*yylval.string))
1805	<	{
1806	<	char def_reason[] = "No reason";
1807	<
1808	<	create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1809	<	}
1810	<	}
1811	<	/* ignore it for now.. but we really should make a warning if
1812	<	* its an erroneous name --fl_ */
1732	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1733		};
1734
1735	<	resv_nick: NICK '=' QSTRING ';'
1735	>	resv_exempt: EXEMPT '=' QSTRING ';'
1736		{
1737		if (conf_parser_ctx.pass == 2)
1738	<	{
1819	<	char def_reason[] = "No reason";
1820	<
1821	<	create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1822	<	}
1738	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1739		};
1740
1741	+
1742		/***************************************************************************
1743		*  section service
1744		***************************************************************************/
#	Line 1836 | Line 1753 | service_name: NAME '=' QSTRING ';'
1753		{
1754		if (valid_servname(yylval.string))
1755		{
1756	<	yy_conf = make_conf_item(SERVICE_TYPE);
1757	<	DupString(yy_conf->name, yylval.string);
1756	>	struct MaskItem *conf = conf_make(CONF_SERVICE);
1757	>	conf->name = xstrdup(yylval.string);
1758		}
1759		}
1760		};
#	Line 1847 | Line 1764 | service_name: NAME '=' QSTRING ';'
1764		***************************************************************************/
1765		shared_entry: T_SHARED
1766		{
1767	<	if (conf_parser_ctx.pass == 2)
1768	<	{
1769	<	yy_conf = make_conf_item(ULINE_TYPE);
1770	<	yy_match_item = map_to_conf(yy_conf);
1771	<	yy_match_item->action = SHARED_ALL;
1772	<	}
1767	>	if (conf_parser_ctx.pass != 2)
1768	>	break;
1769	>
1770	>	reset_block_state();
1771	>
1772	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1773	>	strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
1774	>	strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
1775	>	block_state.flags.value = SHARED_ALL;
1776		} '{' shared_items '}' ';'
1777		{
1778	<	if (conf_parser_ctx.pass == 2)
1779	<	{
1780	<	yy_conf = NULL;
1781	<	}
1778	>	struct MaskItem *conf = NULL;
1779	>
1780	>	if (conf_parser_ctx.pass != 2)
1781	>	break;
1782	>
1783	>	conf = conf_make(CONF_ULINE);
1784	>	conf->flags = block_state.flags.value;
1785	>	conf->name = xstrdup(block_state.name.buf);
1786	>	conf->user = xstrdup(block_state.user.buf);
1787	>	conf->host = xstrdup(block_state.host.buf);
1788		};
1789
1790		shared_items: shared_items shared_item | shared_item;
#	Line 1867 | Line 1793 | shared_item:  shared_name | shared_user
1793		shared_name: NAME '=' QSTRING ';'
1794		{
1795		if (conf_parser_ctx.pass == 2)
1796	<	{
1871	<	MyFree(yy_conf->name);
1872	<	DupString(yy_conf->name, yylval.string);
1873	<	}
1796	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1797		};
1798
1799		shared_user: USER '=' QSTRING ';'
#	Line 1881 | Line 1804 | shared_user: USER '=' QSTRING ';'
1804
1805		nuh.nuhmask  = yylval.string;
1806		nuh.nickptr  = NULL;
1807	<	nuh.userptr  = userbuf;
1808	<	nuh.hostptr  = hostbuf;
1807	>	nuh.userptr  = block_state.user.buf;
1808	>	nuh.hostptr  = block_state.host.buf;
1809
1810		nuh.nicksize = 0;
1811	<	nuh.usersize = sizeof(userbuf);
1812	<	nuh.hostsize = sizeof(hostbuf);
1811	>	nuh.usersize = sizeof(block_state.user.buf);
1812	>	nuh.hostsize = sizeof(block_state.host.buf);
1813
1814		split_nuh(&nuh);
1892	–
1893	–	DupString(yy_match_item->user, userbuf);
1894	–	DupString(yy_match_item->host, hostbuf);
1815		}
1816		};
1817
1818		shared_type: TYPE
1819		{
1820		if (conf_parser_ctx.pass == 2)
1821	<	yy_match_item->action = 0;
1821	>	block_state.flags.value = 0;
1822		} '=' shared_types ';' ;
1823
1824		shared_types: shared_types ',' shared_type_item | shared_type_item;
1825		shared_type_item: KLINE
1826		{
1827		if (conf_parser_ctx.pass == 2)
1828	<	yy_match_item->action |= SHARED_KLINE;
1828	>	block_state.flags.value |= SHARED_KLINE;
1829		} | UNKLINE
1830		{
1831		if (conf_parser_ctx.pass == 2)
1832	<	yy_match_item->action |= SHARED_UNKLINE;
1832	>	block_state.flags.value |= SHARED_UNKLINE;
1833		} | T_DLINE
1834		{
1835		if (conf_parser_ctx.pass == 2)
1836	<	yy_match_item->action |= SHARED_DLINE;
1836	>	block_state.flags.value |= SHARED_DLINE;
1837		} | T_UNDLINE
1838		{
1839		if (conf_parser_ctx.pass == 2)
1840	<	yy_match_item->action |= SHARED_UNDLINE;
1840	>	block_state.flags.value |= SHARED_UNDLINE;
1841		} | XLINE
1842		{
1843		if (conf_parser_ctx.pass == 2)
1844	<	yy_match_item->action |= SHARED_XLINE;
1844	>	block_state.flags.value |= SHARED_XLINE;
1845		} | T_UNXLINE
1846		{
1847		if (conf_parser_ctx.pass == 2)
1848	<	yy_match_item->action |= SHARED_UNXLINE;
1848	>	block_state.flags.value |= SHARED_UNXLINE;
1849		} | RESV
1850		{
1851		if (conf_parser_ctx.pass == 2)
1852	<	yy_match_item->action |= SHARED_RESV;
1852	>	block_state.flags.value |= SHARED_RESV;
1853		} | T_UNRESV
1854		{
1855		if (conf_parser_ctx.pass == 2)
1856	<	yy_match_item->action |= SHARED_UNRESV;
1856	>	block_state.flags.value |= SHARED_UNRESV;
1857		} | T_LOCOPS
1858		{
1859		if (conf_parser_ctx.pass == 2)
1860	<	yy_match_item->action |= SHARED_LOCOPS;
1860	>	block_state.flags.value |= SHARED_LOCOPS;
1861		} | T_ALL
1862		{
1863		if (conf_parser_ctx.pass == 2)
1864	<	yy_match_item->action = SHARED_ALL;
1864	>	block_state.flags.value = SHARED_ALL;
1865		};
1866
1867		/***************************************************************************
#	Line 1949 | Line 1869 | shared_type_item: KLINE
1869		***************************************************************************/
1870		cluster_entry: T_CLUSTER
1871		{
1872	<	if (conf_parser_ctx.pass == 2)
1873	<	{
1874	<	yy_conf = make_conf_item(CLUSTER_TYPE);
1875	<	yy_conf->flags = SHARED_ALL;
1876	<	}
1872	>	if (conf_parser_ctx.pass != 2)
1873	>	break;
1874	>
1875	>	reset_block_state();
1876	>
1877	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1878	>	block_state.flags.value = SHARED_ALL;
1879		} '{' cluster_items '}' ';'
1880		{
1881	<	if (conf_parser_ctx.pass == 2)
1882	<	{
1883	<	if (yy_conf->name == NULL)
1884	<	DupString(yy_conf->name, "*");
1885	<	yy_conf = NULL;
1886	<	}
1881	>	struct MaskItem *conf = NULL;
1882	>
1883	>	if (conf_parser_ctx.pass != 2)
1884	>	break;
1885	>
1886	>	conf = conf_make(CONF_CLUSTER);
1887	>	conf->flags = block_state.flags.value;
1888	>	conf->name = xstrdup(block_state.name.buf);
1889		};
1890
1891		cluster_items:  cluster_items cluster_item | cluster_item;
#	Line 1970 | Line 1894 | cluster_item:  cluster_name | cluster_typ
1894		cluster_name: NAME '=' QSTRING ';'
1895		{
1896		if (conf_parser_ctx.pass == 2)
1897	<	DupString(yy_conf->name, yylval.string);
1897	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1898		};
1899
1900		cluster_type: TYPE
1901		{
1902		if (conf_parser_ctx.pass == 2)
1903	<	yy_conf->flags = 0;
1903	>	block_state.flags.value = 0;
1904		} '=' cluster_types ';' ;
1905
1906		cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1907		cluster_type_item: KLINE
1908		{
1909		if (conf_parser_ctx.pass == 2)
1910	<	yy_conf->flags |= SHARED_KLINE;
1910	>	block_state.flags.value |= SHARED_KLINE;
1911		} | UNKLINE
1912		{
1913		if (conf_parser_ctx.pass == 2)
1914	<	yy_conf->flags |= SHARED_UNKLINE;
1914	>	block_state.flags.value |= SHARED_UNKLINE;
1915		} | T_DLINE
1916		{
1917		if (conf_parser_ctx.pass == 2)
1918	<	yy_conf->flags |= SHARED_DLINE;
1918	>	block_state.flags.value |= SHARED_DLINE;
1919		} | T_UNDLINE
1920		{
1921		if (conf_parser_ctx.pass == 2)
1922	<	yy_conf->flags |= SHARED_UNDLINE;
1922	>	block_state.flags.value |= SHARED_UNDLINE;
1923		} | XLINE
1924		{
1925		if (conf_parser_ctx.pass == 2)
1926	<	yy_conf->flags |= SHARED_XLINE;
1926	>	block_state.flags.value |= SHARED_XLINE;
1927		} | T_UNXLINE
1928		{
1929		if (conf_parser_ctx.pass == 2)
1930	<	yy_conf->flags |= SHARED_UNXLINE;
1930	>	block_state.flags.value |= SHARED_UNXLINE;
1931		} | RESV
1932		{
1933		if (conf_parser_ctx.pass == 2)
1934	<	yy_conf->flags |= SHARED_RESV;
1934	>	block_state.flags.value |= SHARED_RESV;
1935		} | T_UNRESV
1936		{
1937		if (conf_parser_ctx.pass == 2)
1938	<	yy_conf->flags |= SHARED_UNRESV;
1938	>	block_state.flags.value |= SHARED_UNRESV;
1939		} | T_LOCOPS
1940		{
1941		if (conf_parser_ctx.pass == 2)
1942	<	yy_conf->flags |= SHARED_LOCOPS;
1942	>	block_state.flags.value |= SHARED_LOCOPS;
1943		} | T_ALL
1944		{
1945		if (conf_parser_ctx.pass == 2)
1946	<	yy_conf->flags = SHARED_ALL;
1946	>	block_state.flags.value = SHARED_ALL;
1947		};
1948
1949		/***************************************************************************
#	Line 2027 | Line 1951 | cluster_type_item: KLINE
1951		***************************************************************************/
1952		connect_entry: CONNECT
1953		{
2030	–	if (conf_parser_ctx.pass == 2)
2031	–	{
2032	–	yy_conf = make_conf_item(SERVER_TYPE);
2033	–	yy_aconf = map_to_conf(yy_conf);
1954
1955	<	/* defaults */
1956	<	yy_aconf->port = PORTNUM;
1957	<	}
1958	<	else
1959	<	{
2040	<	MyFree(class_name);
2041	<	class_name = NULL;
2042	<	}
1955	>	if (conf_parser_ctx.pass != 2)
1956	>	break;
1957	>
1958	>	reset_block_state();
1959	>	block_state.port.value = PORTNUM;
1960		} '{' connect_items '}' ';'
1961		{
1962	<	if (conf_parser_ctx.pass == 2)
1962	>	struct MaskItem *conf = NULL;
1963	>	struct addrinfo hints, *res;
1964	>
1965	>	if (conf_parser_ctx.pass != 2)
1966	>	break;
1967	>
1968	>	if (!block_state.name.buf[0] ||
1969	>	!block_state.host.buf[0])
1970	>	break;
1971	>
1972	>	if (!(block_state.rpass.buf[0] ||
1973	>	block_state.spass.buf[0]))
1974	>	break;
1975	>
1976	>	if (has_wildcards(block_state.name.buf) ||
1977	>	has_wildcards(block_state.host.buf))
1978	>	break;
1979	>
1980	>	conf = conf_make(CONF_SERVER);
1981	>	conf->port = block_state.port.value;
1982	>	conf->flags = block_state.flags.value;
1983	>	conf->aftype = block_state.aftype.value;
1984	>	conf->host = xstrdup(block_state.host.buf);
1985	>	conf->name = xstrdup(block_state.name.buf);
1986	>	conf->passwd = xstrdup(block_state.rpass.buf);
1987	>	conf->spasswd = xstrdup(block_state.spass.buf);
1988	>	conf->cipher_list = xstrdup(block_state.ciph.buf);
1989	>
1990	>	dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
1991	>	dlinkMoveList(&block_state.hub.list, &conf->hub_list);
1992	>
1993	>	if (block_state.bind.buf[0])
1994		{
1995	<	if (yy_aconf->host && yy_aconf->passwd && yy_aconf->spasswd)
1996	<	{
1997	<	if (conf_add_server(yy_conf, class_name) == -1)
1998	<	delete_conf_item(yy_conf);
1999	<	}
1995	>	memset(&hints, 0, sizeof(hints));
1996	>
1997	>	hints.ai_family   = AF_UNSPEC;
1998	>	hints.ai_socktype = SOCK_STREAM;
1999	>	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2000	>
2001	>	if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2002	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2003		else
2004		{
2005	<	if (yy_conf->name != NULL)
2055	<	{
2056	<	if (yy_aconf->host == NULL)
2057	<	yyerror("Ignoring connect block -- missing host");
2058	<	else if (!yy_aconf->passwd || !yy_aconf->spasswd)
2059	<	yyerror("Ignoring connect block -- missing password");
2060	<	}
2005	>	assert(res != NULL);
2006
2007	<	/* XXX
2008	<	* This fixes a try_connections() core (caused by invalid class_ptr
2009	<	* pointers) reported by metalrock. That's an ugly fix, but there
2010	<	* is currently no better way. The entire config subsystem needs an
2066	<	* rewrite ASAP. make_conf_item() shouldn't really add things onto
2067	<	* a doubly linked list immediately without any sanity checks!  -Michael
2068	<	*/
2069	<	delete_conf_item(yy_conf);
2007	>	memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2008	>	conf->bind.ss.ss_family = res->ai_family;
2009	>	conf->bind.ss_len = res->ai_addrlen;
2010	>	freeaddrinfo(res);
2011		}
2071	–
2072	–	MyFree(class_name);
2073	–	class_name = NULL;
2074	–	yy_conf = NULL;
2075	–	yy_aconf = NULL;
2012		}
2013	+
2014	+	conf_add_class_to_conf(conf, block_state.class.buf);
2015	+	lookup_confhost(conf);
2016		};
2017
2018		connect_items:  connect_items connect_item | connect_item;
#	Line 2087 | Line 2026 | connect_item:   connect_name | connect_h
2026		connect_name: NAME '=' QSTRING ';'
2027		{
2028		if (conf_parser_ctx.pass == 2)
2029	<	{
2091	<	MyFree(yy_conf->name);
2092	<	DupString(yy_conf->name, yylval.string);
2093	<	}
2029	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2030		};
2031
2032		connect_host: HOST '=' QSTRING ';'
2033		{
2034		if (conf_parser_ctx.pass == 2)
2035	<	{
2100	<	MyFree(yy_aconf->host);
2101	<	DupString(yy_aconf->host, yylval.string);
2102	<	}
2035	>	strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2036		};
2037
2038		connect_vhost: VHOST '=' QSTRING ';'
2039		{
2040		if (conf_parser_ctx.pass == 2)
2041	<	{
2109	<	struct addrinfo hints, *res;
2110	<
2111	<	memset(&hints, 0, sizeof(hints));
2112	<
2113	<	hints.ai_family   = AF_UNSPEC;
2114	<	hints.ai_socktype = SOCK_STREAM;
2115	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2116	<
2117	<	if (getaddrinfo(yylval.string, NULL, &hints, &res))
2118	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
2119	<	else
2120	<	{
2121	<	assert(res != NULL);
2122	<
2123	<	memcpy(&yy_aconf->bind, res->ai_addr, res->ai_addrlen);
2124	<	yy_aconf->bind.ss.ss_family = res->ai_family;
2125	<	yy_aconf->bind.ss_len = res->ai_addrlen;
2126	<	freeaddrinfo(res);
2127	<	}
2128	<	}
2041	>	strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2042		};
2043
2044		connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2045		{
2046	<	if (conf_parser_ctx.pass == 2)
2047	<	{
2135	<	if ($3[0] == ':')
2136	<	yyerror("Server passwords cannot begin with a colon");
2137	<	else if (strchr($3, ' ') != NULL)
2138	<	yyerror("Server passwords cannot contain spaces");
2139	<	else {
2140	<	if (yy_aconf->spasswd != NULL)
2141	<	memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
2046	>	if (conf_parser_ctx.pass != 2)
2047	>	break;
2048
2049	<	MyFree(yy_aconf->spasswd);
2050	<	DupString(yy_aconf->spasswd, yylval.string);
2051	<	}
2052	<	}
2049	>	if ($3[0] == ':')
2050	>	conf_error_report("Server passwords cannot begin with a colon");
2051	>	else if (strchr($3, ' ') != NULL)
2052	>	conf_error_report("Server passwords cannot contain spaces");
2053	>	else
2054	>	strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
2055		};
2056
2057		connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2058		{
2059	<	if (conf_parser_ctx.pass == 2)
2060	<	{
2153	<	if ($3[0] == ':')
2154	<	yyerror("Server passwords cannot begin with a colon");
2155	<	else if (strchr($3, ' ') != NULL)
2156	<	yyerror("Server passwords cannot contain spaces");
2157	<	else {
2158	<	if (yy_aconf->passwd != NULL)
2159	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
2059	>	if (conf_parser_ctx.pass != 2)
2060	>	break;
2061
2062	<	MyFree(yy_aconf->passwd);
2063	<	DupString(yy_aconf->passwd, yylval.string);
2064	<	}
2065	<	}
2062	>	if ($3[0] == ':')
2063	>	conf_error_report("Server passwords cannot begin with a colon");
2064	>	else if (strchr($3, ' ') != NULL)
2065	>	conf_error_report("Server passwords cannot contain spaces");
2066	>	else
2067	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2068		};
2069
2070		connect_port: PORT '=' NUMBER ';'
2071		{
2072		if (conf_parser_ctx.pass == 2)
2073	<	yy_aconf->port = $3;
2073	>	block_state.port.value = $3;
2074		};
2075
2076		connect_aftype: AFTYPE '=' T_IPV4 ';'
2077		{
2078		if (conf_parser_ctx.pass == 2)
2079	<	yy_aconf->aftype = AF_INET;
2079	>	block_state.aftype.value = AF_INET;
2080		} | AFTYPE '=' T_IPV6 ';'
2081		{
2082		#ifdef IPV6
2083		if (conf_parser_ctx.pass == 2)
2084	<	yy_aconf->aftype = AF_INET6;
2084	>	block_state.aftype.value = AF_INET6;
2085		#endif
2086		};
2087
2088		connect_flags: IRCD_FLAGS
2089		{
2090	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2091		} '='  connect_flags_items ';';
2092
2093		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2094		connect_flags_item: AUTOCONN
2095		{
2096		if (conf_parser_ctx.pass == 2)
2097	<	SetConfAllowAutoConn(yy_aconf);
2194	<	} | BURST_AWAY
2195	<	{
2196	<	if (conf_parser_ctx.pass == 2)
2197	<	SetConfAwayBurst(yy_aconf);
2198	<	} | TOPICBURST
2199	<	{
2200	<	if (conf_parser_ctx.pass == 2)
2201	<	SetConfTopicBurst(yy_aconf);
2097	>	block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2098		} | T_SSL
2099		{
2100		if (conf_parser_ctx.pass == 2)
2101	<	SetConfSSL(yy_aconf);
2101	>	block_state.flags.value |= CONF_FLAGS_SSL;
2102		};
2103
2104		connect_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 2210 | Line 2106 | connect_encrypted: ENCRYPTED '=' TBOOL '
2106		if (conf_parser_ctx.pass == 2)
2107		{
2108		if (yylval.number)
2109	<	yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
2109	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
2110		else
2111	<	yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
2111	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
2112		}
2113		};
2114
2115		connect_hub_mask: HUB_MASK '=' QSTRING ';'
2116		{
2117		if (conf_parser_ctx.pass == 2)
2118	<	{
2223	<	char *mask;
2224	<
2225	<	DupString(mask, yylval.string);
2226	<	dlinkAdd(mask, make_dlink_node(), &yy_aconf->hub_list);
2227	<	}
2118	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2119		};
2120
2121		connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2122		{
2123		if (conf_parser_ctx.pass == 2)
2124	<	{
2234	<	char *mask;
2235	<
2236	<	DupString(mask, yylval.string);
2237	<	dlinkAdd(mask, make_dlink_node(), &yy_aconf->leaf_list);
2238	<	}
2124	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
2125		};
2126
2127		connect_class: CLASS '=' QSTRING ';'
2128		{
2129		if (conf_parser_ctx.pass == 2)
2130	<	{
2245	<	MyFree(class_name);
2246	<	DupString(class_name, yylval.string);
2247	<	}
2130	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2131		};
2132
2133		connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2134		{
2135		#ifdef HAVE_LIBCRYPTO
2136		if (conf_parser_ctx.pass == 2)
2137	<	{
2255	<	MyFree(yy_aconf->cipher_list);
2256	<	DupString(yy_aconf->cipher_list, yylval.string);
2257	<	}
2137	>	strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2138		#else
2139		if (conf_parser_ctx.pass == 2)
2140	<	yyerror("Ignoring connect::ciphers -- no OpenSSL support");
2140	>	conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
2141		#endif
2142		};
2143
#	Line 2268 | Line 2148 | connect_ssl_cipher_list: T_SSL_CIPHER_LI
2148		kill_entry: KILL
2149		{
2150		if (conf_parser_ctx.pass == 2)
2151	<	{
2272	<	userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
2273	<	regex_ban = 0;
2274	<	}
2151	>	reset_block_state();
2152		} '{' kill_items '}' ';'
2153		{
2154	<	if (conf_parser_ctx.pass == 2)
2278	<	{
2279	<	if (userbuf[0] && hostbuf[0])
2280	<	{
2281	<	if (regex_ban)
2282	<	{
2283	<	#ifdef HAVE_LIBPCRE
2284	<	void *exp_user = NULL;
2285	<	void *exp_host = NULL;
2286	<	const char *errptr = NULL;
2287	<
2288	<	if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
2289	<	!(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
2290	<	{
2291	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: %s",
2292	<	errptr);
2293	<	break;
2294	<	}
2295	<
2296	<	yy_aconf = map_to_conf(make_conf_item(RKLINE_TYPE));
2297	<	yy_aconf->regexuser = exp_user;
2298	<	yy_aconf->regexhost = exp_host;
2299	<
2300	<	DupString(yy_aconf->user, userbuf);
2301	<	DupString(yy_aconf->host, hostbuf);
2302	<
2303	<	if (reasonbuf[0])
2304	<	DupString(yy_aconf->reason, reasonbuf);
2305	<	else
2306	<	DupString(yy_aconf->reason, "No reason");
2307	<	#else
2308	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: no PCRE support");
2309	<	break;
2310	<	#endif
2311	<	}
2312	<	else
2313	<	{
2314	<	find_and_delete_temporary(userbuf, hostbuf, CONF_KLINE);
2154	>	struct MaskItem *conf = NULL;
2155
2156	<	yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
2156	>	if (conf_parser_ctx.pass != 2)
2157	>	break;
2158
2159	<	DupString(yy_aconf->user, userbuf);
2160	<	DupString(yy_aconf->host, hostbuf);
2159	>	if (!block_state.user.buf[0] ||
2160	>	!block_state.host.buf[0])
2161	>	break;
2162
2163	<	if (reasonbuf[0])
2164	<	DupString(yy_aconf->reason, reasonbuf);
2165	<	else
2324	<	DupString(yy_aconf->reason, "No reason");
2325	<	add_conf_by_address(CONF_KLINE, yy_aconf);
2326	<	}
2327	<	}
2163	>	conf = conf_make(CONF_KLINE);
2164	>	conf->user = xstrdup(block_state.user.buf);
2165	>	conf->host = xstrdup(block_state.host.buf);
2166
2167	<	yy_aconf = NULL;
2168	<	}
2167	>	if (block_state.rpass.buf[0])
2168	>	conf->reason = xstrdup(block_state.rpass.buf);
2169	>	else
2170	>	conf->reason = xstrdup(CONF_NOREASON);
2171	>	add_conf_by_address(CONF_KLINE, conf);
2172		};
2173
2333	–	kill_type: TYPE
2334	–	{
2335	–	} '='  kill_type_items ';';
2336	–
2337	–	kill_type_items: kill_type_items ',' kill_type_item | kill_type_item;
2338	–	kill_type_item: REGEX_T
2339	–	{
2340	–	if (conf_parser_ctx.pass == 2)
2341	–	regex_ban = 1;
2342	–	};
2343	–
2174		kill_items:     kill_items kill_item | kill_item;
2175	<	kill_item:      kill_user | kill_reason | kill_type | error;
2175	>	kill_item:      kill_user | kill_reason | error;
2176
2177		kill_user: USER '=' QSTRING ';'
2178		{
2179	+
2180		if (conf_parser_ctx.pass == 2)
2181		{
2182		struct split_nuh_item nuh;
2183
2184		nuh.nuhmask  = yylval.string;
2185		nuh.nickptr  = NULL;
2186	<	nuh.userptr  = userbuf;
2187	<	nuh.hostptr  = hostbuf;
2186	>	nuh.userptr  = block_state.user.buf;
2187	>	nuh.hostptr  = block_state.host.buf;
2188
2189		nuh.nicksize = 0;
2190	<	nuh.usersize = sizeof(userbuf);
2191	<	nuh.hostsize = sizeof(hostbuf);
2190	>	nuh.usersize = sizeof(block_state.user.buf);
2191	>	nuh.hostsize = sizeof(block_state.host.buf);
2192
2193		split_nuh(&nuh);
2194		}
#	Line 2366 | Line 2197 | kill_user: USER '=' QSTRING ';'
2197		kill_reason: REASON '=' QSTRING ';'
2198		{
2199		if (conf_parser_ctx.pass == 2)
2200	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2200	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2201		};
2202
2203		/***************************************************************************
#	Line 2375 | Line 2206 | kill_reason: REASON '=' QSTRING ';'
2206		deny_entry: DENY
2207		{
2208		if (conf_parser_ctx.pass == 2)
2209	<	hostbuf[0] = reasonbuf[0] = '\0';
2209	>	reset_block_state();
2210		} '{' deny_items '}' ';'
2211		{
2212	<	if (conf_parser_ctx.pass == 2)
2382	<	{
2383	<	if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
2384	<	{
2385	<	find_and_delete_temporary(NULL, hostbuf, CONF_DLINE);
2212	>	struct MaskItem *conf = NULL;
2213
2214	<	yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
2215	<	DupString(yy_aconf->host, hostbuf);
2214	>	if (conf_parser_ctx.pass != 2)
2215	>	break;
2216
2217	<	if (reasonbuf[0])
2218	<	DupString(yy_aconf->reason, reasonbuf);
2219	<	else
2220	<	DupString(yy_aconf->reason, "No reason");
2221	<	add_conf_by_address(CONF_DLINE, yy_aconf);
2222	<	yy_aconf = NULL;
2223	<	}
2217	>	if (!block_state.addr.buf[0])
2218	>	break;
2219	>
2220	>	if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2221	>	{
2222	>	conf = conf_make(CONF_DLINE);
2223	>	conf->host = xstrdup(block_state.addr.buf);
2224	>
2225	>	if (block_state.rpass.buf[0])
2226	>	conf->reason = xstrdup(block_state.rpass.buf);
2227	>	else
2228	>	conf->reason = xstrdup(CONF_NOREASON);
2229	>	add_conf_by_address(CONF_DLINE, conf);
2230		}
2231		};
2232
#	Line 2403 | Line 2236 | deny_item:      deny_ip | deny_reason |
2236		deny_ip: IP '=' QSTRING ';'
2237		{
2238		if (conf_parser_ctx.pass == 2)
2239	<	strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
2239	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2240		};
2241
2242		deny_reason: REASON '=' QSTRING ';'
2243		{
2244		if (conf_parser_ctx.pass == 2)
2245	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2245	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2246		};
2247
2248		/***************************************************************************
#	Line 2426 | Line 2259 | exempt_ip: IP '=' QSTRING ';'
2259		{
2260		if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2261		{
2262	<	yy_aconf = map_to_conf(make_conf_item(EXEMPTDLINE_TYPE));
2263	<	DupString(yy_aconf->host, yylval.string);
2262	>	struct MaskItem *conf = conf_make(CONF_EXEMPT);
2263	>	conf->host = xstrdup(yylval.string);
2264
2265	<	add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
2433	<	yy_aconf = NULL;
2265	>	add_conf_by_address(CONF_EXEMPT, conf);
2266		}
2267		}
2268		};
#	Line 2441 | Line 2273 | exempt_ip: IP '=' QSTRING ';'
2273		gecos_entry: GECOS
2274		{
2275		if (conf_parser_ctx.pass == 2)
2276	<	{
2445	<	regex_ban = 0;
2446	<	reasonbuf[0] = gecos_name[0] = '\0';
2447	<	}
2276	>	reset_block_state();
2277		} '{' gecos_items '}' ';'
2278		{
2279	<	if (conf_parser_ctx.pass == 2)
2451	<	{
2452	<	if (gecos_name[0])
2453	<	{
2454	<	if (regex_ban)
2455	<	{
2456	<	#ifdef HAVE_LIBPCRE
2457	<	void *exp_p = NULL;
2458	<	const char *errptr = NULL;
2459	<
2460	<	if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
2461	<	{
2462	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: %s",
2463	<	errptr);
2464	<	break;
2465	<	}
2279	>	struct MaskItem *conf = NULL;
2280
2281	<	yy_conf = make_conf_item(RXLINE_TYPE);
2282	<	yy_conf->regexpname = exp_p;
2469	<	#else
2470	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: no PCRE support");
2471	<	break;
2472	<	#endif
2473	<	}
2474	<	else
2475	<	yy_conf = make_conf_item(XLINE_TYPE);
2281	>	if (conf_parser_ctx.pass != 2)
2282	>	break;
2283
2284	<	yy_match_item = map_to_conf(yy_conf);
2285	<	DupString(yy_conf->name, gecos_name);
2284	>	if (!block_state.name.buf[0])
2285	>	break;
2286
2287	<	if (reasonbuf[0])
2288	<	DupString(yy_match_item->reason, reasonbuf);
2482	<	else
2483	<	DupString(yy_match_item->reason, "No reason");
2484	<	}
2485	<	}
2486	<	};
2287	>	conf = conf_make(CONF_XLINE);
2288	>	conf->name = xstrdup(block_state.name.buf);
2289
2290	<	gecos_flags: TYPE
2291	<	{
2292	<	} '='  gecos_flags_items ';';
2293	<
2492	<	gecos_flags_items: gecos_flags_items ',' gecos_flags_item | gecos_flags_item;
2493	<	gecos_flags_item: REGEX_T
2494	<	{
2495	<	if (conf_parser_ctx.pass == 2)
2496	<	regex_ban = 1;
2290	>	if (block_state.rpass.buf[0])
2291	>	conf->reason = xstrdup(block_state.rpass.buf);
2292	>	else
2293	>	conf->reason = xstrdup(CONF_NOREASON);
2294		};
2295
2296		gecos_items: gecos_items gecos_item | gecos_item;
2297	<	gecos_item:  gecos_name | gecos_reason | gecos_flags | error;
2297	>	gecos_item:  gecos_name | gecos_reason | error;
2298
2299		gecos_name: NAME '=' QSTRING ';'
2300		{
2301		if (conf_parser_ctx.pass == 2)
2302	<	strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
2302	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2303		};
2304
2305		gecos_reason: REASON '=' QSTRING ';'
2306		{
2307		if (conf_parser_ctx.pass == 2)
2308	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2308	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2309		};
2310
2311		/***************************************************************************
#	Line 2523 | Line 2320 | general_item:       general_hide_spoof_i
2320		general_max_nick_time | general_max_nick_changes |
2321		general_max_accept | general_anti_spam_exit_message_time |
2322		general_ts_warn_delta | general_ts_max_delta |
2323	<	general_kill_chase_time_limit | general_kline_with_reason |
2324	<	general_kline_reason | general_invisible_on_connect |
2323	>	general_kill_chase_time_limit |
2324	>	general_invisible_on_connect |
2325		general_warn_no_nline | general_dots_in_ident |
2326		general_stats_o_oper_only | general_stats_k_oper_only |
2327		general_pace_wait | general_stats_i_oper_only |
2328		general_pace_wait_simple | general_stats_P_oper_only |
2329		general_short_motd | general_no_oper_flood |
2330		general_true_no_oper_flood | general_oper_pass_resv |
2534	–	general_message_locale |
2331		general_oper_only_umodes | general_max_targets |
2332		general_use_egd | general_egdpool_path |
2333		general_oper_umodes | general_caller_id_wait |
2334		general_opers_bypass_callerid | general_default_floodcount |
2335		general_min_nonwildcard | general_min_nonwildcard_simple |
2336		general_disable_remote_commands |
2541	–	general_client_flood |
2337		general_throttle_time | general_havent_read_conf |
2338		general_ping_cookie |
2339		general_disable_auth |
2340		general_tkline_expire_notices | general_gline_enable |
2341		general_gline_duration | general_gline_request_duration |
2342		general_gline_min_cidr |
2343	<	general_gline_min_cidr6 | general_use_whois_actually |
2344	<	general_reject_hold_time | general_stats_e_disabled |
2343	>	general_gline_min_cidr6 |
2344	>	general_stats_e_disabled |
2345		general_max_watch | general_services_name |
2346		error;
2347
#	Line 2584 | Line 2379 | general_gline_min_cidr6: GLINE_MIN_CIDR6
2379		ConfigFileEntry.gline_min_cidr6 = $3;
2380		};
2381
2587	–	general_use_whois_actually: USE_WHOIS_ACTUALLY '=' TBOOL ';'
2588	–	{
2589	–	ConfigFileEntry.use_whois_actually = yylval.number;
2590	–	};
2591	–
2592	–	general_reject_hold_time: TREJECT_HOLD_TIME '=' timespec ';'
2593	–	{
2594	–	GlobalSetOptions.rejecttime = yylval.number;
2595	–	};
2596	–
2382		general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2383		{
2384		ConfigFileEntry.tkline_expire_notices = yylval.number;
#	Line 2671 | Line 2456 | general_havent_read_conf: HAVENT_READ_CO
2456		}
2457		};
2458
2674	–	general_kline_with_reason: KLINE_WITH_REASON '=' TBOOL ';'
2675	–	{
2676	–	ConfigFileEntry.kline_with_reason = yylval.number;
2677	–	};
2678	–
2679	–	general_kline_reason: KLINE_REASON '=' QSTRING ';'
2680	–	{
2681	–	if (conf_parser_ctx.pass == 2)
2682	–	{
2683	–	MyFree(ConfigFileEntry.kline_reason);
2684	–	DupString(ConfigFileEntry.kline_reason, yylval.string);
2685	–	}
2686	–	};
2687	–
2459		general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2460		{
2461		ConfigFileEntry.invisible_on_connect = yylval.number;
#	Line 2766 | Line 2537 | general_oper_pass_resv: OPER_PASS_RESV '
2537		ConfigFileEntry.oper_pass_resv = yylval.number;
2538		};
2539
2769	–	general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
2770	–	{
2771	–	if (conf_parser_ctx.pass == 2)
2772	–	{
2773	–	if (strlen(yylval.string) > LOCALE_LENGTH-2)
2774	–	yylval.string[LOCALE_LENGTH-1] = '\0';
2775	–
2776	–	set_locale(yylval.string);
2777	–	}
2778	–	};
2779	–
2540		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2541		{
2542		ConfigFileEntry.dots_in_ident = $3;
#	Line 2797 | Line 2557 | general_egdpool_path: EGDPOOL_PATH '=' Q
2557		if (conf_parser_ctx.pass == 2)
2558		{
2559		MyFree(ConfigFileEntry.egdpool_path);
2560	<	DupString(ConfigFileEntry.egdpool_path, yylval.string);
2560	>	ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
2561		}
2562		};
2563
#	Line 2806 | Line 2566 | general_services_name: T_SERVICES_NAME '
2566		if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2567		{
2568		MyFree(ConfigFileEntry.service_name);
2569	<	DupString(ConfigFileEntry.service_name, yylval.string);
2569	>	ConfigFileEntry.service_name = xstrdup(yylval.string);
2570		}
2571		};
2572
#	Line 2959 | Line 2719 | umode_item:    T_BOTS
2719		} | T_LOCOPS
2720		{
2721		ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
2722	+	} | T_NONONREG
2723	+	{
2724	+	ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
2725		};
2726
2727		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
#	Line 2976 | Line 2739 | general_default_floodcount: DEFAULT_FLOO
2739		ConfigFileEntry.default_floodcount = $3;
2740		};
2741
2979	–	general_client_flood: T_CLIENT_FLOOD '=' sizespec ';'
2980	–	{
2981	–	ConfigFileEntry.client_flood = $3;
2982	–	};
2983	–
2742
2743		/***************************************************************************
2744		*  section channel
#	Line 2989 | Line 2747 | channel_entry: CHANNEL
2747		'{' channel_items '}' ';';
2748
2749		channel_items:      channel_items channel_item | channel_item;
2750	<	channel_item:       channel_use_except |
2993	<	channel_use_invex | channel_use_knock | channel_max_bans |
2750	>	channel_item:       channel_max_bans |
2751		channel_knock_delay | channel_knock_delay_channel |
2752		channel_max_chans_per_user | channel_max_chans_per_oper |
2753		channel_quiet_on_ban | channel_default_split_user_count |
2754		channel_default_split_server_count |
2755	<	channel_no_create_on_split | channel_restrict_channels |
2755	>	channel_no_create_on_split |
2756		channel_no_join_on_split |
2757		channel_jflood_count | channel_jflood_time |
2758		channel_disable_fake_channels | error;
#	Line 3005 | Line 2762 | channel_disable_fake_channels: DISABLE_F
2762		ConfigChannel.disable_fake_channels = yylval.number;
2763		};
2764
3008	–	channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
3009	–	{
3010	–	ConfigChannel.restrict_channels = yylval.number;
3011	–	};
3012	–
3013	–	channel_use_except: USE_EXCEPT '=' TBOOL ';'
3014	–	{
3015	–	ConfigChannel.use_except = yylval.number;
3016	–	};
3017	–
3018	–	channel_use_invex: USE_INVEX '=' TBOOL ';'
3019	–	{
3020	–	ConfigChannel.use_invex = yylval.number;
3021	–	};
3022	–
3023	–	channel_use_knock: USE_KNOCK '=' TBOOL ';'
3024	–	{
3025	–	ConfigChannel.use_knock = yylval.number;
3026	–	};
3027	–
2765		channel_knock_delay: KNOCK_DELAY '=' timespec ';'
2766		{
2767		ConfigChannel.knock_delay = $3;
#	Line 3093 | Line 2830 | serverhide_entry: SERVERHIDE
2830
2831		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
2832		serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
2833	+	serverhide_hide_services |
2834		serverhide_links_delay |
3097	–	serverhide_disable_hidden |
2835		serverhide_hidden | serverhide_hidden_name |
2836		serverhide_hide_server_ips |
2837		error;
#	Line 3111 | Line 2848 | serverhide_hide_servers: HIDE_SERVERS '=
2848		ConfigServerHide.hide_servers = yylval.number;
2849		};
2850
2851	+	serverhide_hide_services: HIDE_SERVICES '=' TBOOL ';'
2852	+	{
2853	+	if (conf_parser_ctx.pass == 2)
2854	+	ConfigServerHide.hide_services = yylval.number;
2855	+	};
2856	+
2857		serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2858		{
2859		if (conf_parser_ctx.pass == 2)
2860		{
2861		MyFree(ConfigServerHide.hidden_name);
2862	<	DupString(ConfigServerHide.hidden_name, yylval.string);
2862	>	ConfigServerHide.hidden_name = xstrdup(yylval.string);
2863		}
2864		};
2865
#	Line 3140 | Line 2883 | serverhide_hidden: HIDDEN '=' TBOOL ';'
2883		ConfigServerHide.hidden = yylval.number;
2884		};
2885
3143	–	serverhide_disable_hidden: DISABLE_HIDDEN '=' TBOOL ';'
3144	–	{
3145	–	if (conf_parser_ctx.pass == 2)
3146	–	ConfigServerHide.disable_hidden = yylval.number;
3147	–	};
3148	–
2886		serverhide_hide_server_ips: HIDE_SERVER_IPS '=' TBOOL ';'
2887		{
2888		if (conf_parser_ctx.pass == 2)

Diff Legend

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