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 /auth | |
| 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 'auth')
| -rw-r--r-- | auth/gensec/gensec_start.c | 14 | ||||
| -rw-r--r-- | auth/gensec/wscript_build | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c index a48606f7cd..c38b97050f 100644 --- a/auth/gensec/gensec_start.c +++ b/auth/gensec/gensec_start.c @@ -29,7 +29,7 @@ #include "auth/gensec/gensec.h" #include "lib/param/param.h" #include "lib/util/tsort.h" -#include "lib/util/samba_module.h" +#include "lib/util/samba_modules.h" /* the list of currently registered GENSEC backends */ static struct gensec_security_ops **generic_security_ops; @@ -878,19 +878,19 @@ _PUBLIC_ NTSTATUS gensec_init(void) #define _MODULE_PROTO(init) extern NTSTATUS init(void); #ifdef STATIC_gensec_MODULES STATIC_gensec_MODULES_PROTO; - samba_module_init_fn static_init[] = { STATIC_gensec_MODULES }; + init_module_fn static_init[] = { STATIC_gensec_MODULES }; #else - samba_module_init_fn *static_init = NULL; + init_module_fn *static_init = NULL; #endif - samba_module_init_fn *shared_init; + init_module_fn *shared_init; if (initialized) return NT_STATUS_OK; initialized = true; - shared_init = samba_module_init_fns_for_subsystem(NULL, "gensec"); + shared_init = load_samba_modules(NULL, "gensec"); - 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); diff --git a/auth/gensec/wscript_build b/auth/gensec/wscript_build index 6514a064b7..e3e9372c3d 100644 --- a/auth/gensec/wscript_build +++ b/auth/gensec/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_LIBRARY('gensec', source='gensec.c gensec_start.c', pc_files='gensec.pc', autoproto='gensec_toplevel_proto.h', - public_deps='tevent-util samba-util errors LIBPACKET auth_system_session samba-module gensec_util', + public_deps='tevent-util samba-util errors LIBPACKET auth_system_session samba-modules gensec_util', public_headers='gensec.h', deps='com_err', vnum='0.0.1' |