sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

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

Browse Source 
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Sun Jan 30 12:17:49 CET 2011 on sn-devel-104
This commit is contained in:
Volker Lendecke 2011-01-29 09:19:54 +01:00 committed by Volker Lendecke
parent 619e5cb646
commit e6e7c724ad
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/Makefile.in
View File

@ -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 $@"

14
source3/configure.in
View File

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

4
source3/modules/vfs_zfsacl.c
View File

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