The branch, master has been updated via 799387963c4 add some missing FSCTL defines via 14470e4e4c1 docs-xml: update list of posible VFS operations for vfs_full_audit via f57673d89e3 docs: improve desription of map acl inherit from ec312ee6fe5 tevent: Fix a tevent tutorial error
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 799387963c4a1fc707b975b24a12e5e112273042 Author: Björn Jacke <b...@sernet.de> Date: Wed May 6 17:45:29 2020 +0200 add some missing FSCTL defines as dodumented in https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-smb2/a64e55aa-1152-48e4-8206-edd96444e7f7 FSCTL_SET_OBJECT_ID_EXTENDED FSCTL_READ_FILE_USN_DATA FSCTL_WRITE_USN_CLOSE_RECORD FSCTL_QUERY_ON_DISK_VOLUME_INFO FSCTL_QUERY_SPARING_INFO FSCTL_DUPLICATE_EXTENTS_TO_FILE_EX FSCTL_STORAGE_QOS_CONTROL Signed-off-by: Bjoern Jacke <bja...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> Autobuild-User(master): Björn Jacke <bja...@samba.org> Autobuild-Date(master): Tue May 19 15:57:08 UTC 2020 on sn-devel-184 commit 14470e4e4c16cfc36384027c39c1685dea42ad26 Author: Björn Jacke <b...@sernet.de> Date: Tue May 19 12:42:31 2020 +0200 docs-xml: update list of posible VFS operations for vfs_full_audit the list of valid operations can be generated by grep "{ SMB_VFS_OP_" source3/modules/vfs_full_audit.c |sed 's/.*,[ \t]*"//;s/".*//'|grep -v NULL | sort BUG: https://bugzilla.samba.org/show_bug.cgi?id=14386 Signed-off-by: Bjoern Jacke <bja...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> commit f57673d89e3f404cbdf7c975fa0ae08d5f47f6b0 Author: Björn Jacke <b...@sernet.de> Date: Thu May 7 16:00:14 2020 +0200 docs: improve desription of map acl inherit Signed-off-by: Bjoern Jacke <bja...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> ----------------------------------------------------------------------- Summary of changes: docs-xml/manpages/vfs_full_audit.8.xml | 73 ++++++++++++++++++++------ docs-xml/smbdotconf/protocol/mapaclinherit.xml | 8 +-- libcli/smb/smb_constants.h | 8 +++ 3 files changed, 69 insertions(+), 20 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages/vfs_full_audit.8.xml b/docs-xml/manpages/vfs_full_audit.8.xml index 7b17e2e1ad4..674b032017d 100644 --- a/docs-xml/manpages/vfs_full_audit.8.xml +++ b/docs-xml/manpages/vfs_full_audit.8.xml @@ -38,60 +38,97 @@ complete set of Samba VFS operations:</para> <simplelist> + <member>aio_force</member> + <member>audit_file</member> + <member>brl_lock_windows</member> + <member>brl_unlock_windows</member> <member>chdir</member> <member>chflags</member> <member>chmod</member> - <member>chown</member> <member>close</member> <member>closedir</member> <member>connect</member> - <member>copy_chunk_send</member> - <member>copy_chunk_recv</member> + <member>connectpath</member> + <member>create_dfs_pathat</member> + <member>create_file</member> <member>disconnect</member> <member>disk_free</member> + <member>durable_cookie</member> + <member>durable_disconnect</member> + <member>durable_reconnect</member> + <member>fallocate</member> <member>fchmod</member> <member>fchown</member> - <member>fget_nt_acl</member> + <member>fdopendir</member> + <member>fget_dos_attributes</member> + <member>fget_nt_acl_at</member> <member>fgetxattr</member> + <member>file_id_create</member> <member>flistxattr</member> <member>fremovexattr</member> + <member>fs_capabilities</member> + <member>fsctl</member> + <member>fset_dos_attributes</member> <member>fset_nt_acl</member> <member>fsetxattr</member> + <member>fs_file_id</member> <member>fstat</member> <member>fsync</member> + <member>fsync_recv</member> + <member>fsync_send</member> <member>ftruncate</member> + <member>get_alloc_size</member> <member>get_compression</member> + <member>get_dfs_referrals</member> + <member>get_dos_attributes</member> + <member>get_dos_attributes_recv</member> + <member>get_dos_attributes_send</member> + <member>getlock</member> <member>get_nt_acl</member> <member>get_quota</member> + <member>get_real_filename</member> <member>get_shadow_copy_data</member> - <member>getlock</member> <member>getwd</member> <member>getxattr</member> + <member>getxattrat_recv</member> + <member>getxattrat_send</member> + <member>is_offline</member> <member>kernel_flock</member> - <member>link</member> + <member>lchown</member> + <member>linkat</member> <member>linux_setlease</member> <member>listxattr</member> <member>lock</member> <member>lseek</member> <member>lstat</member> - <member>mkdir</member> - <member>mknod</member> + <member>mkdirat</member> + <member>mknodat</member> + <member>ntimes</member> + <member>offload_read_recv</member> + <member>offload_read_send</member> + <member>offload_write_recv</member> + <member>offload_write_send</member> <member>open</member> - <member>opendir</member> <member>pread</member> + <member>pread_recv</member> + <member>pread_send</member> <member>pwrite</member> + <member>pwrite_recv</member> + <member>pwrite_send</member> <member>read</member> <member>readdir</member> - <member>readlink</member> + <member>readdir_attr</member> + <member>readlinkat</member> <member>realpath</member> + <member>recvfile</member> <member>removexattr</member> - <member>rename</member> + <member>renameat</member> <member>rewinddir</member> - <member>rmdir</member> <member>seekdir</member> <member>sendfile</member> <member>set_compression</member> - <member>set_nt_acl</member> + <member>set_dos_attributes</member> + <member>set_offline</member> <member>set_quota</member> <member>setxattr</member> <member>snap_check_path</member> @@ -99,15 +136,19 @@ <member>snap_delete</member> <member>stat</member> <member>statvfs</member> - <member>symlink</member> + <member>streaminfo</member> + <member>strict_lock_check</member> + <member>symlinkat</member> + <member>sys_acl_blob_get_fd</member> + <member>sys_acl_blob_get_file</member> <member>sys_acl_delete_def_file</member> <member>sys_acl_get_fd</member> <member>sys_acl_get_file</member> <member>sys_acl_set_fd</member> <member>sys_acl_set_file</member> <member>telldir</member> - <member>unlink</member> - <member>utime</member> + <member>translate_name</member> + <member>unlinkat</member> <member>write</member> </simplelist> diff --git a/docs-xml/smbdotconf/protocol/mapaclinherit.xml b/docs-xml/smbdotconf/protocol/mapaclinherit.xml index 3409232b7fe..28271f9d66b 100644 --- a/docs-xml/smbdotconf/protocol/mapaclinherit.xml +++ b/docs-xml/smbdotconf/protocol/mapaclinherit.xml @@ -6,10 +6,10 @@ <para>This boolean parameter controls whether <citerefentry><refentrytitle>smbd</refentrytitle> <manvolnum>8</manvolnum></citerefentry> will attempt to map the 'inherit' and 'protected' access control entry flags stored in Windows ACLs into an extended attribute - called user.SAMBA_PAI. This parameter only takes effect if Samba is being run - on a platform that supports extended attributes (Linux and IRIX so far) and - allows the Windows 2000 ACL editor to correctly use inheritance with the Samba - POSIX ACL mapping code. + called user.SAMBA_PAI (POSIX ACL Inheritance). This parameter requires + supports for extended attributes on the filesystem and + allows the Windows ACL editor to store inheritance information while + NT ACLs are mapped best-effort to the POSIX ACLs. </para> </description> <value type="default">no</value> diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h index 68476939a9a..07c22209881 100644 --- a/libcli/smb/smb_constants.h +++ b/libcli/smb/smb_constants.h @@ -532,17 +532,25 @@ enum csc_policy { #define FSCTL_SET_REPARSE_POINT (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00A4 | FSCTL_METHOD_BUFFERED) #define FSCTL_GET_REPARSE_POINT (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00A8 | FSCTL_METHOD_BUFFERED) #define FSCTL_DELETE_REPARSE_POINT (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00AC | FSCTL_METHOD_BUFFERED) +#define FSCTL_SET_OBJECT_ID_EXTENDED (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00BC | FSCTL_METHOD_BUFFERED) #define FSCTL_CREATE_OR_GET_OBJECT_ID (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00C0 | FSCTL_METHOD_BUFFERED) #define FSCTL_SET_SPARSE (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00C4 | FSCTL_METHOD_BUFFERED) #define FSCTL_SET_ZERO_DATA (FSCTL_FILESYSTEM | FSCTL_ACCESS_WRITE | 0x00C8 | FSCTL_METHOD_BUFFERED) #define FSCTL_SET_ZERO_ON_DEALLOCATION (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0194 | FSCTL_METHOD_BUFFERED) +#define FSCTL_READ_FILE_USN_DATA (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00EB | FSCTL_METHOD_BUFFERED) +#define FSCTL_WRITE_USN_CLOSE_RECORD (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00EF | FSCTL_METHOD_BUFFERED) #define FSCTL_QUERY_ALLOCATED_RANGES (FSCTL_FILESYSTEM | FSCTL_ACCESS_READ | 0x00CC | FSCTL_METHOD_NEITHER) +#define FSCTL_QUERY_ON_DISK_VOLUME_INFO (FSCTL_FILESYSTEM | FSCTL_ACCESS_WRITE | 0x013C | FSCTL_METHOD_BUFFERED) +#define FSCTL_QUERY_SPARING_INFO (FSCTL_FILESYSTEM | FSCTL_ACCESS_WRITE | 0x0138 | FSCTL_METHOD_BUFFERED) #define FSCTL_FILE_LEVEL_TRIM (FSCTL_FILESYSTEM | FSCTL_ACCESS_WRITE | 0x0208 | FSCTL_METHOD_BUFFERED) #define FSCTL_OFFLOAD_READ (FSCTL_FILESYSTEM | FSCTL_ACCESS_READ | 0x0264 | FSCTL_METHOD_BUFFERED) #define FSCTL_OFFLOAD_WRITE (FSCTL_FILESYSTEM | FSCTL_ACCESS_WRITE | 0x0268 | FSCTL_METHOD_BUFFERED) #define FSCTL_SET_INTEGRITY_INFORMATION (FSCTL_FILESYSTEM | FSCTL_ACCESS_READ \ | FSCTL_ACCESS_WRITE | 0x0280 | FSCTL_METHOD_BUFFERED) +/* this one is really FSCTL_DUPLICATE_EXTENTS_TO_FILE in the MS docs: */ #define FSCTL_DUP_EXTENTS_TO_FILE (FSCTL_FILESYSTEM | FSCTL_ACCESS_WRITE | 0x0344 | FSCTL_METHOD_BUFFERED) +#define FSCTL_DUPLICATE_EXTENTS_TO_FILE_EX (FSCTL_FILESYSTEM | FSCTL_ACCESS_WRITE | 0x03E8 | FSCTL_METHOD_BUFFERED) +#define FSCTL_STORAGE_QOS_CONTROL (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0350 | FSCTL_METHOD_BUFFERED) #define FSCTL_SVHDX_SYNC_TUNNEL_REQUEST (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0304 | FSCTL_METHOD_BUFFERED) #define FSCTL_QUERY_SHARED_VIRTUAL_DISK_SUPPORT (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0300 | FSCTL_METHOD_BUFFERED) -- Samba Shared Repository