s3:smbcacls: use NUMERIC_CMP in ace_compare

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15625

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

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index ff11ba4d7d7c8fa4ad66376ceb68f3eb8cd31f80..0c1d2b38c9357f9bd6a3728e46f7ceb4aa9c79da 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -510,22 +510,23 @@ static int ace_compare(struct security_ace *ace1, struct security_ace *ace2)
                return -1;
        if ((ace1->flags & SEC_ACE_FLAG_INHERITED_ACE) &&
                        (ace2->flags & SEC_ACE_FLAG_INHERITED_ACE))
-               return ace1 - ace2;
-
-       if (ace1->type != ace2->type)
-               return ace2->type - ace1->type;
+               return NUMERIC_CMP(ace1, ace2);
 
+       if (ace1->type != ace2->type) {
+               /* note the reverse order */
+               return NUMERIC_CMP(ace2->type, ace1->type);
+       }
        if (dom_sid_compare(&ace1->trustee, &ace2->trustee))
                return dom_sid_compare(&ace1->trustee, &ace2->trustee);
 
        if (ace1->flags != ace2->flags)
-               return ace1->flags - ace2->flags;
+               return NUMERIC_CMP(ace1->flags, ace2->flags);
 
        if (ace1->access_mask != ace2->access_mask)
-               return ace1->access_mask - ace2->access_mask;
+               return NUMERIC_CMP(ace1->access_mask, ace2->access_mask);
 
        if (ace1->size != ace2->size)
-               return ace1->size - ace2->size;
+               return NUMERIC_CMP(ace1->size, ace2->size);
 
        return memcmp(ace1, ace2, sizeof(struct security_ace));
 }