X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=2cd17e844bcd0b62e7f42281395ac1fd1f0d8461;hb=b424130196c0c3abfa70a67c299483a76fbaa57e;hp=5b298ddd8066b6ae00e2ac7f3fd124504ea3fede;hpb=8ba9242952053fba069319afd064c80beda5ea84;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 5b298ddd8..2cd17e844 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -1,12 +1,21 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006-2009 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013-2014, 2016-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Justin Crawford <Justasic@Gmail.com>
+ *   Copyright (C) 2012 DjSlash <djslash@djslash.org>
+ *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ *   Copyright (C) 2009-2011 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
- *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2007-2010 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <om@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -23,209 +32,81 @@
 
 
 #include "inspircd.h"
-#include <fstream>
 #include "xline.h"
+#include "listmode.h"
 #include "exitcodes.h"
-#include "commands/cmd_whowas.h"
 #include "configparser.h"
 #include <iostream>
-#ifdef _WIN32
-#include <Iphlpapi.h>
-#pragma comment(lib, "Iphlpapi.lib")
-#endif
-
-ServerConfig::ServerConfig()
-	: NoSnoticeStack(false)
-{
-	WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0;
-	RawLog = NoUserDns = HideBans = HideSplits = UndernetMsgPrefix = false;
-	WildcardIPv6 = CycleHosts = InvBypassModes = true;
-	dns_timeout = 5;
-	MaxTargets = 20;
-	NetBufferSize = 10240;
-	SoftLimit = ServerInstance->SE->GetMaxFds();
-	MaxConn = SOMAXCONN;
-	MaxChans = 20;
-	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()
-{
-	std::stringstream out(data005);
-	std::vector<std::string> data;
-	std::string token;
-	while (out >> token)
-		data.push_back(token);
-	sort(data.begin(), data.end());
-
-	std::string line5;
-	isupport.clear();
-	for(unsigned int i=0; i < data.size(); i++)
-	{
-		token = data[i];
-		line5 = line5 + token + " ";
-		if (i % 13 == 12)
-		{
-			line5.append(":are supported by this server");
-			isupport.push_back(line5);
-			line5.clear();
-		}
-	}
-	if (!line5.empty())
-	{
-		line5.append(":are supported by this server");
-		isupport.push_back(line5);
-	}
-}
 
-void ServerConfig::Send005(User* user)
+ServerLimits::ServerLimits(ConfigTag* tag)
+	: 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))
 {
-	for (std::vector<std::string>::iterator line = ServerInstance->Config->isupport.begin(); line != ServerInstance->Config->isupport.end(); line++)
-		user->WriteNumeric(RPL_ISUPPORT, "%s %s", user->nick.c_str(), line->c_str());
 }
 
-template<typename T, typename V>
-static void range(T& value, V min, V max, V def, const char* msg)
+ServerConfig::ServerPaths::ServerPaths(ConfigTag* tag)
+	: 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))
+	, Runtime(tag->getString("runtimedir", INSPIRCD_RUNTIME_PATH, 1))
 {
-	if (value >= (T)min && value <= (T)max)
-		return;
-	ServerInstance->Logs->Log("CONFIG", DEFAULT,
-		"WARNING: %s value of %ld is not between %ld and %ld; set to %ld.",
-		msg, (long)value, (long)min, (long)max, (long)def);
-	value = def;
 }
 
-
-static void ValidIP(const std::string& ip, const std::string& key)
+static ConfigTag* CreateEmptyTag()
 {
-	irc::sockets::sockaddrs dummy;
-	if (!irc::sockets::aptosa(ip, 0, dummy))
-		throw CoreException("The value of "+key+" is not an IP address");
+	ConfigItems* items;
+	return ConfigTag::create("empty", "<auto>", 0, items);
 }
 
-static void ValidHost(const std::string& p, const std::string& msg)
+ServerConfig::ServerConfig()
+	: EmptyTag(CreateEmptyTag())
+	, Limits(EmptyTag)
+	, Paths(EmptyTag)
+	, RawLog(false)
+	, NoSnoticeStack(false)
 {
-	int num_dots = 0;
-	if (p.empty() || p[0] == '.')
-		throw CoreException("The value of "+msg+" is not a valid hostname");
-	for (unsigned int i=0;i < p.length();i++)
-	{
-		switch (p[i])
-		{
-			case ' ':
-				throw CoreException("The value of "+msg+" is not a valid hostname");
-			case '.':
-				num_dots++;
-			break;
-		}
-	}
-	if (num_dots == 0)
-		throw CoreException("The value of "+msg+" is not a valid hostname");
 }
 
