Add a way to disable using environment variables in included files.

[user/henk/code/inspircd.git] / src / users.cpp

diff --git a/src/users.cpp b/src/users.cpp
index 4edfd574c1949badf7874edf2a919fc32870e88f..0f1ee74660968c2abb73dae51619dc9eb3d34c4b 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -91,7 +91,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)
@@ -354,8 +354,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();
 }
@@ -1155,9 +1155,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;
@@ -1290,4 +1290,6 @@ void ConnectClass::Update(const ConnectClass* src)
        limit = src->limit;
        resolvehostnames = src->resolvehostnames;
        ports = src->ports;
+       password = src->password;
+       passwordhash = src->passwordhash;
 }