Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -33,6 +33,7 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Security.Permissions;
using System.Security.Claims;
namespace System.Security.Principal {
@@ -113,6 +114,15 @@ namespace System.Security.Principal {
_info = info;
}
internal WindowsIdentity (ClaimsIdentity claimsIdentity, IntPtr userToken)
: base (claimsIdentity)
{
if (userToken != IntPtr.Zero && userToken.ToInt64() > 0)
{
SetToken (userToken);
}
}
[ComVisible (false)]
public void Dispose ()
{
@@ -269,6 +279,16 @@ namespace System.Security.Principal {
info.AddValue ("m_isAuthenticated", _authenticated);
}
internal ClaimsIdentity CloneAsBase ()
{
return base.Clone();
}
internal IntPtr GetTokenInternal ()
{
return _token;
}
private void SetToken (IntPtr token)
{
if (Environment.IsUnix) {