s3: On FreeBSD, compile zfsacl if sunacl.h is around

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Sun Jan 30 12:17:49 CET 2011 on sn-devel-104

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 5a4435badbb810c136494a57b3e65c702f57bf9c..4cb9a9fb5c86288791081fa0bd50f31be06ad353 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2888,7 +2888,7 @@ bin/solarisacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_SOLARISACL_OBJ)
 
 bin/zfsacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ZFSACL_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD_MODULE) $(VFS_ZFSACL_OBJ)
+       @$(SHLD_MODULE) $(VFS_ZFSACL_OBJ) @ZFSACL_LIBS@
 
 bin/irixacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_IRIXACL_OBJ)
        @echo "Building plugin $@"

diff --git a/source3/configure.in b/source3/configure.in
index dea167e0dd0150392aad49cb28b819283456eefb..cfaf99ba7be07df37d2c8c18a1fa3beb7f2d79f7 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5659,7 +5659,19 @@ else
         esac
 fi # with_acl_support
 
-
+#################################################
+# check if we have FreeBSD sunacl
+case "$host_os" in
+*freebsd*)
+    AC_CHECK_HEADER(sunacl.h)
+    if test x"$ac_cv_header_sunacl_h" = xyes ; then
+       AC_DEFINE(HAVE_FREEBSD_SUNACL_H,1,[Whether we have FreeBSD sunacl around])
+       ZFSACL_LIBS=-lsunacl
+       AC_SUBST(ZFSACL_LIBS)
+       default_shared_modules="$default_shared_modules vfs_zfsacl"
+    fi
+    ;;
+esac
 
 #################################################
 # check for AIO support

diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c
index 8a2c378e057721af128ecbfb9e4a8837b896f0a5..c5277a6b2c4e97a3138d3100ae7d689eeaa90c44 100644 (file)
--- a/source3/modules/vfs_zfsacl.c
+++ b/source3/modules/vfs_zfsacl.c
@@ -25,6 +25,10 @@
 #include "includes.h"
 #include "nfs4_acls.h"
 
+#if HAVE_FREEBSD_SUNACL_H
+#include "sunacl.h"
+#endif
+
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS