svn commit: samba r9003 - in branches/SAMBA_4_0/source/torture/raw:
.
tridge at samba.org
tridge at samba.org
Wed Aug 3 16:50:14 GMT 2005
Author: tridge
Date: 2005-08-03 16:50:12 +0000 (Wed, 03 Aug 2005)
New Revision: 9003
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9003
Log:
add testing for non-empty directory delete on close
Modified:
branches/SAMBA_4_0/source/torture/raw/unlink.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/unlink.c
===================================================================
--- branches/SAMBA_4_0/source/torture/raw/unlink.c 2005-08-03 16:26:37 UTC (rev 9002)
+++ branches/SAMBA_4_0/source/torture/raw/unlink.c 2005-08-03 16:50:12 UTC (rev 9003)
@@ -173,9 +173,10 @@
struct smb_rmdir dio;
NTSTATUS status;
BOOL ret = True;
- int fnum;
+ int fnum, fnum2;
const char *fname = BASEDIR "\\test.txt";
const char *dname = BASEDIR "\\test.dir";
+ const char *inside = BASEDIR "\\test.dir\\test.txt";
union smb_setfileinfo sfinfo;
if (!torture_setup_dir(cli, BASEDIR)) {
@@ -242,6 +243,34 @@
status = smb_raw_rmdir(cli->tree, &dio);
CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+
+ printf("Testing with non-empty directory delete_on_close\n");
+ fnum = create_directory_handle(cli->tree, dname);
+ fnum2 = create_complex_file(cli, mem_ctx, inside);
+
+ sfinfo.disposition_info.file.fnum = fnum;
+ sfinfo.disposition_info.in.delete_on_close = 1;
+ status = smb_raw_setfileinfo(cli->tree, &sfinfo);
+ CHECK_STATUS(status, NT_STATUS_DIRECTORY_NOT_EMPTY);
+
+ sfinfo.disposition_info.file.fnum = fnum2;
+ status = smb_raw_setfileinfo(cli->tree, &sfinfo);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ sfinfo.disposition_info.file.fnum = fnum;
+ status = smb_raw_setfileinfo(cli->tree, &sfinfo);
+ CHECK_STATUS(status, NT_STATUS_DIRECTORY_NOT_EMPTY);
+
+ smbcli_close(cli->tree, fnum2);
+
+ status = smb_raw_setfileinfo(cli->tree, &sfinfo);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ smbcli_close(cli->tree, fnum);
+
+ status = smb_raw_rmdir(cli->tree, &dio);
+ CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+
done:
smb_raw_exit(cli->session);
smbcli_deltree(cli->tree, BASEDIR);
More information about the samba-cvs
mailing list