diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-13 19:57:34 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-15 11:44:48 +1000 |
| commit | 631a356ea227eb48a9472b31ae3034fcbb1d3c5c (patch) | |
| tree | fb7d5a11c5c1ac7d5a7575fb90775ded4e495d4f | |
| parent | d78c7c32dc67d77bf68d3ac19853f599f0a817e7 (diff) | |
| download | samba-631a356ea227eb48a9472b31ae3034fcbb1d3c5c.tar.gz samba-631a356ea227eb48a9472b31ae3034fcbb1d3c5c.tar.bz2 samba-631a356ea227eb48a9472b31ae3034fcbb1d3c5c.zip | |
s3-smbd: Call sys_acl_clear_perms() directly rather than via the VFS
This will allow us to remove the struct smb_acl_t manipuations from the VFS layer,
which will be reduced to handling the get/set functions.
Andrew Bartlett
| -rw-r--r-- | source3/smbd/posix_acls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index c0aa48eb92..de27a1ea93 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -891,7 +891,7 @@ static mode_t unix_perms_to_acl_perms(mode_t mode, int r_mask, int w_mask, int x static int map_acl_perms_to_permset(connection_struct *conn, mode_t mode, SMB_ACL_PERMSET_T *p_permset) { - if (SMB_VFS_SYS_ACL_CLEAR_PERMS(conn, *p_permset) == -1) + if (sys_acl_clear_perms(*p_permset) == -1) return -1; if (mode & S_IRUSR) { if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_READ) == -1) @@ -4474,7 +4474,7 @@ static bool unix_ex_wire_to_permset(connection_struct *conn, unsigned char wire_ return False; } - if (SMB_VFS_SYS_ACL_CLEAR_PERMS(conn, *p_permset) == -1) { + if (sys_acl_clear_perms(*p_permset) == -1) { return False; } |