diff options
| author | Jeremy Allison <jra@samba.org> | 2009-08-24 20:57:37 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-08-24 20:57:37 -0700 |
| commit | c69f92d16d57c2387d31b5dfd01aab0685a671d0 (patch) | |
| tree | 4eef7104df67108cde2fd436a28c51176473f5e5 /source3/smbd/service.c | |
| parent | 9a86f26a5f0b421f8cf259e579fe5946b39623f6 (diff) | |
| download | samba-c69f92d16d57c2387d31b5dfd01aab0685a671d0.tar.gz samba-c69f92d16d57c2387d31b5dfd01aab0685a671d0.tar.bz2 samba-c69f92d16d57c2387d31b5dfd01aab0685a671d0.zip | |
Second attempt at fix for bug 6529 - Offline files conflict with Vista and Office 2003.
Confirmation from reporter that this fixes the issue in master on ext3/ext4.
Back-ports to follow.
Jeremy.
Diffstat (limited to 'source3/smbd/service.c')
| -rw-r--r-- | source3/smbd/service.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 36b783ee78..3520f0d411 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -1015,23 +1015,6 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn, goto err_root_exit; } - if (smb_fname_cpath->st.st_ex_mtime.tv_nsec || - smb_fname_cpath->st.st_ex_atime.tv_nsec || - smb_fname_cpath->st.st_ex_ctime.tv_nsec) { - /* If any of the normal UNIX directory timestamps - * have a non-zero tv_nsec component assume - * we can fully store hires timestamps. We need - * to make a runtime/share level distinction - * as on Linux ext3 doesn't have hires timestamps, but - * ext4 does, so a compile time test won't work. JRA. - */ - DEBUG(10,("make_connection_snum: hires timestamps " - "available on share %s, directory %s\n", - lp_servicename(snum), - conn->connectpath )); - conn->hires_timestamps_avail = true; - } - string_set(&conn->origpath,conn->connectpath); #if SOFTLINK_OPTIMISATION @@ -1056,7 +1039,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn, * the same characteristics, which is likely but not guaranteed. */ - conn->fs_capabilities = SMB_VFS_FS_CAPABILITIES(conn); + conn->fs_capabilities = SMB_VFS_FS_CAPABILITIES(conn, &conn->ts_res); /* * Print out the 'connected as' stuff here as we need |