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

author: Melanie 2010-03-22 18:51:07 +0000
committer: Melanie 2010-03-22 18:51:07 +0000
commit: d378c758e1069507a9db837ed24f1e7c8a03c79a (patch)
tree: d8db7821aa2655ad99cc0d3ac0aa6dcb4f1dafb1
parent: Remove the reading of estate_settings.xml and the associated processing of (diff)
parent: * Updated libomv libraries to fix JSON (LLSD) decoding errors on null values ... (diff)
download: opensim-SC_OLD-d378c758e1069507a9db837ed24f1e7c8a03c79a.zip
opensim-SC_OLD-d378c758e1069507a9db837ed24f1e7c8a03c79a.tar.gz
opensim-SC_OLD-d378c758e1069507a9db837ed24f1e7c8a03c79a.tar.bz2
opensim-SC_OLD-d378c758e1069507a9db837ed24f1e7c8a03c79a.tar.xz
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
                        {
                            string credential = identity["Credential"].AsString();
-                            if (password == credential || Utils.MD5String(password) == credential)
+                            if (password == credential || "$1$" + Utils.MD5String(password) == credential)
                                return Authorize(principalID);
                        }
                    }
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
author	Melanie	2010-03-22 18:51:07 +0000
committer	Melanie	2010-03-22 18:51:07 +0000
commit	d378c758e1069507a9db837ed24f1e7c8a03c79a (patch)
tree	d8db7821aa2655ad99cc0d3ac0aa6dcb4f1dafb1
parent	Remove the reading of estate_settings.xml and the associated processing of (diff)
parent	* Updated libomv libraries to fix JSON (LLSD) decoding errors on null values ... (diff)
download	opensim-SC_OLD-d378c758e1069507a9db837ed24f1e7c8a03c79a.zip opensim-SC_OLD-d378c758e1069507a9db837ed24f1e7c8a03c79a.tar.gz opensim-SC_OLD-d378c758e1069507a9db837ed24f1e7c8a03c79a.tar.bz2 opensim-SC_OLD-d378c758e1069507a9db837ed24f1e7c8a03c79a.tar.xz

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