Remove a few more usages of global_loadparm.

diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index fb23214bca300322e54c309609edaa9423610a5f..590edfef6430f643f614f5a0f3b73f945eda9b02 100644 (file)
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -94,12 +94,12 @@ PyObject *py_messaging_connect(PyTypeObject *self, PyObject *args, PyObject *kwa
                ret->msg_ctx = messaging_init(ret->mem_ctx, 
                                            messaging_path,
                                            server_id,
-                                           lp_iconv_convenience(global_loadparm),
+                                       py_iconv_convenience(ret->mem_ctx),
                                            ev);
        } else {
                ret->msg_ctx = messaging_client_init(ret->mem_ctx, 
                                            messaging_path,
-                                           lp_iconv_convenience(global_loadparm),
+                                       py_iconv_convenience(ret->mem_ctx),
                                            ev);
        }
 

diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index 391efe061941990658b96a905cf56aad68f823b9..1dc5e4e766c55e0eb65e907e4344c437dd37e92a 100644 (file)
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -168,15 +168,14 @@ struct smbcli_request *smbcli_transport_connect_send(struct smbcli_transport *tr
        DATA_BLOB calling_blob, called_blob;
        TALLOC_CTX *tmp_ctx = talloc_new(transport);
        NTSTATUS status;
-       struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(global_loadparm);
 
        status = nbt_name_dup(transport, called, &transport->called);
        if (!NT_STATUS_IS_OK(status)) goto failed;
        
-       status = nbt_name_to_blob(tmp_ctx, iconv_convenience, &calling_blob, calling);
+       status = nbt_name_to_blob(tmp_ctx, transport->iconv_convenience, &calling_blob, calling);
        if (!NT_STATUS_IS_OK(status)) goto failed;
 
-       status = nbt_name_to_blob(tmp_ctx, iconv_convenience, &called_blob, called);
+       status = nbt_name_to_blob(tmp_ctx, transport->iconv_convenience, &called_blob, called);
        if (!NT_STATUS_IS_OK(status)) goto failed;
 
        /* allocate output buffer */

diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index abca8f49b2f014f61a7eedc9d368447ca08a651b..13f7ab4704543c0a71be28126daa196009582ee7 100644 (file)
--- a/source4/libcli/util/clilsa.c
+++ b/source4/libcli/util/clilsa.c
@@ -81,7 +81,7 @@ static NTSTATUS smblsa_connect(struct smbcli_state *cli)
        lsa->ipc_tree->tid = tcon.tconx.out.tid;
 
        lsa->pipe = dcerpc_pipe_init(lsa, cli->transport->socket->event.ctx,
-                                    lp_iconv_convenience(global_loadparm));
+                                                                cli->transport->iconv_convenience);
        if (lsa->pipe == NULL) {
                talloc_free(lsa);
                return NT_STATUS_NO_MEMORY;

diff --git a/source4/ntvfs/posix/pvfs_util.c b/source4/ntvfs/posix/pvfs_util.c
index 720ddaaa7bf09a4fd00c1b123bd13a47a063293b..2aea15fbd1d281f9bd937c1bb78c8ba52ad9b89b 100644 (file)
--- a/source4/ntvfs/posix/pvfs_util.c
+++ b/source4/ntvfs/posix/pvfs_util.c
@@ -179,10 +179,11 @@ uint32_t pvfs_name_hash(const char *key, size_t length)
        const uint32_t fnv1_prime = 0x01000193;
        const uint32_t fnv1_init = 0xa6b93095;
        uint32_t value = fnv1_init;
+       struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(global_loadparm);
 
        while (*key && length--) {
                size_t c_size;
-               codepoint_t c = next_codepoint(lp_iconv_convenience(global_loadparm), key, &c_size);
+               codepoint_t c = next_codepoint(iconv_convenience, key, &c_size);
                c = toupper_m(c);
                 value *= fnv1_prime;
                 value ^= (uint32_t)c;