From d622cadd34e268a7348cb1c06b3e3ca01013a0bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Baumbach?= Date: Tue, 19 Jul 2011 16:15:52 +0200 Subject: [PATCH] s3-torture: run_simple_posix_open_test(): replace cli_read_old() with cli_read() Signed-off-by: Stefan Metzmacher Autobuild-User: Stefan Metzmacher Autobuild-Date: Wed Jul 20 23:22:09 CEST 2011 on sn-devel-104 --- source3/torture/torture.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 83873675c88..6317d0eae6a 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -5276,6 +5276,7 @@ static bool run_simple_posix_open_test(int dummy) SMB_STRUCT_STAT sbuf; bool correct = false; NTSTATUS status; + size_t nread; printf("Starting simple POSIX open test\n"); @@ -5495,8 +5496,14 @@ static bool run_simple_posix_open_test(int dummy) goto out; } - if (cli_read_old(cli1, fnum1, buf, 0, 10) != 10) { - printf("POSIX read of %s failed (%s)\n", hname, cli_errstr(cli1)); + status = cli_read(cli1, fnum1, buf, 0, 10, &nread); + if (!NT_STATUS_IS_OK(status)) { + printf("POSIX read of %s failed (%s)\n", hname, + nt_errstr(status)); + goto out; + } else if (nread != 10) { + printf("POSIX read of %s failed. Received %ld, expected %d\n", + hname, (unsigned long)nread, 10); goto out; } -- 2.11.4.GIT