Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
commit
998bd48d98
|
@ -140,6 +140,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
|
|||
public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
|
||||
{
|
||||
// Not implemented at the regions
|
||||
realID = UUID.Zero;
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
|
|
|
@ -65,7 +65,6 @@ namespace OpenSim.Services.AuthenticationService
|
|||
public string Authenticate(UUID principalID, string password, int lifetime)
|
||||
{
|
||||
UUID realID;
|
||||
|
||||
return Authenticate(principalID, password, lifetime, out realID);
|
||||
}
|
||||
|
||||
|
|
|
@ -63,7 +63,6 @@ namespace OpenSim.Services.AuthenticationService
|
|||
public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
|
||||
{
|
||||
realID = UUID.Zero;
|
||||
|
||||
return Authenticate(principalID, password, lifetime);
|
||||
}
|
||||
|
||||
|
|
|
@ -64,6 +64,7 @@ namespace OpenSim.Services.AuthenticationService
|
|||
{
|
||||
AuthenticationData data = m_Database.Get(principalID);
|
||||
string result = String.Empty;
|
||||
realID = UUID.Zero;
|
||||
if (data != null && data.Data != null)
|
||||
{
|
||||
if (data.Data.ContainsKey("webLoginKey"))
|
||||
|
@ -85,7 +86,7 @@ namespace OpenSim.Services.AuthenticationService
|
|||
}
|
||||
}
|
||||
|
||||
realID = UUID.Zero;
|
||||
|
||||
|
||||
if (result == string.Empty)
|
||||
{
|
||||
|
@ -96,6 +97,8 @@ namespace OpenSim.Services.AuthenticationService
|
|||
{
|
||||
m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID);
|
||||
}
|
||||
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -104,6 +104,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
|||
|
||||
public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
|
||||
{
|
||||
realID = UUID.Zero;
|
||||
return Authenticate(principalID, password, lifetime);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue