X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=c82bda479f3a9edd7a29b40620ab06d61212749d;hb=67e0e32b86885df705a92cdc971a6085c4a7c1ba;hp=59a9f0d9787304f6210dff90a1391479b3b03b84;hpb=2cf4b614e6c23bfc6d47da2ec4b1932ee2f62cf0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 59a9f0d97..c82bda479 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -36,7 +36,7 @@ ServerConfig::ServerConfig()
 	dns_timeout = 5;
 	MaxTargets = 20;
 	NetBufferSize = 10240;
-	SoftLimit = ServerInstance->SE->GetMaxFds();
+	SoftLimit = SocketEngine::GetMaxFds();
 	MaxConn = SOMAXCONN;
 	MaxChans = 20;
 	OperMaxChans = 30;
@@ -366,24 +366,12 @@ void ServerConfig::Fill()
 		if (!nsid.empty() && nsid != sid)
 			throw CoreException("You must restart to change the server id");
 	}
-	diepass = ConfValue("power")->getString("diepass");
-	restartpass = ConfValue("power")->getString("restartpass");
-	powerhash = ConfValue("power")->getString("hash");
-	PrefixQuit = options->getString("prefixquit");
-	SuffixQuit = options->getString("suffixquit");
-	FixedQuit = options->getString("fixedquit");
-	PrefixPart = options->getString("prefixpart");
-	SuffixPart = options->getString("suffixpart");
-	FixedPart = options->getString("fixedpart");
-	SoftLimit = ConfValue("performance")->getInt("softlimit", ServerInstance->SE->GetMaxFds(), 10, ServerInstance->SE->GetMaxFds());
+	SoftLimit = ConfValue("performance")->getInt("softlimit", SocketEngine::GetMaxFds(), 10, SocketEngine::GetMaxFds());
 	CCOnConnect = ConfValue("performance")->getBool("clonesonconnect", true);
 	MaxConn = ConfValue("performance")->getInt("somaxconn", SOMAXCONN);
 	XLineMessage = options->getString("xlinemessage", options->getString("moronbanner", "You're banned!"));
 	ServerDesc = ConfValue("server")->getString("description", "Configure Me");
 	Network = ConfValue("server")->getString("network", "Network");
-	AdminName = ConfValue("admin")->getString("name", "");
-	AdminEmail = ConfValue("admin")->getString("email", "null@example.com");
-	AdminNick = ConfValue("admin")->getString("nick", "admin");
 	NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240, 1024, 65534);
 	dns_timeout = ConfValue("dns")->getInt("timeout", 5);
 	DisabledCommands = ConfValue("disabled")->getString("commands", "");
@@ -404,13 +392,14 @@ void ServerConfig::Fill()
 	DefaultModes = options->getString("defaultmodes", "not");
 	PID = ConfValue("pid")->getString("file");
 	MaxChans = ConfValue("channels")->getInt("users", 20);
-	OperMaxChans = ConfValue("channels")->getInt("opers", 60);
+	OperMaxChans = ConfValue("channels")->getInt("opers");
 	c_ipv4_range = ConfValue("cidr")->getInt("ipv4clone", 32);
 	c_ipv6_range = ConfValue("cidr")->getInt("ipv6clone", 128);
 	Limits.NickMax = ConfValue("limits")->getInt("maxnick", 32);
 	Limits.ChanMax = ConfValue("limits")->getInt("maxchan", 64);
 	Limits.MaxModes = ConfValue("limits")->getInt("maxmodes", 20);
 	Limits.IdentMax = ConfValue("limits")->getInt("maxident", 11);
+	Limits.MaxHost = ConfValue("limits")->getInt("maxhost", 64);
 	Limits.MaxQuit = ConfValue("limits")->getInt("maxquit", 255);
 	Limits.MaxTopic = ConfValue("limits")->getInt("maxtopic", 307);
 	Limits.MaxKick = ConfValue("limits")->getInt("maxkick", 255);
@@ -597,7 +586,10 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 	User* user = useruid.empty() ? NULL : ServerInstance->FindNick(useruid);
 
 	if (!valid)
+	{
 		ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "There were errors in your configuration file:");
+		Classes.clear();
+	}
 
 	while (errstr.good())
 	{
@@ -677,7 +669,7 @@ void ServerConfig::ApplyModules(User* user)
 	for (ModuleManager::ModuleMap::iterator i = removed_modules.begin(); i != removed_modules.end(); ++i)
 	{
 		const std::string& modname = i->first;
-		// Don't remove cmd_*.so, just remove m_*.so
+		// Don't remove core_*.so, just remove m_*.so
 		if (modname.c_str()[0] == 'c')
 			continue;
 		if (ServerInstance->Modules->Unload(i->second))