r26464: Tighten dependencies.

(This used to be commit 2b7cfa5d9ab94e1ff2d60719cd3749810463ab15)

7 files changed, 12 insertions, 9 deletions

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 046ce026d0b..04a9fb58f64 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -11,7 +11,7 @@ PUBLIC_PROTO_HEADER = session_proto.h
 [SUBSYSTEM::auth_system_session]
 OBJ_FILES = system_session.o
 PUBLIC_PROTO_HEADER = system_session_proto.h
-PRIVATE_DEPENDENCIES = auth_session
+PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL
 
 [SUBSYSTEM::auth_sam]
 PRIVATE_PROTO_HEADER = auth_sam.h
diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index 7b091313c9c..c8fb8c86289 100644
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -7,7 +7,7 @@ OBJ_FILES = credentials.o \
 		credentials_files.o \
 		credentials_ntlm.o
 PUBLIC_DEPENDENCIES = \
-		LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS
+		LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS UTIL_LDB
 PRIVATE_DEPENDENCIES = CREDENTIALS_KRB5
 # End SUBSYSTEM CREDENTIALS
 #################################
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index 7f4bfafb549..6750ca2d493 100644
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -33,7 +33,7 @@ INIT_FUNCTION = s4_events_standard_init
 [SUBSYSTEM::LIBEVENTS]
 OBJ_FILES = events.o events_timed.o events_signal.o
 PUBLIC_HEADERS = events.h events_internal.h
-PUBLIC_DEPENDENCIES = LIBTALLOC
+PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
 # End SUBSYSTEM LIBEVENTS
 ##############################
 
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index c9ed5102d1e..99d53c7bbdb 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -35,7 +35,7 @@ OBJ_FILES = \
 	smb_composite/fetchfile.o \
 	smb_composite/appendacl.o \
 	smb_composite/fsinfo.o 
-PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE CREDENTIALS gensec
+PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE CREDENTIALS gensec LIBCLI_RESOLVE
 
 [SUBSYSTEM::NDR_NBT_BUF]
 PRIVATE_PROTO_HEADER = nbt/nbtname.h
@@ -74,7 +74,7 @@ OBJ_FILES = \
 	dgram/netlogon.o \
 	dgram/ntlogon.o \
 	dgram/browse.o
-PUBLIC_DEPENDENCIES = LIBCLI_NBT
+PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNDR LIBCLI_RESOLVE
 
 [LIBRARY::LIBCLI_CLDAP]
 VERSION = 0.0.1
diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index ff7480c9570..8c66df0325f 100644
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -6,7 +6,7 @@ OBJ_FILES = security_token.o \
 		access_check.o \
 		privilege.o \
 		sddl.o
-PUBLIC_DEPENDENCIES = NDR_MISC
+PUBLIC_DEPENDENCIES = NDR_MISC LIBNDR
 
 [PYTHON::swig_security]
 SWIG_FILE = security.i
diff --git a/source4/param/config.mk b/source4/param/config.mk
index d338b2f513f..b28f6639c04 100644
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -8,7 +8,7 @@ OBJ_FILES = loadparm.o \
 			util.o \
 			../lib/version.o
 PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL 
-PRIVATE_DEPENDENCIES = DYNCONFIG LIBREPLACE_EXT
+PRIVATE_DEPENDENCIES = DYNCONFIG LIBREPLACE_EXT CHARSET
 PUBLIC_PROTO_HEADER = proto.h
 PUBLIC_HEADERS = param.h
 
@@ -41,7 +41,7 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
 SUBSYSTEM = share
 INIT_FUNCTION = share_ldb_init
 OBJ_FILES = share_ldb.o 
-PRIVATE_DEPENDENCIES = LIBLDB
+PRIVATE_DEPENDENCIES = LIBLDB LDB_WRAP
 # End MODULE share_ldb
 ################################################
 
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 064f67ba827..d732a09f2f7 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2586,8 +2586,11 @@ int lp_maxprintjobs(struct loadparm_service *service)
 struct smb_iconv_convenience *lp_iconv_convenience(struct loadparm_context *lp_ctx)
 {
 	if (lp_ctx == NULL) {
-		return smb_iconv_convenience_init(talloc_autofree_context(), 
+		static struct smb_iconv_convenience *fallback_ic = NULL;
+		if (fallback_ic == NULL)
+			fallback_ic = smb_iconv_convenience_init(talloc_autofree_context(), 
 						  "CP850", "UTF8", true);
+		return fallback_ic;
 	}
 	return lp_ctx->iconv_convenience;
 }