diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-02 18:39:15 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-01-02 12:48:04 -0600 |
| commit | 969b8579c755441092e27b499ecedbd7d725816d (patch) | |
| tree | 2b6ed0049c7afc7624ec81b559aad1d179a6b398 /source4/libcli/smb_composite/connect.c | |
| parent | 40acf23a927b7fcabad621cadabb9c7476c8d5e9 (diff) | |
| download | samba-969b8579c755441092e27b499ecedbd7d725816d.tar.gz samba-969b8579c755441092e27b499ecedbd7d725816d.tar.bz2 samba-969b8579c755441092e27b499ecedbd7d725816d.zip | |
r26646: libcli/smb_composite: Allow specifying SMB parameters in smb_composite_connect structure. AFAIK no global variables will now be used when doing RPC client connections.
(This used to be commit 0ef75e4e3cb0e1bd10e367a00f5e9b725587c40a)
Diffstat (limited to 'source4/libcli/smb_composite/connect.c')
| -rw-r--r-- | source4/libcli/smb_composite/connect.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c index b71cfc2c19..bdefe39b71 100644 --- a/source4/libcli/smb_composite/connect.c +++ b/source4/libcli/smb_composite/connect.c @@ -63,8 +63,7 @@ static NTSTATUS connect_send_negprot(struct composite_context *c, { struct connect_state *state = talloc_get_type(c->private_data, struct connect_state); - state->req = smb_raw_negotiate_send(state->transport, lp_unicode(global_loadparm), - lp_cli_maxprotocol(global_loadparm)); + state->req = smb_raw_negotiate_send(state->transport, io->in.unicode, io->in.max_protocol); NT_STATUS_HAVE_NO_MEMORY(state->req); state->req->async.fn = request_handler; @@ -308,9 +307,9 @@ static NTSTATUS connect_socket(struct composite_context *c, /* the socket is up - we can initialise the smbcli transport layer */ state->transport = smbcli_transport_init(state->sock, state, true, - lp_max_xmit(global_loadparm), - lp_maxmux(global_loadparm), - lp_use_spnego(global_loadparm) && lp_nt_status_support(global_loadparm)); + io->in.max_xmit, + io->in.max_mux, + io->in.use_spnego); NT_STATUS_HAVE_NO_MEMORY(state->transport); if (is_ipaddress(state->sock->hostname) && |