diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-11 07:58:42 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-03-11 07:58:42 +1100 |
| commit | 3d0a727f575942b767e396b694f6529259528a17 (patch) | |
| tree | 8ea6acdfe1b043abe06a0f3d78dcbc1b55d6f146 /source3/torture | |
| parent | c218d3e1173355acf025471a10b4b6425b9c086b (diff) | |
| parent | 3d280639c4652d6cd35577e333bcd46c2517754c (diff) | |
| download | samba-3d0a727f575942b767e396b694f6529259528a17.tar.gz samba-3d0a727f575942b767e396b694f6529259528a17.tar.bz2 samba-3d0a727f575942b767e396b694f6529259528a17.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
Diffstat (limited to 'source3/torture')
| -rw-r--r-- | source3/torture/torture.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/torture/torture.c b/source3/torture/torture.c index db89b05603..a563557d5f 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -5004,7 +5004,9 @@ static bool run_chain1(int dummy) return True; } -static size_t null_source(uint8_t *buf, size_t n, void *priv) +static size_t null_source(uint8_t *inbuf, size_t n, + const uint8_t *outbuf, + void *priv) { size_t *to_pull = (size_t *)priv; size_t thistime = *to_pull; @@ -5014,7 +5016,7 @@ static size_t null_source(uint8_t *buf, size_t n, void *priv) return 0; } - memset(buf, 0, thistime); + memset(inbuf, 0, thistime); *to_pull -= thistime; return thistime; } @@ -5057,7 +5059,7 @@ static bool run_windows_write(int dummy) } status = cli_push(cli1, fnum, 0, i * torture_blocksize, torture_blocksize, - null_source, &to_pull); + false, null_source, &to_pull); if (!NT_STATUS_IS_OK(status)) { printf("cli_push returned: %s\n", nt_errstr(status)); goto fail; |