OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug introduced by Query Access. The response does not come in a packaged _Result field, it comes as simple OSDMap with 2 fields in it. 

Also in this commit: comment out irrelevant debug message on AuthService.
0.7.1-dev
Diva Canto 2011-02-16 09:57:12 -08:00
parent fc84225038
commit c6f2d66eae
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
View File

@ -71,7 +71,7 @@ namespace OpenSim.Services.AuthenticationService
string hashed = Util.Md5Hash(password + ":" + string hashed = Util.Md5Hash(password + ":" +
data.Data["passwordSalt"].ToString()); data.Data["passwordSalt"].ToString());
m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString()); //m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString());
if (data.Data["passwordHash"].ToString() == hashed) if (data.Data["passwordHash"].ToString() == hashed)
{ {

10
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
View File

@ -274,7 +274,11 @@ namespace OpenSim.Services.Connectors.Simulation
try try
{ {
OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000); OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000);
bool success = result["Success"].AsBoolean(); bool success = result["success"].AsBoolean();
reason = result["reason"].AsString();
//m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1}", uri, success);
if (!success) if (!success)
{ {
if (result.ContainsKey("Message")) if (result.ContainsKey("Message"))
@ -296,10 +300,6 @@ namespace OpenSim.Services.Connectors.Simulation
return false; return false;
} }
OSDMap resp = (OSDMap)result["_Result"];
success = resp["success"].AsBoolean();
reason = resp["reason"].AsString();
return success; return success;
} }
catch (Exception e) catch (Exception e)