Fixes found by removing User inheritance from StreamSocket

[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 96ca2236de39b7d3907e6b021d4eaa1b442f74c8..24691c3ca5d274c3790270722953ddc32fd9e157 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -19,7 +19,6 @@
 #include "link.h"
 #include "treesocket.h"
 #include "resolvers.h"
-#include "handshaketimer.h"
 
 /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_hash.h m_spanningtree/handshaketimer.h */
 
@@ -87,7 +86,7 @@ bool TreeSocket::ParseUID(const std::string &source, parameterlist &params)
        User* _new = NULL;
        try
        {
-               _new = new User(params[0]);
+               _new = new RemoteUser(params[0], remoteserver->GetName());
        }
        catch (...)
        {
@@ -95,11 +94,9 @@ bool TreeSocket::ParseUID(const std::string &source, parameterlist &params)
                return false;
        }
        (*(ServerInstance->Users->clientlist))[params[2]] = _new;
-       _new->SetFd(FD_MAGIC_NUMBER);
        _new->nick.assign(params[2], 0, MAXBUF);
        _new->host.assign(params[3], 0, 64);
        _new->dhost.assign(params[4], 0, 64);
-       _new->server = ServerInstance->FindServerNamePtr(remoteserver->GetName().c_str());
        _new->ident.assign(params[5], 0, MAXBUF);
        _new->fullname.assign(params[params.size() - 1], 0, MAXBUF);
        _new->registered = REG_ALL;