s3-vfs: Use the system. namespace for fake ACLs
[kai/samba.git] / source3 / modules / vfs_full_audit.c
index 0ff05f4b0f11b4d5576b503050b0566e112ca222..48198e7fa5b3627af3316123d6cf1c125b596723 100644 (file)
 
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "system/syslog.h"
+#include "smbd/smbd.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "auth.h"
+#include "ntioctl.h"
+#include "lib/param/loadparm.h"
+#include "lib/util/bitmap.h"
+#include "lib/util/tevent_unix.h"
 
 static int vfs_full_audit_debug_level = DBGC_VFS;
 
@@ -104,13 +112,19 @@ typedef enum _vfs_op_type {
        SMB_VFS_OP_CLOSE,
        SMB_VFS_OP_READ,
        SMB_VFS_OP_PREAD,
+       SMB_VFS_OP_PREAD_SEND,
+       SMB_VFS_OP_PREAD_RECV,
        SMB_VFS_OP_WRITE,
        SMB_VFS_OP_PWRITE,
+       SMB_VFS_OP_PWRITE_SEND,
+       SMB_VFS_OP_PWRITE_RECV,
        SMB_VFS_OP_LSEEK,
        SMB_VFS_OP_SENDFILE,
        SMB_VFS_OP_RECVFILE,
        SMB_VFS_OP_RENAME,
        SMB_VFS_OP_FSYNC,
+       SMB_VFS_OP_FSYNC_SEND,
+       SMB_VFS_OP_FSYNC_RECV,
        SMB_VFS_OP_STAT,
        SMB_VFS_OP_FSTAT,
        SMB_VFS_OP_LSTAT,
@@ -159,51 +173,23 @@ typedef enum _vfs_op_type {
        SMB_VFS_OP_CHMOD_ACL,
        SMB_VFS_OP_FCHMOD_ACL,
 
-       SMB_VFS_OP_SYS_ACL_GET_ENTRY,
-       SMB_VFS_OP_SYS_ACL_GET_TAG_TYPE,
-       SMB_VFS_OP_SYS_ACL_GET_PERMSET,
-       SMB_VFS_OP_SYS_ACL_GET_QUALIFIER,
        SMB_VFS_OP_SYS_ACL_GET_FILE,
        SMB_VFS_OP_SYS_ACL_GET_FD,
-       SMB_VFS_OP_SYS_ACL_CLEAR_PERMS,
-       SMB_VFS_OP_SYS_ACL_ADD_PERM,
-       SMB_VFS_OP_SYS_ACL_TO_TEXT,
-       SMB_VFS_OP_SYS_ACL_INIT,
-       SMB_VFS_OP_SYS_ACL_CREATE_ENTRY,
-       SMB_VFS_OP_SYS_ACL_SET_TAG_TYPE,
-       SMB_VFS_OP_SYS_ACL_SET_QUALIFIER,
-       SMB_VFS_OP_SYS_ACL_SET_PERMSET,
-       SMB_VFS_OP_SYS_ACL_VALID,
        SMB_VFS_OP_SYS_ACL_SET_FILE,
        SMB_VFS_OP_SYS_ACL_SET_FD,
        SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE,
-       SMB_VFS_OP_SYS_ACL_GET_PERM,
-       SMB_VFS_OP_SYS_ACL_FREE_TEXT,
-       SMB_VFS_OP_SYS_ACL_FREE_ACL,
-       SMB_VFS_OP_SYS_ACL_FREE_QUALIFIER,
 
        /* EA operations. */
        SMB_VFS_OP_GETXATTR,
-       SMB_VFS_OP_LGETXATTR,
        SMB_VFS_OP_FGETXATTR,
        SMB_VFS_OP_LISTXATTR,
-       SMB_VFS_OP_LLISTXATTR,
        SMB_VFS_OP_FLISTXATTR,
        SMB_VFS_OP_REMOVEXATTR,
-       SMB_VFS_OP_LREMOVEXATTR,
        SMB_VFS_OP_FREMOVEXATTR,
        SMB_VFS_OP_SETXATTR,
-       SMB_VFS_OP_LSETXATTR,
        SMB_VFS_OP_FSETXATTR,
 
        /* aio operations */
-       SMB_VFS_OP_AIO_READ,
-       SMB_VFS_OP_AIO_WRITE,
-       SMB_VFS_OP_AIO_RETURN,
-       SMB_VFS_OP_AIO_CANCEL,
-       SMB_VFS_OP_AIO_ERROR,
-       SMB_VFS_OP_AIO_FSYNC,
-       SMB_VFS_OP_AIO_SUSPEND,
         SMB_VFS_OP_AIO_FORCE,
 
        /* offline operations */
@@ -244,6 +230,8 @@ static struct {
        { SMB_VFS_OP_CLOSE,     "close" },
        { SMB_VFS_OP_READ,      "read" },
        { SMB_VFS_OP_PREAD,     "pread" },
+       { SMB_VFS_OP_PREAD_SEND,        "pread_send" },
+       { SMB_VFS_OP_PREAD_RECV,        "pread_recv" },
        { SMB_VFS_OP_WRITE,     "write" },
        { SMB_VFS_OP_PWRITE,    "pwrite" },
        { SMB_VFS_OP_LSEEK,     "lseek" },
@@ -251,6 +239,8 @@ static struct {
        { SMB_VFS_OP_RECVFILE,  "recvfile" },
        { SMB_VFS_OP_RENAME,    "rename" },
        { SMB_VFS_OP_FSYNC,     "fsync" },
+       { SMB_VFS_OP_FSYNC_SEND,        "fsync_send" },
+       { SMB_VFS_OP_FSYNC_RECV,        "fsync_recv" },
        { SMB_VFS_OP_STAT,      "stat" },
        { SMB_VFS_OP_FSTAT,     "fstat" },
        { SMB_VFS_OP_LSTAT,     "lstat" },
@@ -292,50 +282,22 @@ static struct {
        { SMB_VFS_OP_FSET_NT_ACL,       "fset_nt_acl" },
        { SMB_VFS_OP_CHMOD_ACL, "chmod_acl" },
        { SMB_VFS_OP_FCHMOD_ACL,        "fchmod_acl" },
-       { SMB_VFS_OP_SYS_ACL_GET_ENTRY, "sys_acl_get_entry" },
-       { SMB_VFS_OP_SYS_ACL_GET_TAG_TYPE,      "sys_acl_get_tag_type" },
-       { SMB_VFS_OP_SYS_ACL_GET_PERMSET,       "sys_acl_get_permset" },
-       { SMB_VFS_OP_SYS_ACL_GET_QUALIFIER,     "sys_acl_get_qualifier" },
        { SMB_VFS_OP_SYS_ACL_GET_FILE,  "sys_acl_get_file" },
        { SMB_VFS_OP_SYS_ACL_GET_FD,    "sys_acl_get_fd" },
-       { SMB_VFS_OP_SYS_ACL_CLEAR_PERMS,       "sys_acl_clear_perms" },
-       { SMB_VFS_OP_SYS_ACL_ADD_PERM,  "sys_acl_add_perm" },
-       { SMB_VFS_OP_SYS_ACL_TO_TEXT,   "sys_acl_to_text" },
-       { SMB_VFS_OP_SYS_ACL_INIT,      "sys_acl_init" },
-       { SMB_VFS_OP_SYS_ACL_CREATE_ENTRY,      "sys_acl_create_entry" },
-       { SMB_VFS_OP_SYS_ACL_SET_TAG_TYPE,      "sys_acl_set_tag_type" },
-       { SMB_VFS_OP_SYS_ACL_SET_QUALIFIER,     "sys_acl_set_qualifier" },
-       { SMB_VFS_OP_SYS_ACL_SET_PERMSET,       "sys_acl_set_permset" },
-       { SMB_VFS_OP_SYS_ACL_VALID,     "sys_acl_valid" },
        { SMB_VFS_OP_SYS_ACL_SET_FILE,  "sys_acl_set_file" },
        { SMB_VFS_OP_SYS_ACL_SET_FD,    "sys_acl_set_fd" },
        { SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE,   "sys_acl_delete_def_file" },
-       { SMB_VFS_OP_SYS_ACL_GET_PERM,  "sys_acl_get_perm" },
-       { SMB_VFS_OP_SYS_ACL_FREE_TEXT, "sys_acl_free_text" },
-       { SMB_VFS_OP_SYS_ACL_FREE_ACL,  "sys_acl_free_acl" },
-       { SMB_VFS_OP_SYS_ACL_FREE_QUALIFIER,    "sys_acl_free_qualifier" },
        { SMB_VFS_OP_GETXATTR,  "getxattr" },
-       { SMB_VFS_OP_LGETXATTR, "lgetxattr" },
        { SMB_VFS_OP_FGETXATTR, "fgetxattr" },
        { SMB_VFS_OP_LISTXATTR, "listxattr" },
-       { SMB_VFS_OP_LLISTXATTR,        "llistxattr" },
        { SMB_VFS_OP_FLISTXATTR,        "flistxattr" },
        { SMB_VFS_OP_REMOVEXATTR,       "removexattr" },
-       { SMB_VFS_OP_LREMOVEXATTR,      "lremovexattr" },
        { SMB_VFS_OP_FREMOVEXATTR,      "fremovexattr" },
        { SMB_VFS_OP_SETXATTR,  "setxattr" },
-       { SMB_VFS_OP_LSETXATTR, "lsetxattr" },
        { SMB_VFS_OP_FSETXATTR, "fsetxattr" },
-       { SMB_VFS_OP_AIO_READ,  "aio_read" },
-       { SMB_VFS_OP_AIO_WRITE, "aio_write" },
-       { SMB_VFS_OP_AIO_RETURN,"aio_return" },
-       { SMB_VFS_OP_AIO_CANCEL,"aio_cancel" },
-       { SMB_VFS_OP_AIO_ERROR, "aio_error" },
-       { SMB_VFS_OP_AIO_FSYNC, "aio_fsync" },
-       { SMB_VFS_OP_AIO_SUSPEND,"aio_suspend" },
        { SMB_VFS_OP_AIO_FORCE, "aio_force" },
-       { SMB_VFS_OP_IS_OFFLINE, "aio_is_offline" },
-       { SMB_VFS_OP_SET_OFFLINE, "aio_set_offline" },
+       { SMB_VFS_OP_IS_OFFLINE, "is_offline" },
+       { SMB_VFS_OP_SET_OFFLINE, "set_offline" },
        { SMB_VFS_OP_LAST, NULL }
 };
 
@@ -350,7 +312,8 @@ static int audit_syslog_facility(vfs_handle_struct *handle)
                { LOG_LOCAL4, "LOCAL4" },
                { LOG_LOCAL5, "LOCAL5" },
                { LOG_LOCAL6, "LOCAL6" },
-               { LOG_LOCAL7, "LOCAL7" }
+               { LOG_LOCAL7, "LOCAL7" },
+               { -1, NULL}
        };
 
        int facility;
@@ -370,7 +333,8 @@ static int audit_syslog_priority(vfs_handle_struct *handle)
                { LOG_WARNING, "WARNING" },
                { LOG_NOTICE, "NOTICE" },
                { LOG_INFO, "INFO" },
-               { LOG_DEBUG, "DEBUG" }
+               { LOG_DEBUG, "DEBUG" },
+               { -1, NULL}
        };
 
        int priority;
@@ -396,12 +360,12 @@ static char *audit_prefix(TALLOC_CTX *ctx, connection_struct *conn)
                return NULL;
        }
        result = talloc_sub_advanced(ctx,
-                       lp_servicename(SNUM(conn)),
-                       conn->session_info->unix_name,
+                       lp_servicename(talloc_tos(), SNUM(conn)),
+                       conn->session_info->unix_info->unix_name,
                        conn->connectpath,
-                       conn->session_info->utok.gid,
-                       conn->session_info->sanitized_username,
-                       conn->session_info->info3->base.domain.string,
+                       conn->session_info->unix_token->gid,
+                       conn->session_info->unix_info->sanitized_username,
+                       conn->session_info->info->domain_name,
                        prefix);
        TALLOC_FREE(prefix);
        return result;
@@ -560,8 +524,6 @@ static void do_log(vfs_op_type op, bool success, vfs_handle_struct *handle,
        TALLOC_FREE(audit_pre);
        TALLOC_FREE(op_msg);
        TALLOC_FREE(tmp_do_log_ctx);
-
-       return;
 }
 
 /**
@@ -604,13 +566,13 @@ static int smb_full_audit_connect(vfs_handle_struct *handle,
                return result;
        }
 
-       pd = TALLOC_ZERO_P(handle, struct vfs_full_audit_private_data);
+       pd = talloc_zero(handle, struct vfs_full_audit_private_data);
        if (!pd) {
                SMB_VFS_NEXT_DISCONNECT(handle);
                return -1;
        }
 
-#ifndef WITH_SYSLOG
+#ifdef WITH_SYSLOG
        openlog("smbd_audit", 0, audit_syslog_facility(handle));
 #endif
 
@@ -636,12 +598,10 @@ static void smb_full_audit_disconnect(vfs_handle_struct *handle)
        SMB_VFS_NEXT_DISCONNECT(handle);
 
        do_log(SMB_VFS_OP_DISCONNECT, True, handle,
-              "%s", lp_servicename(SNUM(handle->conn)));
+              "%s", lp_servicename(talloc_tos(), SNUM(handle->conn)));
 
        /* The bitmaps will be disconnected when the private
           data is deleted. */
-
-       return;
 }
 
 static uint64_t smb_full_audit_disk_free(vfs_handle_struct *handle,
@@ -690,7 +650,8 @@ static int smb_full_audit_set_quota(struct vfs_handle_struct *handle,
 
 static int smb_full_audit_get_shadow_copy_data(struct vfs_handle_struct *handle,
                                struct files_struct *fsp,
-                               SHADOW_COPY_DATA *shadow_copy_data, bool labels)
+                               struct shadow_copy_data *shadow_copy_data,
+                               bool labels)
 {
        int result;
 
@@ -725,10 +686,10 @@ static uint32_t smb_full_audit_fs_capabilities(struct vfs_handle_struct *handle,
        return result;
 }
 
-static SMB_STRUCT_DIR *smb_full_audit_opendir(vfs_handle_struct *handle,
+static DIR *smb_full_audit_opendir(vfs_handle_struct *handle,
                          const char *fname, const char *mask, uint32 attr)
 {
-       SMB_STRUCT_DIR *result;
+       DIR *result;
 
        result = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 
@@ -737,10 +698,10 @@ static SMB_STRUCT_DIR *smb_full_audit_opendir(vfs_handle_struct *handle,
        return result;
 }
 
-static SMB_STRUCT_DIR *smb_full_audit_fdopendir(vfs_handle_struct *handle,
+static DIR *smb_full_audit_fdopendir(vfs_handle_struct *handle,
                          files_struct *fsp, const char *mask, uint32 attr)
 {
-       SMB_STRUCT_DIR *result;
+       DIR *result;
 
        result = SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
 
@@ -750,10 +711,10 @@ static SMB_STRUCT_DIR *smb_full_audit_fdopendir(vfs_handle_struct *handle,
        return result;
 }
 
-static SMB_STRUCT_DIRENT *smb_full_audit_readdir(vfs_handle_struct *handle,
-                                   SMB_STRUCT_DIR *dirp, SMB_STRUCT_STAT *sbuf)
+static struct dirent *smb_full_audit_readdir(vfs_handle_struct *handle,
+                                   DIR *dirp, SMB_STRUCT_STAT *sbuf)
 {
-       SMB_STRUCT_DIRENT *result;
+       struct dirent *result;
 
        result = SMB_VFS_NEXT_READDIR(handle, dirp, sbuf);
 
@@ -766,16 +727,15 @@ static SMB_STRUCT_DIRENT *smb_full_audit_readdir(vfs_handle_struct *handle,
 }
 
 static void smb_full_audit_seekdir(vfs_handle_struct *handle,
-                       SMB_STRUCT_DIR *dirp, long offset)
+                       DIR *dirp, long offset)
 {
        SMB_VFS_NEXT_SEEKDIR(handle, dirp, offset);
 
        do_log(SMB_VFS_OP_SEEKDIR, True, handle, "");
-       return;
 }
 
 static long smb_full_audit_telldir(vfs_handle_struct *handle,
-                       SMB_STRUCT_DIR *dirp)
+                       DIR *dirp)
 {
        long result;
 
@@ -787,12 +747,11 @@ static long smb_full_audit_telldir(vfs_handle_struct *handle,
 }
 
 static void smb_full_audit_rewinddir(vfs_handle_struct *handle,
-                       SMB_STRUCT_DIR *dirp)
+                       DIR *dirp)
 {
        SMB_VFS_NEXT_REWINDDIR(handle, dirp);
 
        do_log(SMB_VFS_OP_REWINDDIR, True, handle, "");
-       return;
 }
 
 static int smb_full_audit_mkdir(vfs_handle_struct *handle,
@@ -820,7 +779,7 @@ static int smb_full_audit_rmdir(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_closedir(vfs_handle_struct *handle,
-                         SMB_STRUCT_DIR *dirp)
+                         DIR *dirp)
 {
        int result;
 
@@ -832,12 +791,11 @@ static int smb_full_audit_closedir(vfs_handle_struct *handle,
 }
 
 static void smb_full_audit_init_search_op(vfs_handle_struct *handle,
-                       SMB_STRUCT_DIR *dirp)
+                       DIR *dirp)
 {
        SMB_VFS_NEXT_INIT_SEARCH_OP(handle, dirp);
 
        do_log(SMB_VFS_OP_INIT_SEARCH_OP, True, handle, "");
-       return;
 }
 
 static int smb_full_audit_open(vfs_handle_struct *handle,
@@ -950,7 +908,7 @@ static ssize_t smb_full_audit_read(vfs_handle_struct *handle, files_struct *fsp,
 }
 
 static ssize_t smb_full_audit_pread(vfs_handle_struct *handle, files_struct *fsp,
-                          void *data, size_t n, SMB_OFF_T offset)
+                          void *data, size_t n, off_t offset)
 {
        ssize_t result;
 
@@ -962,6 +920,76 @@ static ssize_t smb_full_audit_pread(vfs_handle_struct *handle, files_struct *fsp
        return result;
 }
 
+struct smb_full_audit_pread_state {
+       vfs_handle_struct *handle;
+       files_struct *fsp;
+       ssize_t ret;
+       int err;
+};
+
+static void smb_full_audit_pread_done(struct tevent_req *subreq);
+
+static struct tevent_req *smb_full_audit_pread_send(
+       struct vfs_handle_struct *handle, TALLOC_CTX *mem_ctx,
+       struct tevent_context *ev, struct files_struct *fsp,
+       void *data, size_t n, off_t offset)
+{
+       struct tevent_req *req, *subreq;
+       struct smb_full_audit_pread_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct smb_full_audit_pread_state);
+       if (req == NULL) {
+               do_log(SMB_VFS_OP_PREAD_SEND, false, handle, "%s",
+                      fsp_str_do_log(fsp));
+               return NULL;
+       }
+       state->handle = handle;
+       state->fsp = fsp;
+
+       subreq = SMB_VFS_NEXT_PREAD_SEND(state, ev, handle, fsp, data,
+                                        n, offset);
+       if (tevent_req_nomem(subreq, req)) {
+               do_log(SMB_VFS_OP_PREAD_SEND, false, handle, "%s",
+                      fsp_str_do_log(fsp));
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, smb_full_audit_pread_done, req);
+
+       do_log(SMB_VFS_OP_PREAD_SEND, true, handle, "%s", fsp_str_do_log(fsp));
+       return req;
+}
+
+static void smb_full_audit_pread_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct smb_full_audit_pread_state *state = tevent_req_data(
+               req, struct smb_full_audit_pread_state);
+
+       state->ret = SMB_VFS_PREAD_RECV(subreq, &state->err);
+       TALLOC_FREE(subreq);
+       tevent_req_done(req);
+}
+
+static ssize_t smb_full_audit_pread_recv(struct tevent_req *req, int *err)
+{
+       struct smb_full_audit_pread_state *state = tevent_req_data(
+               req, struct smb_full_audit_pread_state);
+
+       if (tevent_req_is_unix_error(req, err)) {
+               do_log(SMB_VFS_OP_PREAD_RECV, false, state->handle, "%s",
+                      fsp_str_do_log(state->fsp));
+               return -1;
+       }
+
+       do_log(SMB_VFS_OP_PREAD_RECV, (state->ret >= 0), state->handle, "%s",
+              fsp_str_do_log(state->fsp));
+
+       *err = state->err;
+       return state->ret;
+}
+
 static ssize_t smb_full_audit_write(vfs_handle_struct *handle, files_struct *fsp,
                           const void *data, size_t n)
 {
@@ -977,7 +1005,7 @@ static ssize_t smb_full_audit_write(vfs_handle_struct *handle, files_struct *fsp
 
 static ssize_t smb_full_audit_pwrite(vfs_handle_struct *handle, files_struct *fsp,
                            const void *data, size_t n,
-                           SMB_OFF_T offset)
+                           off_t offset)
 {
        ssize_t result;
 
@@ -989,8 +1017,79 @@ static ssize_t smb_full_audit_pwrite(vfs_handle_struct *handle, files_struct *fs
        return result;
 }
 
-static SMB_OFF_T smb_full_audit_lseek(vfs_handle_struct *handle, files_struct *fsp,
-                            SMB_OFF_T offset, int whence)
+struct smb_full_audit_pwrite_state {
+       vfs_handle_struct *handle;
+       files_struct *fsp;
+       ssize_t ret;
+       int err;
+};
+
+static void smb_full_audit_pwrite_done(struct tevent_req *subreq);
+
+static struct tevent_req *smb_full_audit_pwrite_send(
+       struct vfs_handle_struct *handle, TALLOC_CTX *mem_ctx,
+       struct tevent_context *ev, struct files_struct *fsp,
+       const void *data, size_t n, off_t offset)
+{
+       struct tevent_req *req, *subreq;
+       struct smb_full_audit_pwrite_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct smb_full_audit_pwrite_state);
+       if (req == NULL) {
+               do_log(SMB_VFS_OP_PWRITE_SEND, false, handle, "%s",
+                      fsp_str_do_log(fsp));
+               return NULL;
+       }
+       state->handle = handle;
+       state->fsp = fsp;
+
+       subreq = SMB_VFS_NEXT_PWRITE_SEND(state, ev, handle, fsp, data,
+                                        n, offset);
+       if (tevent_req_nomem(subreq, req)) {
+               do_log(SMB_VFS_OP_PWRITE_SEND, false, handle, "%s",
+                      fsp_str_do_log(fsp));
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, smb_full_audit_pwrite_done, req);
+
+       do_log(SMB_VFS_OP_PWRITE_SEND, true, handle, "%s",
+              fsp_str_do_log(fsp));
+       return req;
+}
+
+static void smb_full_audit_pwrite_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct smb_full_audit_pwrite_state *state = tevent_req_data(
+               req, struct smb_full_audit_pwrite_state);
+
+       state->ret = SMB_VFS_PWRITE_RECV(subreq, &state->err);
+       TALLOC_FREE(subreq);
+       tevent_req_done(req);
+}
+
+static ssize_t smb_full_audit_pwrite_recv(struct tevent_req *req, int *err)
+{
+       struct smb_full_audit_pwrite_state *state = tevent_req_data(
+               req, struct smb_full_audit_pwrite_state);
+
+       if (tevent_req_is_unix_error(req, err)) {
+               do_log(SMB_VFS_OP_PWRITE_RECV, false, state->handle, "%s",
+                      fsp_str_do_log(state->fsp));
+               return -1;
+       }
+
+       do_log(SMB_VFS_OP_PWRITE_RECV, (state->ret >= 0), state->handle, "%s",
+              fsp_str_do_log(state->fsp));
+
+       *err = state->err;
+       return state->ret;
+}
+
+static off_t smb_full_audit_lseek(vfs_handle_struct *handle, files_struct *fsp,
+                            off_t offset, int whence)
 {
        ssize_t result;
 
@@ -1004,7 +1103,7 @@ static SMB_OFF_T smb_full_audit_lseek(vfs_handle_struct *handle, files_struct *f
 
 static ssize_t smb_full_audit_sendfile(vfs_handle_struct *handle, int tofd,
                              files_struct *fromfsp,
-                             const DATA_BLOB *hdr, SMB_OFF_T offset,
+                             const DATA_BLOB *hdr, off_t offset,
                              size_t n)
 {
        ssize_t result;
@@ -1019,7 +1118,7 @@ static ssize_t smb_full_audit_sendfile(vfs_handle_struct *handle, int tofd,
 
 static ssize_t smb_full_audit_recvfile(vfs_handle_struct *handle, int fromfd,
                      files_struct *tofsp,
-                             SMB_OFF_T offset,
+                             off_t offset,
                              size_t n)
 {
        ssize_t result;
@@ -1059,6 +1158,74 @@ static int smb_full_audit_fsync(vfs_handle_struct *handle, files_struct *fsp)
        return result;    
 }
 
+struct smb_full_audit_fsync_state {
+       vfs_handle_struct *handle;
+       files_struct *fsp;
+       int ret;
+       int err;
+};
+
+static void smb_full_audit_fsync_done(struct tevent_req *subreq);
+
+static struct tevent_req *smb_full_audit_fsync_send(
+       struct vfs_handle_struct *handle, TALLOC_CTX *mem_ctx,
+       struct tevent_context *ev, struct files_struct *fsp)
+{
+       struct tevent_req *req, *subreq;
+       struct smb_full_audit_fsync_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct smb_full_audit_fsync_state);
+       if (req == NULL) {
+               do_log(SMB_VFS_OP_FSYNC_SEND, false, handle, "%s",
+                      fsp_str_do_log(fsp));
+               return NULL;
+       }
+       state->handle = handle;
+       state->fsp = fsp;
+
+       subreq = SMB_VFS_NEXT_FSYNC_SEND(state, ev, handle, fsp);
+       if (tevent_req_nomem(subreq, req)) {
+               do_log(SMB_VFS_OP_FSYNC_SEND, false, handle, "%s",
+                      fsp_str_do_log(fsp));
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, smb_full_audit_fsync_done, req);
+
+       do_log(SMB_VFS_OP_FSYNC_SEND, true, handle, "%s", fsp_str_do_log(fsp));
+       return req;
+}
+
+static void smb_full_audit_fsync_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct smb_full_audit_fsync_state *state = tevent_req_data(
+               req, struct smb_full_audit_fsync_state);
+
+       state->ret = SMB_VFS_FSYNC_RECV(subreq, &state->err);
+       TALLOC_FREE(subreq);
+       tevent_req_done(req);
+}
+
+static int smb_full_audit_fsync_recv(struct tevent_req *req, int *err)
+{
+       struct smb_full_audit_fsync_state *state = tevent_req_data(
+               req, struct smb_full_audit_fsync_state);
+
+       if (tevent_req_is_unix_error(req, err)) {
+               do_log(SMB_VFS_OP_FSYNC_RECV, false, state->handle, "%s",
+                      fsp_str_do_log(state->fsp));
+               return -1;
+       }
+
+       do_log(SMB_VFS_OP_FSYNC_RECV, (state->ret >= 0), state->handle, "%s",
+              fsp_str_do_log(state->fsp));
+
+       *err = state->err;
+       return state->ret;
+}
+
 static int smb_full_audit_stat(vfs_handle_struct *handle,
                               struct smb_filename *smb_fname)
 {
@@ -1200,14 +1367,14 @@ static int smb_full_audit_chdir(vfs_handle_struct *handle,
        return result;
 }
 
-static char *smb_full_audit_getwd(vfs_handle_struct *handle,
-                        char *path)
+static char *smb_full_audit_getwd(vfs_handle_struct *handle)
 {
        char *result;
 
-       result = SMB_VFS_NEXT_GETWD(handle, path);
+       result = SMB_VFS_NEXT_GETWD(handle);
        
-       do_log(SMB_VFS_OP_GETWD, (result != NULL), handle, "%s", path);
+       do_log(SMB_VFS_OP_GETWD, (result != NULL), handle, "%s",
+               result == NULL? "" : result);
 
        return result;
 }
@@ -1227,7 +1394,7 @@ static int smb_full_audit_ntimes(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_ftruncate(vfs_handle_struct *handle, files_struct *fsp,
-                          SMB_OFF_T len)
+                          off_t len)
 {
        int result;
 
@@ -1241,8 +1408,8 @@ static int smb_full_audit_ftruncate(vfs_handle_struct *handle, files_struct *fsp
 
 static int smb_full_audit_fallocate(vfs_handle_struct *handle, files_struct *fsp,
                           enum vfs_fallocate_mode mode,
-                          SMB_OFF_T offset,
-                          SMB_OFF_T len)
+                          off_t offset,
+                          off_t len)
 {
        int result;
 
@@ -1255,7 +1422,7 @@ static int smb_full_audit_fallocate(vfs_handle_struct *handle, files_struct *fsp
 }
 
 static bool smb_full_audit_lock(vfs_handle_struct *handle, files_struct *fsp,
-                      int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
+                      int op, off_t offset, off_t count, int type)
 {
        bool result;
 
@@ -1294,7 +1461,7 @@ static int smb_full_audit_linux_setlease(vfs_handle_struct *handle, files_struct
 }
 
 static bool smb_full_audit_getlock(vfs_handle_struct *handle, files_struct *fsp,
-                      SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid)
+                      off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid)
 {
        bool result;
 
@@ -1369,7 +1536,9 @@ static char *smb_full_audit_realpath(vfs_handle_struct *handle,
 
 static NTSTATUS smb_full_audit_notify_watch(struct vfs_handle_struct *handle,
                        struct sys_notify_context *ctx,
-                       struct notify_entry *e,
+                       const char *path,
+                       uint32_t *filter,
+                       uint32_t *subdir_filter,
                        void (*callback)(struct sys_notify_context *ctx,
                                        void *private_data,
                                        struct notify_event *ev),
@@ -1377,7 +1546,9 @@ static NTSTATUS smb_full_audit_notify_watch(struct vfs_handle_struct *handle,
 {
        NTSTATUS result;
 
-       result = SMB_VFS_NEXT_NOTIFY_WATCH(handle, ctx, e, callback, private_data, handle_p);
+       result = SMB_VFS_NEXT_NOTIFY_WATCH(handle, ctx, path,
+                                          filter, subdir_filter, callback,
+                                          private_data, handle_p);
 
        do_log(SMB_VFS_OP_NOTIFY_WATCH, NT_STATUS_IS_OK(result), handle, "");
 
@@ -1536,8 +1707,6 @@ static void smb_full_audit_strict_unlock(struct vfs_handle_struct *handle,
        do_log(SMB_VFS_OP_STRICT_UNLOCK, true, handle,
            "%s:%llu-%llu:%d", fsp_str_do_log(fsp), plock->start,
            plock->size);
-
-       return;
 }
 
 static NTSTATUS smb_full_audit_translate_name(struct vfs_handle_struct *handle,
@@ -1625,68 +1794,6 @@ static int smb_full_audit_fchmod_acl(vfs_handle_struct *handle, files_struct *fs
        return result;
 }
 
-static int smb_full_audit_sys_acl_get_entry(vfs_handle_struct *handle,
-
-                                  SMB_ACL_T theacl, int entry_id,
-                                  SMB_ACL_ENTRY_T *entry_p)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_GET_ENTRY(handle, theacl, entry_id,
-                                               entry_p);
-
-       do_log(SMB_VFS_OP_SYS_ACL_GET_ENTRY, (result >= 0), handle,
-              "");
-
-       return result;
-}
-
-static int smb_full_audit_sys_acl_get_tag_type(vfs_handle_struct *handle,
-
-                                     SMB_ACL_ENTRY_T entry_d,
-                                     SMB_ACL_TAG_T *tag_type_p)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_GET_TAG_TYPE(handle, entry_d,
-                                                  tag_type_p);
-
-       do_log(SMB_VFS_OP_SYS_ACL_GET_TAG_TYPE, (result >= 0), handle,
-              "");
-
-       return result;
-}
-
-static int smb_full_audit_sys_acl_get_permset(vfs_handle_struct *handle,
-
-                                    SMB_ACL_ENTRY_T entry_d,
-                                    SMB_ACL_PERMSET_T *permset_p)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_GET_PERMSET(handle, entry_d,
-                                                 permset_p);
-
-       do_log(SMB_VFS_OP_SYS_ACL_GET_PERMSET, (result >= 0), handle,
-              "");
-
-       return result;
-}
-
-static void * smb_full_audit_sys_acl_get_qualifier(vfs_handle_struct *handle,
-
-                                         SMB_ACL_ENTRY_T entry_d)
-{
-       void *result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_GET_QUALIFIER(handle, entry_d);
-
-       do_log(SMB_VFS_OP_SYS_ACL_GET_QUALIFIER, (result != NULL), handle,
-              "");
-
-       return result;
-}
-
 static SMB_ACL_T smb_full_audit_sys_acl_get_file(vfs_handle_struct *handle,
                                        const char *path_p,
                                        SMB_ACL_TYPE_T type)
@@ -1714,137 +1821,6 @@ static SMB_ACL_T smb_full_audit_sys_acl_get_fd(vfs_handle_struct *handle,
        return result;
 }
 
-static int smb_full_audit_sys_acl_clear_perms(vfs_handle_struct *handle,
-
-                                    SMB_ACL_PERMSET_T permset)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_CLEAR_PERMS(handle, permset);
-
-       do_log(SMB_VFS_OP_SYS_ACL_CLEAR_PERMS, (result >= 0), handle,
-              "");
-
-       return result;
-}
-
-static int smb_full_audit_sys_acl_add_perm(vfs_handle_struct *handle,
-
-                                 SMB_ACL_PERMSET_T permset,
-                                 SMB_ACL_PERM_T perm)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_ADD_PERM(handle, permset, perm);
-
-       do_log(SMB_VFS_OP_SYS_ACL_ADD_PERM, (result >= 0), handle,
-              "");
-
-       return result;
-}
-
-static char * smb_full_audit_sys_acl_to_text(vfs_handle_struct *handle,
-                                   SMB_ACL_T theacl,
-                                   ssize_t *plen)
-{
-       char * result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_TO_TEXT(handle, theacl, plen);
-
-       do_log(SMB_VFS_OP_SYS_ACL_TO_TEXT, (result != NULL), handle,
-              "");
-
-       return result;
-}
-
-static SMB_ACL_T smb_full_audit_sys_acl_init(vfs_handle_struct *handle,
-
-                                   int count)
-{
-       SMB_ACL_T result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_INIT(handle, count);
-
-       do_log(SMB_VFS_OP_SYS_ACL_INIT, (result != NULL), handle,
-              "");
-
-       return result;
-}
-
-static int smb_full_audit_sys_acl_create_entry(vfs_handle_struct *handle,
-                                     SMB_ACL_T *pacl,
-                                     SMB_ACL_ENTRY_T *pentry)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_CREATE_ENTRY(handle, pacl, pentry);
-
-       do_log(SMB_VFS_OP_SYS_ACL_CREATE_ENTRY, (result >= 0), handle,
-              "");
-
-       return result;
-}
-
-static int smb_full_audit_sys_acl_set_tag_type(vfs_handle_struct *handle,
-
-                                     SMB_ACL_ENTRY_T entry,
-                                     SMB_ACL_TAG_T tagtype)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_SET_TAG_TYPE(handle, entry,
-                                                  tagtype);
-
-       do_log(SMB_VFS_OP_SYS_ACL_SET_TAG_TYPE, (result >= 0), handle,
-              "");
-
-       return result;
-}
-
-static int smb_full_audit_sys_acl_set_qualifier(vfs_handle_struct *handle,
-
-                                      SMB_ACL_ENTRY_T entry,
-                                      void *qual)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_SET_QUALIFIER(handle, entry, qual);
-
-       do_log(SMB_VFS_OP_SYS_ACL_SET_QUALIFIER, (result >= 0), handle,
-              "");
-
-       return result;
-}
-
-static int smb_full_audit_sys_acl_set_permset(vfs_handle_struct *handle,
-
-                                    SMB_ACL_ENTRY_T entry,
-                                    SMB_ACL_PERMSET_T permset)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_SET_PERMSET(handle, entry, permset);
-
-       do_log(SMB_VFS_OP_SYS_ACL_SET_PERMSET, (result >= 0), handle,
-              "");
-
-       return result;
-}
-
-static int smb_full_audit_sys_acl_valid(vfs_handle_struct *handle,
-
-                              SMB_ACL_T theacl )
-{
-       int result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_VALID(handle, theacl);
-
-       do_log(SMB_VFS_OP_SYS_ACL_VALID, (result >= 0), handle,
-              "");
-
-       return result;
-}
-
 static int smb_full_audit_sys_acl_set_file(vfs_handle_struct *handle,
 
                                  const char *name, SMB_ACL_TYPE_T acltype,
@@ -1888,64 +1864,6 @@ static int smb_full_audit_sys_acl_delete_def_file(vfs_handle_struct *handle,
        return result;
 }
 
-static int smb_full_audit_sys_acl_get_perm(vfs_handle_struct *handle,
-
-                                 SMB_ACL_PERMSET_T permset,
-                                 SMB_ACL_PERM_T perm)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_GET_PERM(handle, permset, perm);
-
-       do_log(SMB_VFS_OP_SYS_ACL_GET_PERM, (result >= 0), handle,
-              "");
-
-       return result;
-}
-
-static int smb_full_audit_sys_acl_free_text(vfs_handle_struct *handle,
-
-                                  char *text)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_FREE_TEXT(handle, text);
-
-       do_log(SMB_VFS_OP_SYS_ACL_FREE_TEXT, (result >= 0), handle,
-              "");
-
-       return result;
-}
-
-static int smb_full_audit_sys_acl_free_acl(vfs_handle_struct *handle,
-
-                                 SMB_ACL_T posix_acl)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_FREE_ACL(handle, posix_acl);
-
-       do_log(SMB_VFS_OP_SYS_ACL_FREE_ACL, (result >= 0), handle,
-              "");
-
-       return result;
-}
-
-static int smb_full_audit_sys_acl_free_qualifier(vfs_handle_struct *handle,
-                                       void *qualifier,
-                                       SMB_ACL_TAG_T tagtype)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_SYS_ACL_FREE_QUALIFIER(handle, qualifier,
-                                                    tagtype);
-
-       do_log(SMB_VFS_OP_SYS_ACL_FREE_QUALIFIER, (result >= 0), handle,
-              "");
-
-       return result;
-}
-
 static ssize_t smb_full_audit_getxattr(struct vfs_handle_struct *handle,
                              const char *path,
                              const char *name, void *value, size_t size)
@@ -1960,20 +1878,6 @@ static ssize_t smb_full_audit_getxattr(struct vfs_handle_struct *handle,
        return result;
 }
 
-static ssize_t smb_full_audit_lgetxattr(struct vfs_handle_struct *handle,
-                              const char *path, const char *name,
-                              void *value, size_t size)
-{
-       ssize_t result;
-
-       result = SMB_VFS_NEXT_LGETXATTR(handle, path, name, value, size);
-
-       do_log(SMB_VFS_OP_LGETXATTR, (result >= 0), handle,
-              "%s|%s", path, name);
-
-       return result;
-}
-
 static ssize_t smb_full_audit_fgetxattr(struct vfs_handle_struct *handle,
                               struct files_struct *fsp,
                               const char *name, void *value, size_t size)
@@ -2000,18 +1904,6 @@ static ssize_t smb_full_audit_listxattr(struct vfs_handle_struct *handle,
        return result;
 }
 
-static ssize_t smb_full_audit_llistxattr(struct vfs_handle_struct *handle,
-                               const char *path, char *list, size_t size)
-{
-       ssize_t result;
-
-       result = SMB_VFS_NEXT_LLISTXATTR(handle, path, list, size);
-
-       do_log(SMB_VFS_OP_LLISTXATTR, (result >= 0), handle, "%s", path);
-
-       return result;
-}
-
 static ssize_t smb_full_audit_flistxattr(struct vfs_handle_struct *handle,
                                struct files_struct *fsp, char *list,
                                size_t size)
@@ -2040,20 +1932,6 @@ static int smb_full_audit_removexattr(struct vfs_handle_struct *handle,
        return result;
 }
 
-static int smb_full_audit_lremovexattr(struct vfs_handle_struct *handle,
-                             const char *path,
-                             const char *name)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_LREMOVEXATTR(handle, path, name);
-
-       do_log(SMB_VFS_OP_LREMOVEXATTR, (result >= 0), handle,
-              "%s|%s", path, name);
-
-       return result;
-}
-
 static int smb_full_audit_fremovexattr(struct vfs_handle_struct *handle,
                              struct files_struct *fsp,
                              const char *name)
@@ -2084,22 +1962,6 @@ static int smb_full_audit_setxattr(struct vfs_handle_struct *handle,
        return result;
 }
 
-static int smb_full_audit_lsetxattr(struct vfs_handle_struct *handle,
-                          const char *path,
-                          const char *name, const void *value, size_t size,
-                          int flags)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_LSETXATTR(handle, path, name, value, size,
-                                       flags);
-
-       do_log(SMB_VFS_OP_LSETXATTR, (result >= 0), handle,
-              "%s|%s", path, name);
-
-       return result;
-}
-
 static int smb_full_audit_fsetxattr(struct vfs_handle_struct *handle,
                           struct files_struct *fsp, const char *name,
                           const void *value, size_t size, int flags)
@@ -2114,92 +1976,38 @@ static int smb_full_audit_fsetxattr(struct vfs_handle_struct *handle,
        return result;
 }
 
-static int smb_full_audit_aio_read(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_AIO_READ(handle, fsp, aiocb);
-       do_log(SMB_VFS_OP_AIO_READ, (result >= 0), handle,
-              "%s", fsp_str_do_log(fsp));
-
-       return result;
-}
-
-static int smb_full_audit_aio_write(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_AIO_WRITE(handle, fsp, aiocb);
-       do_log(SMB_VFS_OP_AIO_WRITE, (result >= 0), handle,
-              "%s", fsp_str_do_log(fsp));
-
-       return result;
-}
-
-static ssize_t smb_full_audit_aio_return(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_AIO_RETURN(handle, fsp, aiocb);
-       do_log(SMB_VFS_OP_AIO_RETURN, (result >= 0), handle,
-              "%s", fsp_str_do_log(fsp));
-
-       return result;
-}
-
-static int smb_full_audit_aio_cancel(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_AIO_CANCEL(handle, fsp, aiocb);
-       do_log(SMB_VFS_OP_AIO_CANCEL, (result >= 0), handle,
-              "%s", fsp_str_do_log(fsp));
-
-       return result;
-}
-
-static int smb_full_audit_aio_error(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
-{
-       int result;
-
-       result = SMB_VFS_NEXT_AIO_ERROR(handle, fsp, aiocb);
-       do_log(SMB_VFS_OP_AIO_ERROR, (result >= 0), handle,
-              "%s", fsp_str_do_log(fsp));
-
-       return result;
-}
-
-static int smb_full_audit_aio_fsync(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, SMB_STRUCT_AIOCB *aiocb)
+static bool smb_full_audit_aio_force(struct vfs_handle_struct *handle,
+                                    struct files_struct *fsp)
 {
-       int result;
+       bool result;
 
-       result = SMB_VFS_NEXT_AIO_FSYNC(handle, fsp, op, aiocb);
-       do_log(SMB_VFS_OP_AIO_FSYNC, (result >= 0), handle,
+       result = SMB_VFS_NEXT_AIO_FORCE(handle, fsp);
+       do_log(SMB_VFS_OP_AIO_FORCE, result, handle,
                "%s", fsp_str_do_log(fsp));
 
        return result;
 }
 
-static int smb_full_audit_aio_suspend(struct vfs_handle_struct *handle, struct files_struct *fsp, const SMB_STRUCT_AIOCB * const aiocb[], int n, const struct timespec *ts)
+static bool smb_full_audit_is_offline(struct vfs_handle_struct *handle,
+                                     const struct smb_filename *fname,
+                                     SMB_STRUCT_STAT *sbuf)
 {
-       int result;
-
-       result = SMB_VFS_NEXT_AIO_SUSPEND(handle, fsp, aiocb, n, ts);
-       do_log(SMB_VFS_OP_AIO_SUSPEND, (result >= 0), handle,
-               "%s", fsp_str_do_log(fsp));
+       bool result;
 
+       result = SMB_VFS_NEXT_IS_OFFLINE(handle, fname, sbuf);
+       do_log(SMB_VFS_OP_IS_OFFLINE, result, handle, "%s",
+              smb_fname_str_do_log(fname));
        return result;
 }
 
-static bool smb_full_audit_aio_force(struct vfs_handle_struct *handle,
-                                    struct files_struct *fsp)
+static int smb_full_audit_set_offline(struct vfs_handle_struct *handle,
+                                     const struct smb_filename *fname)
 {
-       bool result;
-
-       result = SMB_VFS_NEXT_AIO_FORCE(handle, fsp);
-       do_log(SMB_VFS_OP_AIO_FORCE, result, handle,
-               "%s", fsp_str_do_log(fsp));
+       int result;
 
+       result = SMB_VFS_NEXT_SET_OFFLINE(handle, fname);
+       do_log(SMB_VFS_OP_SET_OFFLINE, result >= 0, handle, "%s",
+              smb_fname_str_do_log(fname));
        return result;
 }
 
@@ -2208,118 +2016,98 @@ static struct vfs_fn_pointers vfs_full_audit_fns = {
        /* Disk operations */
 
        .connect_fn = smb_full_audit_connect,
-       .disconnect = smb_full_audit_disconnect,
-       .disk_free = smb_full_audit_disk_free,
-       .get_quota = smb_full_audit_get_quota,
-       .set_quota = smb_full_audit_set_quota,
-       .get_shadow_copy_data = smb_full_audit_get_shadow_copy_data,
-       .statvfs = smb_full_audit_statvfs,
-       .fs_capabilities = smb_full_audit_fs_capabilities,
-       .opendir = smb_full_audit_opendir,
-       .fdopendir = smb_full_audit_fdopendir,
-       .readdir = smb_full_audit_readdir,
-       .seekdir = smb_full_audit_seekdir,
-       .telldir = smb_full_audit_telldir,
-       .rewind_dir = smb_full_audit_rewinddir,
-       .mkdir = smb_full_audit_mkdir,
-       .rmdir = smb_full_audit_rmdir,
-       .closedir = smb_full_audit_closedir,
-       .init_search_op = smb_full_audit_init_search_op,
-       .open = smb_full_audit_open,
-       .create_file = smb_full_audit_create_file,
+       .disconnect_fn = smb_full_audit_disconnect,
+       .disk_free_fn = smb_full_audit_disk_free,
+       .get_quota_fn = smb_full_audit_get_quota,
+       .set_quota_fn = smb_full_audit_set_quota,
+       .get_shadow_copy_data_fn = smb_full_audit_get_shadow_copy_data,
+       .statvfs_fn = smb_full_audit_statvfs,
+       .fs_capabilities_fn = smb_full_audit_fs_capabilities,
+       .opendir_fn = smb_full_audit_opendir,
+       .fdopendir_fn = smb_full_audit_fdopendir,
+       .readdir_fn = smb_full_audit_readdir,
+       .seekdir_fn = smb_full_audit_seekdir,
+       .telldir_fn = smb_full_audit_telldir,
+       .rewind_dir_fn = smb_full_audit_rewinddir,
+       .mkdir_fn = smb_full_audit_mkdir,
+       .rmdir_fn = smb_full_audit_rmdir,
+       .closedir_fn = smb_full_audit_closedir,
+       .init_search_op_fn = smb_full_audit_init_search_op,
+       .open_fn = smb_full_audit_open,
+       .create_file_fn = smb_full_audit_create_file,
        .close_fn = smb_full_audit_close,
-       .vfs_read = smb_full_audit_read,
-       .pread = smb_full_audit_pread,
-       .write = smb_full_audit_write,
-       .pwrite = smb_full_audit_pwrite,
-       .lseek = smb_full_audit_lseek,
-       .sendfile = smb_full_audit_sendfile,
-       .recvfile = smb_full_audit_recvfile,
-       .rename = smb_full_audit_rename,
-       .fsync = smb_full_audit_fsync,
-       .stat = smb_full_audit_stat,
-       .fstat = smb_full_audit_fstat,
-       .lstat = smb_full_audit_lstat,
-       .get_alloc_size = smb_full_audit_get_alloc_size,
-       .unlink = smb_full_audit_unlink,
-       .chmod = smb_full_audit_chmod,
-       .fchmod = smb_full_audit_fchmod,
-       .chown = smb_full_audit_chown,
-       .fchown = smb_full_audit_fchown,
-       .lchown = smb_full_audit_lchown,
-       .chdir = smb_full_audit_chdir,
-       .getwd = smb_full_audit_getwd,
-       .ntimes = smb_full_audit_ntimes,
-       .ftruncate = smb_full_audit_ftruncate,
-       .fallocate = smb_full_audit_fallocate,
-       .lock = smb_full_audit_lock,
-       .kernel_flock = smb_full_audit_kernel_flock,
-       .linux_setlease = smb_full_audit_linux_setlease,
-       .getlock = smb_full_audit_getlock,
-       .symlink = smb_full_audit_symlink,
-       .vfs_readlink = smb_full_audit_readlink,
-       .link = smb_full_audit_link,
-       .mknod = smb_full_audit_mknod,
-       .realpath = smb_full_audit_realpath,
-       .notify_watch = smb_full_audit_notify_watch,
-       .chflags = smb_full_audit_chflags,
-       .file_id_create = smb_full_audit_file_id_create,
-       .streaminfo = smb_full_audit_streaminfo,
-       .get_real_filename = smb_full_audit_get_real_filename,
-       .connectpath = smb_full_audit_connectpath,
-       .brl_lock_windows = smb_full_audit_brl_lock_windows,
-       .brl_unlock_windows = smb_full_audit_brl_unlock_windows,
-       .brl_cancel_windows = smb_full_audit_brl_cancel_windows,
-       .strict_lock = smb_full_audit_strict_lock,
-       .strict_unlock = smb_full_audit_strict_unlock,
-       .translate_name = smb_full_audit_translate_name,
-       .fget_nt_acl = smb_full_audit_fget_nt_acl,
-       .get_nt_acl = smb_full_audit_get_nt_acl,
-       .fset_nt_acl = smb_full_audit_fset_nt_acl,
-       .chmod_acl = smb_full_audit_chmod_acl,
-       .fchmod_acl = smb_full_audit_fchmod_acl,
-       .sys_acl_get_entry = smb_full_audit_sys_acl_get_entry,
-       .sys_acl_get_tag_type = smb_full_audit_sys_acl_get_tag_type,
-       .sys_acl_get_permset = smb_full_audit_sys_acl_get_permset,
-       .sys_acl_get_qualifier = smb_full_audit_sys_acl_get_qualifier,
-       .sys_acl_get_file = smb_full_audit_sys_acl_get_file,
-       .sys_acl_get_fd = smb_full_audit_sys_acl_get_fd,
-       .sys_acl_clear_perms = smb_full_audit_sys_acl_clear_perms,
-       .sys_acl_add_perm = smb_full_audit_sys_acl_add_perm,
-       .sys_acl_to_text = smb_full_audit_sys_acl_to_text,
-       .sys_acl_init = smb_full_audit_sys_acl_init,
-       .sys_acl_create_entry = smb_full_audit_sys_acl_create_entry,
-       .sys_acl_set_tag_type = smb_full_audit_sys_acl_set_tag_type,
-       .sys_acl_set_qualifier = smb_full_audit_sys_acl_set_qualifier,
-       .sys_acl_set_permset = smb_full_audit_sys_acl_set_permset,
-       .sys_acl_valid = smb_full_audit_sys_acl_valid,
-       .sys_acl_set_file = smb_full_audit_sys_acl_set_file,
-       .sys_acl_set_fd = smb_full_audit_sys_acl_set_fd,
-       .sys_acl_delete_def_file = smb_full_audit_sys_acl_delete_def_file,
-       .sys_acl_get_perm = smb_full_audit_sys_acl_get_perm,
-       .sys_acl_free_text = smb_full_audit_sys_acl_free_text,
-       .sys_acl_free_acl = smb_full_audit_sys_acl_free_acl,
-       .sys_acl_free_qualifier = smb_full_audit_sys_acl_free_qualifier,
-       .getxattr = smb_full_audit_getxattr,
-       .lgetxattr = smb_full_audit_lgetxattr,
-       .fgetxattr = smb_full_audit_fgetxattr,
-       .listxattr = smb_full_audit_listxattr,
-       .llistxattr = smb_full_audit_llistxattr,
-       .flistxattr = smb_full_audit_flistxattr,
-       .removexattr = smb_full_audit_removexattr,
-       .lremovexattr = smb_full_audit_lremovexattr,
-       .fremovexattr = smb_full_audit_fremovexattr,
-       .setxattr = smb_full_audit_setxattr,
-       .lsetxattr = smb_full_audit_lsetxattr,
-       .fsetxattr = smb_full_audit_fsetxattr,
-       .aio_read = smb_full_audit_aio_read,
-       .aio_write = smb_full_audit_aio_write,
-       .aio_return_fn = smb_full_audit_aio_return,
-       .aio_cancel = smb_full_audit_aio_cancel,
-       .aio_error_fn = smb_full_audit_aio_error,
-       .aio_fsync = smb_full_audit_aio_fsync,
-       .aio_suspend = smb_full_audit_aio_suspend,
-       .aio_force = smb_full_audit_aio_force,
+       .read_fn = smb_full_audit_read,
+       .pread_fn = smb_full_audit_pread,
+       .pread_send_fn = smb_full_audit_pread_send,
+       .pread_recv_fn = smb_full_audit_pread_recv,
+       .write_fn = smb_full_audit_write,
+       .pwrite_fn = smb_full_audit_pwrite,
+       .pwrite_send_fn = smb_full_audit_pwrite_send,
+       .pwrite_recv_fn = smb_full_audit_pwrite_recv,
+       .lseek_fn = smb_full_audit_lseek,
+       .sendfile_fn = smb_full_audit_sendfile,
+       .recvfile_fn = smb_full_audit_recvfile,
+       .rename_fn = smb_full_audit_rename,
+       .fsync_fn = smb_full_audit_fsync,
+       .fsync_send_fn = smb_full_audit_fsync_send,
+       .fsync_recv_fn = smb_full_audit_fsync_recv,
+       .stat_fn = smb_full_audit_stat,
+       .fstat_fn = smb_full_audit_fstat,
+       .lstat_fn = smb_full_audit_lstat,
+       .get_alloc_size_fn = smb_full_audit_get_alloc_size,
+       .unlink_fn = smb_full_audit_unlink,
+       .chmod_fn = smb_full_audit_chmod,
+       .fchmod_fn = smb_full_audit_fchmod,
+       .chown_fn = smb_full_audit_chown,
+       .fchown_fn = smb_full_audit_fchown,
+       .lchown_fn = smb_full_audit_lchown,
+       .chdir_fn = smb_full_audit_chdir,
+       .getwd_fn = smb_full_audit_getwd,
+       .ntimes_fn = smb_full_audit_ntimes,
+       .ftruncate_fn = smb_full_audit_ftruncate,
+       .fallocate_fn = smb_full_audit_fallocate,
+       .lock_fn = smb_full_audit_lock,
+       .kernel_flock_fn = smb_full_audit_kernel_flock,
+       .linux_setlease_fn = smb_full_audit_linux_setlease,
+       .getlock_fn = smb_full_audit_getlock,
+       .symlink_fn = smb_full_audit_symlink,
+       .readlink_fn = smb_full_audit_readlink,
+       .link_fn = smb_full_audit_link,
+       .mknod_fn = smb_full_audit_mknod,
+       .realpath_fn = smb_full_audit_realpath,
+       .notify_watch_fn = smb_full_audit_notify_watch,
+       .chflags_fn = smb_full_audit_chflags,
+       .file_id_create_fn = smb_full_audit_file_id_create,
+       .streaminfo_fn = smb_full_audit_streaminfo,
+       .get_real_filename_fn = smb_full_audit_get_real_filename,
+       .connectpath_fn = smb_full_audit_connectpath,
+       .brl_lock_windows_fn = smb_full_audit_brl_lock_windows,
+       .brl_unlock_windows_fn = smb_full_audit_brl_unlock_windows,
+       .brl_cancel_windows_fn = smb_full_audit_brl_cancel_windows,
+       .strict_lock_fn = smb_full_audit_strict_lock,
+       .strict_unlock_fn = smb_full_audit_strict_unlock,
+       .translate_name_fn = smb_full_audit_translate_name,
+       .fget_nt_acl_fn = smb_full_audit_fget_nt_acl,
+       .get_nt_acl_fn = smb_full_audit_get_nt_acl,
+       .fset_nt_acl_fn = smb_full_audit_fset_nt_acl,
+       .chmod_acl_fn = smb_full_audit_chmod_acl,
+       .fchmod_acl_fn = smb_full_audit_fchmod_acl,
+       .sys_acl_get_file_fn = smb_full_audit_sys_acl_get_file,
+       .sys_acl_get_fd_fn = smb_full_audit_sys_acl_get_fd,
+       .sys_acl_set_file_fn = smb_full_audit_sys_acl_set_file,
+       .sys_acl_set_fd_fn = smb_full_audit_sys_acl_set_fd,
+       .sys_acl_delete_def_file_fn = smb_full_audit_sys_acl_delete_def_file,
+       .getxattr_fn = smb_full_audit_getxattr,
+       .fgetxattr_fn = smb_full_audit_fgetxattr,
+       .listxattr_fn = smb_full_audit_listxattr,
+       .flistxattr_fn = smb_full_audit_flistxattr,
+       .removexattr_fn = smb_full_audit_removexattr,
+       .fremovexattr_fn = smb_full_audit_fremovexattr,
+       .setxattr_fn = smb_full_audit_setxattr,
+       .fsetxattr_fn = smb_full_audit_fsetxattr,
+       .aio_force_fn = smb_full_audit_aio_force,
+       .is_offline_fn = smb_full_audit_is_offline,
+       .set_offline_fn = smb_full_audit_set_offline,
 };
 
 NTSTATUS vfs_full_audit_init(void)