summaryrefslogtreecommitdiff
path: root/modules/extra
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2024-01-24 12:01:50 +0000
committerSadie Powell <sadie@witchery.services>2024-01-24 12:22:51 +0000
commit7ac1fe58478d58e2480b6919c4abf3a82929169c (patch)
tree198ad9a6e23d4c189dce57fd95306b6b22d8c23f /modules/extra
parent72acef4e159df5dcdb93b3c13b2f9d2e5e4c21a9 (diff)
Rename several modules to remove the m_ prefix.
Diffstat (limited to 'modules/extra')
-rw-r--r--modules/extra/ldap.cpp (renamed from modules/extra/m_ldap.cpp)0
-rw-r--r--modules/extra/ldap_authentication.cpp (renamed from modules/extra/m_ldap_authentication.cpp)8
-rw-r--r--modules/extra/ldap_oper.cpp (renamed from modules/extra/m_ldap_oper.cpp)2
-rw-r--r--modules/extra/mysql.cpp (renamed from modules/extra/m_mysql.cpp)4
-rw-r--r--modules/extra/regex_pcre2.cpp (renamed from modules/extra/m_regex_pcre2.cpp)0
-rw-r--r--modules/extra/regex_posix.cpp (renamed from modules/extra/m_regex_posix.cpp)0
-rw-r--r--modules/extra/regex_tre.cpp (renamed from modules/extra/m_regex_tre.cpp)0
-rw-r--r--modules/extra/sql_authentication.cpp (renamed from modules/extra/m_sql_authentication.cpp)8
-rw-r--r--modules/extra/sql_log.cpp (renamed from modules/extra/m_sql_log.cpp)0
-rw-r--r--modules/extra/sql_oper.cpp (renamed from modules/extra/m_sql_oper.cpp)14
-rw-r--r--modules/extra/sqlite.cpp (renamed from modules/extra/m_sqlite.cpp)4
-rw-r--r--modules/extra/ssl_gnutls.cpp (renamed from modules/extra/m_ssl_gnutls.cpp)4
-rw-r--r--modules/extra/ssl_openssl.cpp (renamed from modules/extra/m_ssl_openssl.cpp)4
13 files changed, 24 insertions, 24 deletions
diff --git a/modules/extra/m_ldap.cpp b/modules/extra/ldap.cpp
index 31e712662..31e712662 100644
--- a/modules/extra/m_ldap.cpp
+++ b/modules/extra/ldap.cpp
diff --git a/modules/extra/m_ldap_authentication.cpp b/modules/extra/ldap_authentication.cpp
index 1b8318d7e..c78d2ae25 100644
--- a/modules/extra/m_ldap_authentication.cpp
+++ b/modules/extra/ldap_authentication.cpp
@@ -69,7 +69,7 @@ public:
{
const LDAPAttributes &attr = r.get(0);
ii->dn = attr.get("dn");
- Log(LOG_DEBUG) << "m_ldap_authenticationn: binding as " << ii->dn;
+ Log(LOG_DEBUG) << "ldap_authenticationn: binding as " << ii->dn;
ii->lprov->Bind(new IdentifyInterface(this->owner, ii), ii->dn, ii->req->GetPassword());
ii = NULL;
@@ -88,7 +88,7 @@ public:
Anope::string sf = search_filter.replace_all_cs("%account", ii->req->GetAccount()).replace_all_cs("%object_class", object_class);
try
{
- Log(LOG_DEBUG) << "m_ldap_authentication: searching for " << sf;
+ Log(LOG_DEBUG) << "ldap_authentication: searching for " << sf;
ii->lprov->Search(new IdentifyInterface(this->owner, ii), basedn, sf);
ii->admin_bind = false;
ii = NULL;
@@ -113,7 +113,7 @@ public:
// encrypt and store the password in the nickcore
Anope::Encrypt(ii->req->GetPassword(), na->nc->pass);
- na->nc->Extend<Anope::string>("m_ldap_authentication_dn", ii->dn);
+ na->nc->Extend<Anope::string>("ldap_authentication_dn", ii->dn);
ii->req->Success(me);
}
break;
@@ -205,7 +205,7 @@ class ModuleLDAPAuthentication final
public:
ModuleLDAPAuthentication(const Anope::string &modname, const Anope::string &creator) :
Module(modname, creator, EXTRA | VENDOR), ldap("LDAPProvider", "ldap/main"), orinterface(this),
- dn(this, "m_ldap_authentication_dn")
+ dn(this, "ldap_authentication_dn")
{
me = this;
}
diff --git a/modules/extra/m_ldap_oper.cpp b/modules/extra/ldap_oper.cpp
index 866ed0110..62749f957 100644
--- a/modules/extra/m_ldap_oper.cpp
+++ b/modules/extra/ldap_oper.cpp
@@ -112,7 +112,7 @@ public:
try
{
if (!this->ldap)
- throw LDAPException("No LDAP interface. Is m_ldap loaded and configured correctly?");
+ throw LDAPException("No LDAP interface. Is ldap loaded and configured correctly?");
else if (this->basedn.empty() || this->filter.empty() || opertype_attribute.empty())
throw LDAPException("Could not search LDAP for opertype settings, invalid configuration.");
diff --git a/modules/extra/m_mysql.cpp b/modules/extra/mysql.cpp
index d4be01f88..f1baff7b9 100644
--- a/modules/extra/m_mysql.cpp
+++ b/modules/extra/mysql.cpp
@@ -383,14 +383,14 @@ std::vector<Query> MySQLService::CreateTable(const Anope::string &table, const D
if (known_cols.empty())
{
- Log(LOG_DEBUG) << "m_mysql: Fetching columns for " << table;
+ Log(LOG_DEBUG) << "mysql: Fetching columns for " << table;
Result columns = this->RunQuery("SHOW COLUMNS FROM `" + table + "`");
for (int i = 0; i < columns.Rows(); ++i)
{
const Anope::string &column = columns.Get(i, "Field");
- Log(LOG_DEBUG) << "m_mysql: Column #" << i << " for " << table << ": " << column;
+ Log(LOG_DEBUG) << "mysql: Column #" << i << " for " << table << ": " << column;
known_cols.insert(column);
}
}
diff --git a/modules/extra/m_regex_pcre2.cpp b/modules/extra/regex_pcre2.cpp
index ef2786823..ef2786823 100644
--- a/modules/extra/m_regex_pcre2.cpp
+++ b/modules/extra/regex_pcre2.cpp
diff --git a/modules/extra/m_regex_posix.cpp b/modules/extra/regex_posix.cpp
index cef4486f9..cef4486f9 100644
--- a/modules/extra/m_regex_posix.cpp
+++ b/modules/extra/regex_posix.cpp
diff --git a/modules/extra/m_regex_tre.cpp b/modules/extra/regex_tre.cpp
index 18485507a..18485507a 100644
--- a/modules/extra/m_regex_tre.cpp
+++ b/modules/extra/regex_tre.cpp
diff --git a/modules/extra/m_sql_authentication.cpp b/modules/extra/sql_authentication.cpp
index 8d60f12ea..bb2f82410 100644
--- a/modules/extra/m_sql_authentication.cpp
+++ b/modules/extra/sql_authentication.cpp
@@ -32,12 +32,12 @@ public:
{
if (r.Rows() == 0)
{
- Log(LOG_DEBUG) << "m_sql_authentication: Unsuccessful authentication for " << req->GetAccount();
+ Log(LOG_DEBUG) << "sql_authentication: Unsuccessful authentication for " << req->GetAccount();
delete this;
return;
}
- Log(LOG_DEBUG) << "m_sql_authentication: Successful authentication for " << req->GetAccount();
+ Log(LOG_DEBUG) << "sql_authentication: Successful authentication for " << req->GetAccount();
Anope::string email;
try
@@ -69,7 +69,7 @@ public:
void OnError(const SQL::Result &r) override
{
- Log(this->owner) << "m_sql_authentication: Error executing query " << r.GetQuery().query << ": " << r.GetError();
+ Log(this->owner) << "sql_authentication: Error executing query " << r.GetQuery().query << ": " << r.GetError();
delete this;
}
};
@@ -143,7 +143,7 @@ public:
this->SQL->Run(new SQLAuthenticationResult(u, req), q);
- Log(LOG_DEBUG) << "m_sql_authentication: Checking authentication for " << req->GetAccount();
+ Log(LOG_DEBUG) << "sql_authentication: Checking authentication for " << req->GetAccount();
}
};
diff --git a/modules/extra/m_sql_log.cpp b/modules/extra/sql_log.cpp
index 7335a5abf..7335a5abf 100644
--- a/modules/extra/m_sql_log.cpp
+++ b/modules/extra/sql_log.cpp
diff --git a/modules/extra/m_sql_oper.cpp b/modules/extra/sql_oper.cpp
index 7642bab5f..af2b40346 100644
--- a/modules/extra/m_sql_oper.cpp
+++ b/modules/extra/sql_oper.cpp
@@ -34,7 +34,7 @@ class SQLOperResult final
delete user->Account()->o;
user->Account()->o = NULL;
- Log(this->owner) << "m_sql_oper: Removed services operator from " << user->nick << " (" << user->Account()->display << ")";
+ Log(this->owner) << "sql_oper: Removed services operator from " << user->nick << " (" << user->Account()->display << ")";
BotInfo *OperServ = Config->GetClient("OperServ");
user->RemoveMode(OperServ, "OPER"); // Probably not set, just incase
@@ -53,7 +53,7 @@ public:
if (r.Rows() == 0)
{
- Log(LOG_DEBUG) << "m_sql_oper: Got 0 rows for " << user->nick;
+ Log(LOG_DEBUG) << "sql_oper: Got 0 rows for " << user->nick;
Deoper();
return;
}
@@ -69,7 +69,7 @@ public:
return;
}
- Log(LOG_DEBUG) << "m_sql_oper: Got result for " << user->nick << ", opertype " << opertype;
+ Log(LOG_DEBUG) << "sql_oper: Got result for " << user->nick << ", opertype " << opertype;
Anope::string modes;
try
@@ -91,7 +91,7 @@ public:
OperType *ot = OperType::Find(opertype);
if (ot == NULL)
{
- Log(this->owner) << "m_sql_oper: Oper " << user->nick << " has type " << opertype << ", but this opertype does not exist?";
+ Log(this->owner) << "sql_oper: Oper " << user->nick << " has type " << opertype << ", but this opertype does not exist?";
return;
}
@@ -103,7 +103,7 @@ public:
if (!user->Account()->o || user->Account()->o->ot != ot)
{
- Log(this->owner) << "m_sql_oper: Tieing oper " << user->nick << " to type " << opertype;
+ Log(this->owner) << "sql_oper: Tieing oper " << user->nick << " to type " << opertype;
delete user->Account()->o;
user->Account()->o = new SQLOper(user->Account()->display, ot);
@@ -121,7 +121,7 @@ public:
void OnError(const SQL::Result &r) override
{
SQLOperResultDeleter d(this);
- Log(this->owner) << "m_sql_oper: Error executing query " << r.GetQuery().query << ": " << r.GetError();
+ Log(this->owner) << "sql_oper: Error executing query " << r.GetQuery().query << ": " << r.GetError();
}
};
@@ -174,7 +174,7 @@ public:
this->SQL->Run(new SQLOperResult(this, u), q);
- Log(LOG_DEBUG) << "m_sql_oper: Checking authentication for " << u->Account()->display;
+ Log(LOG_DEBUG) << "sql_oper: Checking authentication for " << u->Account()->display;
}
};
diff --git a/modules/extra/m_sqlite.cpp b/modules/extra/sqlite.cpp
index f11c0bf09..a3d2f7757 100644
--- a/modules/extra/m_sqlite.cpp
+++ b/modules/extra/sqlite.cpp
@@ -213,14 +213,14 @@ std::vector<Query> SQLiteService::CreateTable(const Anope::string &table, const
if (known_cols.empty())
{
- Log(LOG_DEBUG) << "m_sqlite: Fetching columns for " << table;
+ Log(LOG_DEBUG) << "sqlite: Fetching columns for " << table;
Result columns = this->RunQuery("PRAGMA table_info(" + table + ")");
for (int i = 0; i < columns.Rows(); ++i)
{
const Anope::string &column = columns.Get(i, "name");
- Log(LOG_DEBUG) << "m_sqlite: Column #" << i << " for " << table << ": " << column;
+ Log(LOG_DEBUG) << "sqlite: Column #" << i << " for " << table << ": " << column;
known_cols.insert(column);
}
}
diff --git a/modules/extra/m_ssl_gnutls.cpp b/modules/extra/ssl_gnutls.cpp
index 28310471a..fdf5b1bff 100644
--- a/modules/extra/m_ssl_gnutls.cpp
+++ b/modules/extra/ssl_gnutls.cpp
@@ -350,7 +350,7 @@ public:
delete newcred;
throw;
}
- Log(LOG_DEBUG) << "m_ssl_gnutls: Successfully loaded DH parameters from " << dhfile;
+ Log(LOG_DEBUG) << "ssl_gnutls: Successfully loaded DH parameters from " << dhfile;
}
if (cred)
@@ -358,7 +358,7 @@ public:
cred = newcred;
cred->incrref();
- Log(LOG_DEBUG) << "m_ssl_gnutls: Successfully loaded certificate " << certfile << " and private key " << keyfile;
+ Log(LOG_DEBUG) << "ssl_gnutls: Successfully loaded certificate " << certfile << " and private key " << keyfile;
}
void OnPreServerConnect() override
diff --git a/modules/extra/m_ssl_openssl.cpp b/modules/extra/ssl_openssl.cpp
index 8d4aca9ba..a052752ae 100644
--- a/modules/extra/m_ssl_openssl.cpp
+++ b/modules/extra/ssl_openssl.cpp
@@ -154,7 +154,7 @@ public:
if (!SSL_CTX_use_certificate_chain_file(client_ctx, this->certfile.c_str()) || !SSL_CTX_use_certificate_chain_file(server_ctx, this->certfile.c_str()))
throw ConfigException("Error loading certificate");
else
- Log(LOG_DEBUG) << "m_ssl_openssl: Successfully loaded certificate " << this->certfile;
+ Log(LOG_DEBUG) << "ssl_openssl: Successfully loaded certificate " << this->certfile;
}
else
Log() << "Unable to open certificate " << this->certfile;
@@ -164,7 +164,7 @@ public:
if (!SSL_CTX_use_PrivateKey_file(client_ctx, this->keyfile.c_str(), SSL_FILETYPE_PEM) || !SSL_CTX_use_PrivateKey_file(server_ctx, this->keyfile.c_str(), SSL_FILETYPE_PEM))
throw ConfigException("Error loading private key");
else
- Log(LOG_DEBUG) << "m_ssl_openssl: Successfully loaded private key " << this->keyfile;
+ Log(LOG_DEBUG) << "ssl_openssl: Successfully loaded private key " << this->keyfile;
}
else
{