From 0dd4a98e5369ef0c023a1fa7174988ceba32f27d Mon Sep 17 00:00:00 2001 From: Viper Date: Wed, 16 Nov 2011 15:57:07 +0100 Subject: Match bans against the vident/vhost instead of real ident/vhost when available. --- Changes | 1 + src/actions.c | 2 +- src/channels.c | 2 +- version.log | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Changes b/Changes index 3f087c688..f0b546194 100644 --- a/Changes +++ b/Changes @@ -10,6 +10,7 @@ Anope Version 1.8 - GIT 08/09 F Fixed deopping the first user to join a channel during a burst [#1287] 08/10 F Fixed loading bs_fantasy_owner on InspIRCd 2.0 on startup [ #00] 08/21 F Send DROP event when forbidding nicks and channels. [ #00] +11/16 F Fixed bans always comparing against real instead of vident. [ #00] Anope Version 1.8.6 ------------------- diff --git a/src/actions.c b/src/actions.c index 97c387eaa..a673f759f 100644 --- a/src/actions.c +++ b/src/actions.c @@ -178,7 +178,7 @@ static void _common_unban(ChannelInfo * ci, char *nick, boolean full) for (ban = ci->c->bans->entries; ban; ban = next) { next = ban->next; if ((full && entry_match(ban, u->nick, u->username, u->host, ip)) || - entry_match(ban, u->nick, u->username, u->vhost, 0) || + entry_match(ban, u->nick, u->vident, u->vhost, 0) || entry_match(ban, u->nick, u->username, u->chost, 0)) { anope_cmd_mode(whosends(ci), ci->name, "-b %s", ban->mask); if (ircdcap->tsmode) diff --git a/src/channels.c b/src/channels.c index 13a0b7c81..3aa05e3ab 100644 --- a/src/channels.c +++ b/src/channels.c @@ -2425,7 +2425,7 @@ static Entry *_elist_match_user(EList * list, User * u, boolean full) if (full) res = elist_match(list, u->nick, u->username, u->host, ip); if (!res) - res = elist_match(list, u->nick, u->username, u->vhost, 0); + res = elist_match(list, u->nick, u->vident, u->vhost, 0); if (!res) res = elist_match(list, u->nick, u->username, u->chost, 0); diff --git a/version.log b/version.log index 8314f4af4..484590ac5 100644 --- a/version.log +++ b/version.log @@ -8,9 +8,10 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="7" VERSION_EXTRA="-git" -VERSION_BUILD="3083" +VERSION_BUILD="3084" # $Log$ # Changes since 1.8.6 Release +#Revision 3084 - Match bans against the vident/vhost instead of real ident/vhost when available. #Revision 3083 - Use _exit, not exit, to exit mail forks to prevent our atexit() functions from being called, and removing our pidfile #Revision 3082 - Made os_sxline and os_akill use a stored value to curent time to prevent the off-chance of time changing while executing the function which can mess up our globops/log messages #Revision 3081 - Added event to warn modules a nickcore gets a new display nick or is about to be dropped. (This should enable modules to more easily link their data to anopes core data.) -- cgit