[SCM] Samba Shared Repository - branch master updated - 4fa4a524de0647644abc842f34a926b458388b09

[Michael Adam]

The branch, master has been updated
       via  4fa4a524de0647644abc842f34a926b458388b09 (commit)
      from  59c3df814a4357d4358e6bcd3bd5d3ff6a18d995 (commit)

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


- Log -----------------------------------------------------------------
commit 4fa4a524de0647644abc842f34a926b458388b09
Author: Michael Adam <obnox at samba.org>
Date:   Mon Sep 29 13:52:23 2008 +0200

    [s3]fix build --with-cluster-support after ndr_[pull|push]_struct blob changes.
    
    Michael

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

Summary of changes:
 source3/lib/ctdbd_conn.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 1ae23bc..5075476 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -260,7 +260,7 @@ static struct messaging_rec *ctdb_pull_messaging_rec(TALLOC_CTX *mem_ctx,
 	blob = data_blob_const(msg->data, msg->datalen);
 
 	ndr_err = ndr_pull_struct_blob(
-		&blob, result, result,
+		&blob, result, NULL, result,
 		(ndr_pull_flags_fn_t)ndr_pull_messaging_rec);
 
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -636,7 +636,7 @@ NTSTATUS ctdbd_messaging_send(struct ctdbd_connection *conn,
 	}
 
 	ndr_err = ndr_push_struct_blob(
-		&blob, mem_ctx, msg,
+		&blob, mem_ctx, NULL, msg,
 		(ndr_push_flags_fn_t)ndr_push_messaging_rec);
 
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {


-- 
Samba Shared Repository