X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_vhost.cpp;h=f5ee54f6cc05980011828a0058038bbe5ee74939;hb=95fd083b589d7b16df98fe00711e8ac2cf9cc871;hp=09327d77be27e732e4b69dd75f6d9a63789fd18b;hpb=53afaa7cadcdf222dcf761441727305f79b4c557;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 09327d77b..f5ee54f6c 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -26,7 +26,7 @@ class CommandVhost : public Command
 		syntax = "<username> <password>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		ConfigReader *Conf = new ConfigReader(ServerInstance);
 
@@ -35,8 +35,9 @@ class CommandVhost : public Command
 			std::string mask = Conf->ReadValue("vhost","host",index);
 			std::string username = Conf->ReadValue("vhost","user",index);
 			std::string pass = Conf->ReadValue("vhost","pass",index);
+			std::string hash = Conf->ReadValue("vhost","hash",index);
 
-			if ((!strcmp(parameters[0],username.c_str())) && (!strcmp(parameters[1],pass.c_str())))
+			if ((!strcmp(parameters[0].c_str(),username.c_str())) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1].c_str(), hash.c_str()))
 			{
 				if (!mask.empty())
 				{
@@ -59,7 +60,7 @@ class ModuleVHost : public Module
  private:
 
 	CommandVhost* mycommand;
-	 
+
  public:
 	ModuleVHost(InspIRCd* Me) : Module(Me)
 	{
@@ -67,7 +68,7 @@ class ModuleVHost : public Module
 		ServerInstance->AddCommand(mycommand);
 
 	}
-	
+
 	virtual ~ModuleVHost()
 	{
 	}
@@ -75,9 +76,9 @@ class ModuleVHost : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_VENDOR,API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleVHost)