Author: jelmer Date: 2008-01-02 01:52:18 +0000 (Wed, 02 Jan 2008) New Revision: 26640
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26640 Log: Janitorial: Remove some more uses of global_loadparm. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c branches/SAMBA_4_0/source/dsdb/repl/drepl_partitions.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/repl_meta_data.c Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c =================================================================== --- branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c 2008-01-01 22:05:13 UTC (rev 26639) +++ branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c 2008-01-02 01:52:18 UTC (rev 26640) @@ -437,6 +437,7 @@ struct PAC_SIGNATURE_DATA *kdc_checksum = NULL; struct PAC_SIGNATURE_DATA *srv_checksum = NULL; int i; + struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(global_loadparm); /* First, just get the keytypes filled in (and lengths right, eventually) */ for (i=0; i < pac_data->num_buffers; i++) { @@ -485,7 +486,7 @@ memset(srv_checksum->signature.data, '\0', srv_checksum->signature.length); ndr_err = ndr_push_struct_blob(&tmp_blob, mem_ctx, - lp_iconv_convenience(global_loadparm), + iconv_convenience, pac_data, (ndr_push_flags_fn_t)ndr_push_PAC_DATA); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { @@ -510,7 +511,7 @@ /* And push it out again, this time to the world. This relies on determanistic pointer values */ ndr_err = ndr_push_struct_blob(&tmp_blob, mem_ctx, - lp_iconv_convenience(global_loadparm), + iconv_convenience, pac_data, (ndr_push_flags_fn_t)ndr_push_PAC_DATA); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { Modified: branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c =================================================================== --- branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c 2008-01-01 22:05:13 UTC (rev 26639) +++ branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c 2008-01-02 01:52:18 UTC (rev 26640) @@ -83,7 +83,7 @@ struct loadparm_context *lp_ctx, const char *dbname, int flags) { - const char *dir = lp_parm_string(global_loadparm, NULL, "ctdb", "shared data"); + const char *dir = lp_parm_string(lp_ctx, NULL, "ctdb", "shared data"); char *path; struct tdb_wrap *w; if (dir == NULL) { Modified: branches/SAMBA_4_0/source/dsdb/repl/drepl_partitions.c =================================================================== --- branches/SAMBA_4_0/source/dsdb/repl/drepl_partitions.c 2008-01-01 22:05:13 UTC (rev 26639) +++ branches/SAMBA_4_0/source/dsdb/repl/drepl_partitions.c 2008-01-02 01:52:18 UTC (rev 26640) @@ -157,7 +157,7 @@ W_ERROR_HAVE_NO_MEMORY(source); ndr_err = ndr_pull_struct_blob(val, source, - lp_iconv_convenience(global_loadparm), &source->_repsFromBlob, + lp_iconv_convenience(s->task->lp_ctx), &source->_repsFromBlob, (ndr_pull_flags_fn_t)ndr_pull_repsFromToBlob); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { NTSTATUS nt_status = ndr_map_error2ntstatus(ndr_err); @@ -224,7 +224,7 @@ if (ouv_value) { enum ndr_err_code ndr_err; ndr_err = ndr_pull_struct_blob(ouv_value, mem_ctx, - lp_iconv_convenience(global_loadparm), &ouv, + lp_iconv_convenience(s->task->lp_ctx), &ouv, (ndr_pull_flags_fn_t)ndr_pull_replUpToDateVectorBlob); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { NTSTATUS nt_status = ndr_map_error2ntstatus(ndr_err); Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c =================================================================== --- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c 2008-01-01 22:05:13 UTC (rev 26639) +++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c 2008-01-02 01:52:18 UTC (rev 26640) @@ -473,7 +473,7 @@ talloc_steal(io->ac, blob.data); /* TODO: use ndr_pull_struct_blob_all(), when the ndr layer handles it correct with relative pointers */ - ndr_err = ndr_pull_struct_blob(&blob, io->ac, lp_iconv_convenience(global_loadparm), &_old_pkb, + ndr_err = ndr_pull_struct_blob(&blob, io->ac, lp_iconv_convenience(ldb_get_opaque(io->ac->module->ldb, "loadparm")), &_old_pkb, (ndr_pull_flags_fn_t)ndr_pull_package_PrimaryKerberosBlob); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { NTSTATUS status = ndr_map_error2ntstatus(ndr_err); Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/repl_meta_data.c =================================================================== --- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/repl_meta_data.c 2008-01-01 22:05:13 UTC (rev 26639) +++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/repl_meta_data.c 2008-01-02 01:52:18 UTC (rev 26640) @@ -779,7 +779,7 @@ md->ctr.ctr1.array[i].local_usn = seq_num; } ndr_err = ndr_push_struct_blob(&md_value, msg, - lp_iconv_convenience(global_loadparm), + lp_iconv_convenience(ldb_get_opaque(ar->module->ldb, "loadparm")), md, (ndr_push_flags_fn_t)ndr_push_replPropertyMetaDataBlob); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { @@ -994,7 +994,7 @@ /* create the meta data value */ ndr_err = ndr_push_struct_blob(&nmd_value, msg, - lp_iconv_convenience(global_loadparm), + lp_iconv_convenience(ldb_get_opaque(ar->module->ldb, "loadparm")), &nmd, (ndr_push_flags_fn_t)ndr_push_replPropertyMetaDataBlob); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { @@ -1362,7 +1362,7 @@ msg->dn = ar->sub.search_msg->dn; ndr_err = ndr_push_struct_blob(&nuv_value, msg, - lp_iconv_convenience(global_loadparm), + lp_iconv_convenience(ldb_get_opaque(ar->module->ldb, "loadparm")), &nuv, (ndr_push_flags_fn_t)ndr_push_replUpToDateVectorBlob); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { @@ -1451,7 +1451,7 @@ /* we now fill the value which is already attached to ldb_message */ ndr_err = ndr_push_struct_blob(nrf_value, msg, - lp_iconv_convenience(global_loadparm), + lp_iconv_convenience(ldb_get_opaque(ar->module->ldb, "loadparm")), &nrf, (ndr_push_flags_fn_t)ndr_push_repsFromToBlob); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
