win: fix SECURITY_DESCRIPTOR builder on vs2013

After https://chromium.googlesource.com/crashpad/crashpad/+/5b83e587.

R=mark@chromium.org
BUG=chromium:655788,chromium:656800

Change-Id: Ic33b9daedc340bfce3cc4ddde4eb4c93f68e7ad0
Reviewed-on: https://chromium-review.googlesource.com/417412
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Scott Graham 2016-12-07 13:25:02 -08:00
parent 5b83e58771
commit f94dd14c45

View File

@ -166,8 +166,8 @@ const void* GetSecurityDescriptorForNamedPipeInstance(size_t* size) {
{ {
ACL_REVISION, // AclRevision. ACL_REVISION, // AclRevision.
0, // Sbz1. 0, // Sbz1.
sizeof(SecurityDescriptorBlob::sacl), // AclSize. sizeof(kSecDescBlob.sacl), // AclSize.
arraysize(SecurityDescriptorBlob::sacl.ace), // AceCount. arraysize(kSecDescBlob.sacl.ace), // AceCount.
0, // Sbz2. 0, // Sbz2.
}, },
@ -178,7 +178,7 @@ const void* GetSecurityDescriptorForNamedPipeInstance(size_t* size) {
{ {
SYSTEM_MANDATORY_LABEL_ACE_TYPE, // AceType. SYSTEM_MANDATORY_LABEL_ACE_TYPE, // AceType.
0, // AceFlags. 0, // AceFlags.
sizeof(SecurityDescriptorBlob::sacl.ace[0]), // AceSize. sizeof(kSecDescBlob.sacl.ace[0]), // AceSize.
}, },
// mask. // mask.
@ -188,8 +188,7 @@ const void* GetSecurityDescriptorForNamedPipeInstance(size_t* size) {
{ {
SID_REVISION, // Revision. SID_REVISION, // Revision.
// SubAuthorityCount. // SubAuthorityCount.
arraysize( arraysize(kSecDescBlob.sacl.ace[0].sid.SubAuthority),
SecurityDescriptorBlob::sacl.ace[0].sid.SubAuthority),
// IdentifierAuthority. // IdentifierAuthority.
SECURITY_MANDATORY_LABEL_AUTHORITY, SECURITY_MANDATORY_LABEL_AUTHORITY,
{SECURITY_MANDATORY_UNTRUSTED_RID}, // SubAuthority. {SECURITY_MANDATORY_UNTRUSTED_RID}, // SubAuthority.