Merge insp20

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

diff --git a/src/modules/m_spanningtree/nick.cpp b/src/modules/m_spanningtree/nick.cpp
index eb6c9396ff9a460c86bae90a6d39e6b9bafefbea..686a2cc4c909437125c7f0d5167438afa93c1da1 100644 (file)
--- a/src/modules/m_spanningtree/nick.cpp
+++ b/src/modules/m_spanningtree/nick.cpp
@@ -33,30 +33,31 @@
 CmdResult CommandNick::HandleRemote(RemoteUser* user, std::vector<std::string>& params)
 {
        if ((isdigit(params[0][0])) && (params[0] != user->uuid))
-               return CMD_INVALID;
+               throw ProtocolException("Attempted to change nick to an invalid or non-matching UUID");
 
        /* Update timestamp on user when they change nicks */
-       user->age = ConvToInt(params[1]);
+       const time_t newts = ConvToInt(params[1]);
 
        /*
         * On nick messages, check that the nick doesn't already exist here.
         * If it does, perform collision logic.
         */
+       bool callfnc = true;
        User* x = ServerInstance->FindNickOnly(params[0]);
-       if ((x) && (x != user))
+       if ((x) && (x != user) && (x->registered == REG_ALL))
        {
                /* x is local, who is remote */
-               int collideret = Utils->DoCollision(x, TreeServer::Get(user), user->age, user->ident, user->GetIPString(), user->uuid);
+               int collideret = Utils->DoCollision(x, TreeServer::Get(user), newts, user->ident, user->GetIPString(), user->uuid);
                if (collideret != 1)
                {
-                       /*
-                        * Remote client lost, or both lost, parsing or passing on this
-                        * nickchange would be pointless, as the incoming client's server will
-                        * soon receive SAVE to change its nick to its UID. :) -- w00t
-                        */
-                       return CMD_FAILURE;
+                       // Remote client lost, or both lost, rewrite this nick change as a change to uuid before
+                       // forwarding and don't call ChangeNick() because DoCollision() has done it already
+                       params[0] = user->uuid;
+                       callfnc = false;
                }
        }
-       user->ForceNickChange(params[0]);
+       if (callfnc)
+               user->ChangeNick(params[0], newts);
+
        return CMD_SUCCESS;
 }