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

vfs: xattr calls give EBADF for sockets

Browse Source 
This is required for make test with disabled O_PATH

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2024-07-08 19:37:01 +02:00 committed by Jeremy Allison
parent e450ff685b
commit e76b7578db
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/modules/vfs_fake_acls.c
View File

@ -47,7 +47,7 @@ static int fake_acls_fuid(vfs_handle_struct *handle,
uint8_t uid_buf[4]; uint8_t uid_buf[4];
size = SMB_VFS_NEXT_FGETXATTR(handle, fsp, FAKE_UID, uid_buf, sizeof(uid_buf)); size = SMB_VFS_NEXT_FGETXATTR(handle, fsp, FAKE_UID, uid_buf, sizeof(uid_buf));
if (size == -1 && errno == ENOATTR) { if (size == -1 && ((errno == ENOATTR) || (errno == EBADF))) {
return 0; return 0;
} }
if (size != 4) { if (size != 4) {
@ -65,7 +65,7 @@ static int fake_acls_fgid(vfs_handle_struct *handle,
uint8_t gid_buf[4]; uint8_t gid_buf[4];
size = SMB_VFS_NEXT_FGETXATTR(handle, fsp, FAKE_GID, gid_buf, sizeof(gid_buf)); size = SMB_VFS_NEXT_FGETXATTR(handle, fsp, FAKE_GID, gid_buf, sizeof(gid_buf));
if (size == -1 && errno == ENOATTR) { if (size == -1 && ((errno == ENOATTR) || (errno == EBADF))) {
return 0; return 0;
} }
if (size != 4) { if (size != 4) {
@ -335,7 +335,7 @@ static SMB_ACL_T fake_acls_sys_acl_get_fd(struct vfs_handle_struct *handle,
length = SMB_VFS_NEXT_FGETXATTR(handle, fsp, name, blob.data, blob.length); length = SMB_VFS_NEXT_FGETXATTR(handle, fsp, name, blob.data, blob.length);
blob.length = length; blob.length = length;
} while (length == -1 && errno == ERANGE); } while (length == -1 && errno == ERANGE);
if (length == -1 && errno == ENOATTR) { if (length == -1 && ((errno == ENOATTR) || (errno == EBADF))) {
TALLOC_FREE(frame); TALLOC_FREE(frame);
return NULL; return NULL;
} }
@ -391,7 +391,7 @@ static int fake_acls_sys_acl_delete_def_fd(vfs_handle_struct *handle,
} }
ret = SMB_VFS_NEXT_FREMOVEXATTR(handle, fsp, name); ret = SMB_VFS_NEXT_FREMOVEXATTR(handle, fsp, name);
if (ret == -1 && errno == ENOATTR) { if (ret == -1 && ((errno == ENOATTR) || (errno == EBADF))) {
ret = 0; ret = 0;
errno = 0; errno = 0;
} }
@ -628,7 +628,7 @@ static int fake_acls_fchmod(vfs_handle_struct *handle,
talloc_tos()); talloc_tos());
if (the_acl == NULL) { if (the_acl == NULL) {
TALLOC_FREE(frame); TALLOC_FREE(frame);
if (errno == ENOATTR) { if (((errno == ENOATTR) || (errno == EBADF))) {
/* No ACL on this file. Just passthrough. */ /* No ACL on this file. Just passthrough. */
return 0; return 0;
} }