diff options
-rw-r--r-- | OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs index 17619ff..2fc9248 100644 --- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||
@@ -71,7 +71,7 @@ namespace OpenSim.Services.AuthenticationService | |||
71 | string hashed = Util.Md5Hash(password + ":" + | 71 | string hashed = Util.Md5Hash(password + ":" + |
72 | data.Data["passwordSalt"].ToString()); | 72 | data.Data["passwordSalt"].ToString()); |
73 | 73 | ||
74 | m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString()); | 74 | //m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString()); |
75 | 75 | ||
76 | if (data.Data["passwordHash"].ToString() == hashed) | 76 | if (data.Data["passwordHash"].ToString() == hashed) |
77 | { | 77 | { |
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index f6ee493..8aa88cb 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -274,7 +274,11 @@ namespace OpenSim.Services.Connectors.Simulation | |||
274 | try | 274 | try |
275 | { | 275 | { |
276 | OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000); | 276 | OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000); |
277 | bool success = result["Success"].AsBoolean(); | 277 | bool success = result["success"].AsBoolean(); |
278 | reason = result["reason"].AsString(); | ||
279 | |||
280 | //m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1}", uri, success); | ||
281 | |||
278 | if (!success) | 282 | if (!success) |
279 | { | 283 | { |
280 | if (result.ContainsKey("Message")) | 284 | if (result.ContainsKey("Message")) |
@@ -296,10 +300,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
296 | return false; | 300 | return false; |
297 | } | 301 | } |
298 | 302 | ||
299 | OSDMap resp = (OSDMap)result["_Result"]; | ||
300 | success = resp["success"].AsBoolean(); | ||
301 | reason = resp["reason"].AsString(); | ||
302 | |||
303 | return success; | 303 | return success; |
304 | } | 304 | } |
305 | catch (Exception e) | 305 | catch (Exception e) |