X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_lockserv.cpp;h=65b9aa036349141cdcfe4164a37b1ae1f0a6b589;hb=acccaa39641500b8a691db4136e6571102a438ed;hp=8fae86e1e9124d9604673c6e7d54c33dabf529e4;hpb=d24619c012b34d5a3d4cfb93e7bea3ff3d5721e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 8fae86e1e..65b9aa036 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -44,7 +44,7 @@ class CommandLockserv : public Command
 		}
 
 		locked = true;
-		user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server.c_str());
+		user->WriteNumeric(988, "%s :Closed for new connections", user->server->GetName().c_str());
 		ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily disallow new connections", user->nick.c_str());
 		return CMD_SUCCESS;
 	}
@@ -69,7 +69,7 @@ class CommandUnlockserv : public Command
 		}
 
 		locked = false;
-		user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server.c_str());
+		user->WriteNumeric(989, "%s :Open for new connections", user->server->GetName().c_str());
 		ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow new connections", user->nick.c_str());
 		return CMD_SUCCESS;
 	}
@@ -89,14 +89,13 @@ class ModuleLockserv : public Module
 	void init() CXX11_OVERRIDE
 	{
 		locked = false;
-		ServerInstance->Modules->AddService(lockcommand);
-		ServerInstance->Modules->AddService(unlockcommand);
 	}
 
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		// Emergency way to unlock
-		if (!user) locked = false;
+		if (!status.srcuser)
+			locked = false;
 	}
 
 	ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE