summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes2
-rw-r--r--src/botserv.c2
-rw-r--r--src/nickserv.c4
-rw-r--r--version.log3
4 files changed, 6 insertions, 5 deletions
diff --git a/Changes b/Changes
index f0b546194..876a2f6f8 100644
--- a/Changes
+++ b/Changes
@@ -10,7 +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]
+11/16 F Fixed ident being used instead of vident in some comparisons. [ #00]
Anope Version 1.8.6
-------------------
diff --git a/src/botserv.c b/src/botserv.c
index 7506df7f5..894d6d9df 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -660,7 +660,7 @@ static BanData *get_ban_data(Channel * c, User * u)
if (!c || !u)
return NULL;
- snprintf(mask, sizeof(mask), "%s@%s", u->username,
+ snprintf(mask, sizeof(mask), "%s@%s", common_get_vident(u),
common_get_vhost(u));
for (bd = c->bd; bd; bd = next) {
diff --git a/src/nickserv.c b/src/nickserv.c
index a38894268..f60ce81c8 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -1292,8 +1292,8 @@ int is_on_access(User * u, NickCore * nc)
sprintf(buf, "%s@%s", u->username, u->host);
if (ircd->vhost) {
if (u->vhost) {
- buf2 = scalloc(strlen(u->username) + strlen(u->vhost) + 2, 1);
- sprintf(buf2, "%s@%s", u->username, u->vhost);
+ buf2 = scalloc(strlen(u->vident) + strlen(u->vhost) + 2, 1);
+ sprintf(buf2, "%s@%s", u->vident, u->vhost);
}
if (u->chost)
{
diff --git a/version.log b/version.log
index 484590ac5..525a780c6 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="3084"
+VERSION_BUILD="3085"
# $Log$ # Changes since 1.8.6 Release
+#Revision 3085 - Use vident instead of ident in combination with the vhost for botserv kick(ban)s and nickserv access list checking.
#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