diff options
author | Melanie | 2012-08-15 23:31:38 +0200 |
---|---|---|
committer | Melanie | 2012-08-15 23:31:38 +0200 |
commit | c313de630f2fec6793da2bc1f51dd54be82cb3e8 (patch) | |
tree | 5c8b5800bc1cbad6c2d882deba0ba93aac21f2b3 /OpenSim/Services/Connectors | |
parent | Implementing PRIM_LINK_TARGET in a non-recursive fashion (diff) | |
download | opensim-SC_OLD-c313de630f2fec6793da2bc1f51dd54be82cb3e8.zip opensim-SC_OLD-c313de630f2fec6793da2bc1f51dd54be82cb3e8.tar.gz opensim-SC_OLD-c313de630f2fec6793da2bc1f51dd54be82cb3e8.tar.bz2 opensim-SC_OLD-c313de630f2fec6793da2bc1f51dd54be82cb3e8.tar.xz |
Add a real_id field to the login response if impersonation is used. The wrapper
script needs this for proper logging.
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r-- | OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs | 7 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs b/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs index 2b77154..f996aca 100644 --- a/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs +++ b/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs | |||
@@ -81,6 +81,13 @@ namespace OpenSim.Services.Connectors | |||
81 | m_ServerURI = serviceURI; | 81 | m_ServerURI = serviceURI; |
82 | } | 82 | } |
83 | 83 | ||
84 | public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID) | ||
85 | { | ||
86 | realID = UUID.Zero; | ||
87 | |||
88 | return Authenticate(principalID, password, lifetime); | ||
89 | } | ||
90 | |||
84 | public string Authenticate(UUID principalID, string password, int lifetime) | 91 | public string Authenticate(UUID principalID, string password, int lifetime) |
85 | { | 92 | { |
86 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 93 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs index 69f6ed2..331d485 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |||
@@ -102,6 +102,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
102 | m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector"); | 102 | m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector"); |
103 | } | 103 | } |
104 | 104 | ||
105 | public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID) | ||
106 | { | ||
107 | return Authenticate(principalID, password, lifetime); | ||
108 | } | ||
109 | |||
105 | public string Authenticate(UUID principalID, string password, int lifetime) | 110 | public string Authenticate(UUID principalID, string password, int lifetime) |
106 | { | 111 | { |
107 | NameValueCollection requestArgs = new NameValueCollection | 112 | NameValueCollection requestArgs = new NameValueCollection |