vfs: remove SMB_VFS_INIT_SEARCH_OP
[nivanova/samba-autobuild/.git] / source3 / modules / vfs_full_audit.c
index e8129f41436acd101cf2bb4cc29e3973550e58f1..b8471593db7ec215d6092802ef0b490eb16540bb 100644 (file)
 #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"
+#include "libcli/security/sddl.h"
+#include "passdb/machine_sid.h"
 
 static int vfs_full_audit_debug_level = DBGC_VFS;
 
 struct vfs_full_audit_private_data {
        struct bitmap *success_ops;
        struct bitmap *failure_ops;
+       int syslog_facility;
+       int syslog_priority;
+       bool log_secdesc;
+       bool do_syslog;
 };
 
 #undef DBGC_CLASS
@@ -88,6 +97,7 @@ typedef enum _vfs_op_type {
        SMB_VFS_OP_GET_SHADOW_COPY_DATA,
        SMB_VFS_OP_STATVFS,
        SMB_VFS_OP_FS_CAPABILITIES,
+       SMB_VFS_OP_GET_DFS_REFERRALS,
 
        /* Directory operations */
 
@@ -100,7 +110,6 @@ typedef enum _vfs_op_type {
        SMB_VFS_OP_MKDIR,
        SMB_VFS_OP_RMDIR,
        SMB_VFS_OP_CLOSEDIR,
-       SMB_VFS_OP_INIT_SEARCH_OP,
 
        /* File operations */
 
@@ -109,13 +118,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,
@@ -140,7 +155,6 @@ typedef enum _vfs_op_type {
        SMB_VFS_OP_LINK,
        SMB_VFS_OP_MKNOD,
        SMB_VFS_OP_REALPATH,
-       SMB_VFS_OP_NOTIFY_WATCH,
        SMB_VFS_OP_CHFLAGS,
        SMB_VFS_OP_FILE_ID_CREATE,
        SMB_VFS_OP_STREAMINFO,
@@ -149,78 +163,75 @@ typedef enum _vfs_op_type {
        SMB_VFS_OP_BRL_LOCK_WINDOWS,
        SMB_VFS_OP_BRL_UNLOCK_WINDOWS,
        SMB_VFS_OP_BRL_CANCEL_WINDOWS,
-       SMB_VFS_OP_STRICT_LOCK,
-       SMB_VFS_OP_STRICT_UNLOCK,
+       SMB_VFS_OP_STRICT_LOCK_CHECK,
        SMB_VFS_OP_TRANSLATE_NAME,
+       SMB_VFS_OP_FSCTL,
+       SMB_VFS_OP_OFFLOAD_READ_SEND,
+       SMB_VFS_OP_OFFLOAD_READ_RECV,
+       SMB_VFS_OP_OFFLOAD_WRITE_SEND,
+       SMB_VFS_OP_OFFLOAD_WRITE_RECV,
+       SMB_VFS_OP_GET_COMPRESSION,
+       SMB_VFS_OP_SET_COMPRESSION,
+       SMB_VFS_OP_SNAP_CHECK_PATH,
+       SMB_VFS_OP_SNAP_CREATE,
+       SMB_VFS_OP_SNAP_DELETE,
+
+       /* DOS attribute operations. */
+       SMB_VFS_OP_GET_DOS_ATTRIBUTES,
+       SMB_VFS_OP_FGET_DOS_ATTRIBUTES,
+       SMB_VFS_OP_SET_DOS_ATTRIBUTES,
+       SMB_VFS_OP_FSET_DOS_ATTRIBUTES,
 
        /* NT ACL operations. */
 
        SMB_VFS_OP_FGET_NT_ACL,
        SMB_VFS_OP_GET_NT_ACL,
        SMB_VFS_OP_FSET_NT_ACL,
+       SMB_VFS_OP_AUDIT_FILE,
 
        /* POSIX ACL operations. */
 
        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_BLOB_GET_FILE,
+       SMB_VFS_OP_SYS_ACL_BLOB_GET_FD,
        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 */
        SMB_VFS_OP_IS_OFFLINE,
        SMB_VFS_OP_SET_OFFLINE,
 
+       /* Durable handle operations. */
+       SMB_VFS_OP_DURABLE_COOKIE,
+       SMB_VFS_OP_DURABLE_DISCONNECT,
+       SMB_VFS_OP_DURABLE_RECONNECT,
+
+       SMB_VFS_OP_READDIR_ATTR,
+
        /* This should always be last enum value */
 
        SMB_VFS_OP_LAST
 } vfs_op_type;
 
-/* The following array *must* be in the same order as defined in vfs.h */
+/* The following array *must* be in the same order as defined in vfs_op_type */
 
 static struct {
        vfs_op_type type;
@@ -234,6 +245,7 @@ static struct {
        { SMB_VFS_OP_GET_SHADOW_COPY_DATA,      "get_shadow_copy_data" },
        { SMB_VFS_OP_STATVFS,   "statvfs" },
        { SMB_VFS_OP_FS_CAPABILITIES,   "fs_capabilities" },
+       { SMB_VFS_OP_GET_DFS_REFERRALS, "get_dfs_referrals" },
        { SMB_VFS_OP_OPENDIR,   "opendir" },
        { SMB_VFS_OP_FDOPENDIR, "fdopendir" },
        { SMB_VFS_OP_READDIR,   "readdir" },
@@ -243,19 +255,24 @@ static struct {
        { SMB_VFS_OP_MKDIR,     "mkdir" },
        { SMB_VFS_OP_RMDIR,     "rmdir" },
        { SMB_VFS_OP_CLOSEDIR,  "closedir" },
-       { SMB_VFS_OP_INIT_SEARCH_OP, "init_search_op" },
        { SMB_VFS_OP_OPEN,      "open" },
        { SMB_VFS_OP_CREATE_FILE, "create_file" },
        { 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_PWRITE_SEND,       "pwrite_send" },
+       { SMB_VFS_OP_PWRITE_RECV,       "pwrite_recv" },
        { SMB_VFS_OP_LSEEK,     "lseek" },
        { SMB_VFS_OP_SENDFILE,  "sendfile" },
        { 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" },
@@ -280,7 +297,6 @@ static struct {
        { SMB_VFS_OP_LINK,      "link" },
        { SMB_VFS_OP_MKNOD,     "mknod" },
        { SMB_VFS_OP_REALPATH,  "realpath" },
-       { SMB_VFS_OP_NOTIFY_WATCH, "notify_watch" },
        { SMB_VFS_OP_CHFLAGS,   "chflags" },
        { SMB_VFS_OP_FILE_ID_CREATE,    "file_id_create" },
        { SMB_VFS_OP_STREAMINFO,        "streaminfo" },
@@ -289,58 +305,50 @@ static struct {
        { SMB_VFS_OP_BRL_LOCK_WINDOWS,  "brl_lock_windows" },
        { SMB_VFS_OP_BRL_UNLOCK_WINDOWS, "brl_unlock_windows" },
        { SMB_VFS_OP_BRL_CANCEL_WINDOWS, "brl_cancel_windows" },
-       { SMB_VFS_OP_STRICT_LOCK, "strict_lock" },
-       { SMB_VFS_OP_STRICT_UNLOCK, "strict_unlock" },
+       { SMB_VFS_OP_STRICT_LOCK_CHECK, "strict_lock_check" },
        { SMB_VFS_OP_TRANSLATE_NAME,    "translate_name" },
+       { SMB_VFS_OP_FSCTL,             "fsctl" },
+       { SMB_VFS_OP_OFFLOAD_READ_SEND, "offload_read_send" },
+       { SMB_VFS_OP_OFFLOAD_READ_RECV, "offload_read_recv" },
+       { SMB_VFS_OP_OFFLOAD_WRITE_SEND,        "offload_write_send" },
+       { SMB_VFS_OP_OFFLOAD_WRITE_RECV,        "offload_write_recv" },
+       { SMB_VFS_OP_GET_COMPRESSION,   "get_compression" },
+       { SMB_VFS_OP_SET_COMPRESSION,   "set_compression" },
+       { SMB_VFS_OP_SNAP_CHECK_PATH, "snap_check_path" },
+       { SMB_VFS_OP_SNAP_CREATE, "snap_create" },
+       { SMB_VFS_OP_SNAP_DELETE, "snap_delete" },
+       { SMB_VFS_OP_GET_DOS_ATTRIBUTES, "get_dos_attributes" },
+       { SMB_VFS_OP_FGET_DOS_ATTRIBUTES, "fget_dos_attributes" },
+       { SMB_VFS_OP_SET_DOS_ATTRIBUTES, "set_dos_attributes" },
+       { SMB_VFS_OP_FSET_DOS_ATTRIBUTES, "fset_dos_attributes" },
        { SMB_VFS_OP_FGET_NT_ACL,       "fget_nt_acl" },
        { SMB_VFS_OP_GET_NT_ACL,        "get_nt_acl" },
        { SMB_VFS_OP_FSET_NT_ACL,       "fset_nt_acl" },
+       { SMB_VFS_OP_AUDIT_FILE,        "audit_file" },
        { 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_BLOB_GET_FILE,     "sys_acl_blob_get_file" },
+       { SMB_VFS_OP_SYS_ACL_BLOB_GET_FD,       "sys_acl_blob_get_fd" },
        { 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, "is_offline" },
        { SMB_VFS_OP_SET_OFFLINE, "set_offline" },
+       { SMB_VFS_OP_DURABLE_COOKIE, "durable_cookie" },
+       { SMB_VFS_OP_DURABLE_DISCONNECT, "durable_disconnect" },
+       { SMB_VFS_OP_DURABLE_RECONNECT, "durable_reconnect" },
+       { SMB_VFS_OP_READDIR_ATTR,      "readdir_attr" },
        { SMB_VFS_OP_LAST, NULL }
 };
 
@@ -403,25 +411,19 @@ 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;
 }
 
-static bool log_success(vfs_handle_struct *handle, vfs_op_type op)
+static bool log_success(struct vfs_full_audit_private_data *pd, vfs_op_type op)
 {
-       struct vfs_full_audit_private_data *pd = NULL;
-
-       SMB_VFS_HANDLE_GET_DATA(handle, pd,
-               struct vfs_full_audit_private_data,
-               return True);
-
        if (pd->success_ops == NULL) {
                return True;
        }
@@ -429,14 +431,8 @@ static bool log_success(vfs_handle_struct *handle, vfs_op_type op)
        return bitmap_query(pd->success_ops, op);
 }
 
-static bool log_failure(vfs_handle_struct *handle, vfs_op_type op)
+static bool log_failure(struct vfs_full_audit_private_data *pd, vfs_op_type op)
 {
-       struct vfs_full_audit_private_data *pd = NULL;
-
-       SMB_VFS_HANDLE_GET_DATA(handle, pd,
-               struct vfs_full_audit_private_data,
-               return True);
-
        if (pd->failure_ops == NULL)
                return True;
 
@@ -481,9 +477,10 @@ static struct bitmap *init_bitmap(TALLOC_CTX *mem_ctx, const char **ops)
                }
 
                for (i=0; i<SMB_VFS_OP_LAST; i++) {
-                       if (vfs_op_names[i].name == NULL) {
+                       if ((vfs_op_names[i].name == NULL)
+                        || (vfs_op_names[i].type != i)) {
                                smb_panic("vfs_full_audit.c: name table not "
-                                         "in sync with vfs.h\n");
+                                         "in sync with vfs_op_type enums\n");
                        }
                        if (strequal(op, vfs_op_names[i].name)) {
                                if (neg) {
@@ -526,16 +523,20 @@ static TALLOC_CTX *do_log_ctx(void)
 static void do_log(vfs_op_type op, bool success, vfs_handle_struct *handle,
                   const char *format, ...)
 {
+       struct vfs_full_audit_private_data *pd;
        fstring err_msg;
        char *audit_pre = NULL;
        va_list ap;
        char *op_msg = NULL;
-       int priority;
 
-       if (success && (!log_success(handle, op)))
+       SMB_VFS_HANDLE_GET_DATA(handle, pd,
+                               struct vfs_full_audit_private_data,
+                               return;);
+
+       if (success && (!log_success(pd, op)))
                goto out;
 
-       if (!success && (!log_failure(handle, op)))
+       if (!success && (!log_failure(pd, op)))
                goto out;
 
        if (success)
@@ -551,24 +552,29 @@ static void do_log(vfs_op_type op, bool success, vfs_handle_struct *handle,
                goto out;
        }
 
-       /*
-        * Specify the facility to interoperate with other syslog callers
-        * (smbd for example).
-        */
-       priority = audit_syslog_priority(handle) |
-           audit_syslog_facility(handle);
-
        audit_pre = audit_prefix(talloc_tos(), handle->conn);
-       syslog(priority, "%s|%s|%s|%s\n",
-               audit_pre ? audit_pre : "",
-               audit_opname(op), err_msg, op_msg);
 
+       if (pd->do_syslog) {
+               int priority;
+
+               /*
+                * Specify the facility to interoperate with other syslog
+                * callers (smbd for example).
+                */
+               priority = pd->syslog_priority | pd->syslog_facility;
+
+               syslog(priority, "%s|%s|%s|%s\n",
+                      audit_pre ? audit_pre : "",
+                      audit_opname(op), err_msg, op_msg);
+       } else {
+               DEBUG(1, ("%s|%s|%s|%s\n",
+                         audit_pre ? audit_pre : "",
+                         audit_opname(op), err_msg, op_msg));
+       }
  out:
        TALLOC_FREE(audit_pre);
        TALLOC_FREE(op_msg);
        TALLOC_FREE(tmp_do_log_ctx);
-
-       return;
 }
 
 /**
@@ -617,8 +623,28 @@ static int smb_full_audit_connect(vfs_handle_struct *handle,
                return -1;
        }
 
+       pd->syslog_facility = audit_syslog_facility(handle);
+       if (pd->syslog_facility == -1) {
+               DEBUG(1, ("%s: Unknown facility %s\n", __func__,
+                         lp_parm_const_string(SNUM(handle->conn),
+                                              "full_audit", "facility",
+                                              "USER")));
+               SMB_VFS_NEXT_DISCONNECT(handle);
+               return -1;
+       }
+
+       pd->syslog_priority = audit_syslog_priority(handle);
+
+       pd->log_secdesc = lp_parm_bool(SNUM(handle->conn),
+                                      "full_audit", "log_secdesc", false);
+
+       pd->do_syslog = lp_parm_bool(SNUM(handle->conn),
+                                    "full_audit", "syslog", true);
+
 #ifdef WITH_SYSLOG
-       openlog("smbd_audit", 0, audit_syslog_facility(handle));
+       if (pd->do_syslog) {
+               openlog("smbd_audit", 0, pd->syslog_facility);
+       }
 #endif
 
        pd->success_ops = init_bitmap(
@@ -643,45 +669,45 @@ 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,
-                                   const char *path,
-                                   bool small_query, uint64_t *bsize, 
-                                   uint64_t *dfree, uint64_t *dsize)
+                               const struct smb_filename *smb_fname,
+                               uint64_t *bsize,
+                               uint64_t *dfree,
+                               uint64_t *dsize)
 {
        uint64_t result;
 
-       result = SMB_VFS_NEXT_DISK_FREE(handle, path, small_query, bsize,
-                                       dfree, dsize);
+       result = SMB_VFS_NEXT_DISK_FREE(handle, smb_fname, bsize, dfree, dsize);
 
        /* Don't have a reasonable notion of failure here */
 
-       do_log(SMB_VFS_OP_DISK_FREE, True, handle, "%s", path);
+       do_log(SMB_VFS_OP_DISK_FREE, True, handle, "%s", smb_fname->base_name);
 
        return result;
 }
 
 static int smb_full_audit_get_quota(struct vfs_handle_struct *handle,
-                          enum SMB_QUOTA_TYPE qtype, unid_t id,
-                          SMB_DISK_QUOTA *qt)
+                               const struct smb_filename *smb_fname,
+                               enum SMB_QUOTA_TYPE qtype,
+                               unid_t id,
+                               SMB_DISK_QUOTA *qt)
 {
        int result;
 
-       result = SMB_VFS_NEXT_GET_QUOTA(handle, qtype, id, qt);
+       result = SMB_VFS_NEXT_GET_QUOTA(handle, smb_fname, qtype, id, qt);
 
-       do_log(SMB_VFS_OP_GET_QUOTA, (result >= 0), handle, "");
+       do_log(SMB_VFS_OP_GET_QUOTA, (result >= 0), handle, "%s",
+                       smb_fname->base_name);
 
        return result;
 }
 
-       
 static int smb_full_audit_set_quota(struct vfs_handle_struct *handle,
                           enum SMB_QUOTA_TYPE qtype, unid_t id,
                           SMB_DISK_QUOTA *qt)
@@ -710,12 +736,12 @@ static int smb_full_audit_get_shadow_copy_data(struct vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_statvfs(struct vfs_handle_struct *handle,
-                               const char *path,
+                               const struct smb_filename *smb_fname,
                                struct vfs_statvfs_struct *statbuf)
 {
        int result;
 
-       result = SMB_VFS_NEXT_STATVFS(handle, path, statbuf);
+       result = SMB_VFS_NEXT_STATVFS(handle, smb_fname, statbuf);
 
        do_log(SMB_VFS_OP_STATVFS, (result >= 0), handle, "");
 
@@ -733,22 +759,85 @@ 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,
-                         const char *fname, const char *mask, uint32 attr)
+static NTSTATUS smb_full_audit_get_dfs_referrals(
+                               struct vfs_handle_struct *handle,
+                               struct dfs_GetDFSReferral *r)
+{
+       NTSTATUS status;
+
+       status = SMB_VFS_NEXT_GET_DFS_REFERRALS(handle, r);
+
+       do_log(SMB_VFS_OP_GET_DFS_REFERRALS, NT_STATUS_IS_OK(status),
+              handle, "");
+
+       return status;
+}
+
+static NTSTATUS smb_full_audit_snap_check_path(struct vfs_handle_struct *handle,
+                                              TALLOC_CTX *mem_ctx,
+                                              const char *service_path,
+                                              char **base_volume)
+{
+       NTSTATUS status;
+
+       status = SMB_VFS_NEXT_SNAP_CHECK_PATH(handle, mem_ctx, service_path,
+                                             base_volume);
+       do_log(SMB_VFS_OP_SNAP_CHECK_PATH, NT_STATUS_IS_OK(status),
+              handle, "");
+
+       return status;
+}
+
+static NTSTATUS smb_full_audit_snap_create(struct vfs_handle_struct *handle,
+                                          TALLOC_CTX *mem_ctx,
+                                          const char *base_volume,
+                                          time_t *tstamp,
+                                          bool rw,
+                                          char **base_path,
+                                          char **snap_path)
+{
+       NTSTATUS status;
+
+       status = SMB_VFS_NEXT_SNAP_CREATE(handle, mem_ctx, base_volume, tstamp,
+                                         rw, base_path, snap_path);
+       do_log(SMB_VFS_OP_SNAP_CREATE, NT_STATUS_IS_OK(status), handle, "");
+
+       return status;
+}
+
+static NTSTATUS smb_full_audit_snap_delete(struct vfs_handle_struct *handle,
+                                          TALLOC_CTX *mem_ctx,
+                                          char *base_path,
+                                          char *snap_path)
+{
+       NTSTATUS status;
+
+       status = SMB_VFS_NEXT_SNAP_DELETE(handle, mem_ctx, base_path,
+                                         snap_path);
+       do_log(SMB_VFS_OP_SNAP_DELETE, NT_STATUS_IS_OK(status), handle, "");
+
+       return status;
+}
+
+static DIR *smb_full_audit_opendir(vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       const char *mask,
+                       uint32_t attr)
 {
-       SMB_STRUCT_DIR *result;
+       DIR *result;
 
-       result = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
+       result = SMB_VFS_NEXT_OPENDIR(handle, smb_fname, mask, attr);
 
-       do_log(SMB_VFS_OP_OPENDIR, (result != NULL), handle, "%s", fname);
+       do_log(SMB_VFS_OP_OPENDIR, (result != NULL), handle, "%s",
+               smb_fname->base_name);
 
        return result;
 }
 
-static SMB_STRUCT_DIR *smb_full_audit_fdopendir(vfs_handle_struct *handle,
-                         files_struct *fsp, const char *mask, uint32 attr)
+static DIR *smb_full_audit_fdopendir(vfs_handle_struct *handle,
+                         files_struct *fsp, const char *mask, uint32_t attr)
 {
-       SMB_STRUCT_DIR *result;
+       DIR *result;
 
        result = SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
 
@@ -758,10 +847,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);
 
@@ -774,16 +863,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;
 
@@ -795,40 +883,41 @@ 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,
-                      const char *path, mode_t mode)
+                      const struct smb_filename *smb_fname, mode_t mode)
 {
        int result;
        
-       result = SMB_VFS_NEXT_MKDIR(handle, path, mode);
+       result = SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
        
-       do_log(SMB_VFS_OP_MKDIR, (result >= 0), handle, "%s", path);
+       do_log(SMB_VFS_OP_MKDIR, (result >= 0), handle, "%s",
+               smb_fname->base_name);
 
        return result;
 }
 
 static int smb_full_audit_rmdir(vfs_handle_struct *handle,
-                      const char *path)
+                      const struct smb_filename *smb_fname)
 {
        int result;
        
-       result = SMB_VFS_NEXT_RMDIR(handle, path);
+       result = SMB_VFS_NEXT_RMDIR(handle, smb_fname);
 
-       do_log(SMB_VFS_OP_RMDIR, (result >= 0), handle, "%s", path);
+       do_log(SMB_VFS_OP_RMDIR, (result >= 0), handle, "%s",
+               smb_fname->base_name);
 
        return result;
 }
 
 static int smb_full_audit_closedir(vfs_handle_struct *handle,
-                         SMB_STRUCT_DIR *dirp)
+                         DIR *dirp)
 {
        int result;
 
@@ -839,15 +928,6 @@ static int smb_full_audit_closedir(vfs_handle_struct *handle,
        return result;
 }
 
-static void smb_full_audit_init_search_op(vfs_handle_struct *handle,
-                       SMB_STRUCT_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,
                               struct smb_filename *smb_fname,
                               files_struct *fsp, int flags, mode_t mode)
@@ -873,12 +953,15 @@ static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle,
                                      uint32_t create_options,
                                      uint32_t file_attributes,
                                      uint32_t oplock_request,
+                                     struct smb2_lease *lease,
                                      uint64_t allocation_size,
                                      uint32_t private_flags,
                                      struct security_descriptor *sd,
                                      struct ea_list *ea_list,
                                      files_struct **result_fsp,
-                                     int *pinfo)
+                                     int *pinfo,
+                                     const struct smb2_create_blobs *in_context_blobs,
+                                     struct smb2_create_blobs *out_context_blobs)
 {
        NTSTATUS result;
        const char* str_create_disposition;
@@ -917,12 +1000,14 @@ static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle,
                create_options,                         /* create_options */
                file_attributes,                        /* file_attributes */
                oplock_request,                         /* oplock_request */
+               lease,                                  /* lease */
                allocation_size,                        /* allocation_size */
                private_flags,
                sd,                                     /* sd */
                ea_list,                                /* ea_list */
                result_fsp,                             /* result */
-               pinfo);                                 /* pinfo */
+               pinfo,                                  /* pinfo */
+               in_context_blobs, out_context_blobs);   /* create context */
 
        do_log(SMB_VFS_OP_CREATE_FILE, (NT_STATUS_IS_OK(result)), handle,
               "0x%x|%s|%s|%s", access_mask,
@@ -958,7 +1043,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;
 
@@ -970,6 +1055,77 @@ 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;
+       struct vfs_aio_state vfs_aio_state;
+};
+
+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->vfs_aio_state);
+       TALLOC_FREE(subreq);
+       tevent_req_done(req);
+}
+
+static ssize_t smb_full_audit_pread_recv(struct tevent_req *req,
+                                        struct vfs_aio_state *vfs_aio_state)
+{
+       struct smb_full_audit_pread_state *state = tevent_req_data(
+               req, struct smb_full_audit_pread_state);
+
+       if (tevent_req_is_unix_error(req, &vfs_aio_state->error)) {
+               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));
+
+       *vfs_aio_state = state->vfs_aio_state;
+       return state->ret;
+}
+
 static ssize_t smb_full_audit_write(vfs_handle_struct *handle, files_struct *fsp,
                           const void *data, size_t n)
 {
@@ -985,7 +1141,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;
 
@@ -997,8 +1153,80 @@ 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;
+       struct vfs_aio_state vfs_aio_state;
+};
+
+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->vfs_aio_state);
+       TALLOC_FREE(subreq);
+       tevent_req_done(req);
+}
+
+static ssize_t smb_full_audit_pwrite_recv(struct tevent_req *req,
+                                         struct vfs_aio_state *vfs_aio_state)
+{
+       struct smb_full_audit_pwrite_state *state = tevent_req_data(
+               req, struct smb_full_audit_pwrite_state);
+
+       if (tevent_req_is_unix_error(req, &vfs_aio_state->error)) {
+               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));
+
+       *vfs_aio_state = state->vfs_aio_state;
+       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;
 
