diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-10-13 20:58:38 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-10-13 11:00:04 +0000 |
| commit | 269143fa0031ef0b6d801b47aab48ff3b1414565 (patch) | |
| tree | e83088e77860bd0e7dc513aaa2792a42008c9885 /source4/lib/ldb/ldb_tdb/ldb_search.c | |
| parent | 549c044b9fe76e7d5a47a08fe73a99c87a41ddf4 (diff) | |
| download | samba-269143fa0031ef0b6d801b47aab48ff3b1414565.tar.gz samba-269143fa0031ef0b6d801b47aab48ff3b1414565.tar.bz2 samba-269143fa0031ef0b6d801b47aab48ff3b1414565.zip | |
s4-ldb: take advantage of ldb_match_msg_error() in more places
this gives better error checking
Diffstat (limited to 'source4/lib/ldb/ldb_tdb/ldb_search.c')
| -rw-r--r-- | source4/lib/ldb/ldb_tdb/ldb_search.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_search.c b/source4/lib/ldb/ldb_tdb/ldb_search.c index 9ebec90233..ca47fa3a5d 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_search.c +++ b/source4/lib/ldb/ldb_tdb/ldb_search.c @@ -384,6 +384,7 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi struct ltdb_context *ac; struct ldb_message *msg; int ret; + bool matched; ac = talloc_get_type(state, struct ltdb_context); ldb = ldb_module_get_ctx(ac->module); @@ -415,8 +416,13 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi } /* see if it matches the given expression */ - if (!ldb_match_msg(ldb, msg, - ac->tree, ac->base, ac->scope)) { + ret = ldb_match_msg_error(ldb, msg, + ac->tree, ac->base, ac->scope, &matched); + if (ret != LDB_SUCCESS) { + talloc_free(msg); + return -1; + } + if (!matched) { talloc_free(msg); return 0; } |