mirror of
https://github.com/inspircd/inspircd.git
synced 2025-03-10 11:09:04 -04:00
Allow CIDR channel bans to be matched
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4741 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
parent
66a643121d
commit
30de7a8603
@ -348,11 +348,14 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
|
||||
log(DEBUG,"add_channel: about to walk banlist");
|
||||
MOD_RESULT = 0;
|
||||
FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, Ptr));
|
||||
char mask[MAXBUF];
|
||||
sprintf(mask,"%s@%s",user->ident, user->GetIPString());
|
||||
if (!MOD_RESULT)
|
||||
{
|
||||
for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
|
||||
{
|
||||
if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match(user->GetIPString(),i->data)))
|
||||
/* This allows CIDR ban matching */
|
||||
if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match(mask, i->data, true)))
|
||||
{
|
||||
WriteServ(user->fd,"474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
|
||||
return NULL;
|
||||
|
Loading…
x
Reference in New Issue
Block a user