The Samba-Bugzilla – Attachment 4698 Details for
Bug 6529
Offline files conflict with Vista and Office 2003
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
git-am format patch for 3.3.x
0001-Fix-bug-6529-Offline-files-conflict-with-Vista-and.patch (text/plain), 18.42 KB, created by
Jeremy Allison
on 2009-09-15 16:16:01 UTC
(
hide
)
Description:
git-am format patch for 3.3.x
Filename:
MIME Type:
Creator:
Jeremy Allison
Created:
2009-09-15 16:16:01 UTC
Size:
18.42 KB
patch
obsolete
>From 30d695211199036293d368dea8577baee1d79344 Mon Sep 17 00:00:00 2001 >From: Jeremy Allison <jra@samba.org> >Date: Tue, 15 Sep 2009 14:13:16 -0700 >Subject: [PATCH] Fix bug 6529 - Offline files conflict with Vista and Office 2003. > Jeremy > >--- > source/include/includes.h | 6 ++ > source/include/proto.h | 5 ++- > source/include/smb.h | 4 ++ > source/lib/time.c | 41 ++++++++++++++++- > source/modules/vfs_default.c | 53 ++++++++++++++++++++- > source/smbd/nttrans.c | 16 +++--- > source/smbd/trans2.c | 104 +++++++++++++++++++++--------------------- > 7 files changed, 164 insertions(+), 65 deletions(-) > >diff --git a/source/include/includes.h b/source/include/includes.h >index baf22e8..e5428d7 100644 >--- a/source/include/includes.h >+++ b/source/include/includes.h >@@ -605,6 +605,12 @@ struct timespec { > }; > #endif > >+enum timestamp_set_resolution { >+ TIMESTAMP_SET_SECONDS = 0, >+ TIMESTAMP_SET_MSEC, >+ TIMESTAMP_SET_NT_OR_BETTER >+}; >+ > #ifndef MIN > #define MIN(a,b) ((a)<(b)?(a):(b)) > #endif >diff --git a/source/include/proto.h b/source/include/proto.h >index ec8637b..81576ba 100644 >--- a/source/include/proto.h >+++ b/source/include/proto.h >@@ -1155,7 +1155,8 @@ char *current_timestring(TALLOC_CTX *ctx, bool hires); > void srv_put_dos_date(char *buf,int offset,time_t unixdate); > void srv_put_dos_date2(char *buf,int offset, time_t unixdate); > void srv_put_dos_date3(char *buf,int offset,time_t unixdate); >-void put_long_date_timespec(char *p, struct timespec ts); >+void round_timespec(enum timestamp_set_resolution res, struct timespec *ts); >+void put_long_date_timespec(enum timestamp_set_resolution res, char *p, struct timespec ts); > void put_long_date(char *p, time_t t); > struct timespec get_create_timespec(const SMB_STRUCT_STAT *st,bool fake_dirs); > struct timespec get_atimespec(const SMB_STRUCT_STAT *pst); >@@ -1176,6 +1177,8 @@ struct timespec timespec_current(void); > struct timespec timespec_min(const struct timespec *ts1, > const struct timespec *ts2); > int timespec_compare(const struct timespec *ts1, const struct timespec *ts2); >+void round_timespec_to_sec(struct timespec *ts); >+void round_timespec_to_usec(struct timespec *ts); > struct timespec interpret_long_date(const char *p); > void cli_put_dos_date(struct cli_state *cli, char *buf, int offset, time_t unixdate); > void cli_put_dos_date2(struct cli_state *cli, char *buf, int offset, time_t unixdate); >diff --git a/source/include/smb.h b/source/include/smb.h >index 56d9461..fe004ce 100644 >--- a/source/include/smb.h >+++ b/source/include/smb.h >@@ -583,6 +583,10 @@ typedef struct connection_struct { > bool ipc; > bool read_only; /* Attributes for the current user of the share. */ > bool admin_user; /* Attributes for the current user of the share. */ >+ /* Does this filesystem honor >+ sub second timestamps on files >+ and directories when setting time ? */ >+ enum timestamp_set_resolution ts_res; > char *dirpath; > char *connectpath; > char *origpath; >diff --git a/source/lib/time.c b/source/lib/time.c >index 0da4b5b..cace7c7 100644 >--- a/source/lib/time.c >+++ b/source/lib/time.c >@@ -800,14 +800,30 @@ void srv_put_dos_date3(char *buf,int offset,time_t unixdate) > put_dos_date3(buf, offset, unixdate, server_zone_offset); > } > >+void round_timespec(enum timestamp_set_resolution res, struct timespec *ts) >+{ >+ switch (res) { >+ case TIMESTAMP_SET_SECONDS: >+ round_timespec_to_sec(ts); >+ break; >+ case TIMESTAMP_SET_MSEC: >+ round_timespec_to_usec(ts); >+ break; >+ case TIMESTAMP_SET_NT_OR_BETTER: >+ /* No rounding needed. */ >+ break; >+ } >+} >+ > /**************************************************************************** > Take a Unix time and convert to an NTTIME structure and place in buffer > pointed to by p. > ****************************************************************************/ > >-void put_long_date_timespec(char *p, struct timespec ts) >+void put_long_date_timespec(enum timestamp_set_resolution res, char *p, struct timespec ts) > { > NTTIME nt; >+ round_timespec(res, &ts); > unix_timespec_to_nt_time(&nt, ts); > SIVAL(p, 0, nt & 0xFFFFFFFF); > SIVAL(p, 4, nt >> 32); >@@ -818,7 +834,7 @@ void put_long_date(char *p, time_t t) > struct timespec ts; > ts.tv_sec = t; > ts.tv_nsec = 0; >- put_long_date_timespec(p, ts); >+ put_long_date_timespec(TIMESTAMP_SET_SECONDS, p, ts); > } > > /**************************************************************************** >@@ -1230,6 +1246,27 @@ int timespec_compare(const struct timespec *ts1, const struct timespec *ts2) > } > > /**************************************************************************** >+ Round up a timespec if nsec > 500000000, round down if lower, >+ then zero nsec. >+****************************************************************************/ >+ >+void round_timespec_to_sec(struct timespec *ts) >+{ >+ ts->tv_sec = convert_timespec_to_time_t(*ts); >+ ts->tv_nsec = 0; >+} >+ >+/**************************************************************************** >+ Round a timespec to usec value. >+****************************************************************************/ >+ >+void round_timespec_to_usec(struct timespec *ts) >+{ >+ struct timeval tv = convert_timespec_to_timeval(*ts); >+ *ts = convert_timeval_to_timespec(tv); >+} >+ >+/**************************************************************************** > Interprets an nt time into a unix struct timespec. > Differs from nt_time_to_unix in that an 8 byte value of 0xffffffffffffffff > will be returned as (time_t)-1, whereas nt_time_to_unix returns 0 in this case. >diff --git a/source/modules/vfs_default.c b/source/modules/vfs_default.c >index 1e95633..c379ad1 100644 >--- a/source/modules/vfs_default.c >+++ b/source/modules/vfs_default.c >@@ -92,13 +92,62 @@ static int vfswrap_statvfs(struct vfs_handle_struct *handle, const char *path, > > static uint32_t vfswrap_fs_capabilities(struct vfs_handle_struct *handle) > { >+ connection_struct *conn = handle->conn; >+ uint32_t caps = FILE_CASE_SENSITIVE_SEARCH | FILE_CASE_PRESERVED_NAMES; >+ SMB_STRUCT_STAT st; >+ NTSTATUS status; >+ struct timespec mtime_ts, ctime_ts, atime_ts; >+ int ret = -1; >+ > #if defined(DARWINOS) > struct vfs_statvfs_struct statbuf; > ZERO_STRUCT(statbuf); > sys_statvfs(handle->conn->connectpath, &statbuf); >- return statbuf.FsCapabilities; >+ caps = statbuf.FsCapabilities; > #endif >- return FILE_CASE_SENSITIVE_SEARCH | FILE_CASE_PRESERVED_NAMES; >+ >+ conn->ts_res = TIMESTAMP_SET_SECONDS; >+ >+ /* Work out what timestamp resolution we can >+ * use when setting a timestamp. */ >+ >+ ret = SMB_VFS_STAT(conn, conn->connectpath, &st); >+ if (ret == -1) { >+ return caps; >+ } >+ >+ mtime_ts = get_mtimespec(&st); >+ ctime_ts = get_ctimespec(&st); >+ atime_ts = get_atimespec(&st); >+ >+ if (mtime_ts.tv_nsec || >+ atime_ts.tv_nsec || >+ ctime_ts.tv_nsec) { >+ /* If any of the normal UNIX directory timestamps >+ * have a non-zero tv_nsec component assume >+ * we might be able to set sub-second timestamps. >+ * See what filetime set primitives we have. >+ */ >+#if defined(HAVE_UTIMES) >+ /* utimes allows msec timestamps to be set. */ >+ conn->ts_res = TIMESTAMP_SET_MSEC; >+#elif defined(HAVE_UTIME) >+ /* utime only allows sec timestamps to be set. */ >+ conn->ts_res = TIMESTAMP_SET_SECONDS; >+#endif >+ >+ /* TODO. Add a configure test for the Linux >+ * nsec timestamp set system call, and use it >+ * if available.... >+ */ >+ DEBUG(10,("vfswrap_fs_capabilities: timestamp " >+ "resolution of %s " >+ "available on share %s, directory %s\n", >+ conn->ts_res == TIMESTAMP_SET_MSEC ? "msec" : "sec", >+ lp_servicename(conn->cnum), >+ conn->connectpath )); >+ } >+ return caps; > } > > /* Directory operations */ >diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c >index 0bd37a5..51a6f59 100644 >--- a/source/smbd/nttrans.c >+++ b/source/smbd/nttrans.c >@@ -571,13 +571,13 @@ void reply_ntcreate_and_X(struct smb_request *req) > dos_filetime_timespec(&m_timespec); > } > >- put_long_date_timespec(p, c_timespec); /* create time. */ >+ put_long_date_timespec(conn->ts_res, p, c_timespec); /* create time. */ > p += 8; >- put_long_date_timespec(p, a_timespec); /* access time */ >+ put_long_date_timespec(conn->ts_res, p, a_timespec); /* access time */ > p += 8; >- put_long_date_timespec(p, m_timespec); /* write time */ >+ put_long_date_timespec(conn->ts_res, p, m_timespec); /* write time */ > p += 8; >- put_long_date_timespec(p, m_timespec); /* change time */ >+ put_long_date_timespec(conn->ts_res, p, m_timespec); /* change time */ > p += 8; > SIVAL(p,0,fattr); /* File Attributes. */ > p += 4; >@@ -1022,13 +1022,13 @@ static void call_nt_transact_create(connection_struct *conn, > dos_filetime_timespec(&m_timespec); > } > >- put_long_date_timespec(p, c_timespec); /* create time. */ >+ put_long_date_timespec(conn->ts_res, p, c_timespec); /* create time. */ > p += 8; >- put_long_date_timespec(p, a_timespec); /* access time */ >+ put_long_date_timespec(conn->ts_res, p, a_timespec); /* access time */ > p += 8; >- put_long_date_timespec(p, m_timespec); /* write time */ >+ put_long_date_timespec(conn->ts_res, p, m_timespec); /* write time */ > p += 8; >- put_long_date_timespec(p, m_timespec); /* change time */ >+ put_long_date_timespec(conn->ts_res, p, m_timespec); /* change time */ > p += 8; > SIVAL(p,0,fattr); /* File Attributes. */ > p += 4; >diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c >index 160fe71..72c66ea 100644 >--- a/source/smbd/trans2.c >+++ b/source/smbd/trans2.c >@@ -1598,10 +1598,10 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx, > was_8_3 = mangle_is_8_3(fname, True, conn->params); > p += 4; > SIVAL(p,0,reskey); p += 4; >- put_long_date_timespec(p,create_date_ts); p += 8; >- put_long_date_timespec(p,adate_ts); p += 8; >- put_long_date_timespec(p,mdate_ts); p += 8; >- put_long_date_timespec(p,mdate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,create_date_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,adate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,mdate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,mdate_ts); p += 8; > SOFF_T(p,0,file_size); p += 8; > SOFF_T(p,0,allocation_size); p += 8; > SIVAL(p,0,nt_extmode); p += 4; >@@ -1649,10 +1649,10 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx, > DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_FILE_DIRECTORY_INFO\n")); > p += 4; > SIVAL(p,0,reskey); p += 4; >- put_long_date_timespec(p,create_date_ts); p += 8; >- put_long_date_timespec(p,adate_ts); p += 8; >- put_long_date_timespec(p,mdate_ts); p += 8; >- put_long_date_timespec(p,mdate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,create_date_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,adate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,mdate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,mdate_ts); p += 8; > SOFF_T(p,0,file_size); p += 8; > SOFF_T(p,0,allocation_size); p += 8; > SIVAL(p,0,nt_extmode); p += 4; >@@ -1672,10 +1672,10 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx, > DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_FILE_FULL_DIRECTORY_INFO\n")); > p += 4; > SIVAL(p,0,reskey); p += 4; >- put_long_date_timespec(p,create_date_ts); p += 8; >- put_long_date_timespec(p,adate_ts); p += 8; >- put_long_date_timespec(p,mdate_ts); p += 8; >- put_long_date_timespec(p,mdate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,create_date_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,adate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,mdate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,mdate_ts); p += 8; > SOFF_T(p,0,file_size); p += 8; > SOFF_T(p,0,allocation_size); p += 8; > SIVAL(p,0,nt_extmode); p += 4; >@@ -1721,10 +1721,10 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx, > DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_ID_FULL_DIRECTORY_INFO\n")); > p += 4; > SIVAL(p,0,reskey); p += 4; >- put_long_date_timespec(p,create_date_ts); p += 8; >- put_long_date_timespec(p,adate_ts); p += 8; >- put_long_date_timespec(p,mdate_ts); p += 8; >- put_long_date_timespec(p,mdate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,create_date_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,adate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,mdate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,mdate_ts); p += 8; > SOFF_T(p,0,file_size); p += 8; > SOFF_T(p,0,allocation_size); p += 8; > SIVAL(p,0,nt_extmode); p += 4; >@@ -1754,10 +1754,10 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx, > was_8_3 = mangle_is_8_3(fname, True, conn->params); > p += 4; > SIVAL(p,0,reskey); p += 4; >- put_long_date_timespec(p,create_date_ts); p += 8; >- put_long_date_timespec(p,adate_ts); p += 8; >- put_long_date_timespec(p,mdate_ts); p += 8; >- put_long_date_timespec(p,mdate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,create_date_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,adate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,mdate_ts); p += 8; >+ put_long_date_timespec(conn->ts_res, p,mdate_ts); p += 8; > SOFF_T(p,0,file_size); p += 8; > SOFF_T(p,0,allocation_size); p += 8; > SIVAL(p,0,nt_extmode); p += 4; >@@ -3517,9 +3517,9 @@ static char *store_file_unix_basic(connection_struct *conn, > SOFF_T(pdata,0,get_allocation_size(conn,fsp,psbuf)); /* Number of bytes used on disk - 64 Bit */ > pdata += 8; > >- put_long_date_timespec(pdata,get_ctimespec(psbuf)); /* Change Time 64 Bit */ >- put_long_date_timespec(pdata+8,get_atimespec(psbuf)); /* Last access time 64 Bit */ >- put_long_date_timespec(pdata+16,get_mtimespec(psbuf)); /* Last modification time 64 Bit */ >+ put_long_date_timespec(TIMESTAMP_SET_NT_OR_BETTER, pdata,get_ctimespec(psbuf)); /* Change Time 64 Bit */ >+ put_long_date_timespec(TIMESTAMP_SET_NT_OR_BETTER, pdata+8,get_atimespec(psbuf)); /* Last access time 64 Bit */ >+ put_long_date_timespec(TIMESTAMP_SET_NT_OR_BETTER, pdata+16,get_mtimespec(psbuf)); /* Last modification time 64 Bit */ > pdata += 24; > > SIVAL(pdata,0,psbuf->st_uid); /* user id for the owner */ >@@ -3659,7 +3659,7 @@ static char *store_file_unix_basic_info2(connection_struct *conn, > pdata = store_file_unix_basic(conn, pdata, fsp, psbuf); > > /* Create (birth) time 64 bit */ >- put_long_date_timespec(pdata, get_create_timespec(psbuf, False)); >+ put_long_date_timespec(TIMESTAMP_SET_NT_OR_BETTER, pdata, get_create_timespec(psbuf, False)); > pdata += 8; > > map_info2_flags_from_sbuf(psbuf, &file_flags, &flags_mask); >@@ -4300,10 +4300,10 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd > data_size = 40; > SIVAL(pdata,36,0); > } >- put_long_date_timespec(pdata,create_time_ts); >- put_long_date_timespec(pdata+8,atime_ts); >- put_long_date_timespec(pdata+16,mtime_ts); /* write time */ >- put_long_date_timespec(pdata+24,mtime_ts); /* change time */ >+ put_long_date_timespec(conn->ts_res, pdata,create_time_ts); >+ put_long_date_timespec(conn->ts_res, pdata+8,atime_ts); >+ put_long_date_timespec(conn->ts_res, pdata+16,mtime_ts); /* write time */ >+ put_long_date_timespec(conn->ts_res, pdata+24,mtime_ts); /* change time */ > SIVAL(pdata,32,mode); > > DEBUG(5,("SMB_QFBI - ")); >@@ -4390,10 +4390,10 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd > { > unsigned int ea_size = estimate_ea_size(conn, fsp, fname); > DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ALL_INFORMATION\n")); >- put_long_date_timespec(pdata,create_time_ts); >- put_long_date_timespec(pdata+8,atime_ts); >- put_long_date_timespec(pdata+16,mtime_ts); /* write time */ >- put_long_date_timespec(pdata+24,mtime_ts); /* change time */ >+ put_long_date_timespec(conn->ts_res, pdata,create_time_ts); >+ put_long_date_timespec(conn->ts_res, pdata+8,atime_ts); >+ put_long_date_timespec(conn->ts_res, pdata+16,mtime_ts); /* write time */ >+ put_long_date_timespec(conn->ts_res, pdata+24,mtime_ts); /* change time */ > SIVAL(pdata,32,mode); > SIVAL(pdata,36,0); /* padding. */ > pdata += 40; >@@ -4528,10 +4528,10 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd > > case SMB_FILE_NETWORK_OPEN_INFORMATION: > DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_NETWORK_OPEN_INFORMATION\n")); >- put_long_date_timespec(pdata,create_time_ts); >- put_long_date_timespec(pdata+8,atime_ts); >- put_long_date_timespec(pdata+16,mtime_ts); /* write time */ >- put_long_date_timespec(pdata+24,mtime_ts); /* change time */ >+ put_long_date_timespec(conn->ts_res, pdata,create_time_ts); >+ put_long_date_timespec(conn->ts_res, pdata+8,atime_ts); >+ put_long_date_timespec(conn->ts_res, pdata+16,mtime_ts); /* write time */ >+ put_long_date_timespec(conn->ts_res, pdata+24,mtime_ts); /* change time */ > SOFF_T(pdata,32,allocation_size); > SOFF_T(pdata,40,file_size); > SIVAL(pdata,48,mode); >@@ -4885,6 +4885,7 @@ NTSTATUS smb_set_file_time(connection_struct *conn, > struct timespec ts[2], > bool setting_write_time) > { >+ struct timespec ts_stat[2]; > uint32 action = > FILE_NOTIFY_CHANGE_LAST_ACCESS > |FILE_NOTIFY_CHANGE_LAST_WRITE; >@@ -4909,22 +4910,12 @@ NTSTATUS smb_set_file_time(connection_struct *conn, > action &= ~FILE_NOTIFY_CHANGE_LAST_WRITE; > } > >+ round_timespec(conn->ts_res, &ts[0]); >+ round_timespec(conn->ts_res, &ts[1]); >+ > DEBUG(6,("smb_set_file_time: actime: %s " , time_to_asc(convert_timespec_to_time_t(ts[0])) )); > DEBUG(6,("smb_set_file_time: modtime: %s ", time_to_asc(convert_timespec_to_time_t(ts[1])) )); > >- /* >- * Try and set the times of this file if >- * they are different from the current values. >- */ >- >- { >- struct timespec mts = get_mtimespec(psbuf); >- struct timespec ats = get_atimespec(psbuf); >- if ((timespec_compare(&ts[0], &ats) == 0) && (timespec_compare(&ts[1], &mts) == 0)) { >- return NT_STATUS_OK; >- } >- } >- > if (setting_write_time) { > /* > * This was a Windows setfileinfo on an open file. >@@ -4952,15 +4943,24 @@ NTSTATUS smb_set_file_time(connection_struct *conn, > } > } > >- DEBUG(10,("smb_set_file_time: setting utimes to modified values.\n")); >+ ts_stat[0] = get_atimespec(psbuf); >+ ts_stat[1] = get_mtimespec(psbuf); >+ >+ round_timespec(conn->ts_res, &ts_stat[0]); >+ round_timespec(conn->ts_res, &ts_stat[1]); > > if (fsp && fsp->base_fsp) { > fname = fsp->base_fsp->fsp_name; > } > >- if(file_ntimes(conn, fname, ts)!=0) { >- return map_nt_error_from_unix(errno); >+ if (timespec_compare(&ts_stat[0], &ts[0]) || >+ timespec_compare(&ts_stat[1], &ts[1])) { >+ DEBUG(10,("smb_set_file_time: setting utimes to modified values.\n")); >+ if(file_ntimes(conn, fname, ts)!=0) { >+ return map_nt_error_from_unix(errno); >+ } > } >+ > notify_fname(conn, NOTIFY_ACTION_MODIFIED, action, fname); > > return NT_STATUS_OK; >-- >1.6.0.4 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=4698">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 6529
:
4390
|
4587
|
4588
|
4589
|
4590
|
4591
|
4592
|
4593
|
4594
|
4651
|
4652
|
4669
|
4670
|
4684
|
4685
|
4692
|
4697
| 4698