From 4b0e5bd75373ffa2d847706a71fd0349dfa15e71 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 13 Jun 2005 09:10:17 +0000 Subject: r7527: - added a ldb_search_bytree() interface, which takes a ldb_parse_tree instead of a search expression. This allows our ldap server to pass its ASN.1 parsed search expressions straight to ldb, instead of going via strings. - updated all the ldb modules code to handle the new interface - got rid of the separate ldb_parse.h now that the ldb_parse structures are exposed externally - moved to C99 structure initialisation in ldb - switched ldap server to using ldb_search_bytree() (This used to be commit 96620ab2ee5d440bbbc51c1bc0cad9977770f897) --- source4/ldap_server/ldap_hacked_ldb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/ldap_server/ldap_hacked_ldb.c') diff --git a/source4/ldap_server/ldap_hacked_ldb.c b/source4/ldap_server/ldap_hacked_ldb.c index 0829ae7753..154211ba63 100644 --- a/source4/ldap_server/ldap_hacked_ldb.c +++ b/source4/ldap_server/ldap_hacked_ldb.c @@ -99,7 +99,7 @@ static NTSTATUS convert_values(TALLOC_CTX *mem_ctx, if (strcasecmp(attrs->name, "ncname") == 0) { - char *filter = talloc_strdup(mem_ctx, r->filter); + char *filter = ldb_filter_from_tree(mem_ctx, r->tree); struct ldb_message **res = NULL; int count; const char *dom_dn; @@ -333,8 +333,8 @@ static NTSTATUS hacked_Search(struct ldapsrv_partition *partition, struct ldapsr attrs[j] = NULL; } DEBUG(0,("hacked basedn: %s\n", basedn_str)); -DEBUGADD(0,("hacked filter: %s\n", r->filter)); - count = ldb_search(samdb, basedn_str, scope, r->filter, attrs, &res); +DEBUGADD(0,("hacked filter: %s\n", ldb_filter_from_tree(r, r->tree))); + count = ldb_search_bytree(samdb, basedn_str, scope, r->tree, attrs, &res); talloc_steal(samdb, res); if (count < 1) { -- cgit