s3: Make passing up "result_parent" from cli_smb optional

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 3fb1c7fc7f6b30297e61dae623787df0e1d89ba6..3816419dfd6d8fc918bb2e1b91cb6f22ac73f82a 100644 (file)
--- 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 f68c99fc7144375a0da2feb60ed28a8dfb8c62d4..1b92dd8360c74a5366665ac43e636222c90875dc 100644 (file)
--- 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;
        }