#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;
#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);
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'
includes='',
subsystem=None,
init_function=None,
- module_init_name='samba_module_init',
+ module_init_name='samba_init_module',
autoproto=None,
autoproto_extra_source='',
cflags='',
+++ /dev/null
-samba_module_init_fns_for_subsystem: samba_module_init_fn *(TALLOC_CTX *, const char *)
-samba_module_init_fns_run: bool (samba_module_init_fn *)
+++ /dev/null
-/*
- Unix SMB/CIFS implementation.
- Handling of idle/exit events
- Copyright (C) Stefan (metze) Metzmacher 2003
- Copyright (C) Andrew Bartlett 2011
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _INTERNAL_MODULES_H
-#define _INTERNAL_MODULES_H
-
-#include "lib/util/samba_module.h"
-
-/**
- * Obtain the init function from a shared library file.
- *
- * The handle to dlclose() in case of error is returns in *handle if handle is not NULL
- */
-samba_module_init_fn load_module(const char *path, bool is_probe, void **handle);
-
-int smb_load_modules(const char **modules);
-NTSTATUS smb_probe_module(const char *subsystem, const char *module);
-
-/**
- * Obtain list of init functions from the modules in the specified
- * directory
- */
-samba_module_init_fn *load_modules(TALLOC_CTX *mem_ctx, const char *path);
-
-#endif /* _INTERNAL_MODULES_H */
#include "includes.h"
#include "dynconfig/dynconfig.h"
-#include "lib/util/internal_module.h"
+#include "lib/util/samba_modules.h"
#include "system/filesys.h"
#include "system/dir.h"
/**
* Obtain the init function from a shared library file
*/
-samba_module_init_fn load_module(const char *path, bool is_probe, void **handle_out)
+init_module_fn load_module(const char *path, bool is_probe, void **handle_out)
{
void *handle;
void *init_fn;
return NULL;
}
- init_fn = (samba_module_init_fn)dlsym(handle, SAMBA_MODULE_INIT);
+ init_fn = (init_module_fn)dlsym(handle, SAMBA_INIT_MODULE);
/* we could check dlerror() to determine if it worked, because
dlsym() can validly return NULL, but what would we do with
if (init_fn == NULL) {
DEBUG(0, ("Unable to find %s() in %s: %s\n",
- SAMBA_MODULE_INIT, path, dlerror()));
+ SAMBA_INIT_MODULE, path, dlerror()));
DEBUG(1, ("Loading module '%s' failed\n", path));
dlclose(handle);
return NULL;
*handle_out = handle;
}
- return (samba_module_init_fn)init_fn;
+ return (init_module_fn)init_fn;
}
/**
* Obtain list of init functions from the modules in the specified
* directory
*/
-samba_module_init_fn *load_modules(TALLOC_CTX *mem_ctx, const char *path)
+static init_module_fn *load_modules(TALLOC_CTX *mem_ctx, const char *path)
{
DIR *dir;
struct dirent *entry;
char *filename;
int success = 0;
- samba_module_init_fn *ret = talloc_array(mem_ctx, samba_module_init_fn, 2);
+ init_module_fn *ret = talloc_array(mem_ctx, init_module_fn, 2);
ret[0] = NULL;
ret[success] = load_module(filename, true, NULL);
if (ret[success]) {
- ret = talloc_realloc(mem_ctx, ret, samba_module_init_fn, success+2);
+ ret = talloc_realloc(mem_ctx, ret, init_module_fn, success+2);
success++;
ret[success] = NULL;
}
return ret;
}
+/**
+ * Run the specified init functions.
+ *
+ * @return true if all functions ran successfully, false otherwise
+ */
+bool run_init_functions(init_module_fn *fns)
+{
+ int i;
+ bool ret = true;
+
+ if (fns == NULL)
+ return true;
+
+ for (i = 0; fns[i]; i++) { ret &= (bool)NT_STATUS_IS_OK(fns[i]()); }
+
+ return ret;
+}
+
+/**
+ * Load the initialization functions from DSO files for a specific subsystem.
+ *
+ * Will return an array of function pointers to initialization functions
+ */
+
+init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, const char *subsystem)
+{
+ char *path = modules_path(mem_ctx, subsystem);
+ init_module_fn *ret;
+
+ ret = load_modules(mem_ctx, path);
+
+ talloc_free(path);
+
+ return ret;
+}
+
+
/* Load a dynamic module. Only log a level 0 error if we are not checking
for the existence of a module (probling). */
static NTSTATUS do_smb_load_module(const char *module_name, bool is_probe)
{
void *handle;
- samba_module_init_fn init;
+ init_module_fn init;
NTSTATUS status;
init = load_module(module_name, is_probe, &handle);
+++ /dev/null
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: samba-modules
-Description: Samba module loading utility functions
-Requires: talloc
-Version: 0.0.1
-Libs: @LIB_RPATH@ -L${libdir} -lsamba-modules
-Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1
+++ /dev/null
-/*
- Unix SMB/CIFS implementation.
- Samba utility functions
- Copyright (C) Jelmer Vernooij 2002-2003,2005-2007
- Copyright (C) Stefan (metze) Metzmacher 2003
- Copyright (C) Andrew Bartlett 2011
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "dynconfig/dynconfig.h"
-#include "lib/util/internal_module.h"
-#include "system/filesys.h"
-#include "system/dir.h"
-
-/**
- * Run the specified init functions.
- *
- * @return true if all functions ran successfully, false otherwise
- */
-bool samba_module_init_fns_run(samba_module_init_fn *fns)
-{
- int i;
- bool ret = true;
-
- if (fns == NULL)
- return true;
-
- for (i = 0; fns[i]; i++) { ret &= (bool)NT_STATUS_IS_OK(fns[i]()); }
-
- return ret;
-}
-
-/**
- * Load the initialization functions from DSO files for a specific subsystem.
- *
- * Will return an array of function pointers to initialization functions
- */
-
-samba_module_init_fn *samba_module_init_fns_for_subsystem(TALLOC_CTX *mem_ctx, const char *subsystem)
-{
- char *path = modules_path(mem_ctx, subsystem);
- samba_module_init_fn *ret;
-
- ret = load_modules(mem_ctx, path);
-
- talloc_free(path);
-
- return ret;
-}
#define _SAMBA_MODULES_H
/* Module support */
-typedef NTSTATUS (*samba_module_init_fn) (void);
+typedef NTSTATUS (*init_module_fn) (void);
-NTSTATUS samba_module_init(void);
+NTSTATUS samba_init_module(void);
/* this needs to be a string which is not in the C library. We
previously used "init_module", but that meant that modules which
did not define this function ended up calling the C library
function init_module() which makes a system call */
-#define SAMBA_MODULE_INIT "samba_module_init"
+#define SAMBA_INIT_MODULE "samba_init_module"
+
+/**
+ * Obtain the init function from a shared library file.
+ *
+ * The handle to dlclose() in case of error is returns in *handle if handle is not NULL
+ */
+init_module_fn load_module(const char *path, bool is_probe, void **handle);
/**
* Run the specified init functions.
*
* @return true if all functions ran successfully, false otherwise
*/
-bool samba_module_init_fns_run(samba_module_init_fn *fns);
+bool run_init_functions(init_module_fn *fns);
/**
* Load the initialization functions from DSO files for a specific subsystem.
*
* Will return an array of function pointers to initialization functions
*/
-samba_module_init_fn *samba_module_init_fns_for_subsystem(TALLOC_CTX *mem_ctx, const char *subsystem);
+init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, const char *subsystem);
+
+int smb_load_modules(const char **modules);
+NTSTATUS smb_probe_module(const char *subsystem, const char *module);
#endif /* _SAMBA_MODULES_H */
pc_files='samba-util.pc'
)
-bld.SAMBA_LIBRARY('samba-module',
- source='samba_module.c',
- deps='errors samba-util samba-internal-module',
- local_include=False,
- public_headers='samba_module.h',
- vnum='0.0.1',
- abi_directory='ABI',
- abi_match='samba_module_*',
- pc_files='samba-module.pc')
-
-bld.SAMBA_LIBRARY('samba-internal-module',
- source='internal_module.c',
+bld.SAMBA_LIBRARY('samba-modules',
+ source='modules.c',
deps='errors samba-util',
local_include=False,
- private_library=True)
+ private_library=True)
bld.SAMBA_LIBRARY('asn1util',
source='asn1.c',
../lib/util/charset/charset_macosxfs.o intl/lang_tdb.o \
lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \
lib/sessionid_tdb.o \
- ../lib/util/internal_module.o ../lib/util/samba_module.o lib/events.o @LIBTEVENT_OBJ0@ \
+ ../lib/util/modules.o lib/events.o @LIBTEVENT_OBJ0@ \
@CCAN_OBJ@ \
lib/server_contexts.o \
lib/server_prefork.o \
-_samba_module_init
+_samba_init_module
#include "smb.h"
#include "../lib/util/byteorder.h"
-#include "../lib/util/internal_module.h"
+#include "../lib/util/samba_modules.h"
#include "../lib/util/talloc_stack.h"
#include "../lib/util/smb_threads.h"
#include "../lib/util/smb_threads_internal.h"
fi
if test x"$DEST" = xSHARED; then
- AC_DEFINE([$1][_init], [samba_module_init], [Whether to build $1 as shared module])
+ AC_DEFINE([$1][_init], [samba_init_module], [Whether to build $1 as shared module])
$4_MODULES="$$4_MODULES $3"
AC_MSG_RESULT([shared])
[$6]
perfcount_test_end
};
-NTSTATUS samba_module_init(void)
+NTSTATUS samba_init_module(void)
{
return smb_register_perfcounter(SMB_PERFCOUNTER_INTERFACE_VERSION,
"pc_test", &perfcount_test_handlers);
Initialize the plugins
***********************************************************************/
-NTSTATUS samba_module_init(void)
+NTSTATUS samba_init_module(void)
{
static NTSTATUS status_idmap_ad = NT_STATUS_UNSUCCESSFUL;
static NTSTATUS status_nss_rfc2307 = NT_STATUS_UNSUCCESSFUL;
against the idmap and nss_info interfaces being in a half-registered
state.
**********************************************************************/
-NTSTATUS samba_module_init(void)
+NTSTATUS samba_init_module(void)
{
static NTSTATUS idmap_status = NT_STATUS_UNSUCCESSFUL;
static NTSTATUS nss_status = NT_STATUS_UNSUCCESSFUL;
.allocate_id = idmap_autorid_allocate_id
};
-NTSTATUS samba_module_init(void)
+NTSTATUS samba_init_module(void)
{
return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION,
"autorid", &autorid_methods);
state.
**********************************************************************/
-NTSTATUS samba_module_init(void)
+NTSTATUS samba_init_module(void)
{
static NTSTATUS idmap_status = NT_STATUS_UNSUCCESSFUL;
static NTSTATUS nss_status = NT_STATUS_UNSUCCESSFUL;
.sids_to_unixids = idmap_rid_sids_to_unixids,
};
-NTSTATUS samba_module_init(void)
+NTSTATUS samba_init_module(void)
{
return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "rid", &rid_methods);
}
.allocate_id = idmap_tdb2_get_new_id
};
-NTSTATUS samba_module_init(void)
+NTSTATUS samba_init_module(void)
{
return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "tdb2", &db_methods);
}
conf.DEFINE('static_init_%s' % p, '{}')
if p in shared_list:
for entry in shared_list[p]:
- conf.DEFINE('%s_init' % entry, 'samba_module_init')
+ conf.DEFINE('%s_init' % entry, 'samba_init_module')
conf.env[shared_env].append('%s' % entry)
conf.SAMBA_CONFIG_H('include/config.h')
bld.SAMBA3_SUBSYSTEM('samba3core',
source=LIB_SRC,
- deps='LIBTSOCKET LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap util_sec util_malloc memcache ccan errors3 samba-module samba-internal-module',
+ deps='LIBTSOCKET LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap util_sec util_malloc memcache ccan errors3 samba-modules',
vars=locals())
bld.SAMBA3_LIBRARY('smbd_shim',
#include "param/param.h"
#include "dsdb/samdb/samdb.h"
#include "libcli/wbclient/wbclient.h"
-#include "lib/util/samba_module.h"
+#include "lib/util/samba_modules.h"
/***************************************************************************
Set a fixed challenge
static bool initialized = false;
#define _MODULE_PROTO(init) extern NTSTATUS init(void);
STATIC_auth4_MODULES_PROTO;
- samba_module_init_fn static_init[] = { STATIC_auth4_MODULES };
+ init_module_fn static_init[] = { STATIC_auth4_MODULES };
if (initialized) return NT_STATUS_OK;
initialized = true;
- samba_module_init_fns_run(static_init);
+ run_init_functions(static_init);
return NT_STATUS_OK;
}
bld.SAMBA_LIBRARY('auth4',
source='auth.c auth_util.c auth_simple.c',
autoproto='auth_proto.h',
- deps='samba-util security samdb samba-credentials tevent-util LIBWBCLIENT_OLD auth_unix_token samba-module',
+ deps='samba-util security samdb samba-credentials tevent-util LIBWBCLIENT_OLD auth_unix_token samba-modules',
private_library=True
)
#include "includes.h"
#include "ntptr/ntptr.h"
#include "param/param.h"
-#include "lib/util/samba_module.h"
+#include "lib/util/samba_modules.h"
/* the list of currently registered NTPTR backends */
static struct ntptr_backend {
{
#define _MODULE_PROTO(init) extern NTSTATUS init(void);
STATIC_ntptr_MODULES_PROTO;
- samba_module_init_fn static_init[] = { STATIC_ntptr_MODULES };
- samba_module_init_fn *shared_init = samba_module_init_fns_for_subsystem(NULL, "ntptr");
+ init_module_fn static_init[] = { STATIC_ntptr_MODULES };
+ init_module_fn *shared_init = load_samba_modules(NULL, "ntptr");
- 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);
#include "../lib/util/dlinklist.h"
#include "ntvfs/ntvfs.h"
#include "param/param.h"
-#include "lib/util/samba_module.h"
+#include "lib/util/samba_modules.h"
/* the list of currently registered NTVFS backends, note that there
* can be more than one backend with the same name, as long as they
static bool initialized = false;
#define _MODULE_PROTO(init) extern NTSTATUS init(void);
STATIC_ntvfs_MODULES_PROTO;
- samba_module_init_fn static_init[] = { STATIC_ntvfs_MODULES };
- samba_module_init_fn *shared_init;
+ init_module_fn static_init[] = { STATIC_ntvfs_MODULES };
+ init_module_fn *shared_init;
if (initialized) return NT_STATUS_OK;
initialized = true;
- shared_init = samba_module_init_fns_for_subsystem(NULL, "ntvfs");
+ shared_init = load_samba_modules(NULL, "ntvfs");
- 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);
#include "libcli/security/security.h"
#include "param/param.h"
#include "../lib/util/unix_privs.h"
-#include "lib/util/samba_module.h"
+#include "lib/util/samba_modules.h"
/* the list of currently registered ACL backends */
static struct pvfs_acl_backend {
static bool initialized = false;
#define _MODULE_PROTO(init) extern NTSTATUS init(void);
STATIC_pvfs_acl_MODULES_PROTO;
- samba_module_init_fn static_init[] = { STATIC_pvfs_acl_MODULES };
- samba_module_init_fn *shared_init;
+ init_module_fn static_init[] = { STATIC_pvfs_acl_MODULES };
+ init_module_fn *shared_init;
if (initialized) return NT_STATUS_OK;
initialized = true;
- shared_init = samba_module_init_fns_for_subsystem(NULL, "pvfs_acl");
+ shared_init = load_samba_modules(NULL, "pvfs_acl");
- 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);
bld.SAMBA_SUBSYSTEM('pvfs_acl',
source='pvfs_acl.c',
autoproto='vfs_acl_proto.h',
- deps='events samba-module',
+ deps='events samba-modules',
)
#include "ntvfs/sysdep/sys_lease.h"
#include "../lib/util/dlinklist.h"
#include "param/param.h"
-#include "lib/util/samba_module.h"
+#include "lib/util/samba_modules.h"
/* list of registered backends */
static struct sys_lease_ops *backends;
static bool initialized = false;
#define _MODULE_PROTO(init) extern NTSTATUS init(void);
STATIC_sys_lease_MODULES_PROTO;
- samba_module_init_fn static_init[] = { STATIC_sys_lease_MODULES };
+ init_module_fn static_init[] = { STATIC_sys_lease_MODULES };
if (initialized) return NT_STATUS_OK;
initialized = true;
- samba_module_init_fns_run(static_init);
+ run_init_functions(static_init);
return NT_STATUS_OK;
}
#include <tevent.h>
#include "../lib/util/dlinklist.h"
#include "param/param.h"
-#include "lib/util/samba_module.h"
+#include "lib/util/samba_modules.h"
/* list of registered backends */
static struct sys_notify_backend *backends;
static bool initialized = false;
#define _MODULE_PROTO(init) extern NTSTATUS init(void);
STATIC_sys_notify_MODULES_PROTO;
- samba_module_init_fn static_init[] = { STATIC_sys_notify_MODULES };
+ init_module_fn static_init[] = { STATIC_sys_notify_MODULES };
if (initialized) return NT_STATUS_OK;
initialized = true;
- samba_module_init_fns_run(static_init);
+ run_init_functions(static_init);
return NT_STATUS_OK;
}
bld.SAMBA_LIBRARY('ntvfs',
source='ntvfs_base.c ntvfs_generic.c ntvfs_interface.c ntvfs_util.c',
autoproto='ntvfs_proto.h',
- deps='tevent samba-module',
+ deps='tevent samba-modules',
private_library=True
)
#include "includes.h"
#include "param/share.h"
#include "param/param.h"
-#include "lib/util/samba_module.h"
+#include "lib/util/samba_modules.h"
const char *share_string_option(struct share_config *scfg, const char *opt_name, const char *defval)
{
{
#define _MODULE_PROTO(init) extern NTSTATUS init(void);
STATIC_share_MODULES_PROTO;
- samba_module_init_fn static_init[] = { STATIC_share_MODULES };
+ init_module_fn static_init[] = { STATIC_share_MODULES };
- samba_module_init_fns_run(static_init);
+ run_init_functions(static_init);
return NT_STATUS_OK;
}
bld.SAMBA_SUBSYSTEM('share',
source='share.c',
public_headers='share.h',
- deps='samba-util samba-module'
+ deps='samba-util samba-modules'
)
#include "smbd/process_model.h"
#include "lib/messaging/irpc.h"
#include "librpc/rpc/rpc_common.h"
-#include "lib/util/samba_module.h"
+#include "lib/util/samba_modules.h"
/* this is only used when the client asks for an unknown interface */
#define DUMMY_ASSOC_GROUP 0x0FFFFFFF
static bool initialized;
#define _MODULE_PROTO(init) extern NTSTATUS init(void);
STATIC_dcerpc_server_MODULES_PROTO;
- samba_module_init_fn static_init[] = { STATIC_dcerpc_server_MODULES };
- samba_module_init_fn *shared_init;
+ init_module_fn static_init[] = { STATIC_dcerpc_server_MODULES };
+ init_module_fn *shared_init;
if (initialized) {
return;
}
initialized = true;
- shared_init = samba_module_init_fns_for_subsystem(NULL, "dcerpc_server");
+ shared_init = load_samba_modules(NULL, "dcerpc_server");
- 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);
}
#include "includes.h"
#include "smbd/process_model.h"
#include "param/param.h"
-#include "lib/util/samba_module.h"
+#include "lib/util/samba_modules.h"
/* the list of currently registered process models */
static struct process_model {
{
#define _MODULE_PROTO(init) extern NTSTATUS init(void);
STATIC_process_model_MODULES_PROTO;
- samba_module_init_fn static_init[] = { STATIC_process_model_MODULES };
- samba_module_init_fn *shared_init;
+ init_module_fn static_init[] = { STATIC_process_model_MODULES };
+ init_module_fn *shared_init;
static bool initialised;
if (initialised) {
}
initialised = true;
- shared_init = samba_module_init_fns_for_subsystem(NULL, "process_model");
+ shared_init = load_samba_modules(NULL, "process_model");
- 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);
#include "librpc/gen_ndr/ndr_irpc.h"
#include "cluster/cluster.h"
#include "dynconfig/dynconfig.h"
-#include "lib/util/samba_module.h"
+#include "lib/util/samba_modules.h"
/*
recursively delete a directory tree
poptContext pc;
#define _MODULE_PROTO(init) extern NTSTATUS init(void);
STATIC_service_MODULES_PROTO;
- samba_module_init_fn static_init[] = { STATIC_service_MODULES };
- samba_module_init_fn *shared_init;
+ init_module_fn static_init[] = { STATIC_service_MODULES };
+ init_module_fn *shared_init;
struct tevent_context *event_ctx;
uint16_t stdin_event_flags;
NTSTATUS status;
process_model_init(cmdline_lp_ctx);
- shared_init = samba_module_init_fns_for_subsystem(NULL, "service");
+ shared_init = load_samba_modules(NULL, "service");
- 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);
bld.SAMBA_LIBRARY('process_model',
source='process_model.c',
autoproto='process_model_proto.h',
- deps='samba-util samba-hostconfig samba-module',
+ deps='samba-util samba-hostconfig samba-modules',
private_library=True
)
#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>
}
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));
#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;
{
#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);
git.samba.org / kai / samba.git / commitdiff