Merge branch 'insp3' into master.

8 files changed, 34 insertions, 11 deletions

diff --git a/src/modules/m_ircv3_batch.cpp b/src/modules/m_ircv3_batch.cpp
index 1ff677206..64cfe5e88 100644
--- a/src/modules/m_ircv3_batch.cpp
+++ b/src/modules/m_ircv3_batch.cpp
@@ -26,7 +26,7 @@ class BatchMessage : public ClientProtocol::Message
 {
  public:
 	BatchMessage(const IRCv3::Batch::Batch& batch, bool start)
-		: ClientProtocol::Message("BATCH", ServerInstance->Config->ServerName)
+		: ClientProtocol::Message("BATCH", ServerInstance->Config->GetServerName())
 	{
 		char c = (start ? '+' : '-');
 		PushParam(std::string(1, c) + batch.GetRefTagStr());
diff --git a/src/modules/m_pbkdf2.cpp b/src/modules/m_pbkdf2.cpp
index 6656735f0..006e0a8a1 100644
--- a/src/modules/m_pbkdf2.cpp
+++ b/src/modules/m_pbkdf2.cpp
@@ -212,6 +212,14 @@ class ModulePBKDF2 : public Module
 		stdalgo::delete_all(providers);
 	}
 
+	void init() override
+	{
+		// Let ourself know about any existing services.
+		const ModuleManager::DataProviderMap& dataproviders = ServerInstance->Modules.DataProviders;
+		for (ModuleManager::DataProviderMap::const_iterator it = dataproviders.begin(); it != dataproviders.end(); ++it)
+			OnServiceAdd(*it->second);
+	}
+
 	void OnServiceAdd(ServiceProvider& provider) override
 	{
 		// Check if it's a hash provider
diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 4dcb362f5..031fc512e 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -225,7 +225,7 @@ public:
 						topicset = ServerInstance->Time();
 					std::string topicsetby = tag->getString("topicsetby");
 					if (topicsetby.empty())
-						topicsetby = ServerInstance->Config->ServerName;
+						topicsetby = ServerInstance->Config->GetServerName();
 					c->SetTopic(ServerInstance->FakeClient, topic, topicset, &topicsetby);
 				}
 
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index eb019e994..e78d7f1db 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -209,7 +209,7 @@ class SaslAuthenticator
 		params.push_back(method);
 
 		const std::string fp = sslapi ? sslapi->GetFingerprint(user) : "";
-		if (fp.size())
+		if (!fp.empty())
 			params.push_back(fp);
 
 		SendSASL(user, "*", 'S', params);
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index f2ca7f6be..05326b946 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -143,7 +143,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
 		return;
 
 	user->WriteNumeric(RPL_LINKS, Current->GetName(),
-			(((Utils->FlatLinks) && (!user->IsOper())) ? ServerInstance->Config->ServerName : Parent),
+			(((Utils->FlatLinks) && (!user->IsOper())) ? ServerInstance->Config->GetServerName() : Parent),
 			InspIRCd::Format("%d %s", (((Utils->FlatLinks) && (!user->IsOper())) ? 0 : hops), Current->GetDesc().c_str()));
 }
 
diff --git a/src/modules/m_spanningtree/misccommands.cpp b/src/modules/m_spanningtree/misccommands.cpp
index abf4b792b..95a479f3d 100644
--- a/src/modules/m_spanningtree/misccommands.cpp
+++ b/src/modules/m_spanningtree/misccommands.cpp
@@ -26,12 +26,18 @@
 
 void CmdBuilder::FireEvent(Server* target, const char* cmd, ClientProtocol::TagMap& taglist)
 {
+	if (!Utils->Creator || Utils->Creator->dying)
+		return;
+
 	Utils->Creator->GetMessageEventProvider().Call(&ServerProtocol::MessageEventListener::OnBuildServerMessage, target, cmd, taglist);
 	UpdateTags();
 }
 
 void CmdBuilder::FireEvent(User* target, const char* cmd, ClientProtocol::TagMap& taglist)
 {
+	if (!Utils->Creator || Utils->Creator->dying)
+		return;
+
 	Utils->Creator->GetMessageEventProvider().Call(&ServerProtocol::MessageEventListener::OnBuildUserMessage, target, cmd, taglist);
 	UpdateTags();
 }
diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index 5bb5963f2..276cdda6e 100644
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -53,22 +53,26 @@ static inline bool IsHidden(User* user, TreeServer* server)
 }
 
 // Calculate the map depth the servers go, and the longest server name
-static void GetDepthAndLen(TreeServer* current, unsigned int depth, unsigned int& max_depth, unsigned int& max_len)
+static void GetDepthAndLen(TreeServer* current, unsigned int depth, unsigned int& max_depth, unsigned int& max_len, unsigned int& max_version)
 {
 	if (depth > max_depth)
 		max_depth = depth;
+
 	if (current->GetName().length() > max_len)
 		max_len = current->GetName().length();
 
+	if (current->GetRawVersion().length() > max_version)
+		max_version = current->GetRawVersion().length();
+
 	const TreeServer::ChildServers& servers = current->GetChildren();
 	for (TreeServer::ChildServers::const_iterator i = servers.begin(); i != servers.end(); ++i)
 	{
 		TreeServer* child = *i;
-		GetDepthAndLen(child, depth + 1, max_depth, max_len);
+		GetDepthAndLen(child, depth + 1, max_depth, max_len, max_version);
 	}
 }
 
-static std::vector<std::string> GetMap(User* user, TreeServer* current, unsigned int max_len, unsigned int depth)
+static std::vector<std::string> GetMap(User* user, TreeServer* current, unsigned int max_len, unsigned int max_version_len, unsigned int depth)
 {
 	float percent = 0;
 
@@ -89,6 +93,8 @@ static std::vector<std::string> GetMap(User* user, TreeServer* current, unsigned
 			buffer += " " + cur_vers;
 
 		buffer += ")";
+
+		buffer.append(max_version_len - current->GetRawVersion().length(), ' ');
 	}
 
 	// Pad with spaces until its at max len, max_len must always be >= my names length
@@ -132,7 +138,7 @@ static std::vector<std::string> GetMap(User* user, TreeServer* current, unsigned
 		}
 
 		// Build the map for this child
-		std::vector<std::string> child_map = GetMap(user, child, next_len, depth + 1);
+		std::vector<std::string> child_map = GetMap(user, child, next_len, max_version_len, depth + 1);
 
 		for (std::vector<std::string>::const_iterator j = child_map.begin(); j != child_map.end(); ++j)
 		{
@@ -193,7 +199,8 @@ CmdResult CommandMap::Handle(User* user, const Params& parameters)
 	// Max depth and max server name length
 	unsigned int max_depth = 0;
 	unsigned int max_len = 0;
-	GetDepthAndLen(Utils->TreeRoot, 0, max_depth, max_len);
+	unsigned int max_version = 0;
+	GetDepthAndLen(Utils->TreeRoot, 0, max_depth, max_len, max_version);
 
 	unsigned int max;
 	if (user->IsOper() || !Utils->FlatLinks)
@@ -205,9 +212,11 @@ CmdResult CommandMap::Handle(User* user, const Params& parameters)
 	{
 		// This user can't see any depth
 		max = max_len;
+		if (!user->IsOper())
+			max_version = 0;
 	}
 
-	std::vector<std::string> map = GetMap(user, Utils->TreeRoot, max, 0);
+	std::vector<std::string> map = GetMap(user, Utils->TreeRoot, max, max_version, 0);
 	for (std::vector<std::string>::const_iterator i = map.begin(); i != map.end(); ++i)
 		user->WriteRemoteNumeric(RPL_MAP, *i);
 
diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 1b175bb72..cf580b081 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -290,7 +290,7 @@ class ModuleSSLInfo
 
 		std::string text = "*** You are connected to ";
 		if (!ssliohook->GetServerName(text))
-			text.append(ServerInstance->Config->ServerName);
+			text.append(ServerInstance->Config->GetServerName());
 		text.append(" using TLS (SSL) cipher '");
 		ssliohook->GetCiphersuite(text);
 		text.push_back('\'');