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 | |
| 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
| -rw-r--r-- | source/smbd/open.c | 4 | ||||
| -rw-r--r-- | source/smbd/posix_acls.c | 6 | ||||
| -rw-r--r-- | source/smbd/trans2.c | 5 | ||||
| -rw-r--r-- | source/smbd/vfs.c | 4 |
4 files changed, 13 insertions, 6 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); } diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c index f17594c0796..75605ace8a6 100644 --- a/source/smbd/posix_acls.c +++ b/source/smbd/posix_acls.c @@ -3457,8 +3457,8 @@ int chmod_acl(connection_struct *conn, const char *name, mode_t mode) } /**************************************************************************** - If "inherit permissions" is set and the parent directory has no default - ACL but it does have an Access ACL, inherit this Access ACL to file name. + If the parent directory has no default ACL but it does have an Access ACL, + inherit this Access ACL to file name. ****************************************************************************/ int inherit_access_acl(connection_struct *conn, const char *name, mode_t mode) @@ -3466,7 +3466,7 @@ int inherit_access_acl(connection_struct *conn, const char *name, mode_t mode) pstring dirname; pstrcpy(dirname, parent_dirname(name)); - if (!lp_inherit_perms(SNUM(conn)) || directory_has_default_acl(conn, dirname)) + if (directory_has_default_acl(conn, dirname)) return 0; return copy_access_acl(conn, dirname, name, mode); diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c index 2f4bcb414fd..d15ca6d3274 100644 --- a/source/smbd/trans2.c +++ b/source/smbd/trans2.c @@ -4307,7 +4307,10 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n", if (SMB_VFS_MKNOD(conn,fname, unixmode, dev) != 0) return(UNIXERROR(ERRDOS,ERRnoaccess)); - inherit_access_acl(conn, fname, unixmode); + if (lp_inherit_perms(SNUM(conn))) { + inherit_access_acl(conn, fname, + unixmode); + } SSVAL(params,0,0); send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes); diff --git a/source/smbd/vfs.c b/source/smbd/vfs.c index ab9ddef9fff..b6a7d477bd9 100644 --- a/source/smbd/vfs.c +++ b/source/smbd/vfs.c @@ -319,7 +319,9 @@ int vfs_MkDir(connection_struct *conn, const char *name, mode_t mode) return ret; } - inherit_access_acl(conn, name, mode); + if (lp_inherit_perms(SNUM(conn))) { + inherit_access_acl(conn, name, mode); + } /* * Check if high bits should have been set, |