diff options
| author | David Disseldorp <ddiss@samba.org> | 2014-05-28 17:44:43 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-05-29 01:08:25 +0200 |
| commit | bc70d58cbc1243bb8731ffff5d08848d75f074e4 (patch) | |
| tree | 3c0e8f1074a66a8ae04fa5f427b23613a7f53813 /source3/utils/smbcacls.c | |
| parent | 124775ca812be463ecaf7c573ee6a1d5bdd90559 (diff) | |
| download | samba-bc70d58cbc1243bb8731ffff5d08848d75f074e4.tar.gz | |
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>
Diffstat (limited to 'source3/utils/smbcacls.c')
| -rw-r--r-- | source3/utils/smbcacls.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 684fe791da1..47d75fe3449 100644 --- 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]; |