The branch, v3-0-test has been updated
via 380e957edde3c2318b99fa072019cfa4f5493f96 (commit)
via 98b709262da4429079564bf6bc03b9ecdbdff6be (commit)
via 21b062162f9d4781eda776e181c78e315fc71d94 (commit)
via 54adb86890eb22b6bcf0bc1163662c3f9c075777 (commit)
from eeed0c16f0d6a8afb0096dae6501826ec422b56a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -----------------------------------------------------------------
commit 380e957edde3c2318b99fa072019cfa4f5493f96
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Wed Jan 2 12:55:53 2008 +0100
Happy new year !
Guenther
(cherry picked from commit 9a58cd57953d6aead14789daa47a3badef19496d)
commit 98b709262da4429079564bf6bc03b9ecdbdff6be
Merge: 21b062162f9d4781eda776e181c78e315fc71d94
eeed0c16f0d6a8afb0096dae6501826ec422b56a
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Thu Jan 3 20:49:06 2008 +0100
Merge remote branch 'origin/v3-0-test' of
/home/People/metze/devel/samba/samba-bare into v3-0-test
commit 21b062162f9d4781eda776e181c78e315fc71d94
Merge: 54adb86890eb22b6bcf0bc1163662c3f9c075777
f5476c93c73a0757bfa154d8fb360184ed29e00f
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Fri Dec 14 11:42:00 2007 +0100
Merge remote branch 'origin/v3-0-test' of
/home/People/metze/devel/samba/samba-bare into v3-0-test
commit 54adb86890eb22b6bcf0bc1163662c3f9c075777
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Wed Dec 5 16:02:48 2007 +0100
no-atime-on-mtime
-----------------------------------------------------------------------
Summary of changes:
source/include/smb.h | 2 +-
source/smbd/dosmode.c | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/smb.h b/source/include/smb.h
index ee43bae..5ce8406 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -28,7 +28,7 @@
#define _SMB_H
/* logged when starting the various Samba daemons */
-#define COPYRIGHT_STARTUP_MESSAGE "Copyright Andrew Tridgell and the
Samba Team 1992-2007"
+#define COPYRIGHT_STARTUP_MESSAGE "Copyright Andrew Tridgell and the
Samba Team 1992-2008"
#if defined(LARGE_SMB_OFF_T)
diff --git a/source/smbd/dosmode.c b/source/smbd/dosmode.c
index 28d8a77..e6d2309 100644
--- a/source/smbd/dosmode.c
+++ b/source/smbd/dosmode.c
@@ -605,14 +605,21 @@ int file_ntimes(connection_struct *conn, const char
*fname, const struct timespe
BOOL set_filetime(connection_struct *conn, const char *fname,
const struct timespec mtime)
{
+ SMB_STRUCT_STAT sbuf;
struct timespec ts[2];
if (null_timespec(mtime)) {
return(True);
}
+ ZERO_STRUCT(sbuf);
+
+ if (SMB_VFS_STAT(conn,fname,&sbuf) == -1) {
+ return False;
+ }
+
+ ts[0] = get_atimespec(&sbuf); /* atime. */
ts[1] = mtime; /* mtime. */
- ts[0] = ts[1]; /* atime. */
if (file_ntimes(conn, fname, ts)) {
DEBUG(4,("set_filetime(%s) failed:
%s\n",fname,strerror(errno)));
--
Samba Shared Repository
