X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=5735b395c93217dabd0f46e58adf9eec4dfaeef0;hb=f7730d08b695019c84a0b5961d8fb6bdb67365b9;hp=1185078615224f9a959c60eb76ea6297afabb3e1;hpb=cd095102f471dc86dff08e141208bc9dc38cc78f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 118507861..5735b395c 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -803,6 +803,9 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 		{"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",		"runasuser",	"",		new ValueContainerChar(this->SetUser),				DT_CHARPTR, NoValidation},
+		{"security",		"runasgroup",	"",		new ValueContainerChar(this->SetGroup),				DT_CHARPTR, 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},
@@ -913,9 +916,9 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 				InitTypes, DoType, DoneClassesAndTypes},
 
 		{"class",
-				{"name",	"commands",	"usermodes",	"chanmodes",	NULL},
-				{"",		"",		"",		"",		NULL},
-				{DT_NOSPACES,	DT_CHARPTR,	DT_CHARPTR,	DT_CHARPTR},
+				{"name",	"commands",	"usermodes",	"chanmodes",	"privs",	NULL},
+				{"",		"",				"",				"",			"",			NULL},
+				{DT_NOSPACES,	DT_CHARPTR,	DT_CHARPTR,	DT_CHARPTR, DT_CHARPTR},
 				InitClasses, DoClass, DoneClassesAndTypes},
 	
 		{NULL,
@@ -951,8 +954,6 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 			*item = 0;
 			if (ConfValue(newconfig, 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);
-			else
-				ServerInstance->Logs->Log("CONFIG",DEBUG,"Deprecated item <%s:%s> does not exist, good.", ChangedConfig[Index].tag, ChangedConfig[Index].value);
 		}
 
 		/* Read the values of all the tags which occur once or not at all, and call their callbacks.
@@ -2224,6 +2225,8 @@ bool InitClasses(ServerConfig* conf, const char*)
 				delete[] n->second.cmodelist;
 			if (n->second.umodelist)
 				delete[] n->second.umodelist;
+			if (n->second.privs)
+				delete[] n->second.privs;
 		}
 	}
 
@@ -2252,6 +2255,7 @@ bool DoClass(ServerConfig* conf, const char* tag, char**, ValueList &values, int
 	const char* CommandList = values[1].GetString();
 	const char* UModeList = values[2].GetString();
 	const char* CModeList = values[3].GetString();
+	const char *PrivsList = values[4].GetString();
 
 	for (const char* c = UModeList; *c; ++c)
 	{
@@ -2271,6 +2275,7 @@ bool DoClass(ServerConfig* conf, const char* tag, char**, ValueList &values, int
 	conf->operclass[ClassName].commandlist = strnewdup(CommandList);
 	conf->operclass[ClassName].umodelist = strnewdup(UModeList);
 	conf->operclass[ClassName].cmodelist = strnewdup(CModeList);
+	conf->operclass[ClassName].privs = strnewdup(PrivsList);
 	return true;
 }