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

diff --combined source3/Makefile.in
index 831db95b34d85812ebfec5c80de80f00954b1dec,bb81dd2f70516b54d9054c35812cd5538a46be14..e806e3f06294b07eb0d2d34fb509dca1f77cd1c2
--- 1/source3/Makefile.in
--- 2/source3/Makefile.in
+++ b/source3/Makefile.in
@@@ -336,7 -336,7 +336,7 @@@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OB
          $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
          lib/interface.o lib/pidfile.o \
          lib/system.o lib/sendfile.o lib/recvfile.o lib/time.o \
-         lib/ufc.o lib/genrand.o lib/username.o \
+         lib/genrand.o lib/username.o \
          lib/util_pw.o lib/access.o lib/smbrun.o \
          lib/bitmap.o lib/dprintf.o $(UTIL_REG_OBJ) \
          lib/wins_srv.o \
@@@ -1125,7 -1125,7 +1125,7 @@@ NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIB
                $(LIBNDR_GEN_OBJ0) $(LIBNDR_GEN_OBJ1)
  
  
- VLP_OBJ1 = ../testsuite/printing/vlp.o $(RPC_CLIENT_OBJ1) $(RPC_PARSE_OBJ2) $(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o
+ VLP_OBJ1 = printing/tests/vlp.o $(RPC_CLIENT_OBJ1) $(RPC_PARSE_OBJ2) $(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o
  
  VLP_OBJ = $(VLP_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
          $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
@@@ -2799,9 -2799,6 +2799,9 @@@ valgrindtest:: all torture timelimi
         VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
         PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all "${smbtorture4_path}"
  
 +selftest::
 +      ../selftest/selftest.pl --prefix=st --target=samba3 --testlist="`pwd`/selftest/tests.sh|" 
 +
  # Check for Winbind struct 32/64bit padding
  test_wbpad:
        @echo "Testing winbind request/response structure for 32/64bit padding"