From f9911dde529adf3dc03f4f14bbd70756ac2f665c Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 2 Mar 2025 14:51:02 +0000 Subject: Return references instead of pointers from the config system. We used to return NULL from these methods but now we return an empty block so this can never actually be null now. --- modules/ldap_authentication.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'modules/ldap_authentication.cpp') diff --git a/modules/ldap_authentication.cpp b/modules/ldap_authentication.cpp index 5860055e5..f4e3ddd0a 100644 --- a/modules/ldap_authentication.cpp +++ b/modules/ldap_authentication.cpp @@ -215,23 +215,23 @@ public: ModuleManager::SetPriority(this, PRIORITY_FIRST); } - void OnReload(Configuration::Conf *config) override + void OnReload(Configuration::Conf &config) override { - Configuration::Block *conf = Config->GetModule(this); + Configuration::Block &conf = Config->GetModule(this); - basedn = conf->Get("basedn"); - search_filter = conf->Get("search_filter"); - object_class = conf->Get("object_class"); - username_attribute = conf->Get("username_attribute"); - this->password_attribute = conf->Get("password_attribute"); - email_attribute = conf->Get("email_attribute"); - this->disable_register_reason = conf->Get("disable_register_reason"); - this->disable_email_reason = conf->Get("disable_email_reason"); + basedn = conf.Get("basedn"); + search_filter = conf.Get("search_filter"); + object_class = conf.Get("object_class"); + username_attribute = conf.Get("username_attribute"); + this->password_attribute = conf.Get("password_attribute"); + email_attribute = conf.Get("email_attribute"); + this->disable_register_reason = conf.Get("disable_register_reason"); + this->disable_email_reason = conf.Get("disable_email_reason"); if (!email_attribute.empty()) { /* Don't complain to users about how they need to update their email, we will do it for them */ - config->GetModule("nickserv")->Set("forceemail", "no"); + config.GetModule("nickserv").Set("forceemail", "no"); } } -- cgit