sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

r20525: Closing a dir with del-on-close set requires the same as files: Don't actually

Browse Source 
unlink/rmdir if another process still has it open.

Jeremy, this is a potential merger to 3.0.24.

Volker
(This used to be commit d0550a01af219344ec2e4c16d5253814afc89974)
This commit is contained in:
Volker Lendecke 2007-01-04 16:26:15 +00:00 committed by Gerald (Jerry) Carter
parent 35c5e2d318
commit 7a734d3b30
1 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
source4/torture/basic/delete.c
View File

@ -1254,6 +1254,85 @@ static bool deltest21(struct torture_context *tctx)
return correct;
}
/* Test 22 ... */
/*
* Test whether a second *directory* handle inhibits delete if the first has
* del-on-close set and is closed
*/
static bool deltest22(struct torture_context *tctx)
{
int dnum1 = -1;
int dnum2 = -1;
struct smbcli_state *cli1;
bool correct = True;
if (!torture_open_connection(&cli1, 0))
return False;
smbcli_deltree(cli1->tree, dname);
torture_assert_ntstatus_ok(
tctx, smbcli_mkdir(cli1->tree, dname),
talloc_asprintf(tctx, "smbcli_mdir failed: (%s)\n",
smbcli_errstr(cli1->tree)));
dnum1 = smbcli_nt_create_full(cli1->tree, dname, 0,
SEC_FILE_READ_DATA|
SEC_FILE_WRITE_DATA|
SEC_STD_DELETE,
FILE_ATTRIBUTE_DIRECTORY,
NTCREATEX_SHARE_ACCESS_READ|
NTCREATEX_SHARE_ACCESS_WRITE|
NTCREATEX_SHARE_ACCESS_DELETE,
NTCREATEX_DISP_OPEN,
NTCREATEX_OPTIONS_DIRECTORY, 0);
torture_assert(tctx, dnum1 != -1,
talloc_asprintf(tctx, "open of %s failed: %s!",
dname, smbcli_errstr(cli1->tree)));
dnum2 = smbcli_nt_create_full(cli1->tree, dname, 0,
SEC_FILE_READ_DATA|
SEC_FILE_WRITE_DATA,
FILE_ATTRIBUTE_DIRECTORY,
NTCREATEX_SHARE_ACCESS_READ|
NTCREATEX_SHARE_ACCESS_WRITE|
NTCREATEX_SHARE_ACCESS_DELETE,
NTCREATEX_DISP_OPEN,
NTCREATEX_OPTIONS_DIRECTORY, 0);
torture_assert(tctx, dnum2 != -1,
talloc_asprintf(tctx, "open of %s failed: %s!",
dname, smbcli_errstr(cli1->tree)));
torture_assert_ntstatus_ok(
tctx, smbcli_nt_delete_on_close(cli1->tree, dnum1, True),
talloc_asprintf(tctx, "setting delete_on_close failed (%s)",
smbcli_errstr(cli1->tree)));
smbcli_close(cli1->tree, dnum1);
dnum1 = smbcli_nt_create_full(cli1->tree, dname, 0,
SEC_FILE_READ_DATA|
SEC_FILE_WRITE_DATA|
SEC_STD_DELETE,
FILE_ATTRIBUTE_DIRECTORY,
NTCREATEX_SHARE_ACCESS_READ|
NTCREATEX_SHARE_ACCESS_WRITE|
NTCREATEX_SHARE_ACCESS_DELETE,
NTCREATEX_DISP_OPEN,
NTCREATEX_OPTIONS_DIRECTORY, 0);
torture_assert(tctx, dnum1 == -1,
talloc_asprintf(tctx, "open of %s succeeded!\n",
dname));
CHECK_STATUS(cli1, NT_STATUS_DELETE_PENDING);
return correct;
}
/*
Test delete on close semantics.
@ -1285,6 +1364,7 @@ struct torture_suite *torture_test_delete(void)
torture_suite_add_2smb_test(suite, "deltest19", deltest19);
torture_suite_add_2smb_test(suite, "deltest20", deltest20);
torture_suite_add_simple_test(suite, "deltest21", deltest21);
torture_suite_add_simple_test(suite, "deltest22", deltest22);
return suite;
}