ViewVC Help

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

root/svn/ircd-hybrid/trunk/src/conf.c

Comparing ircd-hybrid/trunk/src/conf.c (file contents):
Revision 5602 by michael, Mon Feb 23 21:04:46 2015 UTC vs.
Revision 7159 by michael, Thu Jan 28 11:26:51 2016 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2015 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2016 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 55 | Line 55
55		#include "conf_class.h"
56		#include "motd.h"
57		#include "ipcache.h"
58	+	#include "isupport.h"
59
60
61		struct config_channel_entry ConfigChannel;
62	<	struct config_server_hide ConfigServerHide;
62	>	struct config_serverhide_entry ConfigServerHide;
63		struct config_general_entry ConfigGeneral;
64	<	struct logging_entry ConfigLog = { .use_logging = 1 };
65	<	struct server_info ConfigServerInfo;
66	<	struct admin_info ConfigAdminInfo;
64	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
65	>	struct config_serverinfo_entry ConfigServerInfo;
66	>	struct config_admin_entry ConfigAdminInfo;
67		struct conf_parser_context conf_parser_ctx;
68
69		/* general conf items link list root, other than k lines etc. */
70		dlink_list service_items;
71		dlink_list server_items;
72		dlink_list cluster_items;
73	<	dlink_list oconf_items;
74	<	dlink_list uconf_items;
75	<	dlink_list xconf_items;
73	>	dlink_list operator_items;
74	>	dlink_list shared_items;
75	>	dlink_list gecos_items;
76		dlink_list nresv_items;
77		dlink_list cresv_items;
78
#	Line 136 | Line 137 | map_to_list(enum maskitem_type type)
137		switch (type)
138		{
139		case CONF_XLINE:
140	<	return &xconf_items;
140	>	return &gecos_items;
141		break;
142	<	case CONF_ULINE:
143	<	return &uconf_items;
142	>	case CONF_SHARED:
143	>	return &shared_items;
144		break;
145		case CONF_NRESV:
146		return &nresv_items;
#	Line 148 | Line 149 | map_to_list(enum maskitem_type type)
149		return &cresv_items;
150		break;
151		case CONF_OPER:
152	<	return &oconf_items;
152	>	return &operator_items;
153		break;
154		case CONF_SERVER:
155		return &server_items;
#	Line 167 | Line 168 | map_to_list(enum maskitem_type type)
168		struct MaskItem *
169		conf_make(enum maskitem_type type)
170		{
171	<	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
171	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
172		dlink_list *list = NULL;
173
174		conf->type   = type;
#	Line 188 | Line 189 | conf_free(struct MaskItem *conf)
189		if ((list = map_to_list(conf->type)))
190		dlinkFindDelete(list, conf);
191
192	<	MyFree(conf->name);
192	>	xfree(conf->name);
193
194		if (conf->dns_pending)
195		delete_resolver_queries(conf);
#	Line 199 | Line 200 | conf_free(struct MaskItem *conf)
200
201		conf->class = NULL;
202
203	<	MyFree(conf->passwd);
204	<	MyFree(conf->spasswd);
205	<	MyFree(conf->reason);
206	<	MyFree(conf->certfp);
207	<	MyFree(conf->whois);
208	<	MyFree(conf->user);
209	<	MyFree(conf->host);
210	<	#ifdef HAVE_LIBCRYPTO
211	<	MyFree(conf->cipher_list);
211	<
212	<	if (conf->rsa_public_key)
213	<	RSA_free(conf->rsa_public_key);
214	<	#endif
203	>	xfree(conf->passwd);
204	>	xfree(conf->spasswd);
205	>	xfree(conf->reason);
206	>	xfree(conf->certfp);
207	>	xfree(conf->whois);
208	>	xfree(conf->user);
209	>	xfree(conf->host);
210	>	xfree(conf->cipher_list);
211	>
212		DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
213		{
214	<	MyFree(node->data);
214	>	xfree(node->data);
215		dlinkDelete(node, &conf->hub_list);
216		free_dlink_node(node);
217		}
218
219		DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
220		{
221	<	MyFree(node->data);
221	>	xfree(node->data);
222		dlinkDelete(node, &conf->leaf_list);
223		free_dlink_node(node);
224		}
#	Line 231 | Line 228 | conf_free(struct MaskItem *conf)
228		struct exempt *exptr = node->data;
229
230		dlinkDelete(node, &conf->exempt_list);
231	<	MyFree(exptr->name);
232	<	MyFree(exptr->user);
233	<	MyFree(exptr->host);
234	<	MyFree(exptr);
231	>	xfree(exptr->name);
232	>	xfree(exptr->user);
233	>	xfree(exptr->host);
234	>	xfree(exptr);
235		}
236
237	<	MyFree(conf);
237	>	xfree(conf);
238		}
239
240		/* attach_iline()
#	Line 259 | Line 256 | attach_iline(struct Client *client_p, st
256		ip_found->count++;
257		AddFlag(client_p, FLAGS_IPHASH);
258
259	<	count_user_host(client_p->username, client_p->host,
260	<	&global, &local, &ident);
259	>	userhost_count(client_p->username, client_p->host,
260	>	&global, &local, &ident);
261
262		/* XXX blah. go down checking the various silly limits
263		* setting a_limit_reached if any limit is reached.
#	Line 301 | Line 298 | verify_access(struct Client *client_p)
298		{
299		struct MaskItem *conf = NULL;
300
301	<	if (IsGotId(client_p))
301	>	if (HasFlag(client_p, FLAGS_GOTID))
302		{
303		conf = find_address_conf(client_p->host, client_p->username,
304		&client_p->connection->ip,
#	Line 319 | Line 316 | verify_access(struct Client *client_p)
316		client_p->connection->password);
317		}
318
319	<	if (conf)
320	<	{
324	<	if (IsConfClient(conf))
325	<	{
326	<	if (IsConfRedir(conf))
327	<	{
328	<	sendto_one_numeric(client_p, &me, RPL_REDIR,
329	<	conf->name ? conf->name : "",
330	<	conf->port);
331	<	return NOT_AUTHORIZED;
332	<	}
333	<
334	<	/* Thanks for spoof idea amm */
335	<	if (IsConfDoSpoofIp(conf))
336	<	{
337	<	if (IsConfSpoofNotice(conf))
338	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
339	<	client_p->name, client_p->host, conf->name);
319	>	if (!conf)
320	>	return NOT_AUTHORIZED;
321
322	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
342	<	}
322	>	assert(IsConfClient(conf) || IsConfKill(conf));
323
324	<	return attach_iline(client_p, conf);
324	>	if (IsConfClient(conf))
325	>	{
326	>	if (IsConfRedir(conf))
327	>	{
328	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
329	>	conf->name ? conf->name : "",
330	>	conf->port);
331	>	return NOT_AUTHORIZED;
332		}
333	<	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
333	>
334	>	if (IsConfDoSpoofIp(conf))
335		{
336	<	if (IsConfGline(conf))
337	<	sendto_one_notice(client_p, &me, ":*** G-lined");
336	>	if (IsConfSpoofNotice(conf))
337	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
338	>	client_p->name, client_p->host, conf->name);
339
340	<	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
352	<	return BANNED_CLIENT;
340	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
341		}
342	+
343	+	return attach_iline(client_p, conf);
344		}
345
346	<	return NOT_AUTHORIZED;
346	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
347	>	return BANNED_CLIENT;
348		}
349
350		/* check_client()
#	Line 527 | Line 518 | attach_connect_block(struct Client *clie
518		continue;
519
520		attach_conf(client_p, conf);
521	<	return -1;
521	>	return 1;
522		}
523
524		return 0;
#	Line 594 | Line 585 | find_matching_name_conf(enum maskitem_ty
585		break;
586
587		case CONF_XLINE:
588	<	case CONF_ULINE:
588	>	case CONF_SHARED:
589		case CONF_NRESV:
590		case CONF_CRESV:
591		DLINK_FOREACH(node, list->head)
#	Line 607 | Line 598 | find_matching_name_conf(enum maskitem_ty
598		{
599		if ((user == NULL && (host == NULL)))
600		return conf;
601	<	if ((conf->flags & flags) != flags)
601	>	if ((conf->modes & flags) != flags)
602		continue;
603		if (EmptyString(conf->user) || EmptyString(conf->host))
604		return conf;
#	Line 655 | Line 646 | find_exact_name_conf(enum maskitem_type
646		switch(type)
647		{
648		case CONF_XLINE:
649	<	case CONF_ULINE:
649	>	case CONF_SHARED:
650		case CONF_NRESV:
651		case CONF_CRESV:
652
#	Line 767 | Line 758 | set_default_conf(void)
758		*/
759		assert(class_default == class_get_list()->tail->data);
760
770	–	#ifdef HAVE_LIBCRYPTO
771	–	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
772	–	{
773	–	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
774	–
775	–	if (key)
776	–	{
777	–	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
778	–	EC_KEY_free(key);
779	–	}
780	–	}
781	–
782	–	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
783	–	#endif
784	–
785	–	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
786	–	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
787	–	ConfigServerInfo.rsa_private_key = NULL;
788	–	ConfigServerInfo.rsa_private_key_file = NULL;
789	–	#endif
790	–
791	–	/* ConfigServerInfo.name is not rehashable */
792	–	/* ConfigServerInfo.name = ConfigServerInfo.name; */
793	–	ConfigServerInfo.description = NULL;
761		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
762		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
763
#	Line 804 | Line 771 | set_default_conf(void)
771		ConfigServerInfo.max_topic_length = 80;
772		ConfigServerInfo.hub = 0;
773
807	–	ConfigAdminInfo.name = NULL;
808	–	ConfigAdminInfo.email = NULL;
809	–	ConfigAdminInfo.description = NULL;
810	–
774		log_del_all();
775
776		ConfigLog.use_logging = 1;
#	Line 815 | Line 778 | set_default_conf(void)
778		ConfigChannel.disable_fake_channels = 0;
779		ConfigChannel.invite_client_count = 10;
780		ConfigChannel.invite_client_time = 300;
781	+	ConfigChannel.invite_delay_channel = 5;
782		ConfigChannel.knock_client_count = 1;
783		ConfigChannel.knock_client_time = 300;
784		ConfigChannel.knock_delay_channel = 60;
#	Line 822 | Line 786 | set_default_conf(void)
786		ConfigChannel.max_bans = 25;
787		ConfigChannel.default_join_flood_count = 18;
788		ConfigChannel.default_join_flood_time = 6;
825	–	ConfigChannel.default_split_user_count = 0;
826	–	ConfigChannel.default_split_server_count = 0;
827	–	ConfigChannel.no_join_on_split = 0;
828	–	ConfigChannel.no_create_on_split = 0;
789
790		ConfigServerHide.flatten_links = 0;
791	<	ConfigServerHide.links_delay = 300;
791	>	ConfigServerHide.flatten_links_delay = 300;
792		ConfigServerHide.hidden = 0;
793		ConfigServerHide.hide_servers = 0;
794		ConfigServerHide.hide_services = 0;
#	Line 838 | Line 798 | set_default_conf(void)
798
799		ConfigGeneral.away_count = 2;
800		ConfigGeneral.away_time = 10;
801	<	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
801	>	ConfigGeneral.max_watch = 50;
802		ConfigGeneral.cycle_on_host_change = 1;
803	<	ConfigGeneral.glines = 0;
804	<	ConfigGeneral.gline_time = 12 * 3600;
805	<	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
806	<	ConfigGeneral.gline_min_cidr = 16;
847	<	ConfigGeneral.gline_min_cidr6 = 48;
803	>	ConfigGeneral.dline_min_cidr = 16;
804	>	ConfigGeneral.dline_min_cidr6 = 48;
805	>	ConfigGeneral.kline_min_cidr = 16;
806	>	ConfigGeneral.kline_min_cidr6 = 48;
807		ConfigGeneral.invisible_on_connect = 1;
808		ConfigGeneral.tkline_expire_notices = 1;
809		ConfigGeneral.ignore_bogus_ts = 0;
#	Line 855 | Line 814 | set_default_conf(void)
814		ConfigGeneral.dots_in_ident = 0;
815		ConfigGeneral.min_nonwildcard = 4;
816		ConfigGeneral.min_nonwildcard_simple = 3;
817	<	ConfigGeneral.max_accept = 20;
817	>	ConfigGeneral.max_accept = 50;
818		ConfigGeneral.anti_nick_flood = 0;
819		ConfigGeneral.max_nick_time = 20;
820		ConfigGeneral.max_nick_changes = 5;
821		ConfigGeneral.anti_spam_exit_message_time = 0;
822	<	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
823	<	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
822	>	ConfigGeneral.ts_warn_delta = 30;
823	>	ConfigGeneral.ts_max_delta = 600;
824		ConfigGeneral.warn_no_connect_block = 1;
825		ConfigGeneral.stats_e_disabled = 0;
826		ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
#	Line 877 | Line 836 | set_default_conf(void)
836		ConfigGeneral.short_motd = 0;
837		ConfigGeneral.ping_cookie = 0;
838		ConfigGeneral.no_oper_flood = 0;
880	–	ConfigGeneral.oper_pass_resv = 1;
839		ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
840		ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
841		UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
#	Line 890 | Line 848 | set_default_conf(void)
848		static void
849		validate_conf(void)
850		{
893	–	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
894	–	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
895	–
896	–	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
897	–	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
898	–
851		if (EmptyString(ConfigServerInfo.network_name))
852		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
853
854		if (EmptyString(ConfigServerInfo.network_desc))
855		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
904	–
905	–	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
856		}
857
858		/* read_conf()
#	Line 935 | Line 885 | read_conf(FILE *file)
885		* as a result of an operator issuing this command, else assume it has been
886		* called as a result of the server receiving a HUP signal.
887		*/
888	<	int
888	>	void
889		conf_rehash(int sig)
890		{
891		if (sig)
892	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
892	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
893		"Got signal SIGHUP, reloading configuration file(s)");
894
895		restart_resolver();
#	Line 950 | Line 900 | conf_rehash(int sig)
900
901		load_conf_modules();
902		check_conf_klines();
953	–
954	–	return 0;
903		}
904
905		/* lookup_confhost()
#	Line 1002 | Line 950 | int
950		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
951		{
952		struct ip_entry *ip_found = NULL;
953	<	struct MaskItem *const conf = find_dline_conf(addr, aftype);
1006	<
1007	<	/* DLINE exempt also gets you out of static limits/pacing... */
1008	<	if (conf && (conf->type == CONF_EXEMPT))
1009	<	return 0;
953	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
954
955		if (conf)
956	+	{
957	+	/* DLINE exempt also gets you out of static limits/pacing... */
958	+	if (conf->type == CONF_EXEMPT)
959	+	return 0;
960		return BANNED_CLIENT;
961	+	}
962
963		ip_found = ipcache_find_or_add_address(addr);
964
#	Line 1045 | Line 994 | expire_tklines(dlink_list *list)
994		if (!conf->until || conf->until > CurrentTime)
995		continue;
996
997	<	if (conf->type == CONF_XLINE)
998	<	{
999	<	if (ConfigGeneral.tkline_expire_notices)
1000	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1052	<	"Temporary X-line for [%s] expired", conf->name);
1053	<	conf_free(conf);
1054	<	}
1055	<	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1056	<	{
1057	<	if (ConfigGeneral.tkline_expire_notices)
1058	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1059	<	"Temporary RESV for [%s] expired", conf->name);
1060	<	conf_free(conf);
1061	<	}
997	>	if (ConfigGeneral.tkline_expire_notices)
998	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
999	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
1000	>	conf_free(conf);
1001		}
1002		}
1003
#	Line 1073 | Line 1012 | void
1012		cleanup_tklines(void *unused)
1013		{
1014		hostmask_expire_temporary();
1015	<	expire_tklines(&xconf_items);
1015	>	expire_tklines(&gecos_items);
1016		expire_tklines(&nresv_items);
1017		expire_tklines(&cresv_items);
1018		}
#	Line 1090 | Line 1029 | static const struct oper_privs
1029		const unsigned char c;
1030		} flag_list[] = {
1031		{ OPER_FLAG_ADMIN,          'A' },
1032	<	{ OPER_FLAG_REMOTEBAN,      'B' },
1033	<	{ OPER_FLAG_DIE,            'D' },
1034	<	{ OPER_FLAG_GLINE,          'G' },
1035	<	{ OPER_FLAG_REHASH,         'H' },
1032	>	{ OPER_FLAG_CLOSE,          'B' },
1033	>	{ OPER_FLAG_CONNECT,        'C' },
1034	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
1035	>	{ OPER_FLAG_DIE,            'E' },
1036	>	{ OPER_FLAG_DLINE,          'F' },
1037	>	{ OPER_FLAG_GLOBOPS,        'G' },
1038	>	{ OPER_FLAG_JOIN_RESV,      'H' },
1039	>	{ OPER_FLAG_KILL,           'I' },
1040	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
1041		{ OPER_FLAG_KLINE,          'K' },
1042	<	{ OPER_FLAG_KILL,           'N' },
1043	<	{ OPER_FLAG_KILL_REMOTE,    'O' },
1044	<	{ OPER_FLAG_CONNECT,        'P' },
1045	<	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1046	<	{ OPER_FLAG_SQUIT,          'R' },
1047	<	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1048	<	{ OPER_FLAG_UNKLINE,        'U' },
1049	<	{ OPER_FLAG_XLINE,          'X' },
1042	>	{ OPER_FLAG_LOCOPS,         'L' },
1043	>	{ OPER_FLAG_MODULE,         'M' },
1044	>	{ OPER_FLAG_NICK_RESV,      'N' },
1045	>	{ OPER_FLAG_OPME,           'O' },
1046	>	{ OPER_FLAG_REHASH,         'P' },
1047	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
1048	>	{ OPER_FLAG_RESTART,        'R' },
1049	>	{ OPER_FLAG_RESV,           'S' },
1050	>	{ OPER_FLAG_SET,            'T' },
1051	>	{ OPER_FLAG_SQUIT,          'U' },
1052	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
1053	>	{ OPER_FLAG_UNDLINE,        'W' },
1054	>	{ OPER_FLAG_UNKLINE,        'X' },
1055	>	{ OPER_FLAG_UNRESV,         'Y' },
1056	>	{ OPER_FLAG_UNXLINE,        'Z' },
1057	>	{ OPER_FLAG_WALLOPS,        'a' },
1058	>	{ OPER_FLAG_XLINE,          'b' },
1059		{ 0, '\0' }
1060		};
1061
1062	<	char *
1062	>	const char *
1063		oper_privs_as_string(const unsigned int port)
1064		{
1065		static char privs_out[IRCD_BUFSIZE];
1066		char *privs_ptr = privs_out;
1067
1068		for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1116	–	{
1069		if (port & opriv->flag)
1070		*privs_ptr++ = opriv->c;
1071	<	else
1072	<	*privs_ptr++ = ToLower(opriv->c);
1073	<	}
1071	>
1072	>	if (privs_ptr == privs_out)
1073	>	*privs_ptr++ = '0';
1074
1075		*privs_ptr = '\0';
1076
#	Line 1178 | Line 1130 | clear_out_old_conf(void)
1130		{
1131		dlink_node *node = NULL, *node_next = NULL;
1132		dlink_list *free_items [] = {
1133	<	&server_items,   &oconf_items,
1134	<	&uconf_items,   &xconf_items,
1133	>	&server_items,   &operator_items,
1134	>	&shared_items,   &gecos_items,
1135		&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1136		};
1137
#	Line 1196 | Line 1148 | clear_out_old_conf(void)
1148		struct MaskItem *conf = node->data;
1149
1150		conf->active = 0;
1199	–	dlinkDelete(&conf->node, *iterator);
1151
1152	<	/* XXX This is less than pretty */
1202	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1152	>	if (!IsConfDatabase(conf))
1153		{
1154	+	dlinkDelete(&conf->node, *iterator);
1155	+
1156		if (!conf->ref_count)
1157		conf_free(conf);
1158		}
1207	–	else if (conf->type == CONF_XLINE)
1208	–	{
1209	–	if (!conf->until)
1210	–	conf_free(conf);
1211	–	}
1212	–	else
1213	–	conf_free(conf);
1159		}
1160		}
1161
#	Line 1230 | Line 1175 | clear_out_old_conf(void)
1175		pseudo_clear();
1176
1177		/* Clean out ConfigServerInfo */
1178	<	MyFree(ConfigServerInfo.description);
1178	>	xfree(ConfigServerInfo.description);
1179		ConfigServerInfo.description = NULL;
1180	<	MyFree(ConfigServerInfo.network_name);
1180	>	xfree(ConfigServerInfo.network_name);
1181		ConfigServerInfo.network_name = NULL;
1182	<	MyFree(ConfigServerInfo.network_desc);
1182	>	xfree(ConfigServerInfo.network_desc);
1183		ConfigServerInfo.network_desc = NULL;
1239	–	#ifdef HAVE_LIBCRYPTO
1240	–	if (ConfigServerInfo.rsa_private_key)
1241	–	{
1242	–	RSA_free(ConfigServerInfo.rsa_private_key);
1243	–	ConfigServerInfo.rsa_private_key = NULL;
1244	–	}
1184
1185	<	MyFree(ConfigServerInfo.rsa_private_key_file);
1185	>	xfree(ConfigServerInfo.rsa_private_key_file);
1186		ConfigServerInfo.rsa_private_key_file = NULL;
1187	<	#endif
1187	>	xfree(ConfigServerInfo.ssl_certificate_file);
1188	>	ConfigServerInfo.ssl_certificate_file = NULL;
1189	>	xfree(ConfigServerInfo.ssl_dh_param_file);
1190	>	ConfigServerInfo.ssl_dh_param_file = NULL;
1191	>	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
1192	>	ConfigServerInfo.ssl_dh_elliptic_curve = NULL;
1193	>	xfree(ConfigServerInfo.ssl_cipher_list);
1194	>	ConfigServerInfo.ssl_cipher_list = NULL;
1195	>	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
1196	>	ConfigServerInfo.ssl_message_digest_algorithm = NULL;
1197
1198		/* Clean out ConfigAdminInfo */
1199	<	MyFree(ConfigAdminInfo.name);
1199	>	xfree(ConfigAdminInfo.name);
1200		ConfigAdminInfo.name = NULL;
1201	<	MyFree(ConfigAdminInfo.email);
1201	>	xfree(ConfigAdminInfo.email);
1202		ConfigAdminInfo.email = NULL;
1203	<	MyFree(ConfigAdminInfo.description);
1203	>	xfree(ConfigAdminInfo.description);
1204		ConfigAdminInfo.description = NULL;
1205
1206	+	xfree(ConfigServerHide.flatten_links_file);
1207	+	ConfigServerHide.flatten_links_file = NULL;
1208	+
1209		/* Clean out listeners */
1210	<	close_listeners();
1210	>	listener_close_marked();
1211	>	}
1212	>
1213	>	static void
1214	>	conf_handle_tls(int cold)
1215	>	{
1216	>	if (!tls_new_cred())
1217	>	{
1218	>	if (cold)
1219	>	{
1220	>	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
1221	>	exit(-1);
1222	>	}
1223	>	else
1224	>	{
1225	>	/* Failed to load new settings/certs, old ones remain active */
1226	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
1227	>	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
1228	>	}
1229	>	}
1230		}
1231
1232		/* read_conf_files()
#	Line 1289 | Line 1259 | read_conf_files(int cold)
1259		{
1260		ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1261		filename, strerror(errno));
1262	<	exit(-1);
1262	>	exit(EXIT_FAILURE);
1263		}
1264		else
1265		{
1266	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1266	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1267		"Unable to read configuration file '%s': %s",
1268		filename, strerror(errno));
1269		return;
#	Line 1307 | Line 1277 | read_conf_files(int cold)
1277		fclose(conf_parser_ctx.conf_file);
1278
1279		log_reopen_all();
1280	+	conf_handle_tls(cold);
1281
1282	<	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1283	<	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1282	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1283	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1284
1285	<	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1286	<	add_isupport("MAXLIST", chanmodes, -1);
1287	<	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1288	<	add_isupport("CHANTYPES", "#", -1);
1285	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1286	>	isupport_add("MAXLIST", chanmodes, -1);
1287	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1288	>	isupport_add("CHANTYPES", "#", -1);
1289
1290	<	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1290	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1291		ConfigChannel.max_channels);
1292	<	add_isupport("CHANLIMIT", chanlimit, -1);
1293	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORS");
1294	<	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1295	<	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1296	<	add_isupport("CHANMODES", chanmodes, -1);
1292	>	isupport_add("CHANLIMIT", chanlimit, -1);
1293	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORST");
1294	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1295	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1296	>	isupport_add("CHANMODES", chanmodes, -1);
1297
1298		/*
1299		* message_locale may have changed.  rebuild isupport since it relies
1300		* on strlen(form_str(RPL_ISUPPORT))
1301		*/
1302	<	rebuild_isupport_message_line();
1302	>	isupport_rebuild();
1303		}
1304
1305		/* conf_add_class_to_conf()
#	Line 1338 | Line 1309 | read_conf_files(int cold)
1309		* side effects - Add a class pointer to a conf
1310		*/
1311		void
1312	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1312	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1313		{
1314	<	if (class_name == NULL)
1314	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1315		{
1316		conf->class = class_default;
1317
1318		if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1319	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1349	<	"Warning *** Defaulting to default class for %s@%s",
1350	<	conf->user, conf->host);
1351	<	else
1352	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1353	<	"Warning *** Defaulting to default class for %s",
1354	<	conf->name);
1355	<	}
1356	<	else
1357	<	conf->class = class_find(class_name, 1);
1358	<
1359	<	if (conf->class == NULL)
1360	<	{
1361	<	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1362	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1319	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1320		"Warning *** Defaulting to default class for %s@%s",
1321		conf->user, conf->host);
1322		else
1323	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1323	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1324		"Warning *** Defaulting to default class for %s",
1325		conf->name);
1369	–	conf->class = class_default;
1326		}
1327		}
1328
#	Line 1385 | Line 1341 | yyerror(const char *msg)
1341		return;
1342
1343		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1344	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1344	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1345		"\"%s\", line %u: %s: %s",
1346		conffilebuf, lineno + 1, msg, newlinebuf);
1347		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1398 | Line 1354 | conf_error_report(const char *msg)
1354		char newlinebuf[IRCD_BUFSIZE];
1355
1356		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1357	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1357	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1358		"\"%s\", line %u: %s: %s",
1359		conffilebuf, lineno + 1, msg, newlinebuf);
1360		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1465 | Line 1421 | valid_wild_card_simple(const char *data)
1421		{
1422		const unsigned char *p = (const unsigned char *)data;
1423		unsigned char tmpch = '\0';
1424	<	unsigned int nonwild = 0;
1424	>	unsigned int nonwild = 0, wild = 0;
1425
1426		while ((tmpch = *p++))
1427		{
#	Line 1480 | Line 1436 | valid_wild_card_simple(const char *data)
1436		if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1437		return 1;
1438		}
1439	+	else
1440	+	++wild;
1441		}
1442
1443	<	return 0;
1443	>	return !wild;
1444		}
1445
1446		/* valid_wild_card()
#	Line 1494 | Line 1452 | valid_wild_card_simple(const char *data)
1452		* side effects - NOTICE is given to source_p if warn is 1
1453		*/
1454		int
1455	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1455	>	valid_wild_card(struct Client *source_p, int count, ...)
1456		{
1457		unsigned char tmpch = '\0';
1458		unsigned int nonwild = 0;
#	Line 1537 | Line 1495 | valid_wild_card(struct Client *source_p,
1495		}
1496		}
1497
1498	<	if (warn)
1498	>	if (IsClient(source_p))
1499		sendto_one_notice(source_p, &me,
1500		":Please include at least %u non-wildcard characters with the mask",
1501		ConfigGeneral.min_nonwildcard);
#	Line 1556 | Line 1514 | valid_wild_card(struct Client *source_p,
1514		*/
1515		static int
1516		find_user_host(struct Client *source_p, char *user_host_or_nick,
1517	<	char *luser, char *lhost, unsigned int flags)
1517	>	char *luser, char *lhost)
1518		{
1519		struct Client *target_p = NULL;
1520		char *hostp = NULL;
#	Line 1601 | Line 1559 | find_user_host(struct Client *source_p,
1559		find_chasing(source_p, user_host_or_nick)) == NULL)
1560		return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1561
1562	<	if (IsExemptKline(target_p))
1562	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1563		{
1564		if (IsClient(source_p))
1565		sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
#	Line 1617 | Line 1575 | find_user_host(struct Client *source_p,
1575		if (target_p->username[0] == '~')
1576		luser[0] = '*';
1577
1578	<	if (!strcmp(target_p->sockhost, "0"))
1621	<	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1622	<	else
1623	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1578	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1579		return 1;
1580		}
1581
#	Line 1641 | Line 1596 | find_user_host(struct Client *source_p,
1596		*              - pointer to target_server to parse into if non NULL
1597		*              - pointer to reason to parse into
1598		*
1599	<	* output       - 1 if valid, -1 if not valid
1599	>	* output       - 1 if valid, 0 if not valid
1600		* side effects - A generalised k/d/x etc. line parser,
1601		*               "ALINE [time] user@host|string [ON] target :reason"
1602		*                will parse returning a parsed user, host if
#	Line 1664 | Line 1619 | parse_aline(const char *cmd, struct Clie
1619		char **target_server, char **reason)
1620		{
1621		int found_tkline_time=0;
1622	<	static char def_reason[] = CONF_NOREASON;
1622	>	static char default_reason[] = CONF_NOREASON;
1623		static char user[USERLEN*4+1];
1624		static char host[HOSTLEN*4+1];
1625
#	Line 1683 | Line 1638 | parse_aline(const char *cmd, struct Clie
1638		else
1639		{
1640		sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1641	<	return -1;
1641	>	return 0;
1642		}
1643		}
1644
1645		if (parc == 0)
1646		{
1647		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1648	<	return -1;
1648	>	return 0;
1649		}
1650
1651		if (h_p == NULL)
1652		*up_p = *parv;
1653		else
1654		{
1655	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1656	<	return -1;
1655	>	if (find_user_host(source_p, *parv, user, host) == 0)
1656	>	return 0;
1657
1658		*up_p = user;
1659		*h_p = host;
#	Line 1714 | Line 1669 | parse_aline(const char *cmd, struct Clie
1669		parc--;
1670		parv++;
1671
1717	–	if (target_server == NULL)
1718	–	{
1719	–	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1720	–	return -1;
1721	–	}
1722	–
1672		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1673		{
1674		sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1675	<	return -1;
1675	>	return 0;
1676		}
1677
1678		if (parc == 0 || EmptyString(*parv))
1679		{
1680		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1681	<	return -1;
1681	>	return 0;
1682		}
1683
1684		*target_server = *parv;
#	Line 1751 | Line 1700 | parse_aline(const char *cmd, struct Clie
1700		if (strchr(user, '!'))
1701		{
1702		sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1703	<	return -1;
1703	>	return 0;
1704		}
1705
1706	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1707	<	return -1;
1706	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1707	>	return 0;
1708		}
1709		else
1710	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1711	<	return -1;
1710	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1711	>	return 0;
1712
1713		if (reason)
1714		{
1715		if (parc && !EmptyString(*parv))
1767	–	{
1716		*reason = *parv;
1769	–
1770	–	if (!valid_comment(source_p, *reason, 1))
1771	–	return -1;
1772	–	}
1717		else
1718	<	*reason = def_reason;
1718	>	*reason = default_reason;
1719		}
1720
1721		return 1;
1722		}
1723
1780	–	/* valid_comment()
1781	–	*
1782	–	* inputs       - pointer to client
1783	–	*              - pointer to comment
1784	–	* output       - 0 if no valid comment,
1785	–	*              - 1 if valid
1786	–	* side effects - truncates reason where necessary
1787	–	*/
1788	–	int
1789	–	valid_comment(struct Client *source_p, char *comment, int warn)
1790	–	{
1791	–	if (strlen(comment) > REASONLEN)
1792	–	comment[REASONLEN-1] = '\0';
1793	–
1794	–	return 1;
1795	–	}
1796	–
1724		/* match_conf_password()
1725		*
1726		* inputs       - pointer to given password
#	Line 1822 | Line 1749 | match_conf_password(const char *password
1749		*
1750		* inputs       - client sending the cluster
1751		*              - command name "KLINE" "XLINE" etc.
1752	<	*              - capab -- CAP_KLN etc. from server.h
1752	>	*              - capab -- CAPAB_KLN etc. from server.h
1753		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1754		*              - pattern and args to send along
1755		* output       - none
#	Line 1846 | Line 1773 | cluster_a_line(struct Client *source_p,
1773		const struct MaskItem *conf = node->data;
1774
1775		if (conf->flags & cluster_type)
1776	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER | capab,
1776	>	sendto_match_servs(source_p, conf->name, CAPAB_CLUSTER | capab,
1777		"%s %s %s", command, conf->name, buffer);
1778		}
1779		}

Diff Legend

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