[SCM] Samba Shared Repository - branch master updated
Ralph Böhme
slow at samba.org
Wed Jun 9 14:05:02 UTC 2021
The branch, master has been updated
via 96ef845430f s3: VFS: solarisacl: Remove solarisacl_sys_acl_set_file().
via fcca720e60f s3: VFS: aixacl: Remove aixacl_sys_acl_set_file().
via 2f4c5b9b1ad s3: VFS: posixacl: Remove posixacl_sys_acl_set_file().
via f0c22f74156 s3: lib: sysacls: Remove all implementations of sys_acl_set_file().
via 30318562117 s3: VFS: default: Remove the sys_proc_fd_path() fallback code in vfswrap_sys_acl_set_fd().
via 4266b6a7fbd s3: VFS: hpuxacl: Fix the funtion signature for hpuxacl_sys_acl_set_fd()
via ac77b2c6f80 s3: lib: sysacls: Add the 'SMB_ACL_TYPE_T type' parameter to sys_acl_set_fd().
via d5e3dcc8a5c s3: VFS: non_posix_acls: Remove non_posix_sys_acl_blob_get_file_helper(). No longer used.
via bfe2d8f54c2 s3: VFS: posixacl: Remove posixacl_sys_acl_get_file().
via 8ed07fa8d2d s3: lib: sysacls: Remove sys_acl_get_file(). No longer used.
via 386f75f3ec0 s3: VFS: Update status of SMB_VFS_SYS_ACL_BLOB_GET_FILE
via 71b278d1626 s3: VFS: RIP SMB_VFS_SYS_ACL_BLOB_GET_FILE()
via c8f468d29d8 s3: VFS: posixacl: Remove call to posix_sys_acl_blob_get_file().
via 5bd95225109 s3: VFS: Remove zfsacl_fail__sys_acl_blob_get_file().
via ed988917c90 s3: VFS: Remove call to posix_sys_acl_blob_get_file().
via 24382af0b17 s3: VFS: nfs4acl_xattr: Remove call to nfs4acl_xattr_fail__sys_acl_blob_get_file().
via e716563700a s3: VFS: hpuxacl: Remove call to posix_sys_acl_blob_get_file().
via 6a0d127437d s3: VFS: gpfs: Remove gpfsacl_sys_acl_blob_get_file().
via eff0afa61e5 s3: VFS: glusterfs: Remove call to posix_sys_acl_blob_get_file().
via eeb2a3ce8ff s3: VFS: fake_acls: Remove call to posix_sys_acl_blob_get_file().
via 6605b05e23c s3: VFS: ceph: Remove call to posix_sys_acl_blob_get_file().
via 07fe1afb97e s3: VFS: aixaxcl2: Remove aixjfs2_sys_acl_blob_get_file().
via b75e459bdf7 s3: VFS: aixacl: Remove call to posix_sys_acl_blob_get_file().
via 0ecc56cb2ea s3: VFS: afsacl: Remove afsacl_sys_acl_blob_get_file().
via d427df221ea s3: VFS: Update status of SMB_VFS_SYS_ACL_GET_FILE
via bb038f2b897 s3: VFS: RIP SMB_VFS_SYS_ACL_GET_FILE()
via b828784caed s3: VFS: posixacl: Remove call to posixacl_sys_acl_get_file().
via 99650debdc3 s3: VFS: zfsacl: Remove zfsacl_fail__sys_acl_get_file().
via 8a6e84287e2 s3: VFS: unityed_media: Remove um_sys_acl_get_file().
via d24b6c7a213 s3: VFS: solarisacl: Make solarisacl_sys_acl_get_file() static. Still called internally.
via 155a660e2c5 s3: VFS: nfs4acl_xattr: Remove nfs4acl_xattr_fail__sys_acl_get_file().
via c0d70d4daf1 s3: VFS: media_harmony: Remove mh_sys_acl_get_file().
via a1298c3f7c3 s3: VFS: hpuxacl: Make hpuxacl_sys_acl_get_file() static.
via a46e9aaadcb s3: VFS: gpfs: Remove gpfsacl_sys_acl_get_file().
via a5b7ccb1b14 s3: VFS: glusterfs: Remove call to posixacl_xattr_acl_get_file().
via 316235ef0fb s3: VFS: fake_acls: Remove fake_acls_sys_acl_get_file().
via 4ba0d4bebe5 s3: VFS: ceph: Remove call to posixacl_xattr_acl_get_file().
via 71bcd205c45 s3: VFS: catia: Remove catia_sys_acl_get_file().
via 7d6b47f0e5d s3: VFS: cap: Remove cap_sys_acl_get_file().
via c0694d44ae6 s3: VFS: aixacl2: Remove aixjfs2_sys_acl_get_file().
via 7eb206517fa s3: VFS: aixacl: Remove aixacl_sys_acl_get_file().
via ccef64dab78 s3: smbd: Remove posix_get_nt_acl().No longer used.
via b0842364d63 s3: VFS: Update status of SMB_VFS_NT_ACL_AT.
via 3cbf0acc0db vfs: RIP SMB_VFS_GET_NT_ACL_AT()
via 737c68146d1 s3: VFS: acl_common: Remove the dirfsp parameter from validate_nt_acl_blob().
via a28a686714e s3: VFS: acl_common: Remove the pathname-based calls in validate_nt_acl_blob().
via 613fed318c8 s3: VFS: acl_common: Remove get_nt_acl_common_at().
via 7d2a2d5f067 s3: VFS: zfsacl: Remove zfsacl_get_nt_acl_at().
via e24e5ec70cc s3: VFS: snapper: Remove snapper_gmt_get_nt_acl_at().
via 7994c0c283f s3: VFS: nfs4acl_xattr: Remove nfs4acl_xattr_get_nt_acl_at().
via 72cf25f62ad s3: VFS: media_harmony. Remove mh_get_nt_acl_at().
via 058ac279a67 s3: VFS: gpfs. Remove gpfsacl_get_nt_acl_at().
via e96b2deef45 s3: VFS: ceph_snapshots. Remove ceph_snap_gmt_get_nt_acl_at().
via ccc9613eba5 s3: VFS: catia. Remove catia_get_nt_acl_at().
via 45341cee017 s3: VFS: acl_xattr: Remove unused get_acl_blob_at().
via fd8a2cfd4e1 s3: VFS: acl_xattr: Remove acl_xattr_get_nt_acl_at().
via 403cf571e48 s3: VFS: acl_tdb: Remove unused get_acl_blob_at().
via aab4970be84 s3: VFS: acl_tdb. Remove acl_tdb_get_nt_acl_at().
via d677cee9724 s3: VFS: aixacl2: Remove aixjfs2_get_nt_acl_at().
via 2cff96d9bdb s3: VFS: afsacl: Remove afsacl_get_nt_acl_at().
via 7da81bfbe57 s3: VFS: shadow_copy2: Remove shadow_copy2_get_nt_acl_at().
via ca5d2c35bc2 s3 VFS: glusterfs: Remove get_nt_acl_at_fn().
via 6ef5ed23097 s3: smbd: open_directory(). Pass down the real parent_dir->fsp to smbd_check_access_rights_fsp().
via 63fb55cd6c6 s3: smbd: open_file(). Pass down the real parent_dir->fsp to smbd_check_access_rights_fsp().
via 699356a245e s3: smbd: smbd_check_access_rights_fsp(). Add dirfsp parameter.
via 88881510c74 s3: smbd: smbd_check_access_rights_sd(). Add dirfsp parameter.
via 3b1d2ddc79c s3: smbd: parent_override_delete(). Add dirfsp parameter.
via 7d4f4c83263 s3: smbd: open_directory(). Start passing a real parent dirfsp to smbd_calculate_access_mask_fsp().
via eea3a3c1565 s3: smbd: open_file_ntcreate(). Start passing a real parent dirfsp to smbd_calculate_access_mask_fsp().
via 492d105b442 s3: smbd: smbd_calculate_access_mask_fsp(). Add dirfsp parameter.
via 6503bb48ca3 s3: smbd: smbd_calculate_maximum_allowed_access_fsp(), add parent dirfsp parameter and pass to can_delete_file_in_directory().
via eaff826aed3 s3: smbd: Remove smbd_check_access_rights(). No longer used.
via dd7c489cd38 s3: smbd: can_delete_file_in_directory(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().
via 120ce4f56f5 s3: smbd: can_delete_file_in_directory(), we no longer need to do the SMB_VFS_STAT() call.
via 5e268266f8f s3: smbd: In can_delete_file_in_directory(), get a real parent pathref.
via e370c082694 s3: smbd: In can_delete_file_in_directory(), remove the assertion that dirfsp == conn->cwd_fsp.
via 7e4a9a1e5f1 s3: smbd: In can_delete_file_in_directory(), move a fast-path exit to before any pathname manipulation.
via 1e90d91b033 s3: smbd: Remove smbd_calculate_maximum_allowed_access(). No longer used.
via f700460c070 s3: smbd: Remove smbd_calculate_access_mask(). No longer used.
via 99ed7693633 s3: smbd: open_fake_file(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp().
via 1146fb3826c s3: smbd: open_fake_file(). Move the smbd_calculate_access_mask() check until after we've initialized the file handle.
via 18d9282c1e0 s3: smbd: open_directory(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp().
via 5abb0409ff4 s3: smbd: open_file_ntcreate(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp().
via 3293cc8d75b s3: VFS: fruit: fruit_freaddir_attr(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp().
via 7c80e0856a7 s3: smbd: smbd_smb2_create_after_exec(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp().
via 07a81f6982b s3: smbd: Change check_base_file_access() to take an fsp as the first argument.
via 03352e981b9 s3: smbd: Add smbd_calculate_access_mask_fsp().
via 2c32cb18fc9 s3: smbd: Add new smbd_calculate_access_mask_fsp() function.
via 845aaadccdb s3: smbd: open_directory(). Cleanup debug message to refer to correct function.
via bed09bc2d66 s3: smbd: open_file(). Cleanup debug message to refer to correct function.
via b8d43466e1f s3: smbd: open_file(). Cleanup debug message to refer to correct function.
via 3f61369d153 s3: smbd: open_file(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().
via af291abefa7 s3: smbd: open_directory(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().
via 11910757c68 s3: smbd: check_base_file_access(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().
via 26dc10bdb2c s3: smbd: open_file(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().
via e5c9cfb0429 s3: smbd: In notify, user_can_stat_name_under_fsp(), smbd_check_access_rights -> smbd_check_access_rights_fsp
via ff8a41a1c59 s3: VFS: ceph_snapshots: In ceph_snap_gmt_convert_dir(), re-use the directory handle for checking SEC_DIR_LIST permission.
via 4d0bda46cee s3: VFS: ceph_snapshots: In ceph_snap_enum_snapdir(), re-use the directory handle for checking SEC_DIR_LIST permission.
via b3d54e20da4 s3: VFS: vfs_shadow_copy2: Remove check_access_snapdir().
via 342a0c92c98 s3: VFS: shadow_copy2: In shadow_copy2_get_shadow_copy_data(), check for DIR_LIST access once we already have a handle on the snap directory.
via b56fc4b0d8e s3: smbd: Remove can_write_to_file(). Pathname call no longer used.
via 0c8f928198c s3: smbd: Remove user_can_write_file().
via b5e12fed54f s3: smbd: Remove user_can_read_file().
via b98cf3a12da s3: smbd: Remove is_visible_file().
via a9be0e26b5a s3: smbd: Remove dptr_normal_ReadDirName().
via f47f5550127 s3: smbd: Now smbd_dirptr_get_entry() is doing the filtering, dptr_normal_ReadDirName() is an unneeded wrapper for ReadDirName().
via 9f2f4affa0a s3: smbd: Now all callers of is_visible_fsp() pass 'false' for the use_veto parameter, remove it.
via 75f7c11bb35 s3: smbd: Remove is_visible_file() from dptr_ReadDirName().
via a66b7de76aa s3: smbd: In smbd_dirptr_get_entry() add a call to is_visible_fsp().
via d3161dd1e48 s3: smbd: In smbd_dirptr_get_entry(), add an early check for VETO_PATH.
via f8a88473d38 s3: smbd: In can_delete_directory_fsp(), is_visible_file() -> is_visible_fsp().
via 5d761421d1c s3: smbd: In can_delete_directory_fsp() explicitly call IS_VETO_PATH().
via 2dfd30384e7 s3: smbd: Allow is_visible_fsp() to cope with POSIX symlinks/MSDFS links.
via 25debb608ed s3: smbd: is_visible_file() is now static to dir.c.
via 138078c9449 s3: smbd: Fix old bug in reply_copy() where is_visible_file(), now is_visible_fsp() wasn't checking VETO files.
via 12cb13691e0 s3: smbd: reply_copy(), is_visible_file() -> is_visible_fsp().
via 5987fab76fd s3: smbd: rename_internals(), is_visible_file() -> is_visible_fsp().
via 146f7bf4fbc s3: smbd: In unlink_internals(), is_visible_file() -> is_visible_fsp().
via 41238eb4750 s3: smbd: rmdir_internals(), fix the initial directory scan pass to use is_visible_fsp().
via bf36c88516a s3: smbd: Allow rmdir_internals() to cope with veto'ed symlinks.
via 452dbd10d92 s3: smbd: In rmdir_internals(), Change is_visible_file() -> is_visible_fsp().
via e6377a909a1 s3: smbd: Change recursive_rmdir(), is_visible_file() -> is_visible_fsp().
via c064758fce4 s3: smbd: Add user_can_write_fsp().
via 53877296de2 s3: smbd: Add user_can_read_fsp().
via b25109d4f4e s3: smbd: Add is_visible_fsp().
via c970badb511 s3: smbd: set_ea_dos_attribute(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().
via b8ef83e1f92 s3: smbd: reply_setatr(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().
via 868457d7779 s3: smbd: file_ntimes(), can_write_to_file() -> can_write_to_fsp().
via fad211a7068 s3: smbd: file_set_dosmode(), can_write_to_file() -> can_write_to_fsp().
via d0fced71416 s3: smbd: dos_mode_from_sbuf(), can_write_to_file() -> can_write_to_fsp().
via 92eff16d5a1 s3: smbd: Change acl_group_override() -> acl_group_override_fsp().
via 161836b24d1 s3: smbd: set_ea_dos_attribute(), can_write_to_file() -> can_write_to_fsp().
via 66dd861245e s3: smbd: call_nt_transact_create(), can_write_to_file() -> can_write_to_fsp().
via dc069500647 s3: smbd: In reply_ntcreate_and_X(), can_write_to_file() -> can_write_to_fsp().
via 2d79eddbb3d s3: smbd: Add can_write_to_fsp(). Not yet used.
via 8723bec340b s3: eventlog: get_nt_acl_no_snum(), SMB_VFS_GET_NT_ACL_AT() -> SMB_VFS_FGET_NT_ACL().
via 82efcc23597 s3: torture: cmd_get_nt_acl(), SMB_VFS_GET_NT_ACL_AT() -> SMB_VFS_FGET_NT_ACL()
via 1c8c2095d24 s3: smbd: get_nt_acl_conn(), SMB_VFS_GET_NT_ACL_AT() -> SMB_VFS_FGET_NT_ACL()
via 32b92d7cdf1 s3/smbd: pysmbd: Ensure SMB_VFS_GET_NT_ACL_AT() has an fsp when called.
via 5c9f8f693cf s3/smbd: pysmbd: SMB_VFS_SYS_ACL_GET_FILE -> SMB_VFS_SYS_ACL_GET_FD
via 3bd2cfc2920 s3: smbd: Inside inherit_new_acl(), change from SMB_VFS_GET_NT_ACL_AT() -> SMB_VFS_FGET_NT_ACL().
via 110de2f4762 s3: smbd: Pass parent_dir_fname parameter to inherit_new_acl().
via 8d615e90965 s3: smbd: Remove directory_has_default_acl().
via 428bceb127c s3: smbd: Change directory_has_default_acl() -> directory_has_default_acl_fsp().
via a87182b2eb8 s3: Add directory_has_default_acl_fsp().
via 580226610f8 s3: smbd: Remove check_parent_access().
via 0e88fc37356 s3: smbd: Change open_file() to use check_parent_access_fsp() instead of check_parent_access().
via 1509ba3c44e s3: smbd: In open_file_ntcreate(), remove the local parent_dir_fname and rename the passed in parameter to be the same.
via 066729f8ce8 s3: smbd: In open_file_ntcreate() initialize the local parent_dir_fname from the passed in parent_dir_fname_in.
via 64bd0ae3583 s3: smbd: Pass parent_dir_fname_in, smb_fname_atname_in from create_file_unixpath() to open_file_ntcreate().
via 748f693a9c5 s3: smbd: In mkdir_internal(), remove the local parent_dir_fname. We pass it in from the caller now.
via 8d4a73db8be s3: smbd: In mkdir_internal(), use the passed in 'smb_fname_atname' instead of a local 'base_name' variable.
via da5762de716 s3: smbd: In mkdir_internal() assign the passed in parent_dir_fname_in, smb_fname_atname_in to the local variables.
via 7a06544d188 s3: smbd: Pass parent_dir_fname_in, smb_fname_atname_in to mkdir_internal().
via 00baf898e8c s3: smbd: Pass in the newly created parent_dir_fname and smb_fname_atname to open_directory().
via 7aa5acb895f s3: smbd: Get a parent pathref in create_file_unixpath().
via daadab4a85b s3: smbd: Change rename_internals_fsp() to use check_parent_access_fsp().
via 8d5e5095c06 s3: smbd: Make mkdir_internal() use check_parent_access_fsp().
via 133196790a6 s3: smbd: Add check_parent_access_fsp().
via e81aa6e3580 s3: torture: Change cmd_sys_acl_blob_get_file() to be handle based.
via 5f3599fab00 s3: smbd: copy_access_posix_acl(), SMB_VFS_SYS_ACL_GET_FILE() -> SMB_VFS_SYS_ACL_GET_FD().
via 23217ced3e6 s3: smbd: directory_has_default_posix_acl(), SMB_VFS_SYS_ACL_GET_FILE() -> SMB_VFS_SYS_ACL_GET_FD().
via 9042bdd0dd8 s3: smbd: In get_acl_group_bits(), SMB_VFS_SYS_ACL_GET_FILE() -> SMB_VFS_SYS_ACL_GET_FD().
via d2ff049ba9b s3: smbd: Ensure we only call get_acl_group_bits() with a valid smb_fname->fsp.
via 91cd0e87f92 s3/smbd: make posix_sys_acl_blob_get_fd actually use handle api with the changes to underlying sys_acl_get_fd_fn we now can pass the acl type down
via a8e49253d73 s3: torture: cmd_sys_acl_get_file(), SMB_VFS_SYS_ACL_GET_FILE() -> SMB_VFS_SYS_ACL_GET_FD().
via b62d90f91f4 s3: VFS: vxfs: Change use of SMB_VFS_SYS_ACL_GET_FILE() -> SMB_VFS_SYS_ACL_GET_FD().
via 7e8849032ff s3: smbd: In smb_query_posix_acl(), remove a use of SMB_VFS_SYS_ACL_GET_FILE().
via e59244461f4 VFS: SMB_VFS_SYS_ACL_GET_FD: Modify api to take additional type param
via 5504a5502d5 VFS: SMB_VFS_SYS_ACL_GET_FD: Add SMB_ACL_TYPE_T type arg
via a706a544775 s3: smbd: Re-use refuse_symlink_fsp() in set/get security descriptors.
via c66305f4c81 s3: smbd: Make refuse_symlink_fsp() public so we can reuse in nttrans.c
via 580d691c9bb s3: smbd: Change refuse_symlink() -> refuse_symlink_fsp()
via 8f9606b26d6 s3: smbd: Remove the NULL fsp use of refuse_symlink().
via ddc226c8497 s3: smbd: recursive_rmdir(), when calling synthetic_pathref() for a directory entry we've already stat()'ed, re-use the stat struct.
via b3ca31905ed s3: smbd: rmdir_internals(), when calling synthetic_pathref() for a directory entry we've already stat()'ed, re-use the stat struct.
via 92d143dbcb8 s3: smbd: rmdir_internals(). Coding cleanup. Move TALLOC_FREE(dir_hnd) into the generic exit path.
via d880116fae1 s3: smbd: rmdir_internals(). Coding cleanup. Always use ISDOT(dname) || ISDOTDOT(dname).
via 153da186a1c s3: smbd: smbd_check_access_rights_fsp(), for a symlink handle just check the handle bits.
via c11f25b7ea1 s3: smbd: Fix smbd_check_access_rights_fsp() to cope with fake/printer fsp's.
via ae5cb84fae6 s3: smbd: Subtle change to semantics needed for smbd_check_access_rights_fsp().
via 12ede1732a5 s3: smbd: Cleanup - make SearchDir() static.
via 7a591e90e33 s3: smbd: Cleanup - fix the comment for dptr_SearchDir().
via ae8313a4458 s3: smbd: In open_directory() move the call to smbd_check_access_rights() until after the fsp is set up.
via d2d52ebb6cc s3: smbd: In open_file(), remove post-open check for opening a directory.
via f1ca59b81b2 s3: smbd: Make open_file() fail early for an existing directory we are trying to open.
via 68124e2a46f s3: smbd: Cleanup. open_file(). If SMB_VFS_FSTAT() fails report the error.
via aaba2918f8b s3: smbd: Cleanup. open_file(). This returns NTSTATUS, don't set errno explicitly internally.
via 99c02ff6c15 s3: smbd: Cleanup. open_file_ntcreate(). This returns NTSTATUS, don't set errno explicitly internally.
via a80456e61de s3: VFS: shadow_copy2: Code cleanup. In shadow_copy2_get_shadow_copy_data() preserve errno accross cleanup syscalls.
via 250a5df6bc6 s3: VFS: posixacl: Fix the fallback code in posixacl_sys_acl_set_fd().
via fc8b3f1878f s3: VFS: posixacl: Missing acl_free() in error code path.
from 8a427783e5e smbd: fix pathref unlinking in create_file_unixpath()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 96ef845430f6f5bb43778c3fbdde57f07a61b575
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 17:09:51 2021 -0700
s3: VFS: solarisacl: Remove solarisacl_sys_acl_set_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
Autobuild-User(master): Ralph Böhme <slow at samba.org>
Autobuild-Date(master): Wed Jun 9 14:04:13 UTC 2021 on sn-devel-184
commit fcca720e60f7a38b3ab51be0285676462135babb
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 17:08:42 2021 -0700
s3: VFS: aixacl: Remove aixacl_sys_acl_set_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 2f4c5b9b1add1195f38af430edf16d696a3a92cb
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 17:07:23 2021 -0700
s3: VFS: posixacl: Remove posixacl_sys_acl_set_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit f0c22f741562221aac905386698b69aebd070420
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 17:05:53 2021 -0700
s3: lib: sysacls: Remove all implementations of sys_acl_set_file().
No longer called.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 303185621178aa76a91458788eb13b731a3ce19f
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 17:01:02 2021 -0700
s3: VFS: default: Remove the sys_proc_fd_path() fallback code in vfswrap_sys_acl_set_fd().
Just pass through to sys_acl_set_fd(), which goes to posixacl_sys_acl_set_fd()
on posix ACL systems.
We already have identical code in posixacl_sys_acl_set_fd()
and these fallbacks are really system specific so we shouldn't
be doing them in more than one place.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 4266b6a7fbd790f662be9f8590fa1cba98d102b1
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:56:44 2021 -0700
s3: VFS: hpuxacl: Fix the funtion signature for hpuxacl_sys_acl_set_fd()
This is really unmaintained code and should be removed unless
someone from HP steps up..
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit ac77b2c6f80e88bb09b4997de73b166e5846206f
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:49:33 2021 -0700
s3: lib: sysacls: Add the 'SMB_ACL_TYPE_T type' parameter to sys_acl_set_fd().
Pass it through to the backends. The default posixacl_sys_acl_set_fd()
already copes with this anyway, as does the AIX, and Solaris backends.
The HPUX code isn't compiled and was broken anyway (there was a
missmatch of the number of parameters being passed to the
sys_acl_set_fd_fn backend hpuxacl_sys_acl_set_fd()), and HPUX
doesn't have fd-based ACLs, so just switch to calling hpuxacl_sys_acl_set_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit d5e3dcc8a5cd29bbff5bcea84857f84a83d29e99
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:35:24 2021 -0700
s3: VFS: non_posix_acls: Remove non_posix_sys_acl_blob_get_file_helper(). No longer used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit bfe2d8f54c23f08389261be94e9ea3fafac18842
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:34:40 2021 -0700
s3: VFS: posixacl: Remove posixacl_sys_acl_get_file().
No longer used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 8ed07fa8d2da66e76d8d85af32fb2f4212790fa3
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:21:14 2021 -0700
s3: lib: sysacls: Remove sys_acl_get_file(). No longer used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 386f75f3ec08d0c94e028abbd4bbb067e6cddb38
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:17:59 2021 -0700
s3: VFS: Update status of SMB_VFS_SYS_ACL_BLOB_GET_FILE
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 71b278d1626ef4c81ec8503c0a9435be77b10238
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:16:32 2021 -0700
s3: VFS: RIP SMB_VFS_SYS_ACL_BLOB_GET_FILE()
(\ _ /)
( \ O / )
(// \\)
X
/ \
/___\
_____/ \\_____
| + ||
| ||
| SMB_VFS_SYS_ACL ||
| BLOB_GET_FILE() ||
| ||
| ||
| ||
| _ ___ _ ||
| | \ | | \ ||
| | | | | | ||
| |_/ | |_/ ||
| | \ | | ||
| | \ | | ||
| | \. _|_. | . ||
| ||
* * | * ** * ** |** **
\)),.,\(/.,(//,,..,,\||(,,.,\\,.((//
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit c8f468d29d8fde67c2e39b375e5a5e8ffac6b282
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:10:45 2021 -0700
s3: VFS: posixacl: Remove call to posix_sys_acl_blob_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 5bd95225109167efeab0ae533c2ed4a4d89ed7aa
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:09:09 2021 -0700
s3: VFS: Remove zfsacl_fail__sys_acl_blob_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit ed988917c90749630606390a2002bf3dba54b998
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:08:29 2021 -0700
s3: VFS: Remove call to posix_sys_acl_blob_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 24382af0b17ef3ae6212979986bf6c1045884af3
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:07:43 2021 -0700
s3: VFS: nfs4acl_xattr: Remove call to nfs4acl_xattr_fail__sys_acl_blob_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit e716563700abefa007bcf1e42f65c01f01d2555d
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:07:02 2021 -0700
s3: VFS: hpuxacl: Remove call to posix_sys_acl_blob_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 6a0d127437d6ccf34d534528fc88ca76bb2f9794
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:06:26 2021 -0700
s3: VFS: gpfs: Remove gpfsacl_sys_acl_blob_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit eff0afa61e526eef216845b94f11d83b027b4cde
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:05:33 2021 -0700
s3: VFS: glusterfs: Remove call to posix_sys_acl_blob_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit eeb2a3ce8ffc844412b33ded67eb98e5738c5b5f
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:04:55 2021 -0700
s3: VFS: fake_acls: Remove call to posix_sys_acl_blob_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 6605b05e23c23ad0cc59c202ec06f4fbb9be6336
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:04:21 2021 -0700
s3: VFS: ceph: Remove call to posix_sys_acl_blob_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 07fe1afb97e8400ea7b839637d8da120b70ade66
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:03:40 2021 -0700
s3: VFS: aixaxcl2: Remove aixjfs2_sys_acl_blob_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b75e459bdf7de154ea600286fc759e2437498844
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:02:48 2021 -0700
s3: VFS: aixacl: Remove call to posix_sys_acl_blob_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 0ecc56cb2ea8b42ca19b2d9ce50a20f88dae552c
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 16:01:50 2021 -0700
s3: VFS: afsacl: Remove afsacl_sys_acl_blob_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit d427df221ea0a12d57d84ee4dd3149938725f7d0
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:59:34 2021 -0700
s3: VFS: Update status of SMB_VFS_SYS_ACL_GET_FILE
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit bb038f2b8974cf73ef46b39ad99b3f596089f551
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:56:20 2021 -0700
s3: VFS: RIP SMB_VFS_SYS_ACL_GET_FILE()
(\ _ /)
( \ O / )
(// \\)
X
/ \
/___\
_____/ \\_____
| + ||
| ||
| SMB_VFS_SYS_ ||
| ACL_GET_FILE() ||
| ||
| ||
| ||
| _ ___ _ ||
| | \ | | \ ||
| | | | | | ||
| |_/ | |_/ ||
| | \ | | ||
| | \ | | ||
| | \. _|_. | . ||
| ||
* * | * ** * ** |** **
\)),.,\(/.,(//,,..,,\||(,,.,\\,.((//
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b828784caedc92ebd2941e5091502a26fc16c2e3
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:37:35 2021 -0700
s3: VFS: posixacl: Remove call to posixacl_sys_acl_get_file().
We can't remove the code yet until the callers inside sysacl.c
are gone. We must remove the VFS function first.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 99650debdc329349534e780d8290298ac2fe8a39
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:26:40 2021 -0700
s3: VFS: zfsacl: Remove zfsacl_fail__sys_acl_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 8a6e84287e2f2b606d39172e1c7f8f351d7774fb
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:26:04 2021 -0700
s3: VFS: unityed_media: Remove um_sys_acl_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit d24b6c7a21373454398bc28823518de5ed7e9707
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:25:14 2021 -0700
s3: VFS: solarisacl: Make solarisacl_sys_acl_get_file() static. Still called internally.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 155a660e2c5f60cd79c6c8ecb7feded0790c92a2
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:23:47 2021 -0700
s3: VFS: nfs4acl_xattr: Remove nfs4acl_xattr_fail__sys_acl_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit c0d70d4daf12fa07ab42f8c1e12d6faff29c4ed4
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:22:59 2021 -0700
s3: VFS: media_harmony: Remove mh_sys_acl_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit a1298c3f7c3932ac401d32c583a41a3db39ebf77
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:21:59 2021 -0700
s3: VFS: hpuxacl: Make hpuxacl_sys_acl_get_file() static.
Called internally as HPUX has no fd-based acl functions.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit a46e9aaadcb4f07530a985a41f077cef177de72a
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:21:06 2021 -0700
s3: VFS: gpfs: Remove gpfsacl_sys_acl_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit a5b7ccb1b148e16fe0755bc93a8949bb9c749a06
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:20:05 2021 -0700
s3: VFS: glusterfs: Remove call to posixacl_xattr_acl_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 316235ef0fb3bae62e61834ff7ee73def786c9ed
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:19:03 2021 -0700
s3: VFS: fake_acls: Remove fake_acls_sys_acl_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 4ba0d4bebe5ca9b0d747742541fdcc2c8528a492
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:18:14 2021 -0700
s3: VFS: ceph: Remove call to posixacl_xattr_acl_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 71bcd205c45b71f6f7ec901ab4d6aab55d8224fc
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:17:02 2021 -0700
s3: VFS: catia: Remove catia_sys_acl_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 7d6b47f0e5d56791a56759ae51c7d19209045a7f
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:16:23 2021 -0700
s3: VFS: cap: Remove cap_sys_acl_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit c0694d44ae67d7557888d66f7eea4f6cd314fb8e
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:15:41 2021 -0700
s3: VFS: aixacl2: Remove aixjfs2_sys_acl_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 7eb206517faaab6819bf248d97f2c5c3f5dd6f15
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:14:57 2021 -0700
s3: VFS: aixacl: Remove aixacl_sys_acl_get_file().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit ccef64dab785b8495f637538ec585a03bdef6ca8
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 13:09:43 2021 -0700
s3: smbd: Remove posix_get_nt_acl().No longer used.
Comment out load_inherited_info() as that was the
only caller.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b0842364d638df313698a882b395a14b9eacb678
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 13:06:42 2021 -0700
s3: VFS: Update status of SMB_VFS_NT_ACL_AT.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 3cbf0acc0dbee67d041b472bf7902a2a44f5b463
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 13:04:57 2021 -0700
vfs: RIP SMB_VFS_GET_NT_ACL_AT()
.--. .-, .-..-.__
.'(`.-` \_.-'-./` |\_( "\__
__.>\ '; _;---,._| / __/`'--)
/.--. : |/' _.--.<| / | |
_..-' `\ /' /` /_/ _/_/
>_.-``-. `Y /' _;---.`|/))))
'` .-''. \|: .' __, .-'"`
.'--._ `-: \/: /' '.\ _|_
/.'`\ :; /' `- `-|-`
-` | | |
:.; : | .-'~^~`-.
|: | .' _ _ `.
|:. | | |_) | |_) |
:. : | | | \ | | |
: ; | | |
: ; | | SMB_VFS |
: ; | | GET_NT_ |
: ; | | ACL_AT |
.jgs. : ; | |
-."-/\\\/:::. `\."-._'."-"_\\-| |///."-
" -."-.\\"-."//.-".`-."_\\-.".-\\`=.........=`//-".
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 737c68146d1cd36d8143632461dabcc156694b57
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 13:02:42 2021 -0700
s3: VFS: acl_common: Remove the dirfsp parameter from validate_nt_acl_blob().
No longer needed.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit a28a686714e2d0e09d050d8df1df328d6fa581d0
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 13:01:12 2021 -0700
s3: VFS: acl_common: Remove the pathname-based calls in validate_nt_acl_blob().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 613fed318c8ab0eefa1fa7d041f856380c8212b9
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:59:31 2021 -0700
s3: VFS: acl_common: Remove get_nt_acl_common_at().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 7d2a2d5f0679f42c1434f79299cb4b9f02a00102
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:51:26 2021 -0700
s3: VFS: zfsacl: Remove zfsacl_get_nt_acl_at().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit e24e5ec70cc36f7ea46899a1b16e28fc43857267
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:50:31 2021 -0700
s3: VFS: snapper: Remove snapper_gmt_get_nt_acl_at().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 7994c0c283f74751b122a6b4e036f55e34aa1ae9
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:49:03 2021 -0700
s3: VFS: nfs4acl_xattr: Remove nfs4acl_xattr_get_nt_acl_at().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 72cf25f62ad6886ade123bd49ec1d0f84d355502
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:48:12 2021 -0700
s3: VFS: media_harmony. Remove mh_get_nt_acl_at().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 058ac279a675fe59559ef932e73278e219aaf439
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:47:27 2021 -0700
s3: VFS: gpfs. Remove gpfsacl_get_nt_acl_at().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit e96b2deef454dc618bcaebcf2bf50e64c7e9a7d3
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:46:34 2021 -0700
s3: VFS: ceph_snapshots. Remove ceph_snap_gmt_get_nt_acl_at().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit ccc9613eba5e7a4f9d12a9ed86431d3d0099a72c
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:45:43 2021 -0700
s3: VFS: catia. Remove catia_get_nt_acl_at().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 45341cee0173ef9fbebc9bdab24acba2c31a63cf
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:44:51 2021 -0700
s3: VFS: acl_xattr: Remove unused get_acl_blob_at().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit fd8a2cfd4e17f8dea114bd6a31cbfeff87ade87a
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:44:05 2021 -0700
s3: VFS: acl_xattr: Remove acl_xattr_get_nt_acl_at().
Comment out get_acl_blob_at() as no longer used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 403cf571e480013d490647e13643b7685253cb1f
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:42:52 2021 -0700
s3: VFS: acl_tdb: Remove unused get_acl_blob_at().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit aab4970be8419453f1494dc09476508efb2a4179
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:42:00 2021 -0700
s3: VFS: acl_tdb. Remove acl_tdb_get_nt_acl_at().
Comment out get_acl_blob_at() as no longer used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit d677cee97241c5c9fbdbb3e14ac90bc44ac2a462
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:40:40 2021 -0700
s3: VFS: aixacl2: Remove aixjfs2_get_nt_acl_at().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 2cff96d9bdba7be116055e475c2bd52be7d95165
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:39:56 2021 -0700
s3: VFS: afsacl: Remove afsacl_get_nt_acl_at().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 7da81bfbe57ab560f1f3fb092f03f5e922502811
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:38:43 2021 -0700
s3: VFS: shadow_copy2: Remove shadow_copy2_get_nt_acl_at().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit ca5d2c35bc26795187c075c66c9b8461ed5a26d7
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:34:25 2021 -0700
s3 VFS: glusterfs: Remove get_nt_acl_at_fn().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 6ef5ed23097b598451d9453509ac36bb18c38507
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:28:24 2021 -0700
s3: smbd: open_directory(). Pass down the real parent_dir->fsp to smbd_check_access_rights_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 63fb55cd6c697e3f605161a2f8ba01c528ac8238
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:27:09 2021 -0700
s3: smbd: open_file(). Pass down the real parent_dir->fsp to smbd_check_access_rights_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 699356a245ed941b5d7e7446afc700fdd9a34bbf
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:24:17 2021 -0700
s3: smbd: smbd_check_access_rights_fsp(). Add dirfsp parameter.
Pass down to smbd_check_access_rights_sd().
Always pass conn->cwd_fsp for now.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 88881510c7472721f6968b68a33f35b9b0bdd229
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:16:04 2021 -0700
s3: smbd: smbd_check_access_rights_sd(). Add dirfsp parameter.
Pass down to parent_override_delete().
Always pass fsp->conn->cwd_fsp for now.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 3b1d2ddc79c2bb5146873200832de1e6b9f28862
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:14:19 2021 -0700
s3: smbd: parent_override_delete(). Add dirfsp parameter.
Pass down to can_delete_file_in_directory().
Always pass conn->cwd_fsp for now.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 7d4f4c832630325ff049f5ed02e03d67215ac2a7
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:02:16 2021 -0700
s3: smbd: open_directory(). Start passing a real parent dirfsp to smbd_calculate_access_mask_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit eea3a3c1565451e3e47b6b547d7718651e5569cf
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 12:00:56 2021 -0700
s3: smbd: open_file_ntcreate(). Start passing a real parent dirfsp to smbd_calculate_access_mask_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 492d105b442b880ab5ab99861ec6bdabd7e342bb
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 11:56:25 2021 -0700
s3: smbd: smbd_calculate_access_mask_fsp(). Add dirfsp parameter.
Pass this down into smbd_calculate_maximum_allowed_access_fsp().
Currently pass fsp->conn->cwd_fsp everywhere.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 6503bb48ca3fb839e703f8a88a1ff8601cc7cacd
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 11:40:11 2021 -0700
s3: smbd: smbd_calculate_maximum_allowed_access_fsp(), add parent dirfsp parameter and pass to can_delete_file_in_directory().
Pass the same fsp->conn->cwd_fsp parameter to can_delete_file_in_directory()
dirfsp for now.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit eaff826aed31169b09d89a9f1b12015ee2e62f03
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 11:37:57 2021 -0700
s3: smbd: Remove smbd_check_access_rights(). No longer used.
There are now no more callers of SMB_VFS_GET_NT_ACL_AT().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit dd7c489cd3829085d3638e3b0dbfbb915d18a25a
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 11:18:34 2021 -0700
s3: smbd: can_delete_file_in_directory(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().
Last user of smbd_check_access_rights().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 120ce4f56f5ead293de6729b123b2d1ad3e60c6b
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 11:15:59 2021 -0700
s3: smbd: can_delete_file_in_directory(), we no longer need to do the SMB_VFS_STAT() call.
All code paths must have a valid stat here.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 5e268266f8f602225ddc1bfbdc84c61c2690270b
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 11:14:29 2021 -0700
s3: smbd: In can_delete_file_in_directory(), get a real parent pathref.
Not yet used but we will use this to get the parent ACL via handle.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit e370c0826948342eee9b3a9952bf9c369430eac9
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 11:08:06 2021 -0700
s3: smbd: In can_delete_file_in_directory(), remove the assertion that dirfsp == conn->cwd_fsp.
Allow a real parent directory fsp to be passed in. We're not doing this
yet but this will allow more efficient calling from the open code
where we have the parent directory fsp available.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 7e4a9a1e5f18db2ae77de944de75e3c6c3df9dc8
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 11:03:24 2021 -0700
s3: smbd: In can_delete_file_in_directory(), move a fast-path exit to before any pathname manipulation.
If we're root we always return true on a writable share.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 1e90d91b0334c9f6f1ca4fd08f107b71f06e8a19
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 17:28:58 2021 -0700
s3: smbd: Remove smbd_calculate_maximum_allowed_access(). No longer used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit f700460c07013ffffee65e9b16773068c916cb45
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 17:27:29 2021 -0700
s3: smbd: Remove smbd_calculate_access_mask(). No longer used.
Comment out smbd_calculate_maximum_allowed_access() as it is
a static function and we just removed the only caller.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 99ed7693633198681651bd55e32dedff97cceda2
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 17:22:57 2021 -0700
s3: smbd: open_fake_file(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 1146fb3826cf737ffd339eedd188c0d205000f9d
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 17:21:04 2021 -0700
s3: smbd: open_fake_file(). Move the smbd_calculate_access_mask() check until after we've initialized the file handle.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 18d9282c1e09cf81d5747a3ef9686b5232477951
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 17:19:25 2021 -0700
s3: smbd: open_directory(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 5abb0409ff4de3b7184ee1f0bddeb5e9c3335e91
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 17:17:40 2021 -0700
s3: smbd: open_file_ntcreate(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 3293cc8d75bb7793a7999bed343fa643cfbbcc42
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 17:13:50 2021 -0700
s3: VFS: fruit: fruit_freaddir_attr(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 7c80e0856a717c98a1129331e9b599893bc7bc37
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 17:12:29 2021 -0700
s3: smbd: smbd_smb2_create_after_exec(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 07a81f6982b57c9d1e77900fc361e935ad4e3938
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 17:07:17 2021 -0700
s3: smbd: Change check_base_file_access() to take an fsp as the first argument.
Internally, change check_base_file_access(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 03352e981b99c1272f5c5e85cb7eca7dc75af5cf
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 17:02:06 2021 -0700
s3: smbd: Add smbd_calculate_access_mask_fsp().
Not yet used but this now uses smbd_calculate_maximum_allowed_access_fsp(),
so uncomment it.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 2c32cb18fc9c1a1b98f32d666ca85559a2a95772
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 16:37:25 2021 -0700
s3: smbd: Add new smbd_calculate_access_mask_fsp() function.
Commented out as not yet used.
Signed-off-by: Noel Power <noel.power at suse.com>
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 845aaadccdb2dd7ab670da16b25b73593db8ebd5
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 16:27:22 2021 -0700
s3: smbd: open_directory(). Cleanup debug message to refer to correct function.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit bed09bc2d66b9a6f1f4b28f37ad7b5c200939b35
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 16:25:54 2021 -0700
s3: smbd: open_file(). Cleanup debug message to refer to correct function.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b8d43466e1f202da90139dba492980eaf1af11c8
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 16:24:42 2021 -0700
s3: smbd: open_file(). Cleanup debug message to refer to correct function.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 3f61369d153419158c0f223e6f81c0bb07275833
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 15:08:06 2021 -0700
s3: smbd: open_file(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit af291abefa7d085460be215bc616c721d88b15a4
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 15:03:41 2021 -0700
s3: smbd: open_directory(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 11910757c6846016a5a3701577c8d46d6440e6cc
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 14:58:39 2021 -0700
s3: smbd: check_base_file_access(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 26dc10bdb2cff3eece4a2874931b4058f9f87d68
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 14:55:38 2021 -0700
s3: smbd: open_file(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit e5c9cfb04296e385dea227e5efccb78575f3977a
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 11:25:39 2021 -0700
s3: smbd: In notify, user_can_stat_name_under_fsp(), smbd_check_access_rights -> smbd_check_access_rights_fsp
Signed-off-by: Jeremy Allison <jra at samba.org>
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit ff8a41a1c59e9d2f5edfd36e3a7fcb0806608fa6
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 10:26:00 2021 -0700
s3: VFS: ceph_snapshots: In ceph_snap_gmt_convert_dir(), re-use the directory handle for checking SEC_DIR_LIST permission.
Similar change to the one that went into shadow_copy2.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 4d0bda46ceef0f0ba143cc86663bdffa06852458
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 10:22:53 2021 -0700
s3: VFS: ceph_snapshots: In ceph_snap_enum_snapdir(), re-use the directory handle for checking SEC_DIR_LIST permission.
Similar change to the one that went into shadow_copy2.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b3d54e20da45f0d00865092ca4df1b5f708b5b7f
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 09:56:19 2021 -0700
s3: VFS: vfs_shadow_copy2: Remove check_access_snapdir().
No longer used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 342a0c92c98927ecd5e5983c72960aad07986137
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 09:47:26 2021 -0700
s3: VFS: shadow_copy2: In shadow_copy2_get_shadow_copy_data(), check for DIR_LIST access once we already have a handle on the snap directory.
There's no sense in opening a synthetic pathref first in
order to check for DIR_LIST access, then open again to
do the SMB_VFS_NEXT_FDOPENDIR() for listing.
Just open once, and check for DIR_LIST access on the
open handle before calling SMB_VFS_NEXT_FDOPENDIR() for listing.
We no longer need check_access_snapdir(), which is
static, so comment it out. Removal next.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b56fc4b0d8e7b0ae327802a66c7c0526acf51cac
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 10:14:27 2021 -0700
s3: smbd: Remove can_write_to_file(). Pathname call no longer used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 0c8f928198c99b183ca60e4372d73ebafb8100d3
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 13:46:08 2021 -0700
s3: smbd: Remove user_can_write_file().
No longer used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b5e12fed54f0b06021661fb829327dd7b9c68c8e
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 13:45:24 2021 -0700
s3: smbd: Remove user_can_read_file().
No longer used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b98cf3a12daedc572ec0fdd0d90918e42c2534ec
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 13:44:52 2021 -0700
s3: smbd: Remove is_visible_file().
No longer used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit a9be0e26b5a1f11f0e5e868d0a14044faed3ac7c
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 13:44:06 2021 -0700
s3: smbd: Remove dptr_normal_ReadDirName().
No longer used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit f47f55501276a49a57d3e2999a096c9dc1115bf3
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 13:41:50 2021 -0700
s3: smbd: Now smbd_dirptr_get_entry() is doing the filtering, dptr_normal_ReadDirName() is an unneeded wrapper for ReadDirName().
Just call ReadDirName() directly.
This also means:
is_visible_file()
user_can_read_file()
user_can_write_file()
are no longer used, so commen them out for subsequent removal.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 9f2f4affa0a376ea342caf7f748eceb5649fb2f7
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 13:32:40 2021 -0700
s3: smbd: Now all callers of is_visible_fsp() pass 'false' for the use_veto parameter, remove it.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 75f7c11bb35c3977ec7e9fd937bd6fd40f5013bf
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 13:27:52 2021 -0700
s3: smbd: Remove is_visible_file() from dptr_ReadDirName().
dptr_ReadDirName() is only called from smbd_dirptr_get_entry(),
which is now doing it's own call to is_visible_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit a66b7de76aa11cd16acc83042cb149b495bb5d75
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 10:10:55 2021 -0700
s3: smbd: In smbd_dirptr_get_entry() add a call to is_visible_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit d3161dd1e48507f568af8ddbe2b277081290a945
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 11:20:08 2021 -0700
s3: smbd: In smbd_dirptr_get_entry(), add an early check for VETO_PATH.
Eventually we will be able to remove the 'bool use_veto' parameter
from is_visible_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit f8a88473d3861f34ba731fbbbe6cb370c99f9416
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 13:21:29 2021 -0700
s3: smbd: In can_delete_directory_fsp(), is_visible_file() -> is_visible_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 5d761421d1c720cc33df306bd758cd62e018a7c9
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 12:47:11 2021 -0700
s3: smbd: In can_delete_directory_fsp() explicitly call IS_VETO_PATH().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 2dfd30384e7849c2f38717ead43ab42287b127c9
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 10:09:34 2021 -0700
s3: smbd: Allow is_visible_fsp() to cope with POSIX symlinks/MSDFS links.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 25debb608ed6f356f8f1b1d21a215f52e78ae6aa
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jun 3 12:40:54 2021 -0700
s3: smbd: is_visible_file() is now static to dir.c.
Once fully replaced in there it can be removed.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 138078c94497882e0b1cd0f2c3aba67b38a2db85
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 13:37:03 2021 -0700
s3: smbd: Fix old bug in reply_copy() where is_visible_file(), now is_visible_fsp() wasn't checking VETO files.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 12cb13691e0fedd82a71d5f54d1eaf5da28a12ca
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jun 3 12:38:18 2021 -0700
s3: smbd: reply_copy(), is_visible_file() -> is_visible_fsp().
Offtopic, the function reply_copy() is insane and should be removed.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 5987fab76fdd4636fbcfacff88531105573c37f8
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jun 3 12:28:37 2021 -0700
s3: smbd: rename_internals(), is_visible_file() -> is_visible_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 146f7bf4fbc06661c821f897303f777671eccf14
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 11:58:39 2021 -0700
s3: smbd: In unlink_internals(), is_visible_file() -> is_visible_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 41238eb4750f92731f14fda7a15bb112614402c4
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 12:16:17 2021 -0700
s3: smbd: rmdir_internals(), fix the initial directory scan pass to use is_visible_fsp().
Add the same symlink accomodation as before.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit bf36c88516a96a224b0abdd3ca831f895d877b7b
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jun 3 11:15:50 2021 -0700
s3: smbd: Allow rmdir_internals() to cope with veto'ed symlinks.
We are only dealing with VETO'ed objects
here. If it's a symlink, just delete the
link without caring what it is pointing
to as this operation is safe.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 452dbd10d928debcbb61effc347e5cedfd5e7681
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 17:51:25 2021 -0700
s3: smbd: In rmdir_internals(), Change is_visible_file() -> is_visible_fsp().
This needs some slight re-arranging, as previously
is_visible_file() preceeds the call to recursive_rmdir().
As we have to move the call to is_visible_fsp()
until after we have direntry_fname->fsp, then
we must also move the recursive_rmdir() to be
after is_visible_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit e6377a909a1692eb5054812d52c24ea935c5371f
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 17:42:27 2021 -0700
s3: smbd: Change recursive_rmdir(), is_visible_file() -> is_visible_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit c064758fce44b78b5c092207de2af2977ed7ce5c
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 17:36:16 2021 -0700
s3: smbd: Add user_can_write_fsp().
Change is_visible_fsp() to use it.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 53877296de2cee8250030f8b91f1c7da80db5aad
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 11:31:45 2021 -0700
s3: smbd: Add user_can_read_fsp().
Change is_visible_fsp() to use it.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b25109d4f4ea56917f4f7d2b17a1b6709c8d4511
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 17:30:26 2021 -0700
s3: smbd: Add is_visible_fsp().
Not yet used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit c970badb511f196abe34e78893dc7c7ed4462e88
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 13:39:50 2021 -0700
s3: smbd: set_ea_dos_attribute(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b8ef83e1f92afe7d698edcb8259272becdb3ba9c
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 13:37:30 2021 -0700
s3: smbd: reply_setatr(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 868457d7779361d05ffd0cef120863f512accbe2
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 12:12:26 2021 -0700
s3: smbd: file_ntimes(), can_write_to_file() -> can_write_to_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit fad211a7068a5afe5e8fa9e1a0c4ab51ef0ac5d9
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 12:01:17 2021 -0700
s3: smbd: file_set_dosmode(), can_write_to_file() -> can_write_to_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit d0fced71416e885a01d749fe40848a7c7747c0f3
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 11:59:07 2021 -0700
s3: smbd: dos_mode_from_sbuf(), can_write_to_file() -> can_write_to_fsp().
Code with MS-DFS link where smb_fname->fsp == NULL.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 92eff16d5a14eae4eebb7933dac3e6a2124af83e
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 11:43:41 2021 -0700
s3: smbd: Change acl_group_override() -> acl_group_override_fsp().
We always have a valid fsp here. Inside acl_group_override_fsp()
change can_write_to_file() -> can_write_to_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 161836b24d16b7ea2946991ab5d9a696fb91800c
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 11:39:15 2021 -0700
s3: smbd: set_ea_dos_attribute(), can_write_to_file() -> can_write_to_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 66dd861245e2bf171322d7af9aa8d4d1c6a69fb8
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 11:40:21 2021 -0700
s3: smbd: call_nt_transact_create(), can_write_to_file() -> can_write_to_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit dc069500647f958353c0c4fb9d8c6a133ea205bd
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 11:37:56 2021 -0700
s3: smbd: In reply_ntcreate_and_X(), can_write_to_file() -> can_write_to_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 2d79eddbb3d553efa469b49f2e30d5e01af46389
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 11:36:59 2021 -0700
s3: smbd: Add can_write_to_fsp(). Not yet used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 8723bec340b87e5889f3ed553bb07ecfb7c647c5
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 17:05:13 2021 -0700
s3: eventlog: get_nt_acl_no_snum(), SMB_VFS_GET_NT_ACL_AT() -> SMB_VFS_FGET_NT_ACL().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 82efcc2359742c830ad192e82835e816ebc72642
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 13:32:28 2021 -0700
s3: torture: cmd_get_nt_acl(), SMB_VFS_GET_NT_ACL_AT() -> SMB_VFS_FGET_NT_ACL()
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 1c8c2095d24a7522065eb63fbc327d0229940bbb
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 13:29:27 2021 -0700
s3: smbd: get_nt_acl_conn(), SMB_VFS_GET_NT_ACL_AT() -> SMB_VFS_FGET_NT_ACL()
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 32b92d7cdf127a506b46c26d1415a101cf531a08
Author: Noel Power <noel.power at suse.com>
Date: Mon May 24 15:55:59 2021 -0700
s3/smbd: pysmbd: Ensure SMB_VFS_GET_NT_ACL_AT() has an fsp when called.
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 5c9f8f693cf4826b563090d21f8885cef9fc3b7f
Author: Noel Power <noel.power at suse.com>
Date: Mon May 24 15:52:44 2021 -0700
s3/smbd: pysmbd: SMB_VFS_SYS_ACL_GET_FILE -> SMB_VFS_SYS_ACL_GET_FD
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 3bd2cfc2920b5a3b4dab202b3fb3db59ad6fe258
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 18:39:52 2021 -0700
s3: smbd: Inside inherit_new_acl(), change from SMB_VFS_GET_NT_ACL_AT() -> SMB_VFS_FGET_NT_ACL().
One more pathname-based call gone.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 110de2f476296405892c1736652ba591b724bbf3
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 18:38:06 2021 -0700
s3: smbd: Pass parent_dir_fname parameter to inherit_new_acl().
Not yet used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 8d615e90965dd35a46ca4a13c616b2cba3a30b23
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 17:00:22 2021 -0700
s3: smbd: Remove directory_has_default_acl().
No more users.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 428bceb127cac9261c3b22636dfd3d4a6fff5336
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 16:59:30 2021 -0700
s3: smbd: Change directory_has_default_acl() -> directory_has_default_acl_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit a87182b2eb8439725a141e182ff2be12d2ad6701
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 16:58:12 2021 -0700
s3: Add directory_has_default_acl_fsp().
Not yet used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 580226610f8dc11ed29b2395521a2de629e9e6c4
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 11:17:22 2021 -0700
s3: smbd: Remove check_parent_access().
No more callers.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 0e88fc373561ca959423bb565ea9d68b32c4dc0e
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 11:15:29 2021 -0700
s3: smbd: Change open_file() to use check_parent_access_fsp() instead of check_parent_access().
No more uses of check_parent_access().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 1509ba3c44e7f092377360b71eee2c9916eefdb9
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 16:51:16 2021 -0700
s3: smbd: In open_file_ntcreate(), remove the local parent_dir_fname and rename the passed in parameter to be the same.
open_file() can now use parent_dir_fname->fsp for handle-based
access calls.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 066729f8ce84240026ab02a26c3824e2a31d226b
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 16:49:44 2021 -0700
s3: smbd: In open_file_ntcreate() initialize the local parent_dir_fname from the passed in parent_dir_fname_in.
We can now remove the call to parent_smb_fname().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 64bd0ae35836bd9213c1f5c15f208052ac290b04
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 16:47:34 2021 -0700
s3: smbd: Pass parent_dir_fname_in, smb_fname_atname_in from create_file_unixpath() to open_file_ntcreate().
Not yet used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 748f693a9c5a03542e77da893d3f4b957697482a
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 16:39:35 2021 -0700
s3: smbd: In mkdir_internal(), remove the local parent_dir_fname. We pass it in from the caller now.
This will allow us to change directory_has_default_acl() to
directory_has_default_acl_fsp() later.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 8d4a73db8be6a7da930207893a7433d1fbcf8cf5
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 16:36:43 2021 -0700
s3: smbd: In mkdir_internal(), use the passed in 'smb_fname_atname' instead of a local 'base_name' variable.
atname is a better name, as base_name refers to the name without streams
and this is nothing to do with streams.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit da5762de7163ffcc8aaec70b0733abafb9a2b129
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 16:33:58 2021 -0700
s3: smbd: In mkdir_internal() assign the passed in parent_dir_fname_in, smb_fname_atname_in to the local variables.
We don't need the parent_pathref() and more, and as we don't
own parent_dir_fname anymore, don't free it on exit.
Next step will be to remove the local variables.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 7a06544d188daca6c63bdea6d531f2ddc501b54f
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 16:28:08 2021 -0700
s3: smbd: Pass parent_dir_fname_in, smb_fname_atname_in to mkdir_internal().
Not yet used. Next step will be to use them to replace the
internal parent_dir_fname,base_name variables inside mkdir_internal().
Annotate them so we know what these extra params are.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 00baf898e8c0d09ac2f6f712e9818dc35b05b380
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 16:13:14 2021 -0700
s3: smbd: Pass in the newly created parent_dir_fname and smb_fname_atname to open_directory().
Not yet used.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 7aa5acb895f9401ab43bac4880e266f49620ce1c
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 16:09:24 2021 -0700
s3: smbd: Get a parent pathref in create_file_unixpath().
Not yet used.
We will be passing this down to open_directory() and
open_file_ntcreate() and using it within create_file_unixpath()
as all of these functions need a parent pathref to check parent
ACLs etc.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit daadab4a85bdcb9242c1821b4d62377dbc77d681
Author: Jeremy Allison <jra at samba.org>
Date: Thu May 20 15:32:13 2021 -0700
s3: smbd: Change rename_internals_fsp() to use check_parent_access_fsp().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 8d5e5095c062adf83492939fdfb11fdce11027aa
Author: Jeremy Allison <jra at samba.org>
Date: Thu May 20 15:20:42 2021 -0700
s3: smbd: Make mkdir_internal() use check_parent_access_fsp().
We already have a parent pathref fsp here.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 133196790a6fee0aa522937773e31210202ac96b
Author: Jeremy Allison <jra at samba.org>
Date: Thu May 20 15:17:09 2021 -0700
s3: smbd: Add check_parent_access_fsp().
Next migrate check_parent_access() users over to it.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit e81aa6e3580e74ea12ca0f6885b311ea9c1ae1ff
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 15:53:57 2021 -0700
s3: torture: Change cmd_sys_acl_blob_get_file() to be handle based.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 5f3599fab00ba8ba238a84d301394760d4d0b307
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 13:22:02 2021 -0700
s3: smbd: copy_access_posix_acl(), SMB_VFS_SYS_ACL_GET_FILE() -> SMB_VFS_SYS_ACL_GET_FD().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 23217ced3e611fe3c52277bd1efb09deaecfa382
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 13:20:22 2021 -0700
s3: smbd: directory_has_default_posix_acl(), SMB_VFS_SYS_ACL_GET_FILE() -> SMB_VFS_SYS_ACL_GET_FD().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 9042bdd0dd82d8c1f64c94c660ff53c2ed106de2
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 13:15:57 2021 -0700
s3: smbd: In get_acl_group_bits(), SMB_VFS_SYS_ACL_GET_FILE() -> SMB_VFS_SYS_ACL_GET_FD().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit d2ff049ba9b68d017002ce92251e3a03593ef8c5
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 13:12:55 2021 -0700
s3: smbd: Ensure we only call get_acl_group_bits() with a valid smb_fname->fsp.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 91cd0e87f92b3aa2e960a4d697c470a48df52ee2
Author: Noel Power <noel.power at suse.com>
Date: Thu Jun 3 10:49:06 2021 -0700
s3/smbd: make posix_sys_acl_blob_get_fd actually use handle api with the changes to underlying sys_acl_get_fd_fn we now can pass the acl type down
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit a8e49253d734fd84e416cd4a5ff430af6a744e7e
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 10:52:47 2021 -0700
s3: torture: cmd_sys_acl_get_file(), SMB_VFS_SYS_ACL_GET_FILE() -> SMB_VFS_SYS_ACL_GET_FD().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b62d90f91f4361d98ff7912c15efc031646f8be7
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 10:47:34 2021 -0700
s3: VFS: vxfs: Change use of SMB_VFS_SYS_ACL_GET_FILE() -> SMB_VFS_SYS_ACL_GET_FD().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 7e8849032ff4536649c633af33a1140d54db0322
Author: Jeremy Allison <jra at samba.org>
Date: Mon May 24 15:44:29 2021 -0700
s3: smbd: In smb_query_posix_acl(), remove a use of SMB_VFS_SYS_ACL_GET_FILE().
We can now use SMB_VFS_SYS_ACL_GET_FD() on the directory fsp instead.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit e59244461f477b01fe3110fcf5d73f2d9962bf4f
Author: Noel Power <noel.power at suse.com>
Date: Fri May 14 15:26:46 2021 +0100
VFS: SMB_VFS_SYS_ACL_GET_FD: Modify api to take additional type param
Modify all implementations (and the definitions) related to
SMB_VFS_SYS_ACL_GET_FD to accept additional SMB_ACL_TYPE_T type param.
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 5504a5502d5146d38927f17bcda590e86c3427bc
Author: Noel Power <noel.power at suse.com>
Date: Fri May 14 13:30:29 2021 +0100
VFS: SMB_VFS_SYS_ACL_GET_FD: Add SMB_ACL_TYPE_T type arg
preparatory patch for api change to SMB_VFS_SYS_ACL_GET_FD to add new
SMB_ACL_TYPE_T arg to SMB_VFS_SYS_ACL_GET_FD.
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit a706a544775fca18a40eb063656a8deb57867ec3
Author: Jeremy Allison <jra at samba.org>
Date: Thu May 20 12:26:47 2021 -0700
s3: smbd: Re-use refuse_symlink_fsp() in set/get security descriptors.
Now we have one common function for refusing access on symlinks.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit c66305f4c8161a5eef4cb541ae496fca9383296f
Author: Jeremy Allison <jra at samba.org>
Date: Thu May 20 12:13:19 2021 -0700
s3: smbd: Make refuse_symlink_fsp() public so we can reuse in nttrans.c
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 580d691c9bbd65a7ce0e28ff9f4ed2acc4fdf51a
Author: Jeremy Allison <jra at samba.org>
Date: Thu May 20 12:02:22 2021 -0700
s3: smbd: Change refuse_symlink() -> refuse_symlink_fsp()
Simplify the interals to check for everything that
would make an fsp something that is open on a symlink.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 8f9606b26d69ecb0c42d044f6ce183186d97af7f
Author: Jeremy Allison <jra at samba.org>
Date: Thu May 20 11:55:45 2021 -0700
s3: smbd: Remove the NULL fsp use of refuse_symlink().
It makes no sense here and will allow us to rename
refuse_symlink() -> refuse_symlink_fsp() and clean it up.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit ddc226c8497d3c653d35f5811ddba1e71f626420
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 09:14:03 2021 -0700
s3: smbd: recursive_rmdir(), when calling synthetic_pathref() for a directory entry we've already stat()'ed, re-use the stat struct.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b3ca31905ed87d5c25f8bcca7d0e14ccefa70abe
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 09:22:28 2021 -0700
s3: smbd: rmdir_internals(), when calling synthetic_pathref() for a directory entry we've already stat()'ed, re-use the stat struct.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 92d143dbcb80fda46894f514d04d8f40c0c935c7
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 09:21:55 2021 -0700
s3: smbd: rmdir_internals(). Coding cleanup. Move TALLOC_FREE(dir_hnd) into the generic exit path.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit d880116fae16a17c36550c7915068b65a45b88c4
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 2 17:56:59 2021 -0700
s3: smbd: rmdir_internals(). Coding cleanup. Always use ISDOT(dname) || ISDOTDOT(dname).
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 153da186a1c85c5b33ddde43f6b81233f60f90d2
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 14:45:24 2021 -0700
s3: smbd: smbd_check_access_rights_fsp(), for a symlink handle just check the handle bits.
For the pathname verison of this function smbd_check_access_rights()
we return the st_mode bits turned into an NT ACL for a symlink.
For a symlink the mode bits are always 'lrwxrwxrwx' which means
smbd_check_access_rights() version always returned NT_STATUS_OK
for any access rights requested on a symlink.
For smbd_check_access_rights_fsp() to a symlink use the handle
access bits as this is a better representation of the access
allowed.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit c11f25b7ea132979ff0070ac4b29439ec3c9a279
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jun 3 17:37:57 2021 -0700
s3: smbd: Fix smbd_check_access_rights_fsp() to cope with fake/printer fsp's.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit ae5cb84fae60663cdd8a507a015ac3f9b8296647
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jun 3 17:05:51 2021 -0700
s3: smbd: Subtle change to semantics needed for smbd_check_access_rights_fsp().
smbd_check_access_rights() is checking permissions on a file *before*
open, so getting ACCESS_DENIED and mapping to NT_STATUS_OK when
reading the security descriptor is fine, as if we really don't have
access the open will fail.
smbd_check_access_rights_fsp() takes place *after* the open (pathref
or otherwise), so being unable to get the security decriptor should
be reported back to the caller and not mapped to NT_STATUS_OK.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 12ede1732a59f60453815471f7f56870dc2e9046
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 12:27:38 2021 -0700
s3: smbd: Cleanup - make SearchDir() static.
It's only used in dir.c
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 7a591e90e3359fd995c858282b0865519c40bb14
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 4 12:32:34 2021 -0700
s3: smbd: Cleanup - fix the comment for dptr_SearchDir().
It doesn't and never has skipped VETO or unreadable files.
It's only used in call_trans2findnext() in the SMB1 code
given a name already returned to the client to find a
resume position. Even if the client gave us a name that
it had never been given to it (client bug or malicious
client) we'd just start the search from the wrong position,
which doesn't cause problems (we still check for VETO
or unreadable before returning any names).
Worst thing that actually happens is the client messes
up their own search, which is what you'd expect from
giving an incorrect resume name.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit ae8313a4458fc314a841f90c00edf6b1ad4e44cf
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 20:58:34 2021 -0700
s3: smbd: In open_directory() move the call to smbd_check_access_rights() until after the fsp is set up.
This doesn't matter now, but later we will move to a handle-based call to
check access rights, so we will need the full handle setup.
Add a fd_close(fsp) in the error path now this is done after the fd open.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit d2d52ebb6ccadc5b1287935b245a8b06abe03cb9
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 20:55:44 2021 -0700
s3: smbd: In open_file(), remove post-open check for opening a directory.
Now we do an early check for opening a directory, this code
could never have been triggered.
The only case we need to consider now is when the filesystem
object exists as a file when we enter open_file() and another
smbd removes and then re-creates the object as a directory before we
call reopen_from_fsp(). In that case, we will open the object,
and come back out to open_file_ntcreate(), where the race
condition detection code that calls check_same_dev_ino()
will catch the case and error out the client request.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit f1ca59b81b20b17827c1ce5425f7da0e45a002af
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 13:10:30 2021 -0700
s3: smbd: Make open_file() fail early for an existing directory we are trying to open.
Makes sure we keep the pathref fd open for the NT_FILE_IS_A_DIRECTORY case.
Signed-off-by: Jeremy Allison <jra at samba.org>
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 68124e2a46fe1766c8265a644c3f1994c2f125e7
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 13:16:31 2021 -0700
s3: smbd: Cleanup. open_file(). If SMB_VFS_FSTAT() fails report the error.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit aaba2918f8bae15156bce88ef04f821d7e2ea89b
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 12:18:13 2021 -0700
s3: smbd: Cleanup. open_file(). This returns NTSTATUS, don't set errno explicitly internally.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 99c02ff6c157c728f766c4891c74d365ecd36a4b
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 12:17:14 2021 -0700
s3: smbd: Cleanup. open_file_ntcreate(). This returns NTSTATUS, don't set errno explicitly internally.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit a80456e61de2d79a9f896b22ca2772c53994f8ec
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jun 7 09:44:23 2021 -0700
s3: VFS: shadow_copy2: Code cleanup. In shadow_copy2_get_shadow_copy_data() preserve errno accross cleanup syscalls.
This VFS function should really return an NTSTATUS but that is
a patch for another day.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 250a5df6bc6602f2ca7b39725b7c3c29f6e70853
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 17:36:50 2021 -0700
s3: VFS: posixacl: Fix the fallback code in posixacl_sys_acl_set_fd().
We weren't maping or using the incoming SMB_ACL_TYPE_T type
parameter correctly.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit fc8b3f1878f3654379de2c9ca30bfe4084bc6633
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 8 17:10:59 2021 -0700
s3: VFS: posixacl: Missing acl_free() in error code path.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
-----------------------------------------------------------------------
Summary of changes:
examples/VFS/skel_opaque.c | 36 +-
examples/VFS/skel_transparent.c | 42 +--
source3/include/smb_acls.h | 14 +-
source3/include/vfs.h | 42 +--
source3/include/vfs_macros.h | 23 +-
source3/lib/sysacls.c | 147 ++------
source3/modules/The_New_VFS.org | 6 +-
source3/modules/The_New_VFS.txt | 6 +-
source3/modules/non_posix_acls.c | 41 --
source3/modules/non_posix_acls.h | 5 -
source3/modules/posixacl_xattr.c | 17 +-
source3/modules/posixacl_xattr.h | 1 +
source3/modules/vfs_acl_common.c | 213 +----------
source3/modules/vfs_acl_tdb.c | 76 ----
source3/modules/vfs_acl_xattr.c | 78 ----
source3/modules/vfs_afsacl.c | 41 --
source3/modules/vfs_aixacl.c | 88 +----
source3/modules/vfs_aixacl2.c | 83 +---
source3/modules/vfs_cap.c | 39 --
source3/modules/vfs_catia.c | 94 +----
source3/modules/vfs_ceph.c | 2 -
source3/modules/vfs_ceph_snapshots.c | 111 ++----
source3/modules/vfs_default.c | 71 +---
source3/modules/vfs_fake_acls.c | 45 +--
source3/modules/vfs_fruit.c | 6 +-
source3/modules/vfs_full_audit.c | 82 +---
source3/modules/vfs_glusterfs.c | 3 -
source3/modules/vfs_gpfs.c | 161 +-------
source3/modules/vfs_hpuxacl.c | 12 +-
source3/modules/vfs_media_harmony.c | 108 ------
source3/modules/vfs_nfs4acl_xattr.c | 116 +-----
source3/modules/vfs_not_implemented.c | 36 +-
source3/modules/vfs_posixacl.c | 84 ++---
source3/modules/vfs_posixacl.h | 11 +-
source3/modules/vfs_shadow_copy2.c | 120 +-----
source3/modules/vfs_snapper.c | 60 ---
source3/modules/vfs_solarisacl.c | 113 +-----
source3/modules/vfs_solarisacl.h | 5 -
source3/modules/vfs_time_audit.c | 83 +---
source3/modules/vfs_unityed_media.c | 110 ------
source3/modules/vfs_vxfs.c | 23 +-
source3/modules/vfs_zfsacl.c | 93 +----
source3/rpc_server/eventlog/srv_eventlog_nt.c | 36 +-
source3/smbd/close.c | 174 ++++++---
source3/smbd/dir.c | 368 +++++++++---------
source3/smbd/dosmode.c | 33 +-
source3/smbd/fake_file.c | 30 +-
source3/smbd/file_access.c | 89 +++--
source3/smbd/globals.h | 5 +-
source3/smbd/notify.c | 54 ++-
source3/smbd/nttrans.c | 26 +-
source3/smbd/open.c | 524 ++++++++++++--------------
source3/smbd/posix_acls.c | 159 ++------
source3/smbd/proto.h | 33 +-
source3/smbd/pysmbd.c | 46 ++-
source3/smbd/reply.c | 82 ++--
source3/smbd/smb2_create.c | 7 +-
source3/smbd/trans2.c | 57 +--
source3/smbd/vfs.c | 39 +-
source3/torture/cmd_vfs.c | 79 +++-
60 files changed, 1155 insertions(+), 3233 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 4ac5e61f1ff..2fad722de04 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -781,16 +781,6 @@ static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS skel_get_nt_acl_at(vfs_handle_struct *handle,
- struct files_struct *dirfsp,
- const struct smb_filename *smb_fname,
- uint32_t security_info,
- TALLOC_CTX *mem_ctx,
- struct security_descriptor **ppdesc)
-{
- return NT_STATUS_NOT_IMPLEMENTED;
-}
-
static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
uint32_t security_info_sent,
const struct security_descriptor *psd)
@@ -798,32 +788,15 @@ static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
return NT_STATUS_NOT_IMPLEMENTED;
}
-static SMB_ACL_T skel_sys_acl_get_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- TALLOC_CTX *mem_ctx)
-{
- errno = ENOSYS;
- return (SMB_ACL_T) NULL;
-}
-
static SMB_ACL_T skel_sys_acl_get_fd(vfs_handle_struct *handle,
- files_struct *fsp, TALLOC_CTX *mem_ctx)
+ files_struct *fsp,
+ SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx)
{
errno = ENOSYS;
return (SMB_ACL_T) NULL;
}
-static int skel_sys_acl_blob_get_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- TALLOC_CTX *mem_ctx,
- char **blob_description,
- DATA_BLOB *blob)
-{
- errno = ENOSYS;
- return -1;
-}
-
static int skel_sys_acl_blob_get_fd(vfs_handle_struct *handle,
files_struct *fsp, TALLOC_CTX *mem_ctx,
char **blob_description, DATA_BLOB *blob)
@@ -1086,14 +1059,11 @@ static struct vfs_fn_pointers skel_opaque_fns = {
/* NT ACL operations. */
.fget_nt_acl_fn = skel_fget_nt_acl,
- .get_nt_acl_at_fn = skel_get_nt_acl_at,
.fset_nt_acl_fn = skel_fset_nt_acl,
/* POSIX ACL operations. */
- .sys_acl_get_file_fn = skel_sys_acl_get_file,
.sys_acl_get_fd_fn = skel_sys_acl_get_fd,
- .sys_acl_blob_get_file_fn = skel_sys_acl_blob_get_file,
.sys_acl_blob_get_fd_fn = skel_sys_acl_blob_get_fd,
.sys_acl_set_fd_fn = skel_sys_acl_set_fd,
.sys_acl_delete_def_fd_fn = skel_sys_acl_delete_def_fd,
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 9138bde0872..6783996a5e0 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -1044,21 +1044,6 @@ static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
ppdesc);
}
-static NTSTATUS skel_get_nt_acl_at(vfs_handle_struct *handle,
- struct files_struct *dirfsp,
- const struct smb_filename *smb_fname,
- uint32_t security_info,
- TALLOC_CTX *mem_ctx,
- struct security_descriptor **ppdesc)
-{
- return SMB_VFS_NEXT_GET_NT_ACL_AT(handle,
- dirfsp,
- smb_fname,
- security_info,
- mem_ctx,
- ppdesc);
-}
-
static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
uint32_t security_info_sent,
const struct security_descriptor *psd)
@@ -1066,28 +1051,12 @@ static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
return SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
}
-static SMB_ACL_T skel_sys_acl_get_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- TALLOC_CTX *mem_ctx)
-{
- return SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, smb_fname, type, mem_ctx);
-}
-
static SMB_ACL_T skel_sys_acl_get_fd(vfs_handle_struct *handle,
- files_struct *fsp, TALLOC_CTX *mem_ctx)
-{
- return SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, mem_ctx);
-}
-
-static int skel_sys_acl_blob_get_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- TALLOC_CTX *mem_ctx,
- char **blob_description,
- DATA_BLOB *blob)
+ files_struct *fsp,
+ SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx)
{
- return SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, smb_fname, mem_ctx,
- blob_description, blob);
+ return SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, type, mem_ctx);
}
static int skel_sys_acl_blob_get_fd(vfs_handle_struct *handle,
@@ -1395,14 +1364,11 @@ static struct vfs_fn_pointers skel_transparent_fns = {
/* NT ACL operations. */
.fget_nt_acl_fn = skel_fget_nt_acl,
- .get_nt_acl_at_fn = skel_get_nt_acl_at,
.fset_nt_acl_fn = skel_fset_nt_acl,
/* POSIX ACL operations. */
- .sys_acl_get_file_fn = skel_sys_acl_get_file,
.sys_acl_get_fd_fn = skel_sys_acl_get_fd,
- .sys_acl_blob_get_file_fn = skel_sys_acl_blob_get_file,
.sys_acl_blob_get_fd_fn = skel_sys_acl_blob_get_fd,
.sys_acl_set_fd_fn = skel_sys_acl_set_fd,
.sys_acl_delete_def_fd_fn = skel_sys_acl_delete_def_fd,
diff --git a/source3/include/smb_acls.h b/source3/include/smb_acls.h
index 3e679e58f1f..7203dd27d75 100644
--- a/source3/include/smb_acls.h
+++ b/source3/include/smb_acls.h
@@ -58,18 +58,14 @@ int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p);
int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d);
int sys_acl_free_text(char *text);
int sys_acl_valid(SMB_ACL_T acl_d);
-SMB_ACL_T sys_acl_get_file(struct vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- TALLOC_CTX *mem_ctx);
-SMB_ACL_T sys_acl_get_fd(struct vfs_handle_struct *handle, struct files_struct *fsp,
+SMB_ACL_T sys_acl_get_fd(struct vfs_handle_struct *handle,
+ struct files_struct *fsp,
+ SMB_ACL_TYPE_T type,
TALLOC_CTX *mem_ctx);
-int sys_acl_set_file(struct vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
+int sys_acl_set_fd(struct vfs_handle_struct *handle,
+ struct files_struct *fsp,
SMB_ACL_TYPE_T type,
SMB_ACL_T acl_d);
-int sys_acl_set_fd(struct vfs_handle_struct *handle, struct files_struct *fsp,
- SMB_ACL_T acl_d);
int sys_acl_delete_def_fd(struct vfs_handle_struct *handle,
struct files_struct *fsp);
int no_acl_syscall_error(int err);
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 0f01da81148..5bc9f18ad57 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -355,6 +355,9 @@
* Version 45 - Add SMB_VFS_SYS_ACL_DELETE_DEF_FD
* Version 45 - Remove SMB_VFS_SYS_ACL_DELETE_DEF_FILE
* Version 45 - Add SMB_VFS_PARENT_PATHNAME
+ * Version 45 - Remove SMB_VFS_GET_NT_ACL_AT
+ * Version 45 - Remove SYS_ACL_GET_FILE
+ * Version 45 - Remove SYS_ACL_BLOB_GET_FILE
*/
#define SMB_VFS_INTERFACE_VERSION 45
@@ -1195,12 +1198,6 @@ struct vfs_fn_pointers {
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc);
- NTSTATUS (*get_nt_acl_at_fn)(struct vfs_handle_struct *handle,
- struct files_struct *dirfsp,
- const struct smb_filename *smb_fname,
- uint32_t security_info,
- TALLOC_CTX *mem_ctx,
- struct security_descriptor **ppdesc);
NTSTATUS (*fset_nt_acl_fn)(struct vfs_handle_struct *handle,
struct files_struct *fsp,
uint32_t security_info_sent,
@@ -1214,18 +1211,10 @@ struct vfs_fn_pointers {
/* POSIX ACL operations. */
- SMB_ACL_T (*sys_acl_get_file_fn)(struct vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- TALLOC_CTX *mem_ctx);
SMB_ACL_T (*sys_acl_get_fd_fn)(struct vfs_handle_struct *handle,
struct files_struct *fsp,
+ SMB_ACL_TYPE_T type,
TALLOC_CTX *mem_ctx);
- int (*sys_acl_blob_get_file_fn)(struct vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- TALLOC_CTX *mem_ctx,
- char **blob_description,
- DATA_BLOB *blob);
int (*sys_acl_blob_get_fd_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp,
TALLOC_CTX *mem_ctx, char **blob_description,
DATA_BLOB *blob);
@@ -1725,18 +1714,10 @@ NTSTATUS smb_vfs_call_audit_file(struct vfs_handle_struct *handle,
int smb_vfs_call_chmod_acl(struct vfs_handle_struct *handle,
const struct smb_filename *file,
mode_t mode);
-SMB_ACL_T smb_vfs_call_sys_acl_get_file(struct vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- TALLOC_CTX *mem_ctx);
SMB_ACL_T smb_vfs_call_sys_acl_get_fd(struct vfs_handle_struct *handle,
struct files_struct *fsp,
+ SMB_ACL_TYPE_T type,
TALLOC_CTX *mem_ctx);
-int smb_vfs_call_sys_acl_blob_get_file(struct vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- TALLOC_CTX *mem_ctx,
- char **blob_description,
- DATA_BLOB *blob);
int smb_vfs_call_sys_acl_blob_get_fd(struct vfs_handle_struct *handle,
struct files_struct *fsp,
TALLOC_CTX *mem_ctx,
@@ -2137,17 +2118,10 @@ NTSTATUS vfs_not_implemented_get_nt_acl_at(vfs_handle_struct *handle,
NTSTATUS vfs_not_implemented_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
uint32_t security_info_sent,
const struct security_descriptor *psd);
-SMB_ACL_T vfs_not_implemented_sys_acl_get_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- TALLOC_CTX *mem_ctx);
SMB_ACL_T vfs_not_implemented_sys_acl_get_fd(vfs_handle_struct *handle,
- files_struct *fsp, TALLOC_CTX *mem_ctx);
-int vfs_not_implemented_sys_acl_blob_get_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- TALLOC_CTX *mem_ctx,
- char **blob_description,
- DATA_BLOB *blob);
+ files_struct *fsp,
+ SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx);
int vfs_not_implemented_sys_acl_blob_get_fd(vfs_handle_struct *handle,
files_struct *fsp, TALLOC_CTX *mem_ctx,
char **blob_description, DATA_BLOB *blob);
diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index 71492b4db79..c5c7a993ac8 100644
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -474,11 +474,6 @@
#define SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, mem_ctx, ppdesc) \
smb_vfs_call_fget_nt_acl((handle)->next, (fsp), (security_info), (mem_ctx), (ppdesc))
-#define SMB_VFS_GET_NT_ACL_AT(conn, dirfsp, smb_fname, security_info, mem_ctx, ppdesc) \
- smb_vfs_call_get_nt_acl_at((conn)->vfs_handles, (dirfsp), (smb_fname), (security_info), (mem_ctx), (ppdesc))
-#define SMB_VFS_NEXT_GET_NT_ACL_AT(handle, dirfsp, smb_fname, security_info, mem_ctx, ppdesc) \
- smb_vfs_call_get_nt_acl_at((handle)->next, (dirfsp), (smb_fname), (security_info), (mem_ctx), (ppdesc))
-
#define SMB_VFS_AUDIT_FILE(conn, name, sacl, access_requested, access_denied) \
smb_vfs_call_audit_file((conn)->vfs_handles, (name), (sacl), (access_requested), (access_denied))
#define SMB_VFS_NEXT_AUDIT_FILE(handle, name, sacl, access_requested, access_denied) \
@@ -489,20 +484,10 @@
#define SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd) \
smb_vfs_call_fset_nt_acl((handle)->next, (fsp), (security_info_sent), (psd))
-#define SMB_VFS_SYS_ACL_GET_FILE(conn, smb_fname, type, mem_ctx) \
- smb_vfs_call_sys_acl_get_file((conn)->vfs_handles, (smb_fname), (type), (mem_ctx))
-#define SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, smb_fname, type, mem_ctx) \
- smb_vfs_call_sys_acl_get_file((handle)->next, (smb_fname), (type), (mem_ctx))
-
-#define SMB_VFS_SYS_ACL_GET_FD(fsp, mem_ctx) \
- smb_vfs_call_sys_acl_get_fd((fsp)->conn->vfs_handles, (fsp), (mem_ctx))
-#define SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, mem_ctx) \
- smb_vfs_call_sys_acl_get_fd((handle)->next, (fsp), (mem_ctx))
-
-#define SMB_VFS_SYS_ACL_BLOB_GET_FILE(conn, smb_fname, mem_ctx, blob_description, blob) \
- smb_vfs_call_sys_acl_blob_get_file((conn)->vfs_handles, (smb_fname), (mem_ctx), (blob_description), (blob))
-#define SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, smb_fname, mem_ctx, blob_description, blob) \
- smb_vfs_call_sys_acl_blob_get_file((handle)->next, (smb_fname), (mem_ctx), (blob_description), (blob))
+#define SMB_VFS_SYS_ACL_GET_FD(fsp, type, mem_ctx) \
+ smb_vfs_call_sys_acl_get_fd((fsp)->conn->vfs_handles, (fsp), (type), (mem_ctx))
+#define SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, type, mem_ctx) \
+ smb_vfs_call_sys_acl_get_fd((handle)->next, (fsp), (type), (mem_ctx))
#define SMB_VFS_SYS_ACL_BLOB_GET_FD(fsp, mem_ctx, blob_description, blob) \
smb_vfs_call_sys_acl_blob_get_fd((fsp)->conn->vfs_handles, (fsp), (mem_ctx), (blob_description), (blob))
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index b617bd9df14..d42337190c3 100644
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -48,7 +48,6 @@
* reorder the entries in the ACL.
*
* sys_acl_valid()
- * sys_acl_set_file()
* sys_acl_set_fd()
*/
@@ -359,31 +358,20 @@ int sys_acl_valid(SMB_ACL_T acl_d)
#if defined(HAVE_POSIX_ACLS)
-SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- TALLOC_CTX *mem_ctx)
-{
- return posixacl_sys_acl_get_file(handle, smb_fname, type, mem_ctx);
-}
-
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp, TALLOC_CTX *mem_ctx)
-{
- return posixacl_sys_acl_get_fd(handle, fsp, mem_ctx);
-}
-
-int sys_acl_set_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- SMB_ACL_T acl_d)
+SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle,
+ files_struct *fsp,
+ SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx)
{
- return posixacl_sys_acl_set_file(handle, smb_fname, type, acl_d);
+ return posixacl_sys_acl_get_fd(handle, fsp, type, mem_ctx);
}
-int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
+int sys_acl_set_fd(vfs_handle_struct *handle,
+ files_struct *fsp,
+ SMB_ACL_TYPE_T type,
SMB_ACL_T acl_d)
{
- return posixacl_sys_acl_set_fd(handle, fsp, SMB_ACL_TYPE_ACCESS, acl_d);
+ return posixacl_sys_acl_set_fd(handle, fsp, type, acl_d);
}
int sys_acl_delete_def_fd(vfs_handle_struct *handle,
@@ -394,32 +382,20 @@ int sys_acl_delete_def_fd(vfs_handle_struct *handle,
#elif defined(HAVE_AIX_ACLS)
-SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- TALLOC_CTX *mem_ctx)
-{
- return aixacl_sys_acl_get_file(handle, smb_fname, type, mem_ctx);
-}
-
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp,
- TALLOC_CTX *mem_ctx)
+SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle,
+ files_struct *fsp,
+ SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx)
{
return aixacl_sys_acl_get_fd(handle, fsp, mem_ctx);
}
-int sys_acl_set_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- SMB_ACL_T acl_d)
-{
- return aixacl_sys_acl_set_file(handle, smb_fname, type, acl_d);
-}
-
-int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
+int sys_acl_set_fd(vfs_handle_struct *handle,
+ files_struct *fsp,
+ SMB_ACL_TYPE_T type,
SMB_ACL_T acl_d)
{
- return aixacl_sys_acl_set_fd(handle, fsp, acl_d);
+ return aixacl_sys_acl_set_fd(handle, fsp, type, acl_d);
}
int sys_acl_delete_def_fd(vfs_handle_struct *handle,
@@ -429,36 +405,23 @@ int sys_acl_delete_def_fd(vfs_handle_struct *handle,
}
#elif defined(HAVE_SOLARIS_UNIXWARE_ACLS)
-SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- TALLOC_CTX *mem_ctx)
-{
- return solarisacl_sys_acl_get_file(handle, smb_fname, type,
- mem_ctx);
-}
-
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp,
+SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle,
+ files_struct *fsp,
+ SMB_ACL_TYPE_T type,
TALLOC_CTX *mem_ctx)
{
return solarisacl_sys_acl_get_fd(handle, fsp,
mem_ctx);
}
-int sys_acl_set_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- SMB_ACL_T acl_d)
-{
- return solarisacl_sys_acl_set_file(handle, smb_fname, type, acl_d);
-}
-
-int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
+int sys_acl_set_fd(vfs_handle_struct *handle,
+ files_struct *fsp,
+ SMB_ACL_TYPE_T type,
SMB_ACL_T acl_d)
{
return solarisacl_sys_acl_set_fd(handle,
fsp,
- SMB_ACL_TYPE_ACCESS,
+ type,
acl_d);
}
@@ -469,32 +432,20 @@ int sys_acl_delete_def_fd(vfs_handle_struct *handle,
}
#elif defined(HAVE_HPUX_ACLS)
-SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- TALLOC_CTX *mem_ctx)
-{
- return hpuxacl_sys_acl_get_file(handle, smb_fname, type, mem_ctx);
-}
-
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp,
- TALLOC_CTX *mem_ctx)
+SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle,
+ files_struct *fsp,
+ SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx)
{
return hpuxacl_sys_acl_get_fd(handle, fsp, mem_ctx);
}
-int sys_acl_set_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- SMB_ACL_T acl_d)
-{
- return hpuxacl_sys_acl_set_file(handle, smb_fname, type, acl_d);
-}
-
-int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
+int sys_acl_set_fd(vfs_handle_struct *handle,
+ files_struct *fsp,
+ SMB_ACL_TYPE_T type,
SMB_ACL_T acl_d)
{
- return hpuxacl_sys_acl_set_fd(handle, fsp, acl_d);
+ return hpuxacl_sys_acl_set_file(handle, fsp->fsp_name, type, acl_d);
}
int sys_acl_delete_def_fd(vfs_handle_struct *handle,
@@ -504,20 +455,9 @@ int sys_acl_delete_def_fd(vfs_handle_struct *handle,
}
#else /* No ACLs. */
-SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- TALLOC_CTX *mem_ctx)
-{
-#ifdef ENOTSUP
- errno = ENOTSUP;
-#else
- errno = ENOSYS;
-#endif
- return NULL;
-}
-
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp,
--
Samba Shared Repository
More information about the samba-cvs
mailing list