diff options
| author | David Disseldorp <ddiss@samba.org> | 2014-05-28 17:42:08 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-05-29 01:08:25 +0200 |
| commit | 3e1a477fdac2d56b01b5cf5f9c868f31e43802a8 (patch) | |
| tree | b180b207854d7341e7ae1b3e0c49c718d0a57584 | |
| parent | 4de94ad8fd601c6871fa0dd2d51864f77c80b26e (diff) | |
| download | samba-3e1a477fdac2d56b01b5cf5f9c868f31e43802a8.tar.gz samba-3e1a477fdac2d56b01b5cf5f9c868f31e43802a8.tar.xz samba-3e1a477fdac2d56b01b5cf5f9c868f31e43802a8.zip | |
s3/libsmb_xattr: 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>
| -rw-r--r-- | source3/libsmb/libsmb_xattr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c index 8e6590a536..84937766fe 100644 --- a/source3/libsmb/libsmb_xattr.c +++ b/source3/libsmb/libsmb_xattr.c @@ -64,7 +64,7 @@ ace_compare(struct security_ace *ace1, bool b2; /* If the ACEs are equal, we have nothing more to do. */ - if (sec_ace_equal(ace1, ace2)) { + if (security_ace_equal(ace1, ace2)) { return 0; } @@ -152,7 +152,8 @@ 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]; @@ -1592,8 +1593,8 @@ cacl_set(SMBCCTX *context, 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] = |