summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-12-21 14:38:45 -0800
committerTim Prouty <tprouty@samba.org>2009-12-21 17:27:36 -0800
commitfd0c3a226486eae63166a05d3746626f9f833693 (patch)
tree810efb8a9d082297776524704c386c562b14458b
parent2a9c22798d829d80f5735899e9a178c3fdfdbd1f (diff)
downloadsamba-fd0c3a226486eae63166a05d3746626f9f833693.tar.gz
samba-fd0c3a226486eae63166a05d3746626f9f833693.tar.bz2
samba-fd0c3a226486eae63166a05d3746626f9f833693.zip
s4 torture: Do a better job of closing open files in RAW-OPLOCK.
-rw-r--r--source4/torture/raw/oplock.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 78987e3121..6a0de2e200 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -2178,9 +2178,8 @@ static bool test_raw_oplock_batch19(struct torture_context *tctx, struct smbcli_
CHECK_STATUS(tctx, status, NT_STATUS_OK);
CHECK_STRMATCH(qfi.all_info.out.fname.s, fname3);
- smbcli_close(cli1->tree, fnum);
-
done:
+ smbcli_close(cli1->tree, fnum);
smb_raw_exit(cli1->session);
smb_raw_exit(cli2->session);
smbcli_deltree(cli1->tree, BASEDIR);
@@ -2284,9 +2283,8 @@ bool test_trans2rename(struct torture_context *tctx, struct smbcli_state *cli1,
CHECK_STATUS(tctx, status, NT_STATUS_OK);
CHECK_STRMATCH(qfi.all_info.out.fname.s, fname3);
- smbcli_close(cli1->tree, fnum);
-
done:
+ smbcli_close(cli1->tree, fnum);
smb_raw_exit(cli1->session);
smb_raw_exit(cli2->session);
smbcli_deltree(cli1->tree, BASEDIR);
@@ -2542,9 +2540,10 @@ static bool test_raw_oplock_batch20(struct torture_context *tctx, struct smbcli_
CHECK_STATUS(tctx, status, NT_STATUS_OK);
CHECK_STRMATCH(qfi.all_info.out.fname.s, fname3);
- smbcli_close(cli1->tree, fnum);
done:
+ smbcli_close(cli1->tree, fnum);
+ smbcli_close(cli2->tree, fnum2);
smb_raw_exit(cli1->session);
smb_raw_exit(cli2->session);
smbcli_deltree(cli1->tree, BASEDIR);