Merge commit 'origin/v4-0-test' into vfs_smb2

(This used to be commit 733937e87a1adcc19492ea2bd138e705701901b6)

diff --cc source4/libcli/config.mk
index 4350cd7b0476e7ea8c1fd923eab2769da0efa11e,dbd05b57bc6fea3cc84b665292b5d496d079acba..68d718abaffd9c4791db2291f6390906f24417e5
--- 1/source4/libcli/config.mk
--- 2/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@@ -33,17 -33,17 +33,18 @@@ LIBCLI_SMB_COMPOSITE_OBJ_FILES = $(addp
        sesssetup.o \
        fetchfile.o \
        appendacl.o \
 -      fsinfo.o)
 +      fsinfo.o \
 +      smb2.o)
  
+ $(eval $(call proto_header_template,$(libclisrcdir)/smb_composite/proto.h,$(LIBCLI_SMB_COMPOSITE_OBJ_FILES:.o=.c)))
  
  [SUBSYSTEM::NDR_NBT_BUF]
- PRIVATE_PROTO_HEADER = nbt/nbtname.h
  
- NDR_NBT_BUF_OBJ_FILES = libcli/nbt/nbtname.o
+ NDR_NBT_BUF_OBJ_FILES = $(libclisrcdir)/nbt/nbtname.o
+ 
+ $(eval $(call proto_header_template,$(libclisrcdir)/nbt/nbtname.h,$(NDR_NBT_BUF_OBJ_FILES:.o=.c)))
  
  [SUBSYSTEM::LIBCLI_NBT]
- PRIVATE_PROTO_HEADER = nbt/nbt_proto.h
  PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
        NDR_SECURITY samba-socket LIBSAMBA-UTIL
  

diff --cc source4/ntvfs/config.mk
index ceb952d25c37d0f010c8194ea53e89eabe3196d0,8e647516eff6e982f7d9bccbd95f53a5a84a2655..bf34c4082abec6ad54c215725703a90839ae1101
--- 1/source4/ntvfs/config.mk
--- 2/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@@ -14,22 -14,8 +14,22 @@@ PRIVATE_DEPENDENCIES = 
  # End MODULE ntvfs_cifs
  ################################################
  
- ntvfs_cifs_OBJ_FILES = ntvfs/cifs/vfs_cifs.o
+ ntvfs_cifs_OBJ_FILES = $(ntvfssrcdir)/cifs/vfs_cifs.o
  
 +
 +################################################
 +# Start MODULE ntvfs_smb2
 +[MODULE::ntvfs_smb2]
 +INIT_FUNCTION = ntvfs_smb2_init
 +SUBSYSTEM = ntvfs
 +PRIVATE_DEPENDENCIES = \
 +              LIBCLI_SMB LIBCLI_RAW
 +# End MODULE ntvfs_smb2
 +################################################
 +
 +ntvfs_smb2_OBJ_FILES = ntvfs/smb2/vfs_smb2.o
 +
 +
  ################################################
  # Start MODULE ntvfs_simple
  [MODULE::ntvfs_simple]