s3-vfs: Add pwrite_send/recv to vfs modules
[kai/samba.git] / source3 / modules / vfs_full_audit.c
index b5c9e6bd9c85ed4a17ba2cadef77e853f565828d..6d621f57ae94ad70dba15a0c2e683e4cb024764f 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;
 
@@ -86,6 +95,7 @@ typedef enum _vfs_op_type {
        /* Directory operations */
 
        SMB_VFS_OP_OPENDIR,
+       SMB_VFS_OP_FDOPENDIR,
        SMB_VFS_OP_READDIR,
        SMB_VFS_OP_SEEKDIR,
        SMB_VFS_OP_TELLDIR,
@@ -102,8 +112,12 @@ 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,
@@ -123,6 +137,7 @@ typedef enum _vfs_op_type {
        SMB_VFS_OP_GETWD,
        SMB_VFS_OP_NTIMES,
        SMB_VFS_OP_FTRUNCATE,
+       SMB_VFS_OP_FALLOCATE,
        SMB_VFS_OP_LOCK,
        SMB_VFS_OP_KERNEL_FLOCK,
        SMB_VFS_OP_LINUX_SETLEASE,
@@ -181,16 +196,12 @@ typedef enum _vfs_op_type {
 
        /* 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 */
@@ -227,6 +238,7 @@ static struct {
        { SMB_VFS_OP_STATVFS,   "statvfs" },
        { SMB_VFS_OP_FS_CAPABILITIES,   "fs_capabilities" },
        { SMB_VFS_OP_OPENDIR,   "opendir" },
+       { SMB_VFS_OP_FDOPENDIR, "fdopendir" },
        { SMB_VFS_OP_READDIR,   "readdir" },
        { SMB_VFS_OP_SEEKDIR,   "seekdir" },
        { SMB_VFS_OP_TELLDIR,   "telldir" },
@@ -240,6 +252,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" },
@@ -261,6 +275,7 @@ static struct {
        { SMB_VFS_OP_GETWD,     "getwd" },
        { SMB_VFS_OP_NTIMES,    "ntimes" },
        { SMB_VFS_OP_FTRUNCATE, "ftruncate" },
+       { SMB_VFS_OP_FALLOCATE,"fallocate" },
        { SMB_VFS_OP_LOCK,      "lock" },
        { SMB_VFS_OP_KERNEL_FLOCK,      "kernel_flock" },
        { SMB_VFS_OP_LINUX_SETLEASE, "linux_setlease" },
@@ -310,16 +325,12 @@ static struct {
        { 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" },
@@ -329,8 +340,8 @@ static struct {
        { 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 }
 };
 
@@ -345,7 +356,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;
@@ -365,7 +377,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;
@@ -391,12 +404,12 @@ static char *audit_prefix(TALLOC_CTX *ctx, connection_struct *conn)
                return NULL;
        }
        result = talloc_sub_advanced(ctx,
-                       lp_servicename(SNUM(conn)),
-                       conn->server_info->unix_name,
+                       lp_servicename(talloc_tos(), SNUM(conn)),
+                       conn->session_info->unix_info->unix_name,
                        conn->connectpath,
-                       conn->server_info->utok.gid,
-                       conn->server_info->sanitized_username,
-                       pdb_get_domain(conn->server_info->sam_account),
+                       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;
@@ -431,59 +444,65 @@ static bool log_failure(vfs_handle_struct *handle, vfs_op_type op)
        return bitmap_query(pd->failure_ops, op);
 }
 
-static void init_bitmap(struct bitmap **bm, const char **ops)
+static struct bitmap *init_bitmap(TALLOC_CTX *mem_ctx, const char **ops)
 {
-       bool log_all = False;
+       struct bitmap *bm;
 
-       if (*bm != NULL)
-               return;
-
-       *bm = bitmap_allocate(SMB_VFS_OP_LAST);
+       if (ops == NULL) {
+               return NULL;
+       }
 
-       if (*bm == NULL) {
+       bm = bitmap_talloc(mem_ctx, SMB_VFS_OP_LAST);
+       if (bm == NULL) {
                DEBUG(0, ("Could not alloc bitmap -- "
                          "defaulting to logging everything\n"));
-               return;
+               return NULL;
        }
 
-       while (*ops != NULL) {
+       for (; *ops != NULL; ops += 1) {
                int i;
-               bool found = False;
+               bool neg = false;
+               const char *op;
 
                if (strequal(*ops, "all")) {
-                       log_all = True;
-                       break;
+                       for (i=0; i<SMB_VFS_OP_LAST; i++) {
+                               bitmap_set(bm, i);
+                       }
+                       continue;
                }
 
                if (strequal(*ops, "none")) {
                        break;
                }
 
+               op = ops[0];
+               if (op[0] == '!') {
+                       neg = true;
+                       op += 1;
+               }
+
                for (i=0; i<SMB_VFS_OP_LAST; i++) {
                        if (vfs_op_names[i].name == NULL) {
                                smb_panic("vfs_full_audit.c: name table not "
                                          "in sync with vfs.h\n");
                        }
-
-                       if (strequal(*ops, vfs_op_names[i].name)) {
-                               bitmap_set(*bm, i);
-                               found = True;
+                       if (strequal(op, vfs_op_names[i].name)) {
+                               if (neg) {
+                                       bitmap_clear(bm, i);
+                               } else {
+                                       bitmap_set(bm, i);
+                               }
+                               break;
                        }
                }
-               if (!found) {
+               if (i == SMB_VFS_OP_LAST) {
                        DEBUG(0, ("Could not find opname %s, logging all\n",
                                  *ops));
-                       log_all = True;
-                       break;
+                       TALLOC_FREE(bm);
+                       return NULL;
                }
-               ops += 1;
-       }
-
-       if (log_all) {
-               /* The query functions default to True */
-               bitmap_free(*bm);
-               *bm = NULL;
        }
+       return bm;
 }
 
 static const char *audit_opname(vfs_op_type op)
@@ -579,22 +598,6 @@ static const char *fsp_str_do_log(const struct files_struct *fsp)
        return smb_fname_str_do_log(fsp->fsp_name);
 }
 
-/* Free function for the private data. */
-
-static void free_private_data(void **p_data)
-{
-       struct vfs_full_audit_private_data *pd = *(struct vfs_full_audit_private_data **)p_data;
-
-       if (pd->success_ops) {
-               bitmap_free(pd->success_ops);
-       }
-       if (pd->failure_ops) {
-               bitmap_free(pd->failure_ops);
-       }
-       SAFE_FREE(pd);
-       *p_data = NULL;
-}
-
 /* Implementation of vfs_ops.  Pass everything on to the default
    operation but log event first. */
 
@@ -603,40 +606,37 @@ static int smb_full_audit_connect(vfs_handle_struct *handle,
 {
        int result;
        struct vfs_full_audit_private_data *pd = NULL;
-       const char *none[] = { NULL };
-       const char *all [] = { "all" };
 
-       if (!handle) {
-               return -1;
+       result = SMB_VFS_NEXT_CONNECT(handle, svc, user);
+       if (result < 0) {
+               return result;
        }
 
-       pd = SMB_MALLOC_P(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;
        }
-       ZERO_STRUCTP(pd);
 
-#ifndef WITH_SYSLOG
+#ifdef WITH_SYSLOG
        openlog("smbd_audit", 0, audit_syslog_facility(handle));
 #endif
 
-       init_bitmap(&pd->success_ops,
-                   lp_parm_string_list(SNUM(handle->conn), "full_audit", "success",
-                                       none));
-       init_bitmap(&pd->failure_ops,
-                   lp_parm_string_list(SNUM(handle->conn), "full_audit", "failure",
-                                       all));
+       pd->success_ops = init_bitmap(
+               pd, lp_parm_string_list(SNUM(handle->conn), "full_audit",
+                                       "success", NULL));
+       pd->failure_ops = init_bitmap(
+               pd, lp_parm_string_list(SNUM(handle->conn), "full_audit",
+                                       "failure", NULL));
 
        /* Store the private data. */
-       SMB_VFS_HANDLE_SET_DATA(handle, pd, free_private_data,
+       SMB_VFS_HANDLE_SET_DATA(handle, pd, NULL,
                                struct vfs_full_audit_private_data, return -1);
 
-       result = SMB_VFS_NEXT_CONNECT(handle, svc, user);
-
        do_log(SMB_VFS_OP_CONNECT, True, handle,
               "%s", svc);
 
-       return result;
+       return 0;
 }
 
 static void smb_full_audit_disconnect(vfs_handle_struct *handle)
@@ -644,7 +644,7 @@ 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. */
@@ -698,7 +698,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;
 
@@ -733,10 +734,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);
 
@@ -745,10 +746,23 @@ static SMB_STRUCT_DIR *smb_full_audit_opendir(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 DIR *smb_full_audit_fdopendir(vfs_handle_struct *handle,
+                         files_struct *fsp, const char *mask, uint32 attr)
 {
-       SMB_STRUCT_DIRENT *result;
+       DIR *result;
+
+       result = SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
+
+       do_log(SMB_VFS_OP_FDOPENDIR, (result != NULL), handle, "%s",
+                       fsp_str_do_log(fsp));
+
+       return result;
+}
+
+static struct dirent *smb_full_audit_readdir(vfs_handle_struct *handle,
+                                   DIR *dirp, SMB_STRUCT_STAT *sbuf)
+{
+       struct dirent *result;
 
        result = SMB_VFS_NEXT_READDIR(handle, dirp, sbuf);
 
@@ -761,7 +775,7 @@ 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);
 
@@ -770,7 +784,7 @@ static void smb_full_audit_seekdir(vfs_handle_struct *handle,
 }
 
 static long smb_full_audit_telldir(vfs_handle_struct *handle,
-                       SMB_STRUCT_DIR *dirp)
+                       DIR *dirp)
 {
        long result;
 
@@ -782,7 +796,7 @@ 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);
 
@@ -815,7 +829,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;
 
@@ -827,7 +841,7 @@ 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);
 
@@ -861,6 +875,7 @@ static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle,
                                      uint32_t file_attributes,
                                      uint32_t oplock_request,
                                      uint64_t allocation_size,
+                                     uint32_t private_flags,
                                      struct security_descriptor *sd,
                                      struct ea_list *ea_list,
                                      files_struct **result_fsp,
@@ -904,6 +919,7 @@ static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle,
                file_attributes,                        /* file_attributes */
                oplock_request,                         /* oplock_request */
                allocation_size,                        /* allocation_size */
+               private_flags,
                sd,                                     /* sd */
                ea_list,                                /* ea_list */
                result_fsp,                             /* result */
@@ -943,7 +959,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;
 
@@ -955,6 +971,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)
 {
@@ -970,7 +1056,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;
 
@@ -982,8 +1068,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;
 
@@ -997,7 +1154,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;
@@ -1012,7 +1169,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;
@@ -1094,11 +1251,12 @@ static int smb_full_audit_lstat(vfs_handle_struct *handle,
 static uint64_t smb_full_audit_get_alloc_size(vfs_handle_struct *handle,
                       files_struct *fsp, const SMB_STRUCT_STAT *sbuf)
 {
-       int result;
+       uint64_t result;
 
        result = SMB_VFS_NEXT_GET_ALLOC_SIZE(handle, fsp, sbuf);
 
-       do_log(SMB_VFS_OP_GET_ALLOC_SIZE, (result >= 0), handle, "%d", result);
+       do_log(SMB_VFS_OP_GET_ALLOC_SIZE, (result != (uint64_t)-1), handle,
+                       "%llu", result);
 
        return result;
 }
@@ -1192,14 +1350,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;
 }
@@ -1219,7 +1377,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;
 
@@ -1231,8 +1389,23 @@ static int smb_full_audit_ftruncate(vfs_handle_struct *handle, files_struct *fsp
        return result;
 }
 
+static int smb_full_audit_fallocate(vfs_handle_struct *handle, files_struct *fsp,
+                          enum vfs_fallocate_mode mode,
+                          off_t offset,
+                          off_t len)
+{
+       int result;
+
+       result = SMB_VFS_NEXT_FALLOCATE(handle, fsp, mode, offset, len);
+
+       do_log(SMB_VFS_OP_FALLOCATE, (result >= 0), handle,
+              "%s", fsp_str_do_log(fsp));
+
+       return result;
+}
+
 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;
 
@@ -1245,11 +1418,11 @@ static bool smb_full_audit_lock(vfs_handle_struct *handle, files_struct *fsp,
 
 static int smb_full_audit_kernel_flock(struct vfs_handle_struct *handle,
                                       struct files_struct *fsp,
-                                      uint32 share_mode)
+                                      uint32 share_mode, uint32 access_mask)
 {
        int result;
 
-       result = SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode);
+       result = SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode, access_mask);
 
        do_log(SMB_VFS_OP_KERNEL_FLOCK, (result >= 0), handle, "%s",
               fsp_str_do_log(fsp));
@@ -1271,7 +1444,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;
 
@@ -1333,11 +1506,11 @@ static int smb_full_audit_mknod(vfs_handle_struct *handle,
 }
 
 static char *smb_full_audit_realpath(vfs_handle_struct *handle,
-                           const char *path, char *resolved_path)
+                           const char *path)
 {
        char *result;
 
-       result = SMB_VFS_NEXT_REALPATH(handle, path, resolved_path);
+       result = SMB_VFS_NEXT_REALPATH(handle, path);
 
        do_log(SMB_VFS_OP_REALPATH, (result != NULL), handle, "%s", path);
 
@@ -1346,7 +1519,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),
@@ -1354,7 +1529,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, "");
 
@@ -1517,12 +1694,16 @@ static void smb_full_audit_strict_unlock(struct vfs_handle_struct *handle,
        return;
 }
 
-static NTSTATUS smb_full_audit_translate_name(vfs_handle_struct *handle,
+static NTSTATUS smb_full_audit_translate_name(struct vfs_handle_struct *handle,
+                                             const char *name,
+                                             enum vfs_translate_direction direction,
+                                             TALLOC_CTX *mem_ctx,
                                              char **mapped_name)
 {
        NTSTATUS result;
 
-       result = SMB_VFS_NEXT_TRANSLATE_NAME(handle, mapped_name);
+       result = SMB_VFS_NEXT_TRANSLATE_NAME(handle, name, direction, mem_ctx,
+                                            mapped_name);
 
        do_log(SMB_VFS_OP_TRANSLATE_NAME, NT_STATUS_IS_OK(result), handle, "");
 
@@ -1531,7 +1712,7 @@ static NTSTATUS smb_full_audit_translate_name(vfs_handle_struct *handle,
 
 static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
                                uint32 security_info,
-                               SEC_DESC **ppdesc)
+                               struct security_descriptor **ppdesc)
 {
        NTSTATUS result;
 
@@ -1546,7 +1727,7 @@ static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_stru
 static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle,
                                          const char *name,
                                          uint32 security_info,
-                                         SEC_DESC **ppdesc)
+                                         struct security_descriptor **ppdesc)
 {
        NTSTATUS result;
 
@@ -1560,7 +1741,7 @@ static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle,
 
 static NTSTATUS smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
                              uint32 security_info_sent,
-                             const SEC_DESC *psd)
+                             const struct security_descriptor *psd)
 {
        NTSTATUS result;
 
@@ -1933,20 +2114,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)
@@ -1973,18 +2140,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)
@@ -2013,20 +2168,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)
@@ -2057,22 +2198,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)
@@ -2176,121 +2301,148 @@ static bool smb_full_audit_aio_force(struct vfs_handle_struct *handle,
        return result;
 }
 
+static bool smb_full_audit_is_offline(struct vfs_handle_struct *handle,
+                                     const struct smb_filename *fname,
+                                     SMB_STRUCT_STAT *sbuf)
+{
+       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 int smb_full_audit_set_offline(struct vfs_handle_struct *handle,
+                                     const struct smb_filename *fname)
+{
+       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;
+}
+
 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,
-       .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,
-       .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,
+       .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,
+       .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_entry_fn = smb_full_audit_sys_acl_get_entry,
+       .sys_acl_get_tag_type_fn = smb_full_audit_sys_acl_get_tag_type,
+       .sys_acl_get_permset_fn = smb_full_audit_sys_acl_get_permset,
+       .sys_acl_get_qualifier_fn = smb_full_audit_sys_acl_get_qualifier,
+       .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_clear_perms_fn = smb_full_audit_sys_acl_clear_perms,
+       .sys_acl_add_perm_fn = smb_full_audit_sys_acl_add_perm,
+       .sys_acl_to_text_fn = smb_full_audit_sys_acl_to_text,
+       .sys_acl_init_fn = smb_full_audit_sys_acl_init,
+       .sys_acl_create_entry_fn = smb_full_audit_sys_acl_create_entry,
+       .sys_acl_set_tag_type_fn = smb_full_audit_sys_acl_set_tag_type,
+       .sys_acl_set_qualifier_fn = smb_full_audit_sys_acl_set_qualifier,
+       .sys_acl_set_permset_fn = smb_full_audit_sys_acl_set_permset,
+       .sys_acl_valid_fn = smb_full_audit_sys_acl_valid,
+       .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,
+       .sys_acl_get_perm_fn = smb_full_audit_sys_acl_get_perm,
+       .sys_acl_free_text_fn = smb_full_audit_sys_acl_free_text,
+       .sys_acl_free_acl_fn = smb_full_audit_sys_acl_free_acl,
+       .sys_acl_free_qualifier_fn = smb_full_audit_sys_acl_free_qualifier,
+       .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_read_fn = smb_full_audit_aio_read,
+       .aio_write_fn = smb_full_audit_aio_write,
        .aio_return_fn = smb_full_audit_aio_return,
-       .aio_cancel = smb_full_audit_aio_cancel,
+       .aio_cancel_fn = 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,
+       .aio_fsync_fn = smb_full_audit_aio_fsync,
+       .aio_suspend_fn = smb_full_audit_aio_suspend,
+       .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)