7 files changed, 13 insertions, 7 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 789055408d..046ce026d0 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -15,10 +15,14 @@ PRIVATE_DEPENDENCIES = auth_session
 
 [SUBSYSTEM::auth_sam]
 PRIVATE_PROTO_HEADER = auth_sam.h
-OBJ_FILES = sam.o auth_sam_reply.o ntlm_check.o 
-PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB
+OBJ_FILES = sam.o ntlm_check.o 
+PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY
 PRIVATE_DEPENDENCIES = LDAP_ENCODE
 
+[SUBSYSTEM::auth_sam_reply]
+PRIVATE_PROTO_HEADER = auth_sam_reply.h
+OBJ_FILES = auth_sam_reply.o
+
 #######################
 # Start MODULE auth_sam
 [MODULE::auth_sam_module]
@@ -81,6 +85,7 @@ OBJ_FILES = \
 		auth_util.o \
 		auth_simple.o
 PUBLIC_DEPENDENCIES = LIBSECURITY SAMDB CREDENTIALS
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
 # End SUBSYSTEM auth
 #######################
 
diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk
index 87c62fb6ed..1c70ef2e63 100644
--- a/source4/auth/kerberos/config.mk
+++ b/source4/auth/kerberos/config.mk
@@ -10,6 +10,6 @@ OBJ_FILES = kerberos.o \
 			gssapi_parse.o \
 			krb5_init_context.o
 PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba-socket LIBCLI_RESOLVE
-PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam CREDENTIALS_KRB5
+PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam_reply CREDENTIALS_KRB5
 # End SUBSYSTEM KERBEROS
 #################################
diff --git a/source4/auth/kerberos/kerberos_pac.c b/source4/auth/kerberos/kerberos_pac.c
index 5fefd24cd1..6eea053e2b 100644
--- a/source4/auth/kerberos/kerberos_pac.c
+++ b/source4/auth/kerberos/kerberos_pac.c
@@ -28,7 +28,7 @@
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "lib/ldb/include/ldb.h"
-#include "auth/auth_sam.h"
+#include "auth/auth_sam_reply.h"
 
 static krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx, 
 					  DATA_BLOB pac_data,
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index d129332ba2..52a377dbba 100644
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -22,7 +22,7 @@ OBJ_FILES = \
 		hdb-ldb.o \
 		pac-glue.o 
 PRIVATE_DEPENDENCIES = \
-		LIBLDB auth_sam KERBEROS
+		LIBLDB auth_sam auth_sam_reply KERBEROS
 # End SUBSYSTEM KDC
 #######################
 
diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 4ba1023785..32f96ee7ab 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/krb5pac.h"
 #include "auth/auth.h"
 #include "auth/auth_sam.h"
+#include "auth/auth_sam_reply.h"
 #include "param/param.h"
 
 struct krb5_dh_moduli;
diff --git a/source4/param/util.c b/source4/param/util.c
index 1cbae841bc..89498b57a6 100644
--- a/source4/param/util.c
+++ b/source4/param/util.c
@@ -107,7 +107,7 @@ _PUBLIC_ char *config_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
 	char *fname, *config_dir, *p;
 	config_dir = talloc_strdup(mem_ctx, lp_configfile(lp_ctx));
 	p = strrchr(config_dir, '/');
-	if (!p) {
+	if (p == NULL) {
 		return NULL;
 	}
 	p[0] = '\0';
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 15916a81fc..25f9939576 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -25,7 +25,7 @@
 #include "rpc_server/common/common.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth.h"
-#include "auth/auth_sam.h"
+#include "auth/auth_sam_reply.h"
 #include "dsdb/samdb/samdb.h"
 #include "rpc_server/samr/proto.h"
 #include "util/util_ldb.h"