diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-17 13:48:29 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-17 13:48:29 +0200 |
commit | 232fd06271d4012872e43a13dc67d2295555f65f (patch) | |
tree | ce7780a073239b49ef8356fbeaebfcc2f6828fe6 /source4/lib | |
parent | 8259cc592698942aa2c83564a3e2f1aa071d440e (diff) | |
parent | 310875e637fd237752770027b28675ed970352dd (diff) | |
download | samba-232fd06271d4012872e43a13dc67d2295555f65f.tar.gz samba-232fd06271d4012872e43a13dc67d2295555f65f.tar.bz2 samba-232fd06271d4012872e43a13dc67d2295555f65f.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
(This used to be commit 30a33cd0a64c434d6aee551f641343c3b2a6d9ca)
Diffstat (limited to 'source4/lib')
-rw-r--r-- | source4/lib/ldb/common/ldb.c | 10 | ||||
-rw-r--r-- | source4/lib/ldb/common/ldb_modules.c | 10 |
2 files changed, 0 insertions, 20 deletions
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index d0570c5382..cac0a383d8 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -185,16 +185,6 @@ int ldb_connect_backend(struct ldb_context *ldb, fn = ldb_find_backend(backend); if (fn == NULL) { - int (*init_fn) (void); - - init_fn = ldb_dso_load_symbol(ldb, backend, - "init_module"); - if (init_fn != NULL && init_fn() == 0) { - fn = ldb_find_backend(backend); - } - } - - if (fn == NULL) { struct ldb_backend_ops *ops; char *symbol_name = talloc_asprintf(ldb, "ldb_%s_backend_ops", backend); if (symbol_name == NULL) { diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c index ddbe0f23a6..fbfb5e5322 100644 --- a/source4/lib/ldb/common/ldb_modules.c +++ b/source4/lib/ldb/common/ldb_modules.c @@ -224,16 +224,6 @@ int ldb_load_modules_list(struct ldb_context *ldb, const char **module_list, str ops = ldb_find_module_ops(module_list[i]); if (ops == NULL) { - int (*init_fn) (void); - - init_fn = ldb_dso_load_symbol(ldb, module_list[i], - "init_module"); - if (init_fn != NULL && init_fn() == 0) { - ops = ldb_find_module_ops(module_list[i]); - } - } - - if (ops == NULL) { char *symbol_name = talloc_asprintf(ldb, "ldb_%s_module_ops", module_list[i]); if (symbol_name == NULL) { |