-bool ServerConfig::ApplyDisabledCommands(const std::string& data)
-{
-	std::stringstream dcmds(data);
-	std::string thiscmd;
-
-	/* Enable everything first */
-	for (Commandtable::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++)
-		x->second->Disable(false);
-
-	/* Now disable all the ones which the user wants disabled */
-	while (dcmds >> thiscmd)
-	{
-		Commandtable::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
-		if (cm != ServerInstance->Parser->cmdlist.end())
-		{
-			cm->second->Disable(true);
-		}
-	}
-	return true;
-}
-
-static void FindDNS(std::string& server)
+ServerConfig::~ServerConfig()
 {
-	if (!server.empty())
-		return;
-#ifdef _WIN32
-	// attempt to look up their nameserver from the system
-	ServerInstance->Logs->Log("CONFIG",DEFAULT,"WARNING: <dns:server> not defined, attempting to find a working server in the system settings...");
-
-	PFIXED_INFO pFixedInfo;
-	DWORD dwBufferSize = sizeof(FIXED_INFO);
-	pFixedInfo = (PFIXED_INFO) HeapAlloc(GetProcessHeap(), 0, sizeof(FIXED_INFO));
-
-	if(pFixedInfo)
-	{
-		if (GetNetworkParams(pFixedInfo, &dwBufferSize) == ERROR_BUFFER_OVERFLOW) {
-			HeapFree(GetProcessHeap(), 0, pFixedInfo);
-			pFixedInfo = (PFIXED_INFO) HeapAlloc(GetProcessHeap(), 0, dwBufferSize);
-		}
-
-		if(pFixedInfo) {
-			if (GetNetworkParams(pFixedInfo, &dwBufferSize) == NO_ERROR)
-				server = pFixedInfo->DnsServerList.IpAddress.String;
-
-			HeapFree(GetProcessHeap(), 0, pFixedInfo);
-		}
-
-		if(!server.empty())
-		{
-			ServerInstance->Logs->Log("CONFIG",DEFAULT,"<dns:server> set to '%s' as first active resolver in the system settings.", server.c_str());
-			return;
-		}
-	}
-
-	ServerInstance->Logs->Log("CONFIG",DEFAULT,"No viable nameserver found! Defaulting to nameserver '127.0.0.1'!");
-#else
-	// attempt to look up their nameserver from /etc/resolv.conf
-	ServerInstance->Logs->Log("CONFIG",DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in /etc/resolv.conf...");
-
-	std::ifstream resolv("/etc/resolv.conf");
-
-	while (resolv >> server)
-	{
-		if (server == "nameserver")
-		{
-			resolv >> server;
-			if (server.find_first_not_of("0123456789.") == std::string::npos)
-			{
-				ServerInstance->Logs->Log("CONFIG",DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",server.c_str());
-				return;
-			}
-		}
-	}
-
-	ServerInstance->Logs->Log("CONFIG",DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!");
-#endif
-	server = "127.0.0.1";
+	delete EmptyTag;
 }
 
 static void ReadXLine(ServerConfig* conf, const std::string& tag, const std::string& key, XLineFactory* make)
 {
+	insp::flat_set<std::string> configlines;
+
 	ConfigTagList tags = conf->ConfTags(tag);
 	for(ConfigIter i = tags.first; i != tags.second; ++i)
 	{
 		ConfigTag* ctag = i->second;
-		std::string mask;
-		if (!ctag->readString(key, mask))
-			throw CoreException("<"+tag+":"+key+"> missing at " + ctag->getTagLocation());
-		std::string reason = ctag->getString("reason", "<Config>");
-		XLine* xl = make->Generate(ServerInstance->Time(), 0, "<Config>", reason, mask);
+
+		const std::string mask = ctag->getString(key);
+		if (mask.empty())
+			throw CoreException("<" + tag + ":" + key + "> missing at " + ctag->getTagLocation());
+
+		const std::string reason = ctag->getString("reason");
+		if (reason.empty())
+			throw CoreException("<" + tag + ":reason> missing at " + ctag->getTagLocation());
+
+		XLine* xl = make->Generate(ServerInstance->Time(), 0, ServerInstance->Config->ServerName, reason, mask);
+		xl->from_config = true;
+		configlines.insert(xl->Displayable());
 		if (!ServerInstance->XLines->AddLine(xl, NULL))
 			delete xl;
 	}
+
+	ServerInstance->XLines->ExpireRemovedConfigLines(make->GetType(), configlines);
 }
 
 typedef std::map<std::string, ConfigTag*> LocalIndex;
@@ -250,14 +131,11 @@ void ServerConfig::CrossCheckOperClassType()
 		std::string name = tag->getString("name");
 		if (name.empty())
 			throw CoreException("<type:name> is missing from tag at " + tag->getTagLocation());
-		if (!ServerInstance->IsNick(name.c_str(), Limits.NickMax))
-			throw CoreException("<type:name> is invalid (value '" + name + "')");
-		if (oper_blocks.find(" " + name) != oper_blocks.end())
+		if (OperTypes.find(name) != OperTypes.end())
 			throw CoreException("Duplicate type block with name " + name + " at " + tag->getTagLocation());
 
-		OperInfo* ifo = new OperInfo;
-		oper_blocks[" " + name] = ifo;
-		ifo->name = name;
+		OperInfo* ifo = new OperInfo(name);
+		OperTypes[name] = ifo;
 		ifo->type_block = tag;
 
 		std::string classname;
@@ -281,14 +159,13 @@ void ServerConfig::CrossCheckOperClassType()
 			throw CoreException("<oper:name> missing from tag at " + tag->getTagLocation());
 
 		std::string type = tag->getString("type");
-		OperIndex::iterator tblk = oper_blocks.find(" " + type);
-		if (tblk == oper_blocks.end())
+		OperIndex::iterator tblk = OperTypes.find(type);
+		if (tblk == OperTypes.end())
 			throw CoreException("Oper block " + name + " has missing type " + type);
 		if (oper_blocks.find(name) != oper_blocks.end())
 			throw CoreException("Duplicate oper block with name " + name + " at " + tag->getTagLocation());
 
-		OperInfo* ifo = new OperInfo;
-		ifo->name = type;
+		OperInfo* ifo = new OperInfo(type);
 		ifo->oper_block = tag;
 		ifo->type_block = tblk->second->type_block;
 		ifo->class_blocks.assign(tblk->second->class_blocks.begin(), tblk->second->class_blocks.end());
@@ -298,46 +175,47 @@ void ServerConfig::CrossCheckOperClassType()
 
 void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 {
-	typedef std::map<std::string, ConnectClass*> ClassMap;
+	typedef std::map<std::pair<std::string, char>, ConnectClass*> ClassMap;
 	ClassMap oldBlocksByMask;
 	if (current)
 	{
 		for(ClassVector::iterator i = current->Classes.begin(); i != current->Classes.end(); ++i)
 		{
 			ConnectClass* c = *i;
-			if (c->name.substr(0, 8) != "unnamed-")
-			{
-				oldBlocksByMask["n" + c->name] = c;
-			}
-			else if (c->type == CC_ALLOW || c->type == CC_DENY)
+			switch (c->type)
 			{
-				std::string typeMask = (c->type == CC_ALLOW) ? "a" : "d";
-				typeMask += c->host;
-				oldBlocksByMask[typeMask] = c;
+				case CC_ALLOW:
+				case CC_DENY:
+					oldBlocksByMask[std::make_pair(c->host, c->type)] = c;
+					break;
+
+				case CC_NAMED:
+					oldBlocksByMask[std::make_pair(c->name, c->type)] = c;
+					break;
 			}
 		}
 	}
 
-	int blk_count = config_data.count("connect");
+	size_t blk_count = config_data.count("connect");
 	if (blk_count == 0)
 	{
 		// No connect blocks found; make a trivial default block
-		std::vector<KeyVal>* items;
+		ConfigItems* items;
 		ConfigTag* tag = ConfigTag::create("connect", "<auto>", 0, items);
-		items->push_back(std::make_pair("allow", "*"));
+		(*items)["allow"] = "*";
 		config_data.insert(std::make_pair("connect", tag));
 		blk_count = 1;
 	}
 
 	Classes.resize(blk_count);
-	std::map<std::string, int> names;
+	std::map<std::string, size_t> names;
 
 	bool try_again = true;
-	for(int tries=0; try_again; tries++)
+	for(size_t tries = 0; try_again; tries++)
 	{
 		try_again = false;
 		ConfigTagList tags = ConfTags("connect");
-		int i=0;
+		size_t i = 0;
 		for(ConfigIter it = tags.first; it != tags.second; ++it, ++i)
 		{
 			ConfigTag* tag = it->second;
@@ -348,7 +226,7 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 			std::string parentName = tag->getString("parent");
 			if (!parentName.empty())
 			{
-				std::map<std::string,int>::iterator parentIter = names.find(parentName);
+				std::map<std::string, size_t>::const_iterator parentIter = names.find(parentName);
 				if (parentIter == names.end())
 				{
 					try_again = true;
@@ -361,24 +239,17 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 			}
 
 			std::string name = tag->getString("name");
-			std::string mask, typeMask;
+			std::string mask;
 			char type;
 
 			if (tag->readString("allow", mask, false))
-			{
 				type = CC_ALLOW;
-				typeMask = 'a' + mask;
-			}
 			else if (tag->readString("deny", mask, false))
-			{
 				type = CC_DENY;
-				typeMask = 'd' + mask;
-			}
 			else if (!name.empty())
 			{
 				type = CC_NAMED;
 				mask = name;
-				typeMask = 'n' + mask;
 			}
 			else
 			{
@@ -386,13 +257,7 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 			}
 
 			if (name.empty())
-			{
 				name = "unnamed-" + ConvToStr(i);
-			}
-			else
-			{
-				typeMask = 'n' + name;
-			}
 
 			if (names.find(name) != names.end())
 				throw CoreException("Two connect classes with name \"" + name + "\" defined!");
@@ -404,32 +269,49 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 
 			me->name = name;
 
-			me->registration_timeout = tag->getInt("timeout", me->registration_timeout);
-			me->pingtime = tag->getInt("pingfreq", me->pingtime);
+			me->registration_timeout = tag->getDuration("timeout", me->registration_timeout);
+			me->pingtime = tag->getDuration("pingfreq", me->pingtime);
 			std::string sendq;
 			if (tag->readString("sendq", sendq))
 			{
 				// attempt to guess a good hard/soft sendq from a single value
-				long value = atol(sendq.c_str());
+				unsigned long value = strtoul(sendq.c_str(), NULL, 10);
 				if (value > 16384)
 					me->softsendqmax = value / 16;
 				else
 					me->softsendqmax = value;
 				me->hardsendqmax = value * 8;
 			}
-			me->softsendqmax = tag->getInt("softsendq", me->softsendqmax);
-			me->hardsendqmax = tag->getInt("hardsendq", me->hardsendqmax);
-			me->recvqmax = tag->getInt("recvq", me->recvqmax);
-			me->penaltythreshold = tag->getInt("threshold", me->penaltythreshold);
-			me->commandrate = tag->getInt("commandrate", me->commandrate);
+			me->softsendqmax = tag->getUInt("softsendq", me->softsendqmax);
+			me->hardsendqmax = tag->getUInt("hardsendq", me->hardsendqmax);
+			me->recvqmax = tag->getUInt("recvq", me->recvqmax);
+			me->penaltythreshold = tag->getUInt("threshold", me->penaltythreshold);
+			me->commandrate = tag->getUInt("commandrate", me->commandrate);
 			me->fakelag = tag->getBool("fakelag", me->fakelag);
-			me->maxlocal = tag->getInt("localmax", me->maxlocal);
-			me->maxglobal = tag->getInt("globalmax", me->maxglobal);
-			me->maxchans = tag->getInt("maxchans", me->maxchans);
+			me->maxlocal = tag->getUInt("localmax", me->maxlocal);
+			me->maxglobal = tag->getUInt("globalmax", me->maxglobal);
+			me->maxchans = tag->getUInt("maxchans", me->maxchans);
 			me->maxconnwarn = tag->getBool("maxconnwarn", me->maxconnwarn);
-			me->limit = tag->getInt("limit", me->limit);
+			me->limit = tag->getUInt("limit", me->limit);
+			me->resolvehostnames = tag->getBool("resolvehostnames", me->resolvehostnames);
+			me->password = tag->getString("password", me->password);
+
+			me->passwordhash = tag->getString("hash", me->passwordhash);
+			if (!me->password.empty() && (me->passwordhash.empty() || stdalgo::string::equalsci(me->passwordhash, "plaintext")))
+			{
+				ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEFAULT, "<connect> tag '%s' at %s contains an plain text password, this is insecure!",
+					name.c_str(), tag->getTagLocation().c_str());
+			}
+
+			std::string ports = tag->getString("port");
+			if (!ports.empty())
+			{
+				irc::portparser portrange(ports, false);
+				while (int port = portrange.GetToken())
+					me->ports.insert(port);
+			}
 
-			ClassMap::iterator oldMask = oldBlocksByMask.find(typeMask);
+			ClassMap::iterator oldMask = oldBlocksByMask.find(std::make_pair(me->name, me->type));
 			if (oldMask != oldBlocksByMask.end())
 			{
 				ConnectClass* old = oldMask->second;
@@ -443,143 +325,90 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 	}
 }
 
-/** Represents a deprecated configuration tag.
- */
-struct Deprecated
+static std::string GetServerHost()
 {
-	/** Tag name
-	 */
-	const char* tag;
-	/** Tag value
-	 */
-	const char* value;
-	/** Reason for deprecation
-	 */
-	const char* reason;
-};
-
-static const Deprecated ChangedConfig[] = {
-	{"options", "hidelinks",		"has been moved to <security:hidelinks> as of 1.2a3"},
-	{"options", "hidewhois",		"has been moved to <security:hidewhois> as of 1.2a3"},
-	{"options", "userstats",		"has been moved to <security:userstats> as of 1.2a3"},
-	{"options", "customversion",	"has been moved to <security:customversion> as of 1.2a3"},
-	{"options", "hidesplits",		"has been moved to <security:hidesplits> as of 1.2a3"},
-	{"options", "hidebans",		"has been moved to <security:hidebans> as of 1.2a3"},
-	{"options", "hidekills",		"has been moved to <security:hidekills> as of 1.2a3"},
-	{"options", "operspywhois",		"has been moved to <security:operspywhois> as of 1.2a3"},
-	{"options", "announceinvites",	"has been moved to <security:announceinvites> as of 1.2a3"},
-	{"options", "hidemodes",		"has been moved to <security:hidemodes> as of 1.2a3"},
-	{"options", "maxtargets",		"has been moved to <security:maxtargets> as of 1.2a3"},
-	{"options",	"nouserdns",		"has been moved to <performance:nouserdns> as of 1.2a3"},
-	{"options",	"maxwho",		"has been moved to <performance:maxwho> as of 1.2a3"},
-	{"options",	"softlimit",		"has been moved to <performance:softlimit> as of 1.2a3"},
-	{"options", "somaxconn",		"has been moved to <performance:somaxconn> as of 1.2a3"},
-	{"options", "netbuffersize",	"has been moved to <performance:netbuffersize> as of 1.2a3"},
-	{"options", "maxwho",		"has been moved to <performance:maxwho> as of 1.2a3"},
-	{"options",	"loglevel",		"1.2+ does not use the loglevel value. Please define <log> tags instead."},
-	{"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."},
-};
+#ifndef _WIN32
+	char hostname[256];
+	if (gethostname(hostname, sizeof(hostname)) == 0)
+	{
+		std::string name(hostname);
+		if (name.find('.') == std::string::npos)
+			name.push_back('.');
+
+		if (name.length() <= ServerInstance->Config->Limits.MaxHost && InspIRCd::IsHost(name))
+			return name;
+	}
+#endif
+	return "irc.example.com";
+}
 
 void ServerConfig::Fill()
 {
 	ConfigTag* options = ConfValue("options");
 	ConfigTag* security = ConfValue("security");
+	ConfigTag* server = ConfValue("server");
 	if (sid.empty())
 	{
-		ServerName = ConfValue("server")->getString("name");
-		sid = ConfValue("server")->getString("id");
-		ValidHost(ServerName, "<server:name>");
-		if (!sid.empty() && !ServerInstance->IsSID(sid))
+		ServerName = server->getString("name", GetServerHost(), InspIRCd::IsHost);
+
+		sid = server->getString("id");
+		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", 1);
+		if (CaseMapping == "ascii")
+			national_case_insensitive_map = ascii_case_insensitive_map;
+		else if (CaseMapping == "rfc1459")
+			national_case_insensitive_map = rfc_case_insensitive_map;
+		else
+			throw CoreException("<options:casemapping> must be set to 'ascii', or 'rfc1459'");
 	}
 	else
 	{
-		if (ServerName != ConfValue("server")->getString("name"))
-			throw CoreException("You must restart to change the server name or SID");
-		std::string nsid = ConfValue("server")->getString("id");
+		std::string name = server->getString("name");
+		if (!name.empty() && name != ServerName)
+			throw CoreException("You must restart to change the server name");
+
+		std::string nsid = server->getString("id");
 		if (!nsid.empty() && nsid != sid)
-			throw CoreException("You must restart to change the server name or SID");
-	}
-	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());
-	MaxConn = ConfValue("performance")->getInt("somaxconn", SOMAXCONN);
-	MoronBanner = 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");
-	ModPath = ConfValue("path")->getString("moduledir", MOD_PATH);
-	NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240);
-	dns_timeout = ConfValue("dns")->getInt("timeout", 5);
-	DisabledCommands = ConfValue("disabled")->getString("commands", "");
-	DisabledDontExist = ConfValue("disabled")->getBool("fakenonexistant");
-	UserStats = security->getString("userstats");
-	CustomVersion = security->getString("customversion", Network + " IRCd");
-	HideSplits = security->getBool("hidesplits");
+			throw CoreException("You must restart to change the server id");
+
+		std::string casemapping = options->getString("casemapping");
+		// Ignore this value if CaseMapping is set to something the core doesn't provide (i.e., m_nationalchars).
+		if (!casemapping.empty() && casemapping != CaseMapping && (CaseMapping == "ascii" || CaseMapping == "rfc1459"))
+			throw CoreException("You must restart to change the server casemapping");
+
+	}
+	SoftLimit = ConfValue("performance")->getUInt("softlimit", (SocketEngine::GetMaxFds() > 0 ? SocketEngine::GetMaxFds() : LONG_MAX), 10);
+	CCOnConnect = ConfValue("performance")->getBool("clonesonconnect", true);
+	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", 1);
+	Network = server->getString("network", "Network", 1);
+	NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240, 1024, 65534);
+	CustomVersion = security->getString("customversion");
 	HideBans = security->getBool("hidebans");
-	HideWhoisServer = security->getString("hidewhois");
-	HideKillsServer = security->getString("hidekills");
-	HideULineKills = security->getBool("hideulinekills");
-	RestrictBannedUsers = security->getBool("restrictbannedusers", true);
-	GenericOper = security->getBool("genericoper");
-	NoUserDns = ConfValue("performance")->getBool("nouserdns");
+	HideServer = security->getString("hideserver", security->getString("hidewhois"));
 	SyntaxHints = options->getBool("syntaxhints");
-	CycleHosts = options->getBool("cyclehosts");
-	CycleHostsFromUser = options->getBool("cyclehostsfromuser");
-	UndernetMsgPrefix = options->getBool("ircumsgprefix");
 	FullHostInTopic = options->getBool("hostintopic");
-	MaxTargets = security->getInt("maxtargets", 20);
-	DefaultModes = options->getString("defaultmodes", "nt");
+	MaxTargets = security->getUInt("maxtargets", 20, 1, 31);
+	DefaultModes = options->getString("defaultmodes", "not");
 	PID = ConfValue("pid")->getString("file");
-	WhoWasGroupSize = ConfValue("whowas")->getInt("groupsize");
-	WhoWasMaxGroups = ConfValue("whowas")->getInt("maxgroups");
-	WhoWasMaxKeep = ServerInstance->Duration(ConfValue("whowas")->getString("maxkeep"));
-	MaxChans = ConfValue("channels")->getInt("users", 20);
-	OperMaxChans = ConfValue("channels")->getInt("opers", 60);
-	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.MaxQuit = ConfValue("limits")->getInt("maxquit", 255);
-	Limits.MaxTopic = ConfValue("limits")->getInt("maxtopic", 307);
-	Limits.MaxKick = ConfValue("limits")->getInt("maxkick", 255);
-	Limits.MaxGecos = ConfValue("limits")->getInt("maxgecos", 128);
-	Limits.MaxAway = ConfValue("limits")->getInt("maxaway", 200);
-	InvBypassModes = options->getBool("invitebypassmodes", true);
+	MaxChans = ConfValue("channels")->getUInt("users", 20);
+	OperMaxChans = ConfValue("channels")->getUInt("opers", 0);
+	c_ipv4_range = ConfValue("cidr")->getUInt("ipv4clone", 32, 1, 32);
+	c_ipv6_range = ConfValue("cidr")->getUInt("ipv6clone", 128, 1, 128);
+	Limits = ServerLimits(ConfValue("limits"));
+	Paths = ServerPaths(ConfValue("path"));
 	NoSnoticeStack = options->getBool("nosnoticestack", false);
-	WelcomeNotice = options->getBool("welcomenotice", true);
-
-	range(SoftLimit, 10, ServerInstance->SE->GetMaxFds(), ServerInstance->SE->GetMaxFds(), "<performance:softlimit>");
-	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>");
-	range(WhoWasMaxGroups, 0, 1000000, 10240, "<whowas:maxgroups>");
-	range(WhoWasMaxKeep, 3600, INT_MAX, 3600, "<whowas:maxkeep>");
-
-	ValidIP(DNSServer, "<dns:server>");
 
 	std::string defbind = options->getString("defaultbind");
-	if (assign(defbind) == "ipv4")
+	if (stdalgo::string::equalsci(defbind, "ipv4"))
 	{
 		WildcardIPv6 = false;
 	}
-	else if (assign(defbind) == "ipv6")
+	else if (stdalgo::string::equalsci(defbind, "ipv6"))
 	{
 		WildcardIPv6 = true;
 	}
@@ -590,26 +419,7 @@ void ServerConfig::Fill()
 		if (socktest < 0)
 			WildcardIPv6 = false;
 		else
-			ServerInstance->SE->Close(socktest);
-	}
-	ConfigTagList tags = ConfTags("uline");
-	for(ConfigIter i = tags.first; i != tags.second; ++i)
-	{
-		ConfigTag* tag = i->second;
-		std::string server;
-		if (!tag->readString("server", server))
-			throw CoreException("<uline> tag missing server at " + tag->getTagLocation());
-		ulines[assign(server)] = tag->getBool("silent");
-	}
-
-	tags = ConfTags("banlist");
-	for(ConfigIter i = tags.first; i != tags.second; ++i)
-	{
-		ConfigTag* tag = i->second;
-		std::string chan;
-		if (!tag->readString("chan", chan))
-			throw CoreException("<banlist> tag missing chan at " + tag->getTagLocation());
-		maxbans[chan] = tag->getInt("limit");
+			SocketEngine::Close(socktest);
 	}
 
 	ReadXLine(this, "badip", "ipmask", ServerInstance->XLines->GetFactory("Z"));
