diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-01-12 11:43:18 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:46 -0500 |
commit | 287515fd3db1932f06d56da3bb388a7efc1120eb (patch) | |
tree | aa22ff31a537d30af6bc1086b014207993275883 /source4/libcli/composite/loadfile.c | |
parent | 09c34de35a472acfe92ef489409646086a564326 (diff) | |
download | samba-287515fd3db1932f06d56da3bb388a7efc1120eb.tar.gz samba-287515fd3db1932f06d56da3bb388a7efc1120eb.tar.bz2 samba-287515fd3db1932f06d56da3bb388a7efc1120eb.zip |
r4710: added a smb_composite_savefile() function, and expanded the test suite a little
(This used to be commit ef4dbc443dbdebc4160209ed3f23cbb97109c414)
Diffstat (limited to 'source4/libcli/composite/loadfile.c')
-rw-r--r-- | source4/libcli/composite/loadfile.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source4/libcli/composite/loadfile.c b/source4/libcli/composite/loadfile.c index 1bf1fd5403..61260aa963 100644 --- a/source4/libcli/composite/loadfile.c +++ b/source4/libcli/composite/loadfile.c @@ -257,22 +257,14 @@ NTSTATUS smb_composite_loadfile_recv(struct smbcli_composite *c, TALLOC_CTX *mem { NTSTATUS status; - if (!c) return NT_STATUS_NO_MEMORY; + status = smb_composite_wait(c); - while (c->state < SMBCLI_REQUEST_DONE) { - if (event_loop_once(c->req->transport->event.ctx) != 0) { - return NT_STATUS_UNSUCCESSFUL; - } - } - - if (NT_STATUS_IS_OK(c->status)) { + if (NT_STATUS_IS_OK(status)) { struct smb_composite_loadfile *io = c->composite_parms; talloc_steal(mem_ctx, io->out.data); } - status = c->status; talloc_free(c); - return status; } |