diff options
Diffstat (limited to 'source4/ldap_server')
| -rw-r--r-- | source4/ldap_server/ldap_hacked_ldb.c | 8 | ||||
| -rw-r--r-- | source4/ldap_server/ldap_rootdse.c | 4 | ||||
| -rw-r--r-- | source4/ldap_server/ldap_simple_ldb.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source4/ldap_server/ldap_hacked_ldb.c b/source4/ldap_server/ldap_hacked_ldb.c index e00ed65f29..be252c738f 100644 --- a/source4/ldap_server/ldap_hacked_ldb.c +++ b/source4/ldap_server/ldap_hacked_ldb.c @@ -52,7 +52,7 @@ static NTSTATUS convert_values(TALLOC_CTX *mem_ctx, struct ldb_message_element *elem, - struct ldap_attribute *attrs, + struct ldb_message_element *attrs, struct ldb_context *samdb, const char **dn, struct ldap_SearchRequest *r) @@ -355,7 +355,7 @@ DEBUGADD(0,("hacked filter: %s\n", ldb_filter_from_tree(r, r->tree))); goto queue_reply; } ent->num_attributes = res[0]->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[0]->elements[j].name); @@ -403,7 +403,7 @@ queue_reply: goto queue_reply2; } 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); @@ -553,7 +553,7 @@ static NTSTATUS hldb_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); diff --git a/source4/ldap_server/ldap_rootdse.c b/source4/ldap_server/ldap_rootdse.c index a754601279..1740a29637 100644 --- a/source4/ldap_server/ldap_rootdse.c +++ b/source4/ldap_server/ldap_rootdse.c @@ -112,7 +112,7 @@ static void *rootdse_db_connect(TALLOC_CTX *mem_ctx) } -static NTSTATUS fill_dynamic_values(void *mem_ctx, struct ldap_attribute *attrs) +static NTSTATUS fill_dynamic_values(void *mem_ctx, struct ldb_message_element *attrs) { /* * currentTime @@ -346,7 +346,7 @@ static NTSTATUS rootdse_Search(struct ldapsrv_partition *partition, struct ldaps goto queue_reply; } ent->num_attributes = res[0]->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[0]->elements[j].name); diff --git a/source4/ldap_server/ldap_simple_ldb.c b/source4/ldap_server/ldap_simple_ldb.c index 1106919891..898b5fd82a 100644 --- a/source4/ldap_server/ldap_simple_ldb.c +++ b/source4/ldap_server/ldap_simple_ldb.c @@ -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); |