@@ -617,48 +427,15 @@ void ServerConfig::Fill()
 	ReadXLine(this, "badhost", "host", ServerInstance->XLines->GetFactory("K"));
 	ReadXLine(this, "exception", "host", ServerInstance->XLines->GetFactory("E"));
 
-	memset(DisabledUModes, 0, sizeof(DisabledUModes));
-	std::string modes = ConfValue("disabled")->getString("usermodes");
-	for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
-	{
-		// Complain when the character is not a-z or A-Z
-		if ((*p < 'A') || (*p > 'z') || ((*p < 'a') && (*p > 'Z')))
-			throw CoreException("Invalid usermode " + std::string(1, *p) + " was found.");
-		DisabledUModes[*p - 'A'] = 1;
-	}
-
-	memset(DisabledCModes, 0, sizeof(DisabledCModes));
-	modes = ConfValue("disabled")->getString("chanmodes");
-	for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
-	{
-		if ((*p < 'A') || (*p > 'z') || ((*p < 'a') && (*p > 'Z')))
-			throw CoreException("Invalid chanmode " + std::string(1, *p) + " was found.");
-		DisabledCModes[*p - 'A'] = 1;
-	}
-
-	memset(HideModeLists, 0, sizeof(HideModeLists));
-	modes = ConfValue("security")->getString("hidemodes");
-	for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
-		HideModeLists[(unsigned char) *p] = true;
-
-	std::string v = security->getString("announceinvites");
-
-	if (v == "ops")
-		AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_OPS;
-	else if (v == "all")
-		AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_ALL;
-	else if (v == "dynamic")
-		AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_DYNAMIC;
+	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"))
+		RestrictBannedUsers = ServerConfig::BUT_RESTRICT_SILENT;
+	else if (stdalgo::string::equalsci(restrictbannedusers, "yes"))
+		RestrictBannedUsers =  ServerConfig::BUT_RESTRICT_NOTIFY;
 	else
