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

diff --combined source3/Makefile.in
index 032efd53a3a259e45f4362be1e5640c0005d2df4,269bc15f3e6a7acd58077a1510faaf099fc97b78..1b0624a304869380d4c0dbe2eb0e93e11982873c
--- 1/source3/Makefile.in
--- 2/source3/Makefile.in
+++ b/source3/Makefile.in
@@@ -249,7 -249,7 +249,7 @@@ LIBNDR_DRSUAPI_OBJ = librpc/ndr/ndr_drs
                     librpc/gen_ndr/ndr_drsuapi.o \
                     librpc/gen_ndr/ndr_drsblobs.o
  
 -COMPRESSION_OBJ = lib/compression/mszip.o
 +COMPRESSION_OBJ = ../lib/compression/mszip.o
  
  DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \
              $(COMPRESSION_OBJ)
@@@ -618,6 -618,7 +618,7 @@@ VFS_TSMSM_OBJ = modules/vfs_tsmsm.
  VFS_FILEID_OBJ = modules/vfs_fileid.o
  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
  
  PLAINTEXT_AUTH_OBJ = auth/pampass.o auth/pass_check.o
  
@@@ -979,6 -980,10 +980,10 @@@ IDMAP_OBJ     = winbindd/idmap.o winbin
  
  NSS_INFO_OBJ = winbindd/nss_info.o @NSS_INFO_STATIC@
  
+ IDMAP_HASH_OBJ = \
+               winbindd/idmap_hash/idmap_hash.o \
+               winbindd/idmap_hash/mapfile.o
+ 
  WINBINDD_OBJ1 = \
                winbindd/winbindd.o       \
                winbindd/winbindd_user.o  \
@@@ -1056,8 -1061,8 +1061,8 @@@ LDBMODIFY_OBJ = $(LDB_CMDLINE_OBJ) lib/
  WINBIND_KRB5_LOCATOR_OBJ1 = nsswitch/winbind_krb5_locator.o
  WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ)
  
 -POPT_OBJ=popt/findme.o popt/popt.o popt/poptconfig.o \
 -          popt/popthelp.o popt/poptparse.o
 +POPT_OBJ=../popt/findme.o ../popt/popt.o ../popt/poptconfig.o \
 +          ../popt/popthelp.o ../popt/poptparse.o
  
  INIPARSER_OBJ = iniparser_build/iniparser.o iniparser_build/dictionary.o \
                iniparser_build/strlib.o
@@@ -2208,6 -2213,10 +2213,10 @@@ bin/ad.@SHLIBEXT@: $(BINARY_PREREQS) wi
        @echo "Building plugin $@"
        @$(SHLD_MODULE) winbindd/idmap_ad.o
  
+ bin/hash.@SHLIBEXT@: $(BINARY_PREREQS) $(IDMAP_HASH_OBJ)
+       @echo "Building plugin $@"
+       @$(SHLD_MODULE) $(IDMAP_HASH_OBJ)
+ 
  bin/tdb2.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_tdb2.o
        @echo "Building plugin $@"
        @$(SHLD_MODULE) winbindd/idmap_tdb2.o
@@@ -2375,6 -2384,10 +2384,10 @@@ bin/aio_fork.@SHLIBEXT@: $(BINARY_PRERE
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(VFS_AIO_FORK_OBJ)
  
+ bin/acl_xattr.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ACL_XATTR_OBJ)
+       @echo "Building plugin $@"
+       @$(SHLD_MODULE) $(VFS_ACL_XATTR_OBJ)
+ 
  bin/registry.@SHLIBEXT@: $(BINARY_PREREQS) libgpo/gpext/registry.o
        @echo "Building plugin $@"
        @$(SHLD_MODULE) libgpo/gpext/registry.o

diff --combined source3/configure.in
index 294092e7214a9cbd79c79529dda78aa6fd9e354c,8025cc35236d7e1ab27a31cf5ca4ec3ee3adc595..92dbf6de2d62f211c674e1a8a16f03069a107d87
--- 1/source3/configure.in
--- 2/source3/configure.in
+++ b/source3/configure.in
@@@ -23,7 -23,7 +23,7 @@@ m4_include(m4/check_path.m4
  
  AC_LIBREPLACE_CC_CHECKS
  
 -m4_include(lib/talloc/libtalloc.m4)
 +m4_include(../lib/talloc/libtalloc.m4)
  
  LIBTALLOC_OBJ0=""
  for obj in ${TALLOC_OBJ}; do
@@@ -33,7 -33,7 +33,7 @@@ AC_SUBST(LIBTALLOC_OBJ0
  
  # TODO: These should come from m4_include(lib/tdb/libtdb.m4)
  # but currently this fails: things have to get merged from s4.
 -tdbdir="lib/tdb"
 +tdbdir="../lib/tdb"
  AC_SUBST(tdbdir)
  TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
  AC_SUBST(TDB_CFLAGS)
@@@ -43,18 -43,18 +43,18 @@@ for o in common/tdb.o common/dump.o com
             common/traverse.o common/freelist.o common/freelistcheck.o \
                 common/io.o common/lock.o common/open.o; 
  do 
 -      LIBTDB_OBJ0="$LIBTDB_OBJ0 lib/tdb/$o"
 +      LIBTDB_OBJ0="$LIBTDB_OBJ0 $tdbdir/$o"
  done
  
  AC_SUBST(LIBTDB_OBJ0)
  SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
 -SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/replace"
 +SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
  SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
  SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
  SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
  SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
  
 -SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/popt"
 +SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
  
  ## cleanup the $(srcdir) in the Makefile if we are outside of the tree
  if test "x${srcdir-.}" != "x."; then
@@@ -131,8 -131,8 +131,8 @@@ els
        CFLAGS="-O"
  fi
  
 -m4_include(lib/socket_wrapper/config.m4)
 -m4_include(lib/nss_wrapper/config.m4)
 +m4_include(../lib/socket_wrapper/config.m4)
 +m4_include(../lib/nss_wrapper/config.m4)
  
  m4_include(m4/swat.m4)
  
@@@ -5872,7 -5872,7 +5872,7 @@@ if test x"$INCLUDED_POPT" = x"yes"; the
      AC_MSG_RESULT(yes)
      BUILD_POPT='$(POPT_OBJ)'
      POPTLIBS='$(POPT_OBJ)'
 -    FLAGS1="-I\$(srcdir)/popt"
 +    FLAGS1="-I\$(srcdir)/../lib/popt"
  else
      AC_MSG_RESULT(no)
        BUILD_POPT=""
@@@ -6057,6 -6057,7 +6057,7 @@@ SMB_MODULE(idmap_passdb, winbindd/idmap
  SMB_MODULE(idmap_nss, winbindd/idmap_nss.o, "bin/nss.$SHLIBEXT", IDMAP)
  SMB_MODULE(idmap_rid, winbindd/idmap_rid.o, "bin/rid.$SHLIBEXT", IDMAP)
  SMB_MODULE(idmap_ad, winbindd/idmap_ad.o, "bin/ad.$SHLIBEXT", IDMAP)
+ SMB_MODULE(idmap_hash, \$(IDMAP_HASH_OBJ), "bin/hash.$SHLIBEXT", IDMAP)
  SMB_SUBSYSTEM(IDMAP, winbindd/idmap.o)
  
  SMB_MODULE(nss_info_template, winbindd/nss_info_template.o, "bin/template.$SHLIBEXT", NSS_INFO)