s3-torture: run_simple_posix_open_test(): replace cli_read_old() with

cli_read()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed Jul 20 23:22:09 CEST 2011 on sn-devel-104

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 83873675c88fd56b3e3fc9d83643dd580f617251..6317d0eae6a5a155d6317a0286d9c659a293754a 100644 (file)
--- 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;
        }