-		AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_NONE;
-
-	v = security->getString("operspywhois");
-	if (v == "splitmsg")
-		OperSpyWhois = SPYWHOIS_SPLITMSG;
-	else if (v == "on" || v == "yes")
-		OperSpyWhois = SPYWHOIS_SINGLEMSG;
-	else
-		OperSpyWhois = SPYWHOIS_NONE;
+		throw CoreException(restrictbannedusers + " is an invalid <options:restrictbannedusers> value, at " + options->getTagLocation());
 }
 
 // WARNING: it is not safe to use most of the codebase in this function, as it
@@ -675,12 +452,7 @@ void ServerConfig::Read()
 	catch (CoreException& err)
 	{
 		valid = false;
-		errstr << err.GetReason();
-	}
-	if (valid)
-	{
-		DNSServer = ConfValue("dns")->getString("server");
-		FindDNS(DNSServer);
+		errstr << err.GetReason() << std::endl;
 	}
 }
 
@@ -692,6 +464,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 		/*
 		 * These values can only be set on boot. Keep their old values. Do it before we send messages so we actually have a servername.
 		 */
+		this->CaseMapping = old->CaseMapping;
 		this->ServerName = old->ServerName;
 		this->sid = old->sid;
 		this->cmdline = old->cmdline;
@@ -700,16 +473,16 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 	/* The stuff in here may throw CoreException, be sure we're in a position to catch it. */
 	try
 	{
-		for (int Index = 0; Index * sizeof(Deprecated) < sizeof(ChangedConfig); Index++)
+		// Ensure the user has actually edited ther config.
+		ConfigTagList dietags = ConfTags("die");
+		if (dietags.first != dietags.second)
 		{
-			std::string dummy;
-			ConfigTagList tags = ConfTags(ChangedConfig[Index].tag);
-			for(ConfigIter i = tags.first; i != tags.second; ++i)
+			errstr << "Your configuration has not been edited correctly!" << std::endl;
+			for (ConfigIter iter = dietags.first; iter != dietags.second; ++iter)
 			{
-				if (i->second->readString(ChangedConfig[Index].value, dummy, true))
-					errstr << "Your configuration contains a deprecated value: <"
-						<< ChangedConfig[Index].tag << ":" << ChangedConfig[Index].value << "> - " << ChangedConfig[Index].reason
-						<< " (at " << i->second->getTagLocation() << ")\n";
+				ConfigTag* tag = iter->second;
+				const std::string reason = tag->getString("reason", "You left a <die> tag in your config", 1);
+				errstr << reason <<  " (at " << tag->getTagLocation() << ")" << std::endl;
 			}
 		}
 
@@ -721,7 +494,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 	}
 	catch (CoreException &ce)
 	{
-		errstr << ce.GetReason();
+		errstr << ce.GetReason() << std::endl;
 	}
 
 	// Check errors before dealing with failed binds, since continuing on failed bind is wanted in some circumstances.
