aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Services
diff options
context:
space:
mode:
authordiva2009-03-30 17:34:36 +0000
committerdiva2009-03-30 17:34:36 +0000
commit695780375924693105aa9b5a06bfe81a28393373 (patch)
treeed2a5d35411c8f23a93690214724efd387f5922c /OpenSim/Framework/Communications/Services
parent* Remove a debug line of localIDs (diff)
downloadopensim-SC_OLD-695780375924693105aa9b5a06bfe81a28393373.zip
opensim-SC_OLD-695780375924693105aa9b5a06bfe81a28393373.tar.gz
opensim-SC_OLD-695780375924693105aa9b5a06bfe81a28393373.tar.bz2
opensim-SC_OLD-695780375924693105aa9b5a06bfe81a28393373.tar.xz
Sigh. Manual data typing grief.
Diffstat (limited to 'OpenSim/Framework/Communications/Services')
-rw-r--r--OpenSim/Framework/Communications/Services/HGInventoryService.cs3
-rw-r--r--OpenSim/Framework/Communications/Services/HGLoginAuthService.cs13
2 files changed, 5 insertions, 11 deletions
diff --git a/OpenSim/Framework/Communications/Services/HGInventoryService.cs b/OpenSim/Framework/Communications/Services/HGInventoryService.cs
index eef9e80..b01c30e 100644
--- a/OpenSim/Framework/Communications/Services/HGInventoryService.cs
+++ b/OpenSim/Framework/Communications/Services/HGInventoryService.cs
@@ -490,7 +490,7 @@ namespace OpenSim.Framework.Communications.Services
490 // This is the meaning of POST agent 490 // This is the meaning of POST agent
491 491
492 // Check Auth Token 492 // Check Auth Token
493 if (!(m_userService is IAuthentication)) 493 if ((m_userService != null) && !(m_userService is IAuthentication))
494 { 494 {
495 m_log.Debug("[HGStandaloneInvService]: UserService is not IAuthentication. Denying access to inventory."); 495 m_log.Debug("[HGStandaloneInvService]: UserService is not IAuthentication. Denying access to inventory.");
496 responsedata["int_response_code"] = 501; 496 responsedata["int_response_code"] = 501;
@@ -499,6 +499,7 @@ namespace OpenSim.Framework.Communications.Services
499 } 499 }
500 500
501 bool success = VerifyKey(userID, authToken); 501 bool success = VerifyKey(userID, authToken);
502 m_log.Debug("[HGStandaloneInvService]: Key verification returned " + success);
502 503
503 if (success) 504 if (success)
504 { 505 {
diff --git a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
index cd4ca5c..72e2dfb 100644
--- a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
+++ b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
@@ -161,14 +161,6 @@ namespace OpenSim.Framework.Communications.Services
161 161
162 public XmlRpcResponse XmlRpcVerifyKeyMethod(XmlRpcRequest request) 162 public XmlRpcResponse XmlRpcVerifyKeyMethod(XmlRpcRequest request)
163 { 163 {
164 foreach (object o in request.Params)
165 {
166 if (o != null)
167 m_log.Debug(" >> Param " + o.ToString());
168 else
169 m_log.Debug(" >> Null");
170 }
171
172 bool success = false; 164 bool success = false;
173 165
174 if (request.Params.Count >= 2) 166 if (request.Params.Count >= 2)
@@ -180,7 +172,7 @@ namespace OpenSim.Framework.Communications.Services
180 { 172 {
181 authKey = (string)request.Params[1]; 173 authKey = (string)request.Params[1];
182 174
183 m_log.InfoFormat("[HGLOGIN] HGVerifyKey called with key ", authKey); 175 m_log.InfoFormat("[HGLOGIN] HGVerifyKey called with key {0}", authKey);
184 176
185 if (!(m_userManager is IAuthentication)) 177 if (!(m_userManager is IAuthentication))
186 { 178 {
@@ -193,8 +185,9 @@ namespace OpenSim.Framework.Communications.Services
193 } 185 }
194 } 186 }
195 187
188 m_log.DebugFormat("[HGLOGIN]: Response to VerifyKey is {0}", success);
196 XmlRpcResponse response = new XmlRpcResponse(); 189 XmlRpcResponse response = new XmlRpcResponse();
197 response.Value = (string)success.ToString(); 190 response.Value = success;
198 return response; 191 return response;
199 } 192 }
200 193