Merge fix by peaveydk which stops crashes when user doesnt auth

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5529 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 5 insertions, 7 deletions

diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index 61666fc4e..fd4c67ed0 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -183,7 +183,11 @@ public:
 			{
 				ServerInstance->Log(DEBUG, "Got query with unknown ID, this probably means the user quit while the query was in progress");
 			}
-		
+
+			if (!user->GetExt("sqlauthed"))
+			{
+				userrec::QuitUser(Srv,user,killreason);
+			}
 			return SQLSUCCESS;
 		}
 		
@@ -200,12 +204,6 @@ public:
 	
 	virtual bool OnCheckReady(userrec* user)
 	{
-		if(user->GetExt("sqlauth_failed"))
-		{
-			userrec::QuitUser(Srv,user,killreason);
-			return false;
-		}
-		
 		return user->GetExt("sqlauthed");
 	}