@@ -729,32 +502,35 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 
 	// write once here, to try it out and make sure its ok
 	if (valid)
-		ServerInstance->WritePID(this->PID);
+		ServerInstance->WritePID(this->PID, !old);
+
+	ConfigTagList binds = ConfTags("bind");
+	if (binds.first == binds.second)
+		 errstr << "Possible configuration error: you have not defined any <bind> blocks." << std::endl
+			 << "You will need to do this if you want clients to be able to connect!" << std::endl;
 
 	if (old && valid)
 	{
 		// On first run, ports are bound later on
 		FailedPortList pl;
 		ServerInstance->BindPorts(pl);
-		if (pl.size())
+		if (!pl.empty())
 		{
-			errstr << "Not all your client ports could be bound.\nThe following port(s) failed to bind:\n";
-
-			int j = 1;
-			for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
+			errstr << "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)
 			{
-				char buf[MAXBUF];
-				snprintf(buf, MAXBUF, "%d.   Address: %s   Reason: %s\n", j, i->first.empty() ? "<all>" : i->first.c_str(), i->second.c_str());
-				errstr << buf;
+				const FailedPort& fp = *iter;
+				errstr << "  " << fp.sa.str() << ": " << strerror(fp.error) << std::endl
+					<< "  " << "Created from <bind> tag at " << fp.tag->getTagLocation() << std::endl;
 			}
 		}
 	}
 
