X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=9ec8aa367bf7b0c1652542f882a2fcffdf219fd2;hb=ed1dd51ef7fbf396ecfa77350b67ed8a4c0be29c;hp=5ee89af233c62d657e930ef321dc73a7a11cbe42;hpb=ccfcdda27482fe2ac99d0da936ef1a1374223624;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 5ee89af23..9ec8aa367 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDconfigreader */
+/* $Core */
 /* $CopyInstall: conf/inspircd.quotes.example $(CONPATH) */
 /* $CopyInstall: conf/inspircd.rules.example $(CONPATH) */
 /* $CopyInstall: conf/inspircd.motd.example $(CONPATH) */
@@ -44,7 +44,7 @@ ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance)
 	WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0;
 	log_file = NULL;
 	NoUserDns = forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = UndernetMsgPrefix = false;
-	CycleHosts = writelog = AllowHalfop = true;
+	CycleHosts = writelog = AllowHalfop = InvBypassModes = true;
 	dns_timeout = DieDelay = 5;
 	MaxTargets = 20;
 	NetBufferSize = 10240;
@@ -82,7 +82,6 @@ bool ServerConfig::AddIOHook(Module* iomod, BufferedSocket* is)
 	else
 	{
 		throw ModuleException("BufferedSocket derived class already hooked by another module");
-		return false;
 	}
 }
 
@@ -136,15 +135,9 @@ bool ServerConfig::CheckOnce(const char* tag, ConfigDataHash &newconf)
 	int count = ConfValueEnum(newconf, tag);
 
 	if (count > 1)
-	{
 		throw CoreException("You have more than one <"+std::string(tag)+"> tag, this is not permitted.");
-		return false;
-	}
 	if (count < 1)
-	{
 		throw CoreException("You have not defined a <"+std::string(tag)+"> tag, this is required.");
-		return false;
-	}
 	return true;
 }
 
@@ -850,6 +843,7 @@ void ServerConfig::Read(bool bail, User* user)
 		{"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},
 		{"security",	"userstats",	"",			new ValueContainerChar (this->UserStats),		DT_CHARPTR,  NoValidation},
 		{"security",	"customversion","",			new ValueContainerChar (this->CustomVersion),		DT_CHARPTR,  NoValidation},
 		{"security",	"hidesplits",	"0",			new ValueContainerBool (&this->HideSplits),		DT_BOOLEAN,  NoValidation},
@@ -885,6 +879,7 @@ void ServerConfig::Read(bool bail, User* user)
 		{"limits",	"maxkick",	"255",			new ValueContainerST (&this->Limits.MaxKick),		DT_INTEGER,  NoValidation},
 		{"limits",	"maxgecos",	"128",			new ValueContainerST (&this->Limits.MaxGecos),		DT_INTEGER,  NoValidation},
 		{"limits",	"maxaway",	"200",			new ValueContainerST (&this->Limits.MaxAway),		DT_INTEGER,  NoValidation},
+		{"options",	"invitebypassmodes",	"1",			new ValueContainerBool (&this->InvBypassModes),		DT_BOOLEAN,  NoValidation},
 		{NULL,		NULL,		NULL,			NULL,							DT_NOTHING,  NoValidation}
 	};