Samba4rc6 compile fail on FreeBSD 9.1Release
Dewayne
dewayne.geraghty at heuristicsystems.com.au
Tue Dec 4 23:35:55 MST 2012
Hi Andrew,
Please find the diff as requested. The source was copied from http://ftp.samba.org/pub/samba/rc/samba-4.0.0rc6.tar.gz
# diff -urN samba-4.0.0rc5/source3/modules/vfs_zfsacl.c samba-4.0.0rc6/source3/modules/vfs_zfsacl.c
--- samba-4.0.0rc5/source3/modules/vfs_zfsacl.c 2012-10-02 08:24:42.000000000 +0000
+++ samba-4.0.0rc6/source3/modules/vfs_zfsacl.c 2012-12-04
+++ 10:07:44.000000000 +0000
@@ -192,14 +192,16 @@
}
static NTSTATUS zfsacl_fget_nt_acl(struct vfs_handle_struct *handle,
- struct files_struct *fsp,
- uint32 security_info,
- struct security_descriptor **ppdesc)
+ struct files_struct *fsp,
+ uint32 security_info,
+ TALLOC_CTX *mem_ctx,
+ struct security_descriptor **ppdesc)
{
SMB4ACL_T *pacl;
NTSTATUS status;
- status = zfs_get_nt_acl_common(fsp->fsp_name->base_name, security_info,
+ status = zfs_get_nt_acl_common(fsp->fsp_name->base_name,
+ mem_ctx, security_info,
&pacl);
if (!NT_STATUS_IS_OK(status)) {
return status;
@@ -209,8 +211,9 @@
}
static NTSTATUS zfsacl_get_nt_acl(struct vfs_handle_struct *handle,
- const char *name, uint32 security_info,
- struct security_descriptor **ppdesc)
+ const char *name, uint32 security_info,
+ TALLOC_CTX *mem_ctx,
+ struct security_descriptor **ppdesc)
{
SMB4ACL_T *pacl;
NTSTATUS status;
@@ -220,7 +223,8 @@
return status;
}
- return smb_get_nt_acl_nfs4(handle->conn, name, security_info, ppdesc,
+ return smb_get_nt_acl_nfs4(handle->conn, name, security_info,
+ mem_ctx, ppdesc,
pacl); }
Regards, Dewayne
More information about the samba-technical
mailing list