aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
index 769c3c2..9d12d47 100644
--- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
@@ -64,6 +64,15 @@ namespace OpenSim.Services.AuthenticationService
64 64
65 public string Authenticate(UUID principalID, string password, int lifetime) 65 public string Authenticate(UUID principalID, string password, int lifetime)
66 { 66 {
67 UUID realID;
68
69 return Authenticate(principalID, password, lifetime, out realID);
70 }
71
72 public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
73 {
74 realID = UUID.Zero;
75
67 m_log.DebugFormat("[AUTH SERVICE]: Authenticating for {0}, user account service present: {1}", principalID, m_UserAccountService != null); 76 m_log.DebugFormat("[AUTH SERVICE]: Authenticating for {0}, user account service present: {1}", principalID, m_UserAccountService != null);
68 AuthenticationData data = m_Database.Get(principalID); 77 AuthenticationData data = m_Database.Get(principalID);
69 UserAccount user = null; 78 UserAccount user = null;
@@ -127,6 +136,7 @@ namespace OpenSim.Services.AuthenticationService
127 if (data.Data["passwordHash"].ToString() == hashed) 136 if (data.Data["passwordHash"].ToString() == hashed)
128 { 137 {
129 m_log.DebugFormat("[PASS AUTH]: {0} {1} impersonating {2}, proceeding with login", a.FirstName, a.LastName, principalID); 138 m_log.DebugFormat("[PASS AUTH]: {0} {1} impersonating {2}, proceeding with login", a.FirstName, a.LastName, principalID);
139 realID = a.PrincipalID;
130 return GetToken(principalID, lifetime); 140 return GetToken(principalID, lifetime);
131 } 141 }
132// else 142// else