diff options
| author | Melanie | 2011-11-11 23:43:18 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-11 23:43:18 +0000 |
| commit | a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e (patch) | |
| tree | f19e00c12dfe753ee218eccd98b5a21304018247 /OpenSim/Services | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Make log messages on authentication failure more explicit (diff) | |
| download | opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.zip opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.tar.gz opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.tar.bz2 opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs index cf7496f..d5a6521 100644 --- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||
| @@ -125,6 +125,13 @@ namespace OpenSim.Services.AuthenticationService | |||
| 125 | m_log.DebugFormat("[PASS AUTH]: {0} {1} impersonating {2}, proceeding with login", a.FirstName, a.LastName, principalID); | 125 | m_log.DebugFormat("[PASS AUTH]: {0} {1} impersonating {2}, proceeding with login", a.FirstName, a.LastName, principalID); |
| 126 | return GetToken(principalID, lifetime); | 126 | return GetToken(principalID, lifetime); |
| 127 | } | 127 | } |
| 128 | else | ||
| 129 | { | ||
| 130 | m_log.DebugFormat( | ||
| 131 | "[AUTH SERVICE]: Salted hash {0} of given password did not match salted hash of {1} for PrincipalID {2}. Authentication failure.", | ||
| 132 | principalID); | ||
| 133 | return String.Empty; | ||
| 134 | } | ||
| 128 | } | 135 | } |
| 129 | 136 | ||
| 130 | m_log.DebugFormat("[PASS AUTH]: Impersonation of {0} failed", principalID); | 137 | m_log.DebugFormat("[PASS AUTH]: Impersonation of {0} failed", principalID); |