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 118bdc500c0073877283adbb89ee2cb26df9c53f..b2f296e7b5c8f0f01b7490d1c25ebff2c4373f54 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -39,6 +39,9 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 
        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;
@@ -61,7 +64,11 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 
                if (collide != 1)
                {
-                       /* remote client changed, make sure we change their nick for the hash too */
+                       /* 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];
                }
        }
@@ -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);