[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  f6445d8... s3-build: fix the build.
      from  c0fb7b8... s3: Fix some more iconv convenience usages.

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


- Log -----------------------------------------------------------------
commit f6445d8f860fa8f771e6c8986b8eda6cc00c7793
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 18 12:26:52 2010 +0200

    s3-build: fix the build.
    
    Guenther

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

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


Changeset truncated at 500 lines:

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 6b50009..b4e7151 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -257,7 +257,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, NULL, result,
+		&blob, result, result,
 		(ndr_pull_flags_fn_t)ndr_pull_messaging_rec);
 
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -670,7 +670,7 @@ NTSTATUS ctdbd_messaging_send(struct ctdbd_connection *conn,
 	}
 
 	ndr_err = ndr_push_struct_blob(
-		&blob, mem_ctx, NULL, msg,
+		&blob, mem_ctx, msg,
 		(ndr_push_flags_fn_t)ndr_push_messaging_rec);
 
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index d0c0a30..6a6f620 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -2478,7 +2478,7 @@ static void call_nt_transact_get_user_quota(connection_struct *conn,
 				tmp_list=tmp_list->next,entry+=entry_len,qt_len+=entry_len) {
 
 				sid_len = ndr_size_dom_sid(
-					&tmp_list->quotas->sid, NULL, 0);
+					&tmp_list->quotas->sid, 0);
 				entry_len = 40 + sid_len;
 
 				/* nextoffset entry 4 bytes */


-- 
Samba Shared Repository