@@ -1012,7 +1240,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;
@@ -1027,7 +1255,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;
@@ -1067,6 +1295,75 @@ 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;
+       struct vfs_aio_state vfs_aio_state;
+};
+
+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->vfs_aio_state);
+       TALLOC_FREE(subreq);
+       tevent_req_done(req);
+}
+
+static int smb_full_audit_fsync_recv(struct tevent_req *req,
+                                    struct vfs_aio_state *vfs_aio_state)
+{
+       struct smb_full_audit_fsync_state *state = tevent_req_data(
+               req, struct smb_full_audit_fsync_state);
+
+       if (tevent_req_is_unix_error(req, &vfs_aio_state->error)) {
+               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));
+
+       *vfs_aio_state = state->vfs_aio_state;
+       return state->ret;
+}
+
 static int smb_full_audit_stat(vfs_handle_struct *handle,
                               struct smb_filename *smb_fname)
 {
@@ -1133,13 +1430,16 @@ static int smb_full_audit_unlink(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_chmod(vfs_handle_struct *handle,
-                      const char *path, mode_t mode)
+                               const struct smb_filename *smb_fname,
+                               mode_t mode)
 {
        int result;
 
-       result = SMB_VFS_NEXT_CHMOD(handle, path, mode);
+       result = SMB_VFS_NEXT_CHMOD(handle, smb_fname, mode);
 
-       do_log(SMB_VFS_OP_CHMOD, (result >= 0), handle, "%s|%o", path, mode);
+       do_log(SMB_VFS_OP_CHMOD, (result >= 0), handle, "%s|%o",
+               smb_fname->base_name,
+               mode);
 
        return result;
 }
@@ -1158,14 +1458,16 @@ static int smb_full_audit_fchmod(vfs_handle_struct *handle, files_struct *fsp,
 }
 
 static int smb_full_audit_chown(vfs_handle_struct *handle,
-                      const char *path, uid_t uid, gid_t gid)
+                       const struct smb_filename *smb_fname,
+                       uid_t uid,
+                       gid_t gid)
 {
        int result;
 
-       result = SMB_VFS_NEXT_CHOWN(handle, path, uid, gid);
+       result = SMB_VFS_NEXT_CHOWN(handle, smb_fname, uid, gid);
 
        do_log(SMB_VFS_OP_CHOWN, (result >= 0), handle, "%s|%ld|%ld",
-              path, (long int)uid, (long int)gid);
+              smb_fname->base_name, (long int)uid, (long int)gid);
 
        return result;
 }
