ViewVC Help

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

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

Comparing ircd-hybrid-8/src/conf.c (file contents):
Revision 1390 by michael, Tue May 1 13:39:18 2012 UTC vs.
Revision 1393 by michael, Wed May 2 19:17:37 2012 UTC

#	Line 2077 | Line 2077 | find_kill(struct Client *client_p)
2077
2078		assert(client_p != NULL);
2079
2080	<	aconf = find_kline_conf(client_p->host, client_p->username,
2081	<	&client_p->localClient->ip,
2082	<	client_p->localClient->aftype);
2080	>	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
2081	>	CONF_KLINE, client_p->localClient->aftype,
2082	>	client_p->username, NULL, 1);
2083		if (aconf == NULL)
2084		aconf = find_regexp_kline(uhi);
2085
2086	<	if (aconf && (aconf->status & CONF_KLINE))
2087	<	return aconf;
2088	<
2089	<	return NULL;
2086	>	return aconf;
2087		}
2088
2089		struct AccessItem *
#	Line 2096 | Line 2093 | find_gline(struct Client *client_p)
2093
2094		assert(client_p != NULL);
2095
2096	<	aconf = find_gline_conf(client_p->host, client_p->username,
2097	<	&client_p->localClient->ip,
2098	<	client_p->localClient->aftype);
2099	<
2103	<	if (aconf && (aconf->status & CONF_GLINE))
2104	<	return aconf;
2105	<
2106	<	return NULL;
2096	>	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
2097	>	CONF_GLINE, client_p->localClient->aftype,
2098	>	client_p->username, NULL, 1);
2099	>	return aconf;
2100		}
2101
2102		/* add_temp_line()

Diff Legend

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