diff options
| author | BlueWall | 2012-03-02 15:02:09 -0500 |
|---|---|---|
| committer | BlueWall | 2012-03-02 15:02:09 -0500 |
| commit | 6fc350725da5132eefe14897644d672ce586c5db (patch) | |
| tree | d73af5d1d9bc61143fbac24a4dd54256a1394c97 /OpenSim/Services | |
| parent | Merge branch 'master' of /home/opensim/src/opensim into v3_support (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-6fc350725da5132eefe14897644d672ce586c5db.zip opensim-SC_OLD-6fc350725da5132eefe14897644d672ce586c5db.tar.gz opensim-SC_OLD-6fc350725da5132eefe14897644d672ce586c5db.tar.bz2 opensim-SC_OLD-6fc350725da5132eefe14897644d672ce586c5db.tar.xz | |
Merge branch 'master' into v3_support
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs index da19b2e..48eb3f8 100644 --- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||
| @@ -78,9 +78,9 @@ namespace OpenSim.Services.AuthenticationService | |||
| 78 | } | 78 | } |
| 79 | else | 79 | else |
| 80 | { | 80 | { |
| 81 | string hashed = Util.Md5Hash(Util.Md5Hash(password) + ":" + data.Data["passwordSalt"].ToString()); | 81 | string hashed = Util.Md5Hash(password + ":" + data.Data["passwordSalt"].ToString()); |
| 82 | 82 | ||
| 83 | // m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}; passonly {3}", password, hashed, data.Data["passwordHash"].ToString(), hashed2); | 83 | //m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString()); |
| 84 | 84 | ||
| 85 | if (data.Data["passwordHash"].ToString() == hashed) | 85 | if (data.Data["passwordHash"].ToString() == hashed) |
| 86 | { | 86 | { |