diff options
| author |  Sadie Powell | 2020-03-18 13:51:23 +0000 |
|---|---|---|
| committer | Sadie Powell | 2020-03-18 13:51:23 +0000 |
| commit | b9acde9aaf0ddae8b821b21821724adcdbea9359 (patch) | |
| tree | 7c76b8988dd9e31596ae2b114b15a762561e063d /src/users.cpp | |
| parent | Remove support for 0/1 in getBool. (diff) | |
| parent | Allow commands to override ERR_{NEEDSMOREPARAMS,NOTREGISTERED}. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/users.cpp')
| -rw-r--r-- | src/users.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/users.cpp b/src/users.cpp index 07c929c9b..c024ef366 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -90,7 +90,7 @@ User::User(const std::string& uid, Server* srv, UserType type) ServerInstance->Logs.Log("USERS", LOG_DEBUG, "New UUID for user: %s", uuid.c_str()); if (srv->IsULine()) - ServerInstance->Users.uline_count++; + ServerInstance->Users.all_ulines.push_back(this); // Do not insert FakeUsers into the uuidlist so FindUUID() won't return them which is the desired behavior if (type != USERTYPE_SERVER) @@ -343,8 +343,8 @@ CullResult User::cull() if (client_sa.family() != AF_UNSPEC) ServerInstance->Users.RemoveCloneCounts(this); - if (server->IsULine() && ServerInstance->Users.uline_count) - ServerInstance->Users.uline_count--; + if (server->IsULine()) + stdalgo::erase(ServerInstance->Users.all_ulines, this); return Extensible::cull(); } @@ -1144,9 +1144,9 @@ void LocalUser::SetClass(const std::string &explicit_name) } } - if (regdone && !c->config->getString("password").empty()) + if (regdone && !c->password.empty()) { - if (!ServerInstance->PassCompare(this, c->config->getString("password"), password, c->config->getString("hash"))) + if (!ServerInstance->PassCompare(this, c->password, password, c->passwordhash)) { ServerInstance->Logs.Log("CONNECTCLASS", LOG_DEBUG, "Bad password, skipping"); continue; @@ -1265,4 +1265,6 @@ void ConnectClass::Update(const ConnectClass* src) limit = src->limit; resolvehostnames = src->resolvehostnames; ports = src->ports; + password = src->password; + passwordhash = src->passwordhash; } |