diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-13 19:59:54 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-15 11:44:49 +1000 |
| commit | 9f16fcfd3f5e0fde9e857f18faaad01ee631320c (patch) | |
| tree | ebc04a666ec5f7e5855a5f6ee3602162cc45c20c | |
| parent | 21e0b91e9cf5ffc098beee01f4b573aee0133be4 (diff) | |
| download | samba-9f16fcfd3f5e0fde9e857f18faaad01ee631320c.tar.gz samba-9f16fcfd3f5e0fde9e857f18faaad01ee631320c.tar.bz2 samba-9f16fcfd3f5e0fde9e857f18faaad01ee631320c.zip | |
s3-smbd: Call sys_acl_set_qualifier() 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 df57bd2f94..9e61706126 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -2926,7 +2926,7 @@ static bool set_canon_ace_list(files_struct *fsp, */ if ((p_ace->type == SMB_ACL_USER) || (p_ace->type == SMB_ACL_GROUP)) { - if (SMB_VFS_SYS_ACL_SET_QUALIFIER(conn, the_entry,(void *)&p_ace->unix_ug.id) == -1) { + if (sys_acl_set_qualifier(the_entry,(void *)&p_ace->unix_ug.id) == -1) { DEBUG(0,("set_canon_ace_list: Failed to set qualifier on entry %d. (%s)\n", i, strerror(errno) )); goto fail; @@ -4588,7 +4588,7 @@ static SMB_ACL_T create_posix_acl_from_wire(connection_struct *conn, uint16 num_ if (tag_type == SMB_ACL_USER) { uint32 uidval = IVAL(pdata,(i*SMB_POSIX_ACL_ENTRY_SIZE)+2); uid_t uid = (uid_t)uidval; - if (SMB_VFS_SYS_ACL_SET_QUALIFIER(conn, the_entry,(void *)&uid) == -1) { + if (sys_acl_set_qualifier(the_entry,(void *)&uid) == -1) { DEBUG(0,("create_posix_acl_from_wire: Failed to set uid %u on entry %u. (%s)\n", (unsigned int)uid, i, strerror(errno) )); goto fail; @@ -4598,7 +4598,7 @@ static SMB_ACL_T create_posix_acl_from_wire(connection_struct *conn, uint16 num_ if (tag_type == SMB_ACL_GROUP) { uint32 gidval = IVAL(pdata,(i*SMB_POSIX_ACL_ENTRY_SIZE)+2); gid_t gid = (uid_t)gidval; - if (SMB_VFS_SYS_ACL_SET_QUALIFIER(conn, the_entry,(void *)&gid) == -1) { + if (sys_acl_set_qualifier(the_entry,(void *)&gid) == -1) { DEBUG(0,("create_posix_acl_from_wire: Failed to set gid %u on entry %u. (%s)\n", (unsigned int)gid, i, strerror(errno) )); goto fail; |