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

(This used to be commit 733937e87a1adcc19492ea2bd138e705701901b6)

diff --combined source4/libcli/config.mk
index 4350cd7b0476e7ea8c1fd923eab2769da0efa11e,dbd05b57bc6fea3cc84b665292b5d496d079acba..68d718abaffd9c4791db2291f6390906f24417e5
--- 1/source4/libcli/config.mk
--- 2/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@@ -5,71 -5,73 +5,74 @@@ mkinclude wbclient/config.m
  
  [SUBSYSTEM::LIBSAMBA-ERRORS]
  
- LIBSAMBA-ERRORS_OBJ_FILES = $(addprefix libcli/util/, doserr.o errormap.o nterr.o)
+ LIBSAMBA-ERRORS_OBJ_FILES = $(addprefix $(libclisrcdir)/util/, doserr.o errormap.o nterr.o)
  
- PUBLIC_HEADERS += $(addprefix libcli/, util/error.h util/ntstatus.h util/doserr.h util/werror.h)
+ PUBLIC_HEADERS += $(addprefix $(libclisrcdir)/, util/error.h util/ntstatus.h util/doserr.h util/werror.h)
  
  [SUBSYSTEM::LIBCLI_LSA]
- PRIVATE_PROTO_HEADER = util/clilsa.h
  PUBLIC_DEPENDENCIES = RPC_NDR_LSA
  PRIVATE_DEPENDENCIES = LIBSECURITY
  
- LIBCLI_LSA_OBJ_FILES = libcli/util/clilsa.o
+ LIBCLI_LSA_OBJ_FILES = $(libclisrcdir)/util/clilsa.o
+ 
+ $(eval $(call proto_header_template,$(libclisrcdir)/util/clilsa.h,$(LIBCLI_LSA_OBJ_FILES:.o=.c)))
  
  [SUBSYSTEM::LIBCLI_COMPOSITE]
- PRIVATE_PROTO_HEADER = composite/proto.h
  PUBLIC_DEPENDENCIES = LIBEVENTS
  
- LIBCLI_COMPOSITE_OBJ_FILES = libcli/composite/composite.o
+ LIBCLI_COMPOSITE_OBJ_FILES = $(libclisrcdir)/composite/composite.o
+ $(eval $(call proto_header_template,$(libclisrcdir)/composite/proto.h,$(LIBCLI_COMPOSITE_OBJ_FILES:.o=.c)))
  
  [SUBSYSTEM::LIBCLI_SMB_COMPOSITE]
- PRIVATE_PROTO_HEADER = smb_composite/proto.h
  PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE CREDENTIALS gensec LIBCLI_RESOLVE
  
