From 322c31443e26bae63c533d17cccad9562c4bbc9f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 30 Mar 2010 17:44:41 -0700 Subject: [PATCH] Fix bug 7310 - DOS attribute inconsistency with MS Office SET_BASIC_INFO was allowing a FILE_ATTRIBUTE_NORMAL to overwrite a FILE_ATTRIBUTE_ARCHIVE set. Simple fix - more complete file will go into master. Jeremy. --- source3/smbd/trans2.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 5620a2f..78298c7 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -5483,6 +5483,10 @@ static NTSTATUS smb_set_file_dosmode(connection_struct *conn, return NT_STATUS_OBJECT_NAME_NOT_FOUND; } + if (dosmode == FILE_ATTRIBUTE_NORMAL) { + return NT_STATUS_OK; + } + /* Always operate on the base_name, even if a stream was passed in. */ status = create_synthetic_smb_fname(talloc_tos(), smb_fname->base_name, NULL, &smb_fname->st, -- 1.6.3.3