X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;fp=src%2Fconfigreader.cpp;h=b83de6f1cf3f36f0a66218ae151e1b1da39576ab;hb=bb39d78be61e45555cdd87985e26ea07b725fabf;hp=a43a9d78cd2f8a4e8c7ede9a13ac208d873dcb9d;hpb=52a433cfccad8559ff7d12f7ea308d8f4570444f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index a43a9d78c..b83de6f1c 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -53,10 +53,10 @@ ServerLimits::ServerLimits(ConfigTag* tag)
 }
 
 ServerConfig::ServerPaths::ServerPaths(ConfigTag* tag)
-	: Config(tag->getString("configdir", INSPIRCD_CONFIG_PATH))
-	, Data(tag->getString("datadir", INSPIRCD_DATA_PATH))
-	, Log(tag->getString("logdir", INSPIRCD_LOG_PATH))
-	, Module(tag->getString("moduledir", INSPIRCD_MODULE_PATH))
+	: Config(tag->getString("configdir", INSPIRCD_CONFIG_PATH, 1))
+	, Data(tag->getString("datadir", INSPIRCD_DATA_PATH, 1))
+	, Log(tag->getString("logdir", INSPIRCD_LOG_PATH, 1))
+	, Module(tag->getString("moduledir", INSPIRCD_MODULE_PATH, 1))
 {
 }
 
@@ -365,7 +365,7 @@ void ServerConfig::Fill()
 		if (!sid.empty() && !InspIRCd::IsSID(sid))
 			throw CoreException(sid + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter.");
 
-		CaseMapping = options->getString("casemapping", "rfc1459");
+		CaseMapping = options->getString("casemapping", "rfc1459", 1);
 		if (CaseMapping == "ascii")
 			national_case_insensitive_map = ascii_case_insensitive_map;
 		else if (CaseMapping == "rfc1459")
@@ -394,8 +394,8 @@ void ServerConfig::Fill()
 	MaxConn = ConfValue("performance")->getUInt("somaxconn", SOMAXCONN);
 	TimeSkipWarn = ConfValue("performance")->getDuration("timeskipwarn", 2, 0, 30);
 	XLineMessage = options->getString("xlinemessage", options->getString("moronbanner", "You're banned!"));
-	ServerDesc = server->getString("description", "Configure Me");
-	Network = server->getString("network", "Network");
+	ServerDesc = server->getString("description", "Configure Me", 1);
+	Network = server->getString("network", "Network", 1);
 	NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240, 1024, 65534);
 	CustomVersion = security->getString("customversion");
 	HideBans = security->getBool("hidebans");
@@ -437,7 +437,7 @@ void ServerConfig::Fill()
 	ReadXLine(this, "badhost", "host", ServerInstance->XLines->GetFactory("K"));
 	ReadXLine(this, "exception", "host", ServerInstance->XLines->GetFactory("E"));
 
-	const std::string restrictbannedusers = options->getString("restrictbannedusers", "yes");
+	const std::string restrictbannedusers = options->getString("restrictbannedusers", "yes", 1);
 	if (stdalgo::string::equalsci(restrictbannedusers, "no"))
 		RestrictBannedUsers = ServerConfig::BUT_NORMAL;
 	else if (stdalgo::string::equalsci(restrictbannedusers, "silent"))