X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=eb14185909b7f047c21428f31ec7cf495c4c9c48;hb=6eeecaada5818d8dc1f3bb98c3e0916d195e3592;hp=aea422a3578c5e94f84c6d51e975d14975f56e57;hpb=3b4c56a69e10223434c6502e60139355b49fbd5e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index aea422a35..eb1418590 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -23,12 +23,14 @@
 /* $CopyInstall: conf/modules.conf.example $(CONPATH) */
 /* $CopyInstall: conf/opers.conf.example $(CONPATH) */
 /* $CopyInstall: conf/links.conf.example $(CONPATH) */
+/* $CopyInstall: .gdbargs $(BASE) */
 
 #include "inspircd.h"
 #include <fstream>
 #include "xline.h"
 #include "exitcodes.h"
 #include "commands/cmd_whowas.h"
+#include "modes/cmode_h.h"
 
 std::vector<std::string> old_module_names, new_module_names, added_modules, removed_modules;
 
@@ -101,9 +103,9 @@ void ServerConfig::Send005(User* user)
 		user->WriteNumeric(RPL_ISUPPORT, "%s %s", user->nick.c_str(), line->c_str());
 }
 
-bool ServerConfig::CheckOnce(const char* tag, ConfigDataHash &newconf)
+bool ServerConfig::CheckOnce(const char* tag)
 {
-	int count = ConfValueEnum(newconf, tag);
+	int count = ConfValueEnum(tag);
 
 	if (count > 1)
 		throw CoreException("You have more than one <"+std::string(tag)+"> tag, this is not permitted.");
@@ -358,6 +360,24 @@ bool ValidateMaxWho(ServerConfig* conf, const char*, const char*, ValueItem &dat
 	return true;
 }
 
+bool ValidateHalfOp(ServerConfig* conf, const char*, const char*, ValueItem &data)
+{
+	ModeHandler* mh = conf->GetInstance()->Modes->FindMode('h', MODETYPE_CHANNEL);
+	if (data.GetBool() && !mh)
+	{
+		conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Enabling halfop mode.");
+		mh = new ModeChannelHalfOp(conf->GetInstance());
+		conf->GetInstance()->Modes->AddMode(mh);
+	}
+	else if (!data.GetBool() && mh)
+	{
+		conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Disabling halfop mode.");
+		conf->GetInstance()->Modes->DelMode(mh);
+		delete mh;
+	}
+	return true;
+}
+
 bool ValidateMotd(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
 	conf->ReadFile(conf->MOTD, data.GetString());
@@ -457,15 +477,33 @@ bool InitConnect(ServerConfig* conf, const char*)
 {
 	conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Reading connect classes... class list is:");
 
-	/*
-	 * Remove all connect classes.. we'll reset the pointers in user classes
-	 * once all new classes have been read from config.
-	 */
-	while (conf->Classes.begin() != conf->Classes.end())
+	for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end() ; )
 	{
-		ConnectClass *c = *(conf->Classes.begin());
-		conf->Classes.erase(conf->Classes.begin());
-		delete c;
+		ConnectClass* c = *i;
+
+		/*
+		 * only delete a class with refcount 0.
+		 * this is needed to avoid trampling on a wild pointer (User::MyClass)!
+		 * it's also the most simple way to do it, given that we're looking at threads..
+		 * -- w00t
+		 */
+		if (c->RefCount == 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
+		}
+		else
+		{
+			/* also mark all existing classes disabled, if they still exist in the conf, they will be reenabled. */
+			c->SetDisabled(true);
+			i++;
+		}
 	}
 
 	return true;
@@ -481,18 +519,16 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 	const char* password = values[2].GetString();
 	int timeout = values[3].GetInteger();
 	int pingfreq = values[4].GetInteger();
-	int flood = values[5].GetInteger();
-	int threshold = values[6].GetInteger();
-	int sendq = values[7].GetInteger();
-	int recvq = values[8].GetInteger();
-	int localmax = values[9].GetInteger();
-	int globalmax = values[10].GetInteger();
-	int port = values[11].GetInteger();
-	const char* name = values[12].GetString();
-	const char* parent = values[13].GetString();
-	int maxchans = values[14].GetInteger();
-	unsigned long limit = values[15].GetInteger();
-	const char* hashtype = values[16].GetString();
+	int sendq = values[5].GetInteger();
+	int recvq = values[6].GetInteger();
+	int localmax = values[7].GetInteger();
+	int globalmax = values[8].GetInteger();
+	int port = values[9].GetInteger();
+	const char* name = values[10].GetString();
+	const char* parent = values[11].GetString();
+	int maxchans = values[12].GetInteger();
+	unsigned long limit = values[13].GetInteger();
+	const char* hashtype = values[14].GetString();
 
 	conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Adding a connect class!");
 
@@ -511,7 +547,7 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 			if (cc->GetName() == parent)
 			{
 				cc = new ConnectClass(name, cc);
-				cc->Update(timeout, flood, *allow ? allow : deny, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit);
+				cc->Update(timeout, *allow ? allow : deny, pingfreq, password, sendq, recvq, localmax, globalmax, maxchans, port, limit);
 				conf->Classes.push_back(cc);
 				break;
 			}
@@ -526,13 +562,13 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 			/* Find existing class by mask, the mask should be unique */
 			for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item)
 			{
-				if ((*item)->GetHost() == allow)
+				if ((*item)->GetHost() == allow && !(*item)->GetDisabled())
 				{
-					(*item)->Update(timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit);
+					(*item)->Update(timeout, allow, pingfreq, password, sendq, recvq, localmax, globalmax, maxchans, port, limit);
 					return true;
 				}
 			}
-			cc = new ConnectClass(name, timeout, flood, allow, pingfreq, password, hashtype, threshold, sendq, recvq, localmax, globalmax, maxchans);
+			cc = new ConnectClass(name, timeout, allow, pingfreq, password, hashtype, sendq, recvq, localmax, globalmax, maxchans);
 			cc->limit = limit;
 			cc->SetPort(port);
 			conf->Classes.push_back(cc);
@@ -542,7 +578,7 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 			/* Find existing class by mask, the mask should be unique */
 			for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item)
 			{
-				if ((*item)->GetHost() == deny)
+				if ((*item)->GetHost() == deny && !(*item)->GetDisabled())
 				{
 					(*item)->Update(name, deny);
 					(*item)->SetPort(port);
@@ -562,29 +598,6 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
  */
 bool DoneConnect(ServerConfig *conf, const char*)
 {
-	/*
-	 * Update connect classes on all users.
-	 */
-	conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Resetting connect classes for users...");
-  	for (std::vector<User*>::iterator n = conf->GetInstance()->Users->local_users.begin(); n != conf->GetInstance()->Users->local_users.end(); n++)
-	{
-		User *u = *n;
-
-		/*
-		 * Make their existing class go away so that SetClass doesn't touch a wild ptr, important!
-		 */
-		u->MyClass = NULL;
-
-		u->SetClass();
-
-		/*
-		 * Check that the user falls into a valid class block.. if they don't,
-		 * they need to be quit, which CheckClass will do. -- w00t
-		 */
-		u->CheckClass();
-	}
-
-
 	conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Done adding connect classes!");
 	return true;
 }
@@ -694,62 +707,24 @@ bool DoneMaxBans(ServerConfig*, const char*)
 	return true;
 }
 
-void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, const std::string &useruid)
+void ServerConfig::ReportConfigError(const std::string &errormessage)
 {
 	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? */
-		printf("There were errors in your configuration:\n%s\n\n",errormessage.c_str());
-		ServerInstance->Exit(EXIT_STATUS_CONFIG);
-	}
-	else
-	{
-		std::string errors = errormessage;
-		std::string::size_type start;
-		unsigned int prefixlen;
-		start = 0;
-		/* ":ServerInstance->Config->ServerName NOTICE user->nick :" */
-		if (!useruid.empty())
-		{
-			User* user = ServerInstance->FindNick(useruid);
-			if (user)
-			{
-				prefixlen = strlen(this->ServerName) + user->nick.length() + 11;
-				user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick.c_str());
-				while (start < errors.length())
-				{
-					user->WriteServ("NOTICE %s :%s",user->nick.c_str(), errors.substr(start, 510 - prefixlen).c_str());
-					start += 510 - prefixlen;
-				}
-			}
-		}
-		else
-		{
-			ServerInstance->SNO->WriteToSnoMask('A', "There were errors in the configuration file:");
-			while (start < errors.length())
-			{
-				ServerInstance->SNO->WriteToSnoMask('A', errors.substr(start, 360));
-				start += 360;
-			}
-		}
-		return;
-	}
+	errstr << errormessage << std::endl;
 }
 
