OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

re-enable registration of user service authentication method I accidentally disabled a few commits ago 

load/save iar on a grid should now work, provided that the user service is this revision or newer
remotes/origin/0.6.7-post-fixes
Justin Clark-Casey (justincc) 2009-09-24 15:22:47 +01:00
parent f62b5e6cec
commit e1abc3d4c4
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Grid/UserServer.Modules/UserManager.cs
View File

@ -109,7 +109,7 @@ namespace OpenSim.Grid.UserServer.Modules
m_httpServer.AddXmlRPCHandler("get_avatar_picker_avatar", XmlRPCGetAvatarPickerAvatar);
// Used by IAR module to do password checks
//m_httpServer.AddXmlRPCHandler("authenticate_user_by_password", XmlRPCAuthenticateUserMethodPassword);
m_httpServer.AddXmlRPCHandler("authenticate_user_by_password", XmlRPCAuthenticateUserMethodPassword);
m_httpServer.AddXmlRPCHandler("update_user_current_region", XmlRPCAtRegion);
m_httpServer.AddXmlRPCHandler("logout_of_simulator", XmlRPCLogOffUserMethodUUID);

12
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@ -153,8 +153,7 @@ namespace OpenSim.Region.Communications.OGS1
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000);
// Temporary measure to deal with older services
if (resp.IsFault && resp.FaultCode == XmlRpcErrorCodes.SERVER_ERROR_METHOD)
//if ((string)respData["fault_code"] != null && (string)respData["fault_code"] ==
if (resp.IsFault && resp.FaultCode == XmlRpcErrorCodes.SERVER_ERROR_METHOD)
{
throw new Exception(
String.Format(
@ -164,15 +163,6 @@ namespace OpenSim.Region.Communications.OGS1
Hashtable respData = (Hashtable)resp.Value;
// foreach (object key in respData.Keys)
// {
// Console.WriteLine("respData {0}, {1}", key, respData[key]);
// }
// m_log.DebugFormat(
// "[OGS1 USER SERVICES]: AuthenticatedUserByPassword response for {0} is [{1}]",
// userID, respData["auth_user"]);
if ((string)respData["auth_user"] == "TRUE")
{
return true;