r7598: take advantage of struct data_blob and struct ldb_val being the same

structure in a couple of places
(This used to be commit bcd4671acae2be51958cbae23a0ab2dd2b194a5e)

diff --git a/source4/libcli/ldap/ldap.c b/source4/libcli/ldap/ldap.c
index 1a3ab6e0a5933663dbd1418aef6db04aa23c5eab..bce3da94aeb4707cce25e28f562373e943aa0bf5 100644 (file)
--- a/source4/libcli/ldap/ldap.c
+++ b/source4/libcli/ldap/ldap.c
@@ -603,11 +603,8 @@ static void ldap_decode_attrib(TALLOC_CTX *mem_ctx, struct asn1_data *data,
        asn1_start_tag(data, ASN1_SET);
        while (asn1_peek_tag(data, ASN1_OCTET_STRING)) {
                DATA_BLOB blob;
-               struct ldb_val value;
                asn1_read_OctetString(data, &blob);
-               value.data = blob.data;
-               value.length = blob.length;
-               add_value_to_attrib(mem_ctx, &value, attrib);
+               add_value_to_attrib(mem_ctx, &blob, attrib);
                data_blob_free(&blob);
        }
        asn1_end_tag(data);

diff --git a/source4/libcli/ldap/ldap_ndr.c b/source4/libcli/ldap/ldap_ndr.c
index 720022c6c27c12c8b968b707fef26f291c4b13d7..88ca1ece772affeaba5e725c9de3e0aedb5bb555 100644 (file)
--- a/source4/libcli/ldap/ldap_ndr.c
+++ b/source4/libcli/ldap/ldap_ndr.c
@@ -25,14 +25,6 @@
 #include "libcli/ldap/ldap.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
-struct ldb_val ldb_blob(DATA_BLOB blob)
-{
-       struct ldb_val val;
-       val.data = blob.data;
-       val.length = blob.length;
-       return val;
-}
-
 /*
   encode a NDR uint32 as a ldap filter element
 */
@@ -59,7 +51,7 @@ const char *ldap_encode_ndr_dom_sid(TALLOC_CTX *mem_ctx, struct dom_sid *sid)
        if (!NT_STATUS_IS_OK(status)) {
                return NULL;
        }
-       ret = ldb_binary_encode(mem_ctx, ldb_blob(blob));
+       ret = ldb_binary_encode(mem_ctx, blob);
        data_blob_free(&blob);
        return ret;
 }
@@ -78,7 +70,7 @@ const char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, struct GUID *guid)
        if (!NT_STATUS_IS_OK(status)) {
                return NULL;
        }
-       ret = ldb_binary_encode(mem_ctx, ldb_blob(blob));
+       ret = ldb_binary_encode(mem_ctx, blob);
        data_blob_free(&blob);
        return ret;
 }