diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-13 19:59:03 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-15 11:44:48 +1000 |
| commit | 50d147b8582d2f04b2a5914fb63c42b4e3aabdd5 (patch) | |
| tree | 65920a92cd31493c5173619f97a1cc5f2ea0c93a | |
| parent | db544790f108000b4cad51fd143946765774753c (diff) | |
| download | samba-50d147b8582d2f04b2a5914fb63c42b4e3aabdd5.tar.gz samba-50d147b8582d2f04b2a5914fb63c42b4e3aabdd5.tar.bz2 samba-50d147b8582d2f04b2a5914fb63c42b4e3aabdd5.zip | |
s3-smbd: Call sys_acl_create_entry() 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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 900d504ff8..79eb8aa097 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -2888,7 +2888,7 @@ static bool set_canon_ace_list(files_struct *fsp, * Get the entry for this ACE. */ - if (SMB_VFS_SYS_ACL_CREATE_ENTRY(conn, &the_acl, &the_entry) == -1) { + if (sys_acl_create_entry(&the_acl, &the_entry) == -1) { DEBUG(0,("set_canon_ace_list: Failed to create entry %d. (%s)\n", i, strerror(errno) )); goto fail; @@ -2965,7 +2965,7 @@ static bool set_canon_ace_list(files_struct *fsp, } if (needs_mask && !got_mask_entry) { - if (SMB_VFS_SYS_ACL_CREATE_ENTRY(conn, &the_acl, &mask_entry) == -1) { + if (sys_acl_create_entry(&the_acl, &mask_entry) == -1) { DEBUG(0,("set_canon_ace_list: Failed to create mask entry. (%s)\n", strerror(errno) )); goto fail; } @@ -4546,7 +4546,7 @@ static SMB_ACL_T create_posix_acl_from_wire(connection_struct *conn, uint16 num_ SMB_ACL_PERMSET_T the_permset; SMB_ACL_TAG_T tag_type; - if (SMB_VFS_SYS_ACL_CREATE_ENTRY(conn, &the_acl, &the_entry) == -1) { + if (sys_acl_create_entry(&the_acl, &the_entry) == -1) { DEBUG(0,("create_posix_acl_from_wire: Failed to create entry %u. (%s)\n", i, strerror(errno) )); goto fail; @@ -4690,7 +4690,7 @@ static bool remove_posix_acl(connection_struct *conn, files_struct *fsp, const c } /* Now create the u/g/w entries. */ - if (SMB_VFS_SYS_ACL_CREATE_ENTRY(conn, &new_file_acl, &user_ent) == -1) { + if (sys_acl_create_entry(&new_file_acl, &user_ent) == -1) { DEBUG(5,("remove_posix_acl: Failed to create user entry for file %s. (%s)\n", fname, strerror(errno) )); goto done; @@ -4701,7 +4701,7 @@ static bool remove_posix_acl(connection_struct *conn, files_struct *fsp, const c goto done; } - if (SMB_VFS_SYS_ACL_CREATE_ENTRY(conn, &new_file_acl, &group_ent) == -1) { + if (sys_acl_create_entry(&new_file_acl, &group_ent) == -1) { DEBUG(5,("remove_posix_acl: Failed to create group entry for file %s. (%s)\n", fname, strerror(errno) )); goto done; @@ -4712,7 +4712,7 @@ static bool remove_posix_acl(connection_struct *conn, files_struct *fsp, const c goto done; } - if (SMB_VFS_SYS_ACL_CREATE_ENTRY(conn, &new_file_acl, &other_ent) == -1) { + if (sys_acl_create_entry(&new_file_acl, &other_ent) == -1) { DEBUG(5,("remove_posix_acl: Failed to create other entry for file %s. (%s)\n", fname, strerror(errno) )); goto done; |