-void ServerConfig::Read(bool bail, const std::string &useruid)
+void ServerConfig::Read()
 {
-	int rem = 0, add = 0;	   /* Number of modules added, number of modules removed */
-
 	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 */
 	static char disabledumodes[MAXBUF]; /* Disabled usermodes */
 	static char disabledcmodes[MAXBUF]; /* Disabled chanmodes */
+	valid = true;
 	/* std::ostringstream::clear() does not clear the string itself, only the error flags. */
-	this->errstr = new std::ostringstream(std::stringstream::in | std::stringstream::out);
-
+	errstr.clear();
+	errstr.str().clear();
 	include_stack.clear();
 
 	/* These tags MUST occur and must ONLY occur once in the config file */
@@ -782,10 +757,10 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 		{"performance",	"softlimit",	"0",			new ValueContainerUInt (&this->SoftLimit),		DT_INTEGER,  ValidateSoftLimit},
 		{"performance",	"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|DT_BOOTONLY, ValidateServerName},
+		{"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|DT_BOOTONLY,  ValidateSID},
+		{"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},
@@ -803,14 +778,14 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 		{"options",	"fixedpart",	"",			new ValueContainerChar (this->FixedPart),		DT_CHARPTR,  NoValidation},
 		{"performance",	"netbuffersize","10240",		new ValueContainerInt  (&this->NetBufferSize),		DT_INTEGER,  ValidateNetBufferSize},
 		{"performance",	"maxwho",	"128",			new ValueContainerInt  (&this->MaxWhoResults),		DT_INTEGER,  ValidateMaxWho},
-		{"options",	"allowhalfop",	"0",			new ValueContainerBool (&this->AllowHalfop),		DT_BOOLEAN,  NoValidation},
+		{"options",	"allowhalfop",	"0",			new ValueContainerBool (&this->AllowHalfop),		DT_BOOLEAN,  ValidateHalfOp},
 		{"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},
 		{"disabled",	"usermodes",	"",			new ValueContainerChar (disabledumodes),		DT_CHARPTR,  ValidateDisabledUModes},
 		{"disabled",	"chanmodes",	"",			new ValueContainerChar (disabledcmodes),		DT_CHARPTR,  ValidateDisabledCModes},
-		{"disabled",	"fakenonexistant",	"0",			new ValueContainerBool (&this->DisabledDontExist),		DT_BOOLEAN,  NoValidation},
+		{"disabled",	"fakenonexistant",	"0",		new ValueContainerBool (&this->DisabledDontExist),		DT_BOOLEAN,  NoValidation},
 
 		{"security",		"runasuser",	"",		new ValueContainerChar(this->SetUser),				DT_CHARPTR, NoValidation},
 		{"security",		"runasgroup",	"",		new ValueContainerChar(this->SetGroup),				DT_CHARPTR, NoValidation},
@@ -821,6 +796,8 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 		{"security",	"hidewhois",	"",			new ValueContainerChar (this->HideWhoisServer),		DT_NOSPACES, NoValidation},
 		{"security",	"hidekills",	"",			new ValueContainerChar (this->HideKillsServer),		DT_NOSPACES,  NoValidation},
 		{"security",	"operspywhois",	"0",			new ValueContainerBool (&this->OperSpyWhois),		DT_BOOLEAN,  NoValidation},
+		{"security",	"restrictbannedusers",	"1",		new ValueContainerBool (&this->RestrictBannedUsers),		DT_BOOLEAN,  NoValidation},
+		{"security",	"genericoper",	"0",			new ValueContainerBool (&this->GenericOper),		DT_BOOLEAN,  NoValidation},
 		{"performance",	"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},
@@ -860,18 +837,16 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 	MultiConfig MultiValues[] = {
 
 		{"connect",
-				{"allow",	"deny",		"password",	"timeout",	"pingfreq",	"flood",
-				"threshold",	"sendq",	"recvq",	"localmax",	"globalmax",	"port",
+				{"allow",	"deny",		"password",	"timeout",	"pingfreq",
+				"sendq",	"recvq",	"localmax",	"globalmax",	"port",
 				"name",		"parent",	"maxchans",     "limit",	"hash",
 				NULL},
-				{"",		"",		"",		"",		"120",		"",
-				 "",		"",		"",		"3",		"3",		"0",
-				 "",		"",		"0",	    "0",	"",
+				{"",		"",				"",			"",			"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_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_NOSPACES,	DT_NOSPACES,	DT_INTEGER,     DT_INTEGER,	DT_CHARPTR},
 				InitConnect, DoConnect, DoneConnect},
 
@@ -904,7 +879,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 				{"No reason",	"",		NULL},
 				{DT_CHARPTR,	DT_CHARPTR},
 				InitXLine, DoQLine, DoneConfItem},
-	
+
 		{"badhost",
 				{"reason",	"host",		NULL},
 				{"No reason",	"",		NULL},
@@ -916,7 +891,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 				{"No reason",	"",		NULL},
 				{DT_CHARPTR,	DT_CHARPTR},
 				InitXLine, DoELine, DoneELine},
-	
+
 		{"type",
 				{"name",	"classes",	NULL},
 				{"",		"",		NULL},
@@ -928,7 +903,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 				{"",		"",				"",				"",			"",			NULL},
 				{DT_NOSPACES,	DT_CHARPTR,	DT_CHARPTR,	DT_CHARPTR, DT_CHARPTR},
 				InitClasses, DoClass, DoneClassesAndTypes},
-	
+
 		{NULL,
 				{NULL},
 				{NULL},
@@ -938,17 +913,11 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 
 	/* 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();
-
-	if (!this->DoInclude(newconfig, ServerInstance->ConfigFileName, *errstr))
+	if (!this->DoInclude(ServerInstance->ConfigFileName))
 	{
-		ReportConfigError(errstr->str(), bail, useruid);
-		delete errstr;
+		valid = false;
 		return;
 	}
-	
-	delete errstr;
 
 	/* The stuff in here may throw CoreException, be sure we're in a position to catch it. */
 	try
@@ -956,14 +925,14 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 		/* 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], newconfig))
+			if (!CheckOnce(Once[Index]))
 				return;
 
 		for (int Index = 0; ChangedConfig[Index].tag; Index++)
 		{
 			char item[MAXBUF];
 			*item = 0;
-			if (ConfValue(newconfig, ChangedConfig[Index].tag, ChangedConfig[Index].value, "", 0, item, MAXBUF, true) || *item)
+			if (ConfValue(ChangedConfig[Index].tag, ChangedConfig[Index].value, "", 0, item, MAXBUF, true) || *item)
 				throw CoreException(std::string("Your configuration contains a deprecated value: <") + ChangedConfig[Index].tag + ":" + ChangedConfig[Index].value + "> - " + ChangedConfig[Index].reason);
 		}
 
@@ -975,25 +944,15 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 			int dt = Values[Index].datatype;
 			bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0);
 			bool allow_wild = ((dt & DT_ALLOW_WILD) > 0);
-			bool bootonly = ((dt & DT_BOOTONLY) > 0);
 			dt &= ~DT_ALLOW_NEWLINE;
 			dt &= ~DT_ALLOW_WILD;
-			dt &= ~DT_BOOTONLY;
 
-			/* Silently ignore boot only values */
-			if (bootonly && !bail)
-			{
-				delete Values[Index].val;
-				continue;
-			}
-
-			ConfValue(newconfig, Values[Index].tag, Values[Index].value, Values[Index].default_value, 0, item, MAXBUF, allow_newlines);
+			ConfValue(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.");
-	
-			ServerInstance->Threads->Lock();
+
 			switch (dt)
 			{
 				case DT_NOSPACES:
@@ -1022,7 +981,6 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 					ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
 					if (*(vi.GetString()) && !ServerInstance->IsChannel(vi.GetString(), MAXBUF))
 					{
-						ServerInstance->Threads->Unlock();
 						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);
@@ -1055,7 +1013,6 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 			}
 			/* We're done with this now */
 			delete Values[Index].val;
-			ServerInstance->Threads->Unlock();
 		}
 
 		/* Read the multiple-tag items (class tags, connect tags, etc)
@@ -1064,11 +1021,9 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 		 */
 		for (int Index = 0; MultiValues[Index].tag; ++Index)
 		{
-			ServerInstance->Threads->Lock();
 			MultiValues[Index].init_function(this, MultiValues[Index].tag);
-			ServerInstance->Threads->Unlock();
 
-			int number_of_tags = ConfValueEnum(newconfig, MultiValues[Index].tag);
+			int number_of_tags = ConfValueEnum(MultiValues[Index].tag);
 
 			for (int tagnum = 0; tagnum < number_of_tags; ++tagnum)
 			{
@@ -1081,7 +1036,6 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 					dt &= ~DT_ALLOW_NEWLINE;
 					dt &= ~DT_ALLOW_WILD;
 
-					ServerInstance->Threads->Lock();
 					/* We catch and rethrow any exception here just so we can free our mutex
 					 */
 					try
@@ -1091,7 +1045,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 							case DT_NOSPACES:
 							{
 								char item[MAXBUF];
-								if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines))
+								if (ConfValue(MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines))
 									vl.push_back(ValueItem(item));
 								else
 									vl.push_back(ValueItem(""));
@@ -1101,7 +1055,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 							case DT_HOSTNAME:
 							{
 								char item[MAXBUF];
-								if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines))
+								if (ConfValue(MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines))
 									vl.push_back(ValueItem(item));
 								else
 									vl.push_back(ValueItem(""));
@@ -1111,7 +1065,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 							case DT_IPADDRESS:
 							{
 								char item[MAXBUF];
-								if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines))
+								if (ConfValue(MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines))
 									vl.push_back(ValueItem(item));
 								else
 									vl.push_back(ValueItem(""));
@@ -1121,7 +1075,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 							case DT_CHANNEL:
 							{
 								char item[MAXBUF];
-								if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines))
+								if (ConfValue(MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines))
 									vl.push_back(ValueItem(item));
 								else
 									vl.push_back(ValueItem(""));
@@ -1132,7 +1086,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 							case DT_CHARPTR:
 							{
 								char item[MAXBUF];
-								if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines))
+								if (ConfValue(MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines))
 									vl.push_back(ValueItem(item));
 								else
 									vl.push_back(ValueItem(""));
@@ -1141,7 +1095,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 							case DT_INTEGER:
 							{
 								int item = 0;
-								if (ConfValueInteger(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item))
+								if (ConfValueInteger(MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item))
 									vl.push_back(ValueItem(item));
 								else
 									vl.push_back(ValueItem(0));
@@ -1149,7 +1103,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 							break;
 							case DT_BOOLEAN:
 							{
-								bool item = ConfValueBool(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum);
+								bool item = ConfValueBool(MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum);
 								vl.push_back(ValueItem(item));
 							}
 							break;
@@ -1160,10 +1114,8 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 					}
 					catch (CoreException &e)
 					{
-						ServerInstance->Threads->Unlock();
 						throw e;
 					}
-					ServerInstance->Threads->Unlock();
 				}
 				MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype);
 			}
@@ -1179,25 +1131,25 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 
 	catch (CoreException &ce)
 	{
-		ReportConfigError(ce.GetReason(), bail, useruid);
+		errstr << ce.GetReason();
+		valid = false;
 		return;
 	}
 
-	ServerInstance->Threads->Lock();
-	for (int i = 0; i < ConfValueEnum(newconfig, "type"); ++i)
+	for (int i = 0; i < ConfValueEnum("type"); ++i)
 	{
 		char item[MAXBUF], classn[MAXBUF], classes[MAXBUF];
 		std::string classname;
-		ConfValue(newconfig, "type", "classes", "", i, classes, MAXBUF, false);
+		ConfValue("type", "classes", "", i, classes, MAXBUF, false);
 		irc::spacesepstream str(classes);
-		ConfValue(newconfig, "type", "name", "", i, item, MAXBUF, false);
+		ConfValue("type", "name", "", i, item, MAXBUF, false);
 		while (str.GetToken(classname))
 		{
 			std::string lost;
 			bool foundclass = false;
-			for (int j = 0; j < ConfValueEnum(newconfig, "class"); ++j)
+			for (int j = 0; j < ConfValueEnum("class"); ++j)
 			{
-				ConfValue(newconfig, "class", "name", "", j, classn, MAXBUF, false);
+				ConfValue("class", "name", "", j, classn, MAXBUF, false);
 				if (!strcmp(classn, classname.c_str()))
 				{
 					foundclass = true;
@@ -1206,160 +1158,119 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 			}
 			if (!foundclass)
 			{
-				if (!useruid.empty())
-				{
-					User* user = ServerInstance->FindNick(useruid);
-					if (user)
-						user->WriteServ("NOTICE %s :*** Warning: Oper type '%s' has a missing class named '%s', this does nothing!", user->nick.c_str(), item, classname.c_str());
-				}
-				else
-				{
-					if (bail)
-						printf("Warning: Oper type '%s' has a missing class named '%s', this does nothing!\n", item, classname.c_str());
-					else
-						ServerInstance->SNO->WriteToSnoMask('A', "Warning: Oper type '%s' has a missing class named '%s', this does nothing!", item, classname.c_str());
-				}
+				char msg[MAXBUF];
+				snprintf(msg, MAXBUF, "	Warning: Oper type '%s' has a missing class named '%s', this does nothing!\n",
+					item, classname.c_str());
+				errstr << msg;
 			}
 		}
 	}
 
-	/* If we succeeded, set the ircd config to the new one */
-	this->config_data = newconfig;
-
-	ServerInstance->Threads->Unlock();
+}
 
+void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
+{
+	int rem = 0, add = 0;
 	// write once here, to try it out and make sure its ok
 	ServerInstance->WritePID(this->PID);
 
-	/* Switch over logfiles */
-	ServerInstance->Logs->CloseLogs();
-	ServerInstance->Logs->OpenFileLogs();
-
-	ServerInstance->Logs->Log("CONFIG", DEFAULT, "Done reading configuration file.");
+	FailedPortList pl;
+	ServerInstance->BindPorts(pl);
 
-	/* If we're rehashing, let's load any new modules, and unload old ones
-	 */
-	if (!bail)
+	if (pl.size())
 	{
-		int found_ports = 0;
-		FailedPortList pl;
-		ServerInstance->BindPorts(false, found_ports, pl);
+		errstr << "Not all your client ports could be bound.\nThe following port(s) failed to bind:\n";
 
-		if (pl.size() && !useruid.empty())
+		int j = 1;
+		for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
 		{
-			ServerInstance->Threads->Lock();
-			User* user = ServerInstance->FindNick(useruid);
-			if (user)
-			{
-				user->WriteServ("NOTICE %s :*** Not all your client ports could be bound.", user->nick.c_str());
-				user->WriteServ("NOTICE %s :*** The following port(s) failed to bind:", user->nick.c_str());
-				int j = 1;
-				for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
-				{
-					user->WriteServ("NOTICE %s :*** %d.   Address: %s        Reason: %s", user->nick.c_str(), j, i->first.empty() ? "<all>" : i->first.c_str(), i->second.c_str());
-				}
-			}
-			ServerInstance->Threads->Unlock();
+			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;
 		}
+	}
+
+	User* user = useruid.empty() ? NULL : ServerInstance->FindNick(useruid);
+
+	while (errstr.good())
+	{
+		std::string line;
+		getline(errstr, line, '\n');
+		if (user)
+			user->WriteServ("NOTICE %s :*** %s", user->nick.c_str(), line.c_str());
+		else
+			ServerInstance->SNO->WriteGlobalSno('a', line);
+	}
+
+	errstr.clear();
+	errstr.str().clear();
+
+	/* No old configuration -> initial boot, nothing more to do here */
+	if (!old)
+		return;
+	
+	/*
+	 * These values can only be set on boot. Keep their old values.
+	 */
+	memcpy(this->ServerName, old->ServerName, sizeof(this->ServerName));
+	memcpy(this->sid, old->sid, sizeof(this->sid));
 
-		ServerInstance->Threads->Lock();
-		if (!removed_modules.empty())
+	if (!removed_modules.empty())
+	{
+		for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
 		{
-			for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
+			if (ServerInstance->Modules->Unload(removing->c_str()))
 			{
-				if (ServerInstance->Modules->Unload(removing->c_str()))
-				{
-					ServerInstance->SNO->WriteToSnoMask('A', "*** REHASH UNLOADED MODULE: %s",removing->c_str());
+				ServerInstance->SNO->WriteToSnoMask('a', "*** REHASH UNLOADED MODULE: %s",removing->c_str());
 
-					if (!useruid.empty())
-					{
-						User* user = ServerInstance->FindNick(useruid);
-						if (user)
-							user->WriteNumeric(RPL_UNLOADEDMODULE, "%s %s :Module %s successfully unloaded.",user->nick.c_str(), removing->c_str(), removing->c_str());
-					}
-					else
-						ServerInstance->SNO->WriteToSnoMask('A', "Module %s successfully unloaded.", removing->c_str());
+				if (user)
+					user->WriteNumeric(RPL_UNLOADEDMODULE, "%s %s :Module %s successfully unloaded.",user->nick.c_str(), removing->c_str(), removing->c_str());
+				else
+					ServerInstance->SNO->WriteToSnoMask('a', "Module %s successfully unloaded.", removing->c_str());
 
-					rem++;
-				}
+				rem++;
+			}
+			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());
 				else
-				{
-					if (!useruid.empty())
-					{
-						User* user = ServerInstance->FindNick(useruid);
-						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());
-					}
-					else
-						 ServerInstance->SNO->WriteToSnoMask('A', "Failed to unload module %s: %s", removing->c_str(), ServerInstance->Modules->LastError().c_str());
-				}
+					 ServerInstance->SNO->WriteToSnoMask('a', "Failed to unload module %s: %s", removing->c_str(), ServerInstance->Modules->LastError().c_str());
 			}
 		}
+	}
 
-		if (!added_modules.empty())
+	if (!added_modules.empty())
+	{
+		for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
 		{
-			for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
+			if (ServerInstance->Modules->Load(adding->c_str()))
 			{
-				if (ServerInstance->Modules->Load(adding->c_str()))
-				{
-					ServerInstance->SNO->WriteToSnoMask('A', "*** REHASH LOADED MODULE: %s",adding->c_str());
-					if (!useruid.empty())
-					{
-						User* user = ServerInstance->FindNick(useruid);
-						if (user)
-							user->WriteNumeric(RPL_LOADEDMODULE, "%s %s :Module %s successfully loaded.",user->nick.c_str(), adding->c_str(), adding->c_str());
-					}
-					else
-						ServerInstance->SNO->WriteToSnoMask('A', "Module %s successfully loaded.", adding->c_str());
+				ServerInstance->SNO->WriteToSnoMask('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());
+				else
+					ServerInstance->SNO->WriteToSnoMask('a', "Module %s successfully loaded.", adding->c_str());
 
-					add++;
-				}
+				add++;
+			}
+			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());
 				else
-				{
-					if (!useruid.empty())
-					{
-						User* user = ServerInstance->FindNick(useruid);
-						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());
-					}
-					else
-						ServerInstance->SNO->WriteToSnoMask('A', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str());
-				}
+					ServerInstance->SNO->WriteToSnoMask('a', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str());
 			}
 		}
-
-		ServerInstance->Logs->Log("CONFIG", 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->Unlock();
-
 	}
 
-	if (bail)
-	{
-		/** Note: This is safe, the method checks for user == NULL */
-		ServerInstance->Threads->Lock();
-		User* user = NULL;
-		if (!useruid.empty())
-			user = ServerInstance->FindNick(useruid);
-		ServerInstance->Parser->SetupCommandTable(user);
-		ServerInstance->Threads->Unlock();
-	}
+	if (user)
+		user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick.c_str());
 	else
