VFS: SMB_VFS_SYS_ACL_GET_FD: Add SMB_ACL_TYPE_T type arg

preparatory patch for api change to SMB_VFS_SYS_ACL_GET_FD to add new
SMB_ACL_TYPE_T arg to SMB_VFS_SYS_ACL_GET_FD.

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/include/smb_acls.h b/source3/include/smb_acls.h
index 3e679e58f1f08ea2843a3d844054d3ad1290534f..3fff108997609a43392e335d680ba93d25dc757f 100644 (file)
--- a/source3/include/smb_acls.h
+++ b/source3/include/smb_acls.h
@@ -62,7 +62,9 @@ SMB_ACL_T sys_acl_get_file(struct vfs_handle_struct *handle,
                        const struct smb_filename *smb_fname,
                        SMB_ACL_TYPE_T type,
                        TALLOC_CTX *mem_ctx);
-SMB_ACL_T sys_acl_get_fd(struct vfs_handle_struct *handle, struct files_struct *fsp,
+SMB_ACL_T sys_acl_get_fd(struct vfs_handle_struct *handle,
+                        struct files_struct *fsp,
+                        SMB_ACL_TYPE_T type,
                         TALLOC_CTX *mem_ctx);
 int sys_acl_set_file(struct vfs_handle_struct *handle,
                        const struct smb_filename *smb_fname,

diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index b617bd9df14bb000e1e214501ea9a32ae260a714..8e30e3341f7f33e43a9b38c1be862d86ab810316 100644 (file)
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -367,7 +367,10 @@ SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
        return posixacl_sys_acl_get_file(handle, smb_fname, type, mem_ctx);
 }
 
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp, TALLOC_CTX *mem_ctx)
+SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle,
+                        files_struct *fsp,
+                        SMB_ACL_TYPE_T type,
+                        TALLOC_CTX *mem_ctx)
 {
        return posixacl_sys_acl_get_fd(handle, fsp, mem_ctx);
 }
@@ -402,8 +405,10 @@ SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
        return aixacl_sys_acl_get_file(handle, smb_fname, type, mem_ctx);
 }
 
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp,
-                          TALLOC_CTX *mem_ctx)
+SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle,
+                        files_struct *fsp,
+                        SMB_ACL_TYPE_T type,
+                        TALLOC_CTX *mem_ctx)
 {
        return aixacl_sys_acl_get_fd(handle, fsp, mem_ctx);
 }
@@ -438,7 +443,9 @@ SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
                                           mem_ctx);
 }
 
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp,
+SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle,
+                        files_struct *fsp,
+                        SMB_ACL_TYPE_T type,
                         TALLOC_CTX *mem_ctx)
 {
        return solarisacl_sys_acl_get_fd(handle, fsp,
@@ -477,8 +484,10 @@ SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
        return hpuxacl_sys_acl_get_file(handle, smb_fname, type, mem_ctx);
 }
 
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp,
-                          TALLOC_CTX *mem_ctx)
+SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle,
+                        files_struct *fsp,
+                        SMB_ACL_TYPE_T type,
+                        TALLOC_CTX *mem_ctx)
 {
        return hpuxacl_sys_acl_get_fd(handle, fsp, mem_ctx);
 }
@@ -517,7 +526,9 @@ SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
        return NULL;
 }
 
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp,
+SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle,
+                        files_struct *fsp,
+                        SMB_ACL_TYPE_T type,
                         TALLOC_CTX *mem_ctx)
 {
 #ifdef ENOTSUP

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 77e709f24497c6f1636ba4b08b3d96f28c888440..4ef6ea17fa9b09946e3ae977dfa508e43c633453 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -3254,7 +3254,7 @@ static SMB_ACL_T vfswrap_sys_acl_get_fd(vfs_handle_struct *handle,
                                        files_struct *fsp,
                                        TALLOC_CTX *mem_ctx)
 {
-       return sys_acl_get_fd(handle, fsp, mem_ctx);
+       return sys_acl_get_fd(handle, fsp, SMB_ACL_TYPE_ACCESS, mem_ctx);
 }
 
 static int vfswrap_sys_acl_set_fd(vfs_handle_struct *handle,