Change to use std::string::iterator rather than making a copy of the pointer and...

[user/henk/code/inspircd.git] / src / cmd_oper.cpp

diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index 12d420567bb646010d9d9f2672baafb9cb1fc002..af0ad838b5bea24b3d03df2f455195ea7be96894 100644 (file)
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -20,6 +17,7 @@
 #include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_oper.h"
+#include "hashcomp.h"
 
 bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 {
@@ -35,8 +33,6 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
        return false;
 }
 
-
-
 extern "C" command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_oper(Instance);
@@ -70,7 +66,7 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
                ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "host", i, HostName, MAXBUF);
 
                match_login = !strcmp(LoginName,parameters[0]);
-               match_pass = !ServerInstance->OperPassCompare(Password,parameters[1]);
+               match_pass = !ServerInstance->OperPassCompare(Password,parameters[1], i);
                match_hosts = OneOfMatches(TheHost,TheIP,HostName);
 
                if (match_login && match_pass && match_hosts)
@@ -105,8 +101,8 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
        if (found)
        {
                /* correct oper credentials */
-               ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')",user->nick,user->ident,user->host,OperType,parameters[0]);
-               user->WriteServ("381 %s :You are now an IRC operator of type %s",user->nick,OperType);
+               ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')",user->nick,user->ident,user->host,irc::Spacify(OperType),parameters[0]);
+               user->WriteServ("381 %s :You are now an IRC operator of type %s",user->nick,irc::Spacify(OperType));
                if (!user->modes[UM_OPERATOR])
                        user->Oper(OperType);
        }