X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_vhost.cpp;h=a300ad3b87a3789eac531c2e9cc96a33ca5ef844;hb=819147178db00008a215670992d0f532dd57f9e5;hp=92aeb3401e2939b1a3bb97eab9d2e5742e60a3eb;hpb=694e307c09334c21aaf1a6c3f0b7b6d95440dd3e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 92aeb3401..a300ad3b8 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,16 +17,16 @@
 
 /** Handle /VHOST
  */
-class cmd_vhost : public Command
+class CommandVhost : public Command
 {
  public:
-	cmd_vhost (InspIRCd* Instance) : Command(Instance,"VHOST", 0, 2)
+	CommandVhost (InspIRCd* Instance) : Command(Instance,"VHOST", 0, 2)
 	{
 		this->source = "m_vhost.so";
 		syntax = "<username> <password>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		ConfigReader *Conf = new ConfigReader(ServerInstance);
 
@@ -35,8 +35,9 @@ class cmd_vhost : 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())
 				{
@@ -58,28 +59,26 @@ class ModuleVHost : public Module
 {
  private:
 
-	cmd_vhost* mycommand;
-	 
+	CommandVhost* mycommand;
+
  public:
 	ModuleVHost(InspIRCd* Me) : Module(Me)
 	{
-		mycommand = new cmd_vhost(ServerInstance);
+		mycommand = new CommandVhost(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+
 	}
-	
+
 	virtual ~ModuleVHost()
 	{
 	}
 
-	void Implements(char* List)
-	{
-	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_VENDOR,API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleVHost)