libcli:sec:display: use macro for more ace types

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/libcli/security/display_sec.c b/libcli/security/display_sec.c
index c0c7b45965d2740fc45eff9fa9892fcc3f4771a9..be89a33f1761cb892e2538a6caa416421ae8a215 100644 (file)
--- a/libcli/security/display_sec.c
+++ b/libcli/security/display_sec.c
@@ -148,22 +148,12 @@ void display_sec_ace(struct security_ace *ace)
                case SEC_ACE_TYPE_SYSTEM_ALARM:
                        printf("SYSTEM ALARM");
                        break;
-               case SEC_ACE_TYPE_ALLOWED_COMPOUND:
-                       printf("SEC_ACE_TYPE_ALLOWED_COMPOUND");
-                       break;
-               case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT:
-                       printf("SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT");
-                       break;
-               case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT:
-                       printf("SEC_ACE_TYPE_ACCESS_DENIED_OBJECT");
-                       break;
-               case SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT:
-                       printf("SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT");
-                       break;
-               case SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT:
-                       printf("SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT");
-                       break;          
 #define ACE_CASE(x) case x: printf(#x); break
+               ACE_CASE(SEC_ACE_TYPE_ALLOWED_COMPOUND);
+               ACE_CASE(SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT);
+               ACE_CASE(SEC_ACE_TYPE_ACCESS_DENIED_OBJECT);
+               ACE_CASE(SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT);
+               ACE_CASE(SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT);
                ACE_CASE(SEC_ACE_TYPE_ACCESS_ALLOWED_CALLBACK);
                ACE_CASE(SEC_ACE_TYPE_ACCESS_DENIED_CALLBACK);
                ACE_CASE(SEC_ACE_TYPE_ACCESS_ALLOWED_CALLBACK_OBJECT);