The branch, master has been updated via 6dcf8d76ccc vfs-docs: Fix the list of full_audit operations via fbcaecab3c7 full_audit: whitespace fixes via 0671d91ac8b s3: VFS: vfs_full_audit. Remove SMB_VFS_OP_FSYNC, it no longer exists in sync form. from 7e0e3f47cd6 s4/lib/registry: Fix use after free with popt 1.19
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 6dcf8d76ccce310515ffa693fa5a2120d8b5b206 Author: Volker Lendecke <v...@samba.org> Date: Fri Oct 7 09:52:19 2022 +0200 vfs-docs: Fix the list of full_audit operations I got this list with modified source3/modules/test_vfs_full_audit.c @@ -34,6 +34,7 @@ static void test_full_audit_array(void **state) for (i=0; i<SMB_VFS_OP_LAST; i++) { assert_non_null(vfs_op_names[i].name); assert_int_equal(vfs_op_names[i].type, i); + fprintf(stderr, "%s\n", vfs_op_names[i].name); } } which *should* be part of a script to fix docs-xml/manpages/vfs_full_audit.8.xml every time after a VFS change. I can't focus on the scripting right now, so just fix it manually. Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Fri Oct 14 17:58:56 UTC 2022 on sn-devel-184 commit fbcaecab3c748feb9015b26545098117f792389f Author: Volker Lendecke <v...@samba.org> Date: Fri Oct 7 09:31:14 2022 +0200 full_audit: whitespace fixes Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 0671d91ac8b1627c9f2ce4c6e014c2d5a22c8f06 Author: Jeremy Allison <j...@samba.org> Date: Fri Oct 7 17:39:39 2022 -0700 s3: VFS: vfs_full_audit. Remove SMB_VFS_OP_FSYNC, it no longer exists in sync form. Signed-off-by: Jeremy Allison <j...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> ----------------------------------------------------------------------- Summary of changes: docs-xml/manpages/vfs_full_audit.8.xml | 218 ++++++++++++++++----------------- source3/modules/vfs_full_audit.c | 30 +++-- 2 files changed, 122 insertions(+), 126 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 dcd71fa9b64..401ac5a0d8f 100644 --- a/docs-xml/manpages/vfs_full_audit.8.xml +++ b/docs-xml/manpages/vfs_full_audit.8.xml @@ -38,116 +38,114 @@ 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>close</member> - <member>closedir</member> - <member>connect</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>fdopendir</member> - <member>fget_compression</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_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>getwd</member> - <member>getxattr</member> - <member>getxattrat_recv</member> - <member>getxattrat_send</member> - <member>is_offline</member> - <member>filesystem_sharemode</member> - <member>lchown</member> - <member>linkat</member> - <member>linux_setlease</member> - <member>listxattr</member> - <member>lock</member> - <member>lseek</member> - <member>lstat</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>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>readdir_attr</member> - <member>readlinkat</member> - <member>realpath</member> - <member>recvfile</member> - <member>removexattr</member> - <member>renameat</member> - <member>rewinddir</member> - <member>seekdir</member> - <member>sendfile</member> - <member>set_compression</member> - <member>set_dos_attributes</member> - <member>set_offline</member> - <member>set_quota</member> - <member>setxattr</member> - <member>snap_check_path</member> - <member>snap_create</member> - <member>snap_delete</member> - <member>stat</member> - <member>statvfs</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_get_fd</member> - <member>sys_acl_get_file</member> - <member>sys_acl_set_fd</member> - <member>telldir</member> - <member>translate_name</member> - <member>unlinkat</member> - <member>write</member> + <member>aio_force</member> + <member>audit_file</member> + <member>brl_lock_windows</member> + <member>brl_unlock_windows</member> + <member>chdir</member> + <member>close</member> + <member>closedir</member> + <member>connect</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>fchflags</member> + <member>fchmod</member> + <member>fchown</member> + <member>fcntl</member> + <member>fdopendir</member> + <member>fget_compression</member> + <member>fget_dos_attributes</member> + <member>fget_nt_acl</member> + <member>fgetxattr</member> + <member>file_id_create</member> + <member>filesystem_sharemode</member> + <member>flistxattr</member> + <member>fntimes</member> + <member>freaddir_attr</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>fstatat</member> + <member>fstreaminfo</member> + <member>fsync_recv</member> + <member>fsync_send</member> + <member>ftruncate</member> + <member>get_alloc_size</member> + <member>get_dfs_referrals</member> + <member>get_dos_attributes_recv</member> + <member>get_dos_attributes_send</member> + <member>getlock</member> + <member>get_quota</member> + <member>get_real_filename</member> + <member>get_real_filename_at</member> + <member>get_shadow_copy_data</member> + <member>getwd</member> + <member>getxattrat_recv</member> + <member>getxattrat_send</member> + <member>is_offline</member> + <member>lchown</member> + <member>linkat</member> + <member>linux_setlease</member> + <member>lock</member> + <member>lseek</member> + <member>lstat</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>openat</member> + <member>parent_pathname</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>read_dfs_pathat</member> + <member>readdir</member> + <member>readlinkat</member> + <member>realpath</member> + <member>recvfile</member> + <member>removexattr</member> + <member>renameat</member> + <member>rewinddir</member> + <member>seekdir</member> + <member>sendfile</member> + <member>set_compression</member> + <member>set_offline</member> + <member>set_quota</member> + <member>snap_check_path</member> + <member>snap_create</member> + <member>snap_delete</member> + <member>stat</member> + <member>statvfs</member> + <member>strict_lock_check</member> + <member>symlinkat</member> + <member>sys_acl_blob_get_fd</member> + <member>sys_acl_delete_def_fd</member> + <member>sys_acl_get_fd</member> + <member>sys_acl_set_fd</member> + <member>telldir</member> + <member>translate_name</member> + <member>unlinkat</member> + <member>write</member> </simplelist> <para>In addition to these operations, diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 011e483de2f..d45298cf705 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -1,4 +1,4 @@ -/* +/* * Auditing VFS module for samba. Log selected file operations to syslog * facility. * @@ -12,12 +12,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, see <http://www.gnu.org/licenses/>. */ @@ -44,7 +44,7 @@ * smbd_audit: nobody|192.168.234.1|create_file|ok|0x3|file|open|/tmp/file.txt * * where "nobody" is the connected username and "192.168.234.1" is the - * client's IP address. + * client's IP address. * * Options: * @@ -134,7 +134,6 @@ typedef enum _vfs_op_type { SMB_VFS_OP_SENDFILE, SMB_VFS_OP_RECVFILE, SMB_VFS_OP_RENAMEAT, - SMB_VFS_OP_FSYNC, SMB_VFS_OP_FSYNC_SEND, SMB_VFS_OP_FSYNC_RECV, SMB_VFS_OP_STAT, @@ -272,7 +271,6 @@ static struct { { SMB_VFS_OP_SENDFILE, "sendfile" }, { SMB_VFS_OP_RECVFILE, "recvfile" }, { SMB_VFS_OP_RENAMEAT, "renameat" }, - { SMB_VFS_OP_FSYNC, "fsync" }, { SMB_VFS_OP_FSYNC_SEND, "fsync_send" }, { SMB_VFS_OP_FSYNC_RECV, "fsync_recv" }, { SMB_VFS_OP_STAT, "stat" }, @@ -1102,7 +1100,7 @@ static int smb_full_audit_closedir(vfs_handle_struct *handle, int result; result = SMB_VFS_NEXT_CLOSEDIR(handle, dirp); - + do_log(SMB_VFS_OP_CLOSEDIR, (result >= 0), handle, ""); return result; @@ -1203,7 +1201,7 @@ static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle, static int smb_full_audit_close(vfs_handle_struct *handle, files_struct *fsp) { int result; - + result = SMB_VFS_NEXT_CLOSE(handle, fsp); do_log(SMB_VFS_OP_CLOSE, (result >= 0), handle, "%s", @@ -1547,20 +1545,20 @@ static int smb_full_audit_stat(vfs_handle_struct *handle, struct smb_filename *smb_fname) { int result; - + result = SMB_VFS_NEXT_STAT(handle, smb_fname); do_log(SMB_VFS_OP_STAT, (result >= 0), handle, "%s", smb_fname_str_do_log(handle->conn, smb_fname)); - return result; + return result; } static int smb_full_audit_fstat(vfs_handle_struct *handle, files_struct *fsp, SMB_STRUCT_STAT *sbuf) { int result; - + result = SMB_VFS_NEXT_FSTAT(handle, fsp, sbuf); do_log(SMB_VFS_OP_FSTAT, (result >= 0), handle, "%s", @@ -1573,13 +1571,13 @@ static int smb_full_audit_lstat(vfs_handle_struct *handle, struct smb_filename *smb_fname) { int result; - + result = SMB_VFS_NEXT_LSTAT(handle, smb_fname); do_log(SMB_VFS_OP_LSTAT, (result >= 0), handle, "%s", smb_fname_str_do_log(handle->conn, smb_fname)); - return result; + return result; } static int smb_full_audit_fstatat( @@ -1646,7 +1644,7 @@ static int smb_full_audit_fchmod(vfs_handle_struct *handle, files_struct *fsp, mode_t mode) { int result; - + result = SMB_VFS_NEXT_FCHMOD(handle, fsp, mode); do_log(SMB_VFS_OP_FCHMOD, (result >= 0), handle, @@ -1705,7 +1703,7 @@ static struct smb_filename *smb_full_audit_getwd(vfs_handle_struct *handle, struct smb_filename *result; result = SMB_VFS_NEXT_GETWD(handle, ctx); - + do_log(SMB_VFS_OP_GETWD, (result != NULL), handle, "%s", result == NULL? "" : result->base_name); @@ -3059,6 +3057,6 @@ NTSTATUS vfs_full_audit_init(TALLOC_CTX *ctx) DEBUG(10, ("vfs_full_audit: Debug class number of " "'full_audit': %d\n", vfs_full_audit_debug_level)); } - + return ret; } -- Samba Shared Repository