s3-nbt: fix remaining callers of ndr_push/pull_struct_blob.

Guenther

diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c
index f436afc2fff367ff595220374ee409e9993491ac..9f7f88f783004ee32bc6bdb452e7b512b0822a25 100644 (file)
--- a/source3/lib/messages_local.c
+++ b/source3/lib/messages_local.c
@@ -160,7 +160,7 @@ static NTSTATUS messaging_tdb_fetch(TDB_CONTEXT *msg_tdb,
        blob = data_blob_const(data.dptr, data.dsize);
 
        ndr_err = ndr_pull_struct_blob(
-               &blob, result, result,
+               &blob, result, NULL, result,
                (ndr_pull_flags_fn_t)ndr_pull_messaging_array);
 
        SAFE_FREE(data.dptr);
@@ -203,7 +203,7 @@ static NTSTATUS messaging_tdb_store(TDB_CONTEXT *msg_tdb,
        }
 
        ndr_err = ndr_push_struct_blob(
-               &blob, mem_ctx, array,
+               &blob, mem_ctx, NULL, array,
                (ndr_push_flags_fn_t)ndr_push_messaging_array);
 
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {

diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c
index 44ae23271ef45261ea1d6a4a0cce868e78e31703..4965200bc1129f254798f3faf5ba87902a3d416c 100644 (file)
--- a/source3/lib/secdesc.c
+++ b/source3/lib/secdesc.c
@@ -249,7 +249,7 @@ NTSTATUS marshall_sec_desc(TALLOC_CTX *mem_ctx,
        enum ndr_err_code ndr_err;
 
        ndr_err = ndr_push_struct_blob(
-               &blob, mem_ctx, secdesc,
+               &blob, mem_ctx, NULL, secdesc,
                (ndr_push_flags_fn_t)ndr_push_security_descriptor);
 
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -285,7 +285,7 @@ NTSTATUS unmarshall_sec_desc(TALLOC_CTX *mem_ctx, uint8 *data, size_t len,
        blob = data_blob_const(data, len);
 
        ndr_err = ndr_pull_struct_blob(
-               &blob, result, result,
+               &blob, result, NULL, result,
                (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
 
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {

diff --git a/source3/libnet/libnet_dssync_keytab.c b/source3/libnet/libnet_dssync_keytab.c
index 6ba2c3aa41962665912f1a1ae14d936bd4e0bbd4..e762ecbe49200b0b7bba8a492a49995fcc62402f 100644 (file)
--- a/source3/libnet/libnet_dssync_keytab.c
+++ b/source3/libnet/libnet_dssync_keytab.c
@@ -86,7 +86,7 @@ static NTSTATUS keytab_startup(struct dssync_context *ctx, TALLOC_CTX *mem_ctx,
                old_utdv = talloc(mem_ctx, struct replUpToDateVectorBlob);
 
                ndr_err = ndr_pull_struct_blob(&entry->password, old_utdv,
-                               old_utdv,
+                               NULL, old_utdv,
                                (ndr_pull_flags_fn_t)ndr_pull_replUpToDateVectorBlob);
                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                        NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
@@ -124,7 +124,7 @@ static NTSTATUS keytab_finish(struct dssync_context *ctx, TALLOC_CTX *mem_ctx,
                        NDR_PRINT_DEBUG(replUpToDateVectorBlob, new_utdv);
                }
 
-               ndr_err = ndr_push_struct_blob(&blob, mem_ctx, new_utdv,
+               ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, new_utdv,
                                (ndr_push_flags_fn_t)ndr_push_replUpToDateVectorBlob);
                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                        status = ndr_map_error2ntstatus(ndr_err);
@@ -236,7 +236,7 @@ static  NTSTATUS parse_supplemental_credentials(TALLOC_CTX *mem_ctx,
                status = NT_STATUS_NO_MEMORY;
                goto done;
        }
-       ndr_err = ndr_pull_struct_blob(&scpk_blob, mem_ctx, pkb,
+       ndr_err = ndr_pull_struct_blob(&scpk_blob, mem_ctx, NULL, pkb,
                        (ndr_pull_flags_fn_t)ndr_pull_package_PrimaryKerberosBlob);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                status = ndr_map_error2ntstatus(ndr_err);

diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index daf27ffb51c3279f0f7bcc96f7f7676b74fea77a..64dcf6de51beaca5a6e0664be9ed80d678f5fe17 100644 (file)
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -65,7 +65,7 @@ static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
                user->user_private_info.SensitiveData = data.data;
                user->user_private_info.DataLength = data.length;
 
-               ndr_err = ndr_pull_struct_blob(&data, mem_ctx, &keys,
+               ndr_err = ndr_pull_struct_blob(&data, mem_ctx, NULL, &keys,
                        (ndr_pull_flags_fn_t)ndr_pull_netr_USER_KEYS);
                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                        dump_data(10, data.data, data.length);
@@ -397,7 +397,7 @@ NTSTATUS pull_netr_AcctLockStr(TALLOC_CTX *mem_ctx,
 
        blob = data_blob_const(r->array, r->length);
 
-       ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, str,
+       ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, str,
                       (ndr_pull_flags_fn_t)ndr_pull_netr_AcctLockStr);
 
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {

diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index 8b35a69defec1ae301dfd101386f0ec0a1b6223f..8ee3507a04f51b2e52431b99622ea869529ebd94 100644 (file)
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -181,7 +181,7 @@ bool send_getdc_request(TALLOC_CTX *mem_ctx,
                NDR_PRINT_DEBUG(nbt_ntlogon_packet, &packet);
        }
 
-       ndr_err = ndr_push_struct_blob(&blob, mem_ctx, &packet,
+       ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, &packet,
                       (ndr_push_flags_fn_t)ndr_push_nbt_ntlogon_packet);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                return false;

diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index fd5931075557dd8250086ce781d0686acabb965b..a2f3477b764b1927143272d3d7d10f580d4f01a4 100644 (file)
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -38,7 +38,7 @@ static NTSTATUS parse_acl_blob(const DATA_BLOB *pblob,
        size_t sd_size;
        struct timespec ts;
 
-       ndr_err = ndr_pull_struct_blob(pblob, ctx, &xacl,
+       ndr_err = ndr_pull_struct_blob(pblob, ctx, NULL, &xacl,
                        (ndr_pull_flags_fn_t)ndr_pull_xattr_NTACL);
 
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -245,7 +245,7 @@ static NTSTATUS create_acl_blob(SEC_DESC *psd, DATA_BLOB *pblob)
        unix_timespec_to_nt_time(&xacl.info.sd_ts->last_changed, curr);
 
        ndr_err = ndr_push_struct_blob(
-                       pblob, ctx, &xacl,
+                       pblob, ctx, NULL, &xacl,
                        (ndr_push_flags_fn_t)ndr_push_xattr_NTACL);
 
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {

diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c
index 7b5e5107476be34d26c59b14b98bf1a6d5179d9c..c707a1828f146641d1b2482cbabc58b3421f64d1 100644 (file)
--- a/source3/modules/vfs_xattr_tdb.c
+++ b/source3/modules/vfs_xattr_tdb.c
@@ -48,7 +48,7 @@ static NTSTATUS xattr_tdb_pull_attrs(TALLOC_CTX *mem_ctx,
        blob = data_blob_const(data->dptr, data->dsize);
 
        ndr_err = ndr_pull_struct_blob(
-               &blob, result, result,
+               &blob, result, NULL, result,
                (ndr_pull_flags_fn_t)ndr_pull_tdb_xattrs);
 
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -74,7 +74,7 @@ static NTSTATUS xattr_tdb_push_attrs(TALLOC_CTX *mem_ctx,
        enum ndr_err_code ndr_err;
 
        ndr_err = ndr_push_struct_blob(
-               &blob, mem_ctx, attribs,
+               &blob, mem_ctx, NULL, attribs,
                (ndr_push_flags_fn_t)ndr_push_tdb_xattrs);
 
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {

diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 124af00b57dff2fcd289e36fd7d3605e73af8dca..005e3ca556085c831f543c07f6d7d00ad9090000 100644 (file)
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -1186,7 +1186,7 @@ static NTSTATUS rpc_registry_getsd_internal(struct net_context *c,
        blob.data = sd->data;
        blob.length = sd->size;
 
-       ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, &sec_desc,
+       ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, &sec_desc,
                                       (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                status = ndr_map_error2ntstatus(ndr_err);