svn commit: samba r3249 - in branches/SAMBA_4_0/source: ntvfs/posix script/tests

[tridge at samba.org]

Author: tridge
Date: 2004-10-26 07:11:49 +0000 (Tue, 26 Oct 2004)
New Revision: 3249

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=3249&nolog=1

Log:
- change_time is closer to ctime than mtime

- pvfs now passes the RAW-CLOSE test

Modified:
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_fileinfo.c
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
   branches/SAMBA_4_0/source/script/tests/test_posix.sh


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_fileinfo.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_fileinfo.c	2004-10-26 07:04:45 UTC (rev 3248)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_fileinfo.c	2004-10-26 07:11:49 UTC (rev 3249)
@@ -84,13 +84,13 @@
 	/* for now just use the simple samba mapping */
 	unix_to_nt_time(&name->dos.create_time, name->st.st_ctime);
 	unix_to_nt_time(&name->dos.access_time, name->st.st_atime);
-	unix_to_nt_time(&name->dos.write_time, name->st.st_mtime);
-	unix_to_nt_time(&name->dos.change_time, name->st.st_mtime);
+	unix_to_nt_time(&name->dos.write_time,  name->st.st_mtime);
+	unix_to_nt_time(&name->dos.change_time, name->st.st_ctime);
 #ifdef HAVE_STAT_TV_NSEC
 	name->dos.create_time += name->st.st_ctim.tv_nsec / 100;
 	name->dos.access_time += name->st.st_atim.tv_nsec / 100;
 	name->dos.write_time  += name->st.st_mtim.tv_nsec / 100;
-	name->dos.change_time += name->st.st_mtim.tv_nsec / 100;
+	name->dos.change_time += name->st.st_ctim.tv_nsec / 100;
 #endif
 	name->dos.attrib = dos_mode_from_stat(pvfs, &name->st);
 	name->dos.alloc_size = name->st.st_size;

Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c	2004-10-26 07:04:45 UTC (rev 3248)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c	2004-10-26 07:11:49 UTC (rev 3249)
@@ -634,6 +634,10 @@
 	NTSTATUS status;
 	struct utimbuf unix_times;
 
+	if (io->generic.level == RAW_CLOSE_SPLCLOSE) {
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+
 	if (io->generic.level != RAW_CLOSE_CLOSE) {
 		return ntvfs_map_close(req, io, ntvfs);
 	}

Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_posix.sh	2004-10-26 07:04:45 UTC (rev 3248)
+++ branches/SAMBA_4_0/source/script/tests/test_posix.sh	2004-10-26 07:11:49 UTC (rev 3249)
@@ -37,12 +37,12 @@
 tests="$tests BASE-CHKPATH BASE-SECLEAK"
 tests="$tests RAW-QFSINFO RAW-QFILEINFO RAW-SFILEINFO-BUG"
 tests="$tests RAW-LOCK RAW-MKDIR RAW-SEEK RAW-CONTEXT BASE-RENAME"
-tests="$tests RAW-UNLINK RAW-READ"
+tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE"
 tests="$tests LOCAL-ICONV LOCAL-TALLOC LOCAL-MESSAGING LOCAL-BINDING LOCAL-IDTREE"
 
 soon="BASE-DENY1 BASE-DEFER_OPEN BASE-OPENATTR BASE-CHARSET"
 soon="$soon RAW-SFILEINFO RAW-SEARCH RAW-OPEN RAW-OPLOCK RAW-NOTIFY RAW-MUX RAW-IOCTL"
-soon="$soon RAW-CHKPATH RAW-WRITE RAW-RENAME RAW-CLOSE BASE-TRANS2"
+soon="$soon RAW-CHKPATH RAW-WRITE RAW-RENAME BASE-TRANS2"
 soon="$soon BASE-TRANS2"
 
 for t in $tests; do