[SCM] Samba Shared Repository - branch v3-6-test updated
Volker Lendecke
vlendec at samba.org
Sun Jan 30 04:29:19 MST 2011
The branch, v3-6-test has been updated
via cf700e5 s3: On FreeBSD, compile zfsacl if sunacl.h is around
from 31f569f s3: Make _lp_maxprotocol static
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit cf700e5bef947c3658cc6c68e6d91c55a40986e0
Author: Volker Lendecke <vl at samba.org>
Date: Sat Jan 29 09:19:54 2011 +0100
s3: On FreeBSD, compile zfsacl if sunacl.h is around
Autobuild-User: Volker Lendecke <vlendec at samba.org>
Autobuild-Date: Sun Jan 30 12:17:49 CET 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 2 +-
source3/configure.in | 14 +++++++++++++-
source3/modules/vfs_zfsacl.c | 4 ++++
3 files changed, 18 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 5a4435b..4cb9a9f 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2888,7 +2888,7 @@ bin/solarisacl. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_SOLARISACL_OBJ)
bin/zfsacl. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ZFSACL_OBJ)
@echo "Building plugin $@"
- @$(SHLD_MODULE) $(VFS_ZFSACL_OBJ)
+ @$(SHLD_MODULE) $(VFS_ZFSACL_OBJ) @ZFSACL_LIBS@
bin/irixacl. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_IRIXACL_OBJ)
@echo "Building plugin $@"
diff --git a/source3/configure.in b/source3/configure.in
index dea167e..cfaf99b 100644
--- 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 8a2c378..c5277a6 100644
--- 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
--
Samba Shared Repository
More information about the samba-cvs
mailing list