@@ -1184,38 +1486,42 @@ static int smb_full_audit_fchown(vfs_handle_struct *handle, files_struct *fsp,
 }
 
 static int smb_full_audit_lchown(vfs_handle_struct *handle,
-                      const char *path, uid_t uid, gid_t gid)
+                       const struct smb_filename *smb_fname,
+                       uid_t uid,
+                       gid_t gid)
 {
        int result;
 
-       result = SMB_VFS_NEXT_LCHOWN(handle, path, uid, gid);
+       result = SMB_VFS_NEXT_LCHOWN(handle, smb_fname, uid, gid);
 
        do_log(SMB_VFS_OP_LCHOWN, (result >= 0), handle, "%s|%ld|%ld",
-              path, (long int)uid, (long int)gid);
+              smb_fname->base_name, (long int)uid, (long int)gid);
 
        return result;
 }
 
 static int smb_full_audit_chdir(vfs_handle_struct *handle,
-                      const char *path)
+                       const struct smb_filename *smb_fname)
 {
        int result;
 
-       result = SMB_VFS_NEXT_CHDIR(handle, path);
+       result = SMB_VFS_NEXT_CHDIR(handle, smb_fname);
 
-       do_log(SMB_VFS_OP_CHDIR, (result >= 0), handle, "chdir|%s", path);
+       do_log(SMB_VFS_OP_CHDIR, (result >= 0), handle, "chdir|%s",
+               smb_fname->base_name);
 
        return result;
 }
 
