The branch, v3-5-test has been updated
via 2bdf504 Fix bug #8507 - smbd doesn't correctly honor the "force
create mode" bits from a cifsfs create.
from abf0629 Second part of fix for bug #8443 - Default user entry is
set to minimal permissions on incoming ACL change with no user specified.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit 2bdf5042dd14283ae195d442d20385ed158367ae
Author: Jeremy Allison <[email protected]>
Date: Tue Oct 4 16:40:58 2011 -0700
Fix bug #8507 - smbd doesn't correctly honor the "force create mode" bits
from a cifsfs create.
Don't manipulate the new_dos_attributes bits until we know it's not a POSIX
open.
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/open.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 9048d6b..70e6b4f 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1344,12 +1344,6 @@ static NTSTATUS open_file_ntcreate(connection_struct
*conn,
ZERO_STRUCT(id);
- /* Windows allows a new file to be created and
- silently removes a FILE_ATTRIBUTE_DIRECTORY
- sent by the client. Do the same. */
-
- new_dos_attributes &= ~FILE_ATTRIBUTE_DIRECTORY;
-
if (conn->printer) {
/*
* Printers are handled completely differently.
@@ -1383,6 +1377,12 @@ static NTSTATUS open_file_ntcreate(connection_struct
*conn,
unx_mode = (mode_t)(new_dos_attributes &
~FILE_FLAG_POSIX_SEMANTICS);
new_dos_attributes = 0;
} else {
+ /* Windows allows a new file to be created and
+ silently removes a FILE_ATTRIBUTE_DIRECTORY
+ sent by the client. Do the same. */
+
+ new_dos_attributes &= ~FILE_ATTRIBUTE_DIRECTORY;
+
/* We add aARCH to this as this mode is only used if the file is
* created new. */
unx_mode = unix_mode(conn, new_dos_attributes | aARCH,
--
Samba Shared Repository
