diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2011-12-03 07:03:35 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2011-12-03 08:36:30 +0100 |
| commit | 05bc4de083b993e3db06fdb2a3e1198021526a71 (patch) | |
| tree | 48c86581142760ca89e6c851d271367d77ae0d05 /source4/torture | |
| parent | d74b3f941f5e28bf4a98dab6d4be25fbaab200b7 (diff) | |
| download | samba-05bc4de083b993e3db06fdb2a3e1198021526a71.tar.gz samba-05bc4de083b993e3db06fdb2a3e1198021526a71.tar.bz2 samba-05bc4de083b993e3db06fdb2a3e1198021526a71.zip | |
Revert making public of the samba-module library.
This library was tiny - containing just two public functions than were
themselves trivial. The amount of overhead this causes isn't really worth the
benefits of sharing the code with other projects like OpenChange. In addition, this code
isn't really generically useful anyway, as it can only load from the module path
set for Samba at configure time.
Adding a new library was breaking the API/ABI anyway, so OpenChange had to be
updated to cope with the new situation one way or another. I've added a simpler
(compatible) routine for loading modules to OpenChange, which is less than 100 lines of code.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Dec 3 08:36:33 CET 2011 on sn-devel-104
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/smbtorture.c | 4 | ||||
| -rw-r--r-- | source4/torture/torture.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 8122c14964..934e0a7b2f 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -32,7 +32,7 @@ #include "librpc/rpc/dcerpc.h" #include "auth/gensec/gensec.h" #include "param/param.h" -#include "lib/util/internal_module.h" +#include "lib/util/samba_modules.h" #if HAVE_READLINE_HISTORY_H #include <readline/history.h> @@ -602,7 +602,7 @@ int main(int argc,char *argv[]) } if (extra_module != NULL) { - samba_module_init_fn fn = load_module(poptGetOptArg(pc), false, NULL); + init_module_fn fn = load_module(poptGetOptArg(pc), false, NULL); if (fn == NULL) d_printf("Unable to load module from %s\n", poptGetOptArg(pc)); diff --git a/source4/torture/torture.c b/source4/torture/torture.c index dc35073eba..b066d3e1ac 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -23,7 +23,7 @@ #include "param/param.h" #include "lib/cmdline/popt_common.h" #include "torture/smbtorture.h" -#include "lib/util/samba_module.h" +#include "lib/util/samba_modules.h" _PUBLIC_ int torture_numops=10; _PUBLIC_ int torture_entries=1000; @@ -48,11 +48,11 @@ _PUBLIC_ int torture_init(void) { #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_smbtorture_MODULES_PROTO; - samba_module_init_fn static_init[] = { STATIC_smbtorture_MODULES }; - samba_module_init_fn *shared_init = samba_module_init_fns_for_subsystem(NULL, "smbtorture"); + init_module_fn static_init[] = { STATIC_smbtorture_MODULES }; + init_module_fn *shared_init = load_samba_modules(NULL, "smbtorture"); - samba_module_init_fns_run(static_init); - samba_module_init_fns_run(shared_init); + run_init_functions(static_init); + run_init_functions(shared_init); talloc_free(shared_init); |