/* $CopyInstall: conf/inspircd.filter.example $(CONPATH) */
/* $CopyInstall: conf/inspircd.conf.example $(CONPATH) */
/* $CopyInstall: conf/modules.conf.example $(CONPATH) */
+/* $CopyInstall: conf/opers.conf.example $(CONPATH) */
+/* $CopyInstall: conf/links.conf.example $(CONPATH) */
#include "inspircd.h"
#include <fstream>
{
conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Reading connect classes...");
- for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end() ; )
+ /*
+ * 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())
{
- ConnectClass* c = *i;
+ ConnectClass *c = *conf->Classes.begin();
- /* only delete a class with refcount 0 */
- 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++;
- }
+ delete c;
+ conf->Classes.erase(conf->Classes.begin());
}
return true;
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.
- * easier said than done, but for now we'll just disallow anything with a duplicate host or name. -- w00t
- */
- for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item)
- {
- ConnectClass* cc = *item;
- if (
- ((*name && (cc->GetName() == name)) || // if the name is the same
- (*allow && (cc->GetHost() == allow)) || // or the allow is the same
- (*deny && (cc->GetHost() == deny))) && // or the deny is the same
- (!port || (port && (cc->GetPort() == port))) // and there is no port, or there is a port and the port is the same
- )
- {
- /* reenable class so users can be shoved into it :P */
- cc->SetDisabled(false);
- conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Not adding class, it already exists!");
- return true;
- }
- }
-
conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Adding a connect class!");
if (*parent)
*/
bool DoneConnect(ServerConfig *conf, const char*)
{
+ /*
+ * Update connect classes on all users.
+ */
+ for (std::vector<User*>::iterator n = conf->GetInstance()->Users->local_users.begin(); n != conf->GetInstance()->Users->local_users.end(); n++)
+ {
+ User *u = *n;
+
+ 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;
}
{"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},
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,
*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.
delete[] n->second.cmodelist;
if (n->second.umodelist)
delete[] n->second.umodelist;
+ if (n->second.privs)
+ delete[] n->second.privs;
}
}
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)
{
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;
}