sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

r10667: cope with a NULL tree for base searches in ldb_search()

Browse Source
This commit is contained in:
Andrew Tridgell 2005-09-30 23:47:40 +00:00 committed by Gerald (Jerry) Carter
parent af24f3d7fa
commit 26ff538578
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/lib/ldb/ldb_tdb/ldb_search.c
View File

@ -501,6 +501,17 @@ int ltdb_search_bytree(struct ldb_module *module, const struct ldb_dn *base,
if ((base == NULL || base->comp_num == 0) &&
(scope == LDB_SCOPE_BASE || scope == LDB_SCOPE_ONELEVEL)) return -1;
/* check if we are looking for a simple dn */
if (scope == LDB_SCOPE_BASE && tree == NULL) {
return ltdb_search_dn(module, base, attrs, res);
}
if (tree == NULL) {
char *err_string = talloc_strdup(module, "expression parse failed");
if (err_string) ldb_set_errstring(module, err_string);
return -1;
}
/* it is important that we handle dn queries this way, and not
via a full db search, otherwise ldb is horribly slow */
if (tree->operation == LDB_OP_EQUALITY &&
@ -553,18 +564,7 @@ int ltdb_search(struct ldb_module *module, const struct ldb_dn *base,
if ((base == NULL || base->comp_num == 0) &&
(scope == LDB_SCOPE_BASE || scope == LDB_SCOPE_ONELEVEL)) return -1;
/* check if we are looking for a simple dn */
if (scope == LDB_SCOPE_BASE && (expression == NULL || expression[0] == '\0')) {
ret = ltdb_search_dn(module, base, attrs, res);
return ret;
}
tree = ldb_parse_tree(ltdb, expression);
if (tree == NULL) {
char *err_string = talloc_strdup(module, "expression parse failed");
if (err_string) ldb_set_errstring(module, err_string);
return -1;
}
ret = ltdb_search_bytree(module, base, scope, tree, attrs, res);
talloc_free(tree);