diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-03 17:22:08 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-01-03 12:33:36 -0600 |
| commit | dc8ccffed40ed5a5978961c632a9e28331a0fd4f (patch) | |
| tree | 88806e8f02dc7a42fa6f443b0644475117535e06 /source4/cluster | |
| parent | 6f79af9d13cb400506e05f20fb68c7f97daccf38 (diff) | |
| download | samba-dc8ccffed40ed5a5978961c632a9e28331a0fd4f.tar.gz samba-dc8ccffed40ed5a5978961c632a9e28331a0fd4f.tar.bz2 samba-dc8ccffed40ed5a5978961c632a9e28331a0fd4f.zip | |
r26653: Janitorial: Remove global_loadparm use in two more places.
(This used to be commit 65fbb4700d145810d1c7539a4037d73d856278c6)
Diffstat (limited to 'source4/cluster')
| -rw-r--r-- | source4/cluster/ctdb/opendb_ctdb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/cluster/ctdb/opendb_ctdb.c b/source4/cluster/ctdb/opendb_ctdb.c index fe5917bc69..aaab3aa55d 100644 --- a/source4/cluster/ctdb/opendb_ctdb.c +++ b/source4/cluster/ctdb/opendb_ctdb.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); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { return ndr_map_error2ntstatus(ndr_err); } @@ -232,7 +232,7 @@ static NTSTATUS odb_push_record(struct odb_lock *lck, struct opendb_file *file) } ndr_err = ndr_push_struct_blob(&blob, lck, - lp_iconv_convenience(global_loadparm), + 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); |