X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=bcee938d55208e1aefc3dcc5d0db93cf81820175;hb=748b3a0d89e7ecc9a766471b79fb78f63a5ca2bb;hp=866521b92033f59e4b86ac8fba466643bf9035d3;hpb=504caa8ca9fd28cce112c929b523a6263e563f18;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 866521b92..bcee938d5 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -35,6 +35,7 @@
 #endif
 
 ServerConfig::ServerConfig()
+	: NoSnoticeStack(false)
 {
 	WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0;
 	RawLog = NoUserDns = HideBans = HideSplits = UndernetMsgPrefix = false;
@@ -48,6 +49,14 @@ ServerConfig::ServerConfig()
 	OperMaxChans = 30;
 	c_ipv4_range = 32;
 	c_ipv6_range = 128;
+
+	std::vector<KeyVal>* items;
+	EmptyTag = ConfigTag::create("empty", "<auto>", 0, items);
+}
+
+ServerConfig::~ServerConfig()
+{
+	delete EmptyTag;
 }
 
 void ServerConfig::Update005()
@@ -471,6 +480,7 @@ static const Deprecated ChangedConfig[] = {
 	{"die",     "value",            "you need to reread your config"},
 	{"bind",    "transport",		"has been moved to <bind:ssl> as of 2.0a1"},
 	{"link",    "transport",		"has been moved to <link:ssl> as of 2.0a1"},
+	{"link",	"autoconnect",		"2.0+ does not use the autoconnect value. Please define <autoconnect> tags instead."},
 };
 
 void ServerConfig::Fill()
@@ -553,7 +563,8 @@ void ServerConfig::Fill()
 	WelcomeNotice = options->getBool("welcomenotice", true);
 
 	range(SoftLimit, 10, ServerInstance->SE->GetMaxFds(), ServerInstance->SE->GetMaxFds(), "<performance:softlimit>");
-	range(MaxConn, 0, SOMAXCONN, SOMAXCONN, "<performance:somaxconn>");
+	if (ConfValue("performance")->getBool("limitsomaxconn", true))
+		range(MaxConn, 0, SOMAXCONN, SOMAXCONN, "<performance:somaxconn>");
 	range(MaxTargets, 1, 31, 20, "<security:maxtargets>");
 	range(NetBufferSize, 1024, 65534, 10240, "<performance:netbuffersize>");
 	range(WhoWasGroupSize, 0, 10000, 10, "<whowas:groupsize>");
@@ -647,8 +658,6 @@ void ServerConfig::Fill()
 		OperSpyWhois = SPYWHOIS_SINGLEMSG;
 	else
 		OperSpyWhois = SPYWHOIS_NONE;
-
-	Limits.Finalise();
 }
 
 // WARNING: it is not safe to use most of the codebase in this function, as it
@@ -721,7 +730,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 	if (valid)
 		ServerInstance->WritePID(this->PID);
 
-	if (old)
+	if (old && valid)
 	{
 		// On first run, ports are bound later on
 		FailedPortList pl;
@@ -743,7 +752,10 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 	User* user = useruid.empty() ? NULL : ServerInstance->FindNick(useruid);
 
 	if (!valid)
+	{
 		ServerInstance->Logs->Log("CONFIG",DEFAULT, "There were errors in your configuration file:");
+		Classes.clear();
+	}
 
 	while (errstr.good())
 	{
@@ -885,7 +897,7 @@ ConfigTag* ServerConfig::ConfValue(const std::string &tag)
 {
 	ConfigTagList found = config_data.equal_range(tag);
 	if (found.first == found.second)
-		return NULL;
+		return EmptyTag;
 	ConfigTag* rv = found.first->second;
 	found.first++;
 	if (found.first != found.second)
@@ -951,6 +963,7 @@ void ConfigReaderThread::Finish()
 		 * XXX: The order of these is IMPORTANT, do not reorder them without testing
 		 * thoroughly!!!
 		 */
+		ServerInstance->Users->RehashCloneCounts();
 		ServerInstance->XLines->CheckELines();
 		ServerInstance->XLines->ApplyLines();
 		ServerInstance->Res->Rehash();