s3-build: fix the build.
authorGünther Deschner <gd@samba.org>
Tue, 18 May 2010 10:26:52 +0000 (12:26 +0200)
committerGünther Deschner <gd@samba.org>
Tue, 18 May 2010 10:27:31 +0000 (12:27 +0200)
Guenther

source3/lib/ctdbd_conn.c
source3/smbd/nttrans.c

index 6b50009e003252917dc1e79d9d349825cbd8fea7..b4e7151b6f02e759188d1013eb67639a0a750960 100644 (file)
@@ -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)) {
index d0c0a30c5682bceb01cc624e92bb21f100132c88..6a6f620ee9daf17b93272c79eee944ac84ab9a8a 100644 (file)
@@ -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 */