{
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;
/* 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);
return true;
/* 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);
*/
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;
}
static char announceinvites[MAXBUF]; /* options:announceinvites setting */
static char disabledumodes[MAXBUF]; /* Disabled usermodes */
static char disabledcmodes[MAXBUF]; /* Disabled chanmodes */
- errstr.clear();
+ /* std::ostringstream::clear() does not clear the string itself, only the error flags. */
+ this->errstr = new std::ostringstream(std::stringstream::in | std::stringstream::out);
include_stack.clear();
{"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},
{"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},
/* 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(newconfig, ServerInstance->ConfigFileName, *errstr))
{
- ReportConfigError(errstr.str(), bail, useruid);
+ ReportConfigError(errstr->str(), bail, useruid);
+ delete errstr;
return;
}
+
+ delete errstr;
/* The stuff in here may throw CoreException, be sure we're in a position to catch it. */
try
/* 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);
ValueItem vi(item);
}
- 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();
- }
- else
+ if (!bail)
{
if (!useruid.empty())
{
projects / user / henk / code / inspircd.git / blobdiff