X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=cb2b5db9d7a27aa88a05553cdd6b6602887a418c;hb=e9b021cc990deaf3028cb09efa3db0040b0d62a9;hp=585abd0c7372e2192ebd827ca8eb00d1df26415b;hpb=e66ea395e424983cb30c11e4050020f8e6f482e1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 585abd0c7..cb2b5db9d 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -109,8 +109,8 @@ void InspIRCd::Cleanup()
 	ports.clear();
 
 	/* Close all client sockets, or the new process inherits them */
-	LocalUserList& list = Users->local_users;
-	for (LocalUserList::iterator i = list.begin(); i != list.end(); ++i)
+	const UserManager::LocalList& list = Users.GetLocalUsers();
+	for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
 		Users->QuitUser(*i, "Server shutdown");
 
 	GlobalCulls.Apply();
@@ -124,10 +124,7 @@ void InspIRCd::Cleanup()
 		FakeClient->cull();
 	}
 	DeleteZero(this->FakeClient);
-	DeleteZero(this->Users);
 	DeleteZero(this->XLines);
-	DeleteZero(this->Modules);
-	DeleteZero(this->SNO);
 	DeleteZero(this->Config);
 	SocketEngine::Deinit();
 	Logs->CloseLogs();
@@ -232,7 +229,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	  * THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods
 	  * themselves within the class.
 	  */
-	 OperQuit("operquit", NULL),
+	 OperQuit("operquit", ExtensionItem::EXT_USER, NULL),
 	 GenRandom(&HandleGenRandom),
 	 IsChannel(&HandleIsChannel),
 	 IsNick(&HandleIsNick),
@@ -249,10 +246,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	    do_nolog = 0, do_root = 0;
 
 	// Initialize so that if we exit before proper initialization they're not deleted
-	this->Users = 0;
 	this->Config = 0;
-	this->SNO = 0;
-	this->Modules = 0;
 	this->XLines = 0;
 	this->ConfigThread = NULL;
 	this->FakeClient = NULL;
@@ -262,12 +256,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
 	SocketEngine::Init();
 
-	// Create base manager classes early, so nothing breaks
-	this->Users = new UserManager;
-
 	this->Config = new ServerConfig;
-	this->SNO = new SnomaskManager;
-	this->Modules = new ModuleManager();
 	dynamic_reference_base::reset_all();
 	this->XLines = new XLineManager;
 
@@ -382,7 +371,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 		}
 	}
 
-	std::cout << con_green << "Inspire Internet Relay Chat Server" << con_reset << ", compiled on " __DATE__ " at " __TIME__ << std::endl;
+	std::cout << con_green << "InspIRCd - Internet Relay Chat Daemon" << con_reset << ", compiled on " __DATE__ " at " __TIME__ << std::endl;
 	std::cout << con_green << "(C) InspIRCd Development Team." << con_reset << std::endl << std::endl;
 	std::cout << "Developers:" << std::endl;
 	std::cout << con_green << "\tBrain, FrostyCoolSlug, w00t, Om, Special, peavey" << std::endl;