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

author: Melanie 2010-06-02 01:22:10 +0100
committer: Melanie 2010-06-02 01:22:10 +0100
commit: b198763d6755aa6d6d0ffc078ae6715474e51732 (patch)
tree: 34b6d427556ff129af6e4a75e906c8b19fa41eb3 /OpenSim/Services
parent: Add a forgotten security check. Make the new functions only work on prims (diff)
parent: Applying patch from coyled to fix IAR support with the SimianGrid connectors (diff)
download: opensim-SC_OLD-b198763d6755aa6d6d0ffc078ae6715474e51732.zip
opensim-SC_OLD-b198763d6755aa6d6d0ffc078ae6715474e51732.tar.gz
opensim-SC_OLD-b198763d6755aa6d6d0ffc078ae6715474e51732.tar.bz2
opensim-SC_OLD-b198763d6755aa6d6d0ffc078ae6715474e51732.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
index b19135e..de3ee4e 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                        {
                            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);
                            md5hashFound = true;
author	Melanie	2010-06-02 01:22:10 +0100
committer	Melanie	2010-06-02 01:22:10 +0100
commit	b198763d6755aa6d6d0ffc078ae6715474e51732 (patch)
tree	34b6d427556ff129af6e4a75e906c8b19fa41eb3 /OpenSim/Services
parent	Add a forgotten security check. Make the new functions only work on prims (diff)
parent	Applying patch from coyled to fix IAR support with the SimianGrid connectors (diff)
download	opensim-SC_OLD-b198763d6755aa6d6d0ffc078ae6715474e51732.zip opensim-SC_OLD-b198763d6755aa6d6d0ffc078ae6715474e51732.tar.gz opensim-SC_OLD-b198763d6755aa6d6d0ffc078ae6715474e51732.tar.bz2 opensim-SC_OLD-b198763d6755aa6d6d0ffc078ae6715474e51732.tar.xz

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs index b19135e..de3ee4e 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
116	{	116	{
117	string credential = identity["Credential"].AsString();	117	string credential = identity["Credential"].AsString();
118		118
119	if (password == credential \|\| "$1$" + Utils.MD5String(password) == credential \|\| Utils.MD5String(password) == credential)	119	if (password == credential \|\| "$1$" + password == credential \|\| "$1$" + Utils.MD5String(password) == credential \|\| Utils.MD5String(password) == credential)
120	return Authorize(principalID);	120	return Authorize(principalID);
121		121
122	md5hashFound = true;	122	md5hashFound = true;