Rename `<bind:ssl>` to `<bind:sslprofile>`.

[user/henk/code/inspircd.git] / src / usermanager.cpp

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 9c8bde1e2c279fd3aafb6df715841444058c07fb..c7aaa5c1134e54c9240c1ff0557bfa2112cd8d0c 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -4,7 +4,7 @@
  *   Copyright (C) 2019 iwalkalone <iwalkalone69@gmail.com>
  *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2013-2016, 2018 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2013, 2018-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013, 2015 Adam <Adam@anope.org>
  *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
@@ -119,7 +119,6 @@ namespace
 UserManager::UserManager()
        : already_sent_id(0)
        , unregistered_count(0)
-       , uline_count(0)
 {
 }
 
@@ -162,7 +161,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
                        {
                                ServerInstance->Logs->Log("USERS", LOG_DEBUG, "Non-existent I/O hook '%s' in <bind:%s> tag at %s",
                                        iohookprovref.GetProvider().c_str(),
-                                       i == via->iohookprovs.begin() ? "hook" : "ssl",
+                                       i == via->iohookprovs.begin() ? "hook" : "sslprofile",
                                        via->bind_tag->getTagLocation().c_str());
                                this->QuitUser(New, "Internal error handling connection");
                                return;
@@ -370,7 +369,7 @@ void UserManager::ServerNoticeAll(const char* text, ...)
 {
        std::string message;
        VAFORMAT(message, text, text);
-       ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, ServerInstance->Config->ServerName, message, MSG_NOTICE);
+       ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, ServerInstance->Config->GetServerName(), message, MSG_NOTICE);
        ClientProtocol::Event msgevent(ServerInstance->GetRFCEvents().privmsg, msg);
 
        for (LocalList::const_iterator i = local_users.begin(); i != local_users.end(); ++i)