r26644: Janitorial: Pass resolve_context explicitly to various SMB functions, should help fix the build for OpenChange.

(This used to be commit 385ffe4f4cc9a21a760c0f00410f56e2592fd507)

3 files changed, 10 insertions, 6 deletions

diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c
index 9732ab1638..8beaef3daa 100644
--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@@ -47,6 +47,7 @@ struct composite_context *smbcli_sock_connect_send(TALLOC_CTX *mem_ctx,
 						   const char *host_addr,
 						   const char **ports,
 						   const char *host_name,
+						   struct resolve_context *resolve_ctx,
 						   struct event_context *event_ctx)
 {
 	struct composite_context *result, *ctx;
@@ -152,11 +153,13 @@ NTSTATUS smbcli_sock_connect_recv(struct composite_context *c,
 NTSTATUS smbcli_sock_connect(TALLOC_CTX *mem_ctx,
 			     const char *host_addr, const char **ports,
 			     const char *host_name,
+			     struct resolve_context *resolve_ctx,
 			     struct event_context *event_ctx,
 			     struct smbcli_socket **result)
 {
 	struct composite_context *c =
 		smbcli_sock_connect_send(mem_ctx, host_addr, ports, host_name,
+					 resolve_ctx,
 					 event_ctx);
 	return smbcli_sock_connect_recv(c, mem_ctx, result);
 }
@@ -233,8 +236,8 @@ struct smbcli_socket *smbcli_sock_connect_byname(const char *host, const char **
 		return NULL;
 	}
 
-	status = smbcli_sock_connect(mem_ctx, address, ports, name, event_ctx,
-				     &result);
+	status = smbcli_sock_connect(mem_ctx, address, ports, name, resolve_ctx,
+				     event_ctx, &result);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(9, ("smbcli_sock_connect failed: %s\n",
diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index 11df6c6c96..bdaeaeb58a 100644
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -75,7 +75,8 @@ struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock,
 					       TALLOC_CTX *parent_ctx, 
 					       bool primary, 
 					       int max_xmit,
-					       int max_mux)
+					       int max_mux,
+					       bool use_spnego)
 {
 	struct smbcli_transport *transport;
 
@@ -88,8 +89,7 @@ struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock,
 		transport->socket = talloc_reference(transport, sock);
 	}
 	transport->negotiate.protocol = PROTOCOL_NT1;
-	transport->options.use_spnego = lp_use_spnego(global_loadparm) && 
-		                        lp_nt_status_support(global_loadparm);
+	transport->options.use_spnego = use_spnego;
 	transport->options.max_xmit = max_xmit;
 	transport->options.max_mux = max_mux;
 	transport->options.request_timeout = SMB_REQUEST_TIMEOUT;
diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index 890d5470da..6b14893c4e 100644
--- a/source4/libcli/raw/clitree.c
+++ b/source4/libcli/raw/clitree.c
@@ -174,6 +174,7 @@ NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
 				     const char *dest_host, const char **dest_ports,
 				     const char *service, const char *service_type,
 				     struct cli_credentials *credentials,
+				     struct resolve_context *resolve_ctx,
 				     struct event_context *ev)
 {
 	struct smb_composite_connect io;
@@ -192,7 +193,7 @@ NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
 	io.in.fallback_to_anonymous = false;
 	io.in.workgroup = lp_workgroup(global_loadparm);
 	
-	status = smb_composite_connect(&io, parent_ctx, ev);
+	status = smb_composite_connect(&io, parent_ctx, resolve_ctx, ev);
 	if (NT_STATUS_IS_OK(status)) {
 		*ret_tree = io.out.tree;
 	}