s3:utils change data_blob_dup_talloc() to take a DATA_BLOB by value

diff --git a/lib/util/data_blob.h b/lib/util/data_blob.h
index 558ade924823ce08613d92caf6d7f376b4dcc474..09a9292aeda0c99a8ea234eaaaedb17f6b0bf747 100644 (file)
--- a/lib/util/data_blob.h
+++ b/lib/util/data_blob.h
@@ -50,7 +50,7 @@ struct data_blob_list_item {
 
 #define data_blob(ptr, size) data_blob_named(ptr, size, "DATA_BLOB: "__location__)
 #define data_blob_talloc(ctx, ptr, size) data_blob_talloc_named(ctx, ptr, size, "DATA_BLOB: "__location__)
-#define data_blob_dup_talloc(ctx, blob) data_blob_talloc_named(ctx, (blob)->data, (blob)->length, "DATA_BLOB: "__location__)
+#define data_blob_dup_talloc(ctx, blob) data_blob_talloc_named(ctx, (blob).data, (blob).length, "DATA_BLOB: "__location__)
 
 /**
  construct a data blob, must be freed with data_blob_free()

diff --git a/source3/librpc/crypto/cli_spnego.c b/source3/librpc/crypto/cli_spnego.c
index bf58e25d9a87d2f0379663cea06d3ccb55d8adbb..98f2a1748de033a1ec1a3e0aa2c0484be57fc259 100644 (file)
--- a/source3/librpc/crypto/cli_spnego.c
+++ b/source3/librpc/crypto/cli_spnego.c
@@ -342,7 +342,7 @@ DATA_BLOB spnego_get_session_key(TALLOC_CTX *mem_ctx,
        case SPNEGO_NTLMSSP:
                sk = auth_ntlmssp_get_session_key(
                                        sp_ctx->mech_ctx.ntlmssp_state);
-               return data_blob_dup_talloc(mem_ctx, &sk);
+               return data_blob_dup_talloc(mem_ctx, sk);
        default:
                DEBUG(0, ("Unsupported type in request!\n"));
                return data_blob_null;

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index ec58b3d646c21a384d999ce6b0f6e671c4ba234b..c8cee97d66f5e2ec49d5be02e3f98f2e7ee8283a 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -3309,7 +3309,7 @@ NTSTATUS cli_get_session_key(TALLOC_CTX *mem_ctx,
        }
 
        if (make_dup) {
-               *session_key = data_blob_dup_talloc(mem_ctx, &sk);
+               *session_key = data_blob_dup_talloc(mem_ctx, sk);
        } else {
                *session_key = sk;
        }