s3-build: Enable vfs_fake_acls when in developer mode or on the build farm

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 57c6c1db1c4aecefcf5b9128a1584b9fe74e120a..c71d588604866bb529cd824e7031ba84de2cd294 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -857,6 +857,7 @@ VFS_AUDIT_OBJ = modules/vfs_audit.o
 VFS_EXTD_AUDIT_OBJ = modules/vfs_extd_audit.o
 VFS_FULL_AUDIT_OBJ = modules/vfs_full_audit.o
 VFS_FAKE_PERMS_OBJ = modules/vfs_fake_perms.o
+VFS_FAKE_ACLS_OBJ = modules/vfs_fake_acls.o autoconf/librpc/gen_ndr/ndr_smb_acl.o
 VFS_RECYCLE_OBJ = modules/vfs_recycle.o
 VFS_NETATALK_OBJ = modules/vfs_netatalk.o
 VFS_DEFAULT_QUOTA_OBJ = modules/vfs_default_quota.o
@@ -2752,6 +2753,10 @@ bin/fake_perms.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_FAKE_PERMS_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(VFS_FAKE_PERMS_OBJ)
 
+bin/fake_acls.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_FAKE_ACLS_OBJ)
+       @echo "Building plugin $@"
+       @$(SHLD_MODULE) $(VFS_FAKE_ACLS_OBJ)
+
 bin/default_quota.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_DEFAULT_QUOTA_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(VFS_DEFAULT_QUOTA_OBJ)

diff --git a/source3/configure.in b/source3/configure.in
index 28894f154a01f7a579b236618bbb23dd445a83e1..f0dde646e3dfaf3c2dc5015e9afbc872f0923be0 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -476,6 +476,9 @@ if test "x$developer" = xyes; then
    default_shared_modules="$default_shared_modules perfcount_test"
 fi
 
+if test x"$RUN_FROM_BUILD_FARM" = x"yes" -o "x$developer" = xyes; then
+   default_shared_modules="$default_shared_modules vfs_fake_acls"
+fi
 
 #
 # Config CPPFLAG settings for strange OS's that must be set
@@ -6533,6 +6536,7 @@ SMB_MODULE(vfs_extd_audit, \$(VFS_EXTD_AUDIT_OBJ), "bin/extd_audit.$SHLIBEXT", V
 SMB_MODULE(vfs_full_audit, \$(VFS_FULL_AUDIT_OBJ), "bin/full_audit.$SHLIBEXT", VFS)
 SMB_MODULE(vfs_netatalk, \$(VFS_NETATALK_OBJ), "bin/netatalk.$SHLIBEXT", VFS)
 SMB_MODULE(vfs_fake_perms, \$(VFS_FAKE_PERMS_OBJ), "bin/fake_perms.$SHLIBEXT", VFS)
+SMB_MODULE(vfs_fake_acls, \$(VFS_FAKE_ACLS_OBJ), "bin/fake_acls.$SHLIBEXT", VFS)
 SMB_MODULE(vfs_default_quota, \$(VFS_DEFAULT_QUOTA_OBJ), "bin/default_quota.$SHLIBEXT", VFS)
 SMB_MODULE(vfs_readonly, \$(VFS_READONLY_OBJ), "bin/readonly.$SHLIBEXT", VFS)
 SMB_MODULE(vfs_cap, \$(VFS_CAP_OBJ), "bin/cap.$SHLIBEXT", VFS)