Add 906, sasl aborted

[user/henk/code/inspircd.git] / src / modules / m_alias.cpp

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index b52db1b8bb1bd178c4ed870cabea4f29985ceedf..e1600e9c61317055a2273e5183beada0889de97d 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -126,7 +126,7 @@ class ModuleAlias : public Module
                }
        }
 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
        {
                User *u = NULL;
 
@@ -179,7 +179,7 @@ class ModuleAlias : public Module
                                {
                                        if (!ServerInstance->ULine(u->server))
                                        {
-                                               ServerInstance->SNO->WriteToSnoMask('O', "NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); 
+                                               ServerInstance->SNO->WriteToSnoMask('A', "NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); 
                                                user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
                                                return 1;
                                        }
@@ -197,10 +197,10 @@ class ModuleAlias : public Module
                                else
                                {
                                        irc::sepstream commands(Aliases[i].replace_with, '\n');
-                                       std::string command;
-                                       while (commands.GetToken(command))
+                                       std::string scommand;
+                                       while (commands.GetToken(scommand))
                                        {
-                                               DoCommand(command, user, safe);
+                                               DoCommand(scommand, user, safe);
                                        }
                                        return 1;
                                }