Commit 616b293e authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard

- Print commas between ACE's.

- Dump access masks from all ACE's.
parent 2218c6e4
...@@ -459,30 +459,35 @@ static void dump_inline_acl( const ACL *acl, size_t size ) ...@@ -459,30 +459,35 @@ static void dump_inline_acl( const ACL *acl, size_t size )
for (i = 0; i < acl->AceCount; i++) for (i = 0; i < acl->AceCount; i++)
{ {
const SID *sid = NULL; const SID *sid = NULL;
if (size < sizeof(ACE_HEADER)) if (size < sizeof(ACE_HEADER))
return; return;
if (size < ace->AceSize) if (size < ace->AceSize)
return; return;
size -= ace->AceSize; size -= ace->AceSize;
if (i != 0) fputc( ',', stderr );
fprintf( stderr, "{AceType=" ); fprintf( stderr, "{AceType=" );
switch (ace->AceType) switch (ace->AceType)
{ {
case ACCESS_DENIED_ACE_TYPE: case ACCESS_DENIED_ACE_TYPE:
sid = (const SID *)&((const ACCESS_DENIED_ACE *)ace)->SidStart; sid = (const SID *)&((const ACCESS_DENIED_ACE *)ace)->SidStart;
fprintf( stderr, "ACCESS_DENIED_ACE_TYPE" ); fprintf( stderr, "ACCESS_DENIED_ACE_TYPE,Mask=%lx",
((const ACCESS_DENIED_ACE *)ace)->Mask );
break; break;
case ACCESS_ALLOWED_ACE_TYPE: case ACCESS_ALLOWED_ACE_TYPE:
sid = (const SID *)&((const ACCESS_ALLOWED_ACE *)ace)->SidStart; sid = (const SID *)&((const ACCESS_ALLOWED_ACE *)ace)->SidStart;
fprintf( stderr, "ACCESS_ALLOWED_ACE_TYPE" ); fprintf( stderr, "ACCESS_ALLOWED_ACE_TYPE,Mask=%lx",
((const ACCESS_ALLOWED_ACE *)ace)->Mask );
break; break;
case SYSTEM_AUDIT_ACE_TYPE: case SYSTEM_AUDIT_ACE_TYPE:
sid = (const SID *)&((const SYSTEM_AUDIT_ACE *)ace)->SidStart; sid = (const SID *)&((const SYSTEM_AUDIT_ACE *)ace)->SidStart;
fprintf( stderr, "SYSTEM_AUDIT_ACE_TYPE" ); fprintf( stderr, "SYSTEM_AUDIT_ACE_TYPE,Mask=%lx",
((const SYSTEM_AUDIT_ACE *)ace)->Mask );
break; break;
case SYSTEM_ALARM_ACE_TYPE: case SYSTEM_ALARM_ACE_TYPE:
sid = (const SID *)&((const SYSTEM_ALARM_ACE *)ace)->SidStart; sid = (const SID *)&((const SYSTEM_ALARM_ACE *)ace)->SidStart;
fprintf( stderr, "SYSTEM_ALARM_ACE_TYPE" ); fprintf( stderr, "SYSTEM_ALARM_ACE_TYPE,Mask=%lx",
((const SYSTEM_ALARM_ACE *)ace)->Mask );
break; break;
default: default:
fprintf( stderr, "unknown<%d>", ace->AceType ); fprintf( stderr, "unknown<%d>", ace->AceType );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment