X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconfigreader.cpp;h=f968365074240d469184c2ef8af9e1219902eba0;hb=6cfabb0064cab52bbbab59974e53dc0fa1954da7;hp=68630685fd03bd1484822fc89f893d0964537f71;hpb=44489ddf7e90413d8f656aea24d74445bab227af;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 68630685f..f96836507 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -38,17 +38,17 @@
 #include <iostream>
 
 ServerLimits::ServerLimits(ConfigTag* tag)
-	: NickMax(tag->getUInt("maxnick", 30))
-	, ChanMax(tag->getUInt("maxchan", 64))
-	, MaxModes(tag->getUInt("maxmodes", 20))
-	, IdentMax(tag->getUInt("maxident", 10))
-	, MaxQuit(tag->getUInt("maxquit", 255))
-	, MaxTopic(tag->getUInt("maxtopic", 307))
-	, MaxKick(tag->getUInt("maxkick", 255))
-	, MaxReal(tag->getUInt("maxreal", tag->getUInt("maxgecos", 128)))
-	, MaxAway(tag->getUInt("maxaway", 200))
-	, MaxLine(tag->getUInt("maxline", 512))
-	, MaxHost(tag->getUInt("maxhost", 64))
+	: MaxLine(tag->getUInt("maxline", 512, 512))
+	, NickMax(tag->getUInt("maxnick", 30, 1, MaxLine))
+	, ChanMax(tag->getUInt("maxchan", 64, 1, MaxLine))
+	, MaxModes(tag->getUInt("maxmodes", 20, 1))
+	, IdentMax(tag->getUInt("maxident", 10, 1))
+	, MaxQuit(tag->getUInt("maxquit", 255, 0, MaxLine))
+	, MaxTopic(tag->getUInt("maxtopic", 307, 1, MaxLine))
+	, MaxKick(tag->getUInt("maxkick", 255, 1, MaxLine))
+	, MaxReal(tag->getUInt("maxreal", tag->getUInt("maxgecos", 128), 1, MaxLine))
+	, MaxAway(tag->getUInt("maxaway", 200, 1, MaxLine))
+	, MaxHost(tag->getUInt("maxhost", 64, 1, MaxLine))
 {
 }
 
@@ -335,7 +335,7 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 	}
 }
 
-static std::string GetServerName()
+static std::string GetServerHost()
 {
 #ifndef _WIN32
 	char hostname[256];
@@ -359,7 +359,7 @@ void ServerConfig::Fill()
 	ConfigTag* server = ConfValue("server");
 	if (sid.empty())
 	{
-		ServerName = server->getString("name", GetServerName(), InspIRCd::IsHost);
+		ServerName = server->getString("name", GetServerHost(), InspIRCd::IsHost);
 
 		sid = server->getString("id");
 		if (!sid.empty() && !InspIRCd::IsSID(sid))
@@ -524,7 +524,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 		// On first run, ports are bound later on
 		FailedPortList pl;
 		ServerInstance->BindPorts(pl);
-		if (pl.size())
+		if (!pl.empty())
 		{
 			std::cout << "Warning! Some of your listener" << (pl.size() == 1 ? "s" : "") << " failed to bind:" << std::endl;
 			for (FailedPortList::const_iterator iter = pl.begin(); iter != pl.end(); ++iter)