r3149: separate the delete on close test into torture/basic/delete.c

(This used to be commit 50379a0a58d9eade3e1390713ef89473c66e65fc)

3 files changed, 527 insertions, 501 deletions

diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
new file mode 100644
index 0000000000..a4489023a6
--- /dev/null
+++ b/source4/torture/basic/delete.c
@@ -0,0 +1,524 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   delete on close testing
+
+   Copyright (C) Andrew Tridgell 2003
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+
+
+/*
+  Test delete on close semantics.
+ */
+BOOL torture_test_delete(int dummy)
+{
+	struct smbcli_state *cli1;
+	struct smbcli_state *cli2 = NULL;
+	const char *fname = "\\delete.file";
+	int fnum1 = -1;
+	int fnum2 = -1;
+	BOOL correct = True;
+	NTSTATUS status;
+	
+	printf("starting delete test\n");
+	
+	if (!torture_open_connection(&cli1)) {
+		return False;
+	}
+	
+	/* Test 1 - this should delete the file on close. */
+	
+	smbcli_setatr(cli1->tree, fname, 0, 0);
+	smbcli_unlink(cli1->tree, fname);
+	
+	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
+				   NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OVERWRITE_IF, 
+				   NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0);
+	
+	if (fnum1 == -1) {
+		printf("[1] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+	
+	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
+		printf("[1] close failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	fnum1 = smbcli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
+	if (fnum1 != -1) {
+		printf("[1] open of %s succeeded (should fail)\n", fname);
+		correct = False;
+		goto fail;
+	}
+	
+	printf("first delete on close test succeeded.\n");
+	
+	/* Test 2 - this should delete the file on close. */
+	
+	smbcli_setatr(cli1->tree, fname, 0, 0);
+	smbcli_unlink(cli1->tree, fname);
+	
+	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS,
+				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, 
+				   NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
+	
+	if (fnum1 == -1) {
+		printf("[2] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+	
+	if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
+		printf("[2] setting delete_on_close failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+	
+	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
+		printf("[2] close failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+	
+	fnum1 = smbcli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
+	if (fnum1 != -1) {
+		printf("[2] open of %s succeeded should have been deleted on close !\n", fname);
+		if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
+			printf("[2] close failed (%s)\n", smbcli_errstr(cli1->tree));
+			correct = False;
+			goto fail;
+		}
+		smbcli_unlink(cli1->tree, fname);
+	} else
+		printf("second delete on close test succeeded.\n");
+	
+	/* Test 3 - ... */
+	smbcli_setatr(cli1->tree, fname, 0, 0);
+	smbcli_unlink(cli1->tree, fname);
+
+	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
+				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
+
+	if (fnum1 == -1) {
+		printf("[3] open - 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	/* This should fail with a sharing violation - open for delete is only compatible
+	   with SHARE_DELETE. */
+
+	fnum2 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL,
+				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, 
+				   NTCREATEX_DISP_OPEN, 0, 0);
+
+	if (fnum2 != -1) {
+		printf("[3] open  - 2 of %s succeeded - should have failed.\n", fname);
+		correct = False;
+		goto fail;
+	}
+
+	/* This should succeed. */
+
+	fnum2 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL,
+			NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN, 0, 0);
+
+	if (fnum2 == -1) {
+		printf("[3] open  - 2 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
+		printf("[3] setting delete_on_close failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+	
+	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
+		printf("[3] close 1 failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+	
+	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum2))) {
+		printf("[3] close 2 failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+	
+	/* This should fail - file should no longer be there. */
+
+	fnum1 = smbcli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
+	if (fnum1 != -1) {
+		printf("[3] open of %s succeeded should have been deleted on close !\n", fname);
+		if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
+			printf("[3] close failed (%s)\n", smbcli_errstr(cli1->tree));
+		}
+		smbcli_unlink(cli1->tree, fname);
+		correct = False;
+		goto fail;
+	} else
+		printf("third delete on close test succeeded.\n");
+
+	/* Test 4 ... */
+	smbcli_setatr(cli1->tree, fname, 0, 0);
+	smbcli_unlink(cli1->tree, fname);
+
+	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, 
+				   SA_RIGHT_FILE_READ_DATA  | 
+				   SA_RIGHT_FILE_WRITE_DATA |
+				   STD_RIGHT_DELETE_ACCESS,
+				   FILE_ATTRIBUTE_NORMAL, 
+				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, 
+				   NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
+								
+	if (fnum1 == -1) {
+		printf("[4] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	/* This should succeed. */
+	fnum2 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ,
+				   FILE_ATTRIBUTE_NORMAL, 
+				   NTCREATEX_SHARE_ACCESS_READ  | 
+				   NTCREATEX_SHARE_ACCESS_WRITE |
+				   NTCREATEX_SHARE_ACCESS_DELETE, 
+				   NTCREATEX_DISP_OPEN, 0, 0);
+	if (fnum2 == -1) {
+		printf("[4] open  - 2 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+	
+	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum2))) {
+		printf("[4] close - 1 failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+	
+	if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
+		printf("[4] setting delete_on_close failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+	
+	/* This should fail - no more opens once delete on close set. */
+	fnum2 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ,
+				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE,
+				   NTCREATEX_DISP_OPEN, 0, 0);
+	if (fnum2 != -1) {
+		printf("[4] open  - 3 of %s succeeded ! Should have failed.\n", fname );
+		correct = False;
+		goto fail;
+	} else
+		printf("fourth delete on close test succeeded.\n");
+	
+	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
+		printf("[4] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+	
+	/* Test 5 ... */
+	smbcli_setatr(cli1->tree, fname, 0, 0);
+	smbcli_unlink(cli1->tree, fname);
+	
+	fnum1 = smbcli_open(cli1->tree, fname, O_RDWR|O_CREAT, DENY_NONE);
+	if (fnum1 == -1) {
+		printf("[5] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	/* This should fail - only allowed on NT opens with DELETE access. */
+
+	if (NT_STATUS_IS_OK(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
+		printf("[5] setting delete_on_close on OpenX file succeeded - should fail !\n");
+		correct = False;
+		goto fail;
+	}
+
+	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
+		printf("[5] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+	
+	printf("fifth delete on close test succeeded.\n");
+	
+	/* Test 6 ... */
+	smbcli_setatr(cli1->tree, fname, 0, 0);
+	smbcli_unlink(cli1->tree, fname);
+	
+	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, 
+				   SA_RIGHT_FILE_READ_DATA | SA_RIGHT_FILE_WRITE_DATA,
+				   FILE_ATTRIBUTE_NORMAL, 
+				   NTCREATEX_SHARE_ACCESS_READ  |
+				   NTCREATEX_SHARE_ACCESS_WRITE |
+				   NTCREATEX_SHARE_ACCESS_DELETE,
+				   NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
+	
+	if (fnum1 == -1) {
+		printf("[6] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+	
+	/* This should fail - only allowed on NT opens with DELETE access. */
+	
+	if (NT_STATUS_IS_OK(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
+		printf("[6] setting delete_on_close on file with no delete access succeeded - should fail !\n");
+		correct = False;
+		goto fail;
+	}
+
+	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
+		printf("[6] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	printf("sixth delete on close test succeeded.\n");
+	
+	/* Test 7 ... */
+	smbcli_setatr(cli1->tree, fname, 0, 0);
+	smbcli_unlink(cli1->tree, fname);
+	
+	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, 
+				   SA_RIGHT_FILE_READ_DATA  | 
+				   SA_RIGHT_FILE_WRITE_DATA |
+				   STD_RIGHT_DELETE_ACCESS,
+				   FILE_ATTRIBUTE_NORMAL, 0, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
+								
+	if (fnum1 == -1) {
+		printf("[7] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
+		printf("[7] setting delete_on_close on file failed !\n");
+		correct = False;
+		goto fail;
+	}
+	
+	if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, False))) {
+		printf("[7] unsetting delete_on_close on file failed !\n");
+		correct = False;
+		goto fail;
+	}
+
+	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
+		printf("[7] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+	
+	/* This next open should succeed - we reset the flag. */
+	
+	fnum1 = smbcli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
+	if (fnum1 == -1) {
+		printf("[5] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
+		printf("[7] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	printf("seventh delete on close test succeeded.\n");
+	
+	/* Test 7 ... */
+	smbcli_setatr(cli1->tree, fname, 0, 0);
+	smbcli_unlink(cli1->tree, fname);
+	
+	if (!torture_open_connection(&cli2)) {
+		printf("[8] failed to open second connection.\n");
+		correct = False;
+		goto fail;
+	}
+
+	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS,
+				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE,
+				   NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
+	
+	if (fnum1 == -1) {
+		printf("[8] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	fnum2 = smbcli_nt_create_full(cli2->tree, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS,
+				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE,
+				   NTCREATEX_DISP_OPEN, 0, 0);
+	
+	if (fnum2 == -1) {
+		printf("[8] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
+		printf("[8] setting delete_on_close on file failed !\n");
+		correct = False;
+		goto fail;
+	}
+	
+	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
+		printf("[8] close - 1 failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) {
+		printf("[8] close - 2 failed (%s)\n", smbcli_errstr(cli2->tree));
+		correct = False;
+		goto fail;
+	}
+
+	/* This should fail.. */
+	fnum1 = smbcli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
+	if (fnum1 != -1) {
+		printf("[8] open of %s succeeded should have been deleted on close !\n", fname);
+		goto fail;
+		correct = False;
+	} else
+		printf("eighth delete on close test succeeded.\n");
+
+	/* This should fail - we need to set DELETE_ACCESS. */
+	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0,SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA,
+				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0);
+	
+	if (fnum1 != -1) {
+		printf("[9] open of %s succeeded should have failed!\n", fname);
+		correct = False;
+		goto fail;
+	}
+
+	printf("ninth delete on close test succeeded.\n");
+
+	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS,
+				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0);
+	if (fnum1 == -1) {
+		printf("[10] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	/* This should delete the file. */
+	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
+		printf("[10] close failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	/* This should fail.. */
+	fnum1 = smbcli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
+	if (fnum1 != -1) {
+		printf("[10] open of %s succeeded should have been deleted on close !\n", fname);
+		goto fail;
+		correct = False;
+	} else
+		printf("tenth delete on close test succeeded.\n");
+
+	/* test 11 - does having read only attribute still allow delete on close. */
+
+	smbcli_setatr(cli1->tree, fname, 0, 0);
+	smbcli_unlink(cli1->tree, fname);
+                                                                                                                                        
+	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS,
+				   FILE_ATTRIBUTE_READONLY, NTCREATEX_SHARE_ACCESS_NONE, 
+				   NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
+	
+        if (fnum1 == -1) {
+                printf("[11] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+                correct = False;
+                goto fail;
+        }
+
+	status = smbcli_nt_delete_on_close(cli1->tree, fnum1, True);
+
+	if (NT_STATUS_V(status) != NT_STATUS_V(NT_STATUS_CANNOT_DELETE)) {
+		printf("[11] setting delete_on_close should fail with NT_STATUS_CANNOT_DELETE. Got %s instead)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
+		printf("[11] close failed (%s)\n", smbcli_errstr(cli1->tree));
+		correct = False;
+		goto fail;
+	}
+
+	smbcli_setatr(cli1->tree, fname, 0, 0);
+	smbcli_unlink(cli1->tree, fname);
+                                                                                                                                        
+        printf("eleventh delete on close test succeeded.\n");
+
+	/* test 12 - does having read only attribute still allow delete on close at time of open. */
+
+	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_READONLY,
+				   NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OVERWRITE_IF, 
+				   NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0);
+	
+	if (fnum1 != -1) {
+		printf("[12] open of %s succeeded. Should fail with NT_STATUS_CANNOT_DELETE.\n", fname);
+		smbcli_close(cli1->tree, fnum1);
+		correct = False;
+		goto fail;
+	} else {
+		status = smbcli_nt_error(cli1->tree);
+		if (NT_STATUS_V(status) != NT_STATUS_V(NT_STATUS_CANNOT_DELETE)) {
+			printf("[12] setting delete_on_close on open should fail with NT_STATUS_CANNOT_DELETE. Got %s instead)\n", smbcli_errstr(cli1->tree));
+			correct = False;
+			goto fail;
+		}
+	}
+	
+        printf("twelvth delete on close test succeeded.\n");
+
+	printf("finished delete test\n");
+
+  fail:
+	/* FIXME: This will crash if we aborted before cli2 got
+	 * intialized, because these functions don't handle
+	 * uninitialized connections. */
+		
+	smbcli_close(cli1->tree, fnum1);
+	smbcli_close(cli1->tree, fnum2);
+	smbcli_setatr(cli1->tree, fname, 0, 0);
+	smbcli_unlink(cli1->tree, fname);
+
+	if (!torture_close_connection(cli1)) {
+		correct = False;
+	}
+	if (!torture_close_connection(cli2)) {
+		correct = False;
+	}
+	return correct;
+}
+
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 49ab3fba43..714f3b7ffb 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -11,7 +11,8 @@ ADD_OBJ_FILES = \
 		torture/basic/denytest.o \
 		torture/basic/aliases.o \
 		torture/basic/locking.o \
-		torture/basic/secleak.o 
+		torture/basic/secleak.o \
+		torture/basic/delete.o 
 REQUIRED_SUBSYSTEMS = \
 		LIBSMB
 # End SUBSYSTEM TORTURE_BASIC
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 67f214d558..19e8bf266e 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -1348,505 +1348,6 @@ static BOOL run_trans2test(int dummy)
 	return correct;
 }
 
-/*
-  Test delete on close semantics.
- */
-static BOOL run_deletetest(int dummy)
-{
-	struct smbcli_state *cli1;
-	struct smbcli_state *cli2 = NULL;
-	const char *fname = "\\delete.file";
-	int fnum1 = -1;
-	int fnum2 = -1;
-	BOOL correct = True;
-	NTSTATUS status;
-	
-	printf("starting delete test\n");
-	
-	if (!torture_open_connection(&cli1)) {
-		return False;
-	}
-	
-	/* Test 1 - this should delete the file on close. */
-	
-	smbcli_setatr(cli1->tree, fname, 0, 0);
-	smbcli_unlink(cli1->tree, fname);
-	
-	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
-				   NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OVERWRITE_IF, 
-				   NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0);
-	
-	if (fnum1 == -1) {
-		printf("[1] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-	
-	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		printf("[1] close failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	fnum1 = smbcli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
-	if (fnum1 != -1) {
-		printf("[1] open of %s succeeded (should fail)\n", fname);
-		correct = False;
-		goto fail;
-	}
-	
-	printf("first delete on close test succeeded.\n");
-	
-	/* Test 2 - this should delete the file on close. */
-	
-	smbcli_setatr(cli1->tree, fname, 0, 0);
-	smbcli_unlink(cli1->tree, fname);
-	
-	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS,
-				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, 
-				   NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
-	
-	if (fnum1 == -1) {
-		printf("[2] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-	
-	if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
-		printf("[2] setting delete_on_close failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-	
-	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		printf("[2] close failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-	
-	fnum1 = smbcli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
-	if (fnum1 != -1) {
-		printf("[2] open of %s succeeded should have been deleted on close !\n", fname);
-		if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-			printf("[2] close failed (%s)\n", smbcli_errstr(cli1->tree));
-			correct = False;
-			goto fail;
-		}
-		smbcli_unlink(cli1->tree, fname);
-	} else
-		printf("second delete on close test succeeded.\n");
-	
-	/* Test 3 - ... */
-	smbcli_setatr(cli1->tree, fname, 0, 0);
-	smbcli_unlink(cli1->tree, fname);
-
-	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
-				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
-
-	if (fnum1 == -1) {
-		printf("[3] open - 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	/* This should fail with a sharing violation - open for delete is only compatible
-	   with SHARE_DELETE. */
-
-	fnum2 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL,
-				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, 
-				   NTCREATEX_DISP_OPEN, 0, 0);
-
-	if (fnum2 != -1) {
-		printf("[3] open  - 2 of %s succeeded - should have failed.\n", fname);
-		correct = False;
-		goto fail;
-	}
-
-	/* This should succeed. */
-
-	fnum2 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL,
-			NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN, 0, 0);
-
-	if (fnum2 == -1) {
-		printf("[3] open  - 2 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
-		printf("[3] setting delete_on_close failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-	
-	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		printf("[3] close 1 failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-	
-	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum2))) {
-		printf("[3] close 2 failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-	
-	/* This should fail - file should no longer be there. */
-
-	fnum1 = smbcli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
-	if (fnum1 != -1) {
-		printf("[3] open of %s succeeded should have been deleted on close !\n", fname);
-		if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-			printf("[3] close failed (%s)\n", smbcli_errstr(cli1->tree));
-		}
-		smbcli_unlink(cli1->tree, fname);
-		correct = False;
-		goto fail;
-	} else
-		printf("third delete on close test succeeded.\n");
-
-	/* Test 4 ... */
-	smbcli_setatr(cli1->tree, fname, 0, 0);
-	smbcli_unlink(cli1->tree, fname);
-
-	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, 
-				   SA_RIGHT_FILE_READ_DATA  | 
-				   SA_RIGHT_FILE_WRITE_DATA |
-				   STD_RIGHT_DELETE_ACCESS,
-				   FILE_ATTRIBUTE_NORMAL, 
-				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, 
-				   NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
-								
-	if (fnum1 == -1) {
-		printf("[4] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	/* This should succeed. */
-	fnum2 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ,
-				   FILE_ATTRIBUTE_NORMAL, 
-				   NTCREATEX_SHARE_ACCESS_READ  | 
-				   NTCREATEX_SHARE_ACCESS_WRITE |
-				   NTCREATEX_SHARE_ACCESS_DELETE, 
-				   NTCREATEX_DISP_OPEN, 0, 0);
-	if (fnum2 == -1) {
-		printf("[4] open  - 2 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-	
-	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum2))) {
-		printf("[4] close - 1 failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-	
-	if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
-		printf("[4] setting delete_on_close failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-	
-	/* This should fail - no more opens once delete on close set. */
-	fnum2 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ,
-				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE,
-				   NTCREATEX_DISP_OPEN, 0, 0);
-	if (fnum2 != -1) {
-		printf("[4] open  - 3 of %s succeeded ! Should have failed.\n", fname );
-		correct = False;
-		goto fail;
-	} else
-		printf("fourth delete on close test succeeded.\n");
-	
-	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		printf("[4] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-	
-	/* Test 5 ... */
-	smbcli_setatr(cli1->tree, fname, 0, 0);
-	smbcli_unlink(cli1->tree, fname);
-	
-	fnum1 = smbcli_open(cli1->tree, fname, O_RDWR|O_CREAT, DENY_NONE);
-	if (fnum1 == -1) {
-		printf("[5] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	/* This should fail - only allowed on NT opens with DELETE access. */
-
-	if (NT_STATUS_IS_OK(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
-		printf("[5] setting delete_on_close on OpenX file succeeded - should fail !\n");
-		correct = False;
-		goto fail;
-	}
-
-	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		printf("[5] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-	
-	printf("fifth delete on close test succeeded.\n");
-	
-	/* Test 6 ... */
-	smbcli_setatr(cli1->tree, fname, 0, 0);
-	smbcli_unlink(cli1->tree, fname);
-	
-	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, 
-				   SA_RIGHT_FILE_READ_DATA | SA_RIGHT_FILE_WRITE_DATA,
-				   FILE_ATTRIBUTE_NORMAL, 
-				   NTCREATEX_SHARE_ACCESS_READ  |
-				   NTCREATEX_SHARE_ACCESS_WRITE |
-				   NTCREATEX_SHARE_ACCESS_DELETE,
-				   NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
-	
-	if (fnum1 == -1) {
-		printf("[6] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-	
-	/* This should fail - only allowed on NT opens with DELETE access. */
-	
-	if (NT_STATUS_IS_OK(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
-		printf("[6] setting delete_on_close on file with no delete access succeeded - should fail !\n");
-		correct = False;
-		goto fail;
-	}
-
-	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		printf("[6] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	printf("sixth delete on close test succeeded.\n");
-	
-	/* Test 7 ... */
-	smbcli_setatr(cli1->tree, fname, 0, 0);
-	smbcli_unlink(cli1->tree, fname);
-	
-	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, 
-				   SA_RIGHT_FILE_READ_DATA  | 
-				   SA_RIGHT_FILE_WRITE_DATA |
-				   STD_RIGHT_DELETE_ACCESS,
-				   FILE_ATTRIBUTE_NORMAL, 0, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
-								
-	if (fnum1 == -1) {
-		printf("[7] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
-		printf("[7] setting delete_on_close on file failed !\n");
-		correct = False;
-		goto fail;
-	}
-	
-	if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, False))) {
-		printf("[7] unsetting delete_on_close on file failed !\n");
-		correct = False;
-		goto fail;
-	}
-
-	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		printf("[7] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-	
-	/* This next open should succeed - we reset the flag. */
-	
-	fnum1 = smbcli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
-	if (fnum1 == -1) {
-		printf("[5] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		printf("[7] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	printf("seventh delete on close test succeeded.\n");
-	
-	/* Test 7 ... */
-	smbcli_setatr(cli1->tree, fname, 0, 0);
-	smbcli_unlink(cli1->tree, fname);
-	
-	if (!torture_open_connection(&cli2)) {
-		printf("[8] failed to open second connection.\n");
-		correct = False;
-		goto fail;
-	}
-
-	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS,
-				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE,
-				   NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
-	
-	if (fnum1 == -1) {
-		printf("[8] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	fnum2 = smbcli_nt_create_full(cli2->tree, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS,
-				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE,
-				   NTCREATEX_DISP_OPEN, 0, 0);
-	
-	if (fnum2 == -1) {
-		printf("[8] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
-		printf("[8] setting delete_on_close on file failed !\n");
-		correct = False;
-		goto fail;
-	}
-	
-	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		printf("[8] close - 1 failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) {
-		printf("[8] close - 2 failed (%s)\n", smbcli_errstr(cli2->tree));
-		correct = False;
-		goto fail;
-	}
-
-	/* This should fail.. */
-	fnum1 = smbcli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
-	if (fnum1 != -1) {
-		printf("[8] open of %s succeeded should have been deleted on close !\n", fname);
-		goto fail;
-		correct = False;
-	} else
-		printf("eighth delete on close test succeeded.\n");
-
-	/* This should fail - we need to set DELETE_ACCESS. */
-	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0,SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA,
-				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0);
-	
-	if (fnum1 != -1) {
-		printf("[9] open of %s succeeded should have failed!\n", fname);
-		correct = False;
-		goto fail;
-	}
-
-	printf("ninth delete on close test succeeded.\n");
-
-	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS,
-				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0);
-	if (fnum1 == -1) {
-		printf("[10] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	/* This should delete the file. */
-	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		printf("[10] close failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	/* This should fail.. */
-	fnum1 = smbcli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
-	if (fnum1 != -1) {
-		printf("[10] open of %s succeeded should have been deleted on close !\n", fname);
-		goto fail;
-		correct = False;
-	} else
-		printf("tenth delete on close test succeeded.\n");
-
-	/* test 11 - does having read only attribute still allow delete on close. */
-
-	smbcli_setatr(cli1->tree, fname, 0, 0);
-	smbcli_unlink(cli1->tree, fname);
-                                                                                                                                        
-	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS,
-				   FILE_ATTRIBUTE_READONLY, NTCREATEX_SHARE_ACCESS_NONE, 
-				   NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
-	
-        if (fnum1 == -1) {
-                printf("[11] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
-                correct = False;
-                goto fail;
-        }
-
-	status = smbcli_nt_delete_on_close(cli1->tree, fnum1, True);
-
-	if (NT_STATUS_V(status) != NT_STATUS_V(NT_STATUS_CANNOT_DELETE)) {
-		printf("[11] setting delete_on_close should fail with NT_STATUS_CANNOT_DELETE. Got %s instead)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		printf("[11] close failed (%s)\n", smbcli_errstr(cli1->tree));
-		correct = False;
-		goto fail;
-	}
-
-	smbcli_setatr(cli1->tree, fname, 0, 0);
-	smbcli_unlink(cli1->tree, fname);
-                                                                                                                                        
-        printf("eleventh delete on close test succeeded.\n");
-
-	/* test 12 - does having read only attribute still allow delete on close at time of open. */
-
-	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_READONLY,
-				   NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OVERWRITE_IF, 
-				   NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0);
-	
-	if (fnum1 != -1) {
-		printf("[12] open of %s succeeded. Should fail with NT_STATUS_CANNOT_DELETE.\n", fname);
-		smbcli_close(cli1->tree, fnum1);
-		correct = False;
-		goto fail;
-	} else {
-		status = smbcli_nt_error(cli1->tree);
-		if (NT_STATUS_V(status) != NT_STATUS_V(NT_STATUS_CANNOT_DELETE)) {
-			printf("[12] setting delete_on_close on open should fail with NT_STATUS_CANNOT_DELETE. Got %s instead)\n", smbcli_errstr(cli1->tree));
-			correct = False;
-			goto fail;
-		}
-	}
-	
-        printf("twelvth delete on close test succeeded.\n");
-
-	printf("finished delete test\n");
-
-  fail:
-	/* FIXME: This will crash if we aborted before cli2 got
-	 * intialized, because these functions don't handle
-	 * uninitialized connections. */
-		
-	smbcli_close(cli1->tree, fnum1);
-	smbcli_close(cli1->tree, fnum2);
-	smbcli_setatr(cli1->tree, fname, 0, 0);
-	smbcli_unlink(cli1->tree, fname);
-
-	if (!torture_close_connection(cli1)) {
-		correct = False;
-	}
-	if (!torture_close_connection(cli2)) {
-		correct = False;
-	}
-	return correct;
-}
-
 
 /*
   print out server properties
@@ -3396,7 +2897,7 @@ static struct {
 	{"BASE-DEFER_OPEN", run_deferopen, FLAG_MULTIPROC},
 	{"BASE-XCOPY", run_xcopy, 0},
 	{"BASE-RENAME", run_rename, 0},
-	{"BASE-DELETE", run_deletetest, 0},
+	{"BASE-DELETE", torture_test_delete, 0},
 	{"BASE-PROPERTIES", run_properties, 0},
 	{"BASE-MANGLE", torture_mangle, 0},
 	{"BASE-OPENATTR", run_openattrtest, 0},