s4: torture: Add a TALLOC_CTX * to torture_smb2_oplocks_init(), torture_smb2_kernel_o...

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

diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c
index 53a6c18f69379e78be03bd6ffc760eb2f242bf05..83197a4f4a8aa4afb82aa1281e8cdc78791f9020 100644 (file)
--- a/source4/torture/smb2/oplock.c
+++ b/source4/torture/smb2/oplock.c
@@ -3947,10 +3947,10 @@ static void levelII501_timeout_cb(struct tevent_context *ev,
        state->done = true;
 }
 
-struct torture_suite *torture_smb2_oplocks_init(void)
+struct torture_suite *torture_smb2_oplocks_init(TALLOC_CTX *ctx)
 {
        struct torture_suite *suite =
-           torture_suite_create(talloc_autofree_context(), "oplock");
+           torture_suite_create(ctx, "oplock");
 
        torture_suite_add_2smb2_test(suite, "exclusive1", test_smb2_oplock_exclusive1);
        torture_suite_add_2smb2_test(suite, "exclusive2", test_smb2_oplock_exclusive2);
@@ -4332,10 +4332,10 @@ done:
        return ret;
 }
 
-struct torture_suite *torture_smb2_kernel_oplocks_init(void)
+struct torture_suite *torture_smb2_kernel_oplocks_init(TALLOC_CTX *ctx)
 {
        struct torture_suite *suite =
-           torture_suite_create(talloc_autofree_context(), "kernel-oplocks");
+           torture_suite_create(ctx, "kernel-oplocks");
 
        torture_suite_add_1smb2_test(suite, "kernel_oplocks1", test_smb2_kernel_oplocks1);
        torture_suite_add_1smb2_test(suite, "kernel_oplocks2", test_smb2_kernel_oplocks2);

diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index 50391a5c50a7b7a2a8769be2a1b040d78acb7522..55716a3b8019fec9332d1bb4164d68b9b13405a2 100644 (file)
--- a/source4/torture/smb2/smb2.c
+++ b/source4/torture/smb2/smb2.c
@@ -166,8 +166,8 @@ NTSTATUS torture_smb2_init(TALLOC_CTX *ctx)
        torture_suite_add_suite(suite, torture_smb2_lease_init(suite));
        torture_suite_add_suite(suite, torture_smb2_compound_init(suite));
        torture_suite_add_suite(suite, torture_smb2_compound_find_init(suite));
-       torture_suite_add_suite(suite, torture_smb2_oplocks_init());
-       torture_suite_add_suite(suite, torture_smb2_kernel_oplocks_init());
+       torture_suite_add_suite(suite, torture_smb2_oplocks_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_kernel_oplocks_init(suite));
        torture_suite_add_suite(suite, torture_smb2_streams_init());
        torture_suite_add_suite(suite, torture_smb2_ioctl_init(suite));
        torture_suite_add_suite(suite, torture_smb2_rename_init());