diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-13 19:56:31 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-15 11:44:47 +1000 |
| commit | d78c7c32dc67d77bf68d3ac19853f599f0a817e7 (patch) | |
| tree | 15b974c9251ebb8eaad6efd8fdcf15106ee040db | |
| parent | 8b3227eb451b360a82d488c643e1e4e4ac96e2fc (diff) | |
| download | samba-d78c7c32dc67d77bf68d3ac19853f599f0a817e7.tar.gz samba-d78c7c32dc67d77bf68d3ac19853f599f0a817e7.tar.bz2 samba-d78c7c32dc67d77bf68d3ac19853f599f0a817e7.zip | |
s3-smbd: Call sys_acl_init() 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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 4b5abd2566..c0aa48eb92 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -2825,7 +2825,7 @@ static bool set_canon_ace_list(files_struct *fsp, { connection_struct *conn = fsp->conn; bool ret = False; - SMB_ACL_T the_acl = SMB_VFS_SYS_ACL_INIT(conn, (int)count_canon_ace_list(the_ace) + 1); + SMB_ACL_T the_acl = sys_acl_init(count_canon_ace_list(the_ace) + 1); canon_ace *p_ace; int i; SMB_ACL_ENTRY_T mask_entry; @@ -4535,7 +4535,7 @@ static bool unix_ex_wire_to_tagtype(unsigned char wire_tt, SMB_ACL_TAG_T *p_tt) static SMB_ACL_T create_posix_acl_from_wire(connection_struct *conn, uint16 num_acls, const char *pdata) { unsigned int i; - SMB_ACL_T the_acl = SMB_VFS_SYS_ACL_INIT(conn, num_acls); + SMB_ACL_T the_acl = sys_acl_init(num_acls); if (the_acl == NULL) { return NULL; @@ -4679,7 +4679,7 @@ static bool remove_posix_acl(connection_struct *conn, files_struct *fsp, const c SMB_ACL_ENTRY_T entry; bool ret = False; /* Create a new ACL with only 3 entries, u/g/w. */ - SMB_ACL_T new_file_acl = SMB_VFS_SYS_ACL_INIT(conn, 3); + SMB_ACL_T new_file_acl = sys_acl_init(3); SMB_ACL_ENTRY_T user_ent = NULL; SMB_ACL_ENTRY_T group_ent = NULL; SMB_ACL_ENTRY_T other_ent = NULL; |