svn commit: samba r8177 - in branches/SAMBA_4_0/source/torture/basic: .

[vlendec at samba.org]

Author: vlendec
Date: 2005-07-06 08:13:11 +0000 (Wed, 06 Jul 2005)
New Revision: 8177

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8177

Log:
More explorations.

The share mode db is actually checked on qpathinfo even before the
delete-on-close is executed.

Volker

Modified:
   branches/SAMBA_4_0/source/torture/basic/delete.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/basic/delete.c
===================================================================
--- branches/SAMBA_4_0/source/torture/basic/delete.c	2005-07-06 07:45:22 UTC (rev 8176)
+++ branches/SAMBA_4_0/source/torture/basic/delete.c	2005-07-06 08:13:11 UTC (rev 8177)
@@ -456,6 +456,41 @@
 		goto fail;
 	}
 	
+	{
+		time_t c_time, a_time, m_time, w_time;
+		size_t size;
+		uint16_t mode;
+		ino_t ino;
+		status = smbcli_qpathinfo(cli1->tree, fname,
+					  &c_time, &a_time, &m_time,
+					  &size, &mode);
+		if (!NT_STATUS_EQUAL(status, NT_STATUS_DELETE_PENDING)) {
+			printf("(%s) qpathinfo 1 did not give correct error "
+			       "code (%s) -- NT_STATUS_DELETE_PENDING "
+			       "expected\n", __location__,
+			       nt_errstr(status));
+			correct = False;
+		}
+		status = smbcli_qpathinfo(cli2->tree, fname,
+					  &c_time, &a_time, &m_time,
+					  &size, &mode);
+		if (!NT_STATUS_EQUAL(status, NT_STATUS_DELETE_PENDING)) {
+			printf("(%s) qpathinfo 2 did not give correct error "
+			       "code (%s) -- NT_STATUS_DELETE_PENDING "
+			       "expected\n", __location__,
+			       nt_errstr(status));
+			correct = False;
+		}
+		status = smbcli_qfileinfo(cli2->tree, fnum2, &mode, &size,
+					  &c_time, &a_time, &m_time,
+					  &w_time, &ino);
+		if (!NT_STATUS_IS_OK(status)) {
+			printf("(%s) qfileinfo failed (%s)\n", 
+			       __location__, smbcli_errstr(cli1->tree));
+			correct = False;
+		}
+	}
+
 	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
 		printf("(%s) close - 1 failed (%s)\n", 
 		       __location__, smbcli_errstr(cli1->tree));
@@ -486,12 +521,22 @@
 					  &c_time, &a_time, &m_time,
 					  &size, &mode);
 		if (!NT_STATUS_EQUAL(status, NT_STATUS_DELETE_PENDING)) {
-			printf("(%s) qpathinfo did not give correct error "
+			printf("(%s) qpathinfo 1 did not give correct error "
 			       "code (%s) -- NT_STATUS_DELETE_PENDING "
 			       "expected\n", __location__,
 			       nt_errstr(status));
 			correct = False;
 		}
+		status = smbcli_qpathinfo(cli2->tree, fname,
+					  &c_time, &a_time, &m_time,
+					  &size, &mode);
+		if (!NT_STATUS_EQUAL(status, NT_STATUS_DELETE_PENDING)) {
+			printf("(%s) qpathinfo 2 did not give correct error "
+			       "code (%s) -- NT_STATUS_DELETE_PENDING "
+			       "expected\n", __location__,
+			       nt_errstr(status));
+			correct = False;
+		}
 		status = smbcli_qfileinfo(cli2->tree, fnum2, &mode, &size,
 					  &c_time, &a_time, &m_time,
 					  &w_time, &ino);