-	{
-		if (!useruid.empty())
-		{
-			User* user = ServerInstance->FindNick(useruid);
-			if (user)
-				user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick.c_str());
-		}
-		else
-			ServerInstance->SNO->WriteToSnoMask('A', "*** Successfully rehashed server.");
-	}
-
+		ServerInstance->SNO->WriteToSnoMask('a', "*** Successfully rehashed server.");
 }
 
-
-bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* filename, std::ostringstream &errorstream)
+bool ServerConfig::LoadConf(FILE* &conf, const char* filename)
 {
 	std::string line;
 	char ch;
@@ -1379,7 +1290,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil
 	/* Check if the file open failed first */
 	if (!conf)
 	{
-		errorstream << "LoadConf: Couldn't open config file: " << filename << std::endl;
+		errstr << "LoadConf: Couldn't open config file: " << filename << std::endl;
 		return false;
 	}
 
@@ -1387,7 +1298,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil
 	{
 		if (std::string(filename) == include_stack[t])
 		{
-			errorstream << "File " << filename << " is included recursively (looped inclusion)." << std::endl;
+			errstr << "File " << filename << " is included recursively (looped inclusion)." << std::endl;
 			return false;
 		}
 	}
@@ -1408,7 +1319,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil
 		 */
 		if ((character_count++ < 2) && (ch == '\xFF' || ch == '\xFE'))
 		{
-			errorstream << "File " << filename << " cannot be read, as it is encoded in braindead UTF-16. Save your file as plain ASCII!" << std::endl;
+			errstr << "File " << filename << " cannot be read, as it is encoded in braindead UTF-16. Save your file as plain ASCII!" << std::endl;
 			return false;
 		}
 
@@ -1464,7 +1375,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil
 			}
 			else
 			{
-				errorstream << "End of file after a \\, what did you want to escape?: " << filename << ":" << linenumber << std::endl;
+				errstr << "End of file after a \\, what did you want to escape?: " << filename << ":" << linenumber << std::endl;
 				return false;
 			}
 		}
