From 53085501a59ebc1e1088afc752a2c31a99257d7d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 30 Mar 2010 18:08:05 -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 e6d2b0a..bc88885 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -5009,6 +5009,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; + } + if (fsp) { if (fsp->base_fsp) { fname = fsp->base_fsp->fsp_name; -- 1.6.3.3