s4: torture: Add TALLOC_CTX * to torture_smb2_durable_open_disconnect_init(), torture...
authorJeremy Allison <jra@samba.org>
Mon, 24 Apr 2017 22:25:38 +0000 (15:25 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 5 May 2017 13:52:12 +0000 (15:52 +0200)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
source4/torture/smb2/durable_open.c
source4/torture/smb2/smb2.c

index 2e68170077ab90129b10f2fbd59967df63b62462..17b3b217b56e8ffb6450fd5ff7a804b374c03beb 100644 (file)
@@ -2753,10 +2753,10 @@ done:
 }
 
 
-struct torture_suite *torture_smb2_durable_open_init(void)
+struct torture_suite *torture_smb2_durable_open_init(TALLOC_CTX *ctx)
 {
        struct torture_suite *suite =
-           torture_suite_create(talloc_autofree_context(), "durable-open");
+           torture_suite_create(ctx, "durable-open");
 
        torture_suite_add_1smb2_test(suite, "open-oplock", test_durable_open_open_oplock);
        torture_suite_add_1smb2_test(suite, "open-lease", test_durable_open_open_lease);
@@ -2793,10 +2793,10 @@ struct torture_suite *torture_smb2_durable_open_init(void)
        return suite;
 }
 
-struct torture_suite *torture_smb2_durable_open_disconnect_init(void)
+struct torture_suite *torture_smb2_durable_open_disconnect_init(TALLOC_CTX *ctx)
 {
        struct torture_suite *suite =
-           torture_suite_create(talloc_autofree_context(),
+           torture_suite_create(ctx,
                                 "durable-open-disconnect");
 
        torture_suite_add_1smb2_test(suite, "open-oplock-disconnect",
index 5175f344d7055d063086e33765810f7cfd1bff3c..e801631cede2770f03498215f09272f605a869fd 100644 (file)
@@ -156,8 +156,9 @@ NTSTATUS torture_smb2_init(TALLOC_CTX *ctx)
        torture_suite_add_suite(suite, torture_smb2_acls_init(suite));
        torture_suite_add_suite(suite, torture_smb2_notify_init());
        torture_suite_add_suite(suite, torture_smb2_notify_disabled_init());
-       torture_suite_add_suite(suite, torture_smb2_durable_open_init());
-       torture_suite_add_suite(suite, torture_smb2_durable_open_disconnect_init());
+       torture_suite_add_suite(suite, torture_smb2_durable_open_init(suite));
+       torture_suite_add_suite(suite,
+               torture_smb2_durable_open_disconnect_init(suite));
        torture_suite_add_suite(suite, torture_smb2_durable_v2_open_init());
        torture_suite_add_suite(suite, torture_smb2_dir_init(suite));
        torture_suite_add_suite(suite, torture_smb2_lease_init());