Fix user->host not being assigned correctly for new connections

[user/henk/code/inspircd.git] / src / commands / cmd_eline.cpp

diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp
index 2fdb29679cd7aad85e87bd205a0cc30aba2431cd..4f26ace42e625e26276cbce2b7a1ab9f810f5798 100644 (file)
--- a/src/commands/cmd_eline.cpp
+++ b/src/commands/cmd_eline.cpp
@@ -22,54 +22,63 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /ELINE
  */
-CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       if (pcnt >= 3)
+       std::string target = parameters[0];
+       
+       if (parameters.size() >= 3)
        {
                IdentHostPair ih;
-               User* find = ServerInstance->FindNick(parameters[0]);
+               User* find = ServerInstance->FindNick(target.c_str());
                if (find)
                {
                        ih.first = "*";
                        ih.second = find->GetIPString();
+                       target = std::string("*@") + find->GetIPString();
                }
                else
-                       ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+                       ih = ServerInstance->XLines->IdentSplit(target.c_str());
+
+        if (ih.first.empty())
+        {
+            user->WriteServ("NOTICE %s :*** Target not found", user->nick.c_str());
+            return CMD_FAILURE;
+        }
 
                if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
                        return CMD_FAILURE;
 
-               long duration = ServerInstance->Duration(parameters[1]);
+               long duration = ServerInstance->Duration(parameters[1].c_str());
 
-               ELine* el = new ELine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ih.first.c_str(), ih.second.c_str());
+               ELine* el = new ELine(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
                if (ServerInstance->XLines->AddLine(el, user))
                {
                        if (!duration)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s.",user->nick,parameters[0]);
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s.",user->nick.c_str(),target.c_str());
                        }
                        else
                        {
                                time_t c_requires_crap = duration + ServerInstance->Time();
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires on %s",user->nick,parameters[0],
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires on %s",user->nick.c_str(),target.c_str(),
                                                ServerInstance->TimeString(c_requires_crap).c_str());
                        }
                }
                else
                {
                        delete el;
-                       user->WriteServ("NOTICE %s :*** E-Line for %s already exists",user->nick,parameters[0]);
+                       user->WriteServ("NOTICE %s :*** E-Line for %s already exists",user->nick.c_str(),target.c_str());
                }
        }
        else
        {
-               if (ServerInstance->XLines->DelLine(parameters[0], "E", user))
+               if (ServerInstance->XLines->DelLine(target.c_str(), "E", user))
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed E-line on %s.",user->nick,parameters[0]);
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed E-line on %s.",user->nick.c_str(),target.c_str());
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** E-Line %s not found in list, try /stats e.",user->nick,parameters[0]);
+                       user->WriteServ("NOTICE %s :*** E-Line %s not found in list, try /stats e.",user->nick.c_str(),target.c_str());
                }
        }