@@ -1474,7 +1385,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil
 
 		if ((ch != '<') && (!in_tag) && (!in_comment) && (ch > ' ') && (ch != 9))
 		{
-			errorstream << "You have stray characters beyond the tag which starts at " << filename << ":" << last_successful_parse << std::endl;
+			errstr << "You have stray characters beyond the tag which starts at " << filename << ":" << last_successful_parse << std::endl;
 			return false;
 		}
 
@@ -1484,7 +1395,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil
 			{
 				if (!in_quote)
 				{
-					errorstream << "The tag at location " << filename << ":" << last_successful_parse << " was valid, but there is an error in the tag which comes after it. You are possibly missing a \" or >. Please check this." << std::endl;
+					errstr << "The tag at location " << filename << ":" << last_successful_parse << " was valid, but there is an error in the tag which comes after it. You are possibly missing a \" or >. Please check this." << std::endl;
 					return false;
 				}
 			}
@@ -1492,12 +1403,12 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil
 			{
 				if (in_quote)
 				{
-					errorstream << "Parser error: Inside a quote but not within the last valid tag, which was opened at: " << filename << ":" << last_successful_parse << std::endl;
+					errstr << "Parser error: Inside a quote but not within the last valid tag, which was opened at: " << filename << ":" << last_successful_parse << std::endl;
 					return false;
 				}
 				else
 				{
-					// errorstream << "Opening new config tag on line " << linenumber << std::endl;
+					// errstr << "Opening new config tag on line " << linenumber << std::endl;
 					in_tag = true;
 				}
 			}
