summaryrefslogtreecommitdiff
path: root/src/users.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/users.cpp')
-rw-r--r--src/users.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/users.cpp b/src/users.cpp
index 2b6e00e0e..784783086 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -1830,6 +1830,9 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
{
ConnectClass* c = *i;
+ if (c->GetDisabled())
+ continue; // can't possibly match, removed from conf
+
if (explicit_name == c->GetName())
{
ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Explicitly set to %s", explicit_name.c_str());
@@ -1852,6 +1855,13 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "DENY %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
}
+ /* if it's disabled, we can't match this one. */
+ if (c->GetDisabled())
+ {
+ ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Class disabled");
+ continue;
+ }
+
/* check if host matches.. */
if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) &&
!InspIRCd::MatchCIDR(this->host, c->GetHost(), NULL))