Fix issue #657, fix sending FNAME with spaces

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

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index f581a480824bde3ec424b125a32bb770bc8bdda6..742781747f4e091de5e9848da2ac8b80095ee52c 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -43,7 +43,7 @@ class CommandSwhois : public Command
        {
                User* dest = ServerInstance->FindNick(parameters[0]);
 
-               if (!dest)
+               if ((!dest) || (IS_SERVER(dest))) // allow setting swhois using SWHOIS before reg
                {
                        user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
@@ -92,7 +92,7 @@ class ModuleSWhois : public Module
 
        void init()
        {
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
                ServerInstance->Modules->AddService(cmd.swhois);
                Implementation eventlist[] = { I_OnWhoisLine, I_OnPostOper };
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));