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: fake_acls: In fake_acls_stat() - Now we always have a valid fsp, remove the calls to the path-based functions.

Browse Source 
Comment out fake_acls_uid()/fake_acls_gid(), they are no longer used.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2021-06-23 10:48:49 -07:00 committed by Ralph Boehme
parent 243bce4158
commit 2e51807838
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source3/modules/vfs_fake_acls.c
View File

@ -35,6 +35,7 @@
#define FAKE_ACL_ACCESS_XATTR "system.fake_access_acl"
#define FAKE_ACL_DEFAULT_XATTR "system.fake_default_acl"
#if 0
static int fake_acls_uid(vfs_handle_struct *handle,
struct smb_filename *smb_fname,
uid_t *uid)
@ -71,6 +72,7 @@ static int fake_acls_gid(vfs_handle_struct *handle,
*gid = IVAL(gid_buf, 0);
return 0;
}
#endif
static int fake_acls_fuid(vfs_handle_struct *handle,
files_struct *fsp,
@ -185,26 +187,16 @@ static int fake_acls_stat(vfs_handle_struct *handle,
fsp = smb_fname_cp->fsp;
}
if (fsp != NULL) {
ret = fake_acls_fuid(handle,
fsp,
&smb_fname->st.st_ex_uid);
} else {
ret = fake_acls_uid(handle, smb_fname_cp,
&smb_fname->st.st_ex_uid);
}
ret = fake_acls_fuid(handle,
fsp,
&smb_fname->st.st_ex_uid);
if (ret != 0) {
TALLOC_FREE(smb_fname_cp);
return ret;
}
if (fsp != NULL) {
ret = fake_acls_fgid(handle,
fsp,
&smb_fname->st.st_ex_gid);
} else {
ret = fake_acls_gid(handle, smb_fname_cp,
&smb_fname->st.st_ex_gid);
}
ret = fake_acls_fgid(handle,
fsp,
&smb_fname->st.st_ex_gid);
if (ret != 0) {
TALLOC_FREE(smb_fname_cp);
return ret;