From a8a5ac2bd218d5bc3985ffbe118111c9b4649860 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 29 Aug 2003 04:35:35 +0000 Subject: expanded the RAW-READ test to make it clearer that all locks conflict in SMBlockread, not just other peoples locks (error in spec) (This used to be commit a56f6896bfc00222b12be3d0bb06f99144f2d23d) --- source4/torture/raw/read.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c index 50b3e0f2fb..e0432651dc 100644 --- a/source4/torture/raw/read.c +++ b/source4/torture/raw/read.c @@ -243,10 +243,16 @@ static BOOL test_lockread(struct cli_state *cli, TALLOC_CTX *mem_ctx) CHECK_STATUS(status, NT_STATUS_OK); CHECK_VALUE(io.lockread.out.nread, 0); + status = smb_raw_read(cli->tree, &io); + CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED); + + status = smb_raw_read(cli->tree, &io); + CHECK_STATUS(status, NT_STATUS_FILE_LOCK_CONFLICT); + printf("Trying zero file read\n"); io.lockread.in.count = 0; status = smb_raw_read(cli->tree, &io); - CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED); + CHECK_STATUS(status, NT_STATUS_FILE_LOCK_CONFLICT); printf("Trying bad fnum\n"); io.lockread.in.fnum = fnum+1; -- cgit