From 6a2f142b4980b8ce71980cd5bf8bd7b2428503d1 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 13 Aug 2012 19:43:23 +1000 Subject: s3-smbd: Call sys_acl_get_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 --- source3/smbd/posix_acls.c | 4 ++-- source3/smbd/trans2.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index aa762665ec..b369582987 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -2658,7 +2658,7 @@ static canon_ace *canonicalise_acl(struct connection_struct *conn, break; case SMB_ACL_USER: { - uid_t *puid = (uid_t *)SMB_VFS_SYS_ACL_GET_QUALIFIER(conn, entry); + uid_t *puid = (uid_t *)sys_acl_get_qualifier(entry); if (puid == NULL) { DEBUG(0,("canonicalise_acl: Failed to get uid.\n")); continue; @@ -2679,7 +2679,7 @@ static canon_ace *canonicalise_acl(struct connection_struct *conn, break; case SMB_ACL_GROUP: { - gid_t *pgid = (gid_t *)SMB_VFS_SYS_ACL_GET_QUALIFIER(conn, entry); + gid_t *pgid = (gid_t *)sys_acl_get_qualifier(entry); if (pgid == NULL) { DEBUG(0,("canonicalise_acl: Failed to get gid.\n")); continue; diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 9a311a3260..c114c42f32 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -3893,7 +3893,7 @@ static bool marshall_posix_acl(connection_struct *conn, char *pdata, SMB_STRUCT_ break; case SMB_ACL_USER: { - uid_t *puid = (uid_t *)SMB_VFS_SYS_ACL_GET_QUALIFIER(conn, entry); + uid_t *puid = (uid_t *)sys_acl_get_qualifier(entry); if (!puid) { DEBUG(0,("marshall_posix_acl: SMB_VFS_SYS_ACL_GET_QUALIFIER failed.\n")); return False; @@ -3913,7 +3913,7 @@ static bool marshall_posix_acl(connection_struct *conn, char *pdata, SMB_STRUCT_ break; case SMB_ACL_GROUP: { - gid_t *pgid= (gid_t *)SMB_VFS_SYS_ACL_GET_QUALIFIER(conn, entry); + gid_t *pgid= (gid_t *)sys_acl_get_qualifier(entry); if (!pgid) { DEBUG(0,("marshall_posix_acl: SMB_VFS_SYS_ACL_GET_QUALIFIER failed.\n")); return False; -- cgit