From 992674362c5f64bdb8e1942eeaa7612524529cd6 Mon Sep 17 00:00:00 2001
From: attilamolnar <attilamolnar@hush.com>
Date: Sun, 26 May 2013 19:44:13 +0200
Subject: Automatically register ServiceProviders created by modules

---
 src/modules/extra/m_geoip.cpp        | 2 --
 src/modules/extra/m_ldapauth.cpp     | 6 ------
 src/modules/extra/m_mssql.cpp        | 2 --
 src/modules/extra/m_regex_pcre.cpp   | 1 -
 src/modules/extra/m_regex_posix.cpp  | 1 -
 src/modules/extra/m_regex_re2.cpp    | 1 -
 src/modules/extra/m_regex_stdlib.cpp | 1 -
 src/modules/extra/m_regex_tre.cpp    | 1 -
 src/modules/extra/m_ssl_gnutls.cpp   | 3 ---
 src/modules/extra/m_ssl_openssl.cpp  | 1 -
 10 files changed, 19 deletions(-)

(limited to 'src/modules/extra')

diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp
index 50df9fc26..142c5fbcf 100644
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -56,8 +56,6 @@ class ModuleGeoIP : public Module
 		if (gi == NULL)
 				throw ModuleException("Unable to initialize geoip, are you missing GeoIP.dat?");
 
-		ServerInstance->Modules->AddService(ext);
-
 		for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i)
 		{
 			LocalUser* user = *i;
diff --git a/src/modules/extra/m_ldapauth.cpp b/src/modules/extra/m_ldapauth.cpp
index 827179f84..d1690850d 100644
--- a/src/modules/extra/m_ldapauth.cpp
+++ b/src/modules/extra/m_ldapauth.cpp
@@ -118,12 +118,6 @@ public:
 		conn = NULL;
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(ldapAuthed);
-		ServerInstance->Modules->AddService(ldapVhost);
-	}
-
 	~ModuleLDAPAuth()
 	{
 		if (conn)
diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp
index 84e02be98..8f8fe080f 100644
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -656,8 +656,6 @@ class ModuleMsSQL : public Module
 		ReadConf();
 
 		ServerInstance->Threads->Start(queryDispatcher);
-
-		ServerInstance->Modules->AddService(sqlserv);
 	}
 
 	~ModuleMsSQL()
diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp
index 91c2d1404..9ae6719ba 100644
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre.cpp
@@ -73,7 +73,6 @@ class ModuleRegexPCRE : public Module
 	PCREFactory ref;
 	ModuleRegexPCRE() : ref(this)
 	{
-		ServerInstance->Modules->AddService(ref);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp
index bde5c3947..b5fddfab8 100644
--- a/src/modules/extra/m_regex_posix.cpp
+++ b/src/modules/extra/m_regex_posix.cpp
@@ -78,7 +78,6 @@ class ModuleRegexPOSIX : public Module
  public:
 	ModuleRegexPOSIX() : ref(this)
 	{
-		ServerInstance->Modules->AddService(ref);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp
index 2525b70ab..544e3060e 100644
--- a/src/modules/extra/m_regex_re2.cpp
+++ b/src/modules/extra/m_regex_re2.cpp
@@ -66,7 +66,6 @@ class ModuleRegexRE2 : public Module
  public:
 	ModuleRegexRE2() : ref(this)
 	{
-		ServerInstance->Modules->AddService(ref);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
diff --git a/src/modules/extra/m_regex_stdlib.cpp b/src/modules/extra/m_regex_stdlib.cpp
index 2f75a60a8..8e7bd0da2 100644
--- a/src/modules/extra/m_regex_stdlib.cpp
+++ b/src/modules/extra/m_regex_stdlib.cpp
@@ -61,7 +61,6 @@ public:
 	StdRegexFactory ref;
 	ModuleRegexStd() : ref(this)
 	{
-		ServerInstance->Modules->AddService(ref);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index 92f2ad990..8a1d54248 100644
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -80,7 +80,6 @@ class ModuleRegexTRE : public Module
  public:
 	ModuleRegexTRE() : trf(this)
 	{
-		ServerInstance->Modules->AddService(trf);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 9f21d6d28..5c30d6f57 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -633,9 +633,6 @@ class ModuleSSLGnuTLS : public Module
 
 		// Void return, guess we assume success
 		gnutls_certificate_set_dh_params(iohook.x509_cred, dh_params);
-
-		ServerInstance->Modules->AddService(iohook);
-		ServerInstance->Modules->AddService(starttls);
 	}
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 0957b5912..7acbcfc18 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -490,7 +490,6 @@ class ModuleSSLOpenSSL : public Module
 	{
 		// Needs the flag as it ignores a plain /rehash
 		OnModuleRehash(NULL,"ssl");
-		ServerInstance->Modules->AddService(iohook);
 	}
 
 	void OnHookIO(StreamSocket* user, ListenSocket* lsb) CXX11_OVERRIDE
-- 
cgit v1.2.3