Fix a word missing from the last commit.

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

diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index 92ba69eda6f4813d8e42e0d1956036f3b611aaef..536c4424d98b2081a9169d1dd732cab8c2dd5afc 100644 (file)
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -1,7 +1,12 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008-2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -136,6 +141,10 @@ Link* TreeSocket::AuthRemote(const CommandBase::Params& params)
                        ssliohook->GetCiphersuite(ciphersuite);
                        ServerInstance->SNO->WriteToSnoMask('l', "Negotiated ciphersuite %s on link %s", ciphersuite.c_str(), x->Name.c_str());
                }
+               else if (!irc::sockets::cidr_mask("127.0.0.0/8").match(capab->remotesa) && !irc::sockets::cidr_mask("::1/128").match(capab->remotesa))
+               {
+                       ServerInstance->SNO->WriteGlobalSno('l', "Server connection to %s is not using SSL (TLS). This is VERY INSECURE and will not be allowed in the next major version of InspIRCd.", x->Name.c_str());
+               }
 
                return x;
        }
@@ -188,8 +197,8 @@ bool TreeSocket::CheckDuplicate(const std::string& sname, const std::string& sid
 
        if (CheckDupe)
        {
-               this->SendError("Server ID "+CheckDupe->GetID()+" already exists on server "+CheckDupe->GetName()+"! You may want to specify the server ID for the server manually with <server:id> so they do not conflict.");
-               ServerInstance->SNO->WriteToSnoMask('l', "Server connection from \002"+sname+"\002 denied, server ID '"+CheckDupe->GetID()+
+               this->SendError("Server ID "+CheckDupe->GetId()+" already exists on server "+CheckDupe->GetName()+"! You may want to specify the server ID for the server manually with <server:id> so they do not conflict.");
+               ServerInstance->SNO->WriteToSnoMask('l', "Server connection from \002"+sname+"\002 denied, server ID '"+CheckDupe->GetId()+
                                "' already exists on server "+CheckDupe->GetName());
                return false;
        }
@@ -228,7 +237,7 @@ CommandServer::Builder::Builder(TreeServer* server)
        : CmdBuilder(server->GetParent(), "SERVER")
 {
        push(server->GetName());
-       push(server->GetID());
+       push(server->GetId());
        if (server->IsBursting())
                push_property("burst", ConvToStr(server->StartBurst));
        push_property("hidden", ConvToStr(server->Hidden));