8 files changed, 19 insertions, 10 deletions
diff --git a/source4/auth/auth_unix.c b/source4/auth/auth_unix.c
index 8b4e23a2c4..d06c73cc34 100644
--- a/source4/auth/auth_unix.c
+++ b/source4/auth/auth_unix.c
@@ -236,7 +236,7 @@ static NTSTATUS smb_pam_start(pam_handle_t **pamh, const char *account_name, con
 
 	pam_error = pam_start("samba", account_name, pconv, pamh);
 	if (pam_error != PAM_SUCCESS) {
-		/* no vaild pamh here, can we reliably call pam_strerror ? */
+		/* no valid pamh here, can we reliably call pam_strerror ? */
 		DEBUG(4,("smb_pam_start: pam_start failed!\n"));
 		return NT_STATUS_UNSUCCESSFUL;
 	}
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 497fccbc96..b2d576be37 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -49,15 +49,11 @@ OBJ_FILES = auth_developer.o
 # End MODULE auth_developer
 #######################
 
-#######################
-# Start MODULE auth_unix
 [MODULE::auth_unix]
 INIT_FUNCTION = auth_unix_init
 SUBSYSTEM = auth
 OBJ_FILES = auth_unix.o
 PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER
-# End MODULE auth_unix
-#######################
 
 [SUBSYSTEM::PAM_ERRORS]
 PRIVATE_PROTO_HEADER = pam_errors.h
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index cfbfd9da02..56a8f532b1 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -8,7 +8,7 @@ include samdb/ldb_modules/config.mk
 PUBLIC_PROTO_HEADER = samdb/samdb_proto.h
 PUBLIC_HEADERS = samdb/samdb.h
 PUBLIC_DEPENDENCIES = LIBCLI_LDAP HEIMDAL_KRB5 
-PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS
+PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER
 OBJ_FILES = \
 		samdb/samdb.o \
 		samdb/samdb_privilege.o \
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 40bfb5cb0f..eb4e88d7a9 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -27,7 +27,8 @@ PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-UTIL \
 		LIBPOPT \
 		POPT_SAMBA \
-		NDR_TABLE
+		NDR_TABLE \
+		LIBSAMBA-ERRORS
 MANPAGE = tools/ndrdump.1
 # FIXME: ndrdump shouldn't have to depend on RPC...
 # End BINARY ndrdump
diff --git a/source4/param/config.mk b/source4/param/config.mk
index 7082a8bca3..17a49eeef6 100644
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -47,4 +47,4 @@ PRIVATE_DEPENDENCIES = LIBLDB
 
 [SUBSYSTEM::SECRETS]
 OBJ_FILES = secrets.o
-PRIVATE_DEPENDENCIES = LDB_WRAP UTIL_TDB
+PRIVATE_DEPENDENCIES = LDB_WRAP TDB_WRAP UTIL_TDB
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 1916854f7b..8b680ba973 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -8,11 +8,13 @@ OBJ_FILES = \
 
 [MODULE::smbcalls_config]
 OBJ_FILES = smbcalls_config.o
+OUTPUT_TYPE = INTEGRATED
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_config
 
 [MODULE::smbcalls_ldb]
 OBJ_FILES = smbcalls_ldb.o
+OUTPUT_TYPE = INTEGRATED
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_ldb
 PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
@@ -20,38 +22,45 @@ PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
 [MODULE::smbcalls_reg]
 OBJ_FILES = smbcalls_reg.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_reg
 PRIVATE_DEPENDENCIES = registry SAMDB LIBNDR
 
 [MODULE::smbcalls_nbt]
 OBJ_FILES = smbcalls_nbt.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_nbt
 
 [MODULE::smbcalls_samba3]
 OBJ_FILES = smbcalls_samba3.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_samba3
 PRIVATE_DEPENDENCIES = LIBSAMBA3 
 
 [MODULE::smbcalls_rand]
 OBJ_FILES = smbcalls_rand.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_random
 
 [MODULE::smbcalls_nss]
 OBJ_FILES = smbcalls_nss.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_nss
 PRIVATE_DEPENDENCIES = NSS_WRAPPER
 
 [MODULE::smbcalls_data]
 OBJ_FILES = smbcalls_data.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_datablob
 
 [MODULE::smbcalls_auth]
 OBJ_FILES = smbcalls_auth.o
+OUTPUT_TYPE = INTEGRATED
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
 PRIVATE_DEPENDENCIES = auth
@@ -59,11 +68,13 @@ PRIVATE_DEPENDENCIES = auth
 [MODULE::smbcalls_string]
 OBJ_FILES = smbcalls_string.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_string
 
 [MODULE::smbcalls_sys]
 OBJ_FILES = smbcalls_sys.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_system
 
 include ejsnet/config.mk
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 1a67928e84..ea0df63f32 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -19,7 +19,7 @@ OBJ_FILES = \
 		service_stream.o \
 		service_task.o
 PRIVATE_DEPENDENCIES = \
-		MESSAGING
+		MESSAGING samba-socket
 # End SUBSYSTEM SERVER
 #######################
 
diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index 71c7647fd9..6ef7e40471 100644
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -32,7 +32,8 @@ PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-CONFIG \
 		LIBSAMBA-UTIL \
 		NDR_XATTR \
-		WRAP_XATTR
+		WRAP_XATTR \
+		LIBSAMBA-ERRORS
 
 # End BINARY getntacl
 #################################