diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-12-17 18:30:44 +0000 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2006-12-17 18:30:44 +0000 |
| commit | 7af40262e15a88dd90d55230f2e8b71dca43b1ea (patch) | |
| tree | 851a6cfc092c4c9cb4703caa630ed9b60762f8e5 /source/smbd/open.c | |
| parent | a61a75bf6192ede613f7e95496ffe4162b9f41f1 (diff) | |
| download | samba-7af40262e15a88dd90d55230f2e8b71dca43b1ea.tar.gz samba-7af40262e15a88dd90d55230f2e8b71dca43b1ea.tar.xz samba-7af40262e15a88dd90d55230f2e8b71dca43b1ea.zip | |
r20228: Bring the calling conventions of inherit_access_acl and change_owner_to_parent
a bit closer together: Move the lp_inherit_perms() check into the callers.
Volker
Diffstat (limited to 'source/smbd/open.c')
| -rw-r--r-- | source/smbd/open.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/smbd/open.c b/source/smbd/open.c index 3d5dd849b69..d9166097694 100644 --- a/source/smbd/open.c +++ b/source/smbd/open.c @@ -283,7 +283,9 @@ static NTSTATUS open_file(files_struct *fsp, } /* Inherit the ACL if the file was created. */ - if ((local_flags & O_CREAT) && !file_existed) { + if ((local_flags & O_CREAT) + && !file_existed + && lp_inherit_perms(SNUM(conn))) { inherit_access_acl(conn, fname, unx_mode); } |