s4:libcli:smb2: add a previous session argument to smb2_connect_send()

diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index f1cf1087237258bf5400e968a7e939f41ad1c7c9..d9d430ddd5549680b689273401a3e8b746c89e6f 100644 (file)
--- a/source4/libcli/smb2/connect.c
+++ b/source4/libcli/smb2/connect.c
@@ -35,6 +35,7 @@
 struct smb2_connect_state {
        struct tevent_context *ev;
        struct cli_credentials *credentials;
+       uint64_t previous_session_id;
        struct resolve_context *resolve_ctx;
        const char *host;
        const char *share;
@@ -62,6 +63,7 @@ struct tevent_req *smb2_connect_send(TALLOC_CTX *mem_ctx,
                                     const char *share,
                                     struct resolve_context *resolve_ctx,
                                     struct cli_credentials *credentials,
+                                    uint64_t previous_session_id,
                                     struct smbcli_options *options,
                                     const char *socket_options,
                                     struct gensec_settings *gensec_settings)
@@ -79,6 +81,7 @@ struct tevent_req *smb2_connect_send(TALLOC_CTX *mem_ctx,
 
        state->ev = ev;
        state->credentials = credentials;
+       state->previous_session_id = previous_session_id;
        state->options = *options;
        state->host = host;
        state->ports = ports;
@@ -177,7 +180,7 @@ static void smb2_connect_negprot_done(struct tevent_req *subreq)
        subreq = smb2_session_setup_spnego_send(state, state->ev,
                                                state->session,
                                                state->credentials,
-                                               0 /* previous_session_id */);
+                                               state->previous_session_id);
        if (tevent_req_nomem(subreq, req)) {
                return;
        }
@@ -294,6 +297,7 @@ NTSTATUS smb2_connect(TALLOC_CTX *mem_ctx,
                                   share,
                                   resolve_ctx,
                                   credentials,
+                                  0, /* previous_session_id */
                                   options,
                                   socket_options,
                                   gensec_settings);

diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index dc70736e3fd85ee5be996bbc4c07f8fc48b176c8..634e3f4dedb66cb1a76aafe59852e52693955d2e 100644 (file)
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -255,6 +255,7 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb2_send(
                        "IPC$",
                        s->io.resolve_ctx,
                        s->io.creds,
+                       0, /* previous_session_id */
                        &options,
                        lpcfg_socket_options(lp_ctx),
                        lpcfg_gensec_settings(mem_ctx, lp_ctx));