vfs: Remove audit_file function

Added in 2012 with 0dc3f423d25d3a, but I could not find any user of
that call.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>

diff --git a/docs-xml/manpages/vfs_full_audit.8.xml b/docs-xml/manpages/vfs_full_audit.8.xml
index 59e72e19091770ecbf50dbc4179f60de41035302..90989fbabf44c42fa4a97da7527788e2192d6834 100644 (file)
--- a/docs-xml/manpages/vfs_full_audit.8.xml
+++ b/docs-xml/manpages/vfs_full_audit.8.xml
@@ -39,7 +39,6 @@
 
        <simplelist>
        <member>aio_force</member>
-       <member>audit_file</member>
        <member>brl_lock_windows</member>
        <member>brl_unlock_windows</member>
        <member>chdir</member>

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 7d0e6e8ff6ddb149957ee4c2cdc3037e777d9584..b5d688edcad96cb7eed80c4d7b655b3829947d10 100644 (file)
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -922,15 +922,6 @@ static bool skel_aio_force(struct vfs_handle_struct *handle,
        return false;
 }
 
-static NTSTATUS skel_audit_file(struct vfs_handle_struct *handle,
-                               struct smb_filename *file,
-                               struct security_acl *sacl,
-                               uint32_t access_requested,
-                               uint32_t access_denied)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 static NTSTATUS skel_durable_cookie(struct vfs_handle_struct *handle,
                                    struct files_struct *fsp,
                                    TALLOC_CTX *mem_ctx,
@@ -1048,7 +1039,6 @@ static struct vfs_fn_pointers skel_opaque_fns = {
        .parent_pathname_fn = skel_parent_pathname,
        .fsctl_fn = skel_fsctl,
        .freaddir_attr_fn = skel_freaddir_attr,
-       .audit_file_fn = skel_audit_file,
 
        /* DOS attributes. */
        .get_dos_attributes_send_fn = skel_get_dos_attributes_send,

diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index bcc59cc10bc14d23cded8f3411bebb297f817baa..5564f07a7a5f279250b02ed4a6e0fd3b92d665fc 100644 (file)
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -1219,19 +1219,6 @@ static bool skel_aio_force(struct vfs_handle_struct *handle,
        return SMB_VFS_NEXT_AIO_FORCE(handle, fsp);
 }
 
-static NTSTATUS skel_audit_file(struct vfs_handle_struct *handle,
-                               struct smb_filename *file,
-                               struct security_acl *sacl,
-                               uint32_t access_requested,
-                               uint32_t access_denied)
-{
-       return SMB_VFS_NEXT_AUDIT_FILE(handle,
-                                      file,
-                                      sacl,
-                                      access_requested,
-                                      access_denied);
-}
-
 static NTSTATUS skel_durable_cookie(struct vfs_handle_struct *handle,
                                    struct files_struct *fsp,
                                    TALLOC_CTX *mem_ctx,
@@ -1362,7 +1349,6 @@ static struct vfs_fn_pointers skel_transparent_fns = {
        .parent_pathname_fn = skel_parent_pathname,
        .fsctl_fn = skel_fsctl,
        .freaddir_attr_fn = skel_freaddir_attr,
-       .audit_file_fn = skel_audit_file,
 
        /* DOS attributes. */
        .get_dos_attributes_send_fn = skel_get_dos_attributes_send,

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index c4320d8ed7e278525eb9d4c29917360bfb68d994..e99d84e36f8c48dfeb98885dea776e2e500412ae 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -395,6 +395,7 @@
  * Change to Version 52 - will ship with 4.24
  * Version 52 - Add rename_stream
  * Version 52 - Remove connectpath
+ * Version 52 - Remove audit_file
  */
 
 #define SMB_VFS_INTERFACE_VERSION 51
@@ -1289,12 +1290,6 @@ struct vfs_fn_pointers {
                                   uint32_t security_info_sent,
                                   const struct security_descriptor *psd);
 
-       NTSTATUS (*audit_file_fn)(struct vfs_handle_struct *handle,
-                                 struct smb_filename *file,
-                                 struct security_acl *sacl,
-                                 uint32_t access_requested,
-                                 uint32_t access_denied);
-
        /* POSIX ACL operations. */
 
        SMB_ACL_T (*sys_acl_get_fd_fn)(struct vfs_handle_struct *handle,
@@ -1812,11 +1807,6 @@ NTSTATUS smb_vfs_call_fset_nt_acl(struct vfs_handle_struct *handle,
                                  struct files_struct *fsp,
                                  uint32_t security_info_sent,
                                  const struct security_descriptor *psd);
-NTSTATUS smb_vfs_call_audit_file(struct vfs_handle_struct *handle,
-                                struct smb_filename *file,
-                                struct security_acl *sacl,
-                                uint32_t access_requested,
-                                uint32_t access_denied);
 int smb_vfs_call_chmod_acl(struct vfs_handle_struct *handle,
                                const struct smb_filename *file,
                                mode_t mode);
@@ -2288,11 +2278,6 @@ int vfs_not_implemented_fsetxattr(vfs_handle_struct *handle, struct files_struct
                                  int flags);
 bool vfs_not_implemented_aio_force(struct vfs_handle_struct *handle,
                                   struct files_struct *fsp);
-NTSTATUS vfs_not_implemented_audit_file(struct vfs_handle_struct *handle,
-                                       struct smb_filename *file,
-                                       struct security_acl *sacl,
-                                       uint32_t access_requested,
-                                       uint32_t access_denied);
 NTSTATUS vfs_not_implemented_durable_cookie(struct vfs_handle_struct *handle,
                                            struct files_struct *fsp,
                                            TALLOC_CTX *mem_ctx,

diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index 56983de6661e9206266d95b9a75f86110ad59ce4..4c98862f03959253e513e266525a97b4edb67121 100644 (file)
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -510,11 +510,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_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) \
-       smb_vfs_call_audit_file((handle)->next, (name), (sacl), (access_requested), (access_denied))
-
 #define SMB_VFS_FSET_NT_ACL(fsp, security_info_sent, psd) \
        smb_vfs_call_fset_nt_acl((fsp)->conn->vfs_handles, (fsp), (security_info_sent), (psd))
 #define SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd) \

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 9321206642585d94a8455b47f99bf8a2b06e738c..71f21b5d1fc8219d8c423fa0335cbb55f7f6c1e3 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -3512,15 +3512,6 @@ static NTSTATUS vfswrap_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp
        return result;
 }
 
-static NTSTATUS vfswrap_audit_file(struct vfs_handle_struct *handle,
-                                  struct smb_filename *file,
-                                  struct security_acl *sacl,
-                                  uint32_t access_requested,
-                                  uint32_t access_denied)
-{
-       return NT_STATUS_OK; /* Nothing to do here ... */
-}
-
 static SMB_ACL_T vfswrap_sys_acl_get_fd(vfs_handle_struct *handle,
                                        files_struct *fsp,
                                        SMB_ACL_TYPE_T type,
@@ -4119,7 +4110,6 @@ static struct vfs_fn_pointers vfs_default_fns = {
 
        .fget_nt_acl_fn = vfswrap_fget_nt_acl,
        .fset_nt_acl_fn = vfswrap_fset_nt_acl,
-       .audit_file_fn = vfswrap_audit_file,
 
        /* POSIX ACL operations. */
 

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 8bd72f93533c76ac8c20da2426e425484b03e3a9..dd05a86e25750086078f89e86b8bbf82f7b9e988 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -192,7 +192,6 @@ typedef enum _vfs_op_type {
 
        SMB_VFS_OP_FGET_NT_ACL,
        SMB_VFS_OP_FSET_NT_ACL,
-       SMB_VFS_OP_AUDIT_FILE,
 
        /* POSIX ACL operations. */
 
@@ -322,7 +321,6 @@ static struct {
        { SMB_VFS_OP_FSET_DOS_ATTRIBUTES, "fset_dos_attributes" },
        { SMB_VFS_OP_FGET_NT_ACL,       "fget_nt_acl" },
        { SMB_VFS_OP_FSET_NT_ACL,       "fset_nt_acl" },
-       { SMB_VFS_OP_AUDIT_FILE,        "audit_file" },
        { SMB_VFS_OP_SYS_ACL_GET_FD,    "sys_acl_get_fd" },
        { SMB_VFS_OP_SYS_ACL_BLOB_GET_FD,       "sys_acl_blob_get_fd" },
        { SMB_VFS_OP_SYS_ACL_SET_FD,    "sys_acl_set_fd" },
@@ -2562,27 +2560,6 @@ static NTSTATUS smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_stru
        return result;
 }
 
-static NTSTATUS smb_full_audit_audit_file(struct vfs_handle_struct *handle,
-                               struct smb_filename *file,
-                               struct security_acl *sacl,
-                               uint32_t access_requested,
-                               uint32_t access_denied)
-{
-       NTSTATUS result;
-
-       result = SMB_VFS_NEXT_AUDIT_FILE(handle,
-                                       file,
-                                       sacl,
-                                       access_requested,
-                                       access_denied);
-
-       do_log(SMB_VFS_OP_AUDIT_FILE, NT_STATUS_IS_OK(result), handle,
-                       "%s",
-                       smb_fname_str_do_log(handle->conn, file));
-
-       return result;
-}
-
 static SMB_ACL_T smb_full_audit_sys_acl_get_fd(vfs_handle_struct *handle,
                                               files_struct *fsp,
                                               SMB_ACL_TYPE_T type,
@@ -3001,7 +2978,6 @@ static struct vfs_fn_pointers vfs_full_audit_fns = {
        .fset_dos_attributes_fn = smb_full_audit_fset_dos_attributes,
        .fget_nt_acl_fn = smb_full_audit_fget_nt_acl,
        .fset_nt_acl_fn = smb_full_audit_fset_nt_acl,
-       .audit_file_fn = smb_full_audit_audit_file,
        .sys_acl_get_fd_fn = smb_full_audit_sys_acl_get_fd,
        .sys_acl_blob_get_fd_fn = smb_full_audit_sys_acl_blob_get_fd,
        .sys_acl_set_fd_fn = smb_full_audit_sys_acl_set_fd,

diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index 3f3a4f6199415232d3ec83636c8a1d09e04343cb..0fabb9a7e08bb38ea711fde0968900e5a4713f9a 100644 (file)
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -2641,7 +2641,6 @@ static struct vfs_fn_pointers glusterfs_fns = {
        /* NT ACL Operations */
        .fget_nt_acl_fn = NULL,
        .fset_nt_acl_fn = NULL,
-       .audit_file_fn = NULL,
 
        /* Posix ACL Operations */
        .sys_acl_get_fd_fn = posixacl_xattr_acl_get_fd,

diff --git a/source3/modules/vfs_not_implemented.c b/source3/modules/vfs_not_implemented.c
index 38a5ee1825bf6b988dbc72ab0a0a58c5fc90d1bd..20ee1ff46582f4783bd354f279d12b41eff44db4 100644 (file)
--- a/source3/modules/vfs_not_implemented.c
+++ b/source3/modules/vfs_not_implemented.c
@@ -1014,16 +1014,6 @@ bool vfs_not_implemented_aio_force(struct vfs_handle_struct *handle,
        return false;
 }
 
-_PUBLIC_
-NTSTATUS vfs_not_implemented_audit_file(struct vfs_handle_struct *handle,
-                                       struct smb_filename *file,
-                                       struct security_acl *sacl,
-                                       uint32_t access_requested,
-                                       uint32_t access_denied)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 _PUBLIC_
 NTSTATUS vfs_not_implemented_durable_cookie(struct vfs_handle_struct *handle,
                                            struct files_struct *fsp,
@@ -1144,7 +1134,6 @@ static struct vfs_fn_pointers vfs_not_implemented_fns = {
        .parent_pathname_fn = vfs_not_implemented_parent_pathname,
        .fsctl_fn = vfs_not_implemented_fsctl,
        .freaddir_attr_fn = vfs_not_implemented_freaddir_attr,
-       .audit_file_fn = vfs_not_implemented_audit_file,
 
        /* DOS attributes. */
        .get_dos_attributes_send_fn = vfs_not_implemented_get_dos_attributes_send,

diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c
index a4b04aa020fc162d0f8296b97fd4aa4107a230f3..3ff87a2a414d59747a54c0d58afa800dbbb6e586 100644 (file)
--- a/source3/modules/vfs_time_audit.c
+++ b/source3/modules/vfs_time_audit.c
@@ -2320,34 +2320,6 @@ static NTSTATUS smb_time_audit_fset_nt_acl(vfs_handle_struct *handle,
        return result;
 }
 
-static NTSTATUS smb_time_audit_audit_file(struct vfs_handle_struct *handle,
-                               struct smb_filename *smb_fname,
-                               struct security_acl *sacl,
-                               uint32_t access_requested,
-                               uint32_t access_denied)
-{
-       NTSTATUS result;
-       struct timespec ts1,ts2;
-       double timediff;
-
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_AUDIT_FILE(handle,
-                                       smb_fname,
-                                       sacl,
-                                       access_requested,
-                                       access_denied);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log_fname("audit_file",
-                       timediff,
-                       smb_fname->base_name);
-       }
-
-       return result;
-}
-
 static SMB_ACL_T smb_time_audit_sys_acl_get_fd(vfs_handle_struct *handle,
                                               files_struct *fsp,
                                               SMB_ACL_TYPE_T type,
@@ -2789,7 +2761,6 @@ static struct vfs_fn_pointers vfs_time_audit_fns = {
        .fset_dos_attributes_fn = smb_time_fset_dos_attributes,
        .fget_nt_acl_fn = smb_time_audit_fget_nt_acl,
        .fset_nt_acl_fn = smb_time_audit_fset_nt_acl,
-       .audit_file_fn = smb_time_audit_audit_file,
        .sys_acl_get_fd_fn = smb_time_audit_sys_acl_get_fd,
        .sys_acl_blob_get_fd_fn = smb_time_audit_sys_acl_blob_get_fd,
        .sys_acl_set_fd_fn = smb_time_audit_sys_acl_set_fd,

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 7c5f141b3db91c61bd654c590dbd8dc0e9520c0b..328df11d6af5e1356e3d588673b5046dc4d5eea3 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -2485,20 +2485,6 @@ NTSTATUS smb_vfs_call_fset_nt_acl(struct vfs_handle_struct *handle,
                                           psd);
 }
 
-NTSTATUS smb_vfs_call_audit_file(struct vfs_handle_struct *handle,
-                                struct smb_filename *file,
-                                struct security_acl *sacl,
-                                uint32_t access_requested,
-                                uint32_t access_denied)
-{
-       VFS_FIND(audit_file);
-       return handle->fns->audit_file_fn(handle, 
-                                         file, 
-                                         sacl, 
-                                         access_requested, 
-                                         access_denied);
-}
-
 SMB_ACL_T smb_vfs_call_sys_acl_get_fd(struct vfs_handle_struct *handle,
                                      struct files_struct *fsp,
                                      SMB_ACL_TYPE_T type,