@@ -1508,12 +1419,12 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil
 			{
 				if (in_quote)
 				{
-					// errorstream << "Closing quote in config tag on line " << linenumber << std::endl;
+					// errstr << "Closing quote in config tag on line " << linenumber << std::endl;
 					in_quote = false;
 				}
 				else
 				{
-					// errorstream << "Opening quote in config tag on line " << linenumber << std::endl;
+					// errstr << "Opening quote in config tag on line " << linenumber << std::endl;
 					in_quote = true;
 				}
 			}
@@ -1521,11 +1432,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil
 			{
 				if (in_quote)
 				{
-					errorstream << "The tag immediately after the one at " << filename << ":" << last_successful_parse << " has a missing closing \" symbol. Please check this." << std::endl;
+					errstr << "The tag immediately after the one at " << filename << ":" << last_successful_parse << " has a missing closing \" symbol. Please check this." << std::endl;
 				}
 				else
 				{
-					errorstream << "You have opened a quote (\") beyond the tag at " << filename << ":" << last_successful_parse << " without opening a new tag. Please check this." << std::endl;
+					errstr << "You have opened a quote (\") beyond the tag at " << filename << ":" << last_successful_parse << " without opening a new tag. Please check this." << std::endl;
 				}
 			}
 		}
@@ -1535,25 +1446,25 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil
 			{
 				if (in_tag)
 				{
-					// errorstream << "Closing config tag on line " << linenumber << std::endl;
+					// errstr << "Closing config tag on line " << linenumber << std::endl;
 					in_tag = false;
-	
+
 					/*
 					 * If this finds an <include> then ParseLine can simply call
 					 * LoadConf() and load the included config into the same ConfigDataHash
 					 */
 					long bl = linenumber;
-					if (!this->ParseLine(target, filename, line, linenumber, errorstream))
+					if (!this->ParseLine(filename, line, linenumber))
 						return false;
 					last_successful_parse = linenumber;
 
 					linenumber = bl;
-	
+
 					line.clear();
 				}
 				else
 				{
-					errorstream << "You forgot to close the tag which comes immediately after the one at " << filename << ":" << last_successful_parse << std::endl;
+					errstr << "You forgot to close the tag which comes immediately after the one at " << filename << ":" << last_successful_parse << std::endl;
 					return false;
 				}
 			}
