Apply diff for userprocess.cpp from earlier in the day

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

diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index 59b35deba024e8081876df8d978bd117b6b55559..331115e1d1174dd1148f405d50f2e38f23b15797 100644 (file)
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -11,6 +11,7 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "typedefs.h"
 #include "users.h"
@@ -33,7 +34,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
        return false;
 }
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_oper(Instance);
 }
@@ -103,7 +104,7 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
                /* 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,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])
+               if (!user->IsModeSet('o'))
                        user->Oper(OperType);
        }
        else
@@ -114,7 +115,7 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
 
                if (!type_invalid)
                {
-                       std::string fields = "";
+                       std::string fields;
                        if (!match_login)
                                fields.append("login ");
                        if (!match_pass)