summaryrefslogtreecommitdiff
path: root/source3/torture/test_smb2.c
diff options
context:
space:
mode:
Diffstat (limited to 'source3/torture/test_smb2.c')
-rw-r--r--source3/torture/test_smb2.c54
1 files changed, 36 insertions, 18 deletions
diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c
index 9cedef84e0..a8f7cd421e 100644
--- a/source3/torture/test_smb2.c
+++ b/source3/torture/test_smb2.c
@@ -96,7 +96,8 @@ bool run_smb2_basic(int dummy)
return false;
}
- status = smb2cli_flush(cli, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
+ cli->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@@ -343,7 +344,8 @@ bool run_smb2_session_reconnect(int dummy)
return false;
}
- status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
+ cli1->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@@ -504,7 +506,8 @@ bool run_smb2_session_reconnect(int dummy)
/* check file operation on the old client */
- status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
+ cli1->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@@ -521,7 +524,8 @@ bool run_smb2_session_reconnect(int dummy)
* on w2k8r2 at least, flush, read and write also work the same way,
* while create gives ACCESS_DENIED without signing
*/
- status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
+ cli2->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@@ -575,7 +579,8 @@ bool run_smb2_session_reconnect(int dummy)
cli2->smb2.tid = cli1->smb2.tid;
- status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
+ cli2->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@@ -646,7 +651,8 @@ bool run_smb2_session_reconnect(int dummy)
return false;
}
- status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
+ cli2->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@@ -738,7 +744,8 @@ bool run_smb2_tcon_dependence(int dummy)
return false;
}
- status = smb2cli_flush(cli, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
+ cli->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@@ -1141,19 +1148,22 @@ bool run_smb2_multi_channel(int dummy)
return false;
}
- status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
+ cli2->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
}
- status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
+ cli1->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
}
- status = smb2cli_flush(cli3, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli3->conn, cli3->timeout, cli3->smb2.session,
+ cli3->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@@ -1252,19 +1262,22 @@ bool run_smb2_multi_channel(int dummy)
return false;
}
- status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
+ cli1->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
}
- status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
+ cli2->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
}
- status = smb2cli_flush(cli3, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli3->conn, cli3->timeout, cli3->smb2.session,
+ cli3->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@@ -1356,19 +1369,22 @@ bool run_smb2_multi_channel(int dummy)
return false;
}
- status = smb2cli_flush(cli3, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli3->conn, cli3->timeout, cli3->smb2.session,
+ cli3->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
}
- status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
+ cli2->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
}
- status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
+ cli1->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@@ -1555,7 +1571,8 @@ bool run_smb2_session_reauth(int dummy)
return false;
}
- status = smb2cli_flush(cli, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
+ cli->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@@ -1703,7 +1720,8 @@ bool run_smb2_session_reauth(int dummy)
return false;
}
- status = smb2cli_flush(cli, fid_persistent, fid_volatile);
+ status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
+ cli->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;