diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-13 19:40:52 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-15 11:44:45 +1000 |
| commit | d83276c13f3bfb25e98399827b1d5e10e709480d (patch) | |
| tree | f9af0006ee695c76acd42ee29f7c3195c064a250 | |
| parent | 3b409324d3196b8f08df63189fc7d0802f03d757 (diff) | |
| download | samba-d83276c13f3bfb25e98399827b1d5e10e709480d.tar.gz samba-d83276c13f3bfb25e98399827b1d5e10e709480d.tar.bz2 samba-d83276c13f3bfb25e98399827b1d5e10e709480d.zip | |
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
| -rw-r--r-- | source3/smbd/posix_acls.c | 8 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 2 |
2 files changed, 5 insertions, 5 deletions
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; } |