summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/modules/extra/m_geoip.cpp4
-rw-r--r--src/modules/extra/m_ldapauth.cpp2
-rw-r--r--src/modules/extra/m_sqlauth.cpp4
-rw-r--r--src/modules/extra/m_ssl_gnutls.cpp2
-rw-r--r--src/modules/extra/m_ssl_openssl.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp
index 0e5723bc5..90bd4722e 100644
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -73,12 +73,12 @@ class ModuleGeoIP : public Module
{
std::map<std::string, std::string>::iterator x = GeoBans.find(c);
if (x != GeoBans.end())
- User::QuitUser(ServerInstance, user, x->second);
+ ServerInstance->Users->QuitUser(user, x->second);
}
else
{
if (banunknown)
- User::QuitUser(ServerInstance, user, "Could not identify your country of origin. Access denied.");
+ ServerInstance->Users->QuitUser(user, "Could not identify your country of origin. Access denied.");
}
}
return 0;
diff --git a/src/modules/extra/m_ldapauth.cpp b/src/modules/extra/m_ldapauth.cpp
index de9dc3c6c..60f1e8978 100644
--- a/src/modules/extra/m_ldapauth.cpp
+++ b/src/modules/extra/m_ldapauth.cpp
@@ -121,7 +121,7 @@ public:
if (!CheckCredentials(user))
{
- User::QuitUser(ServerInstance,user,killreason);
+ ServerInstance->Users->QuitUser(user, killreason);
return 1;
}
return 0;
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index dcc62a0a2..bf367a583 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -82,7 +82,7 @@ public:
if (!CheckCredentials(user))
{
- User::QuitUser(ServerInstance,user,killreason);
+ ServerInstance->Users->QuitUser(user, killreason);
return 1;
}
return 0;
@@ -192,7 +192,7 @@ public:
if (!user->GetExt("sqlauthed"))
{
- User::QuitUser(ServerInstance,user,killreason);
+ ServerInstance->Users->QuitUser(user, killreason);
}
return SQLSUCCESS;
}
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 27456959a..6515670fe 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -284,7 +284,7 @@ class ModuleSSLGnuTLS : public Module
{
// User is using SSL, they're a local user, and they're using one of *our* SSL ports.
// Potentially there could be multiple SSL modules loaded at once on different ports.
- User::QuitUser(ServerInstance, user, "SSL module unloading");
+ ServerInstance->Users->QuitUser(user, "SSL module unloading");
}
if (user->GetExt("ssl_cert", dummy))
{
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index ed38933db..b80bef840 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -318,7 +318,7 @@ class ModuleSSLOpenSSL : public Module
{
// User is using SSL, they're a local user, and they're using one of *our* SSL ports.
// Potentially there could be multiple SSL modules loaded at once on different ports.
- User::QuitUser(ServerInstance, user, "SSL module unloading");
+ ServerInstance->Users->QuitUser(user, "SSL module unloading");
}
if (user->GetExt("ssl_cert", dummy))
{