nfs4acls: Add "smbacl4_vfs_params" parameter to smb_set_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 38b53a42d8f671321fc099dea45af1ae2d0beb08..8ab0ff9b7b480ce5c32beb319ac4270552250607 100644 (file)
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -905,6 +905,7 @@ static struct SMB4ACL_T *smbacl4_win2nfs4(
 }
 
 NTSTATUS smb_set_nt_acl_nfs4(vfs_handle_struct *handle, files_struct *fsp,
+       const struct smbacl4_vfs_params *pparams,
        uint32_t security_info_sent,
        const struct security_descriptor *psd,
        set_nfs4acl_native_fn_t set_nfs4_native)

diff --git a/source3/modules/nfs4_acls.h b/source3/modules/nfs4_acls.h
index e6e07bfe514ee59cbe97bce861178ec787772c90..4236495a78c1dd1de9c81a43ecb07961483d536d 100644 (file)
--- a/source3/modules/nfs4_acls.h
+++ b/source3/modules/nfs4_acls.h
@@ -151,6 +151,7 @@ typedef bool (*set_nfs4acl_native_fn_t)(vfs_handle_struct *handle,
                                        struct SMB4ACL_T *);
 
 NTSTATUS smb_set_nt_acl_nfs4(vfs_handle_struct *handle, files_struct *fsp,
+       const struct smbacl4_vfs_params *pparams,
        uint32_t security_info_sent,
        const struct security_descriptor *psd,
        set_nfs4acl_native_fn_t set_nfs4_native);

diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c
index a2a04768592c64dd2d6e233fcbc2febc4bc86b87..c4a026459f333f62837310fc26e8a27125e7bfd9 100644 (file)
--- a/source3/modules/vfs_aixacl2.c
+++ b/source3/modules/vfs_aixacl2.c
@@ -446,7 +446,7 @@ static NTSTATUS aixjfs2_set_nt_acl_common(vfs_handle_struct *handle, files_struc
        if (rc==0)
        {
                result = smb_set_nt_acl_nfs4(handle,
-                       fsp, security_info_sent, psd,
+                       fsp, NULL, security_info_sent, psd,
                        aixjfs2_process_smbacl);
        } else if (rc==1) { /* assume POSIX ACL - by default... */
                result = set_nt_acl(fsp, security_info_sent, psd);

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 72dabd2d45b79db002009fd8b1e5f422c8b157cf..8bc2f0a19c69f6a8b2032596a4cb485f93b62086 100644 (file)
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -810,7 +810,7 @@ static NTSTATUS gpfsacl_set_nt_acl_internal(vfs_handle_struct *handle, files_str
                }
 
                result = smb_set_nt_acl_nfs4(handle,
-                       fsp, security_info_sent, psd,
+                       fsp, NULL, security_info_sent, psd,
                        gpfsacl_process_smbacl);
        } else { /* assume POSIX ACL - by default... */
                result = set_nt_acl(fsp, security_info_sent, psd);

diff --git a/source3/modules/vfs_nfs4acl_xattr.c b/source3/modules/vfs_nfs4acl_xattr.c
index 9e969cad7a0a5129d010c7e5344496309dcb4187..273c9265a351eacfde6cbd87ed71e5d176b038e2 100644 (file)
--- a/source3/modules/vfs_nfs4acl_xattr.c
+++ b/source3/modules/vfs_nfs4acl_xattr.c
@@ -336,7 +336,7 @@ static NTSTATUS nfs4_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
                           uint32_t security_info_sent,
                           const struct security_descriptor *psd)
 {
-       return smb_set_nt_acl_nfs4(handle, fsp, security_info_sent, psd,
+       return smb_set_nt_acl_nfs4(handle, fsp, NULL, security_info_sent, psd,
                        nfs4acl_xattr_fset_smb4acl);
 }
 

diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c
index 325c91e35f8c455cb1566d3deab5a6e981bfa3a2..a0993fff79c0a58668ac3b917a2fae2e14a1b1f4 100644 (file)
--- a/source3/modules/vfs_zfsacl.c
+++ b/source3/modules/vfs_zfsacl.c
@@ -187,7 +187,7 @@ static NTSTATUS zfs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
                           uint32_t security_info_sent,
                           const struct security_descriptor *psd)
 {
-        return smb_set_nt_acl_nfs4(handle, fsp, security_info_sent, psd,
+        return smb_set_nt_acl_nfs4(handle, fsp, NULL, security_info_sent, psd,
                                   zfs_process_smbacl);
 }