git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1080
c9e4aea6-c8fd-4c43-8297-
357d70d61c8c
+2004-06-18 Alex Badea <decampos@users.sourceforge.net>
+
+ * ircd/gline.c (gline_lookup): only return a gline if it's
+ active
+
+ * ircd/s_conf.c (find_kill): don't check for active gline,
+ since gline_lookup does now
+
2002-11-11 hikari <shadow@undernet.org>
* ircd/ircd.c: added call to irc_crypt_init() - someone hurry up and
modularise :P
2002-11-11 hikari <shadow@undernet.org>
* ircd/ircd.c: added call to irc_crypt_init() - someone hurry up and
modularise :P
Debug((DEBUG_DEBUG,"realname gline: '%s' '%s'",gline->gl_user,cli_info(cptr)));
if (match(gline->gl_user+2, cli_info(cptr)) != 0)
continue;
Debug((DEBUG_DEBUG,"realname gline: '%s' '%s'",gline->gl_user,cli_info(cptr)));
if (match(gline->gl_user+2, cli_info(cptr)) != 0)
continue;
+ if (!GlineIsActive(gline))
+ continue;
else {
if (match(gline->gl_host, (cli_user(cptr))->realhost) != 0)
continue;
else {
if (match(gline->gl_host, (cli_user(cptr))->realhost) != 0)
continue;
+ if (!GlineIsActive(gline))
+ continue;
send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.", deny->message);
}
}
send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.", deny->message);
}
}
- else if ((agline = gline_lookup(cptr, 0)) && GlineIsActive(agline)) {
+ else if ((agline = gline_lookup(cptr, 0))) {
/*
* find active glines
* added a check against the user's IP address to find_gline() -Kev
*/
send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.", GlineReason(agline));
}
/*
* find active glines
* added a check against the user's IP address to find_gline() -Kev
*/
send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.", GlineReason(agline));
}
- else
- agline = 0; /* if a gline was found, it was inactive */