Replaced vsnprintf with VAFORMAT pretty much everywhere.

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 0bf8e0e0a9f1a0b56ef7e489811aeb515f614e30..d386337f2e9567b7ea235f868821db42eaf53ef1 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -296,11 +296,11 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
                if (!user->HasPermission(command))
                {
                        user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to command %s",
-                               user->nick.c_str(), user->oper->NameStr(), command.c_str());
+                               user->nick.c_str(), user->oper->name.c_str(), command.c_str());
                        return do_more;
                }
        }
-       if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
+       if ((user->registered == REG_ALL) && (!user->IsOper()) && (cm->second->IsDisabled()))
        {
                /* command is disabled! */
                if (ServerInstance->Config->DisabledDontExist)
@@ -371,7 +371,7 @@ bool CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user)
        if (!user || buffer.empty())
                return true;
 
-       ServerInstance->Logs->Log("USERINPUT", RAWIO, "C[%s] I :%s %s",
+       ServerInstance->Logs->Log("USERINPUT", LOG_RAWIO, "C[%s] I :%s %s",
                user->uuid.c_str(), user->nick.c_str(), buffer.c_str());
        return ProcessCommand(user,buffer);
 }