From 616b293e1d68fd6a44c6fd8e8196b7372b9a37eb Mon Sep 17 00:00:00 2001
From: Robert Shearman <rob@codeweavers.com>
Date: Wed, 25 May 2005 09:54:05 +0000
Subject: [PATCH] - Print commas between ACE's. - Dump access masks from all
 ACE's.

---
 server/trace.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/server/trace.c b/server/trace.c
index a4bc23d67b..87b4cfff2c 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -459,30 +459,35 @@ static void dump_inline_acl( const ACL *acl, size_t size )
         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 );