diff options
| author | Gerald Carter <jerry@samba.org> | 2005-03-11 10:52:54 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-03-11 10:52:54 +0000 |
| commit | 061a07f6b476428c622618d83a5a1e54c5f05fe5 (patch) | |
| tree | 5e926c06e720253210687391b68aa82f553c9ad3 /source/torture | |
| parent | 6c30768e14f5639328e06a73940f133f9078b90e (diff) | |
| download | samba-061a07f6b476428c622618d83a5a1e54c5f05fe5.tar.gz | |
r5739: sync for 3.0.12rc1 (current with SAMBA_3_0 r5738)
Diffstat (limited to 'source/torture')
| -rw-r--r-- | source/torture/torture.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/torture/torture.c b/source/torture/torture.c index ec13abc1c1f..37aefc55acf 100644 --- a/source/torture/torture.c +++ b/source/torture/torture.c @@ -2666,9 +2666,10 @@ static BOOL run_oplock2(int dummy) sleep(2); - /* Ensure cli1 processes the break. */ + /* Ensure cli1 processes the break. Empty file should always return 0 + * bytes. */ - if (cli_read(cli1, fnum1, buf, 0, 4) != 4) { + if (cli_read(cli1, fnum1, buf, 0, 4) != 0) { printf("read on fnum1 failed (%s)\n", cli_errstr(cli1)); correct = False; } @@ -4138,7 +4139,7 @@ static BOOL run_openattrtest(int dummy) return correct; } -static void list_fn(file_info *finfo, const char *name, void *state) +static void list_fn(const char *mnt, file_info *finfo, const char *name, void *state) { } @@ -4198,7 +4199,7 @@ static BOOL run_dirtest(int dummy) return correct; } -static void del_fn(file_info *finfo, const char *mask, void *state) +static void del_fn(const char *mnt, file_info *finfo, const char *mask, void *state) { struct cli_state *pcli = (struct cli_state *)state; fstring fname; |