diff options
author | John Hurliman | 2010-03-20 19:21:58 -0700 |
---|---|---|
committer | John Hurliman | 2010-03-20 19:21:58 -0700 |
commit | 9a781e793a649c75d0054dee8271fc611318dd25 (patch) | |
tree | 6df312134c62c09bea19e6b4a8fc32827fb80c48 | |
parent | Fix a nullref in permissions when returning objects via right-click (diff) | |
download | opensim-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()
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | 2 | ||||
-rw-r--r-- | bin/Mono.Security.dll | bin | 289792 -> 0 bytes | |||
-rw-r--r-- | bin/OpenMetaverse.Http.dll | bin | 36864 -> 0 bytes | |||
-rw-r--r-- | bin/OpenMetaverse.StructuredData.dll | bin | 102400 -> 102400 bytes | |||
-rw-r--r-- | bin/OpenMetaverse.dll | bin | 1675264 -> 1691648 bytes | |||
-rw-r--r-- | bin/OpenMetaverseTypes.dll | bin | 106496 -> 106496 bytes |
6 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 | } |
diff --git a/bin/Mono.Security.dll b/bin/Mono.Security.dll deleted file mode 100644 index c027c19..0000000 --- a/bin/Mono.Security.dll +++ /dev/null | |||
Binary files differ | |||
diff --git a/bin/OpenMetaverse.Http.dll b/bin/OpenMetaverse.Http.dll deleted file mode 100644 index dbbe4d3..0000000 --- a/bin/OpenMetaverse.Http.dll +++ /dev/null | |||
Binary files differ | |||
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll index 0e571d8..f4992a2 100644 --- a/bin/OpenMetaverse.StructuredData.dll +++ b/bin/OpenMetaverse.StructuredData.dll | |||
Binary files differ | |||
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll index a35b5ae..8751bfc 100644 --- a/bin/OpenMetaverse.dll +++ b/bin/OpenMetaverse.dll | |||
Binary files differ | |||
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index c5efaf4..6c6440e 100644 --- a/bin/OpenMetaverseTypes.dll +++ b/bin/OpenMetaverseTypes.dll | |||
Binary files differ | |||