Move <security:hideulinekills> into core_oper.

5 files changed, 5 insertions, 6 deletions

diff --git a/include/configreader.h b/include/configreader.h
index 12b154b69..5d99bd843 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -397,10 +397,6 @@ class CoreExport ServerConfig
 	/** Set to a non-empty string to obfuscate server names. */
 	std::string HideServer;
 
-	/** Set to hide kills from clients of ulined servers in snotices.
-	 */
-	bool HideULineKills;
-
 	/** The full pathname and filename of the PID
 	 * file as defined in the configuration.
 	 */
diff --git a/src/configreader.cpp b/src/configreader.cpp
index c3ef7a1c9..18cfe032f 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -412,7 +412,6 @@ void ServerConfig::Fill()
 	HideSplits = security->getBool("hidesplits");
 	HideBans = security->getBool("hidebans");
 	HideServer = security->getString("hideserver", security->getString("hidewhois"));
-	HideULineKills = security->getBool("hideulinekills");
 	GenericOper = security->getBool("genericoper");
 	SyntaxHints = options->getBool("syntaxhints");
 	FullHostInTopic = options->getBool("hostintopic");
diff --git a/src/coremods/core_oper/cmd_kill.cpp b/src/coremods/core_oper/cmd_kill.cpp
index 1232ccb46..bdf08f194 100644
--- a/src/coremods/core_oper/cmd_kill.cpp
+++ b/src/coremods/core_oper/cmd_kill.cpp
@@ -106,7 +106,7 @@ CmdResult CommandKill::Handle(User* user, const Params& parameters)
 		killreason.assign(parameters[1], 0, ServerInstance->Config->Limits.MaxQuit);
 	}
 
-	if ((!ServerInstance->Config->HideULineKills) || (!user->server->IsULine()))
+	if ((!hideuline) || (!user->server->IsULine()))
 	{
 		if (IS_LOCAL(user) && IS_LOCAL(target))
 			ServerInstance->SNO->WriteGlobalSno('k', "Local kill by %s: %s (%s)", user->nick.c_str(), target->GetFullRealHost().c_str(), parameters[1].c_str());
diff --git a/src/coremods/core_oper/core_oper.cpp b/src/coremods/core_oper/core_oper.cpp
index 0da1e1a3a..54814b589 100644
--- a/src/coremods/core_oper/core_oper.cpp
+++ b/src/coremods/core_oper/core_oper.cpp
@@ -50,6 +50,7 @@ class CoreModOper : public Module
 	{
 		ConfigTag* security = ServerInstance->Config->ConfValue("security");
 		cmdkill.hidenick = security->getString("hidekills");
+		cmdkill.hideuline = security->getBool("hideulinekills");
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
diff --git a/src/coremods/core_oper/core_oper.h b/src/coremods/core_oper/core_oper.h
index d78f90a83..bdb1ae9ee 100644
--- a/src/coremods/core_oper/core_oper.h
+++ b/src/coremods/core_oper/core_oper.h
@@ -66,6 +66,9 @@ class CommandKill : public Command
 	/** Set to a non empty string to obfuscate nicknames prepended to a KILL. */
 	std::string hidenick;
 
+	/** Set to hide kills from clients of ulined servers in snotices. */
+	bool hideuline;
+
 	/** Constructor for kill.
 	 */
 	CommandKill(Module* parent);