From: Stefan Metzmacher Date: Tue, 24 Jul 2007 08:04:42 +0000 (+0000) Subject: r24013: merge from http://samba.org/~tridge/samba_3_2_ctdb/: X-Git-Tag: samba-4.0.0alpha6~801^2~5267 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=213e178cb047ee67ad6367699cc1f3a822c13d8d;p=thirdparty%2Fsamba.git r24013: merge from http://samba.org/~tridge/samba_3_2_ctdb/: fixed prototype metze (This used to be commit 0add4e9478afd9b20205f572a485b450a669c275) --- diff --git a/source3/modules/nfs4_acls.h b/source3/modules/nfs4_acls.h index 1d53e9a620e..b8baa83e78d 100644 --- a/source3/modules/nfs4_acls.h +++ b/source3/modules/nfs4_acls.h @@ -137,7 +137,7 @@ size_t smb_get_nt_acl_nfs4(files_struct *fsp, * when applicable */ typedef BOOL (*set_nfs4acl_native_fn_t)(files_struct *, SMB4ACL_T *); -BOOL smb_set_nt_acl_nfs4(files_struct *fsp, +NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd, set_nfs4acl_native_fn_t set_nfs4_native);