diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-10-06 05:24:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:39:26 -0500 |
| commit | 5fd031c97daaa1bf09a7ad80550753acd434075f (patch) | |
| tree | 8221ef256c17f138b11d22d9da26ae95db5618c4 /source4/dsdb/samdb | |
| parent | 92da5aa6b8d5141b22d781442583c9f3ad94d3af (diff) | |
| download | samba-5fd031c97daaa1bf09a7ad80550753acd434075f.tar.gz samba-5fd031c97daaa1bf09a7ad80550753acd434075f.tar.bz2 samba-5fd031c97daaa1bf09a7ad80550753acd434075f.zip | |
r10753: don't require every ldb module to implement both a search_bytree() and
a search() function, instead each module now only implements the
bytree method, and the expression based search is handled generically
by the modules code. This makes for more consistency and less code
duplication.
fixed the tdb backend to handle BASE searches much more
efficiently. They now always only lookup one record, regardless of the
search expression
(This used to be commit 7e44f9153c5578624e2fca04cdc0a00af0fd9eb4)
Diffstat (limited to 'source4/dsdb/samdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/objectguid.c | 9 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 9 |
2 files changed, 0 insertions, 18 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/objectguid.c b/source4/dsdb/samdb/ldb_modules/objectguid.c index bdef4d5147..9e0946b17c 100644 --- a/source4/dsdb/samdb/ldb_modules/objectguid.c +++ b/source4/dsdb/samdb/ldb_modules/objectguid.c @@ -38,14 +38,6 @@ #include "librpc/gen_ndr/ndr_misc.h" #include <time.h> -static int objectguid_search(struct ldb_module *module, const struct ldb_dn *base, - enum ldb_scope scope, const char *expression, - const char * const *attrs, struct ldb_message ***res) -{ - ldb_debug(module->ldb, LDB_DEBUG_TRACE, "objectguid_search\n"); - return ldb_next_search(module, base, scope, expression, attrs, res); -} - static int objectguid_search_bytree(struct ldb_module *module, const struct ldb_dn *base, enum ldb_scope scope, struct ldb_parse_tree *tree, const char * const *attrs, struct ldb_message ***res) @@ -166,7 +158,6 @@ static int objectguid_destructor(void *module_ctx) static const struct ldb_module_ops objectguid_ops = { .name = "objectguid", - .search = objectguid_search, .search_bytree = objectguid_search_bytree, .add_record = objectguid_add_record, .modify_record = objectguid_modify_record, diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 28e56fe0ca..89c9daa924 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -40,14 +40,6 @@ #define SAM_ACCOUNT_NAME_BASE "$000000-000000000000" -static int samldb_search(struct ldb_module *module, const struct ldb_dn *base, - enum ldb_scope scope, const char *expression, - const char * const *attrs, struct ldb_message ***res) -{ - ldb_debug(module->ldb, LDB_DEBUG_TRACE, "samldb_search\n"); - return ldb_next_search(module, base, scope, expression, attrs, res); -} - static int samldb_search_bytree(struct ldb_module *module, const struct ldb_dn *base, enum ldb_scope scope, struct ldb_parse_tree *tree, const char * const *attrs, struct ldb_message ***res) @@ -602,7 +594,6 @@ static int samldb_destructor(void *module_ctx) static const struct ldb_module_ops samldb_ops = { .name = "samldb", - .search = samldb_search, .search_bytree = samldb_search_bytree, .add_record = samldb_add_record, .modify_record = samldb_modify_record, |