-static char *smb_full_audit_getwd(vfs_handle_struct *handle)
+static struct smb_filename *smb_full_audit_getwd(vfs_handle_struct *handle,
+                               TALLOC_CTX *ctx)
 {
-       char *result;
+       struct smb_filename *result;
 
-       result = SMB_VFS_NEXT_GETWD(handle);
+       result = SMB_VFS_NEXT_GETWD(handle, ctx);
        
        do_log(SMB_VFS_OP_GETWD, (result != NULL), handle, "%s",
-               result == NULL? "" : result);
+               result == NULL? "" : result->base_name);
 
        return result;
 }
@@ -1235,7 +1541,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;
 
@@ -1248,9 +1554,9 @@ 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)
+                          uint32_t mode,
+                          off_t offset,
+                          off_t len)
 {
        int result;
 
@@ -1263,7 +1569,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;
 
@@ -1276,7 +1582,7 @@ 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 access_mask)
+                                      uint32_t share_mode, uint32_t access_mask)
 {
        int result;
 
@@ -1302,7 +1608,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;
 
@@ -1314,92 +1620,87 @@ static bool smb_full_audit_getlock(vfs_handle_struct *handle, files_struct *fsp,
 }
 
 static int smb_full_audit_symlink(vfs_handle_struct *handle,
-                        const char *oldpath, const char *newpath)
+                       const char *link_contents,
+                       const struct smb_filename *new_smb_fname)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYMLINK(handle, oldpath, newpath);
+       result = SMB_VFS_NEXT_SYMLINK(handle, link_contents, new_smb_fname);
 
        do_log(SMB_VFS_OP_SYMLINK, (result >= 0), handle,
-              "%s|%s", oldpath, newpath);
+              "%s|%s", link_contents, new_smb_fname->base_name);
 
        return result;
 }
 
 static int smb_full_audit_readlink(vfs_handle_struct *handle,
-                         const char *path, char *buf, size_t bufsiz)
+                       const struct smb_filename *smb_fname,
+                       char *buf,
+                       size_t bufsiz)
 {
        int result;
 
-       result = SMB_VFS_NEXT_READLINK(handle, path, buf, bufsiz);
+       result = SMB_VFS_NEXT_READLINK(handle, smb_fname, buf, bufsiz);
 
-       do_log(SMB_VFS_OP_READLINK, (result >= 0), handle, "%s", path);
+       do_log(SMB_VFS_OP_READLINK, (result >= 0), handle, "%s",
+                       smb_fname->base_name);
 
        return result;
 }
 
 static int smb_full_audit_link(vfs_handle_struct *handle,
-                     const char *oldpath, const char *newpath)
+                       const struct smb_filename *old_smb_fname,
+                       const struct smb_filename *new_smb_fname)
 {
        int result;
 
-       result = SMB_VFS_NEXT_LINK(handle, oldpath, newpath);
+       result = SMB_VFS_NEXT_LINK(handle, old_smb_fname, new_smb_fname);
 
        do_log(SMB_VFS_OP_LINK, (result >= 0), handle,
-              "%s|%s", oldpath, newpath);
+              "%s|%s", old_smb_fname->base_name, new_smb_fname->base_name);
 
        return result;
 }
 
 static int smb_full_audit_mknod(vfs_handle_struct *handle,
-                      const char *pathname, mode_t mode, SMB_DEV_T dev)
+                       const struct smb_filename *smb_fname,
+                       mode_t mode,
+                       SMB_DEV_T dev)
 {
        int result;
 
-       result = SMB_VFS_NEXT_MKNOD(handle, pathname, mode, dev);
+       result = SMB_VFS_NEXT_MKNOD(handle, smb_fname, mode, dev);
 
-       do_log(SMB_VFS_OP_MKNOD, (result >= 0), handle, "%s", pathname);
+       do_log(SMB_VFS_OP_MKNOD, (result >= 0), handle, "%s",
+               smb_fname->base_name);
 
        return result;
 }
 
-static char *smb_full_audit_realpath(vfs_handle_struct *handle,
-                           const char *path)
+static struct smb_filename *smb_full_audit_realpath(vfs_handle_struct *handle,
+                               TALLOC_CTX *ctx,
+                               const struct smb_filename *smb_fname)
 {
-       char *result;
+       struct smb_filename *result_fname = NULL;
 
-       result = SMB_VFS_NEXT_REALPATH(handle, path);
+       result_fname = SMB_VFS_NEXT_REALPATH(handle, ctx, smb_fname);
 
-       do_log(SMB_VFS_OP_REALPATH, (result != NULL), handle, "%s", path);
+       do_log(SMB_VFS_OP_REALPATH, (result_fname != NULL), handle, "%s",
+                       smb_fname->base_name);
 
-       return result;
-}
-
-static NTSTATUS smb_full_audit_notify_watch(struct vfs_handle_struct *handle,
-                       struct sys_notify_context *ctx,
-                       struct notify_entry *e,
-                       void (*callback)(struct sys_notify_context *ctx,
-                                       void *private_data,
-                                       struct notify_event *ev),
-                       void *private_data, void *handle_p)
-{
-       NTSTATUS result;
-
-       result = SMB_VFS_NEXT_NOTIFY_WATCH(handle, ctx, e, callback, private_data, handle_p);
-
-       do_log(SMB_VFS_OP_NOTIFY_WATCH, NT_STATUS_IS_OK(result), handle, "");
-
-       return result;
+       return result_fname;
 }
 
 static int smb_full_audit_chflags(vfs_handle_struct *handle,
-                           const char *path, unsigned int flags)
+                       const struct smb_filename *smb_fname,
+                       unsigned int flags)
 {
        int result;
 
-       result = SMB_VFS_NEXT_CHFLAGS(handle, path, flags);
+       result = SMB_VFS_NEXT_CHFLAGS(handle, smb_fname, flags);
 
-       do_log(SMB_VFS_OP_CHFLAGS, (result != 0), handle, "%s", path);
+       do_log(SMB_VFS_OP_CHFLAGS, (result != 0), handle, "%s",
+               smb_fname->base_name);
 
        return result;
 }
@@ -1423,18 +1724,18 @@ static struct file_id smb_full_audit_file_id_create(struct vfs_handle_struct *ha
 
 static NTSTATUS smb_full_audit_streaminfo(vfs_handle_struct *handle,
                                          struct files_struct *fsp,
-                                         const char *fname,
+                                         const struct smb_filename *smb_fname,
                                          TALLOC_CTX *mem_ctx,
                                          unsigned int *pnum_streams,
                                          struct stream_struct **pstreams)
 {
        NTSTATUS result;
 
-       result = SMB_VFS_NEXT_STREAMINFO(handle, fsp, fname, mem_ctx,
+       result = SMB_VFS_NEXT_STREAMINFO(handle, fsp, smb_fname, mem_ctx,
                                         pnum_streams, pstreams);
 
        do_log(SMB_VFS_OP_STREAMINFO, NT_STATUS_IS_OK(result), handle,
-              "%s", fname);
+              "%s", smb_fname->base_name);
 
        return result;
 }
@@ -1457,14 +1758,14 @@ static int smb_full_audit_get_real_filename(struct vfs_handle_struct *handle,
 }
 
 static const char *smb_full_audit_connectpath(vfs_handle_struct *handle,
-                                             const char *fname)
+                                       const struct smb_filename *smb_fname)
 {
        const char *result;
 
-       result = SMB_VFS_NEXT_CONNECTPATH(handle, fname);
+       result = SMB_VFS_NEXT_CONNECTPATH(handle, smb_fname);
 
        do_log(SMB_VFS_OP_CONNECTPATH, result != NULL, handle,
-              "%s", fname);
+              "%s", smb_fname->base_name);
 
        return result;
 }
