summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb/ldb_modules/rootdse.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-01-17 13:39:46 +1100
committerAndrew Tridgell <tridge@samba.org>2011-01-17 05:23:04 +0100
commit8794e6dad906b9cc1eefbe03665a0035b91ac199 (patch)
treecf6e9c809ad9791333f397237139b370994f60d7 /source4/dsdb/samdb/ldb_modules/rootdse.c
parent87f31510475c6debd56ff874130f4f5d48bef9a5 (diff)
downloadsamba-8794e6dad906b9cc1eefbe03665a0035b91ac199.tar.gz
samba-8794e6dad906b9cc1eefbe03665a0035b91ac199.tar.bz2
samba-8794e6dad906b9cc1eefbe03665a0035b91ac199.zip
s4-dsdb: replaced the calls to ldb_search() in dsdb modules with dsdb_module_search()
this ensures we follow the module stack, and set the parent on child requests
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/rootdse.c')
-rw-r--r--source4/dsdb/samdb/ldb_modules/rootdse.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index 157a8c0ae5..007af57d54 100644
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -802,9 +802,9 @@ static int rootdse_init(struct ldb_module *module)
Then stuff these values into an opaque
*/
- ret = ldb_search(ldb, mem_ctx, &res,
- ldb_get_default_basedn(ldb),
- LDB_SCOPE_BASE, attrs, NULL);
+ ret = dsdb_module_search(module, mem_ctx, &res,
+ ldb_get_default_basedn(ldb),
+ LDB_SCOPE_BASE, attrs, DSDB_FLAG_NEXT_MODULE, NULL, NULL);
if (ret == LDB_SUCCESS && res->count == 1) {
int domain_behaviour_version
= ldb_msg_find_attr_as_int(res->msgs[0],
@@ -824,9 +824,9 @@ static int rootdse_init(struct ldb_module *module)
}
}
- ret = ldb_search(ldb, mem_ctx, &res,
- samdb_partitions_dn(ldb, mem_ctx),
- LDB_SCOPE_BASE, attrs, NULL);
+ ret = dsdb_module_search(module, mem_ctx, &res,
+ samdb_partitions_dn(ldb, mem_ctx),
+ LDB_SCOPE_BASE, attrs, DSDB_FLAG_NEXT_MODULE, NULL, NULL);
if (ret == LDB_SUCCESS && res->count == 1) {
int forest_behaviour_version
= ldb_msg_find_attr_as_int(res->msgs[0],
@@ -846,16 +846,16 @@ static int rootdse_init(struct ldb_module *module)
}
}
- ret = ldb_search(ldb, mem_ctx, &res,
- ldb_dn_new(mem_ctx, ldb, ""),
- LDB_SCOPE_BASE, ds_attrs, NULL);
+ ret = dsdb_module_search(module, mem_ctx, &res,
+ ldb_dn_new(mem_ctx, ldb, ""),
+ LDB_SCOPE_BASE, ds_attrs, DSDB_FLAG_NEXT_MODULE, NULL, NULL);
if (ret == LDB_SUCCESS && res->count == 1) {
struct ldb_dn *ds_dn
= ldb_msg_find_attr_as_dn(ldb, mem_ctx, res->msgs[0],
"dsServiceName");
if (ds_dn) {
- ret = ldb_search(ldb, mem_ctx, &res, ds_dn,
- LDB_SCOPE_BASE, attrs, NULL);
+ ret = dsdb_module_search(module, mem_ctx, &res, ds_dn,
+ LDB_SCOPE_BASE, attrs, DSDB_FLAG_NEXT_MODULE, NULL, NULL);
if (ret == LDB_SUCCESS && res->count == 1) {
int domain_controller_behaviour_version
= ldb_msg_find_attr_as_int(res->msgs[0],