From 7b054ecaed589ed4228fe5cd5680540f8fef201d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 16 Jan 2011 19:20:43 +0100 Subject: s3: Make passing up "result_parent" from cli_smb optional --- source3/libsmb/clientgen.c | 2 +- source3/libsmb/clifile.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'source3/libsmb') diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 3fb1c7fc7f..3816419dfd 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -954,7 +954,7 @@ NTSTATUS cli_smb(TALLOC_CTX *mem_ctx, struct cli_state *cli, pnum_bytes, pbytes); fail: TALLOC_FREE(ev); - if (NT_STATUS_IS_OK(status)) { + if (NT_STATUS_IS_OK(status) && (result_parent != NULL)) { *result_parent = req; } return status; diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index f68c99fc71..1b92dd8360 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -4082,14 +4082,13 @@ NTSTATUS cli_raw_ioctl(struct cli_state *cli, uint16_t fnum, uint32_t code, DATA { uint16_t vwv[3]; NTSTATUS status; - struct tevent_req *result_parent; SSVAL(vwv+0, 0, fnum); SSVAL(vwv+1, 0, code>>16); SSVAL(vwv+2, 0, (code&0xFFFF)); status = cli_smb(talloc_tos(), cli, SMBioctl, 0, 3, vwv, 0, NULL, - &result_parent, 0, NULL, NULL, NULL, NULL); + NULL, 0, NULL, NULL, NULL, NULL); if (!NT_STATUS_IS_OK(status)) { return status; } -- cgit