The branch, master has been updated via f30a8a2 s4.torture.smb2/session: Add torture assert for close via e8a2dda s4.torture.smb2/session: Add torture assert for unlink via 9582a48 s4.torture.smb2/session : Replace CHECK_STATUS with torture macros from 9e87465 smbd: Fix/simplify scavenger routines
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit f30a8a28322b1a83909388f983800f99a8c77c14 Author: Anoop C S <anoo...@redhat.com> Date: Mon Oct 26 16:33:11 2015 +0530 s4.torture.smb2/session: Add torture assert for close Signed-off-by: Anoop C S <anoo...@redhat.com> Reviewed-by: Michael Adam <ob...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Michael Adam <ob...@samba.org> Autobuild-Date(master): Sat Oct 31 15:52:22 CET 2015 on sn-devel-104 commit e8a2ddafe40f46ca89d699ee770d2b399e87af3f Author: Anoop C S <anoo...@redhat.com> Date: Thu Oct 29 20:20:52 2015 +0530 s4.torture.smb2/session: Add torture assert for unlink Signed-off-by: Anoop C S <anoo...@redhat.com> Reviewed-by: Michael Adam <ob...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 9582a484b41b94ec8a6451ac98822d781598eaac Author: Anoop C S <anoo...@redhat.com> Date: Thu Oct 8 19:02:06 2015 +0530 s4.torture.smb2/session : Replace CHECK_STATUS with torture macros Signed-off-by: Anoop C S <anoo...@redhat.com> Reviewed-by: Michael Adam <ob...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: source4/torture/smb2/session.c | 235 +++++++++++++++++++++++++++-------------- 1 file changed, 158 insertions(+), 77 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/smb2/session.c b/source4/torture/smb2/session.c index 798230b..7bb9f64 100644 --- a/source4/torture/smb2/session.c +++ b/source4/torture/smb2/session.c @@ -38,14 +38,6 @@ ret = false; \ }} while (0) -#define CHECK_STATUS(status, correct) do { \ - if (!NT_STATUS_EQUAL(status, correct)) { \ - torture_result(tctx, TORTURE_FAIL, __location__": Incorrect status %s - should be %s", \ - nt_errstr(status), nt_errstr(correct)); \ - ret = false; \ - goto done; \ - }} while (0) - #define CHECK_CREATED(__io, __created, __attribute) \ do { \ CHECK_VAL((__io)->out.create_action, NTCREATEX_ACTION_ ## __created); \ @@ -85,7 +77,8 @@ bool test_session_reconnect1(struct torture_context *tctx, struct smb2_tree *tre smb2_util_oplock_level("b")); status = smb2_create(tree, mem_ctx, &io1); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_create failed"); _h1 = io1.out.file.handle; h1 = &_h1; CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE); @@ -105,7 +98,10 @@ bool test_session_reconnect1(struct torture_context *tctx, struct smb2_tree *tre qfinfo.generic.level = RAW_FILEINFO_POSITION_INFORMATION; qfinfo.generic.in.file.handle = _h1; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_USER_SESSION_DELETED); + torture_assert_ntstatus_equal_goto(tctx, status, + NT_STATUS_USER_SESSION_DELETED, + ret, done, "smb2_getinfo_file " + "returned unexpected status"); h1 = NULL; smb2_oplock_create_share(&io2, fname, @@ -113,7 +109,9 @@ bool test_session_reconnect1(struct torture_context *tctx, struct smb2_tree *tre smb2_util_oplock_level("b")); status = smb2_create(tree2, mem_ctx, &io2); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_create failed"); + CHECK_CREATED(&io2, EXISTED, FILE_ATTRIBUTE_ARCHIVE); CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("b")); _h2 = io2.out.file.handle; @@ -168,7 +166,8 @@ bool test_session_reconnect2(struct torture_context *tctx, struct smb2_tree *tre io1.in.create_options |= NTCREATEX_OPTIONS_DELETE_ON_CLOSE; status = smb2_create(tree, mem_ctx, &io1); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_create failed"); _h1 = io1.out.file.handle; h1 = &_h1; CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE); @@ -187,7 +186,10 @@ bool test_session_reconnect2(struct torture_context *tctx, struct smb2_tree *tre qfinfo.generic.level = RAW_FILEINFO_POSITION_INFORMATION; qfinfo.generic.in.file.handle = _h1; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_USER_SESSION_DELETED); + torture_assert_ntstatus_equal_goto(tctx, status, + NT_STATUS_USER_SESSION_DELETED, + ret, done, "smb2_getinfo_file " + "returned unexpected status"); h1 = NULL; done: @@ -225,7 +227,8 @@ bool test_session_reauth1(struct torture_context *tctx, struct smb2_tree *tree) smb2_util_oplock_level("b")); status = smb2_create(tree, mem_ctx, &io1); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_create failed"); _h1 = io1.out.file.handle; h1 = &_h1; CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE); @@ -234,7 +237,8 @@ bool test_session_reauth1(struct torture_context *tctx, struct smb2_tree *tree) status = smb2_session_setup_spnego(tree->session, cmdline_credentials, 0 /* previous_session_id */); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_session_setup_spnego failed"); /* try to access the file via the old handle */ @@ -242,12 +246,14 @@ bool test_session_reauth1(struct torture_context *tctx, struct smb2_tree *tree) qfinfo.generic.level = RAW_FILEINFO_POSITION_INFORMATION; qfinfo.generic.in.file.handle = _h1; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_getinfo_file failed"); status = smb2_session_setup_spnego(tree->session, cmdline_credentials, 0 /* previous_session_id */); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_session_setup_spnego failed"); /* try to access the file via the old handle */ @@ -255,7 +261,8 @@ bool test_session_reauth1(struct torture_context *tctx, struct smb2_tree *tree) qfinfo.generic.level = RAW_FILEINFO_POSITION_INFORMATION; qfinfo.generic.in.file.handle = _h1; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_getinfo_file failed"); done: if (h1 != NULL) { @@ -294,7 +301,8 @@ bool test_session_reauth2(struct torture_context *tctx, struct smb2_tree *tree) smb2_util_oplock_level("b")); status = smb2_create(tree, mem_ctx, &io1); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_create failed"); _h1 = io1.out.file.handle; h1 = &_h1; CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE); @@ -308,7 +316,8 @@ bool test_session_reauth2(struct torture_context *tctx, struct smb2_tree *tree) status = smb2_session_setup_spnego(tree->session, anon_creds, 0 /* previous_session_id */); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_session_setup_spnego failed"); /* try to access the file via the old handle */ @@ -316,14 +325,16 @@ bool test_session_reauth2(struct torture_context *tctx, struct smb2_tree *tree) qfinfo.generic.level = RAW_FILEINFO_POSITION_INFORMATION; qfinfo.generic.in.file.handle = _h1; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_getinfo_file failed"); /* re-authenticate as original user again */ status = smb2_session_setup_spnego(tree->session, cmdline_credentials, 0 /* previous_session_id */); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_session_setup_spnego failed"); /* try to access the file via the old handle */ @@ -331,7 +342,8 @@ bool test_session_reauth2(struct torture_context *tctx, struct smb2_tree *tree) qfinfo.generic.level = RAW_FILEINFO_POSITION_INFORMATION; qfinfo.generic.in.file.handle = _h1; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_getinfo_file failed"); done: if (h1 != NULL) { @@ -378,7 +390,8 @@ bool test_session_reauth3(struct torture_context *tctx, struct smb2_tree *tree) smb2_util_oplock_level("b")); status = smb2_create(tree, mem_ctx, &io1); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_create failed"); _h1 = io1.out.file.handle; h1 = &_h1; CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE); @@ -393,7 +406,9 @@ bool test_session_reauth3(struct torture_context *tctx, struct smb2_tree *tree) qfinfo.query_secdesc.in.secinfo_flags = secinfo_flags; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_getinfo_file failed"); + /* re-authenticate as anonymous */ anon_creds = cli_credentials_init_anon(mem_ctx); @@ -402,7 +417,8 @@ bool test_session_reauth3(struct torture_context *tctx, struct smb2_tree *tree) status = smb2_session_setup_spnego(tree->session, anon_creds, 0 /* previous_session_id */); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_session_setup_spnego failed"); /* try to access the file via the old handle */ @@ -413,14 +429,16 @@ bool test_session_reauth3(struct torture_context *tctx, struct smb2_tree *tree) qfinfo.query_secdesc.in.secinfo_flags = secinfo_flags; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_getinfo_file failed"); /* re-authenticate as original user again */ status = smb2_session_setup_spnego(tree->session, cmdline_credentials, 0 /* previous_session_id */); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_session_setup_spnego failed"); /* try to access the file via the old handle */ @@ -431,7 +449,8 @@ bool test_session_reauth3(struct torture_context *tctx, struct smb2_tree *tree) qfinfo.query_secdesc.in.secinfo_flags = secinfo_flags; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_getinfo_file failed"); done: if (h1 != NULL) { @@ -482,7 +501,8 @@ bool test_session_reauth4(struct torture_context *tctx, struct smb2_tree *tree) smb2_util_oplock_level("b")); status = smb2_create(tree, mem_ctx, &io1); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_create failed"); _h1 = io1.out.file.handle; h1 = &_h1; CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE); @@ -497,7 +517,8 @@ bool test_session_reauth4(struct torture_context *tctx, struct smb2_tree *tree) qfinfo.query_secdesc.in.secinfo_flags = secinfo_flags; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_getinfo_file failed"); sd1 = qfinfo.query_secdesc.out.sd; @@ -509,7 +530,8 @@ bool test_session_reauth4(struct torture_context *tctx, struct smb2_tree *tree) status = smb2_session_setup_spnego(tree->session, anon_creds, 0 /* previous_session_id */); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_session_setup_spnego failed"); /* give full access on the file to anonymous */ @@ -522,7 +544,8 @@ bool test_session_reauth4(struct torture_context *tctx, struct smb2_tree *tree) ace.trustee = *extra_sid; status = security_descriptor_dacl_add(sd1, &ace); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "security_descriptor_dacl_add failed"); ZERO_STRUCT(sfinfo); sfinfo.set_secdesc.level = RAW_SFILEINFO_SEC_DESC; @@ -531,14 +554,16 @@ bool test_session_reauth4(struct torture_context *tctx, struct smb2_tree *tree) sfinfo.set_secdesc.in.sd = sd1; status = smb2_setinfo_file(tree, &sfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_setinfo_file failed"); /* re-authenticate as original user again */ status = smb2_session_setup_spnego(tree->session, cmdline_credentials, 0 /* previous_session_id */); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_session_setup_spnego failed"); /* re-get the security descriptor */ @@ -549,7 +574,8 @@ bool test_session_reauth4(struct torture_context *tctx, struct smb2_tree *tree) qfinfo.query_secdesc.in.secinfo_flags = secinfo_flags; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_getinfo_file failed"); ret = true; @@ -607,7 +633,8 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) CHECK_VAL(ok, true); status = torture_smb2_testdir(tree, dname, &_dh1); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "torture_smb2_testdir failed"); dh1 = &_dh1; smb2_oplock_create_share(&io1, fname, @@ -615,7 +642,8 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) smb2_util_oplock_level("b")); status = smb2_create(tree, mem_ctx, &io1); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_create failed"); _h1 = io1.out.file.handle; h1 = &_h1; CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE); @@ -630,7 +658,8 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) qfinfo.query_secdesc.in.secinfo_flags = secinfo_flags; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_getinfo_file failed"); f_sd1 = qfinfo.query_secdesc.out.sd; @@ -642,13 +671,17 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) status = smb2_session_setup_spnego(tree->session, anon_creds, 0 /* previous_session_id */); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_session_setup_spnego failed"); /* try to rename the file: fails */ snprintf(fname2, sizeof(fname2), "%s\\file2.dat", dname); - smb2_util_unlink(tree, fname2); + status = smb2_util_unlink(tree, fname2); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_util_unlink failed"); + ZERO_STRUCT(sfinfo); sfinfo.rename_information.level = RAW_SFILEINFO_RENAME_INFORMATION; @@ -657,14 +690,18 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) sfinfo.rename_information.in.new_name = fname2; status = smb2_setinfo_file(tree, &sfinfo); - CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED); + torture_assert_ntstatus_equal_goto(tctx, status, + NT_STATUS_ACCESS_DENIED, + ret, done, "smb2_setinfo_file " + "returned unexpected status"); /* re-authenticate as original user again */ status = smb2_session_setup_spnego(tree->session, cmdline_credentials, 0 /* previous_session_id */); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_session_setup_spnego failed"); /* give full access on the file to anonymous */ @@ -677,7 +714,8 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) ace.trustee = *extra_sid; status = security_descriptor_dacl_add(f_sd1, &ace); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "security_descriptor_dacl_add failed"); ZERO_STRUCT(sfinfo); sfinfo.set_secdesc.level = RAW_SFILEINFO_SEC_DESC; @@ -686,7 +724,8 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) sfinfo.set_secdesc.in.sd = f_sd1; status = smb2_setinfo_file(tree, &sfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_setinfo_file failed"); /* re-get the security descriptor */ @@ -697,7 +736,8 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) qfinfo.query_secdesc.in.secinfo_flags = secinfo_flags; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_getinfo_file failed"); /* re-authenticate as anonymous - again */ @@ -707,7 +747,8 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) status = smb2_session_setup_spnego(tree->session, anon_creds, 0 /* previous_session_id */); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_session_setup_spnego failed"); /* try to rename the file: fails */ @@ -718,7 +759,10 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) sfinfo.rename_information.in.new_name = fname2; status = smb2_setinfo_file(tree, &sfinfo); - CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED); + torture_assert_ntstatus_equal_goto(tctx, status, + NT_STATUS_ACCESS_DENIED, + ret, done, "smb2_setinfo_file " + "returned unexpected status"); /* give full access on the parent dir to anonymous */ @@ -729,7 +773,8 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) qfinfo.query_secdesc.in.secinfo_flags = secinfo_flags; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_getinfo_file failed"); d_sd1 = qfinfo.query_secdesc.out.sd; @@ -740,7 +785,8 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) ace.trustee = *extra_sid; status = security_descriptor_dacl_add(d_sd1, &ace); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "security_descriptor_dacl_add failed"); ZERO_STRUCT(sfinfo); sfinfo.set_secdesc.level = RAW_SFILEINFO_SEC_DESC; @@ -750,7 +796,8 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) sfinfo.set_secdesc.in.sd = d_sd1; status = smb2_setinfo_file(tree, &sfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_setinfo_file failed"); ZERO_STRUCT(qfinfo); @@ -759,9 +806,12 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) qfinfo.query_secdesc.in.secinfo_flags = secinfo_flags; status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_getinfo_file failed"); - smb2_util_close(tree, _dh1); + status = smb2_util_close(tree, _dh1); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_util_close failed"); dh1 = NULL; /* try to rename the file: still fails */ @@ -773,14 +823,18 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) sfinfo.rename_information.in.new_name = fname2; status = smb2_setinfo_file(tree, &sfinfo); - CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED); + torture_assert_ntstatus_equal_goto(tctx, status, + NT_STATUS_ACCESS_DENIED, + ret, done, "smb2_setinfo_file " + "returned unexpected status"); /* re-authenticate as original user - again */ status = smb2_session_setup_spnego(tree->session, cmdline_credentials, 0 /* previous_session_id */); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_session_setup_spnego failed"); /* rename the file - for verification that it works */ @@ -791,12 +845,14 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree) sfinfo.rename_information.in.new_name = fname2; status = smb2_setinfo_file(tree, &sfinfo); - CHECK_STATUS(status, NT_STATUS_OK); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, + "smb2_setinfo_file failed"); /* closs the file, check it is gone and reopen under the new name */ - smb2_util_close(tree, _h1); - -- Samba Shared Repository