@@ -1472,17 +1773,17 @@ static const char *smb_full_audit_connectpath(vfs_handle_struct *handle,
 static NTSTATUS smb_full_audit_brl_lock_windows(struct vfs_handle_struct *handle,
                                                struct byte_range_lock *br_lck,
                                                struct lock_struct *plock,
-                                               bool blocking_lock,
-                                               struct blocking_lock_record *blr)
+                                               bool blocking_lock)
 {
        NTSTATUS result;
 
        result = SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle, br_lck, plock,
-           blocking_lock, blr);
+                                              blocking_lock);
 
        do_log(SMB_VFS_OP_BRL_LOCK_WINDOWS, NT_STATUS_IS_OK(result), handle,
-           "%s:%llu-%llu. type=%d. blocking=%d", fsp_str_do_log(br_lck->fsp),
-           plock->start, plock->size, plock->lock_type, blocking_lock );
+           "%s:%llu-%llu. type=%d. blocking=%d",
+              fsp_str_do_log(brl_fsp(br_lck)),
+           plock->start, plock->size, plock->lock_type, blocking_lock);
 
        return result;
 }
@@ -1498,7 +1799,8 @@ static bool smb_full_audit_brl_unlock_windows(struct vfs_handle_struct *handle,
            plock);
 
        do_log(SMB_VFS_OP_BRL_UNLOCK_WINDOWS, (result == 0), handle,
-           "%s:%llu-%llu:%d", fsp_str_do_log(br_lck->fsp), plock->start,
+              "%s:%llu-%llu:%d", fsp_str_do_log(brl_fsp(br_lck)),
+              plock->start,
            plock->size, plock->lock_type);
 
        return result;
@@ -1506,48 +1808,35 @@ static bool smb_full_audit_brl_unlock_windows(struct vfs_handle_struct *handle,
 
 static bool smb_full_audit_brl_cancel_windows(struct vfs_handle_struct *handle,
                                              struct byte_range_lock *br_lck,
-                                             struct lock_struct *plock,
-                                             struct blocking_lock_record *blr)
+                                             struct lock_struct *plock)
 {
        bool result;
 
-       result = SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock, blr);
+       result = SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock);
 
        do_log(SMB_VFS_OP_BRL_CANCEL_WINDOWS, (result == 0), handle,
-           "%s:%llu-%llu:%d", fsp_str_do_log(br_lck->fsp), plock->start,
-           plock->size);
+              "%s:%llu-%llu:%d", fsp_str_do_log(brl_fsp(br_lck)),
+              plock->start,
+           plock->size, plock->lock_type);
 
        return result;
 }
 
-static bool smb_full_audit_strict_lock(struct vfs_handle_struct *handle,
-                                      struct files_struct *fsp,
-                                      struct lock_struct *plock)
+static bool smb_full_audit_strict_lock_check(struct vfs_handle_struct *handle,
+                                            struct files_struct *fsp,
+                                            struct lock_struct *plock)
 {
        bool result;
 
-       result = SMB_VFS_NEXT_STRICT_LOCK(handle, fsp, plock);
+       result = SMB_VFS_NEXT_STRICT_LOCK_CHECK(handle, fsp, plock);
 
-       do_log(SMB_VFS_OP_STRICT_LOCK, result, handle,
+       do_log(SMB_VFS_OP_STRICT_LOCK_CHECK, result, handle,
            "%s:%llu-%llu:%d", fsp_str_do_log(fsp), plock->start,
-           plock->size);
+           plock->size, plock->lock_type);
 
        return result;
 }
 
-static void smb_full_audit_strict_unlock(struct vfs_handle_struct *handle,
-                                        struct files_struct *fsp,
-                                        struct lock_struct *plock)
-{
-       SMB_VFS_NEXT_STRICT_UNLOCK(handle, fsp, plock);
-
-       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,
                                              const char *name,
                                              enum vfs_translate_direction direction,
@@ -1564,420 +1853,454 @@ static NTSTATUS smb_full_audit_translate_name(struct vfs_handle_struct *handle,
        return result;
 }
 
-static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                               uint32 security_info,
-                               struct security_descriptor **ppdesc)
+static NTSTATUS smb_full_audit_fsctl(struct vfs_handle_struct *handle,
+                               struct files_struct *fsp,
+                               TALLOC_CTX *ctx,
+                               uint32_t function,
+                               uint16_t req_flags,
+                               const uint8_t *_in_data,
+                               uint32_t in_len,
+                               uint8_t **_out_data,
+                               uint32_t max_out_len,
+                               uint32_t *out_len)
 {
        NTSTATUS result;
 
-       result = SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, ppdesc);
+       result = SMB_VFS_NEXT_FSCTL(handle,
+                               fsp,
+                               ctx,
+                               function,
+                               req_flags,
+                               _in_data,
+                               in_len,
+                               _out_data,
+                               max_out_len,
+                               out_len);
 
-       do_log(SMB_VFS_OP_FGET_NT_ACL, NT_STATUS_IS_OK(result), handle,
-              "%s", fsp_str_do_log(fsp));
+       do_log(SMB_VFS_OP_FSCTL, NT_STATUS_IS_OK(result), handle, "");
 
        return result;
 }
 
-static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle,
-                                         const char *name,
-                                         uint32 security_info,
-                                         struct security_descriptor **ppdesc)
+static struct tevent_req *smb_full_audit_offload_read_send(
+       TALLOC_CTX *mem_ctx,
+       struct tevent_context *ev,
+       struct vfs_handle_struct *handle,
+       struct files_struct *fsp,
+       uint32_t fsctl,
+       uint32_t ttl,
+       off_t offset,
+       size_t to_copy)
 {
-       NTSTATUS result;
+       struct tevent_req *req = NULL;
 
-       result = SMB_VFS_NEXT_GET_NT_ACL(handle, name, security_info, ppdesc);
+       req = SMB_VFS_NEXT_OFFLOAD_READ_SEND(mem_ctx, ev, handle, fsp,
+                                            fsctl, ttl, offset, to_copy);
 
-       do_log(SMB_VFS_OP_GET_NT_ACL, NT_STATUS_IS_OK(result), handle,
-              "%s", name);
+       do_log(SMB_VFS_OP_OFFLOAD_READ_SEND, req, handle, "");
 
-       return result;
+       return req;
 }
 
-static NTSTATUS smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                             uint32 security_info_sent,
-                             const struct security_descriptor *psd)
+static NTSTATUS smb_full_audit_offload_read_recv(
+       struct tevent_req *req,
+       struct vfs_handle_struct *handle,
+       TALLOC_CTX *mem_ctx,
+       DATA_BLOB *_token_blob)
 {
-       NTSTATUS result;
+       NTSTATUS status;
 
-       result = SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
+       status = SMB_VFS_NEXT_OFFLOAD_READ_RECV(req, handle, mem_ctx,
+                                               _token_blob);
 
-       do_log(SMB_VFS_OP_FSET_NT_ACL, NT_STATUS_IS_OK(result), handle, "%s",
-              fsp_str_do_log(fsp));
+       do_log(SMB_VFS_OP_OFFLOAD_READ_RECV, NT_STATUS_IS_OK(status), handle, "");
 
-       return result;
+       return status;
 }
 
-static int smb_full_audit_chmod_acl(vfs_handle_struct *handle,
-                          const char *path, mode_t mode)
+static struct tevent_req *smb_full_audit_offload_write_send(struct vfs_handle_struct *handle,
+                                                        TALLOC_CTX *mem_ctx,
+                                                        struct tevent_context *ev,
+                                                        uint32_t fsctl,
+                                                        DATA_BLOB *token,
+                                                        off_t transfer_offset,
+                                                        struct files_struct *dest_fsp,
+                                                        off_t dest_off,
+                                                           off_t num)
 {
-       int result;
-       
-       result = SMB_VFS_NEXT_CHMOD_ACL(handle, path, mode);
-
-       do_log(SMB_VFS_OP_CHMOD_ACL, (result >= 0), handle,
-              "%s|%o", path, mode);
-
-       return result;
-}
+       struct tevent_req *req;
 
-static int smb_full_audit_fchmod_acl(vfs_handle_struct *handle, files_struct *fsp,
-                                    mode_t mode)
-{
-       int result;
-       
-       result = SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, mode);
+       req = SMB_VFS_NEXT_OFFLOAD_WRITE_SEND(handle, mem_ctx, ev,
+                                          fsctl, token, transfer_offset,
+                                          dest_fsp, dest_off, num);
 
-       do_log(SMB_VFS_OP_FCHMOD_ACL, (result >= 0), handle,
-              "%s|%o", fsp_str_do_log(fsp), mode);
+       do_log(SMB_VFS_OP_OFFLOAD_WRITE_SEND, req, handle, "");
 
