summaryrefslogtreecommitdiff
path: root/source3/smbd/open.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-10-23 01:22:32 +0000
committerJeremy Allison <jra@samba.org>2002-10-23 01:22:32 +0000
commitf735551b9edef66b152261cf6eb2f29b7b69d65b (patch)
tree056d6b95538571bb4932c658f2b08a4e491d0d2b /source3/smbd/open.c
parent83219da3028a0341a9c7b2db38738ca30288686b (diff)
downloadsamba-f735551b9edef66b152261cf6eb2f29b7b69d65b.tar.gz
samba-f735551b9edef66b152261cf6eb2f29b7b69d65b.tar.bz2
samba-f735551b9edef66b152261cf6eb2f29b7b69d65b.zip
First cut of new ACL mapping code from Andreas Gruenbacher <agruen@suse.de>.
This is not 100% the same as what SuSE shipped in their Samba, there is a crash bug fix, a race condition fix, and a few logic changes I'd like to discuss with Andreas. Added Andreas to (C) notices for posix_acls.c Jeremy. (This used to be commit 40eafb9dde113af9f7f1808fda22908953f7e8c3)
Diffstat (limited to 'source3/smbd/open.c')
-rw-r--r--source3/smbd/open.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index a95793a050..417a9dd039 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -165,9 +165,13 @@ static BOOL open_file(files_struct *fsp,connection_struct *conn,
local_flags |= O_NONBLOCK;
#endif
- /* actually do the open */
+ /* Actually do the open */
fsp->fd = fd_open(conn, fname, local_flags, mode);
+ /* Inherit the ACL if the file was created. */
+ if ((local_flags & O_CREAT) && !VALID_STAT(*psbuf))
+ inherit_access_acl(conn, fname, mode);
+
if (fsp->fd == -1) {
DEBUG(3,("Error opening file %s (%s) (local_flags=%d) (flags=%d)\n",
fname,strerror(errno),local_flags,flags));