From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 13 Aug 2012 09:43:23 +0000 (+1000)
Subject: s3-smbd: Call sys_acl_get_qualifier() directly rather than via the VFS
X-Git-Tag: tevent-0.9.17~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a2f142b4980b8ce71980cd5bf8bd7b2428503d1;p=thirdparty%2Fsamba.git

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
---

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index aa762665ec5..b3695829871 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 9a311a3260e..c114c42f326 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;