The branch, v3-5-test has been updated
via 779c205... Fix bug 7310 - DOS attribute inconsistency with MS Office
from 06d1aeb... s3:registry: eliminate race condition in
creating/scanning sorted subkeys
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit 779c2052b3b13c8f1a793e59e6152c3704eb75c6
Author: Jeremy Allison <[email protected]>
Date: Tue Mar 30 22:16:37 2010 -0700
Fix bug 7310 - DOS attribute inconsistency with MS Office
On rename we need to set the archive bit on the renamed file.
Jeremy
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/reply.c | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 8d40ed6..c9c80e8 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -5846,6 +5846,21 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
"%s -> %s\n", smb_fname_str_dbg(fsp->fsp_name),
smb_fname_str_dbg(smb_fname_dst)));
+ if (lp_map_archive(SNUM(conn)) ||
+ lp_store_dos_attributes(SNUM(conn))) {
+ /* We must set the archive bit on the newly
+ renamed file. */
+ if (SMB_VFS_STAT(conn, smb_fname_dst) == 0) {
+ uint32_t old_dosmode = dos_mode(conn,
+ smb_fname_dst);
+ file_set_dosmode(conn,
+ smb_fname_dst,
+ old_dosmode | FILE_ATTRIBUTE_ARCHIVE,
+ NULL,
+ true);
+ }
+ }
+
notify_rename(conn, fsp->is_directory, fsp->fsp_name,
smb_fname_dst);
--
Samba Shared Repository
