diff options
| author | Justin Clark-Casey (justincc) | 2012-02-04 02:03:49 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-04 02:03:49 +0000 |
| commit | 1a14e660d29088e938d8ec8ba5b2c7e5baa17304 (patch) | |
| tree | 70f6d681a7b6a2aba9e7ef9b147c90af777f2d87 /OpenSim | |
| parent | Switch flavour to RC1. It will still be a while before RC1 is released. (diff) | |
| parent | Supply correct parameters to detailed authentication login fail message (diff) | |
| download | opensim-SC_OLD-1a14e660d29088e938d8ec8ba5b2c7e5baa17304.zip opensim-SC_OLD-1a14e660d29088e938d8ec8ba5b2c7e5baa17304.tar.gz opensim-SC_OLD-1a14e660d29088e938d8ec8ba5b2c7e5baa17304.tar.bz2 opensim-SC_OLD-1a14e660d29088e938d8ec8ba5b2c7e5baa17304.tar.xz | |
Merge branch 'master' into 0.7.3-post-fixes
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs index 14d96cb..48eb3f8 100644 --- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||
| @@ -90,7 +90,7 @@ namespace OpenSim.Services.AuthenticationService | |||
| 90 | { | 90 | { |
| 91 | m_log.DebugFormat( | 91 | m_log.DebugFormat( |
| 92 | "[AUTH SERVICE]: Salted hash {0} of given password did not match salted hash of {1} for PrincipalID {2}. Authentication failure.", | 92 | "[AUTH SERVICE]: Salted hash {0} of given password did not match salted hash of {1} for PrincipalID {2}. Authentication failure.", |
| 93 | principalID); | 93 | hashed, data.Data["passwordHash"], principalID); |
| 94 | return String.Empty; | 94 | return String.Empty; |
| 95 | } | 95 | } |
| 96 | } | 96 | } |