-       return result;
+       return req;
 }
 
-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)
+static NTSTATUS smb_full_audit_offload_write_recv(struct vfs_handle_struct *handle,
+                                              struct tevent_req *req,
+                                              off_t *copied)
 {
-       int result;
+       NTSTATUS result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_ENTRY(handle, theacl, entry_id,
-                                               entry_p);
+       result = SMB_VFS_NEXT_OFFLOAD_WRITE_RECV(handle, req, copied);
 
-       do_log(SMB_VFS_OP_SYS_ACL_GET_ENTRY, (result >= 0), handle,
-              "");
+       do_log(SMB_VFS_OP_OFFLOAD_WRITE_RECV, NT_STATUS_IS_OK(result), 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)
+static NTSTATUS smb_full_audit_get_compression(vfs_handle_struct *handle,
+                                              TALLOC_CTX *mem_ctx,
+                                              struct files_struct *fsp,
+                                              struct smb_filename *smb_fname,
+                                              uint16_t *_compression_fmt)
 {
-       int result;
+       NTSTATUS result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_TAG_TYPE(handle, entry_d,
-                                                  tag_type_p);
+       result = SMB_VFS_NEXT_GET_COMPRESSION(handle, mem_ctx, fsp, smb_fname,
+                                             _compression_fmt);
 
-       do_log(SMB_VFS_OP_SYS_ACL_GET_TAG_TYPE, (result >= 0), handle,
-              "");
+       do_log(SMB_VFS_OP_GET_COMPRESSION, NT_STATUS_IS_OK(result), handle,
+              "%s",
+              (fsp ? fsp_str_do_log(fsp) : smb_fname_str_do_log(smb_fname)));
 
        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)
+static NTSTATUS smb_full_audit_set_compression(vfs_handle_struct *handle,
+                                              TALLOC_CTX *mem_ctx,
+                                              struct files_struct *fsp,
+                                              uint16_t compression_fmt)
 {
-       int result;
+       NTSTATUS result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_PERMSET(handle, entry_d,
-                                                 permset_p);
+       result = SMB_VFS_NEXT_SET_COMPRESSION(handle, mem_ctx, fsp,
+                                             compression_fmt);
 
-       do_log(SMB_VFS_OP_SYS_ACL_GET_PERMSET, (result >= 0), handle,
-              "");
+       do_log(SMB_VFS_OP_SET_COMPRESSION, NT_STATUS_IS_OK(result), handle,
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
 
-static void * smb_full_audit_sys_acl_get_qualifier(vfs_handle_struct *handle,
-
-                                         SMB_ACL_ENTRY_T entry_d)
+static NTSTATUS smb_full_audit_readdir_attr(struct vfs_handle_struct *handle,
+                                           const struct smb_filename *fname,
+                                           TALLOC_CTX *mem_ctx,
+                                           struct readdir_attr_data **pattr_data)
 {
-       void *result;
+       NTSTATUS status;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_QUALIFIER(handle, entry_d);
+       status = SMB_VFS_NEXT_READDIR_ATTR(handle, fname, mem_ctx, pattr_data);
 
-       do_log(SMB_VFS_OP_SYS_ACL_GET_QUALIFIER, (result != NULL), handle,
-              "");
+       do_log(SMB_VFS_OP_READDIR_ATTR, NT_STATUS_IS_OK(status), handle, "%s",
+              smb_fname_str_do_log(fname));
 
-       return result;
+       return status;
 }
 
-static SMB_ACL_T smb_full_audit_sys_acl_get_file(vfs_handle_struct *handle,
-                                       const char *path_p,
-                                       SMB_ACL_TYPE_T type)
+static NTSTATUS smb_full_audit_get_dos_attributes(
+                               struct vfs_handle_struct *handle,
+                               struct smb_filename *smb_fname,
+                               uint32_t *dosmode)
 {
-       SMB_ACL_T result;
+       NTSTATUS status;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, path_p, type);
+       status = SMB_VFS_NEXT_GET_DOS_ATTRIBUTES(handle,
+                               smb_fname,
+                               dosmode);
 
-       do_log(SMB_VFS_OP_SYS_ACL_GET_FILE, (result != NULL), handle,
-              "%s", path_p);
+       do_log(SMB_VFS_OP_GET_DOS_ATTRIBUTES,
+               NT_STATUS_IS_OK(status),
+               handle,
+               "%s",
+               smb_fname_str_do_log(smb_fname));
 
-       return result;
+       return status;
 }
 
-static SMB_ACL_T smb_full_audit_sys_acl_get_fd(vfs_handle_struct *handle,
-                                     files_struct *fsp)
+static NTSTATUS smb_full_audit_fget_dos_attributes(
+                               struct vfs_handle_struct *handle,
+                               struct files_struct *fsp,
+                               uint32_t *dosmode)
 {
-       SMB_ACL_T result;
+       NTSTATUS status;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp);
+       status = SMB_VFS_NEXT_FGET_DOS_ATTRIBUTES(handle,
+                               fsp,
+                               dosmode);
 
-       do_log(SMB_VFS_OP_SYS_ACL_GET_FD, (result != NULL), handle,
-              "%s", fsp_str_do_log(fsp));
+       do_log(SMB_VFS_OP_FGET_DOS_ATTRIBUTES,
+               NT_STATUS_IS_OK(status),
+               handle,
+               "%s",
+               fsp_str_do_log(fsp));
 
-       return result;
+       return status;
 }
 
-static int smb_full_audit_sys_acl_clear_perms(vfs_handle_struct *handle,
-
-                                    SMB_ACL_PERMSET_T permset)
+static NTSTATUS smb_full_audit_set_dos_attributes(
+                               struct vfs_handle_struct *handle,
+                               const struct smb_filename *smb_fname,
+                               uint32_t dosmode)
 {
-       int result;
+       NTSTATUS status;
 
-       result = SMB_VFS_NEXT_SYS_ACL_CLEAR_PERMS(handle, permset);
+       status = SMB_VFS_NEXT_SET_DOS_ATTRIBUTES(handle,
+                               smb_fname,
+                               dosmode);
 
-       do_log(SMB_VFS_OP_SYS_ACL_CLEAR_PERMS, (result >= 0), handle,
-              "");
+       do_log(SMB_VFS_OP_SET_DOS_ATTRIBUTES,
+               NT_STATUS_IS_OK(status),
+               handle,
+               "%s",
+               smb_fname_str_do_log(smb_fname));
 
-       return result;
+       return status;
 }
 
-static int smb_full_audit_sys_acl_add_perm(vfs_handle_struct *handle,
-
-                                 SMB_ACL_PERMSET_T permset,
-                                 SMB_ACL_PERM_T perm)
+static NTSTATUS smb_full_audit_fset_dos_attributes(
+                               struct vfs_handle_struct *handle,
+                               struct files_struct *fsp,
+                               uint32_t dosmode)
 {
-       int result;
+       NTSTATUS status;
 
-       result = SMB_VFS_NEXT_SYS_ACL_ADD_PERM(handle, permset, perm);
+       status = SMB_VFS_NEXT_FSET_DOS_ATTRIBUTES(handle,
+                               fsp,
+                               dosmode);
 
-       do_log(SMB_VFS_OP_SYS_ACL_ADD_PERM, (result >= 0), handle,
-              "");
+       do_log(SMB_VFS_OP_FSET_DOS_ATTRIBUTES,
+               NT_STATUS_IS_OK(status),
+               handle,
+               "%s",
+               fsp_str_do_log(fsp));
 
-       return result;
+       return status;
 }
 
-static char * smb_full_audit_sys_acl_to_text(vfs_handle_struct *handle,
-                                   SMB_ACL_T theacl,
-                                   ssize_t *plen)
+static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+                                          uint32_t security_info,
+                                          TALLOC_CTX *mem_ctx,
+                                          struct security_descriptor **ppdesc)
 {
-       char * result;
+       NTSTATUS result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_TO_TEXT(handle, theacl, plen);
+       result = SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info,
+                                         mem_ctx, ppdesc);
 
-       do_log(SMB_VFS_OP_SYS_ACL_TO_TEXT, (result != NULL), handle,
-              "");
+       do_log(SMB_VFS_OP_FGET_NT_ACL, NT_STATUS_IS_OK(result), handle,
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
 
-static SMB_ACL_T smb_full_audit_sys_acl_init(vfs_handle_struct *handle,
-
-                                   int count)
+static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle,
+                                         const struct smb_filename *smb_fname,
+                                         uint32_t security_info,
+                                         TALLOC_CTX *mem_ctx,
+                                         struct security_descriptor **ppdesc)
 {
-       SMB_ACL_T result;
+       NTSTATUS result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_INIT(handle, count);
+       result = SMB_VFS_NEXT_GET_NT_ACL(handle, smb_fname, security_info,
+                                        mem_ctx, ppdesc);
 
-       do_log(SMB_VFS_OP_SYS_ACL_INIT, (result != NULL), handle,
-              "");
+       do_log(SMB_VFS_OP_GET_NT_ACL, NT_STATUS_IS_OK(result), handle,
+              "%s", smb_fname_str_do_log(smb_fname));
 
        return result;
 }
 
