Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

2010-03-22 18:51:07 +00:00 · 2010-03-22 18:51:07 +00:00 · d378c758e1
parent 70b0e07d1e 9a781e793a
commit d378c758e1
6 changed files with 1 additions and 1 deletions
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@ -114,7 +114,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                        {
                            string credential = identity["Credential"].AsString();
-                            if (password == credential || Utils.MD5String(password) == credential)
+                            if (password == credential || "$1$" + Utils.MD5String(password) == credential)
                                return Authorize(principalID);
                        }
                    }
--- a/bin/Mono.Security.dll
+++ b/bin/Mono.Security.dll
--- a/bin/OpenMetaverse.Http.dll
+++ b/bin/OpenMetaverse.Http.dll
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll