mirror of
https://github.com/samba-team/samba.git
synced 2025-12-11 08:23:49 +03:00
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 87fc307339)
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
a7d6185f41
commit
3e92471d4c
@@ -108,7 +108,7 @@ static NTSTATUS sldb_Search(struct ldapsrv_partition *partition, struct ldapsrv_
|
||||
goto queue_reply;
|
||||
}
|
||||
ent->num_attributes = res[i]->num_elements;
|
||||
ent->attributes = talloc_array(ent_r, struct ldap_attribute, ent->num_attributes);
|
||||
ent->attributes = talloc_array(ent_r, struct ldb_message_element, ent->num_attributes);
|
||||
NT_STATUS_HAVE_NO_MEMORY(ent->attributes);
|
||||
for (j=0; j < ent->num_attributes; j++) {
|
||||
ent->attributes[j].name = talloc_steal(ent->attributes, res[i]->elements[j].name);
|
||||
|
||||
Reference in New Issue
Block a user