diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-05-05 12:57:23 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-05 12:57:23 +1000 |
commit | f8fb5d8c4da11cdb8ac79649fd74047d4cc42c68 (patch) | |
tree | 7ebd52d4401a95ef61cbffecc88bfc17ad3413bc /source4/libcli/smb_composite | |
parent | 30a45df36612bc4b9aaae07031fc9486d8fe6a7c (diff) | |
download | samba-f8fb5d8c4da11cdb8ac79649fd74047d4cc42c68.tar.gz samba-f8fb5d8c4da11cdb8ac79649fd74047d4cc42c68.tar.bz2 samba-f8fb5d8c4da11cdb8ac79649fd74047d4cc42c68.zip |
Reorder this function in the file, so it reads bottom-up.
The rest of this file reads bottom-up, but this function
(connect_send_negprot()) was out of place.
Andrew Bartlett
(This used to be commit f0c95cd74fb6fea57cef89b59e5d2f10ea25c138)
Diffstat (limited to 'source4/libcli/smb_composite')
-rw-r--r-- | source4/libcli/smb_composite/connect.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c index 39c614f042..e56339f96b 100644 --- a/source4/libcli/smb_composite/connect.c +++ b/source4/libcli/smb_composite/connect.c @@ -59,25 +59,6 @@ static void request_handler(struct smbcli_request *); static void composite_handler(struct composite_context *); /* - setup a negprot send -*/ -static NTSTATUS connect_send_negprot(struct composite_context *c, - struct smb_composite_connect *io) -{ - struct connect_state *state = talloc_get_type(c->private_data, struct connect_state); - - state->req = smb_raw_negotiate_send(state->transport, io->in.options.unicode, io->in.options.max_protocol); - NT_STATUS_HAVE_NO_MEMORY(state->req); - - state->req->async.fn = request_handler; - state->req->async.private = c; - state->stage = CONNECT_NEGPROT; - - return NT_STATUS_OK; -} - - -/* a tree connect request has completed */ static NTSTATUS connect_tcon(struct composite_context *c, @@ -291,6 +272,24 @@ static NTSTATUS connect_negprot(struct composite_context *c, return NT_STATUS_OK; } +/* + setup a negprot send +*/ +static NTSTATUS connect_send_negprot(struct composite_context *c, + struct smb_composite_connect *io) +{ + struct connect_state *state = talloc_get_type(c->private_data, struct connect_state); + + state->req = smb_raw_negotiate_send(state->transport, io->in.options.unicode, io->in.options.max_protocol); + NT_STATUS_HAVE_NO_MEMORY(state->req); + + state->req->async.fn = request_handler; + state->req->async.private = c; + state->stage = CONNECT_NEGPROT; + + return NT_STATUS_OK; +} + /* a session request operation has completed |