diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | |
parent | Add a build script. (diff) | |
download | opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to 'OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs')
-rw-r--r-- | OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs index 229f557..f66b4e2 100644 --- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs +++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | |||
@@ -30,17 +30,18 @@ using OpenMetaverse; | |||
30 | using log4net; | 30 | using log4net; |
31 | using Nini.Config; | 31 | using Nini.Config; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Server.Base; | ||
34 | using OpenSim.Services.Interfaces; | ||
33 | using OpenSim.Data; | 35 | using OpenSim.Data; |
34 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
35 | using OpenSim.Services.Base; | 37 | using OpenSim.Services.Base; |
36 | using OpenSim.Services.Interfaces; | ||
37 | 38 | ||
38 | namespace OpenSim.Services.AuthenticationService | 39 | namespace OpenSim.Services.AuthenticationService |
39 | { | 40 | { |
40 | // Generic Authentication service used for identifying | 41 | // Generic Authentication service used for identifying |
41 | // and authenticating principals. | 42 | // and authenticating principals. |
42 | // Principals may be clients acting on users' behalf, | 43 | // Principals may be clients acting on users' behalf, |
43 | // or any other components that need | 44 | // or any other components that need |
44 | // verifiable identification. | 45 | // verifiable identification. |
45 | // | 46 | // |
46 | public class AuthenticationServiceBase : ServiceBase | 47 | public class AuthenticationServiceBase : ServiceBase |
@@ -48,8 +49,14 @@ namespace OpenSim.Services.AuthenticationService | |||
48 | private static readonly ILog m_log = | 49 | private static readonly ILog m_log = |
49 | LogManager.GetLogger( | 50 | LogManager.GetLogger( |
50 | MethodBase.GetCurrentMethod().DeclaringType); | 51 | MethodBase.GetCurrentMethod().DeclaringType); |
51 | 52 | ||
52 | protected IAuthenticationData m_Database; | 53 | protected IAuthenticationData m_Database; |
54 | protected IUserAccountService m_UserAccountService = null; | ||
55 | |||
56 | public AuthenticationServiceBase(IConfigSource config, IUserAccountService acct) : this(config) | ||
57 | { | ||
58 | m_UserAccountService = acct; | ||
59 | } | ||
53 | 60 | ||
54 | public AuthenticationServiceBase(IConfigSource config) : base(config) | 61 | public AuthenticationServiceBase(IConfigSource config) : base(config) |
55 | { | 62 | { |
@@ -171,7 +178,7 @@ namespace OpenSim.Services.AuthenticationService | |||
171 | m_log.DebugFormat("[AUTHENTICATION DB]: Set authentication info for principalID {0}", info.PrincipalID); | 178 | m_log.DebugFormat("[AUTHENTICATION DB]: Set authentication info for principalID {0}", info.PrincipalID); |
172 | return true; | 179 | return true; |
173 | } | 180 | } |
174 | 181 | ||
175 | protected string GetToken(UUID principalID, int lifetime) | 182 | protected string GetToken(UUID principalID, int lifetime) |
176 | { | 183 | { |
177 | UUID token = UUID.Random(); | 184 | UUID token = UUID.Random(); |