3 files changed, 22 insertions, 1 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index a6d5cb2ce74..6847e96f5af 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -3963,7 +3963,8 @@ void Spell::EffectTameCreature(uint32 /*i*/)
     finish();
 
     Pet* pet = m_caster->CreateTamedPetFrom(creatureTarget,m_spellInfo->Id);
-    if(!pet) return;
+    if(!pet)                                                // in versy specific state like near world end/etc.
+        return;
 
     // kill original creature
     creatureTarget->setDeathState(JUST_DIED);
diff --git a/src/trinitycore/Main.cpp b/src/trinitycore/Main.cpp
index 7b00073026d..46db54c649f 100644
--- a/src/trinitycore/Main.cpp
+++ b/src/trinitycore/Main.cpp
@@ -27,6 +27,8 @@
 #include "Config/ConfigEnv.h"
 #include "Log.h"
 #include "Master.h"
+#include <openssl/opensslv.h>
+#include <openssl/crypto.h>
 
 #ifndef _TRINITY_CORE_CONFIG
 # define _TRINITY_CORE_CONFIG  "TrinityCore.conf"
@@ -152,6 +154,14 @@ extern int main(int argc, char **argv)
         while (pause > clock()) {}
     }
 
+    sLog.outString("%s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
+    if (SSLeay() < 0x009080bfL)
+    {
+        sLog.outError("Outdated version of OpenSSL lib, Logins to server impossible!");
+        sLog.outError("minimal required version [OpenSSL 0.9.8k]");
+        return 1;
+    }
+
     ///- and run the 'Master'
     /// \todo Why do we need this 'Master'? Can't all of this be in the Main as for Realmd?
     return sMaster.Run();
diff --git a/src/trinityrealm/Main.cpp b/src/trinityrealm/Main.cpp
index cbadd4d1e4c..7d36f4c9a59 100644
--- a/src/trinityrealm/Main.cpp
+++ b/src/trinityrealm/Main.cpp
@@ -32,6 +32,8 @@
 #include "AuthSocket.h"
 #include "SystemConfig.h"
 #include "Util.h"
+#include <openssl/opensslv.h>
+#include <openssl/crypto.h>
 
 // Format is YYYYMMDDRR where RR is the change in the conf file
 // for that day.
@@ -162,6 +164,14 @@ extern int main(int argc, char **argv)
         while (pause > clock()) {}
     }
 
+    sLog.outString("%s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
+    if (SSLeay() < 0x009080bfL )
+    {
+        sLog.outError("Outdated version of OpenSSL lib, Logins to server impossible!");
+        sLog.outError("minimal required version [OpenSSL 0.9.8k]");
+        return 1;
+    }
+
     sLog.outString( "%s (realm-daemon)", _FULLVERSION );
     sLog.outString( "<Ctrl-C> to stop.\n" );