diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-08 23:32:43 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:57 +0100 |
| commit | a72c5053c587f0ed6113ef514fe3739cb81e7abf (patch) | |
| tree | 6099f21bea03a584363c76c6b87a0f648f35d44e /source4/ntvfs/posix | |
| parent | dd7e5ed88c48f4ee39e53be07c8839791e914e45 (diff) | |
| download | samba-a72c5053c587f0ed6113ef514fe3739cb81e7abf.tar.gz samba-a72c5053c587f0ed6113ef514fe3739cb81e7abf.tar.xz samba-a72c5053c587f0ed6113ef514fe3739cb81e7abf.zip | |
r26353: Remove use of global_loadparm.
(This used to be commit 17637e4490e42db6cdef619286c4d5a0982e9d1a)
Diffstat (limited to 'source4/ntvfs/posix')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_shortname.c | 4 | ||||
| -rw-r--r-- | source4/ntvfs/posix/vfs_posix.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/ntvfs/posix/pvfs_shortname.c b/source4/ntvfs/posix/pvfs_shortname.c index e671804ca6..68e415000e 100644 --- a/source4/ntvfs/posix/pvfs_shortname.c +++ b/source4/ntvfs/posix/pvfs_shortname.c @@ -614,7 +614,7 @@ NTSTATUS pvfs_mangle_init(struct pvfs_state *pvfs) } /* by default have a max of 512 entries in the cache. */ - ctx->cache_size = lp_parm_int(global_loadparm, NULL, "mangle", "cachesize", 512); + ctx->cache_size = lp_parm_int(pvfs->ntvfs->ctx->lp_ctx, NULL, "mangle", "cachesize", 512); ctx->prefix_cache = talloc_array(ctx, char *, ctx->cache_size); if (ctx->prefix_cache == NULL) { @@ -628,7 +628,7 @@ NTSTATUS pvfs_mangle_init(struct pvfs_state *pvfs) memset(ctx->prefix_cache, 0, sizeof(char *) * ctx->cache_size); memset(ctx->prefix_cache_hashes, 0, sizeof(uint32_t) * ctx->cache_size); - ctx->mangle_prefix = lp_parm_int(global_loadparm, NULL, "mangle", "prefix", -1); + ctx->mangle_prefix = lp_parm_int(pvfs->ntvfs->ctx->lp_ctx, NULL, "mangle", "prefix", -1); if (ctx->mangle_prefix < 0 || ctx->mangle_prefix > 6) { ctx->mangle_prefix = DEFAULT_MANGLE_PREFIX; } diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c index 07948a64e2..c1e15976d2 100644 --- a/source4/ntvfs/posix/vfs_posix.c +++ b/source4/ntvfs/posix/vfs_posix.c @@ -216,7 +216,7 @@ static NTSTATUS pvfs_connect(struct ntvfs_module_context *ntvfs, event_context_find(pvfs), pvfs->ntvfs->ctx->config); - pvfs->sidmap = sidmap_open(pvfs, global_loadparm); + pvfs->sidmap = sidmap_open(pvfs, pvfs->ntvfs->ctx->lp_ctx); if (pvfs->sidmap == NULL) { return NT_STATUS_INTERNAL_DB_CORRUPTION; } |