summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-09-17 19:49:01 +0200
committerStefan Metzmacher <metze@samba.org>2011-09-18 05:33:10 +0200
commitbbe78ca5a217eeba69a1e9189d8922c637d124f7 (patch)
treecd36c31d4465c5b80fdb789f2b4670bc5420049b
parent79043f84d1916196fc163d4cacd10235301a3283 (diff)
downloadsamba-bbe78ca5a217eeba69a1e9189d8922c637d124f7.tar.gz
samba-bbe78ca5a217eeba69a1e9189d8922c637d124f7.tar.bz2
samba-bbe78ca5a217eeba69a1e9189d8922c637d124f7.zip
s3:libsmb: return if tevent_req_set_endtime() fails
tevent_req_set_endtime() already calls tevent_req_nomem(). metze
-rw-r--r--source3/libsmb/async_smb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 8966794ab6..8336ec255a 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -420,7 +420,7 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
if (cli->timeout) {
endtime = timeval_current_ofs_msec(cli->timeout);
if (!tevent_req_set_endtime(result, ev, endtime)) {
- tevent_req_oom(result);
+ return result;
}
}
@@ -563,7 +563,9 @@ struct tevent_req *cli_smb_send(TALLOC_CTX *mem_ctx,
if (req == NULL) {
return NULL;
}
-
+ if (!tevent_req_is_in_progress(req)) {
+ return tevent_req_post(req, ev);
+ }
status = cli_smb_req_send(req);
if (!NT_STATUS_IS_OK(status)) {
tevent_req_nterror(req, status);