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

(This used to be commit ffbd222d651dcddb19cacdc50cdbfeaefa816940)

diff --combined source4/libcli/config.mk
index 68d718abaffd9c4791db2291f6390906f24417e5,0cc97c058ad33bc5a1cc3b2d4626046cbeeb5bb6..f502091b0798118ff9e5aa3184202be3a85c15c9
--- 1/source4/libcli/config.mk
--- 2/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@@ -33,8 -33,7 +33,8 @@@ 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)))
  
@@@ -57,6 -56,15 +57,15 @@@ LIBCLI_NBT_OBJ_FILES = $(addprefix $(li
  
  $(eval $(call proto_header_template,$(libclisrcdir)/nbt/nbt_proto.h,$(LIBCLI_NBT_OBJ_FILES:.o=.c)))
  
+ [SUBSYSTEM::LIBCLI_NETLOGON]
+ PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT  \
+       NDR_SECURITY LIBSAMBA-UTIL
+ 
+ LIBCLI_NETLOGON_OBJ_FILES = $(addprefix libcli/, \
+       netlogon.o)
+ 
+ $(eval $(call proto_header_template,$(libclisrcdir)/netlogon_proto.h,$(LIBCLI_NETLOGON_OBJ_FILES:.o=.c)))
+ 
  [PYTHON::python_libcli_nbt]
  SWIG_FILE = swig/libcli_nbt.i
  PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG
@@@ -70,18 -78,17 +79,17 @@@ PUBLIC_DEPENDENCIES = LIBCLI_SMB DYNCON
  python_libcli_smb_OBJ_FILES = $(libclisrcdir)/swig/libcli_smb_wrap.o
  
  [SUBSYSTEM::LIBCLI_DGRAM]
- PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNDR LIBCLI_RESOLVE
+ PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNDR LIBCLI_RESOLVE LIBCLI_NETLOGON
  
  LIBCLI_DGRAM_OBJ_FILES = $(addprefix $(libclisrcdir)/dgram/, \
        dgramsocket.o \
        mailslot.o \
        netlogon.o \
-       ntlogon.o \
        browse.o)
  
  [SUBSYSTEM::LIBCLI_CLDAP]
  PUBLIC_DEPENDENCIES = LIBCLI_LDAP
- PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBLDB
+ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBLDB LIBCLI_NETLOGON
  
  LIBCLI_CLDAP_OBJ_FILES = $(libclisrcdir)/cldap/cldap.o
  # PUBLIC_HEADERS += $(libclisrcdir)/cldap/cldap.h