summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorViper <viper@anope.org>2011-11-16 15:57:07 +0100
committerViper <viper@anope.org>2011-11-16 15:57:07 +0100
commit0dd4a98e5369ef0c023a1fa7174988ceba32f27d (patch)
tree6dca6b880f21007cef4b3487fac239f39361b075 /src
parentf1577975a99dc93eff2dd9aa159a93a3c1cf4301 (diff)
Match bans against the vident/vhost instead of real ident/vhost when available.
Diffstat (limited to 'src')
-rw-r--r--src/actions.c2
-rw-r--r--src/channels.c2
2 files changed, 2 insertions, 2 deletions
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);