From 0aab2a8251fc46fe9f62fb1418a343e93467adf4 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 10 May 2007 13:31:15 +0000 Subject: r22777: Fix for [Bug 4543] - POSIX ACL support on FreeBSD. This adds vfs_posixacl to the list of static modules and makes use of HAVE_ACL_GET_PERM_NP. This is just a quick fix. FreeBSD acl support is still hardcoded in configure.in, but actually this could be detected in a unified test for freebsd, linux, *, as suggested in the bugreport. This has still to be checked and elaborated. Michael (This used to be commit af94654772f743f0c0b7809ff3f2ef019feb713a) --- source3/modules/vfs_posixacl.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/modules') diff --git a/source3/modules/vfs_posixacl.c b/source3/modules/vfs_posixacl.c index 191c4a7cb0..109c1e20b2 100644 --- a/source3/modules/vfs_posixacl.c +++ b/source3/modules/vfs_posixacl.c @@ -200,9 +200,15 @@ static BOOL smb_ace_to_internal(acl_entry_t posix_ace, return False; } ace->a_perm = 0; +#ifdef HAVE_ACL_GET_PERM_NP + ace->a_perm |= (acl_get_perm_np(permset, ACL_READ) ? SMB_ACL_READ : 0); + ace->a_perm |= (acl_get_perm_np(permset, ACL_WRITE) ? SMB_ACL_WRITE : 0); + ace->a_perm |= (acl_get_perm_np(permset, ACL_EXECUTE) ? SMB_ACL_EXECUTE : 0); +#else ace->a_perm |= (acl_get_perm(permset, ACL_READ) ? SMB_ACL_READ : 0); ace->a_perm |= (acl_get_perm(permset, ACL_WRITE) ? SMB_ACL_WRITE : 0); ace->a_perm |= (acl_get_perm(permset, ACL_EXECUTE) ? SMB_ACL_EXECUTE : 0); +#endif return True; } -- cgit