aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2010-09-03 13:37:30 -0700
committerJohn Hurliman2010-09-03 13:37:30 -0700
commit83f6550bcca7d246de2d850f70a346070c4cc745 (patch)
tree84c4d672490028659302da323e8daede4af79ac6
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
parentAdd another variant of password hash construction to SimianAuthenticationServ... (diff)
downloadopensim-SC_OLD-83f6550bcca7d246de2d850f70a346070c4cc745.zip
opensim-SC_OLD-83f6550bcca7d246de2d850f70a346070c4cc745.tar.gz
opensim-SC_OLD-83f6550bcca7d246de2d850f70a346070c4cc745.tar.bz2
opensim-SC_OLD-83f6550bcca7d246de2d850f70a346070c4cc745.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
index 7f48bbd..f1c2575 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -249,7 +249,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
249 if (password == simianGridCredential || 249 if (password == simianGridCredential ||
250 "$1$" + password == simianGridCredential || 250 "$1$" + password == simianGridCredential ||
251 "$1$" + Utils.MD5String(password) == simianGridCredential || 251 "$1$" + Utils.MD5String(password) == simianGridCredential ||
252 Utils.MD5String(password) == simianGridCredential) 252 Utils.MD5String(password) == simianGridCredential ||
253 "$1$" + Utils.MD5String(password + ":") == simianGridCredential)
253 { 254 {
254 authorizeResult = Authorize(userID); 255 authorizeResult = Authorize(userID);
255 return true; 256 return true;