git.samba.org
/
ddiss
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9bab305
)
s3: Fix vfs_zfsacl to compile.
author
Ira Cooper
<ira@samba.org>
Thu, 27 Dec 2012 19:57:14 +0000
(19:57 +0000)
committer
Karolin Seeger
<kseeger@samba.org>
Mon, 28 Jan 2013 10:07:32 +0000
(11:07 +0100)
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit
0615f68096569d00b1f262529024ad40136d445e
)
(ported to 4.0 VFS interface, removing blob function references by abartlet)
source3/modules/vfs_zfsacl.c
patch
|
blob
|
history
diff --git
a/source3/modules/vfs_zfsacl.c
b/source3/modules/vfs_zfsacl.c
index bf0688146272cc17ad64c79ad2ae421a24b06ae8..1b59c24157dea956328d0805f15a147d9b1eb0ee 100644
(file)
--- a/
source3/modules/vfs_zfsacl.c
+++ b/
source3/modules/vfs_zfsacl.c
@@
-201,13
+201,13
@@
static NTSTATUS zfsacl_fget_nt_acl(struct vfs_handle_struct *handle,
NTSTATUS status;
status = zfs_get_nt_acl_common(fsp->fsp_name->base_name,
-
mem_ctx,
security_info,
+ security_info,
&pacl);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
- return smb_fget_nt_acl_nfs4(fsp, security_info, ppdesc, pacl);
+ return smb_fget_nt_acl_nfs4(fsp, security_info,
mem_ctx,
ppdesc, pacl);
}
static NTSTATUS zfsacl_get_nt_acl(struct vfs_handle_struct *handle,