sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

s3: lib: In ad_read_meta(), allow use of SMB_VFS_FGETXATTR() as well as SMB_VFS_GETXATTR().

Browse Source 
Eventually we will guarantee a valid smb_fname->fsp here and
will remove SMB_VFS_GETXATTR().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2021-07-02 13:35:37 -07:00
parent 6a366012aa
commit 53e0494958
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source3/lib/adouble.c
View File

@ -2037,12 +2037,27 @@ static ssize_t ad_read_meta(vfs_handle_struct *handle,
int rc = 0;
ssize_t ealen;
bool ok;
struct files_struct *fsp = smb_fname->fsp;
DEBUG(10, ("reading meta xattr for %s\n", smb_fname->base_name));
ealen = SMB_VFS_GETXATTR(handle->conn, smb_fname,
AFPINFO_EA_NETATALK, ad->ad_data,
AD_DATASZ_XATTR);
if (fsp != NULL && fsp->base_fsp != NULL) {
fsp = fsp->base_fsp;
}
if (fsp != NULL) {
ealen = SMB_VFS_FGETXATTR(fsp,
AFPINFO_EA_NETATALK,
ad->ad_data,
AD_DATASZ_XATTR);
} else {
ealen = SMB_VFS_GETXATTR(handle->conn,
smb_fname,
AFPINFO_EA_NETATALK,
ad->ad_data,
AD_DATASZ_XATTR);
}
if (ealen == -1) {
switch (errno) {
case ENOATTR:
@ -2096,9 +2111,9 @@ exit:
if (rc != 0) {
ealen = -1;
if (errno == EINVAL) {
if (smb_fname->fsp != NULL) {
if (fsp != NULL) {
become_root();
(void)SMB_VFS_FREMOVEXATTR(smb_fname->fsp,
(void)SMB_VFS_FREMOVEXATTR(fsp,
AFPINFO_EA_NETATALK);
unbecome_root();
}