diff options
author | Simo Sorce <idra@samba.org> | 2006-01-06 16:12:45 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:49:48 -0500 |
commit | dbef4d76de92c3388f4e1819a76d6febf90be290 (patch) | |
tree | 9de9afa682085de347e6cdd632a9d0e06baa26c7 /source4/dsdb/samdb/ldb_modules/extended_dn.c | |
parent | 8f4dc51345dc48f5a6bfb1a49297f205ba53ef0a (diff) | |
download | samba-dbef4d76de92c3388f4e1819a76d6febf90be290.tar.gz samba-dbef4d76de92c3388f4e1819a76d6febf90be290.tar.bz2 samba-dbef4d76de92c3388f4e1819a76d6febf90be290.zip |
r12743: Remove the ugly way we had to make a second stage init and introduce
a second_stage_init private function for modules that need a second stage init.
Simo.
(This used to be commit 5e8b365fa2d93801a5de1d9ea76ce9d5546bd248)
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/extended_dn.c')
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/extended_dn.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn.c b/source4/dsdb/samdb/ldb_modules/extended_dn.c index 49af8604d5..839c190a8e 100644 --- a/source4/dsdb/samdb/ldb_modules/extended_dn.c +++ b/source4/dsdb/samdb/ldb_modules/extended_dn.c @@ -266,35 +266,34 @@ static int extended_request(struct ldb_module *module, struct ldb_request *req) } } +static int extended_init_2(struct ldb_module *module) +{ + struct ldb_request request; + int ret; + + request.operation = LDB_REQ_REGISTER; + request.op.reg.oid = LDB_CONTROL_EXTENDED_DN_OID; + request.controls = NULL; + + ret = ldb_request(module->ldb, &request); + if (ret != LDB_SUCCESS) { + ldb_debug(module->ldb, LDB_DEBUG_ERROR, "extended_dn: Unable to register control with rootdse!\n"); + return LDB_ERR_OTHER; + } + + return ldb_next_second_stage_init(module); +} + static const struct ldb_module_ops extended_dn_ops = { .name = "extended_dn", .request = extended_request, + .second_stage_init = extended_init_2 }; -#ifdef HAVE_DLOPEN_DISABLED -struct ldb_module *init_module(struct ldb_context *ldb, int stage, const char *options[]) -#else -struct ldb_module *extended_dn_module_init(struct ldb_context *ldb, int stage, const char *options[]) -#endif +struct ldb_module *extended_dn_module_init(struct ldb_context *ldb, const char *options[]) { struct ldb_module *ctx; - if (stage == LDB_MODULES_INIT_STAGE_2) { - struct ldb_request request; - int ret; - - request.operation = LDB_REQ_REGISTER; - request.op.reg.oid = LDB_CONTROL_EXTENDED_DN_OID; - request.controls = NULL; - - ret = ldb_request(ldb, &request); - if (ret != LDB_SUCCESS) { - ldb_debug(ldb, LDB_DEBUG_ERROR, "extended_dn: Unable to register control with rootdse!\n"); - } - - return NULL; - } - ctx = talloc(ldb, struct ldb_module); if (!ctx) return NULL; |