sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3/smbcacls: use security_ace_equal instead of sec_ace_equal

Browse Source 
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>
This commit is contained in:
David Disseldorp 2014-05-28 17:44:43 +02:00 committed by Andrew Bartlett
parent 124775ca81
commit bc70d58cbc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/utils/smbcacls.c
View File

@ -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];