diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-05 15:36:37 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-01-05 09:42:02 -0600 |
| commit | 2da3464080e1a45f5c76231668a546ad7f10e790 (patch) | |
| tree | be874a6f1b8eef3cdf0a485b27dfcc454a340707 /source4/ntvfs | |
| parent | 2c8c9a535500e40084c4810da1890df8d9415659 (diff) | |
| download | samba-2da3464080e1a45f5c76231668a546ad7f10e790.tar.gz samba-2da3464080e1a45f5c76231668a546ad7f10e790.tar.bz2 samba-2da3464080e1a45f5c76231668a546ad7f10e790.zip | |
r26670: Janitorial: Remove global_loadparm uses.
(This used to be commit 13cc6ca1d3c2b5899bdd02c4c7306a92baa260f5)
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/common/opendb_tdb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c index 9bb6784df3..abd9ca708b 100644 --- a/source4/ntvfs/common/opendb_tdb.c +++ b/source4/ntvfs/common/opendb_tdb.c @@ -205,7 +205,7 @@ static NTSTATUS odb_pull_record(struct odb_lock *lck, struct opendb_file *file) blob.data = dbuf.dptr; blob.length = dbuf.dsize; - ndr_err = ndr_pull_struct_blob(&blob, lck, lp_iconv_convenience(global_loadparm), file, (ndr_pull_flags_fn_t)ndr_pull_opendb_file); + ndr_err = ndr_pull_struct_blob(&blob, lck, lp_iconv_convenience(lck->odb->ntvfs_ctx->lp_ctx), file, (ndr_pull_flags_fn_t)ndr_pull_opendb_file); free(dbuf.dptr); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { return ndr_map_error2ntstatus(ndr_err); @@ -233,7 +233,7 @@ static NTSTATUS odb_push_record(struct odb_lock *lck, struct opendb_file *file) return NT_STATUS_OK; } - ndr_err = ndr_push_struct_blob(&blob, lck, lp_iconv_convenience(global_loadparm), file, (ndr_push_flags_fn_t)ndr_push_opendb_file); + ndr_err = ndr_push_struct_blob(&blob, lck, lp_iconv_convenience(lck->odb->ntvfs_ctx->lp_ctx), file, (ndr_push_flags_fn_t)ndr_push_opendb_file); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { return ndr_map_error2ntstatus(ndr_err); } |