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 1389 by michael, Tue May 1 13:08:29 2012 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 1976 by michael, Wed May 8 19:33:06 2013 UTC

#	Line 33 | Line 33
33		#include "ircd.h"
34		#include "list.h"
35		#include "conf.h"
36	+	#include "conf_class.h"
37		#include "event.h"
38		#include "log.h"
39		#include "client.h"     /* for UMODE_ALL only */
40		#include "irc_string.h"
40	–	#include "sprintf_irc.h"
41		#include "memory.h"
42		#include "modules.h"
43		#include "s_serv.h"
#	Line 55 | Line 55
55		#include <openssl/dh.h>
56		#endif
57
58	+	#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  BURST_TOPICWHO
126	<	%token  BYTES KBYTES MBYTES GBYTES TBYTES
149	>	%token  BYTES KBYTES MBYTES
150		%token  CALLER_ID_WAIT
151		%token  CAN_FLOOD
152		%token  CHANNEL
#	Line 140 | Line 163 | free_collect_item(struct CollectItem *it
163		%token  DIE
164		%token  DISABLE_AUTH
165		%token  DISABLE_FAKE_CHANNELS
143	–	%token  DISABLE_HIDDEN
144	–	%token  DISABLE_LOCAL_CHANNELS
166		%token  DISABLE_REMOTE_COMMANDS
167		%token  DOTS_IN_IDENT
147	–	%token  DURATION
168		%token  EGDPOOL_PATH
169		%token  EMAIL
150	–	%token  ENABLE
170		%token  ENCRYPTED
171		%token  EXCEED_LIMIT
172		%token  EXEMPT
#	Line 157 | Line 176 | free_collect_item(struct CollectItem *it
176		%token  GECOS
177		%token  GENERAL
178		%token  GLINE
179	<	%token  GLINES
179	>	%token  GLINE_DURATION
180	>	%token  GLINE_ENABLE
181		%token  GLINE_EXEMPT
182	<	%token  GLINE_TIME
182	>	%token  GLINE_REQUEST_DURATION
183		%token  GLINE_MIN_CIDR
184		%token  GLINE_MIN_CIDR6
185		%token  GLOBAL_KILL
#	Line 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
215		%token  MAX_CHANS_PER_USER
216		%token  MAX_GLOBAL
217		%token  MAX_IDENT
218		%token  MAX_LOCAL
219		%token  MAX_NICK_CHANGES
220	+	%token  MAX_NICK_LENGTH
221		%token  MAX_NICK_TIME
222		%token  MAX_NUMBER
223		%token  MAX_TARGETS
224	+	%token  MAX_TOPIC_LENGTH
225		%token  MAX_WATCH
203	–	%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 210 | Line 236 | free_collect_item(struct CollectItem *it
236		%token  NETWORK_DESC
237		%token  NETWORK_NAME
238		%token  NICK
213	–	%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
219	–	%token  NUMBER_PER_IDENT
244		%token  NUMBER_PER_CIDR
245		%token  NUMBER_PER_IP
222	–	%token  NUMBER_PER_IP_GLOBAL
246		%token  OPERATOR
247		%token  OPERS_BYPASS_CALLERID
248		%token  OPER_ONLY_UMODES
#	Line 234 | Line 257 | free_collect_item(struct CollectItem *it
257		%token  PATH
258		%token  PING_COOKIE
259		%token  PING_TIME
237	–	%token  PING_WARNING
260		%token  PORT
261		%token  QSTRING
240	–	%token  QUIET_ON_BAN
262		%token  REASON
263		%token  REDIRPORT
264		%token  REDIRSERV
244	–	%token  REGEX_T
265		%token  REHASH
246	–	%token  TREJECT_HOLD_TIME
266		%token  REMOTE
267		%token  REMOTEBAN
249	–	%token  RESTRICT_CHANNELS
250	–	%token  RESTRICTED
268		%token  RSA_PRIVATE_KEY_FILE
269		%token  RSA_PUBLIC_KEY_FILE
270		%token  SSL_CERTIFICATE_FILE
#	Line 258 | Line 275 | free_collect_item(struct CollectItem *it
275		%token  T_TLSV1
276		%token  RESV
277		%token  RESV_EXEMPT
278	<	%token  SECONDS MINUTES HOURS DAYS WEEKS
278	>	%token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
279		%token  SENDQ
280		%token  SEND_PASSWORD
281		%token  SERVERHIDE
#	Line 269 | Line 286 | free_collect_item(struct CollectItem *it
286		%token  T_CLUSTER
287		%token  TYPE
288		%token  SHORT_MOTD
272	–	%token  SILENT
289		%token  SPOOF
290		%token  SPOOF_NOTICE
291		%token  STATS_E_DISABLED
#	Line 279 | Line 295 | free_collect_item(struct CollectItem *it
295		%token  STATS_P_OPER_ONLY
296		%token  TBOOL
297		%token  TMASKED
282	–	%token  T_REJECT
298		%token  TS_MAX_DELTA
299		%token  TS_WARN_DELTA
300		%token  TWODOTS
#	Line 290 | Line 305 | free_collect_item(struct CollectItem *it
305		%token  T_CCONN
306		%token  T_CCONN_FULL
307		%token  T_SSL_CIPHER_LIST
293	–	%token  T_CLIENT_FLOOD
308		%token  T_DEAF
309		%token  T_DEBUG
310		%token  T_DLINE
297	–	%token  T_DRONE
311		%token  T_EXTERNAL
312	+	%token  T_FARCONNECT
313		%token  T_FULL
314		%token  T_INVISIBLE
315		%token  T_IPV4
#	Line 303 | 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
326	+	%token  T_SET
327		%token  T_SKILL
328		%token  T_SPY
329		%token  T_SSL
#	Line 318 | 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
325	–	%token  TOPICBURST
343		%token  TRUE_NO_OPER_FLOOD
327	–	%token  TKLINE
328	–	%token  TXLINE
329	–	%token  TRESV
344		%token  UNKLINE
345		%token  USER
346		%token  USE_EGD
333	–	%token  USE_EXCEPT
334	–	%token  USE_INVEX
335	–	%token  USE_KNOCK
347		%token  USE_LOGGING
337	–	%token  USE_WHOIS_ACTUALLY
348		%token  VHOST
349		%token  VHOST6
350		%token  XLINE
341	–	%token  WARN
351		%token  WARN_NO_NLINE
352		%token  T_SIZE
353		%token  T_FILE
#	Line 373 | Line 382 | conf_item:        admin_entry
382		| deny_entry
383		| exempt_entry
384		| general_entry
376	–	| gline_entry
385		| gecos_entry
386		| modules_entry
387		| error ';'
#	Line 406 | 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 444 | 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 492 | 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 501 | 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 510 | 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 543 | 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 558 | 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 567 | 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 577 | 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 600 | 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 625 | 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 640 | 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 654 | 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 668 | 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 677 | 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 741 | 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];
751	<	ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
752	<	yyerror(buf);
753	<	}
754	<	else if ($3 > MAXCLIENTS_MAX)
755	<	{
756	<	char buf[IRCD_BUFSIZE];
757	<	ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
758	<	yyerror(buf);
759	<	}
760	<	else
761	<	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 782 | 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 791 | 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 800 | 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 821 | Line 887 | logging_use_logging: USE_LOGGING '=' TBO
887
888		logging_file_entry:
889		{
890	<	lfile[0] = '\0';
891	<	ltype = 0;
826	<	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 838 | 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 892 | 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 */
900	<	}
901	<	else
902	<	{
903	<	MyFree(class_name);
904	<	class_name = NULL;
905	<	}
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)
909	<	{
910	<	struct CollectItem *yy_tmp;
911	<	dlink_node *ptr;
912	<	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;
924	<	yy_tmp = ptr->data;
925	<
926	<	new_conf = make_conf_item(OPER_TYPE);
927	<	new_aconf = (struct AccessItem *)map_to_conf(new_conf);
928	<
929	<	new_aconf->flags = yy_aconf->flags;
930	<
931	<	if (yy_conf->name != NULL)
932	<	DupString(new_conf->name, yy_conf->name);
933	<	if (yy_tmp->user != NULL)
934	<	DupString(new_aconf->user, yy_tmp->user);
935	<	else
936	<	DupString(new_aconf->user, "*");
937	<	if (yy_tmp->host != NULL)
938	<	DupString(new_aconf->host, yy_tmp->host);
939	<	else
940	<	DupString(new_aconf->host, "*");
941	<
942	<	new_aconf->type = parse_netmask(new_aconf->host, &new_aconf->addr,
943	<	&new_aconf->bits);
944	<
945	<	conf_add_class_to_conf(new_conf, class_name);
946	<	if (yy_aconf->passwd != NULL)
947	<	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");
959	<	new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
960	<	NULL, 0, NULL);
961	<	BIO_set_close(file, BIO_CLOSE);
962	<	BIO_free(file);
963	<	}
964	<	#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)
975	<	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);
980	<	}
981	<
982	<	yy_conf = NULL;
983	<	yy_aconf = NULL;
984	<
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 996 | Line 1047 | oper_item:      oper_name | oper_user |
1047		oper_name: NAME '=' QSTRING ';'
1048		{
1049		if (conf_parser_ctx.pass == 2)
1050	<	{
1000	<	MyFree(yy_conf->name);
1001	<	DupString(yy_conf->name, yylval.string);
1002	<	}
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	<	{
1009	<	struct split_nuh_item nuh;
1010	<
1011	<	nuh.nuhmask  = yylval.string;
1012	<	nuh.nickptr  = NULL;
1013	<	nuh.userptr  = userbuf;
1014	<	nuh.hostptr  = hostbuf;
1015	<
1016	<	nuh.nicksize = 0;
1017	<	nuh.usersize = sizeof(userbuf);
1018	<	nuh.hostsize = sizeof(hostbuf);
1019	<
1020	<	split_nuh(&nuh);
1021	<
1022	<	if (yy_aconf->user == NULL)
1023	<	{
1024	<	DupString(yy_aconf->user, userbuf);
1025	<	DupString(yy_aconf->host, hostbuf);
1026	<
1027	<	yy_aconf->type = parse_netmask(yy_aconf->host, &yy_aconf->addr,
1028	<	&yy_aconf->bits);
1029	<	}
1030	<	else
1031	<	{
1032	<	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
1033	<
1034	<	DupString(yy_tmp->user, userbuf);
1035	<	DupString(yy_tmp->host, hostbuf);
1036	<
1037	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1038	<	}
1039	<	}
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	<	{
1046	<	if (yy_aconf->passwd != NULL)
1047	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1048	<
1049	<	MyFree(yy_aconf->passwd);
1050	<	DupString(yy_aconf->passwd, yylval.string);
1051	<	}
1062	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1063		};
1064
1065		oper_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 1056 | 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		{
1067	–	#ifdef HAVE_LIBCRYPTO
1078		if (conf_parser_ctx.pass == 2)
1079	<	{
1070	<	BIO *file;
1071	<
1072	<	if (yy_aconf->rsa_public_key != NULL)
1073	<	{
1074	<	RSA_free(yy_aconf->rsa_public_key);
1075	<	yy_aconf->rsa_public_key = NULL;
1076	<	}
1077	<
1078	<	if (yy_aconf->rsa_public_key_file != NULL)
1079	<	{
1080	<	MyFree(yy_aconf->rsa_public_key_file);
1081	<	yy_aconf->rsa_public_key_file = NULL;
1082	<	}
1083	<
1084	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
1085	<	file = BIO_new_file(yylval.string, "r");
1086	<
1087	<	if (file == NULL)
1088	<	{
1089	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
1090	<	break;
1091	<	}
1092	<
1093	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
1094	<
1095	<	if (yy_aconf->rsa_public_key == NULL)
1096	<	{
1097	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1098	<	break;
1099	<	}
1100	<
1101	<	BIO_set_close(file, BIO_CLOSE);
1102	<	BIO_free(file);
1103	<	}
1104	<	#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	<	{
1111	<	MyFree(class_name);
1112	<	DupString(class_name, yylval.string);
1113	<	}
1085	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1086		};
1087
1088		oper_umodes: T_UMODES
1089		{
1090		if (conf_parser_ctx.pass == 2)
1091	<	yy_aconf->modes = 0;
1091	>	block_state.modes.value = 0;
1092		} '='  oper_umodes_items ';' ;
1093
1094		oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1095		oper_umodes_item:  T_BOTS
1096		{
1097		if (conf_parser_ctx.pass == 2)
1098	<	yy_aconf->modes |= UMODE_BOTS;
1098	>	block_state.modes.value |= UMODE_BOTS;
1099		} | T_CCONN
1100		{
1101		if (conf_parser_ctx.pass == 2)
1102	<	yy_aconf->modes |= UMODE_CCONN;
1102	>	block_state.modes.value |= UMODE_CCONN;
1103		} | T_CCONN_FULL
1104		{
1105		if (conf_parser_ctx.pass == 2)
1106	<	yy_aconf->modes |= UMODE_CCONN_FULL;
1106	>	block_state.modes.value |= UMODE_CCONN_FULL;
1107		} | T_DEAF
1108		{
1109		if (conf_parser_ctx.pass == 2)
1110	<	yy_aconf->modes |= UMODE_DEAF;
1110	>	block_state.modes.value |= UMODE_DEAF;
1111		} | T_DEBUG
1112		{
1113		if (conf_parser_ctx.pass == 2)
1114	<	yy_aconf->modes |= UMODE_DEBUG;
1114	>	block_state.modes.value |= UMODE_DEBUG;
1115		} | T_FULL
1116		{
1117		if (conf_parser_ctx.pass == 2)
1118	<	yy_aconf->modes |= UMODE_FULL;
1118	>	block_state.modes.value |= UMODE_FULL;
1119		} | HIDDEN
1120		{
1121		if (conf_parser_ctx.pass == 2)
1122	<	yy_aconf->modes |= UMODE_HIDDEN;
1122	>	block_state.modes.value |= UMODE_HIDDEN;
1123		} | T_SKILL
1124		{
1125		if (conf_parser_ctx.pass == 2)
1126	<	yy_aconf->modes |= UMODE_SKILL;
1126	>	block_state.modes.value |= UMODE_SKILL;
1127		} | T_NCHANGE
1128		{
1129		if (conf_parser_ctx.pass == 2)
1130	<	yy_aconf->modes |= UMODE_NCHANGE;
1130	>	block_state.modes.value |= UMODE_NCHANGE;
1131		} | T_REJ
1132		{
1133		if (conf_parser_ctx.pass == 2)
1134	<	yy_aconf->modes |= UMODE_REJ;
1134	>	block_state.modes.value |= UMODE_REJ;
1135		} | T_UNAUTH
1136		{
1137		if (conf_parser_ctx.pass == 2)
1138	<	yy_aconf->modes |= UMODE_UNAUTH;
1138	>	block_state.modes.value |= UMODE_UNAUTH;
1139		} | T_SPY
1140		{
1141		if (conf_parser_ctx.pass == 2)
1142	<	yy_aconf->modes |= UMODE_SPY;
1142	>	block_state.modes.value |= UMODE_SPY;
1143		} | T_EXTERNAL
1144		{
1145		if (conf_parser_ctx.pass == 2)
1146	<	yy_aconf->modes |= UMODE_EXTERNAL;
1146	>	block_state.modes.value |= UMODE_EXTERNAL;
1147		} | T_OPERWALL
1148		{
1149		if (conf_parser_ctx.pass == 2)
1150	<	yy_aconf->modes |= UMODE_OPERWALL;
1150	>	block_state.modes.value |= UMODE_OPERWALL;
1151		} | T_SERVNOTICE
1152		{
1153		if (conf_parser_ctx.pass == 2)
1154	<	yy_aconf->modes |= UMODE_SERVNOTICE;
1154	>	block_state.modes.value |= UMODE_SERVNOTICE;
1155		} | T_INVISIBLE
1156		{
1157		if (conf_parser_ctx.pass == 2)
1158	<	yy_aconf->modes |= UMODE_INVISIBLE;
1158	>	block_state.modes.value |= UMODE_INVISIBLE;
1159		} | T_WALLOP
1160		{
1161		if (conf_parser_ctx.pass == 2)
1162	<	yy_aconf->modes |= UMODE_WALLOP;
1162	>	block_state.modes.value |= UMODE_WALLOP;
1163		} | T_SOFTCALLERID
1164		{
1165		if (conf_parser_ctx.pass == 2)
1166	<	yy_aconf->modes |= UMODE_SOFTCALLERID;
1166	>	block_state.modes.value |= UMODE_SOFTCALLERID;
1167		} | T_CALLERID
1168		{
1169		if (conf_parser_ctx.pass == 2)
1170	<	yy_aconf->modes |= UMODE_CALLERID;
1170	>	block_state.modes.value |= UMODE_CALLERID;
1171		} | T_LOCOPS
1172		{
1173		if (conf_parser_ctx.pass == 2)
1174	<	yy_aconf->modes |= UMODE_LOCOPS;
1174	>	block_state.modes.value |= UMODE_LOCOPS;
1175	>	} | T_NONONREG
1176	>	{
1177	>	if (conf_parser_ctx.pass == 2)
1178	>	block_state.modes.value |= UMODE_REGONLY;
1179	>	} | T_FARCONNECT
1180	>	{
1181	>	if (conf_parser_ctx.pass == 2)
1182	>	block_state.modes.value |= UMODE_FARCONNECT;
1183		};
1184
1185		oper_flags: IRCD_FLAGS
1186		{
1187		if (conf_parser_ctx.pass == 2)
1188	<	yy_aconf->port = 0;
1188	>	block_state.port.value = 0;
1189		} '='  oper_flags_items ';';
1190
1191		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1192		oper_flags_item: GLOBAL_KILL
1193		{
1194		if (conf_parser_ctx.pass == 2)
1195	<	yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1195	>	block_state.port.value |= OPER_FLAG_GLOBAL_KILL;
1196		} | REMOTE
1197		{
1198		if (conf_parser_ctx.pass == 2)
1199	<	yy_aconf->port |= OPER_FLAG_REMOTE;
1199	>	block_state.port.value |= OPER_FLAG_REMOTE;
1200		} | KLINE
1201		{
1202		if (conf_parser_ctx.pass == 2)
1203	<	yy_aconf->port |= OPER_FLAG_K;
1203	>	block_state.port.value |= OPER_FLAG_K;
1204		} | UNKLINE
1205		{
1206		if (conf_parser_ctx.pass == 2)
1207	<	yy_aconf->port |= OPER_FLAG_UNKLINE;
1207	>	block_state.port.value |= OPER_FLAG_UNKLINE;
1208		} | T_DLINE
1209		{
1210		if (conf_parser_ctx.pass == 2)
1211	<	yy_aconf->port |= OPER_FLAG_DLINE;
1211	>	block_state.port.value |= OPER_FLAG_DLINE;
1212		} | T_UNDLINE
1213		{
1214		if (conf_parser_ctx.pass == 2)
1215	<	yy_aconf->port |= OPER_FLAG_UNDLINE;
1215	>	block_state.port.value |= OPER_FLAG_UNDLINE;
1216		} | XLINE
1217		{
1218		if (conf_parser_ctx.pass == 2)
1219	<	yy_aconf->port |= OPER_FLAG_X;
1219	>	block_state.port.value |= OPER_FLAG_X;
1220		} | GLINE
1221		{
1222		if (conf_parser_ctx.pass == 2)
1223	<	yy_aconf->port |= OPER_FLAG_GLINE;
1223	>	block_state.port.value |= OPER_FLAG_GLINE;
1224		} | DIE
1225		{
1226		if (conf_parser_ctx.pass == 2)
1227	<	yy_aconf->port |= OPER_FLAG_DIE;
1227	>	block_state.port.value |= OPER_FLAG_DIE;
1228		} | T_RESTART
1229		{
1230		if (conf_parser_ctx.pass == 2)
1231	<	yy_aconf->port |= OPER_FLAG_RESTART;
1231	>	block_state.port.value |= OPER_FLAG_RESTART;
1232		} | REHASH
1233		{
1234		if (conf_parser_ctx.pass == 2)
1235	<	yy_aconf->port |= OPER_FLAG_REHASH;
1235	>	block_state.port.value |= OPER_FLAG_REHASH;
1236		} | ADMIN
1237		{
1238		if (conf_parser_ctx.pass == 2)
1239	<	yy_aconf->port |= OPER_FLAG_ADMIN;
1260	<	} | NICK_CHANGES
1261	<	{
1262	<	if (conf_parser_ctx.pass == 2)
1263	<	yy_aconf->port |= OPER_FLAG_N;
1239	>	block_state.port.value |= OPER_FLAG_ADMIN;
1240		} | T_OPERWALL
1241		{
1242		if (conf_parser_ctx.pass == 2)
1243	<	yy_aconf->port |= OPER_FLAG_OPERWALL;
1243	>	block_state.port.value |= OPER_FLAG_OPERWALL;
1244		} | T_GLOBOPS
1245		{
1246		if (conf_parser_ctx.pass == 2)
1247	<	yy_aconf->port |= OPER_FLAG_GLOBOPS;
1247	>	block_state.port.value |= OPER_FLAG_GLOBOPS;
1248		} | OPER_SPY_T
1249		{
1250		if (conf_parser_ctx.pass == 2)
1251	<	yy_aconf->port |= OPER_FLAG_OPER_SPY;
1251	>	block_state.port.value |= OPER_FLAG_OPER_SPY;
1252		} | REMOTEBAN
1253		{
1254		if (conf_parser_ctx.pass == 2)
1255	<	yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1255	>	block_state.port.value |= OPER_FLAG_REMOTEBAN;
1256	>	} | T_SET
1257	>	{
1258	>	if (conf_parser_ctx.pass == 2)
1259	>	block_state.port.value |= OPER_FLAG_SET;
1260		} | MODULE
1261		{
1262		if (conf_parser_ctx.pass == 2)
1263	<	yy_aconf->port |= OPER_FLAG_MODULE;
1263	>	block_state.port.value |= OPER_FLAG_MODULE;
1264		};
1265
1266
#	Line 1289 | Line 1269 | oper_flags_item: GLOBAL_KILL
1269		***************************************************************************/
1270		class_entry: CLASS
1271		{
1272	<	if (conf_parser_ctx.pass == 1)
1273	<	{
1294	<	yy_conf = make_conf_item(CLASS_TYPE);
1295	<	yy_class = map_to_conf(yy_conf);
1296	<	}
1297	<	} '{' class_items '}' ';'
1298	<	{
1299	<	if (conf_parser_ctx.pass == 1)
1300	<	{
1301	<	struct ConfItem *cconf = NULL;
1302	<	struct ClassItem *class = NULL;
1303	<
1304	<	if (yy_class_name == NULL)
1305	<	delete_conf_item(yy_conf);
1306	<	else
1307	<	{
1308	<	cconf = find_exact_name_conf(CLASS_TYPE, NULL, yy_class_name, NULL, NULL);
1309	<
1310	<	if (cconf != NULL)                /* The class existed already */
1311	<	{
1312	<	int user_count = 0;
1272	>	if (conf_parser_ctx.pass != 1)
1273	>	break;
1274
1275	<	rebuild_cidr_class(cconf, yy_class);
1275	>	reset_block_state();
1276
1277	<	class = map_to_conf(cconf);
1277	>	block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1278	>	block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1279	>	block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1280	>	block_state.max_sendq.value = DEFAULT_SENDQ;
1281	>	block_state.max_recvq.value = DEFAULT_RECVQ;
1282	>	} '{' class_items '}' ';'
1283	>	{
1284	>	struct ClassItem *class = NULL;
1285
1286	<	user_count = class->curr_user_count;
1287	<	memcpy(class, yy_class, sizeof(*class));
1320	<	class->curr_user_count = user_count;
1321	<	class->active = 1;
1286	>	if (conf_parser_ctx.pass != 1)
1287	>	break;
1288
1289	<	delete_conf_item(yy_conf);
1289	>	if (!block_state.class.buf[0])
1290	>	break;
1291
1292	<	MyFree(cconf->name);            /* Allows case change of class name */
1293	<	cconf->name = yy_class_name;
1294	<	}
1295	<	else      /* Brand new class */
1296	<	{
1297	<	MyFree(yy_conf->name);          /* just in case it was allocated */
1298	<	yy_conf->name = yy_class_name;
1299	<	yy_class->active = 1;
1300	<	}
1301	<	}
1302	<
1303	<	yy_class_name = NULL;
1304	<	}
1292	>	if (!(class = class_find(block_state.class.buf, 0)))
1293	>	class = class_make();
1294	>
1295	>	class->active = 1;
1296	>	MyFree(class->name);
1297	>	class->name = xstrdup(block_state.class.buf);
1298	>	class->ping_freq = block_state.ping_freq.value;
1299	>	class->max_perip = block_state.max_perip.value;
1300	>	class->con_freq = block_state.con_freq.value;
1301	>	class->max_total = block_state.max_total.value;
1302	>	class->max_global = block_state.max_global.value;
1303	>	class->max_local = block_state.max_local.value;
1304	>	class->max_ident = block_state.max_ident.value;
1305	>	class->max_sendq = block_state.max_sendq.value;
1306	>	class->max_recvq = block_state.max_recvq.value;
1307	>
1308	>	if (block_state.min_idle.value > block_state.max_idle.value)
1309	>	{
1310	>	block_state.min_idle.value = 0;
1311	>	block_state.max_idle.value = 0;
1312	>	block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
1313	>	}
1314	>
1315	>	class->flags = block_state.flags.value;
1316	>	class->min_idle = block_state.min_idle.value;
1317	>	class->max_idle = block_state.max_idle.value;
1318	>
1319	>	if (class->number_per_cidr && block_state.number_per_cidr.value)
1320	>	if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
1321	>	(class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
1322	>	if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
1323	>	(class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
1324	>	rebuild_cidr_list(class);
1325	>
1326	>	class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1327	>	class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1328	>	class->number_per_cidr = block_state.number_per_cidr.value;
1329		};
1330
1331		class_items:    class_items class_item | class_item;
1332		class_item:     class_name |
1333		class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1334		class_ping_time |
1344	–	class_ping_warning |
1335		class_number_per_cidr |
1336		class_number_per_ip |
1337		class_connectfreq |
#	Line 1349 | Line 1339 | class_item:     class_name |
1339		class_max_global |
1340		class_max_local |
1341		class_max_ident |
1342	<	class_sendq |
1342	>	class_sendq | class_recvq |
1343	>	class_min_idle |
1344	>	class_max_idle |
1345	>	class_flags |
1346		error ';' ;
1347
1348		class_name: NAME '=' QSTRING ';'
1349		{
1350		if (conf_parser_ctx.pass == 1)
1351	<	{
1359	<	MyFree(yy_class_name);
1360	<	DupString(yy_class_name, yylval.string);
1361	<	}
1351	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1352		};
1353
1354		class_ping_time: PING_TIME '=' timespec ';'
1355		{
1356		if (conf_parser_ctx.pass == 1)
1357	<	yy_class->ping_freq = $3;
1368	<	};
1369	<
1370	<	class_ping_warning: PING_WARNING '=' timespec ';'
1371	<	{
1372	<	if (conf_parser_ctx.pass == 1)
1373	<	yy_class->ping_warning = $3;
1357	>	block_state.ping_freq.value = $3;
1358		};
1359
1360		class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1361		{
1362		if (conf_parser_ctx.pass == 1)
1363	<	yy_class->max_perip = $3;
1363	>	block_state.max_perip.value = $3;
1364		};
1365
1366		class_connectfreq: CONNECTFREQ '=' timespec ';'
1367		{
1368		if (conf_parser_ctx.pass == 1)
1369	<	yy_class->con_freq = $3;
1369	>	block_state.con_freq.value = $3;
1370		};
1371
1372		class_max_number: MAX_NUMBER '=' NUMBER ';'
1373		{
1374		if (conf_parser_ctx.pass == 1)
1375	<	yy_class->max_total = $3;
1375	>	block_state.max_total.value = $3;
1376		};
1377
1378		class_max_global: MAX_GLOBAL '=' NUMBER ';'
1379		{
1380		if (conf_parser_ctx.pass == 1)
1381	<	yy_class->max_global = $3;
1381	>	block_state.max_global.value = $3;
1382		};
1383
1384		class_max_local: MAX_LOCAL '=' NUMBER ';'
1385		{
1386		if (conf_parser_ctx.pass == 1)
1387	<	yy_class->max_local = $3;
1387	>	block_state.max_local.value = $3;
1388		};
1389
1390		class_max_ident: MAX_IDENT '=' NUMBER ';'
1391		{
1392		if (conf_parser_ctx.pass == 1)
1393	<	yy_class->max_ident = $3;
1393	>	block_state.max_ident.value = $3;
1394		};
1395
1396		class_sendq: SENDQ '=' sizespec ';'
1397		{
1398		if (conf_parser_ctx.pass == 1)
1399	<	yy_class->max_sendq = $3;
1399	>	block_state.max_sendq.value = $3;
1400	>	};
1401	>
1402	>	class_recvq: T_RECVQ '=' sizespec ';'
1403	>	{
1404	>	if (conf_parser_ctx.pass == 1)
1405	>	if ($3 >= CLIENT_FLOOD_MIN && $3 <= CLIENT_FLOOD_MAX)
1406	>	block_state.max_recvq.value = $3;
1407		};
1408
1409		class_cidr_bitlen_ipv4: CIDR_BITLEN_IPV4 '=' NUMBER ';'
1410		{
1411		if (conf_parser_ctx.pass == 1)
1412	<	yy_class->cidr_bitlen_ipv4 = $3;
1412	>	block_state.cidr_bitlen_ipv4.value = $3 > 32 ? 32 : $3;
1413		};
1414
1415		class_cidr_bitlen_ipv6: CIDR_BITLEN_IPV6 '=' NUMBER ';'
1416		{
1417		if (conf_parser_ctx.pass == 1)
1418	<	yy_class->cidr_bitlen_ipv6 = $3;
1418	>	block_state.cidr_bitlen_ipv6.value = $3 > 128 ? 128 : $3;
1419		};
1420
1421		class_number_per_cidr: NUMBER_PER_CIDR '=' NUMBER ';'
1422		{
1423		if (conf_parser_ctx.pass == 1)
1424	<	yy_class->number_per_cidr = $3;
1424	>	block_state.number_per_cidr.value = $3;
1425		};
1426
1427	+	class_min_idle: MIN_IDLE '=' timespec ';'
1428	+	{
1429	+	if (conf_parser_ctx.pass != 1)
1430	+	break;
1431	+
1432	+	block_state.min_idle.value = $3;
1433	+	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1434	+	};
1435	+
1436	+	class_max_idle: MAX_IDLE '=' timespec ';'
1437	+	{
1438	+	if (conf_parser_ctx.pass != 1)
1439	+	break;
1440	+
1441	+	block_state.max_idle.value = $3;
1442	+	block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1443	+	};
1444	+
1445	+	class_flags: IRCD_FLAGS
1446	+	{
1447	+	if (conf_parser_ctx.pass == 1)
1448	+	block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1449	+	} '='  class_flags_items ';';
1450	+
1451	+	class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1452	+	class_flags_item: RANDOM_IDLE
1453	+	{
1454	+	if (conf_parser_ctx.pass == 1)
1455	+	block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
1456	+	} | HIDE_IDLE_FROM_OPERS
1457	+	{
1458	+	if (conf_parser_ctx.pass == 1)
1459	+	block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
1460	+	};
1461	+
1462	+
1463		/***************************************************************************
1464		*  section listen
1465		***************************************************************************/
1466		listen_entry: LISTEN
1467		{
1468		if (conf_parser_ctx.pass == 2)
1469	<	{
1470	<	listener_address = NULL;
1444	<	listener_flags = 0;
1445	<	}
1446	<	} '{' listen_items '}' ';'
1447	<	{
1448	<	if (conf_parser_ctx.pass == 2)
1449	<	{
1450	<	MyFree(listener_address);
1451	<	listener_address = NULL;
1452	<	}
1453	<	};
1469	>	reset_block_state();
1470	>	} '{' listen_items '}' ';';
1471
1472		listen_flags: IRCD_FLAGS
1473		{
1474	<	listener_flags = 0;
1474	>	block_state.flags.value = 0;
1475		} '='  listen_flags_items ';';
1476
1477		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1478		listen_flags_item: T_SSL
1479		{
1480		if (conf_parser_ctx.pass == 2)
1481	<	listener_flags |= LISTENER_SSL;
1481	>	block_state.flags.value |= LISTENER_SSL;
1482		} | HIDDEN
1483		{
1484		if (conf_parser_ctx.pass == 2)
1485	<	listener_flags |= LISTENER_HIDDEN;
1485	>	block_state.flags.value |= LISTENER_HIDDEN;
1486		} | T_SERVER
1487		{
1488		if (conf_parser_ctx.pass == 2)
1489	<	listener_flags |= LISTENER_SERVER;
1489	>	block_state.flags.value |= LISTENER_SERVER;
1490		};
1491
1475	–
1476	–
1492		listen_items:   listen_items listen_item | listen_item;
1493		listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';';
1494
1495	<	listen_port: PORT '=' port_items { listener_flags = 0; } ';';
1495	>	listen_port: PORT '=' port_items { block_state.flags.value = 0; } ';';
1496
1497		port_items: port_items ',' port_item | port_item;
1498
#	Line 1485 | Line 1500 | port_item: NUMBER
1500		{
1501		if (conf_parser_ctx.pass == 2)
1502		{
1503	<	if ((listener_flags & LISTENER_SSL))
1503	>	if (block_state.flags.value & LISTENER_SSL)
1504		#ifdef HAVE_LIBCRYPTO
1505		if (!ServerInfo.server_ctx)
1506		#endif
1507		{
1508	<	yyerror("SSL not available - port closed");
1508	>	conf_error_report("SSL not available - port closed");
1509		break;
1510		}
1511	<	add_listener($1, listener_address, listener_flags);
1511	>	add_listener($1, block_state.addr.buf, block_state.flags.value);
1512		}
1513		} | NUMBER TWODOTS NUMBER
1514		{
#	Line 1501 | Line 1516 | port_item: NUMBER
1516		{
1517		int i;
1518
1519	<	if ((listener_flags & LISTENER_SSL))
1519	>	if (block_state.flags.value & LISTENER_SSL)
1520		#ifdef HAVE_LIBCRYPTO
1521		if (!ServerInfo.server_ctx)
1522		#endif
1523		{
1524	<	yyerror("SSL not available - port closed");
1524	>	conf_error_report("SSL not available - port closed");
1525		break;
1526		}
1527
1528		for (i = $1; i <= $3; ++i)
1529	<	add_listener(i, listener_address, listener_flags);
1529	>	add_listener(i, block_state.addr.buf, block_state.flags.value);
1530		}
1531		};
1532
1533		listen_address: IP '=' QSTRING ';'
1534		{
1535		if (conf_parser_ctx.pass == 2)
1536	<	{
1522	<	MyFree(listener_address);
1523	<	DupString(listener_address, yylval.string);
1524	<	}
1536	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1537		};
1538
1539		listen_host: HOST '=' QSTRING ';'
1540		{
1541		if (conf_parser_ctx.pass == 2)
1542	<	{
1531	<	MyFree(listener_address);
1532	<	DupString(listener_address, yylval.string);
1533	<	}
1542	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1543		};
1544
1545		/***************************************************************************
#	Line 1539 | Line 1548 | listen_host: HOST '=' QSTRING ';'
1548		auth_entry: IRCD_AUTH
1549		{
1550		if (conf_parser_ctx.pass == 2)
1551	<	{
1543	<	yy_conf = make_conf_item(CLIENT_TYPE);
1544	<	yy_aconf = map_to_conf(yy_conf);
1545	<	}
1546	<	else
1547	<	{
1548	<	MyFree(class_name);
1549	<	class_name = NULL;
1550	<	}
1551	>	reset_block_state();
1552		} '{' auth_items '}' ';'
1553		{
1554	<	if (conf_parser_ctx.pass == 2)
1554	<	{
1555	<	struct CollectItem *yy_tmp = NULL;
1556	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1557	<
1558	<	if (yy_aconf->user && yy_aconf->host)
1559	<	{
1560	<	conf_add_class_to_conf(yy_conf, class_name);
1561	<	add_conf_by_address(CONF_CLIENT, yy_aconf);
1562	<	}
1563	<	else
1564	<	delete_conf_item(yy_conf);
1565	<
1566	<	/* copy over settings from first struct */
1567	<	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
1568	<	{
1569	<	struct AccessItem *new_aconf;
1570	<	struct ConfItem *new_conf;
1571	<
1572	<	new_conf = make_conf_item(CLIENT_TYPE);
1573	<	new_aconf = map_to_conf(new_conf);
1554	>	dlink_node *ptr = NULL;
1555
1556	<	yy_tmp = ptr->data;
1556	>	if (conf_parser_ctx.pass != 2)
1557	>	break;
1558
1559	<	assert(yy_tmp->user && yy_tmp->host);
1560	<
1561	<	if (yy_aconf->passwd != NULL)
1562	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1581	<	if (yy_conf->name != NULL)
1582	<	DupString(new_conf->name, yy_conf->name);
1583	<	if (yy_aconf->passwd != NULL)
1584	<	DupString(new_aconf->passwd, yy_aconf->passwd);
1585	<
1586	<	new_aconf->flags = yy_aconf->flags;
1587	<	new_aconf->port  = yy_aconf->port;
1559	>	DLINK_FOREACH(ptr, block_state.mask.list.head)
1560	>	{
1561	>	struct MaskItem *conf = NULL;
1562	>	struct split_nuh_item nuh;
1563
1564	<	DupString(new_aconf->user, yy_tmp->user);
1565	<	collapse(new_aconf->user);
1564	>	nuh.nuhmask  = ptr->data;
1565	>	nuh.nickptr  = NULL;
1566	>	nuh.userptr  = block_state.user.buf;
1567	>	nuh.hostptr  = block_state.host.buf;
1568	>	nuh.nicksize = 0;
1569	>	nuh.usersize = sizeof(block_state.user.buf);
1570	>	nuh.hostsize = sizeof(block_state.host.buf);
1571	>	split_nuh(&nuh);
1572
1573	<	DupString(new_aconf->host, yy_tmp->host);
1574	<	collapse(new_aconf->host);
1573	>	conf        = conf_make(CONF_CLIENT);
1574	>	conf->user  = xstrdup(collapse(block_state.user.buf));
1575	>	conf->host  = xstrdup(collapse(block_state.host.buf));
1576	>
1577	>	if (block_state.rpass.buf[0])
1578	>	conf->passwd = xstrdup(block_state.rpass.buf);
1579	>	if (block_state.name.buf[0])
1580	>	conf->name = xstrdup(block_state.name.buf);
1581
1582	<	conf_add_class_to_conf(new_conf, class_name);
1583	<	add_conf_by_address(CONF_CLIENT, new_aconf);
1597	<	dlinkDelete(&yy_tmp->node, &col_conf_list);
1598	<	free_collect_item(yy_tmp);
1599	<	}
1582	>	conf->flags = block_state.flags.value;
1583	>	conf->port  = block_state.port.value;
1584
1585	<	MyFree(class_name);
1586	<	class_name = NULL;
1603	<	yy_conf = NULL;
1604	<	yy_aconf = NULL;
1585	>	conf_add_class_to_conf(conf, block_state.class.buf);
1586	>	add_conf_by_address(CONF_CLIENT, conf);
1587		}
1588		};
1589
#	Line 1613 | Line 1595 | auth_item:      auth_user | auth_passwd
1595		auth_user: USER '=' QSTRING ';'
1596		{
1597		if (conf_parser_ctx.pass == 2)
1598	<	{
1617	<	struct CollectItem *yy_tmp = NULL;
1618	<	struct split_nuh_item nuh;
1619	<
1620	<	nuh.nuhmask  = yylval.string;
1621	<	nuh.nickptr  = NULL;
1622	<	nuh.userptr  = userbuf;
1623	<	nuh.hostptr  = hostbuf;
1624	<
1625	<	nuh.nicksize = 0;
1626	<	nuh.usersize = sizeof(userbuf);
1627	<	nuh.hostsize = sizeof(hostbuf);
1628	<
1629	<	split_nuh(&nuh);
1630	<
1631	<	if (yy_aconf->user == NULL)
1632	<	{
1633	<	DupString(yy_aconf->user, userbuf);
1634	<	DupString(yy_aconf->host, hostbuf);
1635	<	}
1636	<	else
1637	<	{
1638	<	yy_tmp = MyMalloc(sizeof(struct CollectItem));
1639	<
1640	<	DupString(yy_tmp->user, userbuf);
1641	<	DupString(yy_tmp->host, hostbuf);
1642	<
1643	<	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1644	<	}
1645	<	}
1598	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1599		};
1600
1648	–	/* XXX - IP/IPV6 tags don't exist anymore - put IP/IPV6 into user. */
1649	–
1601		auth_passwd: PASSWORD '=' QSTRING ';'
1602		{
1603		if (conf_parser_ctx.pass == 2)
1604	<	{
1654	<	/* be paranoid */
1655	<	if (yy_aconf->passwd != NULL)
1656	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1657	<
1658	<	MyFree(yy_aconf->passwd);
1659	<	DupString(yy_aconf->passwd, yylval.string);
1660	<	}
1604	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1605		};
1606
1607		auth_class: CLASS '=' QSTRING ';'
1608		{
1609		if (conf_parser_ctx.pass == 2)
1610	<	{
1667	<	MyFree(class_name);
1668	<	DupString(class_name, yylval.string);
1669	<	}
1610	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1611		};
1612
1613		auth_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 1674 | Line 1615 | auth_encrypted: ENCRYPTED '=' TBOOL ';'
1615		if (conf_parser_ctx.pass == 2)
1616		{
1617		if (yylval.number)
1618	<	SetConfEncrypted(yy_aconf);
1618	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1619		else
1620	<	ClearConfEncrypted(yy_aconf);
1620	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1621		}
1622		};
1623
1624		auth_flags: IRCD_FLAGS
1625		{
1626	+	if (conf_parser_ctx.pass == 2)
1627	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
1628		} '='  auth_flags_items ';';
1629
1630		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1631		auth_flags_item: SPOOF_NOTICE
1632		{
1633		if (conf_parser_ctx.pass == 2)
1634	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1634	>	block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1635		} | EXCEED_LIMIT
1636		{
1637		if (conf_parser_ctx.pass == 2)
1638	<	yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1638	>	block_state.flags.value |= CONF_FLAGS_NOLIMIT;
1639		} | KLINE_EXEMPT
1640		{
1641		if (conf_parser_ctx.pass == 2)
1642	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1642	>	block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1643		} | NEED_IDENT
1644		{
1645		if (conf_parser_ctx.pass == 2)
1646	<	yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
1646	>	block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
1647		} | CAN_FLOOD
1648		{
1649		if (conf_parser_ctx.pass == 2)
1650	<	yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
1650	>	block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
1651		} | NO_TILDE
1652		{
1653		if (conf_parser_ctx.pass == 2)
1654	<	yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1654	>	block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1655		} | GLINE_EXEMPT
1656		{
1657		if (conf_parser_ctx.pass == 2)
1658	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
1658	>	block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
1659		} | RESV_EXEMPT
1660		{
1661		if (conf_parser_ctx.pass == 2)
1662	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
1662	>	block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
1663	>	} | T_WEBIRC
1664	>	{
1665	>	if (conf_parser_ctx.pass == 2)
1666	>	block_state.flags.value |= CONF_FLAGS_WEBIRC;
1667		} | NEED_PASSWORD
1668		{
1669		if (conf_parser_ctx.pass == 2)
1670	<	yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
1670	>	block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1671		};
1672
1726	–	/* XXX - need check for illegal hostnames here */
1673		auth_spoof: SPOOF '=' QSTRING ';'
1674		{
1675	<	if (conf_parser_ctx.pass == 2)
1676	<	{
1731	<	MyFree(yy_conf->name);
1675	>	if (conf_parser_ctx.pass != 2)
1676	>	break;
1677
1678	<	if (strlen(yylval.string) < HOSTLEN)
1679	<	{
1680	<	DupString(yy_conf->name, yylval.string);
1681	<	yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
1737	<	}
1738	<	else
1739	<	{
1740	<	ilog(LOG_TYPE_IRCD, "Spoofs must be less than %d..ignoring it", HOSTLEN);
1741	<	yy_conf->name = NULL;
1742	<	}
1678	>	if (strlen(yylval.string) <= HOSTLEN && valid_hostname(yylval.string))
1679	>	{
1680	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1681	>	block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
1682		}
1683	+	else
1684	+	ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
1685		};
1686
1687		auth_redir_serv: REDIRSERV '=' QSTRING ';'
1688		{
1689	<	if (conf_parser_ctx.pass == 2)
1690	<	{
1691	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1692	<	MyFree(yy_conf->name);
1693	<	DupString(yy_conf->name, yylval.string);
1753	<	}
1689	>	if (conf_parser_ctx.pass != 2)
1690	>	break;
1691	>
1692	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1693	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1694		};
1695
1696		auth_redir_port: REDIRPORT '=' NUMBER ';'
1697		{
1698	<	if (conf_parser_ctx.pass == 2)
1699	<	{
1700	<	yy_aconf->flags |= CONF_FLAGS_REDIR;
1701	<	yy_aconf->port = $3;
1702	<	}
1698	>	if (conf_parser_ctx.pass != 2)
1699	>	break;
1700	>
1701	>	block_state.flags.value |= CONF_FLAGS_REDIR;
1702	>	block_state.port.value = $3;
1703		};
1704
1705
#	Line 1768 | Line 1708 | auth_redir_port: REDIRPORT '=' NUMBER ';
1708		***************************************************************************/
1709		resv_entry: RESV
1710		{
1711	<	if (conf_parser_ctx.pass == 2)
1712	<	{
1713	<	MyFree(resv_reason);
1714	<	resv_reason = NULL;
1715	<	}
1711	>	if (conf_parser_ctx.pass != 2)
1712	>	break;
1713	>
1714	>	reset_block_state();
1715	>	strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
1716		} '{' resv_items '}' ';'
1717		{
1718	<	if (conf_parser_ctx.pass == 2)
1719	<	{
1720	<	MyFree(resv_reason);
1721	<	resv_reason = NULL;
1782	<	}
1718	>	if (conf_parser_ctx.pass != 2)
1719	>	break;
1720	>
1721	>	create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1722		};
1723
1724		resv_items:     resv_items resv_item | resv_item;
1725	<	resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
1725	>	resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1726
1727	<	resv_creason: REASON '=' QSTRING ';'
1727	>	resv_mask: MASK '=' QSTRING ';'
1728		{
1729		if (conf_parser_ctx.pass == 2)
1730	<	{
1792	<	MyFree(resv_reason);
1793	<	DupString(resv_reason, yylval.string);
1794	<	}
1730	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1731		};
1732
1733	<	resv_channel: CHANNEL '=' QSTRING ';'
1733	>	resv_reason: REASON '=' QSTRING ';'
1734		{
1735		if (conf_parser_ctx.pass == 2)
1736	<	{
1801	<	if (IsChanPrefix(*yylval.string))
1802	<	{
1803	<	char def_reason[] = "No reason";
1804	<
1805	<	create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1806	<	}
1807	<	}
1808	<	/* ignore it for now.. but we really should make a warning if
1809	<	* its an erroneous name --fl_ */
1736	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1737		};
1738
1739	<	resv_nick: NICK '=' QSTRING ';'
1739	>	resv_exempt: EXEMPT '=' QSTRING ';'
1740		{
1741		if (conf_parser_ctx.pass == 2)
1742	<	{
1816	<	char def_reason[] = "No reason";
1817	<
1818	<	create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
1819	<	}
1742	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1743		};
1744
1745	+
1746		/***************************************************************************
1747		*  section service
1748		***************************************************************************/
#	Line 1833 | Line 1757 | service_name: NAME '=' QSTRING ';'
1757		{
1758		if (valid_servname(yylval.string))
1759		{
1760	<	yy_conf = make_conf_item(SERVICE_TYPE);
1761	<	DupString(yy_conf->name, yylval.string);
1760	>	struct MaskItem *conf = conf_make(CONF_SERVICE);
1761	>	conf->name = xstrdup(yylval.string);
1762		}
1763		}
1764		};
#	Line 1844 | Line 1768 | service_name: NAME '=' QSTRING ';'
1768		***************************************************************************/
1769		shared_entry: T_SHARED
1770		{
1771	<	if (conf_parser_ctx.pass == 2)
1772	<	{
1773	<	yy_conf = make_conf_item(ULINE_TYPE);
1774	<	yy_match_item = map_to_conf(yy_conf);
1775	<	yy_match_item->action = SHARED_ALL;
1776	<	}
1771	>	if (conf_parser_ctx.pass != 2)
1772	>	break;
1773	>
1774	>	reset_block_state();
1775	>
1776	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1777	>	strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
1778	>	strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
1779	>	block_state.flags.value = SHARED_ALL;
1780		} '{' shared_items '}' ';'
1781		{
1782	<	if (conf_parser_ctx.pass == 2)
1783	<	{
1784	<	yy_conf = NULL;
1785	<	}
1782	>	struct MaskItem *conf = NULL;
1783	>
1784	>	if (conf_parser_ctx.pass != 2)
1785	>	break;
1786	>
1787	>	conf = conf_make(CONF_ULINE);
1788	>	conf->flags = block_state.flags.value;
1789	>	conf->name = xstrdup(block_state.name.buf);
1790	>	conf->user = xstrdup(block_state.user.buf);
1791	>	conf->host = xstrdup(block_state.host.buf);
1792		};
1793
1794		shared_items: shared_items shared_item | shared_item;
#	Line 1864 | Line 1797 | shared_item:  shared_name | shared_user
1797		shared_name: NAME '=' QSTRING ';'
1798		{
1799		if (conf_parser_ctx.pass == 2)
1800	<	{
1868	<	MyFree(yy_conf->name);
1869	<	DupString(yy_conf->name, yylval.string);
1870	<	}
1800	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1801		};
1802
1803		shared_user: USER '=' QSTRING ';'
#	Line 1878 | Line 1808 | shared_user: USER '=' QSTRING ';'
1808
1809		nuh.nuhmask  = yylval.string;
1810		nuh.nickptr  = NULL;
1811	<	nuh.userptr  = userbuf;
1812	<	nuh.hostptr  = hostbuf;
1811	>	nuh.userptr  = block_state.user.buf;
1812	>	nuh.hostptr  = block_state.host.buf;
1813
1814		nuh.nicksize = 0;
1815	<	nuh.usersize = sizeof(userbuf);
1816	<	nuh.hostsize = sizeof(hostbuf);
1815	>	nuh.usersize = sizeof(block_state.user.buf);
1816	>	nuh.hostsize = sizeof(block_state.host.buf);
1817
1818		split_nuh(&nuh);
1889	–
1890	–	DupString(yy_match_item->user, userbuf);
1891	–	DupString(yy_match_item->host, hostbuf);
1819		}
1820		};
1821
1822		shared_type: TYPE
1823		{
1824		if (conf_parser_ctx.pass == 2)
1825	<	yy_match_item->action = 0;
1825	>	block_state.flags.value = 0;
1826		} '=' shared_types ';' ;
1827
1828		shared_types: shared_types ',' shared_type_item | shared_type_item;
1829		shared_type_item: KLINE
1830		{
1831		if (conf_parser_ctx.pass == 2)
1832	<	yy_match_item->action |= SHARED_KLINE;
1832	>	block_state.flags.value |= SHARED_KLINE;
1833		} | UNKLINE
1834		{
1835		if (conf_parser_ctx.pass == 2)
1836	<	yy_match_item->action |= SHARED_UNKLINE;
1836	>	block_state.flags.value |= SHARED_UNKLINE;
1837		} | T_DLINE
1838		{
1839		if (conf_parser_ctx.pass == 2)
1840	<	yy_match_item->action |= SHARED_DLINE;
1840	>	block_state.flags.value |= SHARED_DLINE;
1841		} | T_UNDLINE
1842		{
1843		if (conf_parser_ctx.pass == 2)
1844	<	yy_match_item->action |= SHARED_UNDLINE;
1844	>	block_state.flags.value |= SHARED_UNDLINE;
1845		} | XLINE
1846		{
1847		if (conf_parser_ctx.pass == 2)
1848	<	yy_match_item->action |= SHARED_XLINE;
1848	>	block_state.flags.value |= SHARED_XLINE;
1849		} | T_UNXLINE
1850		{
1851		if (conf_parser_ctx.pass == 2)
1852	<	yy_match_item->action |= SHARED_UNXLINE;
1852	>	block_state.flags.value |= SHARED_UNXLINE;
1853		} | RESV
1854		{
1855		if (conf_parser_ctx.pass == 2)
1856	<	yy_match_item->action |= SHARED_RESV;
1856	>	block_state.flags.value |= SHARED_RESV;
1857		} | T_UNRESV
1858		{
1859		if (conf_parser_ctx.pass == 2)
1860	<	yy_match_item->action |= SHARED_UNRESV;
1860	>	block_state.flags.value |= SHARED_UNRESV;
1861		} | T_LOCOPS
1862		{
1863		if (conf_parser_ctx.pass == 2)
1864	<	yy_match_item->action |= SHARED_LOCOPS;
1864	>	block_state.flags.value |= SHARED_LOCOPS;
1865		} | T_ALL
1866		{
1867		if (conf_parser_ctx.pass == 2)
1868	<	yy_match_item->action = SHARED_ALL;
1868	>	block_state.flags.value = SHARED_ALL;
1869		};
1870
1871		/***************************************************************************
#	Line 1946 | Line 1873 | shared_type_item: KLINE
1873		***************************************************************************/
1874		cluster_entry: T_CLUSTER
1875		{
1876	<	if (conf_parser_ctx.pass == 2)
1877	<	{
1878	<	yy_conf = make_conf_item(CLUSTER_TYPE);
1879	<	yy_conf->flags = SHARED_ALL;
1880	<	}
1876	>	if (conf_parser_ctx.pass != 2)
1877	>	break;
1878	>
1879	>	reset_block_state();
1880	>
1881	>	strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1882	>	block_state.flags.value = SHARED_ALL;
1883		} '{' cluster_items '}' ';'
1884		{
1885	<	if (conf_parser_ctx.pass == 2)
1886	<	{
1887	<	if (yy_conf->name == NULL)
1888	<	DupString(yy_conf->name, "*");
1889	<	yy_conf = NULL;
1890	<	}
1885	>	struct MaskItem *conf = NULL;
1886	>
1887	>	if (conf_parser_ctx.pass != 2)
1888	>	break;
1889	>
1890	>	conf = conf_make(CONF_CLUSTER);
1891	>	conf->flags = block_state.flags.value;
1892	>	conf->name = xstrdup(block_state.name.buf);
1893		};
1894
1895		cluster_items:  cluster_items cluster_item | cluster_item;
#	Line 1967 | Line 1898 | cluster_item:  cluster_name | cluster_typ
1898		cluster_name: NAME '=' QSTRING ';'
1899		{
1900		if (conf_parser_ctx.pass == 2)
1901	<	DupString(yy_conf->name, yylval.string);
1901	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1902		};
1903
1904		cluster_type: TYPE
1905		{
1906		if (conf_parser_ctx.pass == 2)
1907	<	yy_conf->flags = 0;
1907	>	block_state.flags.value = 0;
1908		} '=' cluster_types ';' ;
1909
1910		cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1911		cluster_type_item: KLINE
1912		{
1913		if (conf_parser_ctx.pass == 2)
1914	<	yy_conf->flags |= SHARED_KLINE;
1914	>	block_state.flags.value |= SHARED_KLINE;
1915		} | UNKLINE
1916		{
1917		if (conf_parser_ctx.pass == 2)
1918	<	yy_conf->flags |= SHARED_UNKLINE;
1918	>	block_state.flags.value |= SHARED_UNKLINE;
1919		} | T_DLINE
1920		{
1921		if (conf_parser_ctx.pass == 2)
1922	<	yy_conf->flags |= SHARED_DLINE;
1922	>	block_state.flags.value |= SHARED_DLINE;
1923		} | T_UNDLINE
1924		{
1925		if (conf_parser_ctx.pass == 2)
1926	<	yy_conf->flags |= SHARED_UNDLINE;
1926	>	block_state.flags.value |= SHARED_UNDLINE;
1927		} | XLINE
1928		{
1929		if (conf_parser_ctx.pass == 2)
1930	<	yy_conf->flags |= SHARED_XLINE;
1930	>	block_state.flags.value |= SHARED_XLINE;
1931		} | T_UNXLINE
1932		{
1933		if (conf_parser_ctx.pass == 2)
1934	<	yy_conf->flags |= SHARED_UNXLINE;
1934	>	block_state.flags.value |= SHARED_UNXLINE;
1935		} | RESV
1936		{
1937		if (conf_parser_ctx.pass == 2)
1938	<	yy_conf->flags |= SHARED_RESV;
1938	>	block_state.flags.value |= SHARED_RESV;
1939		} | T_UNRESV
1940		{
1941		if (conf_parser_ctx.pass == 2)
1942	<	yy_conf->flags |= SHARED_UNRESV;
1942	>	block_state.flags.value |= SHARED_UNRESV;
1943		} | T_LOCOPS
1944		{
1945		if (conf_parser_ctx.pass == 2)
1946	<	yy_conf->flags |= SHARED_LOCOPS;
1946	>	block_state.flags.value |= SHARED_LOCOPS;
1947		} | T_ALL
1948		{
1949		if (conf_parser_ctx.pass == 2)
1950	<	yy_conf->flags = SHARED_ALL;
1950	>	block_state.flags.value = SHARED_ALL;
1951		};
1952
1953		/***************************************************************************
#	Line 2024 | Line 1955 | cluster_type_item: KLINE
1955		***************************************************************************/
1956		connect_entry: CONNECT
1957		{
2027	–	if (conf_parser_ctx.pass == 2)
2028	–	{
2029	–	yy_conf = make_conf_item(SERVER_TYPE);
2030	–	yy_aconf = map_to_conf(yy_conf);
1958
1959	<	/* defaults */
1960	<	yy_aconf->port = PORTNUM;
1961	<	}
1962	<	else
1963	<	{
2037	<	MyFree(class_name);
2038	<	class_name = NULL;
2039	<	}
1959	>	if (conf_parser_ctx.pass != 2)
1960	>	break;
1961	>
1962	>	reset_block_state();
1963	>	block_state.port.value = PORTNUM;
1964		} '{' connect_items '}' ';'
1965		{
1966	<	if (conf_parser_ctx.pass == 2)
1966	>	struct MaskItem *conf = NULL;
1967	>	struct addrinfo hints, *res;
1968	>
1969	>	if (conf_parser_ctx.pass != 2)
1970	>	break;
1971	>
1972	>	if (!block_state.name.buf[0] ||
1973	>	!block_state.host.buf[0])
1974	>	break;
1975	>
1976	>	if (!(block_state.rpass.buf[0] ||
1977	>	block_state.spass.buf[0]))
1978	>	break;
1979	>
1980	>	if (has_wildcards(block_state.name.buf) ||
1981	>	has_wildcards(block_state.host.buf))
1982	>	break;
1983	>
1984	>	conf = conf_make(CONF_SERVER);
1985	>	conf->port = block_state.port.value;
1986	>	conf->flags = block_state.flags.value;
1987	>	conf->aftype = block_state.aftype.value;
1988	>	conf->host = xstrdup(block_state.host.buf);
1989	>	conf->name = xstrdup(block_state.name.buf);
1990	>	conf->passwd = xstrdup(block_state.rpass.buf);
1991	>	conf->spasswd = xstrdup(block_state.spass.buf);
1992	>	conf->cipher_list = xstrdup(block_state.ciph.buf);
1993	>
1994	>	dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
1995	>	dlinkMoveList(&block_state.hub.list, &conf->hub_list);
1996	>
1997	>	if (block_state.bind.buf[0])
1998		{
1999	<	if (yy_aconf->host && yy_aconf->passwd && yy_aconf->spasswd)
2000	<	{
2001	<	if (conf_add_server(yy_conf, class_name) == -1)
2002	<	delete_conf_item(yy_conf);
2003	<	}
1999	>	memset(&hints, 0, sizeof(hints));
2000	>
2001	>	hints.ai_family   = AF_UNSPEC;
2002	>	hints.ai_socktype = SOCK_STREAM;
2003	>	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2004	>
2005	>	if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2006	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2007		else
2008		{
2009	<	if (yy_conf->name != NULL)
2052	<	{
2053	<	if (yy_aconf->host == NULL)
2054	<	yyerror("Ignoring connect block -- missing host");
2055	<	else if (!yy_aconf->passwd || !yy_aconf->spasswd)
2056	<	yyerror("Ignoring connect block -- missing password");
2057	<	}
2009	>	assert(res != NULL);
2010
2011	<	/* XXX
2012	<	* This fixes a try_connections() core (caused by invalid class_ptr
2013	<	* pointers) reported by metalrock. That's an ugly fix, but there
2014	<	* is currently no better way. The entire config subsystem needs an
2063	<	* rewrite ASAP. make_conf_item() shouldn't really add things onto
2064	<	* a doubly linked list immediately without any sanity checks!  -Michael
2065	<	*/
2066	<	delete_conf_item(yy_conf);
2011	>	memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2012	>	conf->bind.ss.ss_family = res->ai_family;
2013	>	conf->bind.ss_len = res->ai_addrlen;
2014	>	freeaddrinfo(res);
2015		}
2068	–
2069	–	MyFree(class_name);
2070	–	class_name = NULL;
2071	–	yy_conf = NULL;
2072	–	yy_aconf = NULL;
2016		}
2017	+
2018	+	conf_add_class_to_conf(conf, block_state.class.buf);
2019	+	lookup_confhost(conf);
2020		};
2021
2022		connect_items:  connect_items connect_item | connect_item;
#	Line 2084 | Line 2030 | connect_item:   connect_name | connect_h
2030		connect_name: NAME '=' QSTRING ';'
2031		{
2032		if (conf_parser_ctx.pass == 2)
2033	<	{
2088	<	MyFree(yy_conf->name);
2089	<	DupString(yy_conf->name, yylval.string);
2090	<	}
2033	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2034		};
2035
2036		connect_host: HOST '=' QSTRING ';'
2037		{
2038		if (conf_parser_ctx.pass == 2)
2039	<	{
2097	<	MyFree(yy_aconf->host);
2098	<	DupString(yy_aconf->host, yylval.string);
2099	<	}
2039	>	strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2040		};
2041
2042		connect_vhost: VHOST '=' QSTRING ';'
2043		{
2044		if (conf_parser_ctx.pass == 2)
2045	<	{
2106	<	struct addrinfo hints, *res;
2107	<
2108	<	memset(&hints, 0, sizeof(hints));
2109	<
2110	<	hints.ai_family   = AF_UNSPEC;
2111	<	hints.ai_socktype = SOCK_STREAM;
2112	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2113	<
2114	<	if (getaddrinfo(yylval.string, NULL, &hints, &res))
2115	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
2116	<	else
2117	<	{
2118	<	assert(res != NULL);
2119	<
2120	<	memcpy(&yy_aconf->bind, res->ai_addr, res->ai_addrlen);
2121	<	yy_aconf->bind.ss.ss_family = res->ai_family;
2122	<	yy_aconf->bind.ss_len = res->ai_addrlen;
2123	<	freeaddrinfo(res);
2124	<	}
2125	<	}
2045	>	strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2046		};
2047
2048		connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2049		{
2050	<	if (conf_parser_ctx.pass == 2)
2051	<	{
2132	<	if ($3[0] == ':')
2133	<	yyerror("Server passwords cannot begin with a colon");
2134	<	else if (strchr($3, ' ') != NULL)
2135	<	yyerror("Server passwords cannot contain spaces");
2136	<	else {
2137	<	if (yy_aconf->spasswd != NULL)
2138	<	memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
2050	>	if (conf_parser_ctx.pass != 2)
2051	>	break;
2052
2053	<	MyFree(yy_aconf->spasswd);
2054	<	DupString(yy_aconf->spasswd, yylval.string);
2055	<	}
2056	<	}
2053	>	if ($3[0] == ':')
2054	>	conf_error_report("Server passwords cannot begin with a colon");
2055	>	else if (strchr($3, ' ') != NULL)
2056	>	conf_error_report("Server passwords cannot contain spaces");
2057	>	else
2058	>	strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
2059		};
2060
2061		connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2062		{
2063	<	if (conf_parser_ctx.pass == 2)
2064	<	{
2150	<	if ($3[0] == ':')
2151	<	yyerror("Server passwords cannot begin with a colon");
2152	<	else if (strchr($3, ' ') != NULL)
2153	<	yyerror("Server passwords cannot contain spaces");
2154	<	else {
2155	<	if (yy_aconf->passwd != NULL)
2156	<	memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
2063	>	if (conf_parser_ctx.pass != 2)
2064	>	break;
2065
2066	<	MyFree(yy_aconf->passwd);
2067	<	DupString(yy_aconf->passwd, yylval.string);
2068	<	}
2069	<	}
2066	>	if ($3[0] == ':')
2067	>	conf_error_report("Server passwords cannot begin with a colon");
2068	>	else if (strchr($3, ' ') != NULL)
2069	>	conf_error_report("Server passwords cannot contain spaces");
2070	>	else
2071	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2072		};
2073
2074		connect_port: PORT '=' NUMBER ';'
2075		{
2076		if (conf_parser_ctx.pass == 2)
2077	<	yy_aconf->port = $3;
2077	>	block_state.port.value = $3;
2078		};
2079
2080		connect_aftype: AFTYPE '=' T_IPV4 ';'
2081		{
2082		if (conf_parser_ctx.pass == 2)
2083	<	yy_aconf->aftype = AF_INET;
2083	>	block_state.aftype.value = AF_INET;
2084		} | AFTYPE '=' T_IPV6 ';'
2085		{
2086		#ifdef IPV6
2087		if (conf_parser_ctx.pass == 2)
2088	<	yy_aconf->aftype = AF_INET6;
2088	>	block_state.aftype.value = AF_INET6;
2089		#endif
2090		};
2091
2092		connect_flags: IRCD_FLAGS
2093		{
2094	+	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2095		} '='  connect_flags_items ';';
2096
2097		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2098		connect_flags_item: AUTOCONN
2099		{
2100		if (conf_parser_ctx.pass == 2)
2101	<	SetConfAllowAutoConn(yy_aconf);
2191	<	} | BURST_AWAY
2192	<	{
2193	<	if (conf_parser_ctx.pass == 2)
2194	<	SetConfAwayBurst(yy_aconf);
2195	<	} | TOPICBURST
2196	<	{
2197	<	if (conf_parser_ctx.pass == 2)
2198	<	SetConfTopicBurst(yy_aconf);
2101	>	block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2102		} | T_SSL
2103		{
2104		if (conf_parser_ctx.pass == 2)
2105	<	SetConfSSL(yy_aconf);
2105	>	block_state.flags.value |= CONF_FLAGS_SSL;
2106		};
2107
2108		connect_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 2207 | Line 2110 | connect_encrypted: ENCRYPTED '=' TBOOL '
2110		if (conf_parser_ctx.pass == 2)
2111		{
2112		if (yylval.number)
2113	<	yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
2113	>	block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
2114		else
2115	<	yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
2115	>	block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
2116		}
2117		};
2118
2119		connect_hub_mask: HUB_MASK '=' QSTRING ';'
2120		{
2121		if (conf_parser_ctx.pass == 2)
2122	<	{
2220	<	char *mask;
2221	<
2222	<	DupString(mask, yylval.string);
2223	<	dlinkAdd(mask, make_dlink_node(), &yy_aconf->hub_list);
2224	<	}
2122	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2123		};
2124
2125		connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2126		{
2127		if (conf_parser_ctx.pass == 2)
2128	<	{
2231	<	char *mask;
2232	<
2233	<	DupString(mask, yylval.string);
2234	<	dlinkAdd(mask, make_dlink_node(), &yy_aconf->leaf_list);
2235	<	}
2128	>	dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
2129		};
2130
2131		connect_class: CLASS '=' QSTRING ';'
2132		{
2133		if (conf_parser_ctx.pass == 2)
2134	<	{
2242	<	MyFree(class_name);
2243	<	DupString(class_name, yylval.string);
2244	<	}
2134	>	strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2135		};
2136
2137		connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2138		{
2139		#ifdef HAVE_LIBCRYPTO
2140		if (conf_parser_ctx.pass == 2)
2141	<	{
2252	<	MyFree(yy_aconf->cipher_list);
2253	<	DupString(yy_aconf->cipher_list, yylval.string);
2254	<	}
2141	>	strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2142		#else
2143		if (conf_parser_ctx.pass == 2)
2144	<	yyerror("Ignoring connect::ciphers -- no OpenSSL support");
2144	>	conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
2145		#endif
2146		};
2147
#	Line 2265 | Line 2152 | connect_ssl_cipher_list: T_SSL_CIPHER_LI
2152		kill_entry: KILL
2153		{
2154		if (conf_parser_ctx.pass == 2)
2155	<	{
2269	<	userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
2270	<	regex_ban = 0;
2271	<	}
2155	>	reset_block_state();
2156		} '{' kill_items '}' ';'
2157		{
2158	<	if (conf_parser_ctx.pass == 2)
2275	<	{
2276	<	if (userbuf[0] && hostbuf[0])
2277	<	{
2278	<	if (regex_ban)
2279	<	{
2280	<	#ifdef HAVE_LIBPCRE
2281	<	void *exp_user = NULL;
2282	<	void *exp_host = NULL;
2283	<	const char *errptr = NULL;
2284	<
2285	<	if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
2286	<	!(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
2287	<	{
2288	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: %s",
2289	<	errptr);
2290	<	break;
2291	<	}
2292	<
2293	<	yy_aconf = map_to_conf(make_conf_item(RKLINE_TYPE));
2294	<	yy_aconf->regexuser = exp_user;
2295	<	yy_aconf->regexhost = exp_host;
2296	<
2297	<	DupString(yy_aconf->user, userbuf);
2298	<	DupString(yy_aconf->host, hostbuf);
2158	>	struct MaskItem *conf = NULL;
2159
2160	<	if (reasonbuf[0])
2161	<	DupString(yy_aconf->reason, reasonbuf);
2302	<	else
2303	<	DupString(yy_aconf->reason, "No reason");
2304	<	#else
2305	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: no PCRE support");
2306	<	break;
2307	<	#endif
2308	<	}
2309	<	else
2310	<	{
2311	<	find_and_delete_temporary(userbuf, hostbuf, CONF_KLINE);
2312	<
2313	<	yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
2160	>	if (conf_parser_ctx.pass != 2)
2161	>	break;
2162
2163	<	DupString(yy_aconf->user, userbuf);
2164	<	DupString(yy_aconf->host, hostbuf);
2163	>	if (!block_state.user.buf[0] ||
2164	>	!block_state.host.buf[0])
2165	>	break;
2166
2167	<	if (reasonbuf[0])
2168	<	DupString(yy_aconf->reason, reasonbuf);
2169	<	else
2321	<	DupString(yy_aconf->reason, "No reason");
2322	<	add_conf_by_address(CONF_KLINE, yy_aconf);
2323	<	}
2324	<	}
2167	>	conf = conf_make(CONF_KLINE);
2168	>	conf->user = xstrdup(block_state.user.buf);
2169	>	conf->host = xstrdup(block_state.host.buf);
2170
2171	<	yy_aconf = NULL;
2172	<	}
2171	>	if (block_state.rpass.buf[0])
2172	>	conf->reason = xstrdup(block_state.rpass.buf);
2173	>	else
2174	>	conf->reason = xstrdup(CONF_NOREASON);
2175	>	add_conf_by_address(CONF_KLINE, conf);
2176		};
2177
2330	–	kill_type: TYPE
2331	–	{
2332	–	} '='  kill_type_items ';';
2333	–
2334	–	kill_type_items: kill_type_items ',' kill_type_item | kill_type_item;
2335	–	kill_type_item: REGEX_T
2336	–	{
2337	–	if (conf_parser_ctx.pass == 2)
2338	–	regex_ban = 1;
2339	–	};
2340	–
2178		kill_items:     kill_items kill_item | kill_item;
2179	<	kill_item:      kill_user | kill_reason | kill_type | error;
2179	>	kill_item:      kill_user | kill_reason | error;
2180
2181		kill_user: USER '=' QSTRING ';'
2182		{
2183	+
2184		if (conf_parser_ctx.pass == 2)
2185		{
2186		struct split_nuh_item nuh;
2187
2188		nuh.nuhmask  = yylval.string;
2189		nuh.nickptr  = NULL;
2190	<	nuh.userptr  = userbuf;
2191	<	nuh.hostptr  = hostbuf;
2190	>	nuh.userptr  = block_state.user.buf;
2191	>	nuh.hostptr  = block_state.host.buf;
2192
2193		nuh.nicksize = 0;
2194	<	nuh.usersize = sizeof(userbuf);
2195	<	nuh.hostsize = sizeof(hostbuf);
2194	>	nuh.usersize = sizeof(block_state.user.buf);
2195	>	nuh.hostsize = sizeof(block_state.host.buf);
2196
2197		split_nuh(&nuh);
2198		}
#	Line 2363 | Line 2201 | kill_user: USER '=' QSTRING ';'
2201		kill_reason: REASON '=' QSTRING ';'
2202		{
2203		if (conf_parser_ctx.pass == 2)
2204	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2204	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2205		};
2206
2207		/***************************************************************************
#	Line 2372 | Line 2210 | kill_reason: REASON '=' QSTRING ';'
2210		deny_entry: DENY
2211		{
2212		if (conf_parser_ctx.pass == 2)
2213	<	hostbuf[0] = reasonbuf[0] = '\0';
2213	>	reset_block_state();
2214		} '{' deny_items '}' ';'
2215		{
2216	<	if (conf_parser_ctx.pass == 2)
2379	<	{
2380	<	if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
2381	<	{
2382	<	find_and_delete_temporary(NULL, hostbuf, CONF_DLINE);
2216	>	struct MaskItem *conf = NULL;
2217
2218	<	yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
2219	<	DupString(yy_aconf->host, hostbuf);
2218	>	if (conf_parser_ctx.pass != 2)
2219	>	break;
2220
2221	<	if (reasonbuf[0])
2222	<	DupString(yy_aconf->reason, reasonbuf);
2223	<	else
2224	<	DupString(yy_aconf->reason, "No reason");
2225	<	add_conf_by_address(CONF_DLINE, yy_aconf);
2226	<	yy_aconf = NULL;
2227	<	}
2221	>	if (!block_state.addr.buf[0])
2222	>	break;
2223	>
2224	>	if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2225	>	{
2226	>	conf = conf_make(CONF_DLINE);
2227	>	conf->host = xstrdup(block_state.addr.buf);
2228	>
2229	>	if (block_state.rpass.buf[0])
2230	>	conf->reason = xstrdup(block_state.rpass.buf);
2231	>	else
2232	>	conf->reason = xstrdup(CONF_NOREASON);
2233	>	add_conf_by_address(CONF_DLINE, conf);
2234		}
2235		};
2236
#	Line 2400 | Line 2240 | deny_item:      deny_ip | deny_reason |
2240		deny_ip: IP '=' QSTRING ';'
2241		{
2242		if (conf_parser_ctx.pass == 2)
2243	<	strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
2243	>	strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2244		};
2245
2246		deny_reason: REASON '=' QSTRING ';'
2247		{
2248		if (conf_parser_ctx.pass == 2)
2249	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2249	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2250		};
2251
2252		/***************************************************************************
#	Line 2423 | Line 2263 | exempt_ip: IP '=' QSTRING ';'
2263		{
2264		if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2265		{
2266	<	yy_aconf = map_to_conf(make_conf_item(EXEMPTDLINE_TYPE));
2267	<	DupString(yy_aconf->host, yylval.string);
2266	>	struct MaskItem *conf = conf_make(CONF_EXEMPT);
2267	>	conf->host = xstrdup(yylval.string);
2268
2269	<	add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
2430	<	yy_aconf = NULL;
2269	>	add_conf_by_address(CONF_EXEMPT, conf);
2270		}
2271		}
2272		};
#	Line 2438 | Line 2277 | exempt_ip: IP '=' QSTRING ';'
2277		gecos_entry: GECOS
2278		{
2279		if (conf_parser_ctx.pass == 2)
2280	<	{
2442	<	regex_ban = 0;
2443	<	reasonbuf[0] = gecos_name[0] = '\0';
2444	<	}
2280	>	reset_block_state();
2281		} '{' gecos_items '}' ';'
2282		{
2283	<	if (conf_parser_ctx.pass == 2)
2448	<	{
2449	<	if (gecos_name[0])
2450	<	{
2451	<	if (regex_ban)
2452	<	{
2453	<	#ifdef HAVE_LIBPCRE
2454	<	void *exp_p = NULL;
2455	<	const char *errptr = NULL;
2456	<
2457	<	if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
2458	<	{
2459	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: %s",
2460	<	errptr);
2461	<	break;
2462	<	}
2463	<
2464	<	yy_conf = make_conf_item(RXLINE_TYPE);
2465	<	yy_conf->regexpname = exp_p;
2466	<	#else
2467	<	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: no PCRE support");
2468	<	break;
2469	<	#endif
2470	<	}
2471	<	else
2472	<	yy_conf = make_conf_item(XLINE_TYPE);
2283	>	struct MaskItem *conf = NULL;
2284
2285	<	yy_match_item = map_to_conf(yy_conf);
2286	<	DupString(yy_conf->name, gecos_name);
2285	>	if (conf_parser_ctx.pass != 2)
2286	>	break;
2287
2288	<	if (reasonbuf[0])
2289	<	DupString(yy_match_item->reason, reasonbuf);
2479	<	else
2480	<	DupString(yy_match_item->reason, "No reason");
2481	<	}
2482	<	}
2483	<	};
2288	>	if (!block_state.name.buf[0])
2289	>	break;
2290
2291	<	gecos_flags: TYPE
2292	<	{
2487	<	} '='  gecos_flags_items ';';
2291	>	conf = conf_make(CONF_XLINE);
2292	>	conf->name = xstrdup(block_state.name.buf);
2293
2294	<	gecos_flags_items: gecos_flags_items ',' gecos_flags_item | gecos_flags_item;
2295	<	gecos_flags_item: REGEX_T
2296	<	{
2297	<	if (conf_parser_ctx.pass == 2)
2493	<	regex_ban = 1;
2294	>	if (block_state.rpass.buf[0])
2295	>	conf->reason = xstrdup(block_state.rpass.buf);
2296	>	else
2297	>	conf->reason = xstrdup(CONF_NOREASON);
2298		};
2299
2300		gecos_items: gecos_items gecos_item | gecos_item;
2301	<	gecos_item:  gecos_name | gecos_reason | gecos_flags | error;
2301	>	gecos_item:  gecos_name | gecos_reason | error;
2302
2303		gecos_name: NAME '=' QSTRING ';'
2304		{
2305		if (conf_parser_ctx.pass == 2)
2306	<	strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
2306	>	strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2307		};
2308
2309		gecos_reason: REASON '=' QSTRING ';'
2310		{
2311		if (conf_parser_ctx.pass == 2)
2312	<	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2312	>	strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2313		};
2314
2315		/***************************************************************************
#	Line 2520 | Line 2324 | general_item:       general_hide_spoof_i
2324		general_max_nick_time | general_max_nick_changes |
2325		general_max_accept | general_anti_spam_exit_message_time |
2326		general_ts_warn_delta | general_ts_max_delta |
2327	<	general_kill_chase_time_limit | general_kline_with_reason |
2328	<	general_kline_reason | general_invisible_on_connect |
2327	>	general_kill_chase_time_limit |
2328	>	general_invisible_on_connect |
2329		general_warn_no_nline | general_dots_in_ident |
2330		general_stats_o_oper_only | general_stats_k_oper_only |
2331		general_pace_wait | general_stats_i_oper_only |
2332		general_pace_wait_simple | general_stats_P_oper_only |
2333		general_short_motd | general_no_oper_flood |
2334		general_true_no_oper_flood | general_oper_pass_resv |
2531	–	general_message_locale |
2335		general_oper_only_umodes | general_max_targets |
2336		general_use_egd | general_egdpool_path |
2337		general_oper_umodes | general_caller_id_wait |
2338		general_opers_bypass_callerid | general_default_floodcount |
2339		general_min_nonwildcard | general_min_nonwildcard_simple |
2340		general_disable_remote_commands |
2538	–	general_client_flood |
2341		general_throttle_time | general_havent_read_conf |
2342		general_ping_cookie |
2343		general_disable_auth |
2344	<	general_tkline_expire_notices | general_gline_min_cidr |
2345	<	general_gline_min_cidr6 | general_use_whois_actually |
2346	<	general_reject_hold_time | general_stats_e_disabled |
2344	>	general_tkline_expire_notices | general_gline_enable |
2345	>	general_gline_duration | general_gline_request_duration |
2346	>	general_gline_min_cidr |
2347	>	general_gline_min_cidr6 |
2348	>	general_stats_e_disabled |
2349		general_max_watch | general_services_name |
2350		error;
2351
#	Line 2551 | Line 2355 | general_max_watch: MAX_WATCH '=' NUMBER
2355		ConfigFileEntry.max_watch = $3;
2356		};
2357
2358	<	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2358	>	general_gline_enable: GLINE_ENABLE '=' TBOOL ';'
2359		{
2360	<	ConfigFileEntry.gline_min_cidr = $3;
2360	>	if (conf_parser_ctx.pass == 2)
2361	>	ConfigFileEntry.glines = yylval.number;
2362		};
2363
2364	<	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2364	>	general_gline_duration: GLINE_DURATION '=' timespec ';'
2365		{
2366	<	ConfigFileEntry.gline_min_cidr6 = $3;
2366	>	if (conf_parser_ctx.pass == 2)
2367	>	ConfigFileEntry.gline_time = $3;
2368		};
2369
2370	<	general_use_whois_actually: USE_WHOIS_ACTUALLY '=' TBOOL ';'
2370	>	general_gline_request_duration: GLINE_REQUEST_DURATION '=' timespec ';'
2371		{
2372	<	ConfigFileEntry.use_whois_actually = yylval.number;
2372	>	if (conf_parser_ctx.pass == 2)
2373	>	ConfigFileEntry.gline_request_time = $3;
2374		};
2375
2376	<	general_reject_hold_time: TREJECT_HOLD_TIME '=' timespec ';'
2376	>	general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2377		{
2378	<	GlobalSetOptions.rejecttime = yylval.number;
2378	>	ConfigFileEntry.gline_min_cidr = $3;
2379	>	};
2380	>
2381	>	general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
2382	>	{
2383	>	ConfigFileEntry.gline_min_cidr6 = $3;
2384		};
2385
2386		general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
#	Line 2648 | Line 2460 | general_havent_read_conf: HAVENT_READ_CO
2460		}
2461		};
2462
2651	–	general_kline_with_reason: KLINE_WITH_REASON '=' TBOOL ';'
2652	–	{
2653	–	ConfigFileEntry.kline_with_reason = yylval.number;
2654	–	};
2655	–
2656	–	general_kline_reason: KLINE_REASON '=' QSTRING ';'
2657	–	{
2658	–	if (conf_parser_ctx.pass == 2)
2659	–	{
2660	–	MyFree(ConfigFileEntry.kline_reason);
2661	–	DupString(ConfigFileEntry.kline_reason, yylval.string);
2662	–	}
2663	–	};
2664	–
2463		general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2464		{
2465		ConfigFileEntry.invisible_on_connect = yylval.number;
#	Line 2743 | Line 2541 | general_oper_pass_resv: OPER_PASS_RESV '
2541		ConfigFileEntry.oper_pass_resv = yylval.number;
2542		};
2543
2746	–	general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
2747	–	{
2748	–	if (conf_parser_ctx.pass == 2)
2749	–	{
2750	–	if (strlen(yylval.string) > LOCALE_LENGTH-2)
2751	–	yylval.string[LOCALE_LENGTH-1] = '\0';
2752	–
2753	–	set_locale(yylval.string);
2754	–	}
2755	–	};
2756	–
2544		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2545		{
2546		ConfigFileEntry.dots_in_ident = $3;
#	Line 2774 | Line 2561 | general_egdpool_path: EGDPOOL_PATH '=' Q
2561		if (conf_parser_ctx.pass == 2)
2562		{
2563		MyFree(ConfigFileEntry.egdpool_path);
2564	<	DupString(ConfigFileEntry.egdpool_path, yylval.string);
2564	>	ConfigFileEntry.egdpool_path = xstrdup(yylval.string);
2565		}
2566		};
2567
#	Line 2783 | Line 2570 | general_services_name: T_SERVICES_NAME '
2570		if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2571		{
2572		MyFree(ConfigFileEntry.service_name);
2573	<	DupString(ConfigFileEntry.service_name, yylval.string);
2573	>	ConfigFileEntry.service_name = xstrdup(yylval.string);
2574		}
2575		};
2576
#	Line 2868 | Line 2655 | umode_oitem:     T_BOTS
2655		} | T_LOCOPS
2656		{
2657		ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
2658	+	} | T_FARCONNECT
2659	+	{
2660	+	ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT;
2661		};
2662
2663		general_oper_only_umodes: OPER_ONLY_UMODES
#	Line 2936 | Line 2726 | umode_item:    T_BOTS
2726		} | T_LOCOPS
2727		{
2728		ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
2729	+	} | T_NONONREG
2730	+	{
2731	+	ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
2732	+	} | T_FARCONNECT
2733	+	{
2734	+	ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT;
2735		};
2736
2737		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
#	Line 2953 | Line 2749 | general_default_floodcount: DEFAULT_FLOO
2749		ConfigFileEntry.default_floodcount = $3;
2750		};
2751
2956	–	general_client_flood: T_CLIENT_FLOOD '=' sizespec ';'
2957	–	{
2958	–	ConfigFileEntry.client_flood = $3;
2959	–	};
2960	–
2961	–
2962	–	/***************************************************************************
2963	–	*  section glines
2964	–	***************************************************************************/
2965	–	gline_entry: GLINES
2966	–	{
2967	–	if (conf_parser_ctx.pass == 2)
2968	–	{
2969	–	yy_conf = make_conf_item(GDENY_TYPE);
2970	–	yy_aconf = map_to_conf(yy_conf);
2971	–	}
2972	–	} '{' gline_items '}' ';'
2973	–	{
2974	–	if (conf_parser_ctx.pass == 2)
2975	–	{
2976	–	/*
2977	–	* since we re-allocate yy_conf/yy_aconf after the end of action=, at the
2978	–	* end we will have one extra, so we should free it.
2979	–	*/
2980	–	if (yy_conf->name == NULL || yy_aconf->user == NULL)
2981	–	{
2982	–	delete_conf_item(yy_conf);
2983	–	yy_conf = NULL;
2984	–	yy_aconf = NULL;
2985	–	}
2986	–	}
2987	–	};
2988	–
2989	–	gline_items:        gline_items gline_item | gline_item;
2990	–	gline_item:         gline_enable |
2991	–	gline_duration |
2992	–	gline_logging |
2993	–	gline_user |
2994	–	gline_server |
2995	–	gline_action |
2996	–	error;
2997	–
2998	–	gline_enable: ENABLE '=' TBOOL ';'
2999	–	{
3000	–	if (conf_parser_ctx.pass == 2)
3001	–	ConfigFileEntry.glines = yylval.number;
3002	–	};
3003	–
3004	–	gline_duration: DURATION '=' timespec ';'
3005	–	{
3006	–	if (conf_parser_ctx.pass == 2)
3007	–	ConfigFileEntry.gline_time = $3;
3008	–	};
3009	–
3010	–	gline_logging: T_LOG
3011	–	{
3012	–	if (conf_parser_ctx.pass == 2)
3013	–	ConfigFileEntry.gline_logging = 0;
3014	–	} '=' gline_logging_types ';';
3015	–	gline_logging_types:     gline_logging_types ',' gline_logging_type_item | gline_logging_type_item;
3016	–	gline_logging_type_item: T_REJECT
3017	–	{
3018	–	if (conf_parser_ctx.pass == 2)
3019	–	ConfigFileEntry.gline_logging |= GDENY_REJECT;
3020	–	} | T_BLOCK
3021	–	{
3022	–	if (conf_parser_ctx.pass == 2)
3023	–	ConfigFileEntry.gline_logging |= GDENY_BLOCK;
3024	–	};
3025	–
3026	–	gline_user: USER '=' QSTRING ';'
3027	–	{
3028	–	if (conf_parser_ctx.pass == 2)
3029	–	{
3030	–	struct split_nuh_item nuh;
3031	–
3032	–	nuh.nuhmask  = yylval.string;
3033	–	nuh.nickptr  = NULL;
3034	–	nuh.userptr  = userbuf;
3035	–	nuh.hostptr  = hostbuf;
3036	–
3037	–	nuh.nicksize = 0;
3038	–	nuh.usersize = sizeof(userbuf);
3039	–	nuh.hostsize = sizeof(hostbuf);
3040	–
3041	–	split_nuh(&nuh);
3042	–
3043	–	if (yy_aconf->user == NULL)
3044	–	{
3045	–	DupString(yy_aconf->user, userbuf);
3046	–	DupString(yy_aconf->host, hostbuf);
3047	–	}
3048	–	else
3049	–	{
3050	–	struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
3051	–
3052	–	DupString(yy_tmp->user, userbuf);
3053	–	DupString(yy_tmp->host, hostbuf);
3054	–
3055	–	dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
3056	–	}
3057	–	}
3058	–	};
3059	–
3060	–	gline_server: NAME '=' QSTRING ';'
3061	–	{
3062	–	if (conf_parser_ctx.pass == 2)
3063	–	{
3064	–	MyFree(yy_conf->name);
3065	–	DupString(yy_conf->name, yylval.string);
3066	–	}
3067	–	};
3068	–
3069	–	gline_action: ACTION
3070	–	{
3071	–	if (conf_parser_ctx.pass == 2)
3072	–	yy_aconf->flags = 0;
3073	–	} '=' gdeny_types ';'
3074	–	{
3075	–	if (conf_parser_ctx.pass == 2)
3076	–	{
3077	–	struct CollectItem *yy_tmp = NULL;
3078	–	dlink_node *ptr, *next_ptr;
3079	–
3080	–	DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3081	–	{
3082	–	struct AccessItem *new_aconf;
3083	–	struct ConfItem *new_conf;
3084	–
3085	–	yy_tmp = ptr->data;
3086	–	new_conf = make_conf_item(GDENY_TYPE);
3087	–	new_aconf = map_to_conf(new_conf);
3088	–
3089	–	new_aconf->flags = yy_aconf->flags;
3090	–
3091	–	if (yy_conf->name != NULL)
3092	–	DupString(new_conf->name, yy_conf->name);
3093	–	else
3094	–	DupString(new_conf->name, "*");
3095	–	if (yy_aconf->user != NULL)
3096	–	DupString(new_aconf->user, yy_tmp->user);
3097	–	else
3098	–	DupString(new_aconf->user, "*");
3099	–	if (yy_aconf->host != NULL)
3100	–	DupString(new_aconf->host, yy_tmp->host);
3101	–	else
3102	–	DupString(new_aconf->host, "*");
3103	–
3104	–	dlinkDelete(&yy_tmp->node, &col_conf_list);
3105	–	}
3106	–
3107	–	/*
3108	–	* In case someone has fed us with more than one action= after user/name
3109	–	* which would leak memory  -Michael
3110	–	*/
3111	–	if (yy_conf->name == NULL || yy_aconf->user == NULL)
3112	–	delete_conf_item(yy_conf);
3113	–
3114	–	yy_conf = make_conf_item(GDENY_TYPE);
3115	–	yy_aconf = map_to_conf(yy_conf);
3116	–	}
3117	–	};
3118	–
3119	–	gdeny_types: gdeny_types ',' gdeny_type_item | gdeny_type_item;
3120	–	gdeny_type_item: T_REJECT
3121	–	{
3122	–	if (conf_parser_ctx.pass == 2)
3123	–	yy_aconf->flags |= GDENY_REJECT;
3124	–	} | T_BLOCK
3125	–	{
3126	–	if (conf_parser_ctx.pass == 2)
3127	–	yy_aconf->flags |= GDENY_BLOCK;
3128	–	};
2752
2753		/***************************************************************************
2754		*  section channel
#	Line 3134 | Line 2757 | channel_entry: CHANNEL
2757		'{' channel_items '}' ';';
2758
2759		channel_items:      channel_items channel_item | channel_item;
2760	<	channel_item:       channel_disable_local_channels | channel_use_except |
2761	<	channel_use_invex | channel_use_knock |
2762	<	channel_max_bans | channel_knock_delay |
2763	<	channel_knock_delay_channel | channel_max_chans_per_user |
3141	<	channel_quiet_on_ban | channel_default_split_user_count |
2760	>	channel_item:       channel_max_bans |
2761	>	channel_knock_delay | channel_knock_delay_channel |
2762	>	channel_max_chans_per_user | channel_max_chans_per_oper |
2763	>	channel_default_split_user_count |
2764		channel_default_split_server_count |
2765	<	channel_no_create_on_split | channel_restrict_channels |
2766	<	channel_no_join_on_split | channel_burst_topicwho |
2765	>	channel_no_create_on_split |
2766	>	channel_no_join_on_split |
2767		channel_jflood_count | channel_jflood_time |
2768		channel_disable_fake_channels | error;
2769
#	Line 3150 | Line 2772 | channel_disable_fake_channels: DISABLE_F
2772		ConfigChannel.disable_fake_channels = yylval.number;
2773		};
2774
3153	–	channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
3154	–	{
3155	–	ConfigChannel.restrict_channels = yylval.number;
3156	–	};
3157	–
3158	–	channel_disable_local_channels: DISABLE_LOCAL_CHANNELS '=' TBOOL ';'
3159	–	{
3160	–	ConfigChannel.disable_local_channels = yylval.number;
3161	–	};
3162	–
3163	–	channel_use_except: USE_EXCEPT '=' TBOOL ';'
3164	–	{
3165	–	ConfigChannel.use_except = yylval.number;
3166	–	};
3167	–
3168	–	channel_use_invex: USE_INVEX '=' TBOOL ';'
3169	–	{
3170	–	ConfigChannel.use_invex = yylval.number;
3171	–	};
3172	–
3173	–	channel_use_knock: USE_KNOCK '=' TBOOL ';'
3174	–	{
3175	–	ConfigChannel.use_knock = yylval.number;
3176	–	};
3177	–
2775		channel_knock_delay: KNOCK_DELAY '=' timespec ';'
2776		{
2777		ConfigChannel.knock_delay = $3;
#	Line 3190 | Line 2787 | channel_max_chans_per_user: MAX_CHANS_PE
2787		ConfigChannel.max_chans_per_user = $3;
2788		};
2789
2790	<	channel_quiet_on_ban: QUIET_ON_BAN '=' TBOOL ';'
2790	>	channel_max_chans_per_oper: MAX_CHANS_PER_OPER '=' NUMBER ';'
2791		{
2792	<	ConfigChannel.quiet_on_ban = yylval.number;
2792	>	ConfigChannel.max_chans_per_oper = $3;
2793		};
2794
2795		channel_max_bans: MAX_BANS '=' NUMBER ';'
#	Line 3220 | Line 2817 | channel_no_join_on_split: NO_JOIN_ON_SPL
2817		ConfigChannel.no_join_on_split = yylval.number;
2818		};
2819
3223	–	channel_burst_topicwho: BURST_TOPICWHO '=' TBOOL ';'
3224	–	{
3225	–	ConfigChannel.burst_topicwho = yylval.number;
3226	–	};
3227	–
2820		channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
2821		{
2822		GlobalSetOptions.joinfloodcount = yylval.number;
#	Line 3243 | Line 2835 | serverhide_entry: SERVERHIDE
2835
2836		serverhide_items:   serverhide_items serverhide_item | serverhide_item;
2837		serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
2838	+	serverhide_hide_services |
2839		serverhide_links_delay |
3247	–	serverhide_disable_hidden |
2840		serverhide_hidden | serverhide_hidden_name |
2841		serverhide_hide_server_ips |
2842		error;
#	Line 3261 | Line 2853 | serverhide_hide_servers: HIDE_SERVERS '=
2853		ConfigServerHide.hide_servers = yylval.number;
2854		};
2855
2856	+	serverhide_hide_services: HIDE_SERVICES '=' TBOOL ';'
2857	+	{
2858	+	if (conf_parser_ctx.pass == 2)
2859	+	ConfigServerHide.hide_services = yylval.number;
2860	+	};
2861	+
2862		serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2863		{
2864		if (conf_parser_ctx.pass == 2)
2865		{
2866		MyFree(ConfigServerHide.hidden_name);
2867	<	DupString(ConfigServerHide.hidden_name, yylval.string);
2867	>	ConfigServerHide.hidden_name = xstrdup(yylval.string);
2868		}
2869		};
2870
#	Line 3290 | Line 2888 | serverhide_hidden: HIDDEN '=' TBOOL ';'
2888		ConfigServerHide.hidden = yylval.number;
2889		};
2890
3293	–	serverhide_disable_hidden: DISABLE_HIDDEN '=' TBOOL ';'
3294	–	{
3295	–	if (conf_parser_ctx.pass == 2)
3296	–	ConfigServerHide.disable_hidden = yylval.number;
3297	–	};
3298	–
2891		serverhide_hide_server_ips: HIDE_SERVER_IPS '=' TBOOL ';'
2892		{
2893		if (conf_parser_ctx.pass == 2)

Diff Legend

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