-static int smb_full_audit_sys_acl_create_entry(vfs_handle_struct *handle,
-                                     SMB_ACL_T *pacl,
-                                     SMB_ACL_ENTRY_T *pentry)
+static NTSTATUS smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+                             uint32_t security_info_sent,
+                             const struct security_descriptor *psd)
 {
-       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,
-              "");
+       struct vfs_full_audit_private_data *pd;
+       NTSTATUS result;
+       char *sd = NULL;
 
-       return result;
-}
+       SMB_VFS_HANDLE_GET_DATA(handle, pd,
+                               struct vfs_full_audit_private_data,
+                               return NT_STATUS_INTERNAL_ERROR);
 
-static int smb_full_audit_sys_acl_set_tag_type(vfs_handle_struct *handle,
+       if (pd->log_secdesc) {
+               sd = sddl_encode(talloc_tos(), psd, get_global_sam_sid());
+       }
 
-                                     SMB_ACL_ENTRY_T entry,
-                                     SMB_ACL_TAG_T tagtype)
-{
-       int result;
+       result = SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
 
-       result = SMB_VFS_NEXT_SYS_ACL_SET_TAG_TYPE(handle, entry,
-                                                  tagtype);
+       do_log(SMB_VFS_OP_FSET_NT_ACL, NT_STATUS_IS_OK(result), handle,
+              "%s [%s]", fsp_str_do_log(fsp), sd ? sd : "");
 
-       do_log(SMB_VFS_OP_SYS_ACL_SET_TAG_TYPE, (result >= 0), handle,
-              "");
+       TALLOC_FREE(sd);
 
        return result;
 }
 
-static int smb_full_audit_sys_acl_set_qualifier(vfs_handle_struct *handle,
-
-                                      SMB_ACL_ENTRY_T entry,
-                                      void *qual)
+static NTSTATUS smb_full_audit_audit_file(struct vfs_handle_struct *handle,
+                               struct smb_filename *file,
+                               struct security_acl *sacl,
+                               uint32_t access_requested,
+                               uint32_t access_denied)
 {
-       int result;
+       NTSTATUS result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_SET_QUALIFIER(handle, entry, qual);
+       result = SMB_VFS_NEXT_AUDIT_FILE(handle,
+                                       file,
+                                       sacl,
+                                       access_requested,
+                                       access_denied);
 
-       do_log(SMB_VFS_OP_SYS_ACL_SET_QUALIFIER, (result >= 0), handle,
-              "");
+       do_log(SMB_VFS_OP_AUDIT_FILE, NT_STATUS_IS_OK(result), handle,
+                       "%s", smb_fname_str_do_log(file));
 
        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)
+static int smb_full_audit_chmod_acl(vfs_handle_struct *handle,
+                               const struct smb_filename *smb_fname,
+                               mode_t mode)
 {
        int result;
+       
+       result = SMB_VFS_NEXT_CHMOD_ACL(handle, smb_fname, mode);
 
-       result = SMB_VFS_NEXT_SYS_ACL_SET_PERMSET(handle, entry, permset);
-
-       do_log(SMB_VFS_OP_SYS_ACL_SET_PERMSET, (result >= 0), handle,
-              "");
+       do_log(SMB_VFS_OP_CHMOD_ACL, (result >= 0), handle,
+              "%s|%o", smb_fname->base_name, mode);
 
        return result;
 }
 
-static int smb_full_audit_sys_acl_valid(vfs_handle_struct *handle,
-
-                              SMB_ACL_T theacl )
+static int smb_full_audit_fchmod_acl(vfs_handle_struct *handle, files_struct *fsp,
+                                    mode_t mode)
 {
        int result;
+       
+       result = SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, mode);
 
-       result = SMB_VFS_NEXT_SYS_ACL_VALID(handle, theacl);
-
-       do_log(SMB_VFS_OP_SYS_ACL_VALID, (result >= 0), handle,
-              "");
+       do_log(SMB_VFS_OP_FCHMOD_ACL, (result >= 0), handle,
+              "%s|%o", fsp_str_do_log(fsp), mode);
 
        return result;
 }
 
-static int smb_full_audit_sys_acl_set_file(vfs_handle_struct *handle,
-
-                                 const char *name, SMB_ACL_TYPE_T acltype,
-                                 SMB_ACL_T theacl)
+static SMB_ACL_T smb_full_audit_sys_acl_get_file(vfs_handle_struct *handle,
+                               const struct smb_filename *smb_fname,
+                               SMB_ACL_TYPE_T type,
+                               TALLOC_CTX *mem_ctx)
 {
-       int result;
+       SMB_ACL_T result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, name, acltype,
-                                              theacl);
+       result = SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, smb_fname,
+                               type, mem_ctx);
 
-       do_log(SMB_VFS_OP_SYS_ACL_SET_FILE, (result >= 0), handle,
-              "%s", name);
+       do_log(SMB_VFS_OP_SYS_ACL_GET_FILE, (result != NULL), handle,
+              "%s", smb_fname->base_name);
 
        return result;
 }
 
-static int smb_full_audit_sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
-                               SMB_ACL_T theacl)
+static SMB_ACL_T smb_full_audit_sys_acl_get_fd(vfs_handle_struct *handle,
+                                              files_struct *fsp, TALLOC_CTX *mem_ctx)
 {
-       int result;
+       SMB_ACL_T result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_SET_FD(handle, fsp, theacl);
+       result = SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, mem_ctx);
 
-       do_log(SMB_VFS_OP_SYS_ACL_SET_FD, (result >= 0), handle,
+       do_log(SMB_VFS_OP_SYS_ACL_GET_FD, (result != NULL), handle,
               "%s", fsp_str_do_log(fsp));
 
        return result;
 }
 
-static int smb_full_audit_sys_acl_delete_def_file(vfs_handle_struct *handle,
-
-                                        const char *path)
+static int smb_full_audit_sys_acl_blob_get_file(vfs_handle_struct *handle,
+                               const struct smb_filename *smb_fname,
+                               TALLOC_CTX *mem_ctx,
+                               char **blob_description,
+                               DATA_BLOB *blob)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, path);
+       result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, smb_fname,
+                       mem_ctx, blob_description, blob);
 
-       do_log(SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE, (result >= 0), handle,
-              "%s", path);
+       do_log(SMB_VFS_OP_SYS_ACL_BLOB_GET_FILE, (result >= 0), handle,
+              "%s", smb_fname->base_name);
 
        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)
+static int smb_full_audit_sys_acl_blob_get_fd(vfs_handle_struct *handle,
+                                             files_struct *fsp,
+                                             TALLOC_CTX *mem_ctx,
+                                             char **blob_description,
+                                             DATA_BLOB *blob)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_PERM(handle, permset, perm);
+       result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FD(handle, fsp, mem_ctx, blob_description, blob);
 
-       do_log(SMB_VFS_OP_SYS_ACL_GET_PERM, (result >= 0), handle,
-              "");
+       do_log(SMB_VFS_OP_SYS_ACL_BLOB_GET_FD, (result >= 0), handle,
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
 
-static int smb_full_audit_sys_acl_free_text(vfs_handle_struct *handle,
-
-                                  char *text)
+static int smb_full_audit_sys_acl_set_file(vfs_handle_struct *handle,
+                               const struct smb_filename *smb_fname,
+                               SMB_ACL_TYPE_T acltype,
+                               SMB_ACL_T theacl)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_FREE_TEXT(handle, text);
+       result = SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, smb_fname, acltype,
+                                              theacl);
 
-       do_log(SMB_VFS_OP_SYS_ACL_FREE_TEXT, (result >= 0), handle,
-              "");
+       do_log(SMB_VFS_OP_SYS_ACL_SET_FILE, (result >= 0), handle,
+              "%s", smb_fname->base_name);
 
        return result;
 }
 
-static int smb_full_audit_sys_acl_free_acl(vfs_handle_struct *handle,
-
-                                 SMB_ACL_T posix_acl)
+static int smb_full_audit_sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
+                               SMB_ACL_T theacl)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_FREE_ACL(handle, posix_acl);
+       result = SMB_VFS_NEXT_SYS_ACL_SET_FD(handle, fsp, theacl);
 
-       do_log(SMB_VFS_OP_SYS_ACL_FREE_ACL, (result >= 0), handle,
-              "");
+       do_log(SMB_VFS_OP_SYS_ACL_SET_FD, (result >= 0), handle,
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
 
-static int smb_full_audit_sys_acl_free_qualifier(vfs_handle_struct *handle,
-                                       void *qualifier,
-                                       SMB_ACL_TAG_T tagtype)
+static int smb_full_audit_sys_acl_delete_def_file(vfs_handle_struct *handle,
+                               const struct smb_filename *smb_fname)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_FREE_QUALIFIER(handle, qualifier,
-                                                    tagtype);
+       result = SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, smb_fname);
 
-       do_log(SMB_VFS_OP_SYS_ACL_FREE_QUALIFIER, (result >= 0), handle,
-              "");
+       do_log(SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE, (result >= 0), handle,
+              "%s", smb_fname->base_name);
 
        return result;
 }
 
 static ssize_t smb_full_audit_getxattr(struct vfs_handle_struct *handle,
-                             const char *path,
+                             const struct smb_filename *smb_fname,
                              const char *name, void *value, size_t size)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_GETXATTR(handle, path, name, value, size);
