From 303dfd7c1798f4aa211653d1bc66a9998cbe6ceb Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Fri, 28 Nov 2014 14:54:54 +0100
Subject: Reset debug timeouts, fix autoconnect, remove magic numbers

---
 src/server/net/client.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/server/net/client.cpp')

diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp
index f575196..433d967 100644
--- a/src/server/net/client.cpp
+++ b/src/server/net/client.cpp
@@ -252,7 +252,8 @@ void Client::handleMsg()
 		{
 			QByteArray hash(_fromClient.getFieldBytes(_HASH));
 			QByteArray challenge(_fromClient.getFieldBytes(_CHALLENGE));
-			if (genSha1(&Global::sessionNameArray(), &_challenge) != hash)
+			if (genSha1(&Global::sessionNameArray(), &_challenge) != hash
+					&& !(Global::getRooms()[Global::getCurrentRoom()].contains(_socket->peerAddress().toString())))
 			{	// Challenge reply is invalid, drop client
 				NetworkMessage msgErr;
 				msgErr.buildErrorMessage("Challenge reply invalid.");
-- 
cgit v1.2.3-55-g7522