svn commit: samba r7598 - in branches/SAMBA_4_0/source/libcli/ldap:
.
tridge at samba.org
tridge at samba.org
Wed Jun 15 01:12:32 GMT 2005
Author: tridge
Date: 2005-06-15 01:12:31 +0000 (Wed, 15 Jun 2005)
New Revision: 7598
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7598
Log:
take advantage of struct data_blob and struct ldb_val being the same
structure in a couple of places
Modified:
branches/SAMBA_4_0/source/libcli/ldap/ldap.c
branches/SAMBA_4_0/source/libcli/ldap/ldap_ndr.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap.c 2005-06-15 01:08:54 UTC (rev 7597)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap.c 2005-06-15 01:12:31 UTC (rev 7598)
@@ -603,11 +603,8 @@
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);
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_ndr.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_ndr.c 2005-06-15 01:08:54 UTC (rev 7597)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_ndr.c 2005-06-15 01:12:31 UTC (rev 7598)
@@ -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 @@
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 @@
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;
}
More information about the samba-cvs
mailing list