+       result = SMB_VFS_NEXT_GETXATTR(handle, smb_fname, name, value, size);
 
        do_log(SMB_VFS_OP_GETXATTR, (result >= 0), handle,
-              "%s|%s", path, name);
-
-       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);
+              "%s|%s", smb_fname->base_name, name);
 
        return result;
 }
@@ -1997,25 +2320,16 @@ static ssize_t smb_full_audit_fgetxattr(struct vfs_handle_struct *handle,
 }
 
 static ssize_t smb_full_audit_listxattr(struct vfs_handle_struct *handle,
-                              const char *path, char *list, size_t size)
-{
-       ssize_t result;
-
-       result = SMB_VFS_NEXT_LISTXATTR(handle, path, list, size);
-
-       do_log(SMB_VFS_OP_LISTXATTR, (result >= 0), handle, "%s", path);
-
-       return result;
-}
-
-static ssize_t smb_full_audit_llistxattr(struct vfs_handle_struct *handle,
-                               const char *path, char *list, size_t size)
+                               const struct smb_filename *smb_fname,
+                               char *list,
+                               size_t size)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_LLISTXATTR(handle, path, list, size);
+       result = SMB_VFS_NEXT_LISTXATTR(handle, smb_fname, list, size);
 
-       do_log(SMB_VFS_OP_LLISTXATTR, (result >= 0), handle, "%s", path);
+       do_log(SMB_VFS_OP_LISTXATTR, (result >= 0), handle, "%s",
+                       smb_fname->base_name);
 
        return result;
 }
@@ -2035,29 +2349,15 @@ static ssize_t smb_full_audit_flistxattr(struct vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_removexattr(struct vfs_handle_struct *handle,
-                            const char *path,
+                            const struct smb_filename *smb_fname,
                             const char *name)
 {
        int result;
 
-       result = SMB_VFS_NEXT_REMOVEXATTR(handle, path, name);
+       result = SMB_VFS_NEXT_REMOVEXATTR(handle, smb_fname, name);
 
        do_log(SMB_VFS_OP_REMOVEXATTR, (result >= 0), handle,
-              "%s|%s", path, name);
-
-       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);
+              "%s|%s", smb_fname->base_name, name);
 
        return result;
 }
@@ -2077,33 +2377,17 @@ static int smb_full_audit_fremovexattr(struct vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_setxattr(struct vfs_handle_struct *handle,
-                         const char *path,
+                         const struct smb_filename *smb_fname,
                          const char *name, const void *value, size_t size,
                          int flags)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SETXATTR(handle, path, name, value, size,
+       result = SMB_VFS_NEXT_SETXATTR(handle, smb_fname, name, value, size,
                                       flags);
 
        do_log(SMB_VFS_OP_SETXATTR, (result >= 0), handle,
-              "%s|%s", path, name);
-
-       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);
+              "%s|%s", smb_fname->base_name, name);
 
        return result;
 }
@@ -2122,115 +2406,81 @@ 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)
+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_CANCEL(handle, fsp, aiocb);
-       do_log(SMB_VFS_OP_AIO_CANCEL, (result >= 0), handle,
-              "%s", fsp_str_do_log(fsp));
+       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_error(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
+static NTSTATUS smb_full_audit_durable_cookie(struct vfs_handle_struct *handle,
+                               struct files_struct *fsp,
+                               TALLOC_CTX *mem_ctx,
+                               DATA_BLOB *cookie)
 {
-       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;
-}
+       NTSTATUS result;
 
-static int smb_full_audit_aio_fsync(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, SMB_STRUCT_AIOCB *aiocb)
-{
-       int result;
+       result = SMB_VFS_NEXT_DURABLE_COOKIE(handle,
+                                       fsp,
+                                       mem_ctx,
+                                       cookie);
 
-       result = SMB_VFS_NEXT_AIO_FSYNC(handle, fsp, op, aiocb);
-       do_log(SMB_VFS_OP_AIO_FSYNC, (result >= 0), handle,
-               "%s", fsp_str_do_log(fsp));
+       do_log(SMB_VFS_OP_DURABLE_COOKIE, NT_STATUS_IS_OK(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 NTSTATUS smb_full_audit_durable_disconnect(
+                               struct vfs_handle_struct *handle,
+                               struct files_struct *fsp,
+                               const DATA_BLOB old_cookie,
+                               TALLOC_CTX *mem_ctx,
+                               DATA_BLOB *new_cookie)
 {
-       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));
+       NTSTATUS result;
 
-       return result;
-}
+       result = SMB_VFS_NEXT_DURABLE_DISCONNECT(handle,
+                                       fsp,
+                                       old_cookie,
+                                       mem_ctx,
+                                       new_cookie);
 
-static bool smb_full_audit_aio_force(struct vfs_handle_struct *handle,
-                                    struct files_struct *fsp)
-{
-       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));
+       do_log(SMB_VFS_OP_DURABLE_DISCONNECT, NT_STATUS_IS_OK(result), handle,
+                       "%s", fsp_str_do_log(fsp));
 
        return result;
 }
 
-static bool smb_full_audit_is_offline(struct vfs_handle_struct *handle,
-                                     const struct smb_filename *fname,
-                                     SMB_STRUCT_STAT *sbuf)
+static NTSTATUS smb_full_audit_durable_reconnect(
+                               struct vfs_handle_struct *handle,
+                               struct smb_request *smb1req,
+                               struct smbXsrv_open *op,
+                               const DATA_BLOB old_cookie,
+                               TALLOC_CTX *mem_ctx,
+                               struct files_struct **fsp,
+                               DATA_BLOB *new_cookie)
 {
-       bool result;
+       NTSTATUS 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;
-}
+       result = SMB_VFS_NEXT_DURABLE_RECONNECT(handle,
+                                       smb1req,
+                                       op,
+                                       old_cookie,
+                                       mem_ctx,
+                                       fsp,
+                                       new_cookie);
 
-static int smb_full_audit_set_offline(struct vfs_handle_struct *handle,
-                                     const struct smb_filename *fname)
-{
-       int result;
+       do_log(SMB_VFS_OP_DURABLE_RECONNECT,
+                       NT_STATUS_IS_OK(result),
+                       handle,
+                       "");
 
-       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;
 }
 
@@ -2239,127 +2489,128 @@ 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,
+       .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,
+       .get_dfs_referrals_fn = smb_full_audit_get_dfs_referrals,
+       .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,
        .open_fn = smb_full_audit_open,
-       .create_file = smb_full_audit_create_file,
+       .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,
-       .is_offline = smb_full_audit_is_offline,
-       .set_offline = smb_full_audit_set_offline,
+       .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,
+       .chflags_fn = smb_full_audit_chflags,
+       .file_id_create_fn = smb_full_audit_file_id_create,
+       .offload_read_send_fn = smb_full_audit_offload_read_send,
+       .offload_read_recv_fn = smb_full_audit_offload_read_recv,
+       .offload_write_send_fn = smb_full_audit_offload_write_send,
+       .offload_write_recv_fn = smb_full_audit_offload_write_recv,
+       .get_compression_fn = smb_full_audit_get_compression,
+       .set_compression_fn = smb_full_audit_set_compression,
+       .snap_check_path_fn =  smb_full_audit_snap_check_path,
+       .snap_create_fn = smb_full_audit_snap_create,
+       .snap_delete_fn = smb_full_audit_snap_delete,
+       .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_check_fn = smb_full_audit_strict_lock_check,
+       .translate_name_fn = smb_full_audit_translate_name,
+       .fsctl_fn = smb_full_audit_fsctl,
+       .get_dos_attributes_fn = smb_full_audit_get_dos_attributes,
+       .fget_dos_attributes_fn = smb_full_audit_fget_dos_attributes,
+       .set_dos_attributes_fn = smb_full_audit_set_dos_attributes,
+       .fset_dos_attributes_fn = smb_full_audit_fset_dos_attributes,
+       .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,
+       .audit_file_fn = smb_full_audit_audit_file,
+       .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_blob_get_file_fn = smb_full_audit_sys_acl_blob_get_file,
+       .sys_acl_blob_get_fd_fn = smb_full_audit_sys_acl_blob_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,
+       .durable_cookie_fn = smb_full_audit_durable_cookie,
+       .durable_disconnect_fn = smb_full_audit_durable_disconnect,
+       .durable_reconnect_fn = smb_full_audit_durable_reconnect,
+       .readdir_attr_fn = smb_full_audit_readdir_attr
+
 };
 
-NTSTATUS vfs_full_audit_init(void)
+static_decl_vfs;
+NTSTATUS vfs_full_audit_init(TALLOC_CTX *ctx)
 {
-       NTSTATUS ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
-                                       "full_audit", &vfs_full_audit_fns);
-       
+       NTSTATUS ret;
+
+       smb_vfs_assert_all_fns(&vfs_full_audit_fns, "full_audit");
+
+       ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "full_audit",
+                              &vfs_full_audit_fns);
+
        if (!NT_STATUS_IS_OK(ret))
                return ret;