summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2014-01-04 20:04:39 +0000
committermichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2014-01-04 20:04:39 +0000
commit5ea584c565d6753a2293e66246458952e53dd7d6 (patch)
tree0ce81612f2093b4757b51a99e128ef9c2c38a7dd /src
parent547596b986e6e87e4c9476ff26eb8c2a0fec1227 (diff)
- Fixed kline issue as reported by Andrei Hristow
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2740 82007160-df01-0410-b94d-b575c5fd34c7
Diffstat (limited to 'src')
-rw-r--r--src/client.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/client.c b/src/client.c
index 08177a6..4350e14 100644
--- a/src/client.c
+++ b/src/client.c
@@ -364,28 +364,28 @@ check_conf_klines(void)
if (ConfigFileEntry.glines)
{
- if (!(conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
- CONF_GLINE, client_p->localClient->aftype,
- client_p->username, NULL, 1)))
- continue;
-
- if (IsExemptKline(client_p) ||
- IsExemptGline(client_p))
+ if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
+ CONF_GLINE, client_p->localClient->aftype,
+ client_p->username, NULL, 1)))
{
- sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
- "GLINE over-ruled for %s, client is %sline_exempt",
- get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
+ if (IsExemptKline(client_p) ||
+ IsExemptGline(client_p))
+ {
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "GLINE over-ruled for %s, client is %sline_exempt",
+ get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
+ continue;
+ }
+
+ ban_them(client_p, conf);
+ /* and go examine next fd/client_p */
continue;
}
-
- ban_them(client_p, conf);
- /* and go examine next fd/client_p */
- continue;
}
if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
CONF_KLINE, client_p->localClient->aftype,
- client_p->username, NULL, 1)) != NULL)
+ client_p->username, NULL, 1)))
{
if (IsExemptKline(client_p))
{