diff options
| author | BlueWall | 2012-02-29 14:42:36 -0500 |
|---|---|---|
| committer | BlueWall | 2012-02-29 14:42:36 -0500 |
| commit | df75f5ae374093a68fd8cce93928f660577bec9b (patch) | |
| tree | 29e165c9192fe70540342b292bdbb560d796e6d7 /OpenSim | |
| parent | Don't start pCampbot if the user doesn't supply bot firstname, lastname stub ... (diff) | |
| parent | Fix authentication for OpenID provider (diff) | |
| download | opensim-SC_OLD-df75f5ae374093a68fd8cce93928f660577bec9b.zip opensim-SC_OLD-df75f5ae374093a68fd8cce93928f660577bec9b.tar.gz opensim-SC_OLD-df75f5ae374093a68fd8cce93928f660577bec9b.tar.bz2 opensim-SC_OLD-df75f5ae374093a68fd8cce93928f660577bec9b.tar.xz | |
Merge branch 'master' of /home/opensim/src/opensim
Diffstat (limited to 'OpenSim')
| -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 48eb3f8..da19b2e 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(password + ":" + data.Data["passwordSalt"].ToString()); | 81 | string hashed = Util.Md5Hash(Util.Md5Hash(password) + ":" + data.Data["passwordSalt"].ToString()); |
| 82 | 82 | ||
| 83 | //m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString()); | 83 | // m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}; passonly {3}", password, hashed, data.Data["passwordHash"].ToString(), hashed2); |
| 84 | 84 | ||
| 85 | if (data.Data["passwordHash"].ToString() == hashed) | 85 | if (data.Data["passwordHash"].ToString() == hashed) |
| 86 | { | 86 | { |