Take away a uline specific check in fmode, which might explain why desyncs between...

QA please test this with at least 2 insps and services and server syncs/splits, check for channel mode desyncs.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6638 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index a376b5cb1614267c2303a1ac19ff1225f0fd9fc8..ae972a37e0d3dde88c3019a1208c600444a21407 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -663,7 +663,7 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
        }
        else
        /* U-lined servers always win regardless of their TS */
        }
        else
        /* U-lined servers always win regardless of their TS */

-       if ((TS > ourTS) && (!this->Instance->ULine(source.c_str())))
+       if (TS > ourTS)

        {
                /* Bounce the mode back to its sender.* We use our lower TS, so the other end
                 * SHOULD accept it, if its clock is right.
        {
                /* Bounce the mode back to its sender.* We use our lower TS, so the other end
                 * SHOULD accept it, if its clock is right.


@@ -761,13 +761,6 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
        }
        else
        {
        }
        else
        {

-               /* The server was ulined, but something iffy is up with the TS.
-                * Sound the alarm bells!
-                */
-               if ((this->Instance->ULine(sourceserv.c_str())) && (TS > ourTS))
-               {
-                       this->Instance->WriteOpers("\2WARNING!\2 U-Lined server '%s' has bad TS for '%s' (accepted change): \2SYNC YOUR CLOCKS\2 to avoid this notice",sourceserv.c_str(),params[0].c_str());
-               }

                /* Allow the mode, route it to either server or user command handling */
                if (smode)
                        this->Instance->SendMode(modelist,n,who);
                /* Allow the mode, route it to either server or user command handling */
                if (smode)
                        this->Instance->SendMode(modelist,n,who);