Only enable vhosts automatically if the user doesn't already have the vhost set

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

1 files changed, 18 insertions, 15 deletions

diff --git a/src/hostserv.c b/src/hostserv.c
index cf8a6b146..262bf30b0 100644
--- a/src/hostserv.c
+++ b/src/hostserv.c
@@ -198,23 +198,26 @@ void do_on_id(User *u)
 	if (!na || !na->hostinfo.HasVhost())
 		return;
 	
-	ircdproto->SendVhost(u, na->hostinfo.GetIdent(), na->hostinfo.GetHost());
-	if (ircd->vhost)
+	if (!u->vhost || u->vhost != na->hostinfo.GetHost() || (!na->hostinfo.GetIdent().empty() && u->GetVIdent() != na->hostinfo.GetIdent()))
 	{
-		if (u->vhost)
-			delete [] u->vhost;
-		u->vhost = sstrdup(na->hostinfo.GetHost().c_str());
-	}
-	if (ircd->vident && !na->hostinfo.GetIdent().empty())
-	{
-		u->SetVIdent(na->hostinfo.GetIdent());
-	}
-	u->UpdateHost();
+		ircdproto->SendVhost(u, na->hostinfo.GetIdent(), na->hostinfo.GetHost());
+		if (ircd->vhost)
+		{
+			if (u->vhost)
+				delete [] u->vhost;
+			u->vhost = sstrdup(na->hostinfo.GetHost().c_str());
+		}
+		if (ircd->vident && !na->hostinfo.GetIdent().empty())
+		{
+			u->SetVIdent(na->hostinfo.GetIdent());
+		}
+		u->UpdateHost();
 
-	if (!na->hostinfo.GetIdent().empty())
-		notice_lang(Config.s_HostServ, u, HOST_IDENT_ACTIVATED, na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str());
-	else
-		notice_lang(Config.s_HostServ, u, HOST_ACTIVATED, na->hostinfo.GetHost().c_str());
+		if (!na->hostinfo.GetIdent().empty())
+			notice_lang(Config.s_HostServ, u, HOST_IDENT_ACTIVATED, na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str());
+		else
+			notice_lang(Config.s_HostServ, u, HOST_ACTIVATED, na->hostinfo.GetHost().c_str());
+	}
 }