diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/configreader.cpp | 7 | ||||
| -rw-r--r-- | src/users.cpp | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp index 5031f6506..c15b5c0e7 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -421,17 +421,20 @@ bool InitConnect(ServerConfig* conf, const char*) } goagain: - /* change this: only delete a class with refcount 0 */ for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end(); i++) { ConnectClass *c = *i; + /* only delete a class with refcount 0 */ if (c->RefCount == 0) { conf->GetInstance()->Log(DEFAULT, "Removing connect class, refcount is 0!"); conf->Classes.erase(i); goto goagain; // XXX fucking hell.. how better to do this } + + /* also mark all existing classes disabled, if they still exist in the conf, they will be reenabled. */ + c->SetDisabled(true); } return true; @@ -467,6 +470,8 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*) ConnectClass* c = *item; if ((*name && (c->GetName() == name)) || (*allow && (c->GetHost() == allow)) || (*deny && (c->GetHost() == deny))) { + /* reenable class so users can be shoved into it :P */ + c->SetDisabled(false); conf->GetInstance()->Log(DEFAULT, "Not adding class, it already exists!"); return true; } diff --git a/src/users.cpp b/src/users.cpp index 08e38f36d..381806e50 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -1727,7 +1727,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name) { ConnectClass* c = *i; - if (explicit_name == c->GetName()) + if (explicit_name == c->GetName() && !c->GetDisabled()) { found = c; } @@ -1743,7 +1743,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name) { if (c->GetPort()) { - if (this->GetPort() == c->GetPort()) + if (this->GetPort() == c->GetPort() && !c->GetDisabled()) { found = c; } @@ -1752,7 +1752,8 @@ ConnectClass* User::SetClass(const std::string &explicit_name) } else { - found = c; + if (!c->GetDisabled()) + found = c; } } } @@ -1764,6 +1765,8 @@ ConnectClass* User::SetClass(const std::string &explicit_name) /* should always be valid, but just in case .. */ if (this->MyClass) { + if (found == this->MyClass) // no point changing this shit :P + return this->MyClass; this->MyClass->RefCount--; ServerInstance->Log(DEBUG, "Untying user from connect class -- refcount: %u", this->MyClass->RefCount); } |