BUILD : 1.7.5 (411) BUGS : 197 NOTES : Fixed hostserv message on removal of vhost

git-svn-id: svn://svn.anope.org/anope/trunk@411 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@275 5417fbe8-f217-4b02-8779-1006273d7864

13 files changed, 28 insertions, 19 deletions

diff --git a/include/extern.h b/include/extern.h
index 2122b4e72..106e82de7 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -961,7 +961,7 @@ extern void anope_cmd_capab();						  	  		  /* CAPAB */
 extern void anope_cmd_chghost(char *nick, char *vhost);                   			  /* CHGHOST */
 extern void anope_cmd_chgident(char *nick, char *vIdent);                 			  /* CHGIDENT */
 extern void anope_cmd_vhost_on(char *nick, char *vIdent, char *vhost);    			  /* CHGHOST + CHGIDENT */
-extern void anope_cmd_vhost_off(char *nick);
+extern void anope_cmd_vhost_off(User *u);
 extern void anope_cmd_connect(int servernum);                             	           	  /* Connect */
 extern void anope_cmd_ea();									  /* EA      */
 extern void anope_cmd_global(char *source, const char *fmt, ...);         	  		  /* GLOBOPS */
diff --git a/src/bahamut.c b/src/bahamut.c
index 127673e39..f9680410c 100644
--- a/src/bahamut.c
+++ b/src/bahamut.c
@@ -1440,7 +1440,7 @@ void anope_cmd_vhost_on(char *nick, char *vIdent, char *vhost)
     /* Not Supported by this IRCD */
 }
 
-void anope_cmd_vhost_off(char *nick)
+void anope_cmd_vhost_off(User * u)
 {
     /* Not Supported by this IRCD */
 }
diff --git a/src/dreamforge.c b/src/dreamforge.c
index 5a1f5f97c..4318e0760 100644
--- a/src/dreamforge.c
+++ b/src/dreamforge.c
@@ -1258,7 +1258,7 @@ void anope_cmd_unban(char *name, char *nick)
     /* Not Supported by this IRCD */
 }
 
-void anope_cmd_vhost_off(char *nick)
+void anope_cmd_vhost_off(User * u)
 {
     /* Not Supported by this IRCD */
 }
diff --git a/src/hostserv.c b/src/hostserv.c
index 229b809a0..c248de69e 100644
--- a/src/hostserv.c
+++ b/src/hostserv.c
@@ -1012,7 +1012,7 @@ int do_del(User * u)
 int do_off(User * u)
 {
     /* put any generic code here... :) */
-    anope_cmd_vhost_off(u->nick);
+    anope_cmd_vhost_off(u);
     return MOD_CONT;
 }
 
diff --git a/src/hybrid.c b/src/hybrid.c
index f000e7fbf..d309ff621 100644
--- a/src/hybrid.c
+++ b/src/hybrid.c
@@ -687,7 +687,7 @@ void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
     send_cmd(whosets, "TOPIC %s :%s", chan, topic);
 }
 
-void anope_cmd_vhost_off(char *nick)
+void anope_cmd_vhost_off(User * u)
 {
     /* does not support vhosting */
 }
diff --git a/src/ptlink.c b/src/ptlink.c
index a19b1cd76..b13a99b6e 100644
--- a/src/ptlink.c
+++ b/src/ptlink.c
@@ -1296,7 +1296,7 @@ void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
     send_cmd(whosets, "TOPIC %s :%s", chan, topic);
 }
 
-void anope_cmd_vhost_off(char *nick)
+void anope_cmd_vhost_off(User * u)
 {
     /* does not support vhosting */
 }
diff --git a/src/rageircd.c b/src/rageircd.c
index 6771d6fdd..9afb8a94f 100644
--- a/src/rageircd.c
+++ b/src/rageircd.c
@@ -632,7 +632,8 @@ void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
 
 void anope_cmd_vhost_off(char *nick)
 {
-    send_cmd(s_HostServ, "SVSMODE %s -x", nick);
+    send_cmd(s_HostServ, "SVSMODE %s -x", u->nick);
+    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick);
 }
 
 void anope_cmd_vhost_on(char *nick, char *vIdent, char *vhost)
