r26654: libcli/smb_composite: Rather than specifying each of the gazillion options for SMB individually, just specify the smbcli_options struct.

(This used to be commit 8a97886e24a4b969aa91409c06f423b71a45f6eb)

1 files changed, 6 insertions, 6 deletions

diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index c1fadaa679..666dfe8446 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -33,8 +33,7 @@
 bool smbcli_socket_connect(struct smbcli_state *cli, const char *server, 
 			   const char **ports, 
 			   struct resolve_context *resolve_ctx,
-			   int max_xmit, int max_mux, bool use_spnego,
-			   enum smb_signing_state signing)
+			   struct smbcli_options *options)
 {
 	struct smbcli_socket *sock;
 
@@ -43,8 +42,7 @@ bool smbcli_socket_connect(struct smbcli_state *cli, const char *server,
 
 	if (sock == NULL) return false;
 	
-	cli->transport = smbcli_transport_init(sock, cli, true, max_xmit,
-					       max_mux, use_spnego, signing);
+	cli->transport = smbcli_transport_init(sock, cli, true, options);
 	if (!cli->transport) {
 		return false;
 	}
@@ -143,7 +141,8 @@ NTSTATUS smbcli_full_connection(TALLOC_CTX *parent_ctx,
 				const char *devtype,
 				struct cli_credentials *credentials,
 				struct resolve_context *resolve_ctx,
-				struct event_context *ev)
+				struct event_context *ev,
+				struct smbcli_options *options)
 {
 	struct smbcli_tree *tree;
 	NTSTATUS status;
@@ -153,7 +152,8 @@ NTSTATUS smbcli_full_connection(TALLOC_CTX *parent_ctx,
 	status = smbcli_tree_full_connection(parent_ctx,
 					     &tree, host, ports, 
 					     sharename, devtype,
-					     credentials, resolve_ctx, ev);
+					     credentials, resolve_ctx, ev,
+					     options);
 	if (!NT_STATUS_IS_OK(status)) {
 		goto done;
 	}