s3/smbcacls: use security_ace_equal instead of sec_ace_equal

Both offer the same functionality, sec_ace_equal() will be removed.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 684fe791da1b543ca6c1380b84f4cc1a88cb38c6..47d75fe34494484e90e30c0c8a4321577c0f887a 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -1013,7 +1013,7 @@ static int owner_set(struct cli_state *cli, enum chown_mode change_mode,
 
 static int ace_compare(struct security_ace *ace1, struct security_ace *ace2)
 {
-       if (sec_ace_equal(ace1, ace2))
+       if (security_ace_equal(ace1, ace2))
                return 0;
 
        if ((ace1->flags & SEC_ACE_FLAG_INHERITED_ACE) &&
@@ -1052,7 +1052,8 @@ static void sort_acl(struct security_acl *the_acl)
        TYPESAFE_QSORT(the_acl->aces, the_acl->num_aces, ace_compare);
 
        for (i=1;i<the_acl->num_aces;) {
-               if (sec_ace_equal(&the_acl->aces[i-1], &the_acl->aces[i])) {
+               if (security_ace_equal(&the_acl->aces[i-1],
+                                      &the_acl->aces[i])) {
                        int j;
                        for (j=i; j<the_acl->num_aces-1; j++) {
                                the_acl->aces[j] = the_acl->aces[j+1];
@@ -1098,8 +1099,8 @@ static int cacl_set(struct cli_state *cli, const char *filename,
                        bool found = False;
 
                        for (j=0;old->dacl && j<old->dacl->num_aces;j++) {
-                               if (sec_ace_equal(&sd->dacl->aces[i],
-                                                 &old->dacl->aces[j])) {
+                               if (security_ace_equal(&sd->dacl->aces[i],
+                                                      &old->dacl->aces[j])) {
                                        uint32 k;
                                        for (k=j; k<old->dacl->num_aces-1;k++) {
                                                old->dacl->aces[k] = old->dacl->aces[k+1];