@@ -1563,7 +1474,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil
 	/* Fix for bug #392 - if we reach the end of a file and we are still in a quote or comment, most likely the user fucked up */
 	if (in_comment || in_quote)
 	{
-		errorstream << "Reached end of file whilst still inside a quoted section or tag. This is most likely an error or there \
+		errstr << "Reached end of file whilst still inside a quoted section or tag. This is most likely an error or there \
 			is a newline missing from the end of the file: " << filename << ":" << linenumber << std::endl;
 	}
 
@@ -1571,12 +1482,12 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil
 }
 
 
-bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const std::string &filename, std::ostringstream &errorstream)
+bool ServerConfig::LoadConf(FILE* &conf, const std::string &filename)
 {
-	return this->LoadConf(target, conf, filename.c_str(), errorstream);
+	return this->LoadConf(conf, filename.c_str());
 }
 
-bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename, std::string &line, long &linenumber, std::ostringstream &errorstream)
+bool ServerConfig::ParseLine(const std::string &filename, std::string &line, long &linenumber)
 {
 	std::string tagname;
 	std::string current_key;
@@ -1603,7 +1514,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename
 						tagname += *c;
 					else
 					{
-						errorstream << "Invalid character in value name of tag: '" << *c << "' in value '" << tagname << "' in filename: " << filename << ":" << linenumber << std::endl;
+						errstr << "Invalid character in value name of tag: '" << *c << "' in value '" << tagname << "' in filename: " << filename << ":" << linenumber << std::endl;
 						return false;
 					}
 				}
