sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

s3-torture: Add WILDDELETE test to smbtorture3 to test old wildcard delete with zero attribute

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11452

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Jeremy Allison 2015-10-19 16:06:01 -07:00 committed by Andreas Schneider
parent 1d51119f8a
commit 618d3dd599
2 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/selftest/tests.py
View File

@ -48,7 +48,7 @@ tests = ["FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7"
"UNLINK", "BROWSE", "ATTR", "TRANS2", "TORTURE",
"OPLOCK1", "OPLOCK2", "OPLOCK4", "STREAMERROR",
"DIR", "DIR1", "DIR-CREATETIME", "TCON", "TCONDEV", "RW1", "RW2", "RW3", "LARGE_READX", "RW-SIGNING",
"OPEN", "XCOPY", "RENAME", "DELETE", "DELETE-LN", "PROPERTIES", "W2K",
"OPEN", "XCOPY", "RENAME", "DELETE", "DELETE-LN", "WILDDELETE", "PROPERTIES", "W2K",
"TCON2", "IOCTL", "CHKPATH", "FDSESS", "CHAIN1", "CHAIN2",
"CHAIN3",
"GETADDRINFO", "UID-REGRESSION-TEST", "SHORTNAME-TEST",

67
source3/torture/torture.c
View File

@ -4409,6 +4409,72 @@ static bool run_deletetest(int dummy)
return correct;
}
/*
Test wildcard delete.
*/
static bool run_wild_deletetest(int dummy)
{
struct cli_state *cli = NULL;
const char *dname = "\\WTEST";
const char *fname = "\\WTEST\\A";
const char *wunlink_name = "\\WTEST\\*";
uint16_t fnum1 = (uint16_t)-1;
bool correct = false;
NTSTATUS status;
printf("starting wildcard delete test\n");
if (!torture_open_connection(&cli, 0)) {
return false;
}
smbXcli_conn_set_sockopt(cli->conn, sockops);
cli_unlink(cli, fname, 0);
cli_rmdir(cli, dname);
status = cli_mkdir(cli, dname);
if (!NT_STATUS_IS_OK(status)) {
printf("mkdir of %s failed %s!\n", dname, nt_errstr(status));
goto fail;
}
status = cli_openx(cli, fname, O_CREAT|O_RDONLY, DENY_NONE, &fnum1);
if (!NT_STATUS_IS_OK(status)) {
printf("open of %s failed %s!\n", fname, nt_errstr(status));
goto fail;
}
status = cli_close(cli, fnum1);
fnum1 = -1;
/*
* Note the unlink attribute-type of zero. This should
* map into FILE_ATTRIBUTE_NORMAL at the server even
* on a wildcard delete.
*/
status = cli_unlink(cli, wunlink_name, 0);
if (!NT_STATUS_IS_OK(status)) {
printf("unlink of %s failed %s!\n",
wunlink_name, nt_errstr(status));
goto fail;
}
printf("finished wildcard delete test\n");
correct = true;
fail:
if (fnum1 != (uint16_t)-1) cli_close(cli, fnum1);
cli_unlink(cli, fname, 0);
cli_rmdir(cli, dname);
if (cli && !torture_close_connection(cli)) {
correct = false;
}
return correct;
}
static bool run_deletetest_ln(int dummy)
{
struct cli_state *cli;
@ -9548,6 +9614,7 @@ static struct {
{"XCOPY", run_xcopy, 0},
{"RENAME", run_rename, 0},
{"DELETE", run_deletetest, 0},
{"WILDDELETE", run_wild_deletetest, 0},
{"DELETE-LN", run_deletetest_ln, 0},
{"PROPERTIES", run_properties, 0},
{"MANGLE", torture_mangle, 0},