summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2011-07-22 13:06:13 +0200
committerStefan Metzmacher <metze@samba.org>2011-07-23 09:18:27 +0200
commit4b76c108ba2e567a7a2c96274590488a39d1c045 (patch)
treee4aa1d8d5c59b7b00c3de9ef8ad6031640d81c85 /source3
parentaffc9d4b610305dd6f4142869399befc58056ae6 (diff)
downloadsamba-4b76c108ba2e567a7a2c96274590488a39d1c045.tar.gz
samba-4b76c108ba2e567a7a2c96274590488a39d1c045.tar.bz2
samba-4b76c108ba2e567a7a2c96274590488a39d1c045.zip
s3-torture/denytest.c: replace cli_read_old() with cli_read()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/torture/denytest.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index 9fea7c5bea..8462894df5 100644
--- a/source3/torture/denytest.c
+++ b/source3/torture/denytest.c
@@ -1412,8 +1412,9 @@ bool torture_denytest1(int dummy)
uint16_t fnum1, fnum2;
int i;
bool correct = True;
- NTSTATUS ret1, ret2;
+ NTSTATUS ret1, ret2, status;
const char *fnames[2] = {"\\denytest1.dat", "\\denytest1.exe"};
+ size_t nread;
if (!torture_open_connection(&cli1, 0)) {
return False;
@@ -1451,7 +1452,10 @@ bool torture_denytest1(int dummy)
} else {
char x = 1;
res = A_0;
- if (cli_read_old(cli1, fnum2, (char *)&x, 0, 1) == 1) {
+
+ status = cli_read(cli1, fnum2, (char *)&x, 0, 1,
+ &nread);
+ if (NT_STATUS_IS_OK(status) && nread == 1) {
res += A_R;
}
if (NT_STATUS_IS_OK(cli_writeall(cli1, fnum2, 0,
@@ -1506,8 +1510,9 @@ bool torture_denytest2(int dummy)
uint16_t fnum1, fnum2;
int i;
bool correct = True;
- NTSTATUS ret1, ret2;
+ NTSTATUS ret1, ret2, status;
const char *fnames[2] = {"\\denytest2.dat", "\\denytest2.exe"};
+ size_t nread;
if (!torture_open_connection(&cli1, 0) || !torture_open_connection(&cli2, 1)) {
return False;
@@ -1543,9 +1548,12 @@ bool torture_denytest2(int dummy)
} else {
char x = 1;
res = A_0;
- if (cli_read_old(cli2, fnum2, (char *)&x, 0, 1) == 1) {
- res += A_R;
- }
+
+ status = cli_read(cli2, fnum2, (char *)&x, 0, 1,
+ &nread);
+ if (NT_STATUS_IS_OK(status) && nread == 1) {
+ res += A_R;
+ }
if (NT_STATUS_IS_OK(cli_writeall(cli2, fnum2, 0,
(uint8_t *)&x, 0, 1,
NULL))) {