-	User* user = useruid.empty() ? NULL : ServerInstance->FindNick(useruid);
+	User* user = useruid.empty() ? NULL : ServerInstance->FindUUID(useruid);
 
 	if (!valid)
 	{
-		ServerInstance->Logs->Log("CONFIG",DEFAULT, "There were errors in your configuration file:");
+		ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "There were errors in your configuration file:");
 		Classes.clear();
 	}
 
@@ -769,7 +545,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 			std::cout << line << std::endl;
 		// If a user is rehashing, tell them directly
 		if (user)
-			user->SendText(":%s NOTICE %s :*** %s", ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), line.c_str());
+			user->WriteRemoteNotice(InspIRCd::Format("*** %s", line.c_str()));
 		// Also tell opers
 		ServerInstance->SNO->WriteGlobalSno('a', line);
 	}
@@ -777,23 +553,6 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 	errstr.clear();
 	errstr.str(std::string());
 
-	// Re-parse our MOTD and RULES files for colors -- Justasic
-	for (ClassVector::const_iterator it = this->Classes.begin(), it_end = this->Classes.end(); it != it_end; ++it)
-	{
-		ConfigTag *tag = (*it)->config;
-		// Make sure our connection class allows motd colors
-		if(!tag->getBool("allowmotdcolors"))
-		      continue;
-
-		ConfigFileCache::iterator file = this->Files.find(tag->getString("motd", "motd"));
-		if (file != this->Files.end())
-		      InspIRCd::ProcessColors(file->second);
-
-		file = this->Files.find(tag->getString("rules", "rules"));
-		if (file != this->Files.end())
-		      InspIRCd::ProcessColors(file->second);
-	}
-
 	/* No old configuration -> initial boot, nothing more to do here */
 	if (!old)
 	{
@@ -813,20 +572,14 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 	ApplyModules(user);
 
 	if (user)
-		user->SendText(":%s NOTICE %s :*** Successfully rehashed server.",
-			ServerInstance->Config->ServerName.c_str(), user->nick.c_str());
+		user->WriteRemoteNotice("*** Successfully rehashed server.");
 	ServerInstance->SNO->WriteGlobalSno('a', "*** Successfully rehashed server.");
 }
 
 void ServerConfig::ApplyModules(User* user)
 {
-	Module* whowas = ServerInstance->Modules->Find("cmd_whowas.so");
-	if (whowas)
-		WhowasRequest(NULL, whowas, WhowasRequest::WHOWAS_PRUNE).Send();
-
-	const std::vector<std::string> v = ServerInstance->Modules->GetAllModuleNames(0);
 	std::vector<std::string> added_modules;
-	std::set<std::string> removed_modules(v.begin(), v.end());
+	ModuleManager::ModuleMap removed_modules = ServerInstance->Modules->GetModules();
 
 	ConfigTagList tags = ConfTags("module");
 	for(ConfigIter i = tags.first; i != tags.second; ++i)
@@ -835,6 +588,7 @@ void ServerConfig::ApplyModules(User* user)
 		std::string name;
 		if (tag->readString("name", name))
 		{
+			name = ModuleManager::ExpandModName(name);
 			// if this module is already loaded, the erase will succeed, so we need do nothing
 			// otherwise, we need to add the module (which will be done later)
 			if (removed_modules.erase(name) == 0)
@@ -842,58 +596,54 @@ void ServerConfig::ApplyModules(User* user)
 		}
 	}
 
