r7596: next step in ldap cleanup. I'm aiming to get rid of the cut&pasted

ldif parsing code in libcli/ldap/ldap_ldif.c, and instead use the ldb
ldif code. To do that I have changed the ldap code to use 'struct
ldb_message_element' instead of 'struct ldap_attribute'. They are
essentially the same structure anyway, so by making them really the
same it will be much easier to use the ldb code in libcli/ldap/

I have also made 'struct ldb_val' the same as a DATA_BLOB, which will
simplify data handling in quite a few places (I haven't yet removed
all the code that maps between these two, that will come later)
(This used to be commit 87fc3073392236221a3a6b933284e9e477c24ae5)

1 files changed, 6 insertions, 6 deletions

diff --git a/source4/libcli/ldap/ldap_ldif.c b/source4/libcli/ldap/ldap_ldif.c
index 0e0885c1cc..594640179e 100644
--- a/source4/libcli/ldap/ldap_ldif.c
+++ b/source4/libcli/ldap/ldap_ldif.c
@@ -158,7 +158,7 @@ static int next_attr(char **s, const char **attr, struct ldb_val *value)
 }
 
 BOOL add_value_to_attrib(TALLOC_CTX *mem_ctx, struct ldb_val *value,
-			 struct ldap_attribute *attrib)
+			 struct ldb_message_element *attrib)
 {
 	attrib->values = talloc_realloc(mem_ctx, 
 					  attrib->values,
@@ -174,13 +174,13 @@ BOOL add_value_to_attrib(TALLOC_CTX *mem_ctx, struct ldb_val *value,
 }
 
 BOOL add_attrib_to_array_talloc(TALLOC_CTX *mem_ctx,
-				       const struct ldap_attribute *attrib,
-				       struct ldap_attribute **attribs,
+				       const struct ldb_message_element *attrib,
+				       struct ldb_message_element **attribs,
 				       int *num_attribs)
 {
 	*attribs = talloc_realloc(mem_ctx,
 				    *attribs,
-				    struct ldap_attribute,
+				    struct ldb_message_element,
 				    *num_attribs+1);
 
 	if (*attribs == NULL)
@@ -202,7 +202,7 @@ static BOOL fill_add_attributes(struct ldap_message *msg, char **chunk)
 
 	while (next_attr(chunk, &attr_name, &value) == 0) {
 		int i;
-		struct ldap_attribute *attrib = NULL;
+		struct ldb_message_element *attrib = NULL;
 		
 		for (i=0; i<r->num_attributes; i++) {
 			if (strequal(r->attributes[i].name, attr_name)) {
@@ -214,7 +214,7 @@ static BOOL fill_add_attributes(struct ldap_message *msg, char **chunk)
 		if (attrib == NULL) {
 			r->attributes = talloc_realloc(msg,
 							 r->attributes,
-							 struct ldap_attribute,
+							 struct ldb_message_element,
 							 r->num_attributes+1);
 			if (r->attributes == NULL)
 				return False;