summaryrefslogtreecommitdiff
path: root/source3/torture
diff options
context:
space:
mode:
authorLuk Claes <luk@debian.org>2012-05-10 18:40:56 +0200
committerStefan Metzmacher <metze@samba.org>2012-05-12 01:01:31 +0200
commitc7a129262857ede4d4985a1c368b7066811ed2c3 (patch)
tree833088031d9a2f5c9a1bd184a8b90112f040cdaf /source3/torture
parent50d88c96bc03206b59a882669ab13f763945d41f (diff)
downloadsamba-c7a129262857ede4d4985a1c368b7066811ed2c3.tar.gz
samba-c7a129262857ede4d4985a1c368b7066811ed2c3.tar.bz2
samba-c7a129262857ede4d4985a1c368b7066811ed2c3.zip
s3/libsmb: Generalise cli_state in smb2 write calls
Signed-off-by: Luk Claes <luk@debian.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/torture')
-rw-r--r--source3/torture/test_smb2.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c
index 8ce0ad84e7..12f32aa07f 100644
--- a/source3/torture/test_smb2.c
+++ b/source3/torture/test_smb2.c
@@ -89,7 +89,8 @@ bool run_smb2_basic(int dummy)
return false;
}
- status = smb2cli_write(cli, strlen(hello), 0, fid_persistent,
+ status = smb2cli_write(cli->conn, cli->timeout, cli->smb2.session,
+ cli->smb2.tid, strlen(hello), 0, fid_persistent,
fid_volatile, 0, 0, (const uint8_t *)hello);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_write returned %s\n", nt_errstr(status));
@@ -338,7 +339,8 @@ bool run_smb2_session_reconnect(int dummy)
return false;
}
- status = smb2cli_write(cli1, strlen(hello), 0, fid_persistent,
+ status = smb2cli_write(cli1->conn, cli1->timeout, cli1->smb2.session,
+ cli1->smb2.tid, strlen(hello), 0, fid_persistent,
fid_volatile, 0, 0, (const uint8_t *)hello);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_write returned %s\n", nt_errstr(status));
@@ -532,7 +534,8 @@ bool run_smb2_session_reconnect(int dummy)
return false;
}
- status = smb2cli_write(cli2, strlen(hello), 0, fid_persistent,
+ status = smb2cli_write(cli2->conn, cli2->timeout, cli2->smb2.session,
+ cli2->smb2.tid, strlen(hello), 0, fid_persistent,
fid_volatile, 0, 0, (const uint8_t *)hello);
if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
printf("smb2cli_write returned %s\n", nt_errstr(status));
@@ -587,7 +590,8 @@ bool run_smb2_session_reconnect(int dummy)
return false;
}
- status = smb2cli_write(cli2, strlen(hello), 0, fid_persistent,
+ status = smb2cli_write(cli2->conn, cli2->timeout, cli2->smb2.session,
+ cli2->smb2.tid, strlen(hello), 0, fid_persistent,
fid_volatile, 0, 0, (const uint8_t *)hello);
if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
printf("smb2cli_write returned %s\n", nt_errstr(status));
@@ -645,7 +649,8 @@ bool run_smb2_session_reconnect(int dummy)
return false;
}
- status = smb2cli_write(cli2, strlen(hello), 0, fid_persistent,
+ status = smb2cli_write(cli2->conn, cli2->timeout, cli2->smb2.session,
+ cli2->smb2.tid, strlen(hello), 0, fid_persistent,
fid_volatile, 0, 0, (const uint8_t *)hello);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_write returned %s\n", nt_errstr(status));
@@ -738,7 +743,8 @@ bool run_smb2_tcon_dependence(int dummy)
return false;
}
- status = smb2cli_write(cli, strlen(hello), 0, fid_persistent,
+ status = smb2cli_write(cli->conn, cli->timeout, cli->smb2.session,
+ cli->smb2.tid, strlen(hello), 0, fid_persistent,
fid_volatile, 0, 0, (const uint8_t *)hello);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_write returned %s\n", nt_errstr(status));
@@ -1142,7 +1148,8 @@ bool run_smb2_multi_channel(int dummy)
return false;
}
- status = smb2cli_write(cli1, strlen(hello), 0, fid_persistent,
+ status = smb2cli_write(cli1->conn, cli1->timeout, cli1->smb2.session,
+ cli1->smb2.tid, strlen(hello), 0, fid_persistent,
fid_volatile, 0, 0, (const uint8_t *)hello);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_write returned %s\n", nt_errstr(status));