diff --git a/src/ultimate2.c b/src/ultimate2.c
index 4d1aa1274..11ba07ab3 100644
--- a/src/ultimate2.c
+++ b/src/ultimate2.c
@@ -784,9 +784,9 @@ void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
     send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit, when, topic);
 }
 
-void anope_cmd_vhost_off(char *nick)
+void anope_cmd_vhost_off(User * u)
 {
-    /* does not support vhosting */
+    /* does not support removing vhosting */
 }
 
 void anope_cmd_vhost_on(char *nick, char *vIdent, char *vhost)
diff --git a/src/ultimate3.c b/src/ultimate3.c
index e8a1ff874..be3af6849 100644
--- a/src/ultimate3.c
+++ b/src/ultimate3.c
@@ -684,9 +684,10 @@ void anope_cmd_remove_akill(char *user, char *host)
     send_cmd(NULL, "RAKILL %s %s", host, user);
 }
 
-void anope_cmd_vhost_off(char *nick)
+void anope_cmd_vhost_off(User * u)
 {
-    send_cmd(s_HostServ, "SVSMODE %s -x", nick);
+    send_cmd(s_HostServ, "SVSMODE %s -x", u->nick);
+    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick);
 }
 
 void anope_cmd_vhost_on(char *nick, char *vIdent, char *vhost)
diff --git a/src/unreal31.c b/src/unreal31.c
index de6cb027e..8d6ed1a3d 100644
--- a/src/unreal31.c
+++ b/src/unreal31.c
@@ -500,9 +500,10 @@ void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
     send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit, when, topic);
 }
 
-void anope_cmd_vhost_off(char *nick)
+void anope_cmd_vhost_off(User * u)
 {
-    send_cmd(s_HostServ, "SVSMODE %s -xt", nick);
+    send_cmd(s_HostServ, "SVSMODE %s -xt", u->nick);
+    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick);
 }
 
 void anope_cmd_akill(char *user, char *host, char *who, time_t when,
diff --git a/src/unreal32.c b/src/unreal32.c
index 897af7ab8..71573e5af 100644
--- a/src/unreal32.c
+++ b/src/unreal32.c
@@ -741,15 +741,16 @@ void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
              whosetit, when, topic);
 }
 
-void anope_cmd_vhost_off(char *nick)
+void anope_cmd_vhost_off(User * u)
 {
     if (UseSVS2MODE) {
         send_cmd(s_HostServ, "%s %s -xt", send_token("SVS2MODE", "v"),
-                 nick);
+                 u->nick);
     } else {
         send_cmd(s_HostServ, "%s %s -xt", send_token("SVSMODE", "n"),
-                 nick);
+                 u->nick);
     }
+    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick);
 }
 
 void anope_cmd_akill(char *user, char *host, char *who, time_t when,
diff --git a/src/viagra.c b/src/viagra.c
index 9f07a353e..f95ef91f6 100644
--- a/src/viagra.c
+++ b/src/viagra.c
@@ -779,9 +779,10 @@ void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
     send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit, when, topic);
 }
 
-void anope_cmd_vhost_off(char *nick)
+void anope_cmd_vhost_off(User * u)
 {
-    send_cmd(NULL, "SVSMODE %s -x", nick);
+    send_cmd(NULL, "SVSMODE %s -x", u->nick);
+    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick);
 }
 
 void anope_cmd_vhost_on(char *nick, char *vIdent, char *vhost)
diff --git a/version.log b/version.log
index 36bdfee35..d094ecf85 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="5"
-VERSION_BUILD="410"
+VERSION_BUILD="411"
 
 # $Log$
 #
+# BUILD : 1.7.5 (411)
+# BUGS  : 197
+# NOTES : Fixed hostserv message on removal of vhost
+#
 # BUILD : 1.7.5 (410)
 # BUGS  : 
 # NOTES : Added shot note in example.conf regarding NsRestrictOperNick or whatever it is called.