Merge branch 'master' of /home/opensim/src/opensim into v3_support

0.7.4.1
BlueWall 2012-02-29 14:39:51 -05:00
commit afc9a7d3f9
1 changed files with 2 additions and 2 deletions

View File

@ -78,9 +78,9 @@ namespace OpenSim.Services.AuthenticationService
}
else
{
string hashed = Util.Md5Hash(password + ":" + data.Data["passwordSalt"].ToString());
string hashed = Util.Md5Hash(Util.Md5Hash(password) + ":" + data.Data["passwordSalt"].ToString());
//m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString());
// m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}; passonly {3}", password, hashed, data.Data["passwordHash"].ToString(), hashed2);
if (data.Data["passwordHash"].ToString() == hashed)
{