From 176a2c1080c609138b7291828c905cdb979e1f3e Mon Sep 17 00:00:00 2001 From: leak Date: Fri, 13 Jul 2012 09:11:05 +0200 Subject: Core/Warden: Workaround for an OpenSSL bug in the ARC4 stream cipher initialization that causes crashes on some OS - Skip loading warden_action overrides when warden is disabled fixes #6486 --- src/server/game/Warden/WardenCheckMgr.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/server/game/Warden/WardenCheckMgr.cpp') diff --git a/src/server/game/Warden/WardenCheckMgr.cpp b/src/server/game/Warden/WardenCheckMgr.cpp index abd7ff8f87d..0677758439f 100644 --- a/src/server/game/Warden/WardenCheckMgr.cpp +++ b/src/server/game/Warden/WardenCheckMgr.cpp @@ -151,6 +151,14 @@ void WardenCheckMgr::LoadWardenChecks() void WardenCheckMgr::LoadWardenOverrides() { + // Check if Warden is enabled by config before loading anything + if (!sWorld->getBoolConfig(CONFIG_WARDEN_ENABLED)) + { + sLog->outString(">> Warden disabled, loading check overrides skipped."); + sLog->outString(); + return; + } + // 0 1 QueryResult result = CharacterDatabase.Query("SELECT wardenId, action FROM warden_action"); -- cgit v1.2.3