r26640: Janitorial: Remove some more uses of global_loadparm.

diff --git a/source/auth/kerberos/kerberos_pac.c b/source/auth/kerberos/kerberos_pac.c
index d345ea969a346bb071b58e4876d2836775a8ac53..c46e06bc72aeb34a621d5e6909bb4b8b6b6ac76e 100644 (file)
--- a/source/auth/kerberos/kerberos_pac.c
+++ b/source/auth/kerberos/kerberos_pac.c
@@ -437,6 +437,7 @@ static krb5_error_code make_pac_checksum(TALLOC_CTX *mem_ctx,
        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 @@ static krb5_error_code make_pac_checksum(TALLOC_CTX *mem_ctx,
        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 @@ static krb5_error_code make_pac_checksum(TALLOC_CTX *mem_ctx,
 
        /* 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)) {

diff --git a/source/cluster/ctdb/ctdb_cluster.c b/source/cluster/ctdb/ctdb_cluster.c
index 9a543ee3ee58a6235c5113c9118cb0e55a46c135..53df1e968e7f45ec07125be1dc2574c14d51a5c4 100644 (file)
--- a/source/cluster/ctdb/ctdb_cluster.c
+++ b/source/cluster/ctdb/ctdb_cluster.c
@@ -83,7 +83,7 @@ static struct tdb_wrap *ctdb_tdb_tmp_open(struct cluster_ops *ops,
                                          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) {

diff --git a/source/dsdb/repl/drepl_partitions.c b/source/dsdb/repl/drepl_partitions.c
index 1839520b34adb8030ef6703f12a341b00fb7236e..8a1c5aa31a82b27cd7ccaf7070c7187872c632d9 100644 (file)
--- a/source/dsdb/repl/drepl_partitions.c
+++ b/source/dsdb/repl/drepl_partitions.c
@@ -157,7 +157,7 @@ static WERROR dreplsrv_partition_add_source_dsa(struct dreplsrv_service *s,
        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 @@ static WERROR dreplsrv_refresh_partition(struct dreplsrv_service *s,
        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);

diff --git a/source/dsdb/samdb/ldb_modules/password_hash.c b/source/dsdb/samdb/ldb_modules/password_hash.c
index 61bd391d67b8d442afa1d9a1d4fbb86f74242efc..57c053d961829ce678d41a99e394f44e21e36211 100644 (file)
--- a/source/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source/dsdb/samdb/ldb_modules/password_hash.c
@@ -473,7 +473,7 @@ static int setup_primary_kerberos(struct setup_password_fields_io *io,
                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);

diff --git a/source/dsdb/samdb/ldb_modules/repl_meta_data.c b/source/dsdb/samdb/ldb_modules/repl_meta_data.c
index 55b7b18d8903aad2cd48c8f9e9cdcbced2a117d7..5a3cc4bef449f1ade1303d2e1a75d54484ffc07b 100644 (file)
--- a/source/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -779,7 +779,7 @@ static int replmd_replicated_apply_add(struct replmd_replicated_request *ar)
                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 @@ static int replmd_replicated_apply_merge(struct replmd_replicated_request *ar)
 
        /* 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 @@ static int replmd_replicated_uptodate_modify(struct replmd_replicated_request *a
        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 @@ static int replmd_replicated_uptodate_modify(struct replmd_replicated_request *a
 
        /* 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)) {