diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs index 0204699..aef3e9f 100644 --- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||
@@ -87,6 +87,7 @@ namespace OpenSim.Services.AuthenticationService | |||
87 | if (!data.Data.ContainsKey("passwordHash") || | 87 | if (!data.Data.ContainsKey("passwordHash") || |
88 | !data.Data.ContainsKey("passwordSalt")) | 88 | !data.Data.ContainsKey("passwordSalt")) |
89 | { | 89 | { |
90 | m_log.DebugFormat("[AUTH SERVICE]: No credentials."); | ||
90 | return String.Empty; | 91 | return String.Empty; |
91 | } | 92 | } |
92 | 93 | ||
@@ -109,9 +110,12 @@ namespace OpenSim.Services.AuthenticationService | |||
109 | int impersonateFlag = 1 << 6; | 110 | int impersonateFlag = 1 << 6; |
110 | 111 | ||
111 | if ((user.UserFlags & impersonateFlag) == 0) | 112 | if ((user.UserFlags & impersonateFlag) == 0) |
113 | { | ||
114 | m_log.DebugFormat("[AUTH SERVICE]: Not trying impersonation {0} {1}.", user.UserFlags, impersonateFlag); | ||
112 | return String.Empty; | 115 | return String.Empty; |
116 | } | ||
113 | 117 | ||
114 | m_log.DebugFormat("[PASS AUTH]: Attempting impersonation"); | 118 | m_log.DebugFormat("[PASS AUTH]: Attempting impersonation."); |
115 | 119 | ||
116 | List<UserAccount> accounts = m_UserAccountService.GetUserAccountsWhere(UUID.Zero, "UserLevel >= 200"); | 120 | List<UserAccount> accounts = m_UserAccountService.GetUserAccountsWhere(UUID.Zero, "UserLevel >= 200"); |
117 | if (accounts == null || accounts.Count == 0) | 121 | if (accounts == null || accounts.Count == 0) |
@@ -134,7 +138,7 @@ namespace OpenSim.Services.AuthenticationService | |||
134 | 138 | ||
135 | if (data.Data["passwordHash"].ToString() == hashed) | 139 | if (data.Data["passwordHash"].ToString() == hashed) |
136 | { | 140 | { |
137 | m_log.DebugFormat("[PASS AUTH]: {0} {1} impersonating {2}, proceeding with login", a.FirstName, a.LastName, principalID); | 141 | m_log.InfoFormat("[PASS AUTH]: {0} {1} impersonating {2}, proceeding with login", a.FirstName, a.LastName, principalID); |
138 | realID = a.PrincipalID; | 142 | realID = a.PrincipalID; |
139 | return GetToken(principalID, lifetime); | 143 | return GetToken(principalID, lifetime); |
140 | } | 144 | } |
@@ -146,7 +150,7 @@ namespace OpenSim.Services.AuthenticationService | |||
146 | // } | 150 | // } |
147 | } | 151 | } |
148 | 152 | ||
149 | m_log.DebugFormat("[PASS AUTH]: Impersonation of {0} failed", principalID); | 153 | m_log.InfoFormat("[PASS AUTH]: Impersonation of {0} failed", principalID); |
150 | return String.Empty; | 154 | return String.Empty; |
151 | } | 155 | } |
152 | } | 156 | } |