]> jfr.im git - irc/rqf/shadowircd.git/commitdiff
rehash bans: still check k/x lines for users exempt from dlines
authorJilles Tjoelker <redacted>
Sun, 8 Mar 2009 12:30:30 +0000 (13:30 +0100)
committerJilles Tjoelker <redacted>
Sun, 8 Mar 2009 12:30:30 +0000 (13:30 +0100)
src/client.c

index ac45624f0f180842cd14a4f181f0edecb211a562..41da8952df029a3ac5c29f874b2b08ed3dc18312 100644 (file)
@@ -459,11 +459,8 @@ check_banned_lines(void)
                        continue;
 
                /* if there is a returned struct ConfItem then kill it */
-               if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip, client_p->localClient->ip.ss_family)))
+               if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip, client_p->localClient->ip.ss_family)) && !(aconf->status & CONF_EXEMPTDLINE))
                {
-                       if(aconf->status & CONF_EXEMPTDLINE)
-                               continue;
-
                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                             "DLINE active for %s",
                                             get_client_name(client_p, HIDE_IP));