Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
commit
b198763d67
|
@ -116,7 +116,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
||||||
{
|
{
|
||||||
string credential = identity["Credential"].AsString();
|
string credential = identity["Credential"].AsString();
|
||||||
|
|
||||||
if (password == credential || "$1$" + Utils.MD5String(password) == credential || Utils.MD5String(password) == credential)
|
if (password == credential || "$1$" + password == credential || "$1$" + Utils.MD5String(password) == credential || Utils.MD5String(password) == credential)
|
||||||
return Authorize(principalID);
|
return Authorize(principalID);
|
||||||
|
|
||||||
md5hashFound = true;
|
md5hashFound = true;
|
||||||
|
|
Loading…
Reference in New Issue