lib/util Rename samba_modules_load -> samba_module_init_fns_for_subsystem

[ira/wip.git] / source4 / torture / torture.c

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index dc98c2cc9a7f752d4e050f09b09684e148d9d998..dc35073eba826c3033dff552cf1376c4da1cf169 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -20,11 +20,10 @@
 
 #include "includes.h"
 #include "system/time.h"
-#include "torture/torture.h"
-#include "../lib/util/dlinklist.h"
 #include "param/param.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/smbtorture.h"
+#include "lib/util/samba_module.h"
 
 _PUBLIC_ int torture_numops=10;
 _PUBLIC_ int torture_entries=1000;
@@ -45,26 +44,15 @@ bool torture_register_suite(struct torture_suite *suite)
        return torture_suite_add_suite(torture_root, suite);
 }
 
-
 _PUBLIC_ int torture_init(void)
 {
-       extern NTSTATUS torture_base_init(void);
-       extern NTSTATUS torture_ldap_init(void);
-       extern NTSTATUS torture_local_init(void);
-       extern NTSTATUS torture_nbt_init(void);
-       extern NTSTATUS torture_nbench_init(void);
-       extern NTSTATUS torture_rap_init(void);
-       extern NTSTATUS torture_rpc_init(void);
-       extern NTSTATUS torture_smb2_init(void);
-       extern NTSTATUS torture_net_init(void);
-       extern NTSTATUS torture_raw_init(void);
-       extern NTSTATUS torture_unix_init(void);
-       extern NTSTATUS torture_winbind_init(void);
-       init_module_fn static_init[] = { STATIC_smbtorture_MODULES };
-       init_module_fn *shared_init = load_samba_modules(NULL, cmdline_lp_ctx, "torture");
+#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");
 
-       run_init_functions(static_init);
-       run_init_functions(shared_init);
+       samba_module_init_fns_run(static_init);
+       samba_module_init_fns_run(shared_init);
 
        talloc_free(shared_init);