ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/conf_parser.y

Comparing:
ircd-hybrid-7.2/src/ircd_parser.y (file contents), Revision 967 by michael, Sun Aug 2 18:05:28 2009 UTC vs.
ircd-hybrid-8/src/conf_parser.y (file contents), Revision 1352 by michael, Fri Apr 13 09:57:08 2012 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  ircd_parser.y: Parses the ircd configuration file.
3	>	*  conf_parser.y: Parses the ircd configuration file.
4		*
5		*  Copyright (C) 2005 by the past and present ircd coders, and others.
6		*
#	Line 28 | Line 28
28		#include <sys/types.h>
29		#include <string.h>
30
31	+	#include "config.h"
32		#include "stdinc.h"
33		#include "ircd.h"
33	–	#include "tools.h"
34		#include "list.h"
35	<	#include "s_conf.h"
35	>	#include "conf.h"
36		#include "event.h"
37	<	#include "s_log.h"
37	>	#include "log.h"
38		#include "client.h"     /* for UMODE_ALL only */
39	–	#include "pcre.h"
39		#include "irc_string.h"
41	–	#include "irc_getaddrinfo.h"
40		#include "sprintf_irc.h"
41		#include "memory.h"
42		#include "modules.h"
#	Line 54 | Line 52
52		#include <openssl/rsa.h>
53		#include <openssl/bio.h>
54		#include <openssl/pem.h>
55	+	#include <openssl/dh.h>
56		#endif
57
58	+	int yylex(void);
59	+
60		static char *class_name = NULL;
61		static struct ConfItem *yy_conf = NULL;
62		static struct AccessItem *yy_aconf = NULL;
#	Line 72 | Line 73 | 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	<
77	<	extern dlink_list gdeny_items; /* XXX */
78	<
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;
80	–	static int not_atom = 0;
81
82		struct CollectItem
83		{
#	Line 151 | Line 151 | unhook_hub_leaf_confs(void)
151		%token  BYTES KBYTES MBYTES GBYTES TBYTES
152		%token  CALLER_ID_WAIT
153		%token  CAN_FLOOD
154	–	%token  CAN_IDLE
154		%token  CHANNEL
155		%token  CIDR_BITLEN_IPV4
156		%token  CIDR_BITLEN_IPV6
158	–	%token  CIPHER_PREFERENCE
157		%token  CLASS
160	–	%token  COMPRESSED
161	–	%token  COMPRESSION_LEVEL
158		%token  CONNECT
159		%token  CONNECTFREQ
164	–	%token  CRYPTLINK
165	–	%token  DEFAULT_CIPHER_PREFERENCE
160		%token  DEFAULT_FLOODCOUNT
161		%token  DEFAULT_SPLIT_SERVER_COUNT
162		%token  DEFAULT_SPLIT_USER_COUNT
#	Line 174 | Line 168 | unhook_hub_leaf_confs(void)
168		%token  DISABLE_HIDDEN
169		%token  DISABLE_LOCAL_CHANNELS
170		%token  DISABLE_REMOTE_COMMANDS
177	–	%token  DOT_IN_IP6_ADDR
171		%token  DOTS_IN_IDENT
172		%token  DURATION
173		%token  EGDPOOL_PATH
#	Line 184 | Line 177 | unhook_hub_leaf_confs(void)
177		%token  EXCEED_LIMIT
178		%token  EXEMPT
179		%token  FAILED_OPER_NOTICE
187	–	%token  FAKENAME
180		%token  IRCD_FLAGS
181		%token  FLATTEN_LINKS
190	–	%token  FFAILED_OPERLOG
191	–	%token  FKILLLOG
192	–	%token  FKLINELOG
193	–	%token  FGLINELOG
194	–	%token  FIOERRLOG
195	–	%token  FOPERLOG
196	–	%token  FOPERSPYLOG
197	–	%token  FUSERLOG
182		%token  GECOS
183		%token  GENERAL
184		%token  GLINE
185		%token  GLINES
186		%token  GLINE_EXEMPT
203	–	%token  GLINE_LOG
187		%token  GLINE_TIME
188		%token  GLINE_MIN_CIDR
189		%token  GLINE_MIN_CIDR6
#	Line 209 | Line 192 | unhook_hub_leaf_confs(void)
192		%token  NEED_IDENT
193		%token  HAVENT_READ_CONF
194		%token  HIDDEN
212	–	%token  HIDDEN_ADMIN
195		%token  HIDDEN_NAME
214	–	%token  HIDDEN_OPER
196		%token  HIDE_SERVER_IPS
197		%token  HIDE_SERVERS
198		%token  HIDE_SPOOF_IPS
199		%token  HOST
200		%token  HUB
201		%token  HUB_MASK
221	–	%token  IDLETIME
202		%token  IGNORE_BOGUS_TS
203		%token  INVISIBLE_ON_CONNECT
204		%token  IP
#	Line 234 | Line 214 | unhook_hub_leaf_confs(void)
214		%token  LINKS_DELAY
215		%token  LISTEN
216		%token  T_LOG
237	–	%token  LOGGING
238	–	%token  LOG_LEVEL
217		%token  MAX_ACCEPT
218		%token  MAX_BANS
219		%token  MAX_CHANS_PER_USER
#	Line 262 | Line 240 | unhook_hub_leaf_confs(void)
240		%token  NO_JOIN_ON_SPLIT
241		%token  NO_OPER_FLOOD
242		%token  NO_TILDE
265	–	%token  NOT
243		%token  NUMBER
244		%token  NUMBER_PER_IDENT
245		%token  NUMBER_PER_CIDR
#	Line 270 | Line 247 | unhook_hub_leaf_confs(void)
247		%token  NUMBER_PER_IP_GLOBAL
248		%token  OPERATOR
249		%token  OPERS_BYPASS_CALLERID
273	–	%token  OPER_LOG
250		%token  OPER_ONLY_UMODES
251		%token  OPER_PASS_RESV
252		%token  OPER_SPY_T
#	Line 300 | Line 276 | unhook_hub_leaf_confs(void)
276		%token  RSA_PRIVATE_KEY_FILE
277		%token  RSA_PUBLIC_KEY_FILE
278		%token  SSL_CERTIFICATE_FILE
279	<	%token  T_SSL_CONNECTION_METHOD
279	>	%token  SSL_DH_PARAM_FILE
280	>	%token  T_SSL_CLIENT_METHOD
281	>	%token  T_SSL_SERVER_METHOD
282		%token  T_SSLV3
283		%token  T_TLSV1
284		%token  RESV
#	Line 310 | Line 288 | unhook_hub_leaf_confs(void)
288		%token  SEND_PASSWORD
289		%token  SERVERHIDE
290		%token  SERVERINFO
313	–	%token  SERVLINK_PATH
291		%token  IRCD_SID
292		%token  TKLINE_EXPIRE_NOTICES
293		%token  T_SHARED
#	Line 337 | Line 314 | unhook_hub_leaf_confs(void)
314		%token  T_CALLERID
315		%token  T_CCONN
316		%token  T_CCONN_FULL
317	+	%token  T_SSL_CIPHER_LIST
318		%token  T_CLIENT_FLOOD
319		%token  T_DEAF
320		%token  T_DEBUG
321	+	%token  T_DLINE
322		%token  T_DRONE
323		%token  T_EXTERNAL
324		%token  T_FULL
#	Line 347 | Line 326 | unhook_hub_leaf_confs(void)
326		%token  T_IPV4
327		%token  T_IPV6
328		%token  T_LOCOPS
350	–	%token  T_LOGPATH
351	–	%token  T_L_CRIT
352	–	%token  T_L_DEBUG
353	–	%token  T_L_ERROR
354	–	%token  T_L_INFO
355	–	%token  T_L_NOTICE
356	–	%token  T_L_TRACE
357	–	%token  T_L_WARN
329		%token  T_MAX_CLIENTS
330		%token  T_NCHANGE
331		%token  T_OPERWALL
#	Line 366 | Line 337 | unhook_hub_leaf_confs(void)
337		%token  T_SSL
338		%token  T_UMODES
339		%token  T_UNAUTH
340	+	%token  T_UNDLINE
341	+	%token  T_UNLIMITED
342		%token  T_UNRESV
343		%token  T_UNXLINE
344	+	%token  T_GLOBOPS
345		%token  T_WALLOP
346	+	%token  T_RESTART
347	+	%token  T_SERVICE
348	+	%token  T_SERVICES_NAME
349		%token  THROTTLE_TIME
350		%token  TOPICBURST
351		%token  TRUE_NO_OPER_FLOOD
#	Line 388 | Line 365 | unhook_hub_leaf_confs(void)
365		%token  XLINE
366		%token  WARN
367		%token  WARN_NO_NLINE
368	+	%token  T_SIZE
369	+	%token  T_FILE
370
371		%type <string> QSTRING
372		%type <number> NUMBER
#	Line 411 | Line 390 | conf_item:        admin_entry
390		| serverinfo_entry
391		| serverhide_entry
392		| resv_entry
393	+	| service_entry
394		| shared_entry
395		| cluster_entry
396		| connect_entry
#	Line 472 | Line 452 | modules_item:   modules_module | modules
452
453		modules_module: MODULE '=' QSTRING ';'
454		{
475	–	#ifndef STATIC_MODULES /* NOOP in the static case */
455		if (conf_parser_ctx.pass == 2)
456	<	{
478	<	char *m_bn;
479	<
480	<	m_bn = basename(yylval.string);
481	<
482	<	/* I suppose we should just ignore it if it is already loaded(since
483	<	* otherwise we would flood the opers on rehash) -A1kmm.
484	<	*/
485	<	add_conf_module(yylval.string);
486	<	}
487	<	#endif
456	>	add_conf_module(libio_basename(yylval.string));
457		};
458
459		modules_path: PATH '=' QSTRING ';'
460		{
492	–	#ifndef STATIC_MODULES
461		if (conf_parser_ctx.pass == 2)
462		mod_add_path(yylval.string);
495	–	#endif
463		};
464
465
#	Line 502 | Line 469 | serverinfo_items:       serverinfo_items
469		serverinfo_item:        serverinfo_name | serverinfo_vhost |
470		serverinfo_hub | serverinfo_description |
471		serverinfo_network_name | serverinfo_network_desc |
472	<	serverinfo_max_clients |
472	>	serverinfo_max_clients | serverinfo_ssl_dh_param_file |
473		serverinfo_rsa_private_key_file | serverinfo_vhost6 |
474		serverinfo_sid | serverinfo_ssl_certificate_file |
475	<	serverinfo_ssl_connection_method |
475	>	serverinfo_ssl_client_method | serverinfo_ssl_server_method |
476	>	serverinfo_ssl_cipher_list |
477		error ';' ;
478
479
480	<	serverinfo_ssl_connection_method: T_SSL_CONNECTION_METHOD
480	>	serverinfo_ssl_client_method: T_SSL_CLIENT_METHOD '=' client_method_types ';' ;
481	>	serverinfo_ssl_server_method: T_SSL_SERVER_METHOD '=' server_method_types ';' ;
482	>
483	>	client_method_types: client_method_types ',' client_method_type_item | client_method_type_item;
484	>	client_method_type_item: T_SSLV3
485		{
486	<	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
487	<	ServerInfo.tls_version = 0;
488	<	} '=' method_types ';'
486	>	#ifdef HAVE_LIBCRYPTO
487	>	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
488	>	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv3);
489	>	#endif
490	>	} | T_TLSV1
491		{
492	<	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
493	<	{
494	<	if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_SSLV3))
495	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
522	<	if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_TLSV1))
523	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
524	<	}
492	>	#ifdef HAVE_LIBCRYPTO
493	>	if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
494	>	SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_TLSv1);
495	>	#endif
496		};
497
498	<	method_types: method_types ',' method_type_item | method_type_item;
499	<	method_type_item: T_SSLV3
498	>	server_method_types: server_method_types ',' server_method_type_item | server_method_type_item;
499	>	server_method_type_item: T_SSLV3
500		{
501	<	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
502	<	ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_SSLV3;
501	>	#ifdef HAVE_LIBCRYPTO
502	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
503	>	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
504	>	#endif
505		} | T_TLSV1
506		{
507	<	if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
508	<	ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_TLSV1;
507	>	#ifdef HAVE_LIBCRYPTO
508	>	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
509	>	SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
510	>	#endif
511		};
512
513		serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
#	Line 547 | Line 522 | serverinfo_ssl_certificate_file: SSL_CER
522		}
523
524		if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
525	+	SSL_FILETYPE_PEM) <= 0 ||
526	+	SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
527		SSL_FILETYPE_PEM) <= 0)
528		{
529		yyerror(ERR_lib_error_string(ERR_get_error()));
#	Line 554 | Line 531 | serverinfo_ssl_certificate_file: SSL_CER
531		}
532
533		if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
534	+	SSL_FILETYPE_PEM) <= 0 ||
535	+	SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
536		SSL_FILETYPE_PEM) <= 0)
537		{
538		yyerror(ERR_lib_error_string(ERR_get_error()));
539		break;
540		}
541
542	<	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx))
542	>	if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
543	>	!SSL_CTX_check_private_key(ServerInfo.client_ctx))
544		{
545		yyerror(ERR_lib_error_string(ERR_get_error()));
546		break;
#	Line 596 | Line 576 | serverinfo_rsa_private_key_file: RSA_PRI
576		break;
577		}
578
579	<	ServerInfo.rsa_private_key = (RSA *)PEM_read_bio_RSAPrivateKey(file, NULL,
600	<	0, NULL);
579	>	ServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
580
581		BIO_set_close(file, BIO_CLOSE);
582		BIO_free(file);
#	Line 629 | Line 608 | serverinfo_rsa_private_key_file: RSA_PRI
608		#endif
609		};
610
611	+	serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
612	+	{
613	+	/* TBD - XXX: error reporting */
614	+	#ifdef HAVE_LIBCRYPTO
615	+	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
616	+	{
617	+	BIO *file = BIO_new_file(yylval.string, "r");
618	+
619	+	if (file)
620	+	{
621	+	DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
622	+
623	+	BIO_free(file);
624	+
625	+	if (dh)
626	+	{
627	+	if (DH_size(dh) < 128)
628	+	ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
629	+	else
630	+	SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
631	+
632	+	DH_free(dh);
633	+	}
634	+	}
635	+	}
636	+	#endif
637	+	};
638	+
639	+	serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
640	+	{
641	+	#ifdef HAVE_LIBCRYPTO
642	+	if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
643	+	SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
644	+	#endif
645	+	};
646	+
647		serverinfo_name: NAME '=' QSTRING ';'
648		{
649		/* this isn't rehashable */
650	<	if (conf_parser_ctx.pass == 2)
650	>	if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
651		{
652	<	if (ServerInfo.name == NULL)
652	>	if (valid_servname(yylval.string))
653	>	DupString(ServerInfo.name, yylval.string);
654	>	else
655		{
656	<	/* the ircd will exit() in main() if we dont set one */
657	<	if (strlen(yylval.string) <= HOSTLEN)
641	<	DupString(ServerInfo.name, yylval.string);
656	>	ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::name -- invalid name. Aborting.");
657	>	exit(0);
658		}
659		}
660		};
#	Line 652 | Line 668 | serverinfo_sid: IRCD_SID '=' QSTRING ';'
668		DupString(ServerInfo.sid, yylval.string);
669		else
670		{
671	<	ilog(L_ERROR, "Ignoring config file entry SID -- invalid SID. Aborting.");
671	>	ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::sid -- invalid SID. Aborting.");
672		exit(0);
673		}
674		}
#	Line 702 | Line 718 | serverinfo_vhost: VHOST '=' QSTRING ';'
718		hints.ai_socktype = SOCK_STREAM;
719		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
720
721	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
722	<	ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
721	>	if (getaddrinfo(yylval.string, NULL, &hints, &res))
722	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
723		else
724		{
725		assert(res != NULL);
#	Line 711 | Line 727 | serverinfo_vhost: VHOST '=' QSTRING ';'
727		memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
728		ServerInfo.ip.ss.ss_family = res->ai_family;
729		ServerInfo.ip.ss_len = res->ai_addrlen;
730	<	irc_freeaddrinfo(res);
730	>	freeaddrinfo(res);
731
732		ServerInfo.specific_ipv4_vhost = 1;
733		}
#	Line 731 | Line 747 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
747		hints.ai_socktype = SOCK_STREAM;
748		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
749
750	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
751	<	ilog(L_ERROR, "Invalid netmask for server vhost6(%s)", yylval.string);
750	>	if (getaddrinfo(yylval.string, NULL, &hints, &res))
751	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
752		else
753		{
754		assert(res != NULL);
#	Line 740 | Line 756 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
756		memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
757		ServerInfo.ip6.ss.ss_family = res->ai_family;
758		ServerInfo.ip6.ss_len = res->ai_addrlen;
759	<	irc_freeaddrinfo(res);
759	>	freeaddrinfo(res);
760
761		ServerInfo.specific_ipv6_vhost = 1;
762		}
#	Line 774 | Line 790 | serverinfo_max_clients: T_MAX_CLIENTS '=
790		serverinfo_hub: HUB '=' TBOOL ';'
791		{
792		if (conf_parser_ctx.pass == 2)
793	<	{
778	<	if (yylval.number)
779	<	{
780	<	ServerInfo.hub = 1;
781	<	delete_capability("HUB");
782	<	add_capability("HUB", CAP_HUB, 1);
783	<	}
784	<	else if (ServerInfo.hub)
785	<	{
786	<
787	<	ServerInfo.hub = 0;
788	<	delete_capability("HUB");
789	<	}
790	<	}
793	>	ServerInfo.hub = yylval.number;
794		};
795
796		/***************************************************************************
#	Line 829 | Line 832 | admin_description: DESCRIPTION '=' QSTRI
832		/***************************************************************************
833		*  section logging
834		***************************************************************************/
835	<	/* XXX */
836	<	logging_entry:          LOGGING  '{' logging_items '}' ';' ;
835	>	logging_entry:          T_LOG  '{' logging_items '}' ';' ;
836	>	logging_items:          logging_items logging_item | logging_item ;
837
838	<	logging_items:          logging_items logging_item |
836	<	logging_item ;
837	<
838	<	logging_item:           logging_path | logging_oper_log |
839	<	logging_log_level |
840	<	logging_use_logging | logging_fuserlog |
841	<	logging_foperlog | logging_fglinelog |
842	<	logging_fklinelog | logging_killlog |
843	<	logging_foperspylog | logging_ioerrlog |
844	<	logging_ffailed_operlog |
838	>	logging_item:           logging_use_logging | logging_file_entry |
839		error ';' ;
840
841	<	logging_path:           T_LOGPATH '=' QSTRING ';'
848	<	{
849	<	};
850	<
851	<	logging_oper_log:       OPER_LOG '=' QSTRING ';'
852	<	{
853	<	};
854	<
855	<	logging_fuserlog: FUSERLOG '=' QSTRING ';'
841	>	logging_use_logging: USE_LOGGING '=' TBOOL ';'
842		{
843		if (conf_parser_ctx.pass == 2)
844	<	strlcpy(ConfigLoggingEntry.userlog, yylval.string,
859	<	sizeof(ConfigLoggingEntry.userlog));
844	>	ConfigLoggingEntry.use_logging = yylval.number;
845		};
846
847	<	logging_ffailed_operlog: FFAILED_OPERLOG '=' QSTRING ';'
847	>	logging_file_entry:
848		{
849	<	if (conf_parser_ctx.pass == 2)
850	<	strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
851	<	sizeof(ConfigLoggingEntry.failed_operlog));
852	<	};
868	<
869	<	logging_foperlog: FOPERLOG '=' QSTRING ';'
849	>	lfile[0] = '\0';
850	>	ltype = 0;
851	>	lsize = 0;
852	>	} T_FILE  '{' logging_file_items '}' ';'
853		{
854	<	if (conf_parser_ctx.pass == 2)
855	<	strlcpy(ConfigLoggingEntry.operlog, yylval.string,
873	<	sizeof(ConfigLoggingEntry.operlog));
854	>	if (conf_parser_ctx.pass == 2 && ltype > 0)
855	>	log_add_file(ltype, lsize, lfile);
856		};
857
858	<	logging_foperspylog: FOPERSPYLOG '=' QSTRING ';'
859	<	{
878	<	if (conf_parser_ctx.pass == 2)
879	<	strlcpy(ConfigLoggingEntry.operspylog, yylval.string,
880	<	sizeof(ConfigLoggingEntry.operspylog));
881	<	};
858	>	logging_file_items: logging_file_items logging_file_item |
859	>	logging_file_item ;
860
861	<	logging_fglinelog: FGLINELOG '=' QSTRING ';'
862	<	{
885	<	if (conf_parser_ctx.pass == 2)
886	<	strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
887	<	sizeof(ConfigLoggingEntry.glinelog));
888	<	};
861	>	logging_file_item:  logging_file_name | logging_file_type |
862	>	logging_file_size | error ';' ;
863
864	<	logging_fklinelog: FKLINELOG '=' QSTRING ';'
864	>	logging_file_name: NAME '=' QSTRING ';'
865		{
866	<	if (conf_parser_ctx.pass == 2)
867	<	strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
894	<	sizeof(ConfigLoggingEntry.klinelog));
895	<	};
866	>	strlcpy(lfile, yylval.string, sizeof(lfile));
867	>	}
868
869	<	logging_ioerrlog: FIOERRLOG '=' QSTRING ';'
869	>	logging_file_size: T_SIZE '=' sizespec ';'
870		{
871	<	if (conf_parser_ctx.pass == 2)
872	<	strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
873	<	sizeof(ConfigLoggingEntry.ioerrlog));
871	>	lsize = $3;
872	>	} | T_SIZE '=' T_UNLIMITED ';'
873	>	{
874	>	lsize = 0;
875		};
876
877	<	logging_killlog: FKILLLOG '=' QSTRING ';'
877	>	logging_file_type: TYPE
878		{
879		if (conf_parser_ctx.pass == 2)
880	<	strlcpy(ConfigLoggingEntry.killlog, yylval.string,
881	<	sizeof(ConfigLoggingEntry.killlog));
909	<	};
880	>	ltype = 0;
881	>	} '='  logging_file_type_items ';' ;
882
883	<	logging_log_level: LOG_LEVEL '=' T_L_CRIT ';'
884	<	{
913	<	if (conf_parser_ctx.pass == 2)
914	<	set_log_level(L_CRIT);
915	<	} | LOG_LEVEL '=' T_L_ERROR ';'
883	>	logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
884	>	logging_file_type_item:  USER
885		{
886		if (conf_parser_ctx.pass == 2)
887	<	set_log_level(L_ERROR);
888	<	} | LOG_LEVEL '=' T_L_WARN ';'
887	>	ltype = LOG_TYPE_USER;
888	>	} | OPERATOR
889		{
890		if (conf_parser_ctx.pass == 2)
891	<	set_log_level(L_WARN);
892	<	} | LOG_LEVEL '=' T_L_NOTICE ';'
891	>	ltype = LOG_TYPE_OPER;
892	>	} | GLINE
893		{
894		if (conf_parser_ctx.pass == 2)
895	<	set_log_level(L_NOTICE);
896	<	} | LOG_LEVEL '=' T_L_TRACE ';'
895	>	ltype = LOG_TYPE_GLINE;
896	>	} | T_DLINE
897		{
898		if (conf_parser_ctx.pass == 2)
899	<	set_log_level(L_TRACE);
900	<	} | LOG_LEVEL '=' T_L_INFO ';'
899	>	ltype = LOG_TYPE_DLINE;
900	>	} | KLINE
901		{
902		if (conf_parser_ctx.pass == 2)
903	<	set_log_level(L_INFO);
904	<	} | LOG_LEVEL '=' T_L_DEBUG ';'
903	>	ltype = LOG_TYPE_KLINE;
904	>	} | KILL
905		{
906		if (conf_parser_ctx.pass == 2)
907	<	set_log_level(L_DEBUG);
908	<	};
940	<
941	<	logging_use_logging: USE_LOGGING '=' TBOOL ';'
907	>	ltype = LOG_TYPE_KILL;
908	>	} | T_DEBUG
909		{
910		if (conf_parser_ctx.pass == 2)
911	<	ConfigLoggingEntry.use_logging = yylval.number;
911	>	ltype = LOG_TYPE_DEBUG;
912		};
913
914	+
915		/***************************************************************************
916		* section oper
917		***************************************************************************/
#	Line 960 | Line 928 | oper_entry: OPERATOR
928		MyFree(class_name);
929		class_name = NULL;
930		}
931	<	} oper_name_b '{' oper_items '}' ';'
931	>	} '{' oper_items '}' ';'
932		{
933		if (conf_parser_ctx.pass == 2)
934		{
#	Line 995 | Line 963 | oper_entry: OPERATOR
963		DupString(new_aconf->host, yy_tmp->host);
964		else
965		DupString(new_aconf->host, "*");
966	+
967	+	new_aconf->type = parse_netmask(new_aconf->host, &new_aconf->ipnum,
968	+	&new_aconf->bits);
969	+
970		conf_add_class_to_conf(new_conf, class_name);
971		if (yy_aconf->passwd != NULL)
972		DupString(new_aconf->passwd, yy_aconf->passwd);
#	Line 1041 | Line 1013 | oper_entry: OPERATOR
1013		}
1014		};
1015
1044	–	oper_name_b: | oper_name_t;
1016		oper_items:     oper_items oper_item | oper_item;
1017	<	oper_item:      oper_name | oper_user | oper_password | oper_hidden_admin |
1018	<	oper_hidden_oper | oper_umodes |
1019	<	oper_class | oper_global_kill | oper_remote |
1049	<	oper_kline | oper_xline | oper_unkline |
1050	<	oper_gline | oper_nick_changes | oper_remoteban |
1051	<	oper_die | oper_rehash | oper_admin | oper_operwall |
1052	<	oper_encrypted | oper_rsa_public_key_file |
1053	<	oper_flags | error ';' ;
1017	>	oper_item:      oper_name | oper_user | oper_password |
1018	>	oper_umodes | oper_class | oper_encrypted |
1019	>	oper_rsa_public_key_file | oper_flags | error ';' ;
1020
1021		oper_name: NAME '=' QSTRING ';'
1022		{
#	Line 1064 | Line 1030 | oper_name: NAME '=' QSTRING ';'
1030		}
1031		};
1032
1067	–	oper_name_t: QSTRING
1068	–	{
1069	–	if (conf_parser_ctx.pass == 2)
1070	–	{
1071	–	if (strlen(yylval.string) > OPERNICKLEN)
1072	–	yylval.string[OPERNICKLEN] = '\0';
1073	–
1074	–	MyFree(yy_conf->name);
1075	–	DupString(yy_conf->name, yylval.string);
1076	–	}
1077	–	};
1078	–
1033		oper_user: USER '=' QSTRING ';'
1034		{
1035		if (conf_parser_ctx.pass == 2)
#	Line 1097 | Line 1051 | oper_user: USER '=' QSTRING ';'
1051		{
1052		DupString(yy_aconf->user, userbuf);
1053		DupString(yy_aconf->host, hostbuf);
1054	+
1055	+	yy_aconf->type = parse_netmask(yy_aconf->host, &yy_aconf->ipnum,
1056	+	&yy_aconf->bits);
1057		}
1058		else
1059		{
#	Line 1215 | Line 1172 | oper_umodes_item:  T_BOTS
1172		{
1173		if (conf_parser_ctx.pass == 2)
1174		yy_aconf->modes |= UMODE_FULL;
1175	+	} | HIDDEN
1176	+	{
1177	+	if (conf_parser_ctx.pass == 2)
1178	+	yy_aconf->modes |= UMODE_HIDDEN;
1179		} | T_SKILL
1180		{
1181		if (conf_parser_ctx.pass == 2)
#	Line 1269 | Line 1230 | oper_umodes_item:  T_BOTS
1230		yy_aconf->modes |= UMODE_LOCOPS;
1231		};
1232
1272	–	oper_global_kill: GLOBAL_KILL '=' TBOOL ';'
1273	–	{
1274	–	if (conf_parser_ctx.pass == 2)
1275	–	{
1276	–	if (yylval.number)
1277	–	yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1278	–	else
1279	–	yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1280	–	}
1281	–	};
1282	–
1283	–	oper_remote: REMOTE '=' TBOOL ';'
1284	–	{
1285	–	if (conf_parser_ctx.pass == 2)
1286	–	{
1287	–	if (yylval.number)
1288	–	yy_aconf->port |= OPER_FLAG_REMOTE;
1289	–	else
1290	–	yy_aconf->port &= ~OPER_FLAG_REMOTE;
1291	–	}
1292	–	};
1293	–
1294	–	oper_remoteban: REMOTEBAN '=' TBOOL ';'
1295	–	{
1296	–	if (conf_parser_ctx.pass == 2)
1297	–	{
1298	–	if (yylval.number)
1299	–	yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1300	–	else
1301	–	yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1302	–	}
1303	–	};
1304	–
1305	–	oper_kline: KLINE '=' TBOOL ';'
1306	–	{
1307	–	if (conf_parser_ctx.pass == 2)
1308	–	{
1309	–	if (yylval.number)
1310	–	yy_aconf->port |= OPER_FLAG_K;
1311	–	else
1312	–	yy_aconf->port &= ~OPER_FLAG_K;
1313	–	}
1314	–	};
1315	–
1316	–	oper_xline: XLINE '=' TBOOL ';'
1317	–	{
1318	–	if (conf_parser_ctx.pass == 2)
1319	–	{
1320	–	if (yylval.number)
1321	–	yy_aconf->port |= OPER_FLAG_X;
1322	–	else
1323	–	yy_aconf->port &= ~OPER_FLAG_X;
1324	–	}
1325	–	};
1326	–
1327	–	oper_unkline: UNKLINE '=' TBOOL ';'
1328	–	{
1329	–	if (conf_parser_ctx.pass == 2)
1330	–	{
1331	–	if (yylval.number)
1332	–	yy_aconf->port |= OPER_FLAG_UNKLINE;
1333	–	else
1334	–	yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1335	–	}
1336	–	};
1337	–
1338	–	oper_gline: GLINE '=' TBOOL ';'
1339	–	{
1340	–	if (conf_parser_ctx.pass == 2)
1341	–	{
1342	–	if (yylval.number)
1343	–	yy_aconf->port |= OPER_FLAG_GLINE;
1344	–	else
1345	–	yy_aconf->port &= ~OPER_FLAG_GLINE;
1346	–	}
1347	–	};
1348	–
1349	–	oper_nick_changes: NICK_CHANGES '=' TBOOL ';'
1350	–	{
1351	–	if (conf_parser_ctx.pass == 2)
1352	–	{
1353	–	if (yylval.number)
1354	–	yy_aconf->port |= OPER_FLAG_N;
1355	–	else
1356	–	yy_aconf->port &= ~OPER_FLAG_N;
1357	–	}
1358	–	};
1359	–
1360	–	oper_die: DIE '=' TBOOL ';'
1361	–	{
1362	–	if (conf_parser_ctx.pass == 2)
1363	–	{
1364	–	if (yylval.number)
1365	–	yy_aconf->port |= OPER_FLAG_DIE;
1366	–	else
1367	–	yy_aconf->port &= ~OPER_FLAG_DIE;
1368	–	}
1369	–	};
1370	–
1371	–	oper_rehash: REHASH '=' TBOOL ';'
1372	–	{
1373	–	if (conf_parser_ctx.pass == 2)
1374	–	{
1375	–	if (yylval.number)
1376	–	yy_aconf->port |= OPER_FLAG_REHASH;
1377	–	else
1378	–	yy_aconf->port &= ~OPER_FLAG_REHASH;
1379	–	}
1380	–	};
1381	–
1382	–	oper_admin: ADMIN '=' TBOOL ';'
1383	–	{
1384	–	if (conf_parser_ctx.pass == 2)
1385	–	{
1386	–	if (yylval.number)
1387	–	yy_aconf->port |= OPER_FLAG_ADMIN;
1388	–	else
1389	–	yy_aconf->port &= ~OPER_FLAG_ADMIN;
1390	–	}
1391	–	};
1392	–
1393	–	oper_hidden_admin: HIDDEN_ADMIN '=' TBOOL ';'
1394	–	{
1395	–	if (conf_parser_ctx.pass == 2)
1396	–	{
1397	–	if (yylval.number)
1398	–	yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1399	–	else
1400	–	yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1401	–	}
1402	–	};
1403	–
1404	–	oper_hidden_oper: HIDDEN_OPER '=' TBOOL ';'
1405	–	{
1406	–	if (conf_parser_ctx.pass == 2)
1407	–	{
1408	–	if (yylval.number)
1409	–	yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1410	–	else
1411	–	yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1412	–	}
1413	–	};
1414	–
1415	–	oper_operwall: T_OPERWALL '=' TBOOL ';'
1416	–	{
1417	–	if (conf_parser_ctx.pass == 2)
1418	–	{
1419	–	if (yylval.number)
1420	–	yy_aconf->port |= OPER_FLAG_OPERWALL;
1421	–	else
1422	–	yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1423	–	}
1424	–	};
1425	–
1233		oper_flags: IRCD_FLAGS
1234		{
1235	+	if (conf_parser_ctx.pass == 2)
1236	+	yy_aconf->port = 0;
1237		} '='  oper_flags_items ';';
1238
1239		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1240	<	oper_flags_item: NOT { not_atom = 1; } oper_flags_item_atom
1432	<	| { not_atom = 0; } oper_flags_item_atom;
1433	<
1434	<	oper_flags_item_atom: GLOBAL_KILL
1240	>	oper_flags_item: GLOBAL_KILL
1241		{
1242		if (conf_parser_ctx.pass == 2)
1243	<	{
1438	<	if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1439	<	else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1440	<	}
1243	>	yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1244		} | REMOTE
1245		{
1246		if (conf_parser_ctx.pass == 2)
1247	<	{
1445	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
1446	<	else yy_aconf->port |= OPER_FLAG_REMOTE;
1447	<	}
1247	>	yy_aconf->port |= OPER_FLAG_REMOTE;
1248		} | KLINE
1249		{
1250		if (conf_parser_ctx.pass == 2)
1251	<	{
1452	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
1453	<	else yy_aconf->port |= OPER_FLAG_K;
1454	<	}
1251	>	yy_aconf->port |= OPER_FLAG_K;
1252		} | UNKLINE
1253		{
1254		if (conf_parser_ctx.pass == 2)
1255	<	{
1256	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1257	<	else yy_aconf->port |= OPER_FLAG_UNKLINE;
1258	<	}
1255	>	yy_aconf->port |= OPER_FLAG_UNKLINE;
1256	>	} | T_DLINE
1257	>	{
1258	>	if (conf_parser_ctx.pass == 2)
1259	>	yy_aconf->port |= OPER_FLAG_DLINE;
1260	>	} | T_UNDLINE
1261	>	{
1262	>	if (conf_parser_ctx.pass == 2)
1263	>	yy_aconf->port |= OPER_FLAG_UNDLINE;
1264		} | XLINE
1265		{
1266		if (conf_parser_ctx.pass == 2)
1267	<	{
1466	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
1467	<	else yy_aconf->port |= OPER_FLAG_X;
1468	<	}
1267	>	yy_aconf->port |= OPER_FLAG_X;
1268		} | GLINE
1269		{
1270		if (conf_parser_ctx.pass == 2)
1271	<	{
1473	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
1474	<	else yy_aconf->port |= OPER_FLAG_GLINE;
1475	<	}
1271	>	yy_aconf->port |= OPER_FLAG_GLINE;
1272		} | DIE
1273		{
1274		if (conf_parser_ctx.pass == 2)
1275	<	{
1276	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
1481	<	else yy_aconf->port |= OPER_FLAG_DIE;
1482	<	}
1483	<	} | REHASH
1275	>	yy_aconf->port |= OPER_FLAG_DIE;
1276	>	} | T_RESTART
1277		{
1278		if (conf_parser_ctx.pass == 2)
1279	<	{
1280	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
1488	<	else yy_aconf->port |= OPER_FLAG_REHASH;
1489	<	}
1490	<	} | ADMIN
1279	>	yy_aconf->port |= OPER_FLAG_RESTART;
1280	>	} | REHASH
1281		{
1282		if (conf_parser_ctx.pass == 2)
1283	<	{
1284	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_ADMIN;
1495	<	else yy_aconf->port |= OPER_FLAG_ADMIN;
1496	<	}
1497	<	} | HIDDEN_ADMIN
1283	>	yy_aconf->port |= OPER_FLAG_REHASH;
1284	>	} | ADMIN
1285		{
1286		if (conf_parser_ctx.pass == 2)
1287	<	{
1501	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1502	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1503	<	}
1287	>	yy_aconf->port |= OPER_FLAG_ADMIN;
1288		} | NICK_CHANGES
1289		{
1290		if (conf_parser_ctx.pass == 2)
1291	<	{
1508	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
1509	<	else yy_aconf->port |= OPER_FLAG_N;
1510	<	}
1291	>	yy_aconf->port |= OPER_FLAG_N;
1292		} | T_OPERWALL
1293		{
1294		if (conf_parser_ctx.pass == 2)
1295	<	{
1296	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1516	<	else yy_aconf->port |= OPER_FLAG_OPERWALL;
1517	<	}
1518	<	} | OPER_SPY_T
1295	>	yy_aconf->port |= OPER_FLAG_OPERWALL;
1296	>	} | T_GLOBOPS
1297		{
1298		if (conf_parser_ctx.pass == 2)
1299	<	{
1300	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
1523	<	else yy_aconf->port |= OPER_FLAG_OPER_SPY;
1524	<	}
1525	<	} | HIDDEN_OPER
1299	>	yy_aconf->port |= OPER_FLAG_GLOBOPS;
1300	>	} | OPER_SPY_T
1301		{
1302		if (conf_parser_ctx.pass == 2)
1303	<	{
1529	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1530	<	else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1531	<	}
1303	>	yy_aconf->port |= OPER_FLAG_OPER_SPY;
1304		} | REMOTEBAN
1305		{
1306		if (conf_parser_ctx.pass == 2)
1307	<	{
1308	<	if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1537	<	else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1538	<	}
1539	<	} | ENCRYPTED
1307	>	yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1308	>	} | MODULE
1309		{
1310		if (conf_parser_ctx.pass == 2)
1311	<	{
1543	<	if (not_atom) ClearConfEncrypted(yy_aconf);
1544	<	else SetConfEncrypted(yy_aconf);
1545	<	}
1311	>	yy_aconf->port |= OPER_FLAG_MODULE;
1312		};
1313
1314
#	Line 1556 | Line 1322 | class_entry: CLASS
1322		yy_conf = make_conf_item(CLASS_TYPE);
1323		yy_class = map_to_conf(yy_conf);
1324		}
1325	<	} class_name_b '{' class_items '}' ';'
1325	>	} '{' class_items '}' ';'
1326		{
1327		if (conf_parser_ctx.pass == 1)
1328		{
#	Line 1567 | Line 1333 | class_entry: CLASS
1333		delete_conf_item(yy_conf);
1334		else
1335		{
1336	<	cconf = find_exact_name_conf(CLASS_TYPE, yy_class_name, NULL, NULL);
1336	>	cconf = find_exact_name_conf(CLASS_TYPE, NULL, yy_class_name, NULL, NULL);
1337
1338		if (cconf != NULL)                /* The class existed already */
1339		{
#	Line 1599 | Line 1365 | class_entry: CLASS
1365		}
1366		};
1367
1602	–	class_name_b: | class_name_t;
1603	–
1368		class_items:    class_items class_item | class_item;
1369		class_item:     class_name |
1370		class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
#	Line 1625 | Line 1389 | class_name: NAME '=' QSTRING ';'
1389		}
1390		};
1391
1628	–	class_name_t: QSTRING
1629	–	{
1630	–	if (conf_parser_ctx.pass == 1)
1631	–	{
1632	–	MyFree(yy_class_name);
1633	–	DupString(yy_class_name, yylval.string);
1634	–	}
1635	–	};
1636	–
1392		class_ping_time: PING_TIME '=' timespec ';'
1393		{
1394		if (conf_parser_ctx.pass == 1)
#	Line 1880 | Line 1635 | auth_entry: IRCD_AUTH
1635
1636		auth_items:     auth_items auth_item | auth_item;
1637		auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1638	<	auth_kline_exempt | auth_need_ident |
1639	<	auth_exceed_limit | auth_no_tilde | auth_gline_exempt |
1885	<	auth_spoof | auth_spoof_notice |
1886	<	auth_redir_serv | auth_redir_port | auth_can_flood |
1887	<	auth_need_password | auth_encrypted | error ';' ;
1638	>	auth_spoof | auth_redir_serv | auth_redir_port |
1639	>	auth_encrypted | error ';' ;
1640
1641		auth_user: USER '=' QSTRING ';'
1642		{
#	Line 1936 | Line 1688 | auth_passwd: PASSWORD '=' QSTRING ';'
1688		}
1689		};
1690
1939	–	auth_spoof_notice: SPOOF_NOTICE '=' TBOOL ';'
1940	–	{
1941	–	if (conf_parser_ctx.pass == 2)
1942	–	{
1943	–	if (yylval.number)
1944	–	yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1945	–	else
1946	–	yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1947	–	}
1948	–	};
1949	–
1691		auth_class: CLASS '=' QSTRING ';'
1692		{
1693		if (conf_parser_ctx.pass == 2)
#	Line 1972 | Line 1713 | auth_flags: IRCD_FLAGS
1713		} '='  auth_flags_items ';';
1714
1715		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1716	<	auth_flags_item: NOT { not_atom = 1; } auth_flags_item_atom
1976	<	| { not_atom = 0; } auth_flags_item_atom;
1977	<
1978	<	auth_flags_item_atom: SPOOF_NOTICE
1716	>	auth_flags_item: SPOOF_NOTICE
1717		{
1718		if (conf_parser_ctx.pass == 2)
1719	<	{
1982	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1983	<	else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1984	<	}
1985	<
1719	>	yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1720		} | EXCEED_LIMIT
1721		{
1722		if (conf_parser_ctx.pass == 2)
1723	<	{
1990	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
1991	<	else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1992	<	}
1723	>	yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1724		} | KLINE_EXEMPT
1725		{
1726		if (conf_parser_ctx.pass == 2)
1727	<	{
1997	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
1998	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1999	<	}
1727	>	yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1728		} | NEED_IDENT
1729		{
1730		if (conf_parser_ctx.pass == 2)
1731	<	{
2004	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
2005	<	else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
2006	<	}
1731	>	yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
1732		} | CAN_FLOOD
1733		{
1734		if (conf_parser_ctx.pass == 2)
1735	<	{
2011	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
2012	<	else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
2013	<	}
2014	<	} | CAN_IDLE
2015	<	{
2016	<	if (conf_parser_ctx.pass == 2)
2017	<	{
2018	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_IDLE_LINED;
2019	<	else yy_aconf->flags |= CONF_FLAGS_IDLE_LINED;
2020	<	}
1735	>	yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
1736		} | NO_TILDE
1737		{
1738		if (conf_parser_ctx.pass == 2)
1739	<	{
2025	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
2026	<	else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
2027	<	}
1739	>	yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1740		} | GLINE_EXEMPT
1741		{
1742		if (conf_parser_ctx.pass == 2)
1743	<	{
2032	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
2033	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
2034	<	}
1743	>	yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
1744		} | RESV_EXEMPT
1745		{
1746		if (conf_parser_ctx.pass == 2)
1747	<	{
2039	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
2040	<	else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
2041	<	}
1747	>	yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
1748		} | NEED_PASSWORD
1749		{
1750		if (conf_parser_ctx.pass == 2)
1751	<	{
2046	<	if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
2047	<	else yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
2048	<	}
2049	<	};
2050	<
2051	<	auth_kline_exempt: KLINE_EXEMPT '=' TBOOL ';'
2052	<	{
2053	<	if (conf_parser_ctx.pass == 2)
2054	<	{
2055	<	if (yylval.number)
2056	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
2057	<	else
2058	<	yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
2059	<	}
2060	<	};
2061	<
2062	<	auth_need_ident: NEED_IDENT '=' TBOOL ';'
2063	<	{
2064	<	if (conf_parser_ctx.pass == 2)
2065	<	{
2066	<	if (yylval.number)
2067	<	yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
2068	<	else
2069	<	yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
2070	<	}
2071	<	};
2072	<
2073	<	auth_exceed_limit: EXCEED_LIMIT '=' TBOOL ';'
2074	<	{
2075	<	if (conf_parser_ctx.pass == 2)
2076	<	{
2077	<	if (yylval.number)
2078	<	yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
2079	<	else
2080	<	yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
2081	<	}
2082	<	};
2083	<
2084	<	auth_can_flood: CAN_FLOOD '=' TBOOL ';'
2085	<	{
2086	<	if (conf_parser_ctx.pass == 2)
2087	<	{
2088	<	if (yylval.number)
2089	<	yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
2090	<	else
2091	<	yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
2092	<	}
2093	<	};
2094	<
2095	<	auth_no_tilde: NO_TILDE '=' TBOOL ';'
2096	<	{
2097	<	if (conf_parser_ctx.pass == 2)
2098	<	{
2099	<	if (yylval.number)
2100	<	yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
2101	<	else
2102	<	yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
2103	<	}
2104	<	};
2105	<
2106	<	auth_gline_exempt: GLINE_EXEMPT '=' TBOOL ';'
2107	<	{
2108	<	if (conf_parser_ctx.pass == 2)
2109	<	{
2110	<	if (yylval.number)
2111	<	yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
2112	<	else
2113	<	yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
2114	<	}
1751	>	yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
1752		};
1753
1754		/* XXX - need check for illegal hostnames here */
#	Line 2128 | Line 1765 | auth_spoof: SPOOF '=' QSTRING ';'
1765		}
1766		else
1767		{
1768	<	ilog(L_ERROR, "Spoofs must be less than %d..ignoring it", HOSTLEN);
1768	>	ilog(LOG_TYPE_IRCD, "Spoofs must be less than %d..ignoring it", HOSTLEN);
1769		yy_conf->name = NULL;
1770		}
1771		}
#	Line 2153 | Line 1790 | auth_redir_port: REDIRPORT '=' NUMBER ';
1790		}
1791		};
1792
2156	–	auth_need_password: NEED_PASSWORD '=' TBOOL ';'
2157	–	{
2158	–	if (conf_parser_ctx.pass == 2)
2159	–	{
2160	–	if (yylval.number)
2161	–	yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
2162	–	else
2163	–	yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
2164	–	}
2165	–	};
2166	–
1793
1794		/***************************************************************************
1795		*  section resv
#	Line 2222 | Line 1848 | resv_nick: NICK '=' QSTRING ';'
1848		};
1849
1850		/***************************************************************************
1851	+	*  section service
1852	+	***************************************************************************/
1853	+	service_entry: T_SERVICE '{' service_items '}' ';';
1854	+
1855	+	service_items:     service_items service_item | service_item;
1856	+	service_item:      service_name | error;
1857	+
1858	+	service_name: NAME '=' QSTRING ';'
1859	+	{
1860	+	if (conf_parser_ctx.pass == 2)
1861	+	{
1862	+	if (valid_servname(yylval.string))
1863	+	{
1864	+	yy_conf = make_conf_item(SERVICE_TYPE);
1865	+	DupString(yy_conf->name, yylval.string);
1866	+	}
1867	+	}
1868	+	};
1869	+
1870	+	/***************************************************************************
1871		*  section shared, for sharing remote klines etc.
1872		***************************************************************************/
1873		shared_entry: T_SHARED
#	Line 2285 | Line 1931 | shared_type_item: KLINE
1931		{
1932		if (conf_parser_ctx.pass == 2)
1933		yy_match_item->action |= SHARED_KLINE;
2288	–	} | TKLINE
2289	–	{
2290	–	if (conf_parser_ctx.pass == 2)
2291	–	yy_match_item->action |= SHARED_TKLINE;
1934		} | UNKLINE
1935		{
1936		if (conf_parser_ctx.pass == 2)
1937		yy_match_item->action |= SHARED_UNKLINE;
1938	<	} | XLINE
1938	>	} | T_DLINE
1939		{
1940		if (conf_parser_ctx.pass == 2)
1941	<	yy_match_item->action |= SHARED_XLINE;
1942	<	} | TXLINE
1941	>	yy_match_item->action |= SHARED_DLINE;
1942	>	} | T_UNDLINE
1943	>	{
1944	>	if (conf_parser_ctx.pass == 2)
1945	>	yy_match_item->action |= SHARED_UNDLINE;
1946	>	} | XLINE
1947		{
1948		if (conf_parser_ctx.pass == 2)
1949	<	yy_match_item->action |= SHARED_TXLINE;
1949	>	yy_match_item->action |= SHARED_XLINE;
1950		} | T_UNXLINE
1951		{
1952		if (conf_parser_ctx.pass == 2)
#	Line 2309 | Line 1955 | shared_type_item: KLINE
1955		{
1956		if (conf_parser_ctx.pass == 2)
1957		yy_match_item->action |= SHARED_RESV;
2312	–	} | TRESV
2313	–	{
2314	–	if (conf_parser_ctx.pass == 2)
2315	–	yy_match_item->action |= SHARED_TRESV;
1958		} | T_UNRESV
1959		{
1960		if (conf_parser_ctx.pass == 2)
#	Line 2367 | Line 2009 | cluster_type_item: KLINE
2009		{
2010		if (conf_parser_ctx.pass == 2)
2011		yy_conf->flags |= SHARED_KLINE;
2370	–	} | TKLINE
2371	–	{
2372	–	if (conf_parser_ctx.pass == 2)
2373	–	yy_conf->flags |= SHARED_TKLINE;
2012		} | UNKLINE
2013		{
2014		if (conf_parser_ctx.pass == 2)
2015		yy_conf->flags |= SHARED_UNKLINE;
2016	<	} | XLINE
2016	>	} | T_DLINE
2017		{
2018		if (conf_parser_ctx.pass == 2)
2019	<	yy_conf->flags |= SHARED_XLINE;
2020	<	} | TXLINE
2019	>	yy_conf->flags |= SHARED_DLINE;
2020	>	} | T_UNDLINE
2021		{
2022		if (conf_parser_ctx.pass == 2)
2023	<	yy_conf->flags |= SHARED_TXLINE;
2023	>	yy_conf->flags |= SHARED_UNDLINE;
2024	>	} | XLINE
2025	>	{
2026	>	if (conf_parser_ctx.pass == 2)
2027	>	yy_conf->flags |= SHARED_XLINE;
2028		} | T_UNXLINE
2029		{
2030		if (conf_parser_ctx.pass == 2)
#	Line 2391 | Line 2033 | cluster_type_item: KLINE
2033		{
2034		if (conf_parser_ctx.pass == 2)
2035		yy_conf->flags |= SHARED_RESV;
2394	–	} | TRESV
2395	–	{
2396	–	if (conf_parser_ctx.pass == 2)
2397	–	yy_conf->flags |= SHARED_TRESV;
2036		} | T_UNRESV
2037		{
2038		if (conf_parser_ctx.pass == 2)
#	Line 2417 | Line 2055 | connect_entry: CONNECT
2055		if (conf_parser_ctx.pass == 2)
2056		{
2057		yy_conf = make_conf_item(SERVER_TYPE);
2058	<	yy_aconf = (struct AccessItem *)map_to_conf(yy_conf);
2059	<	yy_aconf->passwd = NULL;
2058	>	yy_aconf = map_to_conf(yy_conf);
2059	>
2060		/* defaults */
2061		yy_aconf->port = PORTNUM;
2424	–
2425	–	if (ConfigFileEntry.burst_away)
2426	–	yy_aconf->flags = CONF_FLAGS_BURST_AWAY;
2062		}
2063		else
2064		{
2065		MyFree(class_name);
2066		class_name = NULL;
2067		}
2068	<	} connect_name_b '{' connect_items '}' ';'
2068	>	} '{' connect_items '}' ';'
2069		{
2070		if (conf_parser_ctx.pass == 2)
2071		{
2072		struct CollectItem *yy_hconf=NULL;
2073		struct CollectItem *yy_lconf=NULL;
2074	<	dlink_node *ptr;
2075	<	dlink_node *next_ptr;
2441	<	#ifdef HAVE_LIBCRYPTO
2074	>	dlink_node *ptr = NULL, *next_ptr = NULL;
2075	>
2076		if (yy_aconf->host &&
2077	<	((yy_aconf->passwd && yy_aconf->spasswd) ||
2078	<	(yy_aconf->rsa_public_key && IsConfCryptLink(yy_aconf))))
2079	<	#else /* !HAVE_LIBCRYPTO */
2080	<	if (yy_aconf->host && !IsConfCryptLink(yy_aconf) &&
2081	<	yy_aconf->passwd && yy_aconf->spasswd)
2082	<	#endif /* !HAVE_LIBCRYPTO */
2083	<	{
2084	<	if (conf_add_server(yy_conf, class_name) == -1)
2085	<	{
2086	<	delete_conf_item(yy_conf);
2087	<	yy_conf = NULL;
2088	<	yy_aconf = NULL;
2089	<	}
2090	<	}
2091	<	else
2092	<	{
2093	<	/* Even if yy_conf ->name is NULL
2094	<	* should still unhook any hub/leaf confs still pending
2095	<	*/
2096	<	unhook_hub_leaf_confs();
2097	<
2098	<	if (yy_conf->name != NULL)
2099	<	{
2466	<	#ifndef HAVE_LIBCRYPTO
2467	<	if (IsConfCryptLink(yy_aconf))
2468	<	yyerror("Ignoring connect block -- no OpenSSL support");
2469	<	#else
2470	<	if (IsConfCryptLink(yy_aconf) && !yy_aconf->rsa_public_key)
2471	<	yyerror("Ignoring connect block -- missing key");
2472	<	#endif
2473	<	if (yy_aconf->host == NULL)
2474	<	yyerror("Ignoring connect block -- missing host");
2475	<	else if (!IsConfCryptLink(yy_aconf) &&
2476	<	(!yy_aconf->passwd || !yy_aconf->spasswd))
2477	<	yyerror("Ignoring connect block -- missing password");
2478	<	}
2479	<
2480	<
2481	<	/* XXX
2482	<	* This fixes a try_connections() core (caused by invalid class_ptr
2483	<	* pointers) reported by metalrock. That's an ugly fix, but there
2484	<	* is currently no better way. The entire config subsystem needs an
2485	<	* rewrite ASAP. make_conf_item() shouldn't really add things onto
2486	<	* a doubly linked list immediately without any sanity checks!  -Michael
2487	<	*/
2488	<	delete_conf_item(yy_conf);
2077	>	yy_aconf->passwd && yy_aconf->spasswd)
2078	>	{
2079	>	if (conf_add_server(yy_conf, class_name) == -1)
2080	>	{
2081	>	delete_conf_item(yy_conf);
2082	>	yy_conf = NULL;
2083	>	yy_aconf = NULL;
2084	>	}
2085	>	}
2086	>	else
2087	>	{
2088	>	/* Even if yy_conf ->name is NULL
2089	>	* should still unhook any hub/leaf confs still pending
2090	>	*/
2091	>	unhook_hub_leaf_confs();
2092	>
2093	>	if (yy_conf->name != NULL)
2094	>	{
2095	>	if (yy_aconf->host == NULL)
2096	>	yyerror("Ignoring connect block -- missing host");
2097	>	else if (!yy_aconf->passwd || !yy_aconf->spasswd)
2098	>	yyerror("Ignoring connect block -- missing password");
2099	>	}
2100
2101	<	yy_aconf = NULL;
2102	<	yy_conf = NULL;
2103	<	}
2101	>
2102	>	/* XXX
2103	>	* This fixes a try_connections() core (caused by invalid class_ptr
2104	>	* pointers) reported by metalrock. That's an ugly fix, but there
2105	>	* is currently no better way. The entire config subsystem needs an
2106	>	* rewrite ASAP. make_conf_item() shouldn't really add things onto
2107	>	* a doubly linked list immediately without any sanity checks!  -Michael
2108	>	*/
2109	>	delete_conf_item(yy_conf);
2110	>
2111	>	yy_aconf = NULL;
2112	>	yy_conf = NULL;
2113	>	}
2114
2115		/*
2116		* yy_conf is still pointing at the server that is having
#	Line 2558 | Line 2179 | connect_entry: CONNECT
2179		}
2180		};
2181
2561	–	connect_name_b: | connect_name_t;
2182		connect_items:  connect_items connect_item | connect_item;
2183		connect_item:   connect_name | connect_host | connect_vhost |
2184		connect_send_password | connect_accept_password |
2185	<	connect_aftype | connect_port |
2186	<	connect_fakename | connect_flags | connect_hub_mask |
2187	<	connect_leaf_mask | connect_class | connect_auto |
2188	<	connect_encrypted | connect_compressed | connect_cryptlink |
2569	<	connect_rsa_public_key_file | connect_cipher_preference |
2570	<	connect_topicburst | error ';' ;
2185	>	connect_aftype | connect_port | connect_ssl_cipher_list |
2186	>	connect_flags | connect_hub_mask | connect_leaf_mask |
2187	>	connect_class | connect_encrypted |
2188	>	error ';' ;
2189
2190		connect_name: NAME '=' QSTRING ';'
2191		{
#	Line 2581 | Line 2199 | connect_name: NAME '=' QSTRING ';'
2199		}
2200		};
2201
2584	–	connect_name_t: QSTRING
2585	–	{
2586	–	if (conf_parser_ctx.pass == 2)
2587	–	{
2588	–	if (yy_conf->name != NULL)
2589	–	yyerror("Multiple connect name entry");
2590	–
2591	–	MyFree(yy_conf->name);
2592	–	DupString(yy_conf->name, yylval.string);
2593	–	}
2594	–	};
2595	–
2202		connect_host: HOST '=' QSTRING ';'
2203		{
2204		if (conf_parser_ctx.pass == 2)
#	Line 2614 | Line 2220 | connect_vhost: VHOST '=' QSTRING ';'
2220		hints.ai_socktype = SOCK_STREAM;
2221		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2222
2223	<	if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
2224	<	ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
2223	>	if (getaddrinfo(yylval.string, NULL, &hints, &res))
2224	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
2225		else
2226		{
2227		assert(res != NULL);
#	Line 2623 | Line 2229 | connect_vhost: VHOST '=' QSTRING ';'
2229		memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
2230		yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
2231		yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
2232	<	irc_freeaddrinfo(res);
2232	>	freeaddrinfo(res);
2233		}
2234		}
2235		};
#	Line 2682 | Line 2288 | connect_aftype: AFTYPE '=' T_IPV4 ';'
2288		#endif
2289		};
2290
2685	–	connect_fakename: FAKENAME '=' QSTRING ';'
2686	–	{
2687	–	if (conf_parser_ctx.pass == 2)
2688	–	{
2689	–	MyFree(yy_aconf->fakename);
2690	–	DupString(yy_aconf->fakename, yylval.string);
2691	–	}
2692	–	};
2693	–
2291		connect_flags: IRCD_FLAGS
2292		{
2293		} '='  connect_flags_items ';';
2294
2295		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2296	<	connect_flags_item: NOT  { not_atom = 1; } connect_flags_item_atom
2700	<	|  { not_atom = 0; } connect_flags_item_atom;
2701	<
2702	<	connect_flags_item_atom: COMPRESSED
2703	<	{
2704	<	if (conf_parser_ctx.pass == 2)
2705	<	#ifndef HAVE_LIBZ
2706	<	yyerror("Ignoring flags = compressed; -- no zlib support");
2707	<	#else
2708	<	{
2709	<	if (not_atom)ClearConfCompressed(yy_aconf);
2710	<	else SetConfCompressed(yy_aconf);
2711	<	}
2712	<	#endif
2713	<	} | CRYPTLINK
2714	<	{
2715	<	if (conf_parser_ctx.pass == 2)
2716	<	{
2717	<	if (not_atom)ClearConfCryptLink(yy_aconf);
2718	<	else SetConfCryptLink(yy_aconf);
2719	<	}
2720	<	} | AUTOCONN
2296	>	connect_flags_item: AUTOCONN
2297		{
2298		if (conf_parser_ctx.pass == 2)
2299	<	{
2724	<	if (not_atom)ClearConfAllowAutoConn(yy_aconf);
2725	<	else SetConfAllowAutoConn(yy_aconf);
2726	<	}
2299	>	SetConfAllowAutoConn(yy_aconf);
2300		} | BURST_AWAY
2301		{
2302		if (conf_parser_ctx.pass == 2)
2303	<	{
2731	<	if (not_atom)ClearConfAwayBurst(yy_aconf);
2732	<	else SetConfAwayBurst(yy_aconf);
2733	<	}
2303	>	SetConfAwayBurst(yy_aconf);
2304		} | TOPICBURST
2305		{
2306		if (conf_parser_ctx.pass == 2)
2307	<	{
2308	<	if (not_atom)ClearConfTopicBurst(yy_aconf);
2739	<	else SetConfTopicBurst(yy_aconf);
2740	<	}
2741	<	}
2742	<	;
2743	<
2744	<	connect_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
2307	>	SetConfTopicBurst(yy_aconf);
2308	>	} | T_SSL
2309		{
2746	–	#ifdef HAVE_LIBCRYPTO
2310		if (conf_parser_ctx.pass == 2)
2311	<	{
2749	<	BIO *file;
2750	<
2751	<	if (yy_aconf->rsa_public_key != NULL)
2752	<	{
2753	<	RSA_free(yy_aconf->rsa_public_key);
2754	<	yy_aconf->rsa_public_key = NULL;
2755	<	}
2756	<
2757	<	if (yy_aconf->rsa_public_key_file != NULL)
2758	<	{
2759	<	MyFree(yy_aconf->rsa_public_key_file);
2760	<	yy_aconf->rsa_public_key_file = NULL;
2761	<	}
2762	<
2763	<	DupString(yy_aconf->rsa_public_key_file, yylval.string);
2764	<
2765	<	if ((file = BIO_new_file(yylval.string, "r")) == NULL)
2766	<	{
2767	<	yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
2768	<	break;
2769	<	}
2770	<
2771	<	yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
2772	<
2773	<	if (yy_aconf->rsa_public_key == NULL)
2774	<	{
2775	<	yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
2776	<	break;
2777	<	}
2778	<
2779	<	BIO_set_close(file, BIO_CLOSE);
2780	<	BIO_free(file);
2781	<	}
2782	<	#endif /* HAVE_LIBCRYPTO */
2311	>	SetConfSSL(yy_aconf);
2312		};
2313
2314		connect_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 2793 | Line 2322 | connect_encrypted: ENCRYPTED '=' TBOOL '
2322		}
2323		};
2324
2796	–	connect_cryptlink: CRYPTLINK '=' TBOOL ';'
2797	–	{
2798	–	if (conf_parser_ctx.pass == 2)
2799	–	{
2800	–	if (yylval.number)
2801	–	yy_aconf->flags |= CONF_FLAGS_CRYPTLINK;
2802	–	else
2803	–	yy_aconf->flags &= ~CONF_FLAGS_CRYPTLINK;
2804	–	}
2805	–	};
2806	–
2807	–	connect_compressed: COMPRESSED '=' TBOOL ';'
2808	–	{
2809	–	if (conf_parser_ctx.pass == 2)
2810	–	{
2811	–	if (yylval.number)
2812	–	#ifndef HAVE_LIBZ
2813	–	yyerror("Ignoring compressed=yes; -- no zlib support");
2814	–	#else
2815	–	yy_aconf->flags |= CONF_FLAGS_COMPRESSED;
2816	–	#endif
2817	–	else
2818	–	yy_aconf->flags &= ~CONF_FLAGS_COMPRESSED;
2819	–	}
2820	–	};
2821	–
2822	–	connect_auto: AUTOCONN '=' TBOOL ';'
2823	–	{
2824	–	if (conf_parser_ctx.pass == 2)
2825	–	{
2826	–	if (yylval.number)
2827	–	yy_aconf->flags |= CONF_FLAGS_ALLOW_AUTO_CONN;
2828	–	else
2829	–	yy_aconf->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN;
2830	–	}
2831	–	};
2832	–
2833	–	connect_topicburst: TOPICBURST '=' TBOOL ';'
2834	–	{
2835	–	if (conf_parser_ctx.pass == 2)
2836	–	{
2837	–	if (yylval.number)
2838	–	SetConfTopicBurst(yy_aconf);
2839	–	else
2840	–	ClearConfTopicBurst(yy_aconf);
2841	–	}
2842	–	};
2843	–
2325		connect_hub_mask: HUB_MASK '=' QSTRING ';'
2326		{
2327		if (conf_parser_ctx.pass == 2)
#	Line 2876 | Line 2357 | connect_class: CLASS '=' QSTRING ';'
2357		}
2358		};
2359
2360	<	connect_cipher_preference: CIPHER_PREFERENCE '=' QSTRING ';'
2360	>	connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2361		{
2362		#ifdef HAVE_LIBCRYPTO
2363		if (conf_parser_ctx.pass == 2)
2364		{
2365	<	struct EncCapability *ecap;
2366	<	const char *cipher_name;
2886	<	int found = 0;
2887	<
2888	<	yy_aconf->cipher_preference = NULL;
2889	<	cipher_name = yylval.string;
2890	<
2891	<	for (ecap = CipherTable; ecap->name; ecap++)
2892	<	{
2893	<	if ((irccmp(ecap->name, cipher_name) == 0) &&
2894	<	(ecap->cap & CAP_ENC_MASK))
2895	<	{
2896	<	yy_aconf->cipher_preference = ecap;
2897	<	found = 1;
2898	<	break;
2899	<	}
2900	<	}
2901	<
2902	<	if (!found)
2903	<	yyerror("Invalid cipher");
2365	>	MyFree(yy_aconf->cipher_list);
2366	>	DupString(yy_aconf->cipher_list, yylval.string);
2367		}
2368		#else
2369		if (conf_parser_ctx.pass == 2)
2370	<	yyerror("Ignoring cipher_preference -- no OpenSSL support");
2370	>	yyerror("Ignoring connect::ciphers -- no OpenSSL support");
2371		#endif
2372		};
2373
2374	+
2375		/***************************************************************************
2376		*  section kill
2377		***************************************************************************/
#	Line 2926 | Line 2390 | kill_entry: KILL
2390		{
2391		if (regex_ban)
2392		{
2393	<	pcre *exp_user = NULL;
2394	<	pcre *exp_host = NULL;
2393	>	#ifdef HAVE_LIBPCRE
2394	>	void *exp_user = NULL;
2395	>	void *exp_host = NULL;
2396		const char *errptr = NULL;
2397
2398		if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
2399		!(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
2400		{
2401	<	ilog(L_ERROR, "Failed to add regular expression based K-Line: %s",
2401	>	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: %s",
2402		errptr);
2403		break;
2404		}
2405
2406	<	yy_conf = make_conf_item(RKLINE_TYPE);
2942	<	yy_aconf = map_to_conf(yy_conf);
2943	<
2406	>	yy_aconf = map_to_conf(make_conf_item(RKLINE_TYPE));
2407		yy_aconf->regexuser = exp_user;
2408		yy_aconf->regexhost = exp_host;
2409
#	Line 2951 | Line 2414 | kill_entry: KILL
2414		DupString(yy_aconf->reason, reasonbuf);
2415		else
2416		DupString(yy_aconf->reason, "No reason");
2417	+	#else
2418	+	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: no PCRE support");
2419	+	break;
2420	+	#endif
2421		}
2422		else
2423		{
2424	<	yy_conf = make_conf_item(KLINE_TYPE);
2958	<	yy_aconf = map_to_conf(yy_conf);
2424	>	yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
2425
2426		DupString(yy_aconf->user, userbuf);
2427		DupString(yy_aconf->host, hostbuf);
#	Line 2967 | Line 2433 | kill_entry: KILL
2433		add_conf_by_address(CONF_KILL, yy_aconf);
2434		}
2435		}
2970	–	else
2971	–	delete_conf_item(yy_conf);
2436
2973	–	yy_conf = NULL;
2437		yy_aconf = NULL;
2438		}
2439		};
#	Line 3020 | Line 2483 | kill_reason: REASON '=' QSTRING ';'
2483		deny_entry: DENY
2484		{
2485		if (conf_parser_ctx.pass == 2)
2486	<	{
3024	<	yy_conf = make_conf_item(DLINE_TYPE);
3025	<	yy_aconf = map_to_conf(yy_conf);
3026	<	/* default reason */
3027	<	DupString(yy_aconf->reason, "No reason");
3028	<	}
2486	>	hostbuf[0] = reasonbuf[0] = '\0';
2487		} '{' deny_items '}' ';'
2488		{
2489		if (conf_parser_ctx.pass == 2)
2490		{
2491	<	if (yy_aconf->host && parse_netmask(yy_aconf->host, NULL, NULL) != HM_HOST)
2491	>	if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
2492	>	{
2493	>	yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
2494	>	DupString(yy_aconf->host, hostbuf);
2495	>
2496	>	if (reasonbuf[0])
2497	>	DupString(yy_aconf->reason, reasonbuf);
2498	>	else
2499	>	DupString(yy_aconf->reason, "No reason");
2500		add_conf_by_address(CONF_DLINE, yy_aconf);
2501	<	else
2502	<	delete_conf_item(yy_conf);
3037	<	yy_conf = NULL;
3038	<	yy_aconf = NULL;
2501	>	yy_aconf = NULL;
2502	>	}
2503		}
2504		};
2505
#	Line 3045 | Line 2509 | deny_item:      deny_ip | deny_reason |
2509		deny_ip: IP '=' QSTRING ';'
2510		{
2511		if (conf_parser_ctx.pass == 2)
2512	<	{
3049	<	MyFree(yy_aconf->host);
3050	<	DupString(yy_aconf->host, yylval.string);
3051	<	}
2512	>	strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
2513		};
2514
2515		deny_reason: REASON '=' QSTRING ';'
2516		{
2517		if (conf_parser_ctx.pass == 2)
2518	<	{
3058	<	MyFree(yy_aconf->reason);
3059	<	DupString(yy_aconf->reason, yylval.string);
3060	<	}
2518	>	strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2519		};
2520
2521		/***************************************************************************
#	Line 3074 | Line 2532 | exempt_ip: IP '=' QSTRING ';'
2532		{
2533		if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2534		{
2535	<	yy_conf = make_conf_item(EXEMPTDLINE_TYPE);
3078	<	yy_aconf = map_to_conf(yy_conf);
2535	>	yy_aconf = map_to_conf(make_conf_item(EXEMPTDLINE_TYPE));
2536		DupString(yy_aconf->host, yylval.string);
2537
2538		add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
3082	–
3083	–	yy_conf = NULL;
2539		yy_aconf = NULL;
2540		}
2541		}
#	Line 3104 | Line 2559 | gecos_entry: GECOS
2559		{
2560		if (regex_ban)
2561		{
2562	<	pcre *exp_p = NULL;
2562	>	#ifdef HAVE_LIBPCRE
2563	>	void *exp_p = NULL;
2564		const char *errptr = NULL;
2565
2566		if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
2567		{
2568	<	ilog(L_ERROR, "Failed to add regular expression based X-Line: %s",
2568	>	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: %s",
2569		errptr);
2570		break;
2571		}
2572
2573		yy_conf = make_conf_item(RXLINE_TYPE);
2574		yy_conf->regexpname = exp_p;
2575	+	#else
2576	+	ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: no PCRE support");
2577	+	break;
2578	+	#endif
2579		}
2580		else
2581		yy_conf = make_conf_item(XLINE_TYPE);
#	Line 3177 | Line 2637 | general_item:       general_hide_spoof_i
2637		general_pace_wait_simple | general_stats_P_oper_only |
2638		general_short_motd | general_no_oper_flood |
2639		general_true_no_oper_flood | general_oper_pass_resv |
2640	<	general_idletime | general_message_locale |
2640	>	general_message_locale |
2641		general_oper_only_umodes | general_max_targets |
2642		general_use_egd | general_egdpool_path |
2643		general_oper_umodes | general_caller_id_wait |
2644		general_opers_bypass_callerid | general_default_floodcount |
2645		general_min_nonwildcard | general_min_nonwildcard_simple |
2646	<	general_servlink_path | general_disable_remote_commands |
2647	<	general_default_cipher_preference |
3188	<	general_compression_level | general_client_flood |
2646	>	general_disable_remote_commands |
2647	>	general_client_flood |
2648		general_throttle_time | general_havent_read_conf |
2649	<	general_dot_in_ip6_addr | general_ping_cookie |
2650	<	general_disable_auth | general_burst_away |
2649	>	general_ping_cookie |
2650	>	general_disable_auth |
2651		general_tkline_expire_notices | general_gline_min_cidr |
2652		general_gline_min_cidr6 | general_use_whois_actually |
2653		general_reject_hold_time | general_stats_e_disabled |
2654	<	general_max_watch |
2654	>	general_max_watch | general_services_name |
2655		error;
2656
2657
#	Line 3211 | Line 2670 | general_gline_min_cidr6: GLINE_MIN_CIDR6
2670		ConfigFileEntry.gline_min_cidr6 = $3;
2671		};
2672
3214	–	general_burst_away: BURST_AWAY '=' TBOOL ';'
3215	–	{
3216	–	ConfigFileEntry.burst_away = yylval.number;
3217	–	};
3218	–
2673		general_use_whois_actually: USE_WHOIS_ACTUALLY '=' TBOOL ';'
2674		{
2675		ConfigFileEntry.use_whois_actually = yylval.number;
#	Line 3231 | Line 2685 | general_tkline_expire_notices: TKLINE_EX
2685		ConfigFileEntry.tkline_expire_notices = yylval.number;
2686		};
2687
2688	<	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' NUMBER ';'
2688	>	general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2689		{
2690		ConfigFileEntry.kill_chase_time_limit = $3;
2691		};
#	Line 3296 | Line 2750 | general_havent_read_conf: HAVENT_READ_CO
2750		{
2751		if (($3 > 0) && conf_parser_ctx.pass == 1)
2752		{
2753	<	ilog(L_CRIT, "You haven't read your config file properly.");
2754	<	ilog(L_CRIT, "There is a line in the example conf that will kill your server if not removed.");
2755	<	ilog(L_CRIT, "Consider actually reading/editing the conf file, and removing this line.");
2753	>	ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
2754	>	ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
2755	>	ilog(LOG_TYPE_IRCD, "Consider actually reading/editing the conf file, and removing this line.");
2756		exit(0);
2757		}
2758		};
#	Line 3409 | Line 2863 | general_message_locale: MESSAGE_LOCALE '
2863		}
2864		};
2865
3412	–	general_idletime: IDLETIME '=' timespec ';'
3413	–	{
3414	–	ConfigFileEntry.idletime = $3;
3415	–	};
3416	–
2866		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2867		{
2868		ConfigFileEntry.dots_in_ident = $3;
#	Line 3424 | Line 2873 | general_max_targets: MAX_TARGETS '=' NUM
2873		ConfigFileEntry.max_targets = $3;
2874		};
2875
3427	–	general_servlink_path: SERVLINK_PATH '=' QSTRING ';'
3428	–	{
3429	–	if (conf_parser_ctx.pass == 2)
3430	–	{
3431	–	MyFree(ConfigFileEntry.servlink_path);
3432	–	DupString(ConfigFileEntry.servlink_path, yylval.string);
3433	–	}
3434	–	};
3435	–
3436	–	general_default_cipher_preference: DEFAULT_CIPHER_PREFERENCE '=' QSTRING ';'
3437	–	{
3438	–	#ifdef HAVE_LIBCRYPTO
3439	–	if (conf_parser_ctx.pass == 2)
3440	–	{
3441	–	struct EncCapability *ecap;
3442	–	const char *cipher_name;
3443	–	int found = 0;
3444	–
3445	–	ConfigFileEntry.default_cipher_preference = NULL;
3446	–	cipher_name = yylval.string;
3447	–
3448	–	for (ecap = CipherTable; ecap->name; ecap++)
3449	–	{
3450	–	if ((irccmp(ecap->name, cipher_name) == 0) &&
3451	–	(ecap->cap & CAP_ENC_MASK))
3452	–	{
3453	–	ConfigFileEntry.default_cipher_preference = ecap;
3454	–	found = 1;
3455	–	break;
3456	–	}
3457	–	}
3458	–
3459	–	if (!found)
3460	–	yyerror("Invalid cipher");
3461	–	}
3462	–	#else
3463	–	if (conf_parser_ctx.pass == 2)
3464	–	yyerror("Ignoring default_cipher_preference -- no OpenSSL support");
3465	–	#endif
3466	–	};
3467	–
3468	–	general_compression_level: COMPRESSION_LEVEL '=' NUMBER ';'
3469	–	{
3470	–	if (conf_parser_ctx.pass == 2)
3471	–	{
3472	–	ConfigFileEntry.compression_level = $3;
3473	–	#ifndef HAVE_LIBZ
3474	–	yyerror("Ignoring compression_level -- no zlib support");
3475	–	#else
3476	–	if ((ConfigFileEntry.compression_level < 1) ||
3477	–	(ConfigFileEntry.compression_level > 9))
3478	–	{
3479	–	yyerror("Ignoring invalid compression_level, using default");
3480	–	ConfigFileEntry.compression_level = 0;
3481	–	}
3482	–	#endif
3483	–	}
3484	–	};
3485	–
2876		general_use_egd: USE_EGD '=' TBOOL ';'
2877		{
2878		ConfigFileEntry.use_egd = yylval.number;
#	Line 3497 | Line 2887 | general_egdpool_path: EGDPOOL_PATH '=' Q
2887		}
2888		};
2889
2890	+	general_services_name: T_SERVICES_NAME '=' QSTRING ';'
2891	+	{
2892	+	if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
2893	+	{
2894	+	MyFree(ConfigFileEntry.service_name);
2895	+	DupString(ConfigFileEntry.service_name, yylval.string);
2896	+	}
2897	+	};
2898	+
2899		general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2900		{
2901		ConfigFileEntry.ping_cookie = yylval.number;
#	Line 3536 | Line 2935 | umode_oitem:     T_BOTS
2935		} | T_FULL
2936		{
2937		ConfigFileEntry.oper_umodes |= UMODE_FULL;
2938	+	} | HIDDEN
2939	+	{
2940	+	ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
2941		} | T_SKILL
2942		{
2943		ConfigFileEntry.oper_umodes |= UMODE_SKILL;
#	Line 3604 | Line 3006 | umode_item:    T_BOTS
3006		} | T_SKILL
3007		{
3008		ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
3009	+	} | HIDDEN
3010	+	{
3011	+	ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
3012		} | T_NCHANGE
3013		{
3014		ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
#	Line 3662 | Line 3067 | general_client_flood: T_CLIENT_FLOOD '='
3067		ConfigFileEntry.client_flood = $3;
3068		};
3069
3665	–	general_dot_in_ip6_addr: DOT_IN_IP6_ADDR '=' TBOOL ';'
3666	–	{
3667	–	ConfigFileEntry.dot_in_ip6_addr = yylval.number;
3668	–	};
3070
3071		/***************************************************************************
3072		*  section glines
#	Line 3715 | Line 3116 | gline_duration: DURATION '=' timespec ';
3116		ConfigFileEntry.gline_time = $3;
3117		};
3118
3119	<	gline_logging: LOGGING
3119	>	gline_logging: T_LOG
3120		{
3121		if (conf_parser_ctx.pass == 2)
3122		ConfigFileEntry.gline_logging = 0;

Diff Legend

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