@@ -1631,7 +1542,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename
 							current_key += *c;
 						else
 						{
-							errorstream << "Invalid character in key: '" << *c << "' in key '" << current_key << "' in filename: " << filename << ":" << linenumber << std::endl;
+							errstr << "Invalid character in key: '" << *c << "' in key '" << current_key << "' in filename: " << filename << ":" << linenumber << std::endl;
 							return false;
 						}
 					}
@@ -1660,7 +1571,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename
 				}
 				else if ((*c == '\\') && (!in_quote))
 				{
-					errorstream << "You can't have an escape sequence outside of a quoted section: " << filename << ":" << linenumber << std::endl;
+					errstr << "You can't have an escape sequence outside of a quoted section: " << filename << ":" << linenumber << std::endl;
 					return false;
 				}
 				else if ((*c == '\n') && (in_quote))
@@ -1693,14 +1604,14 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename
 						got_key = false;
 
 						if ((tagname == "include") && (current_key == "file"))
-						{	
-							if (!this->DoInclude(target, current_value, errorstream))
+						{
+							if (!this->DoInclude(current_value))
 								return false;
 						}
 						else if ((tagname == "include") && (current_key == "executable"))
 						{
 							/* Pipe an executable and use its stdout as config data */
-							if (!this->DoPipe(target, current_value, errorstream))
+							if (!this->DoPipe(current_value))
 								return false;
 						}
 
@@ -1721,23 +1632,23 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename
 	}
 
 	/* Finished parsing the tag, add it to the config hash */
-	target.insert(std::pair<std::string, KeyValList > (tagname, results));
+	config_data.insert(std::pair<std::string, KeyValList > (tagname, results));
 
 	return true;
 }
 
-bool ServerConfig::DoPipe(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream)
+bool ServerConfig::DoPipe(const std::string &file)
 {
 	FILE* conf = popen(file.c_str(), "r");
 	bool ret = false;
 
 	if (conf)
 	{
-		ret = LoadConf(target, conf, file.c_str(), errorstream);
+		ret = LoadConf(conf, file.c_str());
 		pclose(conf);
 	}
 	else
-		errorstream << "Couldn't execute: " << file << std::endl;
+		errstr << "Couldn't execute: " << file << std::endl;
 
 	return ret;
 }
@@ -1747,7 +1658,7 @@ bool ServerConfig::StartsWithWindowsDriveLetter(const std::string &path)
 	return (path.length() > 2 && isalpha(path[0]) && path[1] == ':');
 }
 
-bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream)
+bool ServerConfig::DoInclude(const std::string &file)
 {
 	std::string confpath;
 	std::string newfile;
@@ -1768,7 +1679,7 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st
 		}
 		else
 		{
-			errorstream << "Couldn't get config path from: " << ServerInstance->ConfigFileName << std::endl;
+			errstr << "Couldn't get config path from: " << ServerInstance->ConfigFileName << std::endl;
 			return false;
 		}
 	}
@@ -1778,39 +1689,39 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st
 
 	if (conf)
 	{
-		ret = LoadConf(target, conf, newfile, errorstream);
+		ret = LoadConf(conf, newfile);
 		fclose(conf);
 	}
 	else
-		errorstream << "Couldn't open config file: " << file << std::endl;
+		errstr << "Couldn't open config file: " << file << std::endl;
 
 	return ret;
 }
 
-bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length, bool allow_linefeeds)
+bool ServerConfig::ConfValue(const char* tag, const char* var, int index, char* result, int length, bool allow_linefeeds)
 {
-	return ConfValue(target, tag, var, "", index, result, length, allow_linefeeds);
+	return ConfValue(tag, var, "", index, result, length, allow_linefeeds);
 }
 
-bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index, char* result, int length, bool allow_linefeeds)
+bool ServerConfig::ConfValue(const char* tag, const char* var, const char* default_value, int index, char* result, int length, bool allow_linefeeds)
 {
 	std::string value;
-	bool r = ConfValue(target, std::string(tag), std::string(var), std::string(default_value), index, value, allow_linefeeds);
+	bool r = ConfValue(std::string(tag), std::string(var), std::string(default_value), index, value, allow_linefeeds);
 	strlcpy(result, value.c_str(), length);
 	return r;
 }
 
-bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, std::string &result, bool allow_linefeeds)
+bool ServerConfig::ConfValue(const std::string &tag, const std::string &var, int index, std::string &result, bool allow_linefeeds)
 {
-	return ConfValue(target, tag, var, "", index, result, allow_linefeeds);
+	return ConfValue(tag, var, "", index, result, allow_linefeeds);
 }
 
-bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index, std::string &result, bool allow_linefeeds)
+bool ServerConfig::ConfValue(const std::string &tag, const std::string &var, const std::string &default_value, int index, std::string &result, bool allow_linefeeds)
 {
 	ConfigDataHash::size_type pos = index;
-	if (pos < target.count(tag))
+	if (pos < config_data.count(tag))
 	{
-		ConfigDataHash::iterator iter = target.find(tag);
+		ConfigDataHash::iterator iter = config_data.find(tag);
 
 		for(int i = 0; i < index; i++)
 			iter++;
@@ -1850,26 +1761,26 @@ bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, con
 	return false;
 }
 
-bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, int index, int &result)
+bool ServerConfig::ConfValueInteger(const char* tag, const char* var, int index, int &result)
 {
-	return ConfValueInteger(target, std::string(tag), std::string(var), "", index, result);
+	return ConfValueInteger(std::string(tag), std::string(var), "", index, result);
 }
 
-bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index, int &result)
+bool ServerConfig::ConfValueInteger(const char* tag, const char* var, const char* default_value, int index, int &result)
 {
-	return ConfValueInteger(target, std::string(tag), std::string(var), std::string(default_value), index, result);
+	return ConfValueInteger(std::string(tag), std::string(var), std::string(default_value), index, result);
 }
 
-bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, int &result)
+bool ServerConfig::ConfValueInteger(const std::string &tag, const std::string &var, int index, int &result)
 {
-	return ConfValueInteger(target, tag, var, "", index, result);
+	return ConfValueInteger(tag, var, "", index, result);
 }
 
-bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index, int &result)
+bool ServerConfig::ConfValueInteger(const std::string &tag, const std::string &var, const std::string &default_value, int index, int &result)
 {
 	std::string value;
 	std::istringstream stream;
-	bool r = ConfValue(target, tag, var, default_value, index, value);
+	bool r = ConfValue(tag, var, default_value, index, value);
 	stream.str(value);
 	if(!(stream >> result))
 		return false;
@@ -1913,52 +1824,52 @@ bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const std::string &t
 }
 
 
-bool ServerConfig::ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, int index)
+bool ServerConfig::ConfValueBool(const char* tag, const char* var, int index)
 {
-	return ConfValueBool(target, std::string(tag), std::string(var), "", index);
+	return ConfValueBool(std::string(tag), std::string(var), "", index);
 }
 
-bool ServerConfig::ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index)
+bool ServerConfig::ConfValueBool(const char* tag, const char* var, const char* default_value, int index)
 {
-	return ConfValueBool(target, std::string(tag), std::string(var), std::string(default_value), index);
+	return ConfValueBool(std::string(tag), std::string(var), std::string(default_value), index);
 }
 
-bool ServerConfig::ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, int index)
+bool ServerConfig::ConfValueBool(const std::string &tag, const std::string &var, int index)
 {
-	return ConfValueBool(target, tag, var, "", index);
+	return ConfValueBool(tag, var, "", index);
 }
 
-bool ServerConfig::ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index)
+bool ServerConfig::ConfValueBool(const std::string &tag, const std::string &var, const std::string &default_value, int index)
 {
 	std::string result;
-	if(!ConfValue(target, tag, var, default_value, index, result))
+	if(!ConfValue(tag, var, default_value, index, result))
 		return false;
 
 	return ((result == "yes") || (result == "true") || (result == "1"));
 }
 
-int ServerConfig::ConfValueEnum(ConfigDataHash &target, const char* tag)
+int ServerConfig::ConfValueEnum(const char* tag)
 {
-	return target.count(tag);
+	return config_data.count(tag);
 }
 
-int ServerConfig::ConfValueEnum(ConfigDataHash &target, const std::string &tag)
+int ServerConfig::ConfValueEnum(const std::string &tag)
 {
-	return target.count(tag);
+	return config_data.count(tag);
 }
 
-int ServerConfig::ConfVarEnum(ConfigDataHash &target, const char* tag, int index)
+int ServerConfig::ConfVarEnum(const char* tag, int index)
 {
-	return ConfVarEnum(target, std::string(tag), index);
+	return ConfVarEnum(std::string(tag), index);
 }
 
-int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, int index)
+int ServerConfig::ConfVarEnum(const std::string &tag, int index)
 {
 	ConfigDataHash::size_type pos = index;
 
-	if (pos < target.count(tag))
+	if (pos < config_data.count(tag))
 	{
-		ConfigDataHash::const_iterator iter = target.find(tag);
+		ConfigDataHash::const_iterator iter = config_data.find(tag);
 
 		for(int i = 0; i < index; i++)
 			iter++;
@@ -2033,7 +1944,7 @@ bool ServerConfig::FileExists(const char* file)
 
 	if ((sb.st_mode & S_IFDIR) > 0)
 		return false;
-	     
+
 	FILE *input;
 	if ((input = fopen (file, "r")) == NULL)
 		return false;
@@ -2052,64 +1963,6 @@ char* ServerConfig::CleanFilename(char* name)
 }
 
 
-bool ServerConfig::DirValid(const char* dirandfile)
-{
-#ifdef WINDOWS
-	return true;
-#else
-
-	char work[1024];
-	char buffer[1024];
-	char otherdir[1024];
-	int p;
-
-	strlcpy(work, dirandfile, 1024);
-	p = strlen(work);
-
-	// we just want the dir
-	while (*work)
-	{
-		if (work[p] == '/')
-		{
-			work[p] = '\0';
-			break;
-		}
-
-		work[p--] = '\0';
-	}
-
-	// Get the current working directory
-	if (getcwd(buffer, 1024 ) == NULL )
-		return false;
-
-	if (chdir(work) == -1)
-		return false;
-
-	if (getcwd(otherdir, 1024 ) == NULL )
-		return false;
-
-	if (chdir(buffer) == -1)
-		return false;
-
-	size_t t = strlen(work);
-
-	if (strlen(otherdir) >= t)
-	{
-		otherdir[t] = '\0';
-		if (!strcmp(otherdir,work))
-		{
-			return true;
-		}
-
-		return false;
-	}
-	else
-	{
-		return false;
-	}
-#endif
-}
-
 std::string ServerConfig::GetFullProgDir()
 {
 	char buffer[PATH_MAX];
@@ -2211,15 +2064,6 @@ bool ValueItem::GetBool()
  */
 bool InitTypes(ServerConfig* conf, const char*)
 {
-	if (conf->opertypes.size())
-	{
-		for (opertype_t::iterator n = conf->opertypes.begin(); n != conf->opertypes.end(); n++)
-		{
-			if (n->second)
-				delete[] n->second;
-		}
-	}
-
 	conf->opertypes.clear();
 	return true;
 }
@@ -2256,7 +2100,7 @@ bool DoType(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 	const char* TypeName = values[0].GetString();
 	const char* Classes = values[1].GetString();
 
-	conf->opertypes[TypeName] = strnewdup(Classes);
+	conf->opertypes[TypeName] = std::string(Classes);
 	return true;
 }
 
@@ -2377,9 +2221,15 @@ bool DoneELine(ServerConfig* conf, const char* tag)
 
 void ConfigReaderThread::Run()
 {
-	ServerInstance->Config->Read(do_bail, TheUserUID);
-	ServerInstance->Threads->Lock();
-	this->SetExitFlag();
-	ServerInstance->Threads->Unlock();
+	Config = new ServerConfig(ServerInstance);
+	Config->Read();
+	done = true;
 }
 
+void ConfigReaderThread::Finish()
+{
+	ServerConfig* old = ServerInstance->Config;
+	ServerInstance->Config = this->Config;
+	Config->Apply(old, TheUserUID);
+	delete old;
+}