s4:libcli/rap: the caller should get talloc children from call->ndr_pull_{param,data}

[kai/samba.git] / source4 / libcli / rap / rap.c

diff --git a/source4/libcli/rap/rap.c b/source4/libcli/rap/rap.c
index 7743f64c4cc1d9152e4052e3a5bb8cb47b4efa61..1eee811f7f8077545e55e649f5ffee708a9c9070 100644 (file)
--- a/source4/libcli/rap/rap.c
+++ b/source4/libcli/rap/rap.c
@@ -30,24 +30,22 @@ struct rap_call *new_rap_cli_call(TALLOC_CTX *mem_ctx, uint16_t callno)
 {
        struct rap_call *call;
 
-       call = talloc(mem_ctx, struct rap_call);
-
-       if (call == NULL)
+       call = talloc_zero(mem_ctx, struct rap_call);
+       if (call == NULL) {
                return NULL;
+       }
 
        call->callno = callno;
        call->rcv_paramlen = 4;
 
-       call->paramdesc = NULL;
-       call->datadesc = NULL;
-       call->auxdatadesc = NULL;
-
-       call->ndr_push_param = ndr_push_init_ctx(mem_ctx);
+       call->ndr_push_param = ndr_push_init_ctx(call);
        call->ndr_push_param->flags = RAPNDR_FLAGS;
 
-       call->ndr_push_data = ndr_push_init_ctx(mem_ctx);
+       call->ndr_push_data = ndr_push_init_ctx(call);
        call->ndr_push_data->flags = RAPNDR_FLAGS;
 
+       call->pull_mem_ctx = mem_ctx;
+
        return call;
 }
 
@@ -221,9 +219,10 @@ NTSTATUS rap_cli_do_call(struct smbcli_tree *tree,
 
        call->ndr_pull_param = ndr_pull_init_blob(&trans.out.params, call);
        call->ndr_pull_param->flags = RAPNDR_FLAGS;
-
+       call->ndr_pull_param->current_mem_ctx = call->pull_mem_ctx;
        call->ndr_pull_data = ndr_pull_init_blob(&trans.out.data, call);
        call->ndr_pull_data->flags = RAPNDR_FLAGS;
+       call->ndr_pull_data->current_mem_ctx = call->pull_mem_ctx;
 
        return result;
 }