Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist

1 files changed, 0 insertions, 113 deletions

diff --git a/dep/acelite/ace/SOCK_Netlink.cpp b/dep/acelite/ace/SOCK_Netlink.cpp
deleted file mode 100644
index aa1eca8b992..00000000000
--- a/dep/acelite/ace/SOCK_Netlink.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// $Id: SOCK_Netlink.cpp 80826 2008-03-04 14:51:23Z wotte $
-
-#include /* */  "ace/SOCK_Netlink.h"
-
-#ifdef ACE_HAS_NETLINK
-
-#include "ace/Log_Msg.h"
-#include "ace/ACE.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/SOCK_Netlink.h"
-#include "ace/OS_NS_sys_socket.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/SOCK_Netlink.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE (ACE_SOCK_Netlink)
-
-int ACE_SOCK_Netlink::open (ACE_Netlink_Addr &local,
-                            int protocol_family,
-                            int protocol) //! protocol of your choosing
-{
-  ACE_TRACE ("ACE_SOCK_Netlink::open");
-
-  if ( ACE_SOCK::open (SOCK_RAW,
-                       protocol_family, //! RAW or DGRAM valid
-                       protocol,0) < 0 ) {
-    ACE_TRACE ("ACE_SOCK_Netlink::open failed to open");
-    return -1;
-  }
-
-  if (ACE_OS::bind(this->get_handle(),
-                   (sockaddr*)local.get_addr(),
-                   local.get_addr_size())  == -1 ) {
-    ACE_TRACE ("ACE_SOCK_Netlink::open failed to bind socket");
-    return -1;
-  }
-  return 0;
-}
-
-
-ACE_SOCK_Netlink::ACE_SOCK_Netlink (ACE_Netlink_Addr &local,
-                                    int protocol_family,
-                                    int protocol)
-{
-  ACE_TRACE ("ACE_SOCK_Netlink::ACE_SOCK_Netlink");
-
-  if (this->open (local,
-                  protocol_family,
-                  protocol)  == -1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("%p\n"),
-                ACE_TEXT ("ACE_SOCK_Netlink")));
-}
-
-ssize_t
-ACE_SOCK_Netlink::send (const iovec iov[],
-                        int n,
-                        const ACE_Addr &addr,
-                        int flags) const
-{
-  ACE_TRACE ("ACE_SOCK_Netlink::send");
-  msghdr send_msg;
-
-  send_msg.msg_iov = (iovec *) iov;
-  send_msg.msg_iovlen = n;
-  send_msg.msg_name = (char *) addr.get_addr ();
-  send_msg.msg_namelen = addr.get_size ();
-  send_msg.msg_control = 0;
-  send_msg.msg_controllen = 0;
-  send_msg.msg_flags = 0;
-
-  return ACE_OS::sendmsg (this->get_handle (),
-                          &send_msg,
-                          flags);
-}
-
-ssize_t
-ACE_SOCK_Netlink::recv (iovec iov[],
-                        int n,
-                        ACE_Addr &addr,
-                        int flags) const
-{
-  ACE_TRACE ("ACE_SOCK_Netlink::recv");
-  msghdr recv_msg;
-
-  recv_msg.msg_iov = (iovec *) iov;
-  recv_msg.msg_iovlen = n;
-  recv_msg.msg_name = (char *) addr.get_addr ();
-  recv_msg.msg_namelen = addr.get_size ();
-  recv_msg.msg_control = 0;
-  recv_msg.msg_controllen = 0;
-  recv_msg.msg_flags = 0;
-
-  ssize_t status = ACE_OS::recvmsg (this->get_handle (),
-                                    &recv_msg,
-                                    flags);
-
-  if (recv_msg.msg_flags & MSG_TRUNC)
-    return -1;
-
-  addr.set_size (recv_msg.msg_namelen);
-  addr.set_type (((sockaddr_in *) addr.get_addr())->sin_family);
-
-  return status;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_NETLINK */