commit 616b293e1d68fd6a44c6fd8e8196b7372b9a37eb
author Robert Shearman <rob@codeweavers.com> Wed May 25 09:54:05 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed May 25 09:54:05 2005 +0000
tree 54545412c1c38a6671335ad88855feb6c827061a
parent 2218c6e479d843c264f044f68a5518e8f3338b0f

- Print commas between ACE's.
- Dump access masks from all ACE's.

server/trace.c

diff --git a/server/trace.c b/server/trace.c
index a4bc23d..87b4cff 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -459,30 +459,35 @@
         for (i = 0; i < acl->AceCount; i++)
         {
             const SID *sid = NULL;
-    
+
             if (size < sizeof(ACE_HEADER))
                 return;
             if (size < ace->AceSize)
                 return;
             size -= ace->AceSize;
+            if (i != 0) fputc( ',', stderr );
             fprintf( stderr, "{AceType=" );
             switch (ace->AceType)
             {
             case ACCESS_DENIED_ACE_TYPE:
                 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;
             case ACCESS_ALLOWED_ACE_TYPE:
                 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;
             case SYSTEM_AUDIT_ACE_TYPE:
                 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;
             case SYSTEM_ALARM_ACE_TYPE:
                 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;
             default:
                 fprintf( stderr, "unknown<%d>", ace->AceType );