svn commit: samba r10667 - in
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb: .
tridge at samba.org
tridge at samba.org
Fri Sep 30 23:47:41 GMT 2005
Author: tridge
Date: 2005-09-30 23:47:40 +0000 (Fri, 30 Sep 2005)
New Revision: 10667
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10667
Log:
cope with a NULL tree for base searches in ldb_search()
Modified:
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c 2005-09-30 23:46:41 UTC (rev 10666)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c 2005-09-30 23:47:40 UTC (rev 10667)
@@ -501,6 +501,17 @@
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 @@
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);
More information about the samba-cvs
mailing list