From 631a356ea227eb48a9472b31ae3034fcbb1d3c5c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 13 Aug 2012 19:57:34 +1000 Subject: 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 --- source3/smbd/posix_acls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/smbd/posix_acls.c') 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; } -- cgit