s4:torture:smb2: add torture_smb2_connection_ext() that takes previous_session

diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index 403c1abadd0b14ce25ff5e290322966f24f835fb..62e4681563972119fee695854c35473f0412ba80 100644 (file)
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -338,7 +338,9 @@ bool torture_smb2_session_setup(struct torture_context *tctx,
 /*
   open a smb2 connection
 */
-bool torture_smb2_connection(struct torture_context *tctx, struct smb2_tree **tree)
+bool torture_smb2_connection_ext(struct torture_context *tctx,
+                                uint64_t previous_session_id,
+                                struct smb2_tree **tree)
 {
        NTSTATUS status;
        const char *host = torture_setting_string(tctx, "host", NULL);
@@ -348,18 +350,19 @@ bool torture_smb2_connection(struct torture_context *tctx, struct smb2_tree **tr
 
        lpcfg_smbcli_options(tctx->lp_ctx, &options);
 
-       status = smb2_connect(tctx,
-                             host,
-                             lpcfg_smb_ports(tctx->lp_ctx),
-                             share,
-                             lpcfg_resolve_context(tctx->lp_ctx),
-                             credentials,
-                             tree,
-                             tctx->ev,
-                             &options,
-                             lpcfg_socket_options(tctx->lp_ctx),
-                             lpcfg_gensec_settings(tctx, tctx->lp_ctx)
-                             );
+       status = smb2_connect_ext(tctx,
+                                 host,
+                                 lpcfg_smb_ports(tctx->lp_ctx),
+                                 share,
+                                 lpcfg_resolve_context(tctx->lp_ctx),
+                                 credentials,
+                                 previous_session_id,
+                                 tree,
+                                 tctx->ev,
+                                 &options,
+                                 lpcfg_socket_options(tctx->lp_ctx),
+                                 lpcfg_gensec_settings(tctx, tctx->lp_ctx)
+                                 );
        if (!NT_STATUS_IS_OK(status)) {
                printf("Failed to connect to SMB2 share \\\\%s\\%s - %s\n",
                       host, share, nt_errstr(status));
@@ -368,6 +371,15 @@ bool torture_smb2_connection(struct torture_context *tctx, struct smb2_tree **tr
        return true;
 }
 
+bool torture_smb2_connection(struct torture_context *tctx, struct smb2_tree **tree)
+{
+       bool ret;
+
+       ret = torture_smb2_connection_ext(tctx, 0, tree);
+
+       return ret;
+}
+
 
 /*
   create and return a handle to a test file