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 4982 by michael, Sat Dec 6 18:17:20 2014 UTC vs.
Revision 5039 by michael, Sat Dec 13 16:08:37 2014 UTC

#	Line 507 | Line 507 | attach_connect_block(struct Client *clie
507		{
508		dlink_node *node = NULL;
509
510	<	assert(client_p != NULL);
511	<	assert(host != NULL);
512	<
513	<	if (client_p == NULL || host == NULL)
514	<	return 0;
510	>	assert(host);
511
512		DLINK_FOREACH(node, server_items.head)
513		{
#	Line 582 | Line 578 | find_matching_name_conf(enum maskitem_ty
578
579		if (EmptyString(conf->name))
580		continue;
581	<	if ((name != NULL) && !irccmp(name, conf->name))
581	>	if (name && !irccmp(name, conf->name))
582		return conf;
583		}
584		break;
#	Line 597 | Line 593 | find_matching_name_conf(enum maskitem_ty
593
594		if (EmptyString(conf->name))
595		continue;
596	<	if ((name != NULL) && !match(conf->name, name))
596	>	if (name && !match(conf->name, name))
597		{
598		if ((user == NULL && (host == NULL)))
599		return conf;
#	Line 616 | Line 612 | find_matching_name_conf(enum maskitem_ty
612		{
613		conf = node->data;
614
615	<	if ((name != NULL) && !match(name, conf->name))
615	>	if (name && !match(name, conf->name))
616		return conf;
617	<	else if ((host != NULL) && !match(host, conf->host))
617	>	if (host && !match(host, conf->host))
618		return conf;
619		}
620		break;
#	Line 856 | Line 852 | set_default_conf(void)
852		ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
853		ConfigGeneral.warn_no_connect_block = 1;
854		ConfigGeneral.stats_e_disabled = 0;
859	–	ConfigGeneral.stats_o_oper_only = 0;
860	–	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
855		ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
856	+	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
857	+	ConfigGeneral.stats_o_oper_only = 1;
858	+	ConfigGeneral.stats_m_oper_only = 1;
859		ConfigGeneral.stats_P_oper_only = 0;
860		ConfigGeneral.stats_u_oper_only = 0;
861		ConfigGeneral.caller_id_wait = 60;
#	Line 868 | Line 865 | set_default_conf(void)
865		ConfigGeneral.short_motd = 0;
866		ConfigGeneral.ping_cookie = 0;
867		ConfigGeneral.no_oper_flood = 0;
871	–	ConfigGeneral.true_no_oper_flood = 0;
868		ConfigGeneral.oper_pass_resv = 1;
869		ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
870		ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
#	Line 886 | Line 882 | validate_conf(void)
882		if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
883		ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
884
885	<	if (ConfigServerInfo.network_name == NULL)
885	>	if (EmptyString(ConfigServerInfo.network_name))
886		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
887
888	<	if (ConfigServerInfo.network_desc == NULL)
888	>	if (EmptyString(ConfigServerInfo.network_desc))
889		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
890
891		ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
#	Line 1180 | Line 1176 | clear_out_old_conf(void)
1176		* Resetting structs, etc, is taken care of by set_default_conf().
1177		*/
1178
1179	<	for (; *iterator != NULL; iterator++)
1179	>	for (; *iterator; iterator++)
1180		{
1181		DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1182		{

Diff Legend

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