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)

diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index 39c614f0429c3b66ee9ed8035dc0bf80e3de44b9..e56339f96bf2d6a8b624ab437a1ee0604ab979fd 100644 (file)
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -58,25 +58,6 @@ struct connect_state {
 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
 */
@@ -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