summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-04-16 08:42:12 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-05-20 17:39:10 +1000
commitfeb9ffdac82c0e30ea61b7ac0d3dae2fcd3bcedd (patch)
tree09d4f5dc951c453cb9dddd385b30ab8d15da7a94 /source4/dsdb/samdb
parent72ccbcacddd2c3fdc6bfb61b8efb78625368365d (diff)
downloadsamba-feb9ffdac82c0e30ea61b7ac0d3dae2fcd3bcedd.tar.gz
samba-feb9ffdac82c0e30ea61b7ac0d3dae2fcd3bcedd.tar.bz2
samba-feb9ffdac82c0e30ea61b7ac0d3dae2fcd3bcedd.zip
s4:auth Add dependency from the operational module onto auth
We had to split up the auth module into a module loaded by main deamon and a subsystem we manually init in the operational module. Andrew Bartlett
Diffstat (limited to 'source4/dsdb/samdb')
-rw-r--r--source4/dsdb/samdb/ldb_modules/operational.c5
-rw-r--r--source4/dsdb/samdb/ldb_modules/wscript_build2
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index e17409e078..acd8b80161 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -784,7 +784,10 @@ static int operational_search(struct ldb_module *module, struct ldb_request *req
static int operational_init(struct ldb_module *ctx)
{
struct operational_data *data;
- int ret = ldb_next_init(ctx);
+ int ret;
+ auth_init();
+
+ ret = ldb_next_init(ctx);
if (ret != LDB_SUCCESS) {
return ret;
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 370b548eb2..0a222fea45 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -262,7 +262,7 @@ bld.SAMBA_MODULE('ldb_operational',
source='operational.c',
subsystem='LIBLDB',
init_function='LDB_MODULE(operational)',
- deps='talloc tevent LIBSAMBA-UTIL SAMDB_COMMON DSDB_MODULE_HELPERS auth'
+ deps='talloc tevent LIBSAMBA-UTIL SAMDB_COMMON DSDB_MODULE_HELPERS auth auth_session'
)