r26669: Janitorial: Remove uses of global_loadparm.

(This used to be commit 50c46160d997e0448f51ae09e0f3c79e8519fa41)

3 files changed, 5 insertions, 6 deletions

diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c
index 8beaef3daa..8fcb8bb48c 100644
--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@@ -83,7 +83,7 @@ struct composite_context *smbcli_sock_connect_send(TALLOC_CTX *mem_ctx,
 
 	ctx = socket_connect_multi_send(state, host_addr,
 					state->num_ports, state->ports,
-					lp_resolve_context(global_loadparm),
+					resolve_ctx,
 					state->ctx->event_ctx);
 	if (ctx == NULL) goto failed;
 	ctx->async.fn = smbcli_sock_connect_recv_conn;
diff --git a/source4/libcli/raw/rawacl.c b/source4/libcli/raw/rawacl.c
index 9d2068f35f..847d133173 100644
--- a/source4/libcli/raw/rawacl.c
+++ b/source4/libcli/raw/rawacl.c
@@ -77,8 +77,7 @@ NTSTATUS smb_raw_query_secdesc_recv(struct smbcli_request *req,
 
 	nt.out.data.length = IVAL(nt.out.params.data, 0);
 
-	ndr = ndr_pull_init_blob(&nt.out.data, mem_ctx, 
-				 lp_iconv_convenience(global_loadparm));
+	ndr = ndr_pull_init_blob(&nt.out.data, mem_ctx, NULL);
 	if (!ndr) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
@@ -136,7 +135,7 @@ struct smbcli_request *smb_raw_set_secdesc_send(struct smbcli_tree *tree,
 	nt.in.params.data = params;
 	nt.in.params.length = 8;
 
-	ndr = ndr_push_init_ctx(NULL, lp_iconv_convenience(global_loadparm));
+	ndr = ndr_push_init_ctx(NULL, NULL);
 	if (!ndr) return NULL;
 
 	ndr_err = ndr_push_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, io->set_secdesc.in.sd);
diff --git a/source4/libcli/raw/rawnegotiate.c b/source4/libcli/raw/rawnegotiate.c
index 78b9082521..fc7725cc55 100644
--- a/source4/libcli/raw/rawnegotiate.c
+++ b/source4/libcli/raw/rawnegotiate.c
@@ -175,11 +175,11 @@ NTSTATUS smb_raw_negotiate_recv(struct smbcli_request *req)
 	}
 
 	/* a way to force ascii SMB */
-	if (!lp_unicode(global_loadparm)) {
+	if (!transport->options.unicode) {
 		transport->negotiate.capabilities &= ~CAP_UNICODE;
 	}
 
-	if (!lp_nt_status_support(global_loadparm)) {
+	if (!transport->options.ntstatus_support) {
 		transport->negotiate.capabilities &= ~CAP_STATUS32;
 	}