diff options
| author | BlueWall | 2012-02-29 15:52:15 -0500 |
|---|---|---|
| committer | BlueWall | 2012-02-29 15:52:15 -0500 |
| commit | 69c999033b4d5772c8eed0a90d5f9237785224ff (patch) | |
| tree | e6e467464058894f41ab362cdeb2d175602d9cb1 | |
| parent | Trigger a build (diff) | |
| download | opensim-SC-69c999033b4d5772c8eed0a90d5f9237785224ff.zip opensim-SC-69c999033b4d5772c8eed0a90d5f9237785224ff.tar.gz opensim-SC-69c999033b4d5772c8eed0a90d5f9237785224ff.tar.bz2 opensim-SC-69c999033b4d5772c8eed0a90d5f9237785224ff.tar.xz | |
Revert "Fix authentication for OpenID provider"
This reverts commit 9f597c2d423a80279c4aed042be8a991eedefa21. Fixing OpenID causes issues with other parts of the code.
| -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 | { |