summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-21 15:38:35 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-21 15:38:35 +0100
commitede79ae482b16c3cea65d3019bc1a68f07354e89 (patch)
tree285f911d98b63493b2e65d6866bfa1a756497b05 /source4/ntvfs
parentd9f8232c34a695df04a5240e270dd7ffc3101c0e (diff)
downloadsamba-ede79ae482b16c3cea65d3019bc1a68f07354e89.tar.gz
samba-ede79ae482b16c3cea65d3019bc1a68f07354e89.tar.bz2
samba-ede79ae482b16c3cea65d3019bc1a68f07354e89.zip
Remove more uses of global_loadparm.
(This used to be commit 58a5b1de2b093fe642eb11d76d12db0edf60c25c)
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/posix/pvfs_shortname.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_shortname.c b/source4/ntvfs/posix/pvfs_shortname.c
index 083a281819..923887debd 100644
--- a/source4/ntvfs/posix/pvfs_shortname.c
+++ b/source4/ntvfs/posix/pvfs_shortname.c
@@ -104,6 +104,8 @@ struct pvfs_mangle_context {
/* this is used to reverse the base 36 mapping */
unsigned char base_reverse[256];
+
+ struct smb_iconv_convenience *iconv_convenience;
};
@@ -388,7 +390,7 @@ static bool is_legal_name(struct pvfs_mangle_context *ctx, const char *name)
{
while (*name) {
size_t c_size;
- codepoint_t c = next_codepoint(lp_iconv_convenience(global_loadparm), name, &c_size);
+ codepoint_t c = next_codepoint(ctx->iconv_convenience, name, &c_size);
if (c == INVALID_CODEPOINT) {
return false;
}
@@ -613,6 +615,8 @@ NTSTATUS pvfs_mangle_init(struct pvfs_state *pvfs)
return NT_STATUS_NO_MEMORY;
}
+ ctx->iconv_convenience = lp_iconv_convenience(pvfs->ntvfs->ctx->lp_ctx);
+
/* by default have a max of 512 entries in the cache. */
ctx->cache_size = lp_parm_int(pvfs->ntvfs->ctx->lp_ctx, NULL, "mangle", "cachesize", 512);