sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3: vfs: vfs_solarisacl. refuse_symlink() means we can always use STAT here.

Browse Source 
For a posix acl call on a symlink, we've already refused it.
For a Windows acl mapped call on a symlink, we want to follow
it.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>
This commit is contained in:
Jeremy Allison 2016-03-11 16:01:31 -08:00 committed by Uri Simchoni
parent f690c1cfc8
commit b10d3c6440
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source3/modules/vfs_solarisacl.c
View File

@ -139,10 +139,12 @@ int solarisacl_sys_acl_set_file(vfs_handle_struct *handle,
SMB_ACL_T theacl)
{
int ret = -1;
struct stat_ex s;
SOLARIS_ACL_T solaris_acl = NULL;
int count;
struct smb_filename smb_fname = {
.base_name = discard_const_p(char, name)
};
DEBUG(10, ("solarisacl_sys_acl_set_file called for file '%s'\n",
name));
@ -166,12 +168,18 @@ int solarisacl_sys_acl_set_file(vfs_handle_struct *handle,
* the default acl as provided, we have to get the acl part
* that has not been specified in "type" from the file first
* and concatenate it with the acl provided.
*
* We can directly use SMB_VFS_STAT here, as if this was a
* POSIX call on a symlink, we've already refused it.
* For a Windows acl mapped call on a symlink, we want to follow
* it.
*/
if (vfs_stat_smb_basename(handle->conn, name, &s) != 0) {
ret = SMB_VFS_STAT(conn, &smb_fname);
if (ret != 0) {
DEBUG(10, ("Error in stat call: %s\n", strerror(errno)));
goto done;
}
if (S_ISDIR(s.st_ex_mode)) {
if (S_ISDIR(smb_fname.st.st_ex_mode)) {
SOLARIS_ACL_T other_acl = NULL;
int other_count;
SMB_ACL_TYPE_T other_type;