summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlethality <lethality@anope.org>2011-03-04 22:30:44 +0000
committerlethality <lethality@anope.org>2011-03-04 22:30:44 +0000
commit0e0eb38b2a442293ebd8975b75bfea80cc49af1a (patch)
tree79c06ff15700a6a76da9b399ffd780039ea6359f
parent6fca33a2baeb08de823c18692142b33ddbfcfbcc (diff)
Change to users masked host instead of the real one after turning vhost off in inspircd.
-rw-r--r--Changes1
-rw-r--r--src/protocol/inspircd12.c7
-rw-r--r--src/protocol/inspircd20.c7
-rw-r--r--version.log3
4 files changed, 9 insertions, 9 deletions
diff --git a/Changes b/Changes
index a6f062fb7..90adf5490 100644
--- a/Changes
+++ b/Changes
@@ -19,6 +19,7 @@ Anope Version 1.8 - GIT
3/3 F Fixed opping our clients on ratbox when not using TS6 [ #00]
10/31 A Added support for plexus3's channel mode +z [#1202]
2/23 A Added account tracking support to ratbox protocol module [ #00]
+3/4 F Fixed setting a users host in InspIRCd when vhost is turned off [ #00]
Anope Version 1.8.5
-------------------
diff --git a/src/protocol/inspircd12.c b/src/protocol/inspircd12.c
index 38b421513..e53ac735e 100644
--- a/src/protocol/inspircd12.c
+++ b/src/protocol/inspircd12.c
@@ -575,11 +575,10 @@ void inspircd_cmd_topic(char *whosets, char *chan, char *whosetit,
void inspircd_cmd_vhost_off(User * u)
{
- Uid *ud = find_uid(s_OperServ);
- send_cmd(ud->uid, "MODE %s -%s", u->nick, myIrcd->vhostchar);
- inspircd_cmd_chghost(u->nick, u->host);
+ common_svsmode(u, "-x", NULL);
+ common_svsmode(u, "+x", NULL);
- if (has_chgidentmod && u->username && u->vident && strcmp(u->username, u->vident) > 0)
+ if (has_chgidentmod && u->username && u->vident && strcmp(u->username, u->vident) != 0)
{
inspircd_cmd_chgident(u->nick, u->username);
}
diff --git a/src/protocol/inspircd20.c b/src/protocol/inspircd20.c
index 99a39bbc5..d0239ef1c 100644
--- a/src/protocol/inspircd20.c
+++ b/src/protocol/inspircd20.c
@@ -622,11 +622,10 @@ void inspircd_cmd_topic(char *whosets, char *chan, char *whosetit,
void inspircd_cmd_vhost_off(User * u)
{
- Uid *ud = find_uid(s_OperServ);
- send_cmd(ud->uid, "MODE %s -%s", u->nick, myIrcd->vhostchar);
- inspircd_cmd_chghost(u->nick, u->host);
+ common_svsmode(u, "-x", NULL);
+ common_svsmode(u, "+x", NULL);
- if (has_chgidentmod && u->username && u->vident && strcmp(u->username, u->vident) > 0)
+ if (has_chgidentmod && u->username && u->vident && strcmp(u->username, u->vident) != 0)
{
inspircd_cmd_chgident(u->nick, u->username);
}
diff --git a/version.log b/version.log
index 8c74200b5..c3eac1333 100644
--- a/version.log
+++ b/version.log
@@ -8,9 +8,10 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="5"
VERSION_EXTRA="-git"
-VERSION_BUILD="3064"
+VERSION_BUILD="3065"
# $Log$ # Changes since 1.8.5 Release
+#Revision 3065 - Change to users masked host instead of the real one after turning vhost off in inspircd.
#Revision 3063 - Fixed opping our clients on ratbox when TS6 is not used.
#Revision 3062 - Do not show SENDPASS in NickServ and ChanServ help to users who can't use it
#Revision 3061 - Rejoin our clients if kicked on TS6 IRCDs and made ratbox protocol module use account tracking