From: Michael Adam <obnox@samba.org>
Date: Thu, 10 May 2007 13:31:15 +0000 (+0000)
Subject: r22777: Fix for [Bug 4543] - POSIX ACL support on FreeBSD.
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~495
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af94654772f743f0c0b7809ff3f2ef019feb713a;p=thirdparty%2Fsamba.git

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
---

diff --git a/source/configure.in b/source/configure.in
index b938812812c..718baed3025 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -5303,6 +5303,7 @@ AC_ARG_WITH(acl-support,
 		AC_MSG_RESULT(Using FreeBSD posix ACLs)
 		AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether FreeBSD POSIX ACLs are available])
 		AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
+		default_static_modules="$default_static_modules vfs_posixacl"
 		;;
 	*linux*)
 		AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
diff --git a/source/modules/vfs_posixacl.c b/source/modules/vfs_posixacl.c
index 191c4a7cb0e..109c1e20b2e 100644
--- a/source/modules/vfs_posixacl.c
+++ b/source/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;
 }