X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=a3471327918b5ca11ba0f8ff60deeee291b2b6fd;hb=5f8f96e0b6ed20f01dcda78e19e6fb1168d27f5f;hp=d9afb99dd3ef63e9665e6dc4bd7fade55f80b9e6;hpb=5e1f2c1728b200951c0f192f2e2c6b83d53c879c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index d9afb99dd..a34713279 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -160,7 +160,7 @@ void ServerConfig::Send005(User* user)
 		user->WriteServ("005 %s %s", user->nick, line->c_str());
 }
 
-bool ServerConfig::CheckOnce(char* tag)
+bool ServerConfig::CheckOnce(const char* tag)
 {
 	int count = ConfValueEnum(this->config_data, tag);
 
@@ -284,7 +284,7 @@ bool ValidateMaxTargets(ServerConfig* conf, const char*, const char*, ValueItem
 {
 	if ((data.GetInteger() < 0) || (data.GetInteger() > 31))
 	{
-		conf->GetInstance()->Log(DEFAULT,"WARNING: <options:maxtargets> value is greater than 31 or less than 0, set to 20.");
+		conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: <options:maxtargets> value is greater than 31 or less than 0, set to 20.");
 		data.Set(20);
 	}
 	return true;
@@ -294,7 +294,7 @@ bool ValidateSoftLimit(ServerConfig* conf, const char*, const char*, ValueItem &
 {
 	if ((data.GetInteger() < 1) || (data.GetInteger() > MAXCLIENTS))
 	{
-		conf->GetInstance()->Log(DEFAULT,"WARNING: <options:softlimit> value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS);
+		conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: <options:softlimit> value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS);
 		data.Set(MAXCLIENTS);
 	}
 	return true;
@@ -303,7 +303,7 @@ bool ValidateSoftLimit(ServerConfig* conf, const char*, const char*, ValueItem &
 bool ValidateMaxConn(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
 	if (data.GetInteger() > SOMAXCONN)
-		conf->GetInstance()->Log(DEFAULT,"WARNING: <options:somaxconn> value may be higher than the system-defined SOMAXCONN value!");
+		conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: <options:somaxconn> value may be higher than the system-defined SOMAXCONN value!");
 	return true;
 }
 
@@ -334,8 +334,8 @@ bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem &
 	{
 		std::string nameserver;
 		// attempt to look up their nameserver from /etc/resolv.conf
-		conf->GetInstance()->Log(DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in /etc/resolv.conf...");
-		ifstream resolv("/etc/resolv.conf");
+		conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in /etc/resolv.conf...");
+		std::ifstream resolv("/etc/resolv.conf");
 		bool found_server = false;
 
 		if (resolv.is_open())
@@ -347,19 +347,19 @@ bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem &
 					resolv >> nameserver;
 					data.Set(nameserver.c_str());
 					found_server = true;
-					conf->GetInstance()->Log(DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str());
+					conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str());
 				}
 			}
 
 			if (!found_server)
 			{
-				conf->GetInstance()->Log(DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!");
+				conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!");
 				data.Set("127.0.0.1");
 			}
 		}
 		else
 		{
-			conf->GetInstance()->Log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!");
+			conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!");
 			data.Set("127.0.0.1");
 		}
 	}
@@ -377,7 +377,7 @@ bool ValidateServerName(ServerConfig* conf, const char*, const char*, ValueItem
 	}
 	if (!strchr(data.GetString(),'.'))
 	{
-		conf->GetInstance()->Log(DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s%c'",data.GetString(),data.GetString(),'.');
+		conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s%c'",data.GetString(),data.GetString(),'.');
 		std::string moo = std::string(data.GetString()).append(".");
 		data.Set(moo.c_str());
 	}
@@ -388,7 +388,7 @@ bool ValidateNetBufferSize(ServerConfig* conf, const char*, const char*, ValueIt
 {
 	if ((!data.GetInteger()) || (data.GetInteger() > 65535) || (data.GetInteger() < 1024))
 	{
-		conf->GetInstance()->Log(DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240.");
+		conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240.");
 		data.Set(10240);
 	}
 	return true;
@@ -398,7 +398,7 @@ bool ValidateMaxWho(ServerConfig* conf, const char*, const char*, ValueItem &dat
 {
 	if ((data.GetInteger() > 65535) || (data.GetInteger() < 1))
 	{
-		conf->GetInstance()->Log(DEFAULT,"<options:maxwhoresults> size out of range, setting to default of 128.");
+		conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"<options:maxwhoresults> size out of range, setting to default of 128.");
 		data.Set(128);
 	}
 	return true;
@@ -478,13 +478,13 @@ bool ValidateInvite(ServerConfig* conf, const char*, const char*, ValueItem &dat
 
 bool ValidateSID(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
-	int sid = data.GetInteger();
-	if ((sid > 999) || (sid < 0))
+	const char *sid = data.GetString();
+
+	if (*sid && !conf->GetInstance()->IsSID(sid))
 	{
-		sid = sid % 1000;
-		data.Set(sid);
-		conf->GetInstance()->Log(DEFAULT,"WARNING: Server ID is less than 0 or greater than 999. Set to %d", sid);
+		throw CoreException(std::string(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.");
 	}
+
 	return true;
 }
 
@@ -501,7 +501,7 @@ bool ValidateWhoWas(ServerConfig* conf, const char*, const char*, ValueItem &dat
 	if (conf->WhoWasMaxKeep < 3600)
 	{
 		conf->WhoWasMaxKeep = 3600;
-		conf->GetInstance()->Log(DEFAULT,"WARNING: <whowas:maxkeep> value less than 3600, setting to default 3600");
+		conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: <whowas:maxkeep> value less than 3600, setting to default 3600");
 	}
 
 	Command* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS");
@@ -518,29 +518,37 @@ bool ValidateWhoWas(ServerConfig* conf, const char*, const char*, ValueItem &dat
  */
 bool InitConnect(ServerConfig* conf, const char*)
 {
-	conf->GetInstance()->Log(DEFAULT,"Reading connect classes...");
+	conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Reading connect classes...");
 
 	for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end(); i++)
 	{
 		ConnectClass *c = *i;
 
-		conf->GetInstance()->Log(DEBUG, "Address of class is %p", c);
+		conf->GetInstance()->Logs->Log("CONFIG",DEBUG, "Address of class is %p", c);
 	}
 
-	for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end(); i++)
+	for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end() ; )
 	{
-		ConnectClass *c = *i;
+		ConnectClass* c = *i;
 
 		/* only delete a class with refcount 0 */
 		if (c->RefCount == 0)
 		{
-			conf->GetInstance()->Log(DEFAULT, "Removing connect class, refcount is 0!");
+			conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Removing connect class, refcount is 0!");
+			
+			/* This was causing a crash, because we'd set i to .begin() just here, but then the for loop's increment would
+			 * set it to .begin() + 1. Which if it was already the last thing in the list, wasn't good.
+			 * Now the increment is in the else { } below.
+			 */
 			conf->Classes.erase(i);
 			i = conf->Classes.begin(); // start over so we don't trample on a bad iterator
 		}
-
-		/* also mark all existing classes disabled, if they still exist in the conf, they will be reenabled. */
-		c->SetDisabled(true);
+		else
+		{
+			/* also mark all existing classes disabled, if they still exist in the conf, they will be reenabled. */
+			c->SetDisabled(true);
+			i++;
+		}
 	}
 
 	return true;
@@ -567,6 +575,7 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 	const char* parent = values[13].GetString();
 	int maxchans = values[14].GetInteger();
 	unsigned long limit = values[15].GetInteger();
+	const char* hashtype = values[16].GetString();
 
 	/*
 	 * duplicates check: Now we don't delete all connect classes on rehash, we need to ensure we don't add dupes.
@@ -574,17 +583,17 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 	 */
 	for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item)
 	{
-		ConnectClass* c = *item;
-		if ((*name && (c->GetName() == name)) || (*allow && (c->GetHost() == allow)) || (*deny && (c->GetHost() == deny)))
+		ConnectClass* cc = *item;
+		if ((*name && (cc->GetName() == name)) || (*allow && (cc->GetHost() == allow)) || (*deny && (cc->GetHost() == deny)))
 		{
 			/* reenable class so users can be shoved into it :P */
-			c->SetDisabled(false);
-			conf->GetInstance()->Log(DEFAULT, "Not adding class, it already exists!");
+			cc->SetDisabled(false);
+			conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Not adding class, it already exists!");
 			return true;
 		} 
 	}
 
-	conf->GetInstance()->Log(DEFAULT,"Adding a connect class!");
+	conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Adding a connect class!");
 
 	if (*parent)
 	{
@@ -594,11 +603,11 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 		ClassVector::iterator item = conf->Classes.begin();
 		for (; item != conf->Classes.end(); ++item)
 		{
-			ConnectClass* c = *item;
-			conf->GetInstance()->Log(DEBUG,"Class: %s", c->GetName().c_str());
-			if (c->GetName() == parent)
+			ConnectClass* cc = *item;
+			conf->GetInstance()->Logs->Log("CONFIG",DEBUG,"Class: %s", cc->GetName().c_str());
+			if (cc->GetName() == parent)
 			{
-				ConnectClass* newclass = new ConnectClass(name, c);
+				ConnectClass* newclass = new ConnectClass(name, cc);
 				newclass->Update(timeout, flood, *allow ? allow : deny, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit);
 				conf->Classes.push_back(newclass);
 				break;
@@ -611,16 +620,16 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 	{
 		if (*allow)
 		{
-			ConnectClass* c = new ConnectClass(name, timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans);
-			c->limit = limit;
-			c->SetPort(port);
-			conf->Classes.push_back(c);
+			ConnectClass* cc = new ConnectClass(name, timeout, flood, allow, pingfreq, password, hashtype, threshold, sendq, recvq, localmax, globalmax, maxchans);
+			cc->limit = limit;
+			cc->SetPort(port);
+			conf->Classes.push_back(cc);
 		}
 		else
 		{
-			ConnectClass* c = new ConnectClass(name, deny);
-			c->SetPort(port);
-			conf->Classes.push_back(c);
+			ConnectClass* cc = new ConnectClass(name, deny);
+			cc->SetPort(port);
+			conf->Classes.push_back(cc);
 		}
 	}
 
@@ -631,7 +640,7 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
  */
 bool DoneConnect(ServerConfig *conf, const char*)
 {
-	conf->GetInstance()->Log(DEFAULT, "Done adding connect classes!");
+	conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Done adding connect classes!");
 	return true;
 }
 
@@ -742,7 +751,7 @@ bool DoneMaxBans(ServerConfig*, const char*)
 
 void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, User* user)
 {
-	ServerInstance->Log(DEFAULT, "There were errors in your configuration file: %s", errormessage.c_str());
+	ServerInstance->Logs->Log("CONFIG",DEFAULT, "There were errors in your configuration file: %s", errormessage.c_str());
 	if (bail)
 	{
 		/* Unneeded because of the ServerInstance->Log() aboive? */
@@ -768,10 +777,10 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail,
 		}
 		else
 		{
-			ServerInstance->WriteOpers("There were errors in the configuration file:");
+			ServerInstance->SNO->WriteToSnoMask('A', "There were errors in the configuration file:");
 			while (start < errors.length())
 			{
-				ServerInstance->WriteOpers(errors.substr(start, 360).c_str());
+				ServerInstance->SNO->WriteToSnoMask('A', errors.substr(start, 360).c_str());
 				start += 360;
 			}
 		}
@@ -781,280 +790,298 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail,
 
 void ServerConfig::Read(bool bail, User* user)
 {
-	int rem = 0, add = 0;           /* Number of modules added, number of modules removed */
+	int rem = 0, add = 0;	   /* Number of modules added, number of modules removed */
 
-	for (int pass = 0; pass < 2; pass++)
-	{
-	
-		ServerInstance->Log(DEBUG,"Start config pass %d", pass);
-
-		static char debug[MAXBUF];	/* Temporary buffer for debugging value */
-		static char maxkeep[MAXBUF];	/* Temporary buffer for WhoWasMaxKeep value */
-		static char hidemodes[MAXBUF];	/* Modes to not allow listing from users below halfop */
-		static char exemptchanops[MAXBUF];	/* Exempt channel ops from these modes */
-		static char announceinvites[MAXBUF];	/* options:announceinvites setting */
-		std::ostringstream errstr;	/* String stream containing the error output */
-
-		/* These tags MUST occur and must ONLY occur once in the config file */
-		static char* Once[] = { "server", "admin", "files", "power", "options", NULL };
-
-		/* These tags can occur ONCE or not at all */
-		InitialConfig Values[] = {
-			{"options",	"softlimit",	MAXCLIENTS_S,		new ValueContainerUInt (&this->SoftLimit),		DT_INTEGER,  ValidateSoftLimit},
-			{"options",	"somaxconn",	SOMAXCONN_S,		new ValueContainerInt  (&this->MaxConn),		DT_INTEGER,  ValidateMaxConn},
-			{"options",	"moronbanner",	"Youre banned!",	new ValueContainerChar (this->MoronBanner),		DT_CHARPTR,  NoValidation},
-			{"server",	"name",		"",			new ValueContainerChar (this->ServerName),		DT_HOSTNAME, ValidateServerName},
-			{"server",	"description",	"Configure Me",		new ValueContainerChar (this->ServerDesc),		DT_CHARPTR,  NoValidation},
-			{"server",	"network",	"Network",		new ValueContainerChar (this->Network),			DT_NOSPACES, NoValidation},
-			{"server",	"id",		"0",			new ValueContainerInt  (&this->sid),			DT_NOSPACES, ValidateSID},
-			{"admin",	"name",		"",			new ValueContainerChar (this->AdminName),		DT_CHARPTR,  NoValidation},
-			{"admin",	"email",	"Mis@configu.red",	new ValueContainerChar (this->AdminEmail),		DT_CHARPTR,  NoValidation},
-			{"admin",	"nick",		"Misconfigured",	new ValueContainerChar (this->AdminNick),		DT_CHARPTR,  NoValidation},
-			{"files",	"motd",		"",			new ValueContainerChar (this->motd),			DT_CHARPTR,  ValidateMotd},
-			{"files",	"rules",	"",			new ValueContainerChar (this->rules),			DT_CHARPTR,  ValidateRules},
-			{"power",	"diepass",	"",			new ValueContainerChar (this->diepass),			DT_CHARPTR,  ValidateNotEmpty},
-			{"power",	"pause",	"",			new ValueContainerInt  (&this->DieDelay),		DT_INTEGER,  NoValidation},
-			{"power",	"restartpass",	"",			new ValueContainerChar (this->restartpass),		DT_CHARPTR,  ValidateNotEmpty},
-			{"options",	"prefixquit",	"",			new ValueContainerChar (this->PrefixQuit),		DT_CHARPTR,  NoValidation},
-			{"options",	"suffixquit",	"",			new ValueContainerChar (this->SuffixQuit),		DT_CHARPTR,  NoValidation},
-			{"options",	"fixedquit",	"",			new ValueContainerChar (this->FixedQuit),		DT_CHARPTR,  NoValidation},
-			{"options",	"loglevel",	"default",		new ValueContainerChar (debug),				DT_CHARPTR,  ValidateLogLevel},
-			{"options",	"netbuffersize","10240",		new ValueContainerInt  (&this->NetBufferSize),		DT_INTEGER,  ValidateNetBufferSize},
-			{"options",	"maxwho",	"128",			new ValueContainerInt  (&this->MaxWhoResults),		DT_INTEGER,  ValidateMaxWho},
-			{"options",	"allowhalfop",	"0",			new ValueContainerBool (&this->AllowHalfop),		DT_BOOLEAN,  NoValidation},
-			{"dns",		"server",	"",			new ValueContainerChar (this->DNSServer),		DT_IPADDRESS,DNSServerValidator},
-			{"dns",		"timeout",	"5",			new ValueContainerInt  (&this->dns_timeout),		DT_INTEGER,  NoValidation},
-			{"options",	"moduledir",	MOD_PATH,		new ValueContainerChar (this->ModPath),			DT_CHARPTR,  NoValidation},
-			{"disabled",	"commands",	"",			new ValueContainerChar (this->DisabledCommands),	DT_CHARPTR,  NoValidation},
-			{"options",	"userstats",	"",			new ValueContainerChar (this->UserStats),		DT_CHARPTR,  NoValidation},
-			{"options",	"customversion","",			new ValueContainerChar (this->CustomVersion),		DT_CHARPTR,  NoValidation},
-			{"options",	"hidesplits",	"0",			new ValueContainerBool (&this->HideSplits),		DT_BOOLEAN,  NoValidation},
-			{"options",	"hidebans",	"0",			new ValueContainerBool (&this->HideBans),		DT_BOOLEAN,  NoValidation},
-			{"options",	"hidewhois",	"",			new ValueContainerChar (this->HideWhoisServer),		DT_NOSPACES, NoValidation},
-			{"options",	"hidekills",	"",			new ValueContainerChar (this->HideKillsServer),		DT_NOSPACES,  NoValidation},
-			{"options",	"operspywhois",	"0",			new ValueContainerBool (&this->OperSpyWhois),		DT_BOOLEAN,  NoValidation},
-			{"options",	"nouserdns",	"0",			new ValueContainerBool (&this->NoUserDns),		DT_BOOLEAN,  NoValidation},
-			{"options",	"syntaxhints",	"0",			new ValueContainerBool (&this->SyntaxHints),		DT_BOOLEAN,  NoValidation},
-			{"options",	"cyclehosts",	"0",			new ValueContainerBool (&this->CycleHosts),		DT_BOOLEAN,  NoValidation},
-			{"options",	"ircumsgprefix","0",			new ValueContainerBool (&this->UndernetMsgPrefix),	DT_BOOLEAN,  NoValidation},
-			{"options",	"announceinvites", "1",			new ValueContainerChar (announceinvites),		DT_CHARPTR,  ValidateInvite},
-			{"options",	"hostintopic",	"1",			new ValueContainerBool (&this->FullHostInTopic),	DT_BOOLEAN,  NoValidation},
-			{"options",	"hidemodes",	"",			new ValueContainerChar (hidemodes),			DT_CHARPTR,  ValidateModeLists},
-			{"options",	"exemptchanops","",			new ValueContainerChar (exemptchanops),			DT_CHARPTR,  ValidateExemptChanOps},
-			{"options",	"maxtargets",	"20",			new ValueContainerUInt (&this->MaxTargets),		DT_INTEGER,  ValidateMaxTargets},
-			{"options",	"defaultmodes", "nt",			new ValueContainerChar (this->DefaultModes),		DT_CHARPTR,  NoValidation},
-			{"pid",		"file",		"",			new ValueContainerChar (this->PID),			DT_CHARPTR,  NoValidation},
-			{"whowas",	"groupsize",	"10",			new ValueContainerInt  (&this->WhoWasGroupSize),	DT_INTEGER,  NoValidation},
-			{"whowas",	"maxgroups",	"10240",		new ValueContainerInt  (&this->WhoWasMaxGroups),	DT_INTEGER,  NoValidation},
-			{"whowas",	"maxkeep",	"3600",			new ValueContainerChar (maxkeep),			DT_CHARPTR,  ValidateWhoWas},
-			{"die",		"value",	"",			new ValueContainerChar (this->DieValue),		DT_CHARPTR,  NoValidation},
-			{"channels",	"users",	"20",			new ValueContainerUInt (&this->MaxChans),		DT_INTEGER,  NoValidation},
-			{"channels",	"opers",	"60",			new ValueContainerUInt (&this->OperMaxChans),		DT_INTEGER,  NoValidation},
-			{NULL,		NULL,		NULL,			NULL,							DT_NOTHING,  NoValidation}
-		};
-
-		/* These tags can occur multiple times, and therefore they have special code to read them
-		 * which is different to the code for reading the singular tags listed above.
-		 */
-		MultiConfig MultiValues[] = {
-
-			{"connect",
-					{"allow",	"deny",		"password",	"timeout",	"pingfreq",	"flood",
-					"threshold",	"sendq",	"recvq",	"localmax",	"globalmax",	"port",
-					"name",		"parent",	"maxchans",     "limit",
-					NULL},
-					{"",		"",		"",		"",		"120",		"",
-					 "",		"",		"",		"3",		"3",		"0",
-					 "",		"",		"0",	    "0",
-					 NULL},
-					{DT_IPADDRESS|DT_ALLOW_WILD,
-							DT_IPADDRESS|DT_ALLOW_WILD,
-									DT_CHARPTR,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER,
-					DT_INTEGER,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER,
-					DT_NOSPACES,	DT_NOSPACES,	DT_INTEGER,     DT_INTEGER},
-					InitConnect, DoConnect, DoneConnect},
-
-			{"uline",
-					{"server",	"silent",	NULL},
-					{"",		"0",		NULL},
-					{DT_HOSTNAME,	DT_BOOLEAN},
-					InitULine,DoULine,DoneULine},
-
-			{"banlist",
-					{"chan",	"limit",	NULL},
-					{"",		"",		NULL},
-					{DT_CHARPTR,	DT_INTEGER},
-					InitMaxBans, DoMaxBans, DoneMaxBans},
-
-			{"module",
-					{"name",	NULL},
-					{"",		NULL},
-					{DT_CHARPTR},
-					InitModule, DoModule, DoneModule},
-
-			{"badip",
-					{"reason",	"ipmask",	NULL},
-					{"No reason",	"",		NULL},
-					{DT_CHARPTR,	DT_IPADDRESS|DT_ALLOW_WILD},
-					InitXLine, DoZLine, DoneConfItem},
-
-			{"badnick",
-					{"reason",	"nick",		NULL},
-					{"No reason",	"",		NULL},
-					{DT_CHARPTR,	DT_CHARPTR},
-					InitXLine, DoQLine, DoneConfItem},
-	
-			{"badhost",
-					{"reason",	"host",		NULL},
-					{"No reason",	"",		NULL},
-					{DT_CHARPTR,	DT_CHARPTR},
-					InitXLine, DoKLine, DoneConfItem},
-
-			{"exception",
-					{"reason",	"host",		NULL},
-					{"No reason",	"",		NULL},
-					{DT_CHARPTR,	DT_CHARPTR},
-					InitXLine, DoELine, DoneELine},
+	static char debug[MAXBUF];	/* Temporary buffer for debugging value */
+	static char maxkeep[MAXBUF];	/* Temporary buffer for WhoWasMaxKeep value */
+	static char hidemodes[MAXBUF];	/* Modes to not allow listing from users below halfop */
+	static char exemptchanops[MAXBUF];	/* Exempt channel ops from these modes */
+	static char announceinvites[MAXBUF];	/* options:announceinvites setting */
+	errstr.clear();
+
+	include_stack.clear();
+
+	/* These tags MUST occur and must ONLY occur once in the config file */
+	static const char* Once[] = { "server", "admin", "files", "power", "options", NULL };
+
+	/* These tags can occur ONCE or not at all */
+	InitialConfig Values[] = {
+		{"options",	"softlimit",	MAXCLIENTS_S,		new ValueContainerUInt (&this->SoftLimit),		DT_INTEGER,  ValidateSoftLimit},
+		{"options",	"somaxconn",	SOMAXCONN_S,		new ValueContainerInt  (&this->MaxConn),		DT_INTEGER,  ValidateMaxConn},
+		{"options",	"moronbanner",	"Youre banned!",	new ValueContainerChar (this->MoronBanner),		DT_CHARPTR,  NoValidation},
+		{"server",	"name",		"",			new ValueContainerChar (this->ServerName),		DT_HOSTNAME, ValidateServerName},
+		{"server",	"description",	"Configure Me",		new ValueContainerChar (this->ServerDesc),		DT_CHARPTR,  NoValidation},
+		{"server",	"network",	"Network",		new ValueContainerChar (this->Network),			DT_NOSPACES, NoValidation},
+		{"server",	"id",		"",			new ValueContainerChar (this->sid),			DT_CHARPTR,  ValidateSID},
+		{"admin",	"name",		"",			new ValueContainerChar (this->AdminName),		DT_CHARPTR,  NoValidation},
+		{"admin",	"email",	"Mis@configu.red",	new ValueContainerChar (this->AdminEmail),		DT_CHARPTR,  NoValidation},
+		{"admin",	"nick",		"Misconfigured",	new ValueContainerChar (this->AdminNick),		DT_CHARPTR,  NoValidation},
+		{"files",	"motd",		"",			new ValueContainerChar (this->motd),			DT_CHARPTR,  ValidateMotd},
+		{"files",	"rules",	"",			new ValueContainerChar (this->rules),			DT_CHARPTR,  ValidateRules},
+		{"power",	"diepass",	"",			new ValueContainerChar (this->diepass),			DT_CHARPTR,  ValidateNotEmpty},
+		{"power",	"pause",	"",			new ValueContainerInt  (&this->DieDelay),		DT_INTEGER,  NoValidation},
+		{"power",	"hash",		"",			new ValueContainerChar (this->powerhash),		DT_CHARPTR,  NoValidation},
+		{"power",	"restartpass",	"",			new ValueContainerChar (this->restartpass),		DT_CHARPTR,  ValidateNotEmpty},
+		{"options",	"prefixquit",	"",			new ValueContainerChar (this->PrefixQuit),		DT_CHARPTR,  NoValidation},
+		{"options",	"suffixquit",	"",			new ValueContainerChar (this->SuffixQuit),		DT_CHARPTR,  NoValidation},
+		{"options",	"fixedquit",	"",			new ValueContainerChar (this->FixedQuit),		DT_CHARPTR,  NoValidation},
+		{"options",	"prefixpart",	"",			new ValueContainerChar (this->PrefixPart),		DT_CHARPTR,  NoValidation},
+		{"options",	"suffixpart",	"",			new ValueContainerChar (this->SuffixPart),		DT_CHARPTR,  NoValidation},
+		{"options",	"fixedpart",	"",			new ValueContainerChar (this->FixedPart),		DT_CHARPTR,  NoValidation},
+		{"options",	"loglevel",	"default",		new ValueContainerChar (debug),				DT_CHARPTR,  ValidateLogLevel},
+		{"options",	"netbuffersize","10240",		new ValueContainerInt  (&this->NetBufferSize),		DT_INTEGER,  ValidateNetBufferSize},
+		{"options",	"maxwho",	"128",			new ValueContainerInt  (&this->MaxWhoResults),		DT_INTEGER,  ValidateMaxWho},
+		{"options",	"allowhalfop",	"0",			new ValueContainerBool (&this->AllowHalfop),		DT_BOOLEAN,  NoValidation},
+		{"dns",		"server",	"",			new ValueContainerChar (this->DNSServer),		DT_IPADDRESS,DNSServerValidator},
+		{"dns",		"timeout",	"5",			new ValueContainerInt  (&this->dns_timeout),		DT_INTEGER,  NoValidation},
+		{"options",	"moduledir",	MOD_PATH,		new ValueContainerChar (this->ModPath),			DT_CHARPTR,  NoValidation},
+		{"disabled",	"commands",	"",			new ValueContainerChar (this->DisabledCommands),	DT_CHARPTR,  NoValidation},
+		{"options",	"userstats",	"",			new ValueContainerChar (this->UserStats),		DT_CHARPTR,  NoValidation},
+		{"options",	"customversion","",			new ValueContainerChar (this->CustomVersion),		DT_CHARPTR,  NoValidation},
+		{"options",	"hidesplits",	"0",			new ValueContainerBool (&this->HideSplits),		DT_BOOLEAN,  NoValidation},
+		{"options",	"hidebans",	"0",			new ValueContainerBool (&this->HideBans),		DT_BOOLEAN,  NoValidation},
+		{"options",	"hidewhois",	"",			new ValueContainerChar (this->HideWhoisServer),		DT_NOSPACES, NoValidation},
+		{"options",	"hidekills",	"",			new ValueContainerChar (this->HideKillsServer),		DT_NOSPACES,  NoValidation},
+		{"options",	"operspywhois",	"0",			new ValueContainerBool (&this->OperSpyWhois),		DT_BOOLEAN,  NoValidation},
+		{"options",	"nouserdns",	"0",			new ValueContainerBool (&this->NoUserDns),		DT_BOOLEAN,  NoValidation},
+		{"options",	"syntaxhints",	"0",			new ValueContainerBool (&this->SyntaxHints),		DT_BOOLEAN,  NoValidation},
+		{"options",	"cyclehosts",	"0",			new ValueContainerBool (&this->CycleHosts),		DT_BOOLEAN,  NoValidation},
+		{"options",	"ircumsgprefix","0",			new ValueContainerBool (&this->UndernetMsgPrefix),	DT_BOOLEAN,  NoValidation},
+		{"options",	"announceinvites", "1",			new ValueContainerChar (announceinvites),		DT_CHARPTR,  ValidateInvite},
+		{"options",	"hostintopic",	"1",			new ValueContainerBool (&this->FullHostInTopic),	DT_BOOLEAN,  NoValidation},
+		{"options",	"hidemodes",	"",			new ValueContainerChar (hidemodes),			DT_CHARPTR,  ValidateModeLists},
+		{"options",	"exemptchanops","",			new ValueContainerChar (exemptchanops),			DT_CHARPTR,  ValidateExemptChanOps},
+		{"options",	"maxtargets",	"20",			new ValueContainerUInt (&this->MaxTargets),		DT_INTEGER,  ValidateMaxTargets},
+		{"options",	"defaultmodes", "nt",			new ValueContainerChar (this->DefaultModes),		DT_CHARPTR,  NoValidation},
+		{"pid",		"file",		"",			new ValueContainerChar (this->PID),			DT_CHARPTR,  NoValidation},
+		{"whowas",	"groupsize",	"10",			new ValueContainerInt  (&this->WhoWasGroupSize),	DT_INTEGER,  NoValidation},
+		{"whowas",	"maxgroups",	"10240",		new ValueContainerInt  (&this->WhoWasMaxGroups),	DT_INTEGER,  NoValidation},
+		{"whowas",	"maxkeep",	"3600",			new ValueContainerChar (maxkeep),			DT_CHARPTR,  ValidateWhoWas},
+		{"die",		"value",	"",			new ValueContainerChar (this->DieValue),		DT_CHARPTR,  NoValidation},
+		{"channels",	"users",	"20",			new ValueContainerUInt (&this->MaxChans),		DT_INTEGER,  NoValidation},
+		{"channels",	"opers",	"60",			new ValueContainerUInt (&this->OperMaxChans),		DT_INTEGER,  NoValidation},
+		{NULL,		NULL,		NULL,			NULL,							DT_NOTHING,  NoValidation}
+	};
+
+	/* These tags can occur multiple times, and therefore they have special code to read them
+	 * which is different to the code for reading the singular tags listed above.
+	 */
+	MultiConfig MultiValues[] = {
+
+		{"connect",
+				{"allow",	"deny",		"password",	"timeout",	"pingfreq",	"flood",
+				"threshold",	"sendq",	"recvq",	"localmax",	"globalmax",	"port",
+				"name",		"parent",	"maxchans",     "limit",	"hash",
+				NULL},
+				{"",		"",		"",		"",		"120",		"",
+				 "",		"",		"",		"3",		"3",		"0",
+				 "",		"",		"0",	    "0",	"",
+				 NULL},
+				{DT_IPADDRESS|DT_ALLOW_WILD,
+						DT_IPADDRESS|DT_ALLOW_WILD,
+								DT_CHARPTR,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER,
+				DT_INTEGER,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER,
+				DT_NOSPACES,	DT_NOSPACES,	DT_INTEGER,     DT_INTEGER,	DT_CHARPTR},
+				InitConnect, DoConnect, DoneConnect},
+
+		{"uline",
+				{"server",	"silent",	NULL},
+				{"",		"0",		NULL},
+				{DT_HOSTNAME,	DT_BOOLEAN},
+				InitULine,DoULine,DoneULine},
+
+		{"banlist",
+				{"chan",	"limit",	NULL},
+				{"",		"",		NULL},
+				{DT_CHARPTR,	DT_INTEGER},
+				InitMaxBans, DoMaxBans, DoneMaxBans},
+
+		{"module",
+				{"name",	NULL},
+				{"",		NULL},
+				{DT_CHARPTR},
+				InitModule, DoModule, DoneModule},
+
+		{"badip",
+				{"reason",	"ipmask",	NULL},
+				{"No reason",	"",		NULL},
+				{DT_CHARPTR,	DT_IPADDRESS|DT_ALLOW_WILD},
+				InitXLine, DoZLine, DoneConfItem},
+
+		{"badnick",
+				{"reason",	"nick",		NULL},
+				{"No reason",	"",		NULL},
+				{DT_CHARPTR,	DT_CHARPTR},
+				InitXLine, DoQLine, DoneConfItem},
 	
-			{"type",
-					{"name",	"classes",	NULL},
-					{"",		"",		NULL},
-					{DT_NOSPACES,	DT_CHARPTR},
-					InitTypes, DoType, DoneClassesAndTypes},
+		{"badhost",
+				{"reason",	"host",		NULL},
+				{"No reason",	"",		NULL},
+				{DT_CHARPTR,	DT_CHARPTR},
+				InitXLine, DoKLine, DoneConfItem},
+
+		{"exception",
+				{"reason",	"host",		NULL},
+				{"No reason",	"",		NULL},
+				{DT_CHARPTR,	DT_CHARPTR},
+				InitXLine, DoELine, DoneELine},
 	
-			{"class",
-					{"name",	"commands",	NULL},
-					{"",		"",		NULL},
-					{DT_NOSPACES,	DT_CHARPTR},
-					InitClasses, DoClass, DoneClassesAndTypes},
+		{"type",
+				{"name",	"classes",	NULL},
+				{"",		"",		NULL},
+				{DT_NOSPACES,	DT_CHARPTR},
+				InitTypes, DoType, DoneClassesAndTypes},
+
+		{"class",
+				{"name",	"commands",	NULL},
+				{"",		"",		NULL},
+				{DT_NOSPACES,	DT_CHARPTR},
+				InitClasses, DoClass, DoneClassesAndTypes},
 	
-			{NULL,
-					{NULL},
-					{NULL},
-					{0},
-					NULL, NULL, NULL}
-		};
+		{NULL,
+				{NULL},
+				{NULL},
+				{0},
+				NULL, NULL, NULL}
+	};
 
-		include_stack.clear();
+	/* Load and parse the config file, if there are any errors then explode */
 
-		/* Load and parse the config file, if there are any errors then explode */
+	/* Make a copy here so if it fails then we can carry on running with an unaffected config */
+	newconfig.clear();
 
-		/* Make a copy here so if it fails then we can carry on running with an unaffected config */
-		ConfigDataHash newconfig;
+	if (this->LoadConf(newconfig, ServerInstance->ConfigFileName, errstr))
+	{
+		/* If we succeeded, set the ircd config to the new one */
+		ServerInstance->Threads->Mutex(true);
+		this->config_data = newconfig;
+		ServerInstance->Threads->Mutex(false);
+	}
+	else
+	{
+		ReportConfigError(errstr.str(), bail, user);
+		return;
+	}
 
-		if (this->LoadConf(newconfig, ServerInstance->ConfigFileName, errstr, pass))
-		{
-			/* If we succeeded, set the ircd config to the new one */
-			this->config_data = newconfig;
-		}
-		else
-		{
-			ReportConfigError(errstr.str(), bail, user);
-			return;
-		}
+	/* The stuff in here may throw CoreException, be sure we're in a position to catch it. */
+	try
+	{
+		/* Check we dont have more than one of singular tags, or any of them missing
+		 */
+		for (int Index = 0; Once[Index]; Index++)
+			if (!CheckOnce(Once[Index]))
+				return;
 
-		/* The stuff in here may throw CoreException, be sure we're in a position to catch it. */
-		try
+		/* Read the values of all the tags which occur once or not at all, and call their callbacks.
+		 */
+		for (int Index = 0; Values[Index].tag; Index++)
 		{
-			/* Read the values of all the tags which occur once or not at all, and call their callbacks.
-			 */
-			for (int Index = 0; Values[Index].tag; Index++)
-			{
-				char item[MAXBUF];
-				int dt = Values[Index].datatype;
-				bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0);
-				bool allow_wild = ((dt & DT_ALLOW_WILD) > 0);
-				dt &= ~DT_ALLOW_NEWLINE;
-				dt &= ~DT_ALLOW_WILD;
-
-				ConfValue(this->config_data, Values[Index].tag, Values[Index].value, Values[Index].default_value, 0, item, MAXBUF, allow_newlines);
-				ValueItem vi(item);
-
-				if (!Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi))
-					throw CoreException("One or more values in your configuration file failed to validate. Please see your ircd.log for more information.");
+			char item[MAXBUF];
+			int dt = Values[Index].datatype;
+			bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0);
+			bool allow_wild = ((dt & DT_ALLOW_WILD) > 0);
+			dt &= ~DT_ALLOW_NEWLINE;
+			dt &= ~DT_ALLOW_WILD;
+
+			ConfValue(this->config_data, Values[Index].tag, Values[Index].value, Values[Index].default_value, 0, item, MAXBUF, allow_newlines);
+			ValueItem vi(item);
+			
+			if (!Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi))
+				throw CoreException("One or more values in your configuration file failed to validate. Please see your ircd.log for more information.");
 	
-				switch (Values[Index].datatype)
+			ServerInstance->Threads->Mutex(true);
+			switch (Values[Index].datatype)
+			{
+				case DT_NOSPACES:
 				{
-					case DT_NOSPACES:
-					{
-						ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
-						this->ValidateNoSpaces(vi.GetString(), Values[Index].tag, Values[Index].value);
-						vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
-					}
-					break;
-					case DT_HOSTNAME:
-					{
-						ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
-						this->ValidateHostname(vi.GetString(), Values[Index].tag, Values[Index].value);
-						vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
-					}
-					break;
-					case DT_IPADDRESS:
-					{
-						ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
-						this->ValidateIP(vi.GetString(), Values[Index].tag, Values[Index].value, allow_wild);
-						vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
-					}
-					break;
-					case DT_CHANNEL:
-					{
-						ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
-						if (*(vi.GetString()) && !ServerInstance->IsChannel(vi.GetString()))
-							throw CoreException("The value of <"+std::string(Values[Index].tag)+":"+Values[Index].value+"> is not a valid channel name");
-						vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
-					}
-					break;
-					case DT_CHARPTR:
-					{
-							ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
-						/* Make sure we also copy the null terminator */
-						vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
-					}
-					break;
-					case DT_INTEGER:
-					{
-						int val = vi.GetInteger();
-						ValueContainerInt* vci = (ValueContainerInt*)Values[Index].val;
-						vci->Set(&val, sizeof(int));
-					}
-					break;
-					case DT_BOOLEAN:
+					ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
+					this->ValidateNoSpaces(vi.GetString(), Values[Index].tag, Values[Index].value);
+					vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
+				}
+				break;
+				case DT_HOSTNAME:
+				{
+					ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
+					this->ValidateHostname(vi.GetString(), Values[Index].tag, Values[Index].value);
+					vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
+				}
+				break;
+				case DT_IPADDRESS:
+				{
+					ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
+					this->ValidateIP(vi.GetString(), Values[Index].tag, Values[Index].value, allow_wild);
+					vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
+				}
+				break;
+				case DT_CHANNEL:
+				{
+					ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
+					if (*(vi.GetString()) && !ServerInstance->IsChannel(vi.GetString()))
 					{
-						bool val = vi.GetBool();
-						ValueContainerBool* vcb = (ValueContainerBool*)Values[Index].val;
-						vcb->Set(&val, sizeof(bool));
+						ServerInstance->Threads->Mutex(false);
+						throw CoreException("The value of <"+std::string(Values[Index].tag)+":"+Values[Index].value+"> is not a valid channel name");
 					}
-					break;
-					default:
-						/* You don't want to know what happens if someones bad code sends us here. */
-					break;
+					vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
 				}
-	
-				/* We're done with this now */
-				delete Values[Index].val;
+				break;
+				case DT_CHARPTR:
+				{
+					ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
+					/* Make sure we also copy the null terminator */
+					vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
+				}
+				break;
+				case DT_INTEGER:
+				{
+					int val = vi.GetInteger();
+					ValueContainerInt* vci = (ValueContainerInt*)Values[Index].val;
+					vci->Set(&val, sizeof(int));
+				}
+				break;
+				case DT_BOOLEAN:
+				{
+					bool val = vi.GetBool();
+					ValueContainerBool* vcb = (ValueContainerBool*)Values[Index].val;
+					vcb->Set(&val, sizeof(bool));
+				}
+				break;
+				default:
+					/* You don't want to know what happens if someones bad code sends us here. */
+				break;
 			}
+			/* We're done with this now */
+			delete Values[Index].val;
+			ServerInstance->Threads->Mutex(false);
+		}
 
-			/* Read the multiple-tag items (class tags, connect tags, etc)
-			 * and call the callbacks associated with them. We have three
-			 * callbacks for these, a 'start', 'item' and 'end' callback.
-			 */
-			for (int Index = 0; MultiValues[Index].tag; Index++)
+		/* Read the multiple-tag items (class tags, connect tags, etc)
+		 * and call the callbacks associated with them. We have three
+		 * callbacks for these, a 'start', 'item' and 'end' callback.
+		 */
+		for (int Index = 0; MultiValues[Index].tag; Index++)
+		{
+			ServerInstance->Threads->Mutex(true);
+			MultiValues[Index].init_function(this, MultiValues[Index].tag);
+			ServerInstance->Threads->Mutex(false);
+
+			int number_of_tags = ConfValueEnum(this->config_data, MultiValues[Index].tag);
+
+			for (int tagnum = 0; tagnum < number_of_tags; tagnum++)
 			{
-				MultiValues[Index].init_function(this, MultiValues[Index].tag);
-	
-				int number_of_tags = ConfValueEnum(this->config_data, MultiValues[Index].tag);
-	
-				for (int tagnum = 0; tagnum < number_of_tags; tagnum++)
+				ValueList vl;
+				for (int valuenum = 0; MultiValues[Index].items[valuenum]; valuenum++)
 				{
-					ValueList vl;
-					for (int valuenum = 0; MultiValues[Index].items[valuenum]; valuenum++)
+					int dt = MultiValues[Index].datatype[valuenum];
+					bool allow_newlines =  ((dt & DT_ALLOW_NEWLINE) > 0);
+					bool allow_wild = ((dt & DT_ALLOW_WILD) > 0);
+					dt &= ~DT_ALLOW_NEWLINE;
+					dt &= ~DT_ALLOW_WILD;
+
+					ServerInstance->Threads->Mutex(true);
+					/* We catch and rethrow any exception here just so we can free our mutex
+					 */
+					try
 					{
-						int dt = MultiValues[Index].datatype[valuenum];
-						bool allow_newlines =  ((dt & DT_ALLOW_NEWLINE) > 0);
-						bool allow_wild = ((dt & DT_ALLOW_WILD) > 0);
-						dt &= ~DT_ALLOW_NEWLINE;
-						dt &= ~DT_ALLOW_WILD;
-
 						switch (dt)
 						{
 							case DT_NOSPACES:
@@ -1127,49 +1154,24 @@ void ServerConfig::Read(bool bail, User* user)
 							break;
 						}
 					}
-
-					MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype);
+					catch (CoreException &e)
+					{
+						ServerInstance->Threads->Mutex(false);
+						throw e;
+					}
+					ServerInstance->Threads->Mutex(false);
 				}
-
-				MultiValues[Index].finish_function(this, MultiValues[Index].tag);
+				MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype);
 			}
-	
-		}
-
-		catch (CoreException &ce)
-		{
-			ReportConfigError(ce.GetReason(), bail, user);
-			return;
-		}
-
-		/** XXX END PASS **/
-		ServerInstance->Log(DEBUG,"End config pass %d", pass);
-
-		if (pass == 0)
-		{
-			/* FIRST PASS: Set up commands, load modules.
-			 * We cannot gaurantee that all config is correct
-			 * at this point
-			 */
-	
-		        /** Note: This is safe, the method checks for user == NULL */
-		        ServerInstance->Parser->SetupCommandTable(user);
-			ServerInstance->Modules->LoadAll();
+			MultiValues[Index].finish_function(this, MultiValues[Index].tag);
 		}
-		else
-		{
-			/* SECOND PASS: Call modules to read configs, finalize
-			 * stuff. Check that we have at least the required number
-			 * of whichever items. This is no longer done first.
-			 */
-			ConfigReader* n = new ConfigReader(ServerInstance);
-			FOREACH_MOD(I_OnReadConfig,OnReadConfig(this, n));
 
-			for (int Index = 0; Once[Index]; Index++)
-				if (!CheckOnce(Once[Index]))
-					return;
-		}
+	}
 
+	catch (CoreException &ce)
+	{
+		ReportConfigError(ce.GetReason(), bail, user);
+		return;
 	}
 
 	// write once here, to try it out and make sure its ok
@@ -1177,6 +1179,10 @@ void ServerConfig::Read(bool bail, User* user)
 
 	ServerInstance->Log(DEFAULT,"Done reading configuration file.");
 
+	/* Switch over logfiles */
+	ServerInstance->Logs->CloseLogs();
+	ServerInstance->Logs->OpenFileLogs();
+
 	/* If we're rehashing, let's load any new modules, and unload old ones
 	 */
 	if (!bail)
@@ -1187,6 +1193,7 @@ void ServerConfig::Read(bool bail, User* user)
 
 		if (pl.size() && user)
 		{
+			ServerInstance->Threads->Mutex(true);
 			user->WriteServ("NOTICE %s :*** Not all your client ports could be bound.", user->nick);
 			user->WriteServ("NOTICE %s :*** The following port(s) failed to bind:", user->nick);
 			int j = 1;
@@ -1194,60 +1201,72 @@ void ServerConfig::Read(bool bail, User* user)
 			{
 				user->WriteServ("NOTICE %s :*** %d.   IP: %s     Port: %lu", user->nick, j, i->first.empty() ? "<all>" : i->first.c_str(), (unsigned long)i->second);
 			}
+			ServerInstance->Threads->Mutex(false);
 		}
-	}
 
-	if (!removed_modules.empty())
-	{
-		for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
+		ServerInstance->Threads->Mutex(true);
+		if (!removed_modules.empty())
 		{
-			if (ServerInstance->Modules->Unload(removing->c_str()))
+			for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
 			{
-				ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
-				if (user)
-					user->WriteServ("973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
-				rem++;
-			}
-			else
-			{
-				if (user)
-					user->WriteServ("972 %s %s :%s",user->nick, removing->c_str(), ServerInstance->Modules->LastError().c_str());
+				if (ServerInstance->Modules->Unload(removing->c_str()))
+				{
+					ServerInstance->SNO->WriteToSnoMask('A', "*** REHASH UNLOADED MODULE: %s",removing->c_str());
+
+					if (user)
+						user->WriteServ("973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
+
+					rem++;
+				}
+				else
+				{
+					if (user)
+						user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError().c_str());
+				}
 			}
 		}
-	}
 
-	if (!added_modules.empty())
-	{
-		for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
+		if (!added_modules.empty())
 		{
-			if (ServerInstance->Modules->Load(adding->c_str()))
+			for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
 			{
-				ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
-				if (user)
-					user->WriteServ("975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
+				if (ServerInstance->Modules->Load(adding->c_str()))
+				{
+					ServerInstance->SNO->WriteToSnoMask('A', "*** REHASH LOADED MODULE: %s",adding->c_str());
 
-				add++;
-			}
-			else
-			{
-				if (user)
-					user->WriteServ("974 %s %s :%s",user->nick, adding->c_str(), ServerInstance->Modules->LastError().c_str());
+					if (user)
+						user->WriteServ("975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
+
+					add++;
+				}
+				else
+				{
+					if (user)
+						user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError().c_str());
+				}
 			}
 		}
-	}
 
-	ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules in pass 2.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size());
+		ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size());
+
+		ServerInstance->Threads->Mutex(false);
+
+	}
 
 	/** Note: This is safe, the method checks for user == NULL */
-	/*ServerInstance->Parser->SetupCommandTable(user);*/
+	ServerInstance->Threads->Mutex(true);
+	ServerInstance->Parser->SetupCommandTable(user);
+	ServerInstance->Threads->Mutex(false);
 
 	if (user)
 		user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick);
 	else
-		ServerInstance->WriteOpers("*** Successfully rehashed server.");
+		ServerInstance->SNO->WriteToSnoMask('A', "*** Successfully rehashed server.");
+
 }
 
-bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream, int pass)
+
+bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream)
 {
 	std::ifstream conf(filename);
 	std::string line;
@@ -1264,22 +1283,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
 	in_comment = false;
 
 	/* Check if the file open failed first */
-	if (!conf && (pass == 1))
+	if (!conf)
 	{
-		int MOD_RESULT = 0;
-		std::stringstream filedata;
-		/** XXX: THIS SHOULD BE NONBLOCKING WITH A CALLBACK, RETURN A VALUE LIKE
-		 * LOADCONF_TRYAGAIN, LOADCONF_DONE_WITH_ERROR, LOADCONF_DONE_COMPLETE
-		 */
-		FOREACH_RESULT(I_OnDownloadFile, OnDownloadFile(filename, filedata));
-		if (MOD_RESULT == 0)
-		{
-			errorstream << "LoadConf: Couldn't open config file: " << filename << std::endl;
-			return false;
-		}
+		errorstream << "LoadConf: Couldn't open config file: " << filename << std::endl;
+		return false;
 	}
-	else if (!conf && (pass == 0))
-		return true;
 
 	/* Fix the chmod of the file to restrict it to the current user and group */
 	chmod(filename,0600);
@@ -1426,7 +1434,6 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
 		}
 		else if (ch == '>')
 		{
-			if (!in_quote)
 			{
 				if (in_tag)
 				{
@@ -1438,7 +1445,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
 					 * LoadConf() and load the included config into the same ConfigDataHash
 					 */
 
-					if (!this->ParseLine(target, line, linenumber, errorstream, pass))
+					if (!this->ParseLine(target, line, linenumber, errorstream))
 						return false;
 
 					line.clear();
@@ -1462,12 +1469,13 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
 	return true;
 }
 
-bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream, int pass)
+
+bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream)
 {
-	return this->LoadConf(target, filename.c_str(), errorstream, pass);
+	return this->LoadConf(target, filename.c_str(), errorstream);
 }
 
-bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream, int pass)
+bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream)
 {
 	std::string tagname;
 	std::string current_key;
@@ -1556,7 +1564,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &li
 					}
 					else
 					{
-						/* Leaving quotes, we have the value */
+						/* Leaving the quotes, we have the current value */
 						results.push_back(KeyVal(current_key, current_value));
 
 						// std::cout << "<" << tagname << ":" << current_key << "> " << current_value << std::endl;
@@ -1565,8 +1573,8 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &li
 						got_key = false;
 
 						if ((tagname == "include") && (current_key == "file"))
-						{
-							if (!this->DoInclude(target, current_value, errorstream, pass))
+						{	
+							if (!this->DoInclude(target, current_value, errorstream))
 								return false;
 						}
 
@@ -1591,7 +1599,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &li
 	return true;
 }
 
-bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream, int pass)
+bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream)
 {
 	std::string confpath;
 	std::string newfile;
@@ -1603,7 +1611,7 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st
 	std::replace(newfile.begin(),newfile.end(),'\\','/');
 	std::replace(confpath.begin(),confpath.end(),'\\','/');
 
-	if (newfile[0] != '/')
+	if ((newfile[0] != '/') && (newfile.find("://") == std::string::npos))
 	{
 		if((pos = confpath.rfind("/")) != std::string::npos)
 		{
@@ -1617,7 +1625,7 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st
 		}
 	}
 
-	return LoadConf(target, newfile, errorstream, pass);
+	return LoadConf(target, newfile, errorstream);
 }
 
 bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length, bool allow_linefeeds)
@@ -1654,7 +1662,7 @@ bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, con
 			{
  				if ((!allow_linefeeds) && (j->second.find('\n') != std::string::npos))
 				{
-					ServerInstance->Log(DEFAULT, "Value of <" + tag + ":" + var+ "> contains a linefeed, and linefeeds in this value are not permitted -- stripped to spaces.");
+					ServerInstance->Logs->Log("CONFIG",DEFAULT, "Value of <" + tag + ":" + var+ "> contains a linefeed, and linefeeds in this value are not permitted -- stripped to spaces.");
 					for (std::string::iterator n = j->second.begin(); n != j->second.end(); n++)
 						if (*n == '\n')
 							*n = ' ';
@@ -1985,11 +1993,7 @@ InspIRCd* ServerConfig::GetInstance()
 
 std::string ServerConfig::GetSID()
 {
-	std::string OurSID;
-	OurSID += (char)((sid / 100) + 48);
-	OurSID += (char)((sid / 10) % 10 + 48);
-	OurSID += (char)(sid % 10 + 48);
-	return OurSID;
+	return sid;
 }
 
 ValueItem::ValueItem(int value)
@@ -2006,12 +2010,7 @@ ValueItem::ValueItem(bool value)
 	v = n.str();
 }
 
-ValueItem::ValueItem(char* value)
-{
-	v = value;
-}
-
-void ValueItem::Set(char* value)
+ValueItem::ValueItem(const char* value)
 {
 	v = value;
 }
@@ -2180,7 +2179,7 @@ bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &val
 // this should probably be moved to configreader, but atm it relies on CheckELines above.
 bool DoneELine(ServerConfig* conf, const char* tag)
 {
-	for (std::vector<User*>::const_iterator u2 = conf->GetInstance()->local_users.begin(); u2 != conf->GetInstance()->local_users.end(); u2++)
+	for (std::vector<User*>::const_iterator u2 = conf->GetInstance()->Users->local_users.begin(); u2 != conf->GetInstance()->Users->local_users.end(); u2++)
 	{
 		User* u = (User*)(*u2);
 		u->exempt = false;
@@ -2190,3 +2189,9 @@ bool DoneELine(ServerConfig* conf, const char* tag)
 	return true;
 }
 
+void ConfigReaderThread::Run()
+{
+	/* TODO: TheUser may be invalid by the time we get here! Check its validity, or pass a UID would be better */
+	ServerInstance->Config->Read(do_bail, TheUser);
+}
+