r26654: libcli/smb_composite: Rather than specifying each of the gazillion options...

[jelmer/samba4-debian.git] / source / libcli / raw / clitransport.c

diff --git a/source/libcli/raw/clitransport.c b/source/libcli/raw/clitransport.c
index 0bf805910e085f0a01f28672db3b57fb0ec5c025..62c32d305845908c9780278bd6845b322bad8131 100644 (file)
--- a/source/libcli/raw/clitransport.c
+++ b/source/libcli/raw/clitransport.c
@@ -73,7 +73,8 @@ static NTSTATUS smbcli_transport_finish_recv(void *private, DATA_BLOB blob);
 */
 struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock,
                                               TALLOC_CTX *parent_ctx, 
-                                              bool primary)
+                                              bool primary, 
+                                              struct smbcli_options *options)
 {
        struct smbcli_transport *transport;
 
@@ -86,12 +87,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.max_xmit = lp_max_xmit(global_loadparm);
-       transport->options.max_mux = lp_maxmux(global_loadparm);
-       transport->options.request_timeout = SMB_REQUEST_TIMEOUT;
-
+       transport->options = *options;
        transport->negotiate.max_xmit = transport->options.max_xmit;
 
        /* setup the stream -> packet parser */