s3/libsmb: Generalise cli_state in smb2 close calls

[mat/samba.git] / source3 / torture / test_smb2.c

diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c
index 1a4eed95cc9433fd9d236eb4a3fcbe71808719ed..90e065e94f4151afe83138f9e4f5f092c5a74f5c 100644 (file)
--- a/source3/torture/test_smb2.c
+++ b/source3/torture/test_smb2.c
@@ -122,7 +122,8 @@ bool run_smb2_basic(int dummy)
                return false;
        }
 
-       status = smb2cli_close(cli, 0, fid_persistent, fid_volatile);
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tid, 0, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_close returned %s\n", nt_errstr(status));
                return false;
@@ -155,7 +156,8 @@ bool run_smb2_basic(int dummy)
                return false;
        }
 
-       status = smb2cli_close(cli, 0, fid_persistent, fid_volatile);
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tid, 0, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_close returned %s\n", nt_errstr(status));
                return false;
@@ -1336,7 +1338,8 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       status = smb2cli_close(cli3, 0, fid_persistent, fid_volatile);
+       status = smb2cli_close(cli3->conn, cli3->timeout, cli3->smb2.session,
+                              cli3->smb2.tid, 0, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_close returned %s\n", nt_errstr(status));
                return false;
@@ -1769,7 +1772,8 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       status = smb2cli_close(cli, 0, fid_persistent, fid_volatile);
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tid, 0, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_close returned %s\n", nt_errstr(status));
                return false;
@@ -1800,13 +1804,15 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       status = smb2cli_close(cli, 0, dir_persistent, dir_volatile);
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tid, 0, dir_persistent, dir_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_close returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_close(cli, 0, fid_persistent, fid_volatile);
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tid, 0, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_close returned %s\n", nt_errstr(status));
                return false;