Merge branch 'v4-0-test' into v4-0-gmake3

Conflicts:

	source/auth/config.mk
	source/auth/gensec/config.mk
	source/torture/smbtorture.c
(This used to be commit edfd02e59bba86b977bd60848f57a614691fff7a)

diff --cc source4/auth/ntlm/auth.c
index c4cb42779bb685215a8b55493843a58ed9c3b901,dc4303dd5cc087020dc8d9af27151e2923d50902..ad79a40dd239e65afb4c46efd2f10085b0aa9569
--- 1/source4/auth/auth.c
--- 2/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@@ -21,8 -21,9 +21,8 @@@
  #include "includes.h"
  #include "lib/util/dlinklist.h"
  #include "auth/auth.h"
- #include "auth/auth_proto.h"
+ #include "auth/ntlm/auth_proto.h"
  #include "lib/events/events.h"
 -#include "build.h"
  #include "param/param.h"
  
  /***************************************************************************
@@@ -520,8 -521,9 +520,9 @@@ _PUBLIC_ NTSTATUS auth_init(void
        extern NTSTATUS auth_anonymous_init(void);
        extern NTSTATUS auth_unix_init(void);
        extern NTSTATUS auth_sam_init(void);
+       extern NTSTATUS auth_server_init(void);
  
 -      init_module_fn static_init[] = { STATIC_auth_MODULES };
 +      init_module_fn static_init[] = { STATIC_service_auth_MODULES };
        
        if (initialized) return NT_STATUS_OK;
        initialized = true;

diff --cc source4/build/make/rules.mk
index 078f5d9295b007ebc1382aae695658e48a232b46,1fc5e235694cf3fce7029aa135d581f8c8aa27a8..f5d57edb0d3a4e81bea965c71d9d9b7fefbee712
--- 1/source4/build/make/rules.mk
--- 2/source4/build/make/rules.mk
+++ b/source4/build/make/rules.mk
@@@ -212,10 -212,10 +212,9 @@@ include/includes.d: include/includes.
        @-mkdir -p `dirname $@`
        @$(COMPILE) && exit 0 ; \
                echo "The following command failed:" 1>&2;\
-               echo "$(COMPILE)" 1>&2;\
-               $(COMPILE) >/dev/null 2>&1
+               echo "$(COMPILE)" 1>&2 && exit 1
  
  
 -
  .c.ho:
        @echo "Compiling $< with host compiler"
        @-mkdir -p `dirname $@`

diff --cc source4/librpc/config.mk
Simple merge

diff --cc source4/torture/smbtorture.c
index 5c5f96c5058da758de0f943dbd4d2c0eb16735cb,511f58cd7c0fe00c4ce54be01b15b421d9382799..418f933993f3b0b923a59d334cb46054712ecd03
--- 1/source4/torture/smbtorture.c
--- 2/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@@ -30,7 -30,8 +30,7 @@@
  #include "lib/events/events.h"
  #include "dynconfig.h"
  
- #include "torture/torture.h"
+ #include "torture/smbtorture.h"
 -#include "build.h"
  #include "lib/util/dlinklist.h"
  #include "librpc/rpc/dcerpc.h"
  #include "param/param.h"