vfs:zfs fix build after get_nt_acl_fn signature change.
authorJeremy Allison <jra@samba.org>
Wed, 2 Mar 2016 05:52:44 +0000 (21:52 -0800)
committerUri Simchoni <uri@samba.org>
Wed, 2 Mar 2016 09:50:58 +0000 (10:50 +0100)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>
Autobuild-User(master): Uri Simchoni <uri@samba.org>
Autobuild-Date(master): Wed Mar  2 10:50:58 CET 2016 on sn-devel-144

source3/modules/vfs_zfsacl.c

index 02cbcdf277e78a033b50eb942d16fbc3d19ebeba..7dc7cec91cde2877646878f38eaf094cdc79793c 100644 (file)
@@ -215,23 +215,29 @@ static NTSTATUS zfsacl_fget_nt_acl(struct vfs_handle_struct *handle,
 }
 
 static NTSTATUS zfsacl_get_nt_acl(struct vfs_handle_struct *handle,
-                                 const char *name, uint32_t security_info,
-                                 TALLOC_CTX *mem_ctx,
-                                 struct security_descriptor **ppdesc)
+                               const struct smb_filename *smb_fname,
+                               uint32_t security_info,
+                               TALLOC_CTX *mem_ctx,
+                               struct security_descriptor **ppdesc)
 {
        struct SMB4ACL_T *pacl;
        NTSTATUS status;
        TALLOC_CTX *frame = talloc_stackframe();
 
-       status = zfs_get_nt_acl_common(frame, name, &pacl);
+       status = zfs_get_nt_acl_common(frame,
+                                       smb_fname->base_name,
+                                       &pacl);
        if (!NT_STATUS_IS_OK(status)) {
                TALLOC_FREE(frame);
                return status;
        }
 
-       status = smb_get_nt_acl_nfs4(handle->conn, name, security_info,
-                                    mem_ctx, ppdesc,
-                                    pacl);
+       status = smb_get_nt_acl_nfs4(handle->conn,
+                                       smb_fname->base_name,
+                                       security_info,
+                                       mem_ctx,
+                                       ppdesc,
+                                       pacl);
        TALLOC_FREE(frame);
        return status;
 }