X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=b3546a134c9890f6380b71e10d634a301f46e05a;hb=c8f515121fbdf3e4de693712ef2311cece45477d;hp=f7cd00a07c539bdb149d5b74ce1ebc013ec0d086;hpb=5287af979e5abffb2cfcdadb9a7663b42a5c43e5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index f7cd00a07..b3546a134 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -63,7 +63,7 @@ std::string User::GetModeLetters(bool includeparams) const
 	return ret;
 }
 
-User::User(const std::string& uid, Server* srv, int type)
+User::User(const std::string& uid, Server* srv, UserType type)
 	: age(ServerInstance->Time())
 	, signon(0)
 	, uuid(uid)
@@ -688,7 +688,7 @@ const std::string& User::GetRealHost() const
 
 irc::sockets::cidr_mask User::GetCIDRMask()
 {
-	int range = 0;
+	unsigned char range = 0;
 	switch (client_sa.sa.sa_family)
 	{
 		case AF_INET6:
@@ -1163,15 +1163,15 @@ void User::PurgeEmptyChannels()
 
 const std::string& FakeUser::GetFullHost()
 {
-	if (!ServerInstance->Config->HideWhoisServer.empty())
-		return ServerInstance->Config->HideWhoisServer;
+	if (!ServerInstance->Config->HideServer.empty())
+		return ServerInstance->Config->HideServer;
 	return server->GetName();
 }
 
 const std::string& FakeUser::GetFullRealHost()
 {
-	if (!ServerInstance->Config->HideWhoisServer.empty())
-		return ServerInstance->Config->HideWhoisServer;
+	if (!ServerInstance->Config->HideServer.empty())
+		return ServerInstance->Config->HideServer;
 	return server->GetName();
 }
 
@@ -1188,7 +1188,32 @@ ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask, cons
 	Update(&parent);
 	name = "unnamed";
 	type = t;
-	config = tag;
+	host = mask;
+
+	// Connect classes can inherit from each other but this is problematic for modules which can't use
+	// ConnectClass::Update so we build a hybrid tag containing all of the values set on this class as
+	// well as the parent class.
+	ConfigItems* items = NULL;
+	config = ConfigTag::create(tag->tag, tag->src_name, tag->src_line, items);
+
+	const ConfigItems& parentkeys = parent.config->getItems();
+	for (ConfigItems::const_iterator piter = parentkeys.begin(); piter != parentkeys.end(); ++piter)
+	{
+		// The class name and parent name are not inherited
+		if (piter->first == "name" || piter->first == "parent")
+			continue;
+
+		// Store the item in the config tag. If this item also
+		// exists in the child it will be overwritten.
+		(*items)[piter->first] = piter->second;
+	}
+
+	const ConfigItems& childkeys = tag->getItems();
+	for (ConfigItems::const_iterator citer = childkeys.begin(); citer != childkeys.end(); ++citer)
+	{
+		// This will overwrite the parent value if present.
+		(*items)[citer->first] = citer->second;
+	}
 }
 
 void ConnectClass::Update(const ConnectClass* src)