Merge branch 'master' of ssh://git.samba.org/data/git/samba

diff --combined source3/Makefile.in
index 2bcdd8ddaa287e6b875e3918c70455e2cd0bc973,be075ad6856589f2c3125ace6521a16a4310156a..c048e193a6103615a38d9a58876b0bf26e208b3d
--- 1/source3/Makefile.in
--- 2/source3/Makefile.in
+++ b/source3/Makefile.in
@@@ -643,6 -643,7 +643,7 @@@ VFS_FILEID_OBJ = modules/vfs_fileid.
  VFS_AIO_FORK_OBJ = modules/vfs_aio_fork.o
  VFS_SYNCOPS_OBJ = modules/vfs_syncops.o
  VFS_ACL_XATTR_OBJ = modules/vfs_acl_xattr.o
+ VFS_ACL_TDB_OBJ = modules/vfs_acl_tdb.o
  VFS_SMB_TRAFFIC_ANALYZER_OBJ = modules/vfs_smb_traffic_analyzer.o
  
  PLAINTEXT_AUTH_OBJ = auth/pampass.o auth/pass_check.o
@@@ -1224,7 -1225,7 +1225,7 @@@ samba3-idl:
                ../librpc/idl/initshutdown.idl ../librpc/idl/srvsvc.idl ../librpc/idl/svcctl.idl \
                ../librpc/idl/eventlog.idl ../librpc/idl/wkssvc.idl ../librpc/idl/netlogon.idl \
                ../librpc/idl/notify.idl ../librpc/idl/epmapper.idl librpc/idl/messaging.idl \
 -              ../librpc/idl/xattr.idl ../librpc/idl/misc.idl librpc/idl/samr.idl \
 +              ../librpc/idl/xattr.idl ../librpc/idl/misc.idl ../librpc/idl/samr.idl \
                ../librpc/idl/security.idl ../librpc/idl/dssetup.idl ../librpc/idl/krb5pac.idl \
                ../librpc/idl/ntsvcs.idl librpc/idl/libnetapi.idl ../librpc/idl/drsuapi.idl \
                ../librpc/idl/drsblobs.idl ../librpc/idl/nbt.idl \
@@@ -2459,6 -2460,10 +2460,10 @@@ bin/smb_traffic_analyzer.@SHLIBEXT@: $(
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(VFS_SMB_TRAFFIC_ANALYZER_OBJ)
  
+ bin/acl_tdb.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ACL_TDB_OBJ)
+       @echo "Building plugin $@"
+       @$(SHLD_MODULE) $(VFS_ACL_TDB_OBJ)
+ 
  bin/registry.@SHLIBEXT@: $(BINARY_PREREQS) libgpo/gpext/registry.o
        @echo "Building plugin $@"
        @$(SHLD_MODULE) libgpo/gpext/registry.o