summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/protocol/inspircd12.c7
-rw-r--r--src/protocol/inspircd20.c7
2 files changed, 6 insertions, 8 deletions
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);
}