Send HALFOP= line in CAPAB CAPABILITIES for 1201 compat (anope relies on this)

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

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 5152ef274185e8938994b2f4e936c6ea6823c438..b2f296e7b5c8f0f01b7490d1c25ebff2c4373f54 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -33,13 +33,15 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
        time_t age_t = ConvToInt(params[1]);
        time_t signon = ConvToInt(params[7]);
        std::string empty;
-       std::string nick(params[2]);
        std::string modestr(params[8]);
 
        TreeServer* remoteserver = Utils->FindServer(serversrc->server);
 
        if (!remoteserver)
                return CMD_INVALID;
+       /* Is this a valid UID, and not misrouted? */
+       if (params[0].length() != 9 || params[0].substr(0,3) != serversrc->uuid)
+               return CMD_INVALID;
        /* Check parameters for validity before introducing the client, discovered by dmb */
        if (!age_t)
                return CMD_INVALID;
@@ -50,7 +52,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
        TreeSocket* sock = remoteserver->GetRoute()->GetSocket();
 
        /* check for collision */
-       user_hash::iterator iter = ServerInstance->Users->clientlist->find(nick);
+       user_hash::iterator iter = ServerInstance->Users->clientlist->find(params[2]);
 
        if (iter != ServerInstance->Users->clientlist->end())
        {
@@ -62,8 +64,12 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 
                if (collide != 1)
                {
-                       /* remote client changed, make sure we change their nick for the hash too */
-                       nick = params[0];
+                       /* remote client lost, make sure we change their nick for the hash too
+                        *
+                        * This alters the line that will be sent to other servers, which
+                        * commands normally shouldn't do; hence the required const_cast.
+                        */
+                       const_cast<parameterlist&>(params)[2] = params[0];
                }
        }
 
@@ -77,10 +83,11 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
        }
        catch (...)
        {
+               ServerInstance->Logs->Log("m_spanningtree", DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
                return CMD_INVALID;
        }
-       (*(ServerInstance->Users->clientlist))[nick] = _new;
-       _new->nick = nick;
+       (*(ServerInstance->Users->clientlist))[params[2]] = _new;
+       _new->nick = params[2];
        _new->host = params[3];
        _new->dhost = params[4];
        _new->ident = params[5];
@@ -97,9 +104,6 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
        unsigned int paramptr = 9;
        for (std::string::iterator v = modestr.begin(); v != modestr.end(); v++)
        {
-               if (*v == '+')
-                       continue;
-
                /* For each mode thats set, increase counter */
                ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER);