summaryrefslogtreecommitdiff
path: root/source4/param
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-15 22:23:45 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:50:29 +0100
commit1bc38f9fb39eec46b31fa4ef36699b8f52f52350 (patch)
tree87715eb5388e855ec04180c0a022456cb2b69683 /source4/param
parent5b7ed0cd7f92de0a231c65d167c8cd5e90366b34 (diff)
downloadsamba-1bc38f9fb39eec46b31fa4ef36699b8f52f52350.tar.gz
samba-1bc38f9fb39eec46b31fa4ef36699b8f52f52350.tar.bz2
samba-1bc38f9fb39eec46b31fa4ef36699b8f52f52350.zip
r26464: Tighten dependencies.
(This used to be commit 2b7cfa5d9ab94e1ff2d60719cd3749810463ab15)
Diffstat (limited to 'source4/param')
-rw-r--r--source4/param/config.mk4
-rw-r--r--source4/param/loadparm.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/source4/param/config.mk b/source4/param/config.mk
index d338b2f513..b28f6639c0 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 064f67ba82..d732a09f2f 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;
}