diff options
Diffstat (limited to 'source4/torture/ldap')
| -rw-r--r-- | source4/torture/ldap/cldap.c | 6 | ||||
| -rw-r--r-- | source4/torture/ldap/schema.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c index 05f9787191..fb2037f75e 100644 --- a/source4/torture/ldap/cldap.c +++ b/source4/torture/ldap/cldap.c @@ -167,12 +167,12 @@ done: use the convenient ldif dump routines in ldb to print out cldap search results */ -static struct ldb_message *ldap_msg_to_ldb(TALLOC_CTX *mem_ctx, struct ldap_SearchResEntry *res) +static struct ldb_message *ldap_msg_to_ldb(TALLOC_CTX *mem_ctx, struct ldb_context *ldb, struct ldap_SearchResEntry *res) { struct ldb_message *msg; msg = ldb_msg_new(mem_ctx); - msg->dn = ldb_dn_explode_or_special(msg, res->dn); + msg->dn = ldb_dn_new(msg, ldb, res->dn); msg->num_elements = res->num_attributes; msg->elements = talloc_steal(msg, res->attributes); return msg; @@ -194,7 +194,7 @@ static void cldap_dump_results(struct cldap_search *search) ldb = ldb_init(NULL); ZERO_STRUCT(ldif); - ldif.msg = ldap_msg_to_ldb(ldb, search->out.response); + ldif.msg = ldap_msg_to_ldb(ldb, ldb, search->out.response); ldb_ldif_write_file(ldb, stdout, &ldif); diff --git a/source4/torture/ldap/schema.c b/source4/torture/ldap/schema.c index bc8f1e38ce..2ab0c5e116 100644 --- a/source4/torture/ldap/schema.c +++ b/source4/torture/ldap/schema.c @@ -119,7 +119,7 @@ static BOOL test_search_rootDSE(struct ldb_context *ldb, struct test_rootDSE *ro d_printf("Testing RootDSE Search\n"); - ret = ldb_search(ldb, ldb_dn_new(ldb), LDB_SCOPE_BASE, + ret = ldb_search(ldb, ldb_dn_new(ldb, ldb, NULL), LDB_SCOPE_BASE, NULL, NULL, &r); if (ret != LDB_SUCCESS) { return False; @@ -226,7 +226,7 @@ static BOOL test_create_schema_type(struct ldb_context *ldb, struct test_rootDSE ctrl[1] = NULL; req->operation = LDB_SEARCH; - req->op.search.base = ldb_dn_explode(req, root->schemadn); + req->op.search.base = ldb_dn_new(req, ldb, root->schemadn); req->op.search.scope = LDB_SCOPE_SUBTREE; req->op.search.tree = ldb_parse_tree(req, filter); if (req->op.search.tree == NULL) return -1; |