-	if (ConfValue("options")->getBool("allowhalfop") && removed_modules.erase("m_halfop.so") == 0)
-		added_modules.push_back("m_halfop.so");
-
-	for (std::set<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
+	for (ModuleManager::ModuleMap::iterator i = removed_modules.begin(); i != removed_modules.end(); ++i)
 	{
-		// Don't remove cmd_*.so, just remove m_*.so
-		if (removing->c_str()[0] == 'c')
+		const std::string& modname = i->first;
+		// Don't remove core_*.so, just remove m_*.so
+		if (InspIRCd::Match(modname, "core_*.so", ascii_case_insensitive_map))
 			continue;
-		Module* m = ServerInstance->Modules->Find(*removing);
-		if (m && ServerInstance->Modules->Unload(m))
+		if (ServerInstance->Modules->Unload(i->second))
 		{
-			ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH UNLOADED MODULE: %s",removing->c_str());
+			ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH UNLOADED MODULE: %s", modname.c_str());
 
 			if (user)
-				user->WriteNumeric(RPL_UNLOADEDMODULE, "%s %s :Module %s successfully unloaded.",user->nick.c_str(), removing->c_str(), removing->c_str());
+				user->WriteNumeric(RPL_UNLOADEDMODULE, modname, InspIRCd::Format("Module %s successfully unloaded.", modname.c_str()));
 			else
-				ServerInstance->SNO->WriteGlobalSno('a', "Module %s successfully unloaded.", removing->c_str());
+				ServerInstance->SNO->WriteGlobalSno('a', "Module %s successfully unloaded.", modname.c_str());
 		}
 		else
 		{
 			if (user)
-				user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s %s :Failed to unload module %s: %s",user->nick.c_str(), removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError().c_str());
+				user->WriteNumeric(ERR_CANTUNLOADMODULE, modname, InspIRCd::Format("Failed to unload module %s: %s", modname.c_str(), ServerInstance->Modules->LastError().c_str()));
 			else
-				 ServerInstance->SNO->WriteGlobalSno('a', "Failed to unload module %s: %s", removing->c_str(), ServerInstance->Modules->LastError().c_str());
+				ServerInstance->SNO->WriteGlobalSno('a', "Failed to unload module %s: %s", modname.c_str(), ServerInstance->Modules->LastError().c_str());
 		}
 	}
 
 	for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
 	{
-		if (ServerInstance->Modules->Load(adding->c_str()))
+		// Skip modules which are already loaded.
+		if (ServerInstance->Modules->Find(*adding))
+			continue;
+
+		if (ServerInstance->Modules->Load(*adding))
 		{
 			ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH LOADED MODULE: %s",adding->c_str());
 			if (user)
-				user->WriteNumeric(RPL_LOADEDMODULE, "%s %s :Module %s successfully loaded.",user->nick.c_str(), adding->c_str(), adding->c_str());
+				user->WriteNumeric(RPL_LOADEDMODULE, *adding, InspIRCd::Format("Module %s successfully loaded.", adding->c_str()));
 			else
 				ServerInstance->SNO->WriteGlobalSno('a', "Module %s successfully loaded.", adding->c_str());
 		}
 		else
 		{
 			if (user)
-				user->WriteNumeric(ERR_CANTLOADMODULE, "%s %s :Failed to load module %s: %s",user->nick.c_str(), adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError().c_str());
+				user->WriteNumeric(ERR_CANTLOADMODULE, *adding, InspIRCd::Format("Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str()));
 			else
 				ServerInstance->SNO->WriteGlobalSno('a', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str());
 		}
 	}
 }
 
-bool ServerConfig::StartsWithWindowsDriveLetter(const std::string &path)
-{
-	return (path.length() > 2 && isalpha(path[0]) && path[1] == ':');
-}
-
 ConfigTag* ServerConfig::ConfValue(const std::string &tag)
 {
 	ConfigTagList found = config_data.equal_range(tag);
@@ -902,7 +652,7 @@ ConfigTag* ServerConfig::ConfValue(const std::string &tag)
 	ConfigTag* rv = found.first->second;
 	found.first++;
 	if (found.first != found.second)
-		ServerInstance->Logs->Log("CONFIG",DEFAULT, "Multiple <" + tag + "> tags found; only first will be used "
+		ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Multiple <" + tag + "> tags found; only first will be used "
 			"(first at " + rv->getTagLocation() + "; second at " + found.first->second->getTagLocation() + ")");
 	return rv;
 }
@@ -912,35 +662,28 @@ ConfigTagList ServerConfig::ConfTags(const std::string& tag)
 	return config_data.equal_range(tag);
 }
 
-bool ServerConfig::FileExists(const char* file)
+std::string ServerConfig::Escape(const std::string& str, bool xml)
 {
-	struct stat sb;
-	if (stat(file, &sb) == -1)
-		return false;
-
-	if ((sb.st_mode & S_IFDIR) > 0)
-		return false;
-
-	FILE *input = fopen(file, "r");
-	if (input == NULL)
-		return false;
-	else
+	std::string escaped;
+	for (std::string::const_iterator it = str.begin(); it != str.end(); ++it)
 	{
-		fclose(input);
-		return true;
+		switch (*it)
+		{
+			case '"':
+				escaped += xml ? "&quot;" : "\"";
+				break;
+			case '&':
+				escaped += xml ? "&amp;" : "&";
+				break;
+			case '\\':
+				escaped += xml ? "\\" : "\\\\";
+				break;
+			default:
+				escaped += *it;
+				break;
+		}
 	}
-}
-
-const char* ServerConfig::CleanFilename(const char* name)
-{
-	const char* p = name + strlen(name);
-	while ((p != name) && (*p != '/') && (*p != '\\')) p--;
-	return (p != name ? ++p : p);
-}
-
-const std::string& ServerConfig::GetSID()
-{
-	return sid;
+	return escaped;
 }
 
 void ConfigReaderThread::Run()
@@ -952,7 +695,7 @@ void ConfigReaderThread::Run()
 void ConfigReaderThread::Finish()
 {
 	ServerConfig* old = ServerInstance->Config;
-	ServerInstance->Logs->Log("CONFIG",DEBUG,"Switching to new configuration...");
+	ServerInstance->Logs->Log("CONFIG", LOG_DEBUG, "Switching to new configuration...");
 	ServerInstance->Config = this->Config;
 	Config->Apply(old, TheUserUID);
 
@@ -964,15 +707,32 @@ void ConfigReaderThread::Finish()
 		 * XXX: The order of these is IMPORTANT, do not reorder them without testing
 		 * thoroughly!!!
 		 */
-		ServerInstance->Users->RehashCloneCounts();
+		ServerInstance->Users.RehashCloneCounts();
 		ServerInstance->XLines->CheckELines();
 		ServerInstance->XLines->ApplyLines();
-		ServerInstance->Res->Rehash();
-		ServerInstance->ResetMaxBans();
-		Config->ApplyDisabledCommands(Config->DisabledCommands);
-		User* user = ServerInstance->FindNick(TheUserUID);
-		FOREACH_MOD(I_OnRehash, OnRehash(user));
-		ServerInstance->BuildISupport();
+		User* user = ServerInstance->FindUUID(TheUserUID);
+
+		ConfigStatus status(user);
+		const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules();
+		for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
+		{
+			try
+			{
+				ServerInstance->Logs->Log("MODULE", LOG_DEBUG, "Rehashing " + i->first);
+				i->second->ReadConfig(status);
+			}
+			catch (CoreException& modex)
+			{
+				ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Exception caught: " + modex.GetReason());
+				if (user)
+					user->WriteNotice(i->first + ": " + modex.GetReason());
+			}
+		}
+
+		// The description of this server may have changed - update it for WHOIS etc.
+		ServerInstance->FakeClient->server->description = Config->ServerDesc;
+
+		ServerInstance->ISupport.Build();
 
 		ServerInstance->Logs->CloseLogs();
 		ServerInstance->Logs->OpenFileLogs();