[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2741-ga034ad5

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  a034ad5b28dc22b76ef91901306d5c4f9102178f (commit)
      from  1036bd6f8adcff316d2d86201b1a7097b4b9fe0c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit a034ad5b28dc22b76ef91901306d5c4f9102178f
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jul 15 15:27:22 2008 -0700

    Fix from Volodymyr Khomenko <Volodymyr.Khomenko at exanet.com>. Make ntimes
    function more like POSIX and allow NULL arg. Help vfs developers.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/modules/vfs_default.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_default.c b/source/modules/vfs_default.c
index de801a2..88c7237 100644
--- a/source/modules/vfs_default.c
+++ b/source/modules/vfs_default.c
@@ -657,18 +657,22 @@ static int vfswrap_ntimes(vfs_handle_struct *handle, const char *path, const str
 
 	START_PROFILE(syscall_ntimes);
 #if defined(HAVE_UTIMES)
-	{
+	if (ts != NULL) {
 		struct timeval tv[2];
 		tv[0] = convert_timespec_to_timeval(ts[0]);
 		tv[1] = convert_timespec_to_timeval(ts[1]);
 		result = utimes(path, tv);
+	} else {
+		result = utimes(path, NULL);
 	}
 #elif defined(HAVE_UTIME)
-	{
+	if (ts != NULL) {
 		struct utimbuf times;
 		times.actime = convert_timespec_to_time_t(ts[0]);
 		times.modtime = convert_timespec_to_time_t(ts[1]);
 		result = utime(path, times);
+	} else {
+		result = utime(path, NULL);
 	}
 #else
 	errno = ENOSYS;


-- 
Samba Shared Repository