s4: torture: Pass the new talloc context into torture_init().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>

diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index 13fe203ff64e3f618bddb45871dbdb5d1fa28ca9..622f3eb15ea496acde218008a16e1564b34b78c5 100644 (file)
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -584,7 +584,7 @@ int main(int argc, const char *argv[])
                        }
                }
        } else { 
-               torture_init();
+               torture_init(mem_ctx);
        }
 
        if (list_testsuites) {

diff --git a/source4/torture/smbtorture.h b/source4/torture/smbtorture.h
index 0a0647d6594fc36915f025949c2304517a5392b5..7480f241d9772d042a3658f7ee3bd72f00168e9c 100644 (file)
--- a/source4/torture/smbtorture.h
+++ b/source4/torture/smbtorture.h
@@ -34,7 +34,7 @@ extern int torture_failures;
 extern int torture_numasync;
 
 struct torture_test;
-int torture_init(void);
+int torture_init(TALLOC_CTX *);
 bool torture_register_suite(struct torture_suite *suite);
 void torture_shell(struct torture_context *tctx);
 void torture_print_testsuites(bool structured);

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 01089219b876cbea9938580fcc188ee5cf9e461f..3ef1f3b49ba199ba495032c20b79e3c965cedebd 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -44,15 +44,15 @@ bool torture_register_suite(struct torture_suite *suite)
        return torture_suite_add_suite(torture_root, suite);
 }
 
-_PUBLIC_ int torture_init(void)
+_PUBLIC_ int torture_init(TALLOC_CTX *mem_ctx)
 {
 #define _MODULE_PROTO(init) extern NTSTATUS init(TALLOC_CTX *);
        STATIC_smbtorture_MODULES_PROTO;
        init_module_fn static_init[] = { STATIC_smbtorture_MODULES };
-       init_module_fn *shared_init = load_samba_modules(NULL, "smbtorture");
+       init_module_fn *shared_init = load_samba_modules(mem_ctx, "smbtorture");
 
-       run_init_functions(NULL, static_init);
-       run_init_functions(NULL, shared_init);
+       run_init_functions(mem_ctx, static_init);
+       run_init_functions(mem_ctx, shared_init);
 
        talloc_free(shared_init);