aboutsummaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorGravatar Sadie Powell2023-01-10 20:57:56 +0000
committerGravatar Sadie Powell2023-01-10 21:27:18 +0000
commit1b2916c8451506adccf3ab0a56bbf836d9f3cb36 (patch)
tree8675a6bf6fdf97b0f7dba5449fe59f1f669986a2 /src/modules
parentFix calling the base Set/Unset implementation in ListExtItem. (diff)
Avoid copying shared_ptr<ConfigTag> when not necessary.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/extra/m_argon2.cpp2
-rw-r--r--src/modules/extra/m_geo_maxmind.cpp2
-rw-r--r--src/modules/extra/m_ldap.cpp2
-rw-r--r--src/modules/extra/m_log_json.cpp4
-rw-r--r--src/modules/extra/m_log_syslog.cpp2
-rw-r--r--src/modules/extra/m_mysql.cpp2
-rw-r--r--src/modules/extra/m_pgsql.cpp2
-rw-r--r--src/modules/extra/m_sqlite3.cpp2
-rw-r--r--src/modules/extra/m_ssl_gnutls.cpp6
-rw-r--r--src/modules/extra/m_ssl_mbedtls.cpp4
-rw-r--r--src/modules/extra/m_ssl_openssl.cpp8
-rw-r--r--src/modules/m_alias.cpp2
-rw-r--r--src/modules/m_anticaps.cpp2
-rw-r--r--src/modules/m_auditorium.cpp2
-rw-r--r--src/modules/m_bcrypt.cpp2
-rw-r--r--src/modules/m_blockamsg.cpp2
-rw-r--r--src/modules/m_callerid.cpp2
-rw-r--r--src/modules/m_chanfilter.cpp2
-rw-r--r--src/modules/m_chanhistory.cpp2
-rw-r--r--src/modules/m_channames.cpp2
-rw-r--r--src/modules/m_chghost.cpp2
-rw-r--r--src/modules/m_codepage.cpp2
-rw-r--r--src/modules/m_conn_join.cpp2
-rw-r--r--src/modules/m_conn_waitpong.cpp2
-rw-r--r--src/modules/m_connectban.cpp2
-rw-r--r--src/modules/m_connflood.cpp2
-rw-r--r--src/modules/m_customprefix.cpp2
-rw-r--r--src/modules/m_dccallow.cpp2
-rw-r--r--src/modules/m_deaf.cpp2
-rw-r--r--src/modules/m_delaymsg.cpp2
-rw-r--r--src/modules/m_disable.cpp4
-rw-r--r--src/modules/m_dnsbl.cpp2
-rw-r--r--src/modules/m_filter.cpp2
-rw-r--r--src/modules/m_helpop.cpp2
-rw-r--r--src/modules/m_hostchange.cpp8
-rw-r--r--src/modules/m_httpd.cpp2
-rw-r--r--src/modules/m_httpd_stats.cpp2
-rw-r--r--src/modules/m_ident.cpp5
-rw-r--r--src/modules/m_ircv3.cpp2
-rw-r--r--src/modules/m_ircv3_sts.cpp2
-rw-r--r--src/modules/m_joinflood.cpp2
-rw-r--r--src/modules/m_knock.cpp2
-rw-r--r--src/modules/m_ldapauth.cpp2
-rw-r--r--src/modules/m_ldapoper.cpp2
-rw-r--r--src/modules/m_log_sql.cpp2
-rw-r--r--src/modules/m_messageflood.cpp2
-rw-r--r--src/modules/m_monitor.cpp2
-rw-r--r--src/modules/m_muteban.cpp2
-rw-r--r--src/modules/m_nickflood.cpp2
-rw-r--r--src/modules/m_ojoin.cpp2
-rw-r--r--src/modules/m_operjoin.cpp2
-rw-r--r--src/modules/m_opermotd.cpp2
-rw-r--r--src/modules/m_override.cpp2
-rw-r--r--src/modules/m_passforward.cpp2
-rw-r--r--src/modules/m_password_hash.cpp2
-rw-r--r--src/modules/m_pbkdf2.cpp2
-rw-r--r--src/modules/m_permchannels.cpp2
-rw-r--r--src/modules/m_randquote.cpp2
-rw-r--r--src/modules/m_regex_stdlib.cpp2
-rw-r--r--src/modules/m_remove.cpp2
-rw-r--r--src/modules/m_repeat.cpp2
-rw-r--r--src/modules/m_restrictchans.cpp2
-rw-r--r--src/modules/m_rline.cpp2
-rw-r--r--src/modules/m_sasl.cpp2
-rw-r--r--src/modules/m_securelist.cpp2
-rw-r--r--src/modules/m_sethost.cpp2
-rw-r--r--src/modules/m_setname.cpp2
-rw-r--r--src/modules/m_showfile.cpp4
-rw-r--r--src/modules/m_showwhois.cpp2
-rw-r--r--src/modules/m_shun.cpp2
-rw-r--r--src/modules/m_silence.cpp2
-rw-r--r--src/modules/m_spanningtree/link.h4
-rw-r--r--src/modules/m_spanningtree/utils.cpp4
-rw-r--r--src/modules/m_sqlauth.cpp5
-rw-r--r--src/modules/m_sqloper.cpp2
-rw-r--r--src/modules/m_sslinfo.cpp2
-rw-r--r--src/modules/m_starttls.cpp2
-rw-r--r--src/modules/m_svshold.cpp2
-rw-r--r--src/modules/m_timedbans.cpp2
-rw-r--r--src/modules/m_watch.cpp2
-rw-r--r--src/modules/m_websocket.cpp2
-rw-r--r--src/modules/m_xline_db.cpp2
82 files changed, 98 insertions, 100 deletions
diff --git a/src/modules/extra/m_argon2.cpp b/src/modules/extra/m_argon2.cpp
index 305868e0b..29574de4c 100644
--- a/src/modules/extra/m_argon2.cpp
+++ b/src/modules/extra/m_argon2.cpp
@@ -69,7 +69,7 @@ public:
ProviderConfig(const std::string& tagname, ProviderConfig* def)
{
- auto tag = ServerInstance->Config->ConfValue(tagname);
+ const auto& tag = ServerInstance->Config->ConfValue(tagname);
uint32_t def_iterations = def ? def->iterations : 3;
this->iterations = static_cast<uint32_t>(tag->getUInt("iterations", def_iterations, 1, UINT32_MAX));
diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp
index aacdc03e0..03dcc852f 100644
--- a/src/modules/extra/m_geo_maxmind.cpp
+++ b/src/modules/extra/m_geo_maxmind.cpp
@@ -166,7 +166,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("maxmind");
+ const auto& tag = ServerInstance->Config->ConfValue("maxmind");
const std::string file = ServerInstance->Config->Paths.PrependConfig(tag->getString("file", "GeoLite2-Country.mmdb", 1));
// Try to read the new database.
diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp
index a5eb4254f..99ba8dcd7 100644
--- a/src/modules/extra/m_ldap.cpp
+++ b/src/modules/extra/m_ldap.cpp
@@ -349,7 +349,7 @@ public:
query_queue queries, results;
std::mutex process_mutex; /* held when processing requests not in either queue */
- LDAPService(Module* c, std::shared_ptr<ConfigTag> tag)
+ LDAPService(Module* c, const std::shared_ptr<ConfigTag>& tag)
: LDAPProvider(c, "LDAP/" + tag->getString("id"))
, config(tag)
{
diff --git a/src/modules/extra/m_log_json.cpp b/src/modules/extra/m_log_json.cpp
index b6066528a..3408fc82f 100644
--- a/src/modules/extra/m_log_json.cpp
+++ b/src/modules/extra/m_log_json.cpp
@@ -131,7 +131,7 @@ public:
{
}
- Log::MethodPtr Create(std::shared_ptr<ConfigTag> tag) override
+ Log::MethodPtr Create(const std::shared_ptr<ConfigTag>& tag) override
{
const std::string target = tag->getString("target");
if (target.empty())
@@ -163,7 +163,7 @@ public:
{
}
- Log::MethodPtr Create(std::shared_ptr<ConfigTag> tag) override
+ Log::MethodPtr Create(const std::shared_ptr<ConfigTag>& tag) override
{
return std::make_shared<JSONMethod>(name, file, 1, false);
}
diff --git a/src/modules/extra/m_log_syslog.cpp b/src/modules/extra/m_log_syslog.cpp
index aa375761e..5feba1957 100644
--- a/src/modules/extra/m_log_syslog.cpp
+++ b/src/modules/extra/m_log_syslog.cpp
@@ -64,7 +64,7 @@ public:
{
}
- Log::MethodPtr Create(std::shared_ptr<ConfigTag> tag) override
+ Log::MethodPtr Create(const std::shared_ptr<ConfigTag>& tag) override
{
return std::make_shared<SyslogMethod>();
}
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 93d88f6e9..698a0aae8 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -302,7 +302,7 @@ public:
std::mutex lock;
// This constructor creates an SQLConnection object with the given credentials, but does not connect yet.
- SQLConnection(Module* p, std::shared_ptr<ConfigTag> tag)
+ SQLConnection(Module* p, const std::shared_ptr<ConfigTag>& tag)
: SQL::Provider(p, tag->getString("id"))
, config(tag)
{
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index a486657e5..d7cbf1308 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -200,7 +200,7 @@ public:
SQLstatus status = CWRITE; /* PgSQL database connection status */
QueueItem qinprog; /* If there is currently a query in progress */
- SQLConn(Module* Creator, std::shared_ptr<ConfigTag> tag)
+ SQLConn(Module* Creator, const std::shared_ptr<ConfigTag>& tag)
: SQL::Provider(Creator, tag->getString("id"))
, conf(tag)
, qinprog(nullptr, "")
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index dd4e0b3c2..132e0dc64 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -101,7 +101,7 @@ class SQLConn final
std::shared_ptr<ConfigTag> config;
public:
- SQLConn(Module* Parent, std::shared_ptr<ConfigTag> tag)
+ SQLConn(Module* Parent, const std::shared_ptr<ConfigTag>& tag)
: SQL::Provider(Parent, tag->getString("id"))
, config(tag)
{
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 5eb4c7f15..726d384b7 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -486,7 +486,7 @@ namespace GnuTLS
return ret;
}
- static std::string GetPrioStr(const std::string& profilename, std::shared_ptr<ConfigTag> tag)
+ static std::string GetPrioStr(const std::string& profilename, const std::shared_ptr<ConfigTag>& tag)
{
// Use default priority string if this tag does not specify one
std::string priostr = GnuTLS::Priority::GetDefault();
@@ -532,7 +532,7 @@ namespace GnuTLS
unsigned int outrecsize;
bool requestclientcert;
- Config(const std::string& profilename, std::shared_ptr<ConfigTag> tag)
+ Config(const std::string& profilename, const std::shared_ptr<ConfigTag>& tag)
: name(profilename)
, certstr(ReadFile(tag->getString("certfile", "cert.pem", 1)))
, keystr(ReadFile(tag->getString("keyfile", "key.pem", 1)))
@@ -1119,7 +1119,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("gnutls");
+ const auto& tag = ServerInstance->Config->ConfValue("gnutls");
if (status.initial || tag->getBool("onrehash", true))
ReadProfiles();
}
diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp
index c93cadaf0..5055323ec 100644
--- a/src/modules/extra/m_ssl_mbedtls.cpp
+++ b/src/modules/extra/m_ssl_mbedtls.cpp
@@ -442,7 +442,7 @@ namespace mbedTLS
const unsigned int outrecsize;
const bool requestclientcert;
- Config(const std::string& profilename, std::shared_ptr<ConfigTag> tag, CTRDRBG& ctr_drbg)
+ Config(const std::string& profilename, const std::shared_ptr<ConfigTag>& tag, CTRDRBG& ctr_drbg)
: name(profilename)
, ctrdrbg(ctr_drbg)
, certstr(ReadFile(tag->getString("certfile", "cert.pem", 1)))
@@ -954,7 +954,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("mbedtls");
+ const auto& tag = ServerInstance->Config->ConfValue("mbedtls");
if (status.initial || tag->getBool("onrehash", true))
ReadProfiles();
}
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 4a8cd0dbc..86a457673 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -321,7 +321,7 @@ namespace OpenSSL
* @param tag Config tag defining this profile
* @param context Context object to manipulate
*/
- void SetContextOptions(const std::string& ctxname, std::shared_ptr<ConfigTag> tag, Context& context)
+ void SetContextOptions(const std::string& ctxname, const std::shared_ptr<ConfigTag>& tag, Context& context)
{
long setoptions = tag->getInt(ctxname + "setoptions", 0);
long clearoptions = tag->getInt(ctxname + "clearoptions", 0);
@@ -359,7 +359,7 @@ namespace OpenSSL
}
public:
- Profile(const std::string& profilename, std::shared_ptr<ConfigTag> tag)
+ Profile(const std::string& profilename, const std::shared_ptr<ConfigTag>& tag)
: name(profilename)
#ifndef INSPIRCD_OPENSSL_AUTO_DH
, dh(ServerInstance->Config->Paths.PrependConfig(tag->getString("dhfile", "dhparams.pem", 1)))
@@ -900,7 +900,7 @@ class OpenSSLIOHookProvider final
OpenSSL::Profile profile;
public:
- OpenSSLIOHookProvider(Module* mod, const std::string& profilename, std::shared_ptr<ConfigTag> tag)
+ OpenSSLIOHookProvider(Module* mod, const std::string& profilename, const std::shared_ptr<ConfigTag>& tag)
: SSLIOHookProvider(mod, profilename)
, profile(profilename, tag)
{
@@ -1007,7 +1007,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("openssl");
+ const auto& tag = ServerInstance->Config->ConfValue("openssl");
if (status.initial || tag->getBool("onrehash", true))
ReadProfiles();
}
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index ee4c5d6e5..ba088bb10 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -107,7 +107,7 @@ public:
newAliases.emplace(a.AliasedCommand, a);
}
- auto fantasy = ServerInstance->Config->ConfValue("fantasy");
+ const auto& fantasy = ServerInstance->Config->ConfValue("fantasy");
AllowBots = fantasy->getBool("allowbots", false);
fprefix = fantasy->getString("prefix", "!", 1, ServerInstance->Config->Limits.MaxLine);
Aliases.swap(newAliases);
diff --git a/src/modules/m_anticaps.cpp b/src/modules/m_anticaps.cpp
index 40713db59..d4dce8e16 100644
--- a/src/modules/m_anticaps.cpp
+++ b/src/modules/m_anticaps.cpp
@@ -193,7 +193,7 @@ public:
void ReadConfig(ConfigStatus&) override
{
- auto tag = ServerInstance->Config->ConfValue("anticaps");
+ const auto& tag = ServerInstance->Config->ConfValue("anticaps");
uppercase.reset();
for (const auto& chr : tag->getString("uppercase", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1))
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 42bfa1398..35ce62b1e 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -91,7 +91,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("auditorium");
+ const auto& tag = ServerInstance->Config->ConfValue("auditorium");
OpsVisible = tag->getBool("opvisible");
OpsCanSee = tag->getBool("opcansee");
OperCanSee = tag->getBool("opercansee", true);
diff --git a/src/modules/m_bcrypt.cpp b/src/modules/m_bcrypt.cpp
index 62e50db07..cac81cfa1 100644
--- a/src/modules/m_bcrypt.cpp
+++ b/src/modules/m_bcrypt.cpp
@@ -86,7 +86,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto conf = ServerInstance->Config->ConfValue("bcrypt");
+ const auto& conf = ServerInstance->Config->ConfValue("bcrypt");
bcrypt.rounds = conf->getUInt("rounds", 10, 1);
}
};
diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index d850b01eb..3a69a4724 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -66,7 +66,7 @@ public:
}
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("blockamsg");
+ const auto& tag = ServerInstance->Config->ConfValue("blockamsg");
action = tag->getEnum("action", IBLOCK_KILLOPERS, {
{ "kill", IBLOCK_KILL },
{ "killopers", IBLOCK_KILLOPERS },
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 4e749a655..8ee4d8d2f 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -458,7 +458,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("callerid");
+ const auto& tag = ServerInstance->Config->ConfValue("callerid");
cmd.maxaccepts = tag->getUInt("maxaccepts", 30);
tracknick = tag->getBool("tracknick");
notify_cooldown = tag->getDuration("cooldown", 60);
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index fc5f43327..759bc70de 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -105,7 +105,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("chanfilter");
+ const auto& tag = ServerInstance->Config->ConfValue("chanfilter");
hidemask = tag->getBool("hidemask");
cf.maxlen = tag->getUInt("maxlen", 35, 10, ModeParser::MODE_PARAM_MAX);
notifyuser = tag->getBool("notifyuser", true);
diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index 59b62d0c6..9907a555b 100644
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -208,7 +208,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("chanhistory");
+ const auto& tag = ServerInstance->Config->ConfValue("chanhistory");
historymode.maxlines = tag->getUInt("maxlines", 50, 1);
prefixmsg = tag->getBool("prefixmsg", true);
dobots = tag->getBool("bots", true);
diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index 3de247bfa..dacde702e 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -99,7 +99,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("channames");
+ const auto& tag = ServerInstance->Config->ConfValue("channames");
std::string denyToken = tag->getString("denyrange");
std::string allowToken = tag->getString("allowrange");
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index e6885734c..fb4d6ade0 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -98,7 +98,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("hostname");
+ const auto& tag = ServerInstance->Config->ConfValue("hostname");
const std::string hmap = tag->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789", 1);
CharState newhostmap;
diff --git a/src/modules/m_codepage.cpp b/src/modules/m_codepage.cpp
index a37d0b225..586bcc2fb 100644
--- a/src/modules/m_codepage.cpp
+++ b/src/modules/m_codepage.cpp
@@ -255,7 +255,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto codepagetag = ServerInstance->Config->ConfValue("codepage");
+ const auto& codepagetag = ServerInstance->Config->ConfValue("codepage");
const std::string name = codepagetag->getString("name");
if (name.empty())
diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index e6c9c5414..4afff231d 100644
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -84,7 +84,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("autojoin");
+ const auto& tag = ServerInstance->Config->ConfValue("autojoin");
defchans = tag->getString("channel");
defdelay = static_cast<unsigned int>(tag->getDuration("delay", 0, 0, 60*15));
}
diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index 82b6fa24c..bd832a3e4 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -44,7 +44,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("waitpong");
+ const auto& tag = ServerInstance->Config->ConfValue("waitpong");
sendsnotice = tag->getBool("sendsnotice", false);
killonbadreply = tag->getBool("killonbadreply", true);
}
diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index c17506148..bde29a9ba 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -97,7 +97,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("connectban");
+ const auto& tag = ServerInstance->Config->ConfValue("connectban");
ipv4_cidr = static_cast<unsigned int>(tag->getUInt("ipv4cidr", ServerInstance->Config->c_ipv4_range, 1, 32));
ipv6_cidr = static_cast<unsigned int>(tag->getUInt("ipv6cidr", ServerInstance->Config->c_ipv6_range, 1, 128));
diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index da61224f1..09e9df0fc 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -57,7 +57,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
/* read configuration variables */
- auto tag = ServerInstance->Config->ConfValue("connflood");
+ const auto& tag = ServerInstance->Config->ConfValue("connflood");
/* throttle configuration */
seconds = tag->getDuration("period", 30);
maxconns = tag->getUInt("maxconns", 3);
diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp
index 98836f72d..45a518245 100644
--- a/src/modules/m_customprefix.cpp
+++ b/src/modules/m_customprefix.cpp
@@ -28,7 +28,7 @@ class CustomPrefixMode final
public:
std::shared_ptr<ConfigTag> tag;
- CustomPrefixMode(Module* parent, const std::string& Name, char Letter, char Prefix, std::shared_ptr<ConfigTag> Tag)
+ CustomPrefixMode(Module* parent, const std::string& Name, char Letter, char Prefix, const std::shared_ptr<ConfigTag>& Tag)
: PrefixMode(parent, Name, Letter, 0, Prefix)
, tag(Tag)
{
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 62652f583..a50ab5722 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -608,7 +608,7 @@ public:
}
bfl.swap(newbfl);
- auto tag = ServerInstance->Config->ConfValue("dccallow");
+ const auto& tag = ServerInstance->Config->ConfValue("dccallow");
cmd.ext.maxentries = tag->getUInt("maxentries", 20, 1);
cmd.defaultlength = tag->getDuration("length", 0);
blockchat = tag->getBool("blockchat");
diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 10929549f..d8ee9bfcf 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -135,7 +135,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("deaf");
+ const auto& tag = ServerInstance->Config->ConfValue("deaf");
deaf_bypasschars = tag->getString("bypasschars");
deaf_bypasschars_service = tag->getString("servicebypasschars", tag->getString("bypasscharsuline"));
privdeafservice = tag->getBool("privdeafservice", tag->getBool("privdeafuline", true));
diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index fec5c982b..4d0ef99e7 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -157,7 +157,7 @@ ModResult ModuleDelayMsg::HandleMessage(User* user, const MessageTarget& target,
void ModuleDelayMsg::ReadConfig(ConfigStatus& status)
{
- auto tag = ServerInstance->Config->ConfValue("delaymsg");
+ const auto& tag = ServerInstance->Config->ConfValue("delaymsg");
allownotice = tag->getBool("allownotice", true);
}
diff --git a/src/modules/m_disable.cpp b/src/modules/m_disable.cpp
index e9610209f..9f0c0dfa2 100644
--- a/src/modules/m_disable.cpp
+++ b/src/modules/m_disable.cpp
@@ -42,7 +42,7 @@ private:
bool notifyopers;
ModeParser::ModeStatus usermodes;
- void ReadModes(std::shared_ptr<ConfigTag> tag, const std::string& field, ModeType type, ModeParser::ModeStatus& status)
+ void ReadModes(const std::shared_ptr<ConfigTag>& tag, const std::string& field, ModeType type, ModeParser::ModeStatus& status)
{
for (const auto& chr : tag->getString(field))
{
@@ -83,7 +83,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("disabled");
+ const auto& tag = ServerInstance->Config->ConfValue("disabled");
// Parse the disabled commands.
CommandList newcommands;
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index e0d2d276d..600d21572 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -110,7 +110,7 @@ public:
// If action is set to gline, kline, or zline then the duration for an X-line to last for.
unsigned long xlineduration;
- DNSBLEntry(const Module* mod, std::shared_ptr<ConfigTag> tag)
+ DNSBLEntry(const Module* mod, const std::shared_ptr<ConfigTag>& tag)
{
name = tag->getString("name");
if (name.empty())
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 84e85e39a..a48db0fa5 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -640,7 +640,7 @@ void ModuleFilter::ReadConfig(ConfigStatus& status)
}
}
- auto tag = ServerInstance->Config->ConfValue("filteropts");
+ const auto& tag = ServerInstance->Config->ConfValue("filteropts");
std::string newrxengine = tag->getString("engine");
notifyuser = tag->getBool("notifyuser", true);
warnonselfmsg = tag->getBool("warnonselfmsg");
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 6a463a57c..861347fa3 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -169,7 +169,7 @@ public:
newhelp.emplace("index", HelpTopic(indexmsg, "List of help topics"));
cmd.help.swap(newhelp);
- auto tag = ServerInstance->Config->ConfValue("helpmsg");
+ const auto& tag = ServerInstance->Config->ConfValue("helpmsg");
cmd.nohelp = tag->getString("nohelp", "There is no help for the topic you searched for. Please try again.", 1);
}
diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index a24f94d9b..4f656f04a 100644
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -51,7 +51,7 @@ private:
std::string prefix;
std::string suffix;
- void ReadConfig(std::shared_ptr<ConfigTag> tag)
+ void ReadConfig(const std::shared_ptr<ConfigTag>& tag)
{
// Parse <hostchange:class>.
klass = tag->getString("class");
@@ -70,7 +70,7 @@ private:
}
public:
- HostRule(std::shared_ptr<ConfigTag> tag, const std::string& Mask, const std::string& Host)
+ HostRule(const std::shared_ptr<ConfigTag>& tag, const std::string& Mask, const std::string& Host)
: action(HCA_SET)
, host(Host)
, mask(Mask)
@@ -78,7 +78,7 @@ public:
ReadConfig(tag);
}
- HostRule(std::shared_ptr<ConfigTag> tag, HostChangeAction Action, const std::string& Mask, const std::string& Prefix, const std::string& Suffix)
+ HostRule(const std::shared_ptr<ConfigTag>& tag, HostChangeAction Action, const std::string& Mask, const std::string& Prefix, const std::string& Suffix)
: action(Action)
, mask(Mask)
, prefix(Prefix)
@@ -192,7 +192,7 @@ public:
}
}
- auto tag = ServerInstance->Config->ConfValue("hostname");
+ const auto& tag = ServerInstance->Config->ConfValue("hostname");
const std::string hmap = tag->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789", 1);
CharState newhostmap;
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 14e891b37..29c6ff41e 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -431,7 +431,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("httpd");
+ const auto& tag = ServerInstance->Config->ConfValue("httpd");
timeoutsec = tag->getDuration("timeout", 10, 1);
}
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index d1026f8f7..1cf537510 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -463,7 +463,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto conf = ServerInstance->Config->ConfValue("httpstats");
+ const auto& conf = ServerInstance->Config->ConfValue("httpstats");
// Parameterized queries may cause a performance issue
// Due to the sheer volume of data
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index d6c96e3e6..178c611b5 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -308,7 +308,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("ident");
+ const auto& tag = ServerInstance->Config->ConfValue("ident");
timeout = tag->getDuration("timeout", 5, 1, 60);
prefixunqueried = tag->getBool("prefixunqueried");
}
@@ -331,8 +331,7 @@ public:
if (user->IsFullyConnected() || user->quitting)
return;
- std::shared_ptr<ConfigTag> tag = user->GetClass()->config;
- if (!tag->getBool("useident", true))
+ if (!user->GetClass()->config->getBool("useident", true))
{
state.Set(user, IDENT_SKIPPED);
return;
diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp
index 88b1f5305..e5c7908fe 100644
--- a/src/modules/m_ircv3.cpp
+++ b/src/modules/m_ircv3.cpp
@@ -142,7 +142,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto conf = ServerInstance->Config->ConfValue("ircv3");
+ const auto& conf = ServerInstance->Config->ConfValue("ircv3");
cap_accountnotify.SetActive(conf->getBool("accountnotify", true));
joinhook.awaycap.SetActive(conf->getBool("awaynotify", true));
joinhook.extendedjoincap.SetActive(conf->getBool("extendedjoin", true));
diff --git a/src/modules/m_ircv3_sts.cpp b/src/modules/m_ircv3_sts.cpp
index 4dfcf6e0e..ad4d17804 100644
--- a/src/modules/m_ircv3_sts.cpp
+++ b/src/modules/m_ircv3_sts.cpp
@@ -173,7 +173,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
// TODO: Multiple SNI profiles
- auto tag = ServerInstance->Config->ConfValue("sts");
+ const auto& tag = ServerInstance->Config->ConfValue("sts");
if (tag == ServerInstance->Config->EmptyTag)
throw ModuleException(this, "You must define a STS policy!");
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index a5ee1247f..d31053421 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -150,7 +150,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("joinflood");
+ const auto& tag = ServerInstance->Config->ConfValue("joinflood");
duration = static_cast<unsigned int>(tag->getDuration("duration", 60, 10, 600));
bootwait = tag->getDuration("bootwait", 30);
splitwait = tag->getDuration("splitwait", 30);
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 15e6c8df7..09ce41824 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -171,7 +171,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("knock");
+ const auto& tag = ServerInstance->Config->ConfValue("knock");
cmd.notify = tag->getEnum("notify", KN_SEND_NOTICE, {
{ "both", KN_SEND_BOTH },
{ "notice", KN_SEND_NOTICE },
diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp
index 6113d5c55..263edc2bf 100644
--- a/src/modules/m_ldapauth.cpp
+++ b/src/modules/m_ldapauth.cpp
@@ -332,7 +332,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("ldapauth");
+ const auto& tag = ServerInstance->Config->ConfValue("ldapauth");
whitelistedcidrs.clear();
requiredattributes.clear();
diff --git a/src/modules/m_ldapoper.cpp b/src/modules/m_ldapoper.cpp
index 420017ebf..ce2549387 100644
--- a/src/modules/m_ldapoper.cpp
+++ b/src/modules/m_ldapoper.cpp
@@ -207,7 +207,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("ldapoper");
+ const auto& tag = ServerInstance->Config->ConfValue("ldapoper");
LDAP.SetProvider("LDAP/" + tag->getString("dbid"));
base = tag->getString("baserdn");
diff --git a/src/modules/m_log_sql.cpp b/src/modules/m_log_sql.cpp
index a1bbd8472..9870d18de 100644
--- a/src/modules/m_log_sql.cpp
+++ b/src/modules/m_log_sql.cpp
@@ -93,7 +93,7 @@ public:
{
}
- Log::MethodPtr Create(std::shared_ptr<ConfigTag> tag) override
+ Log::MethodPtr Create(const std::shared_ptr<ConfigTag>& tag) override
{
dynamic_reference<SQL::Provider> sql(creator, "SQL");
const std::string dbid = tag->getString("dbid");
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 1de2aa051..02a81121f 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -136,7 +136,7 @@ public:
void ReadConfig(ConfigStatus&) override
{
- auto tag = ServerInstance->Config->ConfValue("messageflood");
+ const auto& tag = ServerInstance->Config->ConfValue("messageflood");
notice = tag->getFloat("notice", 1.0);
privmsg = tag->getFloat("privmsg", 1.0);
tagmsg = tag->getFloat("tagmsg", 0.2);
diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp
index 924f88229..d9baff359 100644
--- a/src/modules/m_monitor.cpp
+++ b/src/modules/m_monitor.cpp
@@ -392,7 +392,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("monitor");
+ const auto& tag = ServerInstance->Config->ConfValue("monitor");
cmd.maxmonitor = tag->getUInt("maxentries", 30, 1);
}
diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp
index f3fd5d997..69daaa046 100644
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -44,7 +44,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("muteban");
+ const auto& tag = ServerInstance->Config->ConfValue("muteban");
notifyuser = tag->getBool("notifyuser", true);
}
diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index 449dc71d4..37e4a56c0 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -141,7 +141,7 @@ public:
void ReadConfig(ConfigStatus&) override
{
- auto tag = ServerInstance->Config->ConfValue("nickflood");
+ const auto& tag = ServerInstance->Config->ConfValue("nickflood");
duration = static_cast<unsigned int>(tag->getDuration("duration", 60, 10, 600));
}
diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index ee8e39cb3..57ec803a2 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -136,7 +136,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto Conf = ServerInstance->Config->ConfValue("ojoin");
+ const auto& Conf = ServerInstance->Config->ConfValue("ojoin");
mycommand.notice = Conf->getBool("notice", true);
mycommand.op = Conf->getBool("op", true);
}
diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index c7faf7b54..7f0a00cd1 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -41,7 +41,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("operjoin");
+ const auto& tag = ServerInstance->Config->ConfValue("operjoin");
override = tag->getBool("override", false);
irc::commasepstream ss(tag->getString("channel"));
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 7aeabb2f1..cdc9e3ec4 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -145,7 +145,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
// Compatibility with the v3 config.
- auto tag = ServerInstance->Config->ConfValue("opermotd");
+ const auto& tag = ServerInstance->Config->ConfValue("opermotd");
cmd.file = tag->getString("file", "opermotd", 1);
onoper = tag->getBool("onoper", true);
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index fb2272ec3..6f4e75605 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -145,7 +145,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
// re-read our config options
- auto tag = ServerInstance->Config->ConfValue("override");
+ const auto& tag = ServerInstance->Config->ConfValue("override");
NoisyOverride = tag->getBool("noisy");
RequireKey = tag->getBool("requirekey");
ou.timeout = tag->getDuration("timeout", 0);
diff --git a/src/modules/m_passforward.cpp b/src/modules/m_passforward.cpp
index 8721df61f..68ddd0784 100644
--- a/src/modules/m_passforward.cpp
+++ b/src/modules/m_passforward.cpp
@@ -42,7 +42,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("passforward");
+ const auto& tag = ServerInstance->Config->ConfValue("passforward");
nickrequired = tag->getString("nick", "NickServ");
forwardmsg = tag->getString("forwardmsg", "NOTICE %nick% :*** Forwarding password to %nickrequired%");
forwardcmd = tag->getString("cmd", "SQUERY %nickrequired% :IDENTIFY %nick% %pass%", 1);
diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index f20176a8b..deaf7c8ef 100644
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -100,7 +100,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("mkpasswd");
+ const auto& tag = ServerInstance->Config->ConfValue("mkpasswd");
cmd.access_needed = tag->getBool("operonly") ? CmdAccess::OPERATOR : CmdAccess::NORMAL;
}
diff --git a/src/modules/m_pbkdf2.cpp b/src/modules/m_pbkdf2.cpp
index f845dacd5..0f454cdd0 100644
--- a/src/modules/m_pbkdf2.cpp
+++ b/src/modules/m_pbkdf2.cpp
@@ -183,7 +183,7 @@ class ModulePBKDF2 final
void GetConfig()
{
// First set the common values
- auto tag = ServerInstance->Config->ConfValue("pbkdf2");
+ const auto& tag = ServerInstance->Config->ConfValue("pbkdf2");
ProviderConfig newglobal;
newglobal.iterations = tag->getUInt("iterations", 12288, 1);
newglobal.dkey_length = tag->getUInt("length", 32, 1, 1024);
diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 0d378e69f..d11e0a6e3 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -189,7 +189,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("permchanneldb");
+ const auto& tag = ServerInstance->Config->ConfValue("permchanneldb");
permchannelsconf = tag->getString("filename");
save_listmodes = tag->getBool("listmodes", true);
p.SetOperOnly(tag->getBool("operonly", true));
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index b8c5abb14..d8a613610 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -39,7 +39,7 @@ public:
void init() override
{
- auto conf = ServerInstance->Config->ConfValue("randquote");
+ const auto& conf = ServerInstance->Config->ConfValue("randquote");
prefix = conf->getString("prefix");
suffix = conf->getString("suffix");
FileReader reader(conf->getString("file", "quotes", 1));
diff --git a/src/modules/m_regex_stdlib.cpp b/src/modules/m_regex_stdlib.cpp
index 191625221..f9d6361ea 100644
--- a/src/modules/m_regex_stdlib.cpp
+++ b/src/modules/m_regex_stdlib.cpp
@@ -104,7 +104,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("stdregex");
+ const auto& tag = ServerInstance->Config->ConfValue("stdregex");
regex.regextype = tag->getEnum("type", std::regex::ECMAScript,
{
{ "awk", std::regex::awk },
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 677d5d47e..2e5151848 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -173,7 +173,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("remove");
+ const auto& tag = ServerInstance->Config->ConfValue("remove");
cmd.supportnokicks = tag->getBool("supportnokicks");
cmd.protectedrank = tag->getUInt("protectedrank", 50000);
}
diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index 69de9e287..0268850bb 100644
--- a/src/modules/m_repeat.cpp
+++ b/src/modules/m_repeat.cpp
@@ -246,7 +246,7 @@ public:
void ReadConfig()
{
- auto conf = ServerInstance->Config->ConfValue("repeat");
+ const auto& conf = ServerInstance->Config->ConfValue("repeat");
ms.MaxLines = conf->getUInt("maxlines", 20);
ms.MaxBacklog = conf->getUInt("maxbacklog", 20);
ms.MaxSecs = conf->getDuration("maxtime", 0);
diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index ff7ba356e..6084bd600 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -74,7 +74,7 @@ public:
allowchans.swap(newallows);
// Global config
- auto tag = ServerInstance->Config->ConfValue("restrictchans");
+ const auto& tag = ServerInstance->Config->ConfValue("restrictchans");
allowregistered = tag->getBool("allowregistered", false);
}
diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 0277490e8..fdb57a256 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -268,7 +268,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("rline");
+ const auto& tag = ServerInstance->Config->ConfValue("rline");
MatchOnNickChange = tag->getBool("matchonnickchange");
ZlineOnMatch = tag->getBool("zlineonmatch");
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 12cf6882a..f4a0ef2ff 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -432,7 +432,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("sasl");
+ const auto& tag = ServerInstance->Config->ConfValue("sasl");
const std::string target = tag->getString("target");
if (target.empty())
diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index aba64e41d..40a640ff4 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -64,7 +64,7 @@ public:
newallows.push_back(host);
}
- auto tag = ServerInstance->Config->ConfValue("securelist");
+ const auto& tag = ServerInstance->Config->ConfValue("securelist");
exemptregistered = tag->getBool("exemptregistered", true);
fakechans = tag->getUInt("fakechans", 5, 0);
fakechanprefix = tag->getString("fakechanprefix", "#", 1, ServerInstance->Config->Limits.MaxChannel - 1);
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 15af9ddb5..bd671049b 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -80,7 +80,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("hostname");
+ const auto& tag = ServerInstance->Config->ConfValue("hostname");
const std::string hmap = tag->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789", 1);
CharState newhostmap;
diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index a639bb9be..9b6fe501e 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -87,7 +87,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("setname");
+ const auto& tag = ServerInstance->Config->ConfValue("setname");
// Whether the module should only be usable by server operators.
bool operonly = tag->getBool("operonly");
diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp
index 91463607e..c758a659f 100644
--- a/src/modules/m_showfile.cpp
+++ b/src/modules/m_showfile.cpp
@@ -79,7 +79,7 @@ public:
return CmdResult::SUCCESS;
}
- void UpdateSettings(std::shared_ptr<ConfigTag> tag, const std::vector<std::string>& filecontents)
+ void UpdateSettings(const std::shared_ptr<ConfigTag>& tag, const std::vector<std::string>& filecontents)
{
introtext = tag->getString("introtext", "Showing " + name);
endtext = tag->getString("endtext", "End of " + name);
@@ -114,7 +114,7 @@ class ModuleShowFile final
private:
std::vector<CommandShowFile*> cmds;
- void ReadTag(std::shared_ptr<ConfigTag> tag, std::vector<CommandShowFile*>& newcmds)
+ void ReadTag(const std::shared_ptr<ConfigTag>& tag, std::vector<CommandShowFile*>& newcmds)
{
std::string cmdname = tag->getString("name");
if (cmdname.empty())
diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 67d68820c..3918f7c33 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -94,7 +94,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("showwhois");
+ const auto& tag = ServerInstance->Config->ConfValue("showwhois");
sw.SetOperOnly(tag->getBool("opersonly", true));
}
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index c99939193..6f66a6ac6 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -208,7 +208,7 @@ public:
cleanedcommands.Clear();
enabledcommands.Clear();
- auto tag = ServerInstance->Config->ConfValue("shun");
+ const auto& tag = ServerInstance->Config->ConfValue("shun");
allowconnect = tag->getBool("allowconnect");
allowtags = tag->getBool("allowtags");
cleanedcommands.AddList(tag->getString("cleanedcommands", "AWAY PART QUIT"));
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 39af417b3..3fc130b66 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -450,7 +450,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("silence");
+ const auto& tag = ServerInstance->Config->ConfValue("silence");
exemptservice = tag->getBool("exemptservice", tag->getBool("exemptuline", true));
cmd.ext.maxsilence = tag->getUInt("maxentries", 32, 1);
}
diff --git a/src/modules/m_spanningtree/link.h b/src/modules/m_spanningtree/link.h
index e2376a248..49e86bf3e 100644
--- a/src/modules/m_spanningtree/link.h
+++ b/src/modules/m_spanningtree/link.h
@@ -42,7 +42,7 @@ public:
unsigned long Timeout;
std::string Bind;
bool Hidden;
- Link(std::shared_ptr<ConfigTag> Tag)
+ Link(const std::shared_ptr<ConfigTag>& Tag)
: tag(Tag)
{
}
@@ -57,7 +57,7 @@ public:
time_t NextConnectTime;
/** Negative == inactive */
int position;
- Autoconnect(std::shared_ptr<ConfigTag> Tag)
+ Autoconnect(const std::shared_ptr<ConfigTag>& Tag)
: tag(Tag)
{
}
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 2b5551051..8024b9d27 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -233,8 +233,8 @@ void SpanningTreeUtilities::RefreshIPCache()
void SpanningTreeUtilities::ReadConfiguration()
{
- auto security = ServerInstance->Config->ConfValue("security");
- auto options = ServerInstance->Config->ConfValue("options");
+ const auto& security = ServerInstance->Config->ConfValue("security");
+ const auto& options = ServerInstance->Config->ConfValue("options");
FlatLinks = security->getBool("flatlinks");
HideServices = security->getBool("hideservices", security->getBool("hideulines"));
HideSplits = security->getBool("hidesplits");
diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp
index a92ce231d..e7055e5a5 100644
--- a/src/modules/m_sqlauth.cpp
+++ b/src/modules/m_sqlauth.cpp
@@ -147,7 +147,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto conf = ServerInstance->Config->ConfValue("sqlauth");
+ const auto& conf = ServerInstance->Config->ConfValue("sqlauth");
std::string dbid = conf->getString("dbid");
if (dbid.empty())
SQL.SetProvider("SQL");
@@ -170,8 +170,7 @@ public:
ModResult OnUserRegister(LocalUser* user) override
{
// Note this is their initial (unresolved) connect block
- std::shared_ptr<ConfigTag> tag = user->GetClass()->config;
- if (!tag->getBool("usesqlauth", true))
+ if (!user->GetClass()->config->getBool("usesqlauth", true))
return MOD_RES_PASSTHRU;
if (!allowpattern.empty() && InspIRCd::Match(user->nick, allowpattern))
diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index 20bf8596f..85a9f7f6c 100644
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -173,7 +173,7 @@ public:
// Clear list of our blocks, as ConfigReader just wiped them anyway
my_blocks.clear();
- auto tag = ServerInstance->Config->ConfValue("sqloper");
+ const auto& tag = ServerInstance->Config->ConfValue("sqloper");
std::string dbid = tag->getString("dbid");
if (dbid.empty())
diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 812962e83..522cb8ef1 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -305,7 +305,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("sslinfo");
+ const auto& tag = ServerInstance->Config->ConfValue("sslinfo");
cmd.operonlyfp = tag->getBool("operonly");
hash = tag->getString("hash");
}
diff --git a/src/modules/m_starttls.cpp b/src/modules/m_starttls.cpp
index c9a6c875c..04c413da2 100644
--- a/src/modules/m_starttls.cpp
+++ b/src/modules/m_starttls.cpp
@@ -125,7 +125,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto conf = ServerInstance->Config->ConfValue("starttls");
+ const auto& conf = ServerInstance->Config->ConfValue("starttls");
std::string newprovider = conf->getString("provider");
if (newprovider.empty())
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 631fd37e7..0c694cd79 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -197,7 +197,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("svshold");
+ const auto& tag = ServerInstance->Config->ConfValue("svshold");
silent = tag->getBool("silent", true);
}
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 19287f088..9ea6d981d 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -233,7 +233,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("timedbans");
+ const auto& tag = ServerInstance->Config->ConfValue("timedbans");
cmd.sendnotice = tag->getBool("sendnotice", true);
}
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 2a1f8f2d6..c7774cabd 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -218,7 +218,7 @@ public:
void ReadConfig(ConfigStatus& status) override
{
- auto tag = ServerInstance->Config->ConfValue("watch");
+ const auto& tag = ServerInstance->Config->ConfValue("watch");
cmd.maxwatch = tag->getUInt("maxwatch", 30, 1);
}
diff --git a/src/modules/m_websocket.cpp b/src/modules/m_websocket.cpp
index 8d4105f1b..75d89aacd 100644
--- a/src/modules/m_websocket.cpp
+++ b/src/modules/m_websocket.cpp
@@ -624,7 +624,7 @@ public:
config.allowedorigins.push_back(allow);
}
- auto tag = ServerInstance->Config->ConfValue("websocket");
+ const auto& tag = ServerInstance->Config->ConfValue("websocket");
const std::string defaultmodestr = tag->getString("defaultmode", tag->getBool("sendastext", true) ? "text" : "binary", 1);
if (stdalgo::string::equalsci(defaultmodestr, "reject"))
diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index 48de8acd3..ecdc0293e 100644
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -55,7 +55,7 @@ public:
* Imagine a scenario where the new file already exists. Merging the current XLines with the existing database is likely a bad idea
* ...and so is discarding all current in-memory XLines for the ones in the database.
*/
- auto Conf = ServerInstance->Config->ConfValue("xlinedb");
+ const auto& Conf = ServerInstance->Config->ConfValue("xlinedb");
xlinedbpath = ServerInstance->Config->Paths.PrependData(Conf->getString("filename", "xline.db", 1));
SetInterval(Conf->getDuration("saveperiod", 5));