diff options
| author | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-11-01 20:44:22 +0000 |
|---|---|---|
| committer | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-11-01 20:44:22 +0000 |
| commit | 76ed67fe37cba4734e1377a468cc95da736ff5d2 (patch) | |
| tree | e67d70fb3b1e27f06064b0fcc71cda36441667d6 /src/client.c | |
| parent | eddfc4585d53d006ff7c0ac1db5b1d3551195a5b (diff) | |
- Got rid of find_kill() and find_gline() wrapper functions
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2523 82007160-df01-0410-b94d-b575c5fd34c7
Diffstat (limited to 'src/client.c')
| -rw-r--r-- | src/client.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/client.c b/src/client.c index 64028e9..575d411 100644 --- a/src/client.c +++ b/src/client.c @@ -361,8 +361,13 @@ check_conf_klines(void) continue; /* and go examine next fd/client_p */ } - if (ConfigFileEntry.glines && (conf = find_gline(client_p))) + 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)) { @@ -377,7 +382,9 @@ check_conf_klines(void) continue; } - if ((conf = find_kill(client_p)) != NULL) + 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) { if (IsExemptKline(client_p)) { |