nfs4acls: Add "smbacl4_vfs_params" parameter to smb_get_nt_acl_nfs4

Pure placeholder right now, this will allow vfs modules to load the params in
advance

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 66794fe7fbbaf79d6d4b4e3fa5d2e5ffa41a54f0..38b53a42d8f671321fc099dea45af1ae2d0beb08 100644 (file)
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -559,6 +559,7 @@ NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
 
 NTSTATUS smb_get_nt_acl_nfs4(struct connection_struct *conn,
                             const struct smb_filename *smb_fname,
+                            const struct smbacl4_vfs_params *pparams,
                             uint32_t security_info,
                             TALLOC_CTX *mem_ctx,
                             struct security_descriptor **ppdesc,

diff --git a/source3/modules/nfs4_acls.h b/source3/modules/nfs4_acls.h
index f8d6867a4227d56cd641ac802307937210d095e9..e6e07bfe514ee59cbe97bce861178ec787772c90 100644 (file)
--- a/source3/modules/nfs4_acls.h
+++ b/source3/modules/nfs4_acls.h
@@ -139,6 +139,7 @@ NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
 
 NTSTATUS smb_get_nt_acl_nfs4(connection_struct *conn,
        const struct smb_filename *smb_fname,
+       const struct smbacl4_vfs_params *pparams,
        uint32_t security_info,
        TALLOC_CTX *mem_ctx,
        struct security_descriptor **ppdesc, struct SMB4ACL_T *theacl);

diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c
index 362486b8b00b83cd1f1d535e0d617698e2145871..a2a04768592c64dd2d6e233fcbc2febc4bc86b87 100644 (file)
--- a/source3/modules/vfs_aixacl2.c
+++ b/source3/modules/vfs_aixacl2.c
@@ -214,6 +214,7 @@ static NTSTATUS aixjfs2_get_nt_acl(vfs_handle_struct *handle,
 
        return smb_get_nt_acl_nfs4(handle->conn,
                                smb_fname,
+                               NULL,
                                security_info,
                                mem_ctx,
                                ppdesc,

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index c3ce9e1207cede13c7c64b2c45daa06e0c171215..72dabd2d45b79db002009fd8b1e5f422c8b157cf 100644 (file)
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -638,7 +638,7 @@ static NTSTATUS gpfsacl_get_nt_acl(vfs_handle_struct *handle,
        result = gpfs_get_nfs4_acl(frame, smb_fname->base_name, &pacl);
 
        if (result == 0) {
-               status = smb_get_nt_acl_nfs4(handle->conn, smb_fname,
+               status = smb_get_nt_acl_nfs4(handle->conn, smb_fname, NULL,
                                             security_info, mem_ctx, ppdesc,
                                             pacl);
                TALLOC_FREE(frame);

diff --git a/source3/modules/vfs_nfs4acl_xattr.c b/source3/modules/vfs_nfs4acl_xattr.c
index c9cae394f89f1b8842333ea789f6f5b6dac1bef4..9e969cad7a0a5129d010c7e5344496309dcb4187 100644 (file)
--- a/source3/modules/vfs_nfs4acl_xattr.c
+++ b/source3/modules/vfs_nfs4acl_xattr.c
@@ -561,8 +561,8 @@ static NTSTATUS nfs4acl_xattr_get_nt_acl(struct vfs_handle_struct *handle,
                return status;
        }
 
-       status = smb_get_nt_acl_nfs4(handle->conn, smb_fname, security_info,
-                                    mem_ctx, ppdesc,
+       status = smb_get_nt_acl_nfs4(handle->conn, smb_fname, NULL,
+                                    security_info, mem_ctx, ppdesc,
                                     pacl);
        TALLOC_FREE(frame);
        return status;

diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c
index 0077553c9dccd01acdfeee2805e4f38b86ad4938..325c91e35f8c455cb1566d3deab5a6e981bfa3a2 100644 (file)
--- a/source3/modules/vfs_zfsacl.c
+++ b/source3/modules/vfs_zfsacl.c
@@ -235,6 +235,7 @@ static NTSTATUS zfsacl_get_nt_acl(struct vfs_handle_struct *handle,
 
        status = smb_get_nt_acl_nfs4(handle->conn,
                                        smb_fname,
+                                       NULL,
                                        security_info,
                                        mem_ctx,
                                        ppdesc,