aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-20 19:21:58 -0700
committerJohn Hurliman2010-03-20 19:21:58 -0700
commit9a781e793a649c75d0054dee8271fc611318dd25 (patch)
tree6df312134c62c09bea19e6b4a8fc32827fb80c48 /OpenSim
parentFix a nullref in permissions when returning objects via right-click (diff)
downloadopensim-SC_OLD-9a781e793a649c75d0054dee8271fc611318dd25.zip
opensim-SC_OLD-9a781e793a649c75d0054dee8271fc611318dd25.tar.gz
opensim-SC_OLD-9a781e793a649c75d0054dee8271fc611318dd25.tar.bz2
opensim-SC_OLD-9a781e793a649c75d0054dee8271fc611318dd25.tar.xz
* Updated libomv libraries to fix JSON (LLSD) decoding errors on null values and remove the unused OpenMetaverse.Http.dll and Mono.Security.dll
* Fixed a password hash comparison error in SimianAuthenticationServiceConnector.Authenticate()
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
index cc53d6c..29c9219 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
114 { 114 {
115 string credential = identity["Credential"].AsString(); 115 string credential = identity["Credential"].AsString();
116 116
117 if (password == credential || Utils.MD5String(password) == credential) 117 if (password == credential || "$1$" + Utils.MD5String(password) == credential)
118 return Authorize(principalID); 118 return Authorize(principalID);
119 } 119 }
120 } 120 }