The branch, master has been updated
via 7114150f437 vfs_aixacl: fix regression from
f4c2f867f035fcbe3d547d5635d058b0aec7636a
from e06f86bbd93 smbd: use fsp->conn->session_info for the initial
delete-on-close token
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7114150f43751ab869323b91da83705b1e1ab465
Author: Ralph Boehme <s...@samba.org>
Date: Tue Jan 26 10:55:42 2021 +0100
vfs_aixacl: fix regression from f4c2f867f035fcbe3d547d5635d058b0aec7636a
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14620
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Björn Jacke <bja...@samba.org>
Autobuild-User(master): Ralph Böhme <s...@samba.org>
Autobuild-Date(master): Tue Jan 26 20:05:39 UTC 2021 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_aixacl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_aixacl.c b/source3/modules/vfs_aixacl.c
index f7493794a45..d266f446008 100644
--- a/source3/modules/vfs_aixacl.c
+++ b/source3/modules/vfs_aixacl.c
@@ -149,9 +149,9 @@ int aixacl_sys_acl_set_fd(vfs_handle_struct *handle,
/*
* This is no longer a handle based call.
*/
- return = chacl(fsp->fsp_name->base_name,
- file_acl,
- file_acl->acl_len);
+ return chacl(fsp->fsp_name->base_name,
+ file_acl,
+ file_acl->acl_len);
}
rc = fchacl(fsp_get_io_fd(fsp),file_acl,file_acl->acl_len);
--
Samba Shared Repository
