diff options
author | Andrew Tridgell <tridge@samba.org> | 2003-08-29 04:35:35 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2003-08-29 04:35:35 +0000 |
commit | a8a5ac2bd218d5bc3985ffbe118111c9b4649860 (patch) | |
tree | 4a2805c8a7ea2e25abe5d0f42c2548c2d4b96e55 /source4 | |
parent | 133c7a9055e2d4aba79f94a692ebe460e9386d01 (diff) | |
download | samba-a8a5ac2bd218d5bc3985ffbe118111c9b4649860.tar.gz samba-a8a5ac2bd218d5bc3985ffbe118111c9b4649860.tar.bz2 samba-a8a5ac2bd218d5bc3985ffbe118111c9b4649860.zip |
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)
Diffstat (limited to 'source4')
-rw-r--r-- | source4/torture/raw/read.c | 8 |
1 files changed, 7 insertions, 1 deletions
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; |