From d83276c13f3bfb25e98399827b1d5e10e709480d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 13 Aug 2012 19:40:52 +1000 Subject: s3-smbd: Call sys_acl_get_tagtype() 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 | 8 ++++---- source3/smbd/trans2.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source3') diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 257bd86108..aa762665ec 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -2641,7 +2641,7 @@ static canon_ace *canonicalise_acl(struct connection_struct *conn, entry_id = SMB_ACL_NEXT_ENTRY; /* Is this a MASK entry ? */ - if (SMB_VFS_SYS_ACL_GET_TAG_TYPE(conn, entry, &tagtype) == -1) + if (sys_acl_get_tag_type(entry, &tagtype) == -1) continue; if (sys_acl_get_permset(entry, &permset) == -1) @@ -4282,7 +4282,7 @@ int get_acl_group_bits( connection_struct *conn, const char *fname, mode_t *mode entry_id = SMB_ACL_NEXT_ENTRY; - if (SMB_VFS_SYS_ACL_GET_TAG_TYPE(conn, entry, &tagtype) ==-1) + if (sys_acl_get_tag_type(entry, &tagtype) ==-1) break; if (tagtype == SMB_ACL_GROUP_OBJ) { @@ -4320,7 +4320,7 @@ static int chmod_acl_internals( connection_struct *conn, SMB_ACL_T posix_acl, mo entry_id = SMB_ACL_NEXT_ENTRY; - if (SMB_VFS_SYS_ACL_GET_TAG_TYPE(conn, entry, &tagtype) == -1) + if (sys_acl_get_tag_type(entry, &tagtype) == -1) return -1; if (sys_acl_get_permset(entry, &permset) == -1) @@ -4744,7 +4744,7 @@ static bool remove_posix_acl(connection_struct *conn, files_struct *fsp, const c entry_id = SMB_ACL_NEXT_ENTRY; - if (SMB_VFS_SYS_ACL_GET_TAG_TYPE(conn, entry, &tagtype) == -1) { + if (sys_acl_get_tag_type(entry, &tagtype) == -1) { DEBUG(5,("remove_posix_acl: failed to get tagtype from ACL on file %s (%s).\n", fname, strerror(errno) )); goto done; diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 7f3f9cc1ff..9a311a3260 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -3868,7 +3868,7 @@ static bool marshall_posix_acl(connection_struct *conn, char *pdata, SMB_STRUCT_ entry_id = SMB_ACL_NEXT_ENTRY; } - if (SMB_VFS_SYS_ACL_GET_TAG_TYPE(conn, entry, &tagtype) == -1) { + if (sys_acl_get_tag_type(entry, &tagtype) == -1) { DEBUG(0,("marshall_posix_acl: SMB_VFS_SYS_ACL_GET_TAG_TYPE failed.\n")); return False; } -- cgit