[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Fri Dec 16 05:12:04 MST 2011


The branch, master has been updated
       via  35605fa s4:libcli/rap: the caller should get talloc children from call->ndr_pull_{param,data}
       via  0e04cc2 s4:libcli/rap: call->ndr_push_{param,data} can be talloc childs of 'call'
       via  17781b1 s4:libcli/rap: use talloc_zero() and initialize everything
      from  850b374 s4:libcli/rap: remove unused members from struct rap_call

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 35605fa0a3c44f1d8da2c06c1b17170aeca2bbef
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Dec 16 11:26:54 2011 +0100

    s4:libcli/rap: the caller should get talloc children from call->ndr_pull_{param,data}
    
    This should fix the flakey 'rap.printing.rap_printq_getinfo' test,
    see https://git.samba.org/autobuild.flakey/2011-12-16-0022/samba4.stdout
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Fri Dec 16 13:11:42 CET 2011 on sn-devel-104

commit 0e04cc2ea4b19ec024c9839ec93e99e417064174
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Dec 16 11:25:37 2011 +0100

    s4:libcli/rap: call->ndr_push_{param,data} can be talloc childs of 'call'
    
    metze

commit 17781b1c863332b9a808b8052119b70b122ff9f3
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Dec 16 11:18:04 2011 +0100

    s4:libcli/rap: use talloc_zero() and initialize everything
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source4/libcli/rap/rap.c |   20 +++++++++-----------
 source4/libcli/rap/rap.h |    2 ++
 2 files changed, 11 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libcli/rap/rap.c b/source4/libcli/rap/rap.c
index 007c520..1eee811 100644
--- a/source4/libcli/rap/rap.c
+++ b/source4/libcli/rap/rap.c
@@ -30,25 +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->rcv_datalen = 0;
 
-	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;
 }
 
@@ -222,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;
 }
diff --git a/source4/libcli/rap/rap.h b/source4/libcli/rap/rap.h
index c611f00..1d44682 100644
--- a/source4/libcli/rap/rap.h
+++ b/source4/libcli/rap/rap.h
@@ -64,6 +64,8 @@ struct rap_call {
 
 	struct ndr_push *ndr_push_param;
 	struct ndr_push *ndr_push_data;
+
+	TALLOC_CTX *pull_mem_ctx;
 	struct ndr_pull *ndr_pull_param;
 	struct ndr_pull *ndr_pull_data;
 };


-- 
Samba Shared Repository


More information about the samba-cvs mailing list