- LIBCLI_SMB_COMPOSITE_OBJ_FILES = $(addprefix libcli/smb_composite/, \
+ LIBCLI_SMB_COMPOSITE_OBJ_FILES = $(addprefix $(libclisrcdir)/smb_composite/, \
        loadfile.o \
        savefile.o \
        connect.o \
        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
  
- LIBCLI_NBT_OBJ_FILES = $(addprefix libcli/nbt/, \
+ LIBCLI_NBT_OBJ_FILES = $(addprefix $(libclisrcdir)/nbt/, \
        nbtsocket.o \
        namequery.o \
        nameregister.o \
        namerefresh.o \
        namerelease.o)
  
+ $(eval $(call proto_header_template,$(libclisrcdir)/nbt/nbt_proto.h,$(LIBCLI_NBT_OBJ_FILES:.o=.c)))
+ 
  [PYTHON::python_libcli_nbt]
  SWIG_FILE = swig/libcli_nbt.i
  PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG
  
- python_libcli_nbt_OBJ_FILES = libcli/swig/libcli_nbt_wrap.o
+ python_libcli_nbt_OBJ_FILES = $(libclisrcdir)/swig/libcli_nbt_wrap.o
  
  [PYTHON::python_libcli_smb]
  SWIG_FILE = swig/libcli_smb.i
  PUBLIC_DEPENDENCIES = LIBCLI_SMB DYNCONFIG LIBSAMBA-HOSTCONFIG
  
- python_libcli_smb_OBJ_FILES = libcli/swig/libcli_smb_wrap.o
+ python_libcli_smb_OBJ_FILES = $(libclisrcdir)/swig/libcli_smb_wrap.o
  
  [SUBSYSTEM::LIBCLI_DGRAM]
  PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNDR LIBCLI_RESOLVE
  
- LIBCLI_DGRAM_OBJ_FILES = $(addprefix libcli/dgram/, \
+ LIBCLI_DGRAM_OBJ_FILES = $(addprefix $(libclisrcdir)/dgram/, \
        dgramsocket.o \
        mailslot.o \
        netlogon.o \
@@@ -80,43 -82,46 +83,46 @@@
  PUBLIC_DEPENDENCIES = LIBCLI_LDAP
  PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBLDB
  
- LIBCLI_CLDAP_OBJ_FILES = libcli/cldap/cldap.o
- # PUBLIC_HEADERS += libcli/cldap/cldap.h
+ LIBCLI_CLDAP_OBJ_FILES = $(libclisrcdir)/cldap/cldap.o
+ # PUBLIC_HEADERS += $(libclisrcdir)/cldap/cldap.h
  
  [SUBSYSTEM::LIBCLI_WREPL]
- PRIVATE_PROTO_HEADER = wrepl/winsrepl_proto.h
  PUBLIC_DEPENDENCIES = NDR_WINSREPL samba-socket LIBCLI_RESOLVE LIBEVENTS \
                                          LIBPACKET LIBNDR
  
- LIBCLI_WREPL_OBJ_FILES = libcli/wrepl/winsrepl.o
+ LIBCLI_WREPL_OBJ_FILES = $(libclisrcdir)/wrepl/winsrepl.o
+ 
+ $(eval $(call proto_header_template,$(libclisrcdir)/wrepl/winsrepl_proto.h,$(LIBCLI_WREPL_OBJ_FILES:.o=.c)))
  
  [SUBSYSTEM::LIBCLI_RESOLVE]
- PRIVATE_PROTO_HEADER = resolve/proto.h
  PUBLIC_DEPENDENCIES = NDR_NBT
  
- LIBCLI_RESOLVE_OBJ_FILES = libcli/resolve/resolve.o
+ LIBCLI_RESOLVE_OBJ_FILES = $(libclisrcdir)/resolve/resolve.o
+ 
+ $(eval $(call proto_header_template,$(libclisrcdir)/resolve/proto.h,$(LIBCLI_RESOLVE_OBJ_FILES:.o=.c)))
  
  [SUBSYSTEM::LP_RESOLVE]
- PRIVATE_PROTO_HEADER = resolve/lp_proto.h
  PRIVATE_DEPENDENCIES = LIBCLI_NBT LIBSAMBA-HOSTCONFIG LIBNETIF 
  
- LP_RESOLVE_OBJ_FILES = $(addprefix libcli/resolve/, \
+ LP_RESOLVE_OBJ_FILES = $(addprefix $(libclisrcdir)/resolve/, \
                                          bcast.o nbtlist.o wins.o \
                                          host.o resolve_lp.o)
  
+ $(eval $(call proto_header_template,$(libclisrcdir)/resolve/lp_proto.h,$(LP_RESOLVE_OBJ_FILES:.o=.c)))
+ 
  [SUBSYSTEM::LIBCLI_FINDDCS]
- PRIVATE_PROTO_HEADER = finddcs.h
  PUBLIC_DEPENDENCIES = LIBCLI_NBT MESSAGING
  
- LIBCLI_FINDDCS_OBJ_FILES = libcli/finddcs.o
+ LIBCLI_FINDDCS_OBJ_FILES = $(libclisrcdir)/finddcs.o
+ 
+ $(eval $(call proto_header_template,$(libclisrcdir)/finddcs.h,$(LIBCLI_FINDDCS_OBJ_FILES:.o=.c)))
  
  [SUBSYSTEM::LIBCLI_SMB]
- PRIVATE_PROTO_HEADER = libcli_proto.h
  PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
        LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \
        LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba-socket
  
- LIBCLI_SMB_OBJ_FILES = $(addprefix libcli/, \
+ LIBCLI_SMB_OBJ_FILES = $(addprefix $(libclisrcdir)/, \
                clireadwrite.o \
                cliconnect.o \
                clifile.o \
@@@ -125,18 -130,22 +131,22 @@@
                climessage.o \
                clideltree.o)
  
- # PUBLIC_HEADERS += libcli/libcli.h
+ $(eval $(call proto_header_template,$(libclisrcdir)/libcli_proto.h,$(LIBCLI_SMB_OBJ_FILES:.o=.c)))
+ 
+ # PUBLIC_HEADERS += $(libclisrcdir)/libcli.h
  
  [SUBSYSTEM::LIBCLI_RAW]
- PRIVATE_PROTO_HEADER = raw/raw_proto.h
  PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE LIBSECURITY LIBNDR
  #LDFLAGS = $(LIBCLI_SMB_COMPOSITE_OUTPUT)
  PUBLIC_DEPENDENCIES = samba-socket LIBPACKET gensec LIBCRYPTO CREDENTIALS 
  
- LIBCLI_RAW_OBJ_FILES = $(addprefix libcli/raw/, rawfile.o smb_signing.o clisocket.o \
+ LIBCLI_RAW_OBJ_FILES = $(addprefix $(libclisrcdir)/raw/, rawfile.o smb_signing.o clisocket.o \
                                          clitransport.o clisession.o clitree.o clierror.o rawrequest.o \
                                          rawreadwrite.o rawsearch.o rawsetfileinfo.o raweas.o rawtrans.o \
                                          clioplock.o rawnegotiate.o rawfsinfo.o rawfileinfo.o rawnotify.o \
                                          rawioctl.o rawacl.o rawdate.o rawlpq.o rawshadow.o)
  
+ 
+ $(eval $(call proto_header_template,$(libclisrcdir)/raw/raw_proto.h,$(LIBCLI_RAW_OBJ_FILES:.o=.c)))
+ 
  mkinclude smb2/config.mk

diff --combined source4/ntvfs/config.mk
index ceb952d25c37d0f010c8194ea53e89eabe3196d0,8e647516eff6e982f7d9bccbd95f53a5a84a2655..bf34c4082abec6ad54c215725703a90839ae1101
--- 1/source4/ntvfs/config.mk
--- 2/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@@ -14,32 -14,19 +14,33 @@@ 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]
  INIT_FUNCTION = ntvfs_simple_init 
  SUBSYSTEM = ntvfs 
- PRIVATE_PROTO_HEADER = simple/proto.h
  # End MODULE ntvfs_simple
  ################################################
  
- ntvfs_simple_OBJ_FILES = $(addprefix ntvfs/simple/, vfs_simple.o svfs_util.o)
+ ntvfs_simple_OBJ_FILES = $(addprefix $(ntvfssrcdir)/simple/, vfs_simple.o svfs_util.o)
+ 
+ $(eval $(call proto_header_template,$(ntvfssrcdir)/simple/proto.h,$(ntvfs_simple_OBJ_FILES:.o=.c)))
  
  ################################################
  # Start MODULE ntvfs_cifsposix
@@@ -47,12 -34,13 +48,13 @@@
  #ENABLE = NO
  INIT_FUNCTION = ntvfs_cifs_posix_init
  SUBSYSTEM = ntvfs
- PRIVATE_PROTO_HEADER = cifs_posix_cli/proto.h
  # End MODULE ntvfs_cifsposix
  ################################################
  
  ntvfs_cifsposix_OBJ_FILES = \
-       $(addprefix ntvfs/cifs_posix_cli/, vfs_cifs_posix.o svfs_util.o)
+       $(addprefix $(ntvfssrcdir)/cifs_posix_cli/, vfs_cifs_posix.o svfs_util.o)
+ 
+ $(eval $(call proto_header_template,$(ntvfssrcdir)/cifs_posix_cli/proto.h,$(ntvfs_cifsposix_OBJ_FILES:.o=.c)))
  
  ################################################
  # Start MODULE ntvfs_print
@@@ -62,19 -50,20 +64,20 @@@ SUBSYSTEM = ntvf
  # End MODULE ntvfs_print
  ################################################
  
- ntvfs_print_OBJ_FILES = ntvfs/print/vfs_print.o
+ ntvfs_print_OBJ_FILES = $(ntvfssrcdir)/print/vfs_print.o
  
  ################################################
  # Start MODULE ntvfs_ipc
  [MODULE::ntvfs_ipc]
  SUBSYSTEM = ntvfs
  INIT_FUNCTION = ntvfs_ipc_init 
- PRIVATE_PROTO_HEADER = ipc/proto.h
  PRIVATE_DEPENDENCIES = dcerpc_server DCERPC_COMMON
  # End MODULE ntvfs_ipc
  ################################################
  
- ntvfs_ipc_OBJ_FILES = $(addprefix ntvfs/ipc/, vfs_ipc.o ipc_rap.o rap_server.o)
+ ntvfs_ipc_OBJ_FILES = $(addprefix $(ntvfssrcdir)/ipc/, vfs_ipc.o ipc_rap.o rap_server.o)
+ 
+ $(eval $(call proto_header_template,$(ntvfssrcdir)/ipc/proto.h,$(ntvfs_ipc_OBJ_FILES:.o=.c)))
  
  ################################################
  # Start MODULE ntvfs_nbench
@@@ -84,16 -73,17 +87,17 @@@ INIT_FUNCTION = ntvfs_nbench_ini
  # End MODULE ntvfs_nbench
  ################################################
  
- ntvfs_nbench_OBJ_FILES = ntvfs/nbench/vfs_nbench.o
+ ntvfs_nbench_OBJ_FILES = $(ntvfssrcdir)/nbench/vfs_nbench.o
  
  ################################################
  # Start SUBSYSTEM NTVFS
  [SUBSYSTEM::ntvfs]
- PRIVATE_PROTO_HEADER = ntvfs_proto.h
  
- ntvfs_OBJ_FILES = $(addprefix ntvfs/, ntvfs_base.o ntvfs_generic.o ntvfs_interface.o ntvfs_util.o)
+ ntvfs_OBJ_FILES = $(addprefix $(ntvfssrcdir)/, ntvfs_base.o ntvfs_generic.o ntvfs_interface.o ntvfs_util.o)
+ 
+ $(eval $(call proto_header_template,$(ntvfssrcdir)/ntvfs_proto.h,$(ntvfs_OBJ_FILES:.o=.c)))
  
- # PUBLIC_HEADERS += ntvfs/ntvfs.h
+ # PUBLIC_HEADERS += $(ntvfssrcdir)/ntvfs.h
  #
  # End SUBSYSTEM NTVFS
  ################################################