1 files changed, 19 insertions, 13 deletions

diff --git a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
index 37c8846..cd4ca5c 100644
--- a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
+++ b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
@@ -169,22 +169,28 @@ namespace OpenSim.Framework.Communications.Services
                     m_log.Debug(" >> Null");

             }

 

-            // Verify the key of who's calling

-            UUID userID = UUID.Zero;

-            string authKey = string.Empty;

-            UUID.TryParse((string)request.Params[0], out userID);

-            authKey = (string)request.Params[1];

-

-            m_log.InfoFormat("[HGLOGIN] HGVerifyKey called with key ", authKey);

             bool success = false;

 

-            if (!(m_userManager is IAuthentication))

+            if (request.Params.Count >= 2)

             {

-                m_log.Debug("[HGLOGIN]: UserManager is not IAuthentication service. Denying.");

-            }

-            else

-            {

-                success = ((IAuthentication)m_userManager).VerifyKey(userID, authKey);

+                // Verify the key of who's calling

+                UUID userID = UUID.Zero;

+                string authKey = string.Empty;

+                if (UUID.TryParse((string)request.Params[0], out userID))

+                {

+                    authKey = (string)request.Params[1];

+

+                    m_log.InfoFormat("[HGLOGIN] HGVerifyKey called with key ", authKey);

+

+                    if (!(m_userManager is IAuthentication))

+                    {

+                        m_log.Debug("[HGLOGIN]: UserManager is not IAuthentication service. Denying.");

+                    }

+                    else

+                    {

+                        success = ((IAuthentication)m_userManager).VerifyKey(userID, authKey);

+                    }

+                }

             }

 

             XmlRpcResponse response = new XmlRpcResponse();