vfs: remove SMB_VFS_INIT_SEARCH_OP
[nivanova/samba-autobuild/.git] / source3 / modules / vfs_full_audit.c
index c8cef605b31a237ff1e337ca96054b9899fc315a..b8471593db7ec215d6092802ef0b490eb16540bb 100644 (file)
@@ -97,9 +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_SNAP_CHECK_PATH,
-       SMB_VFS_OP_SNAP_CREATE,
-       SMB_VFS_OP_SNAP_DELETE,
+       SMB_VFS_OP_GET_DFS_REFERRALS,
 
        /* Directory operations */
 
@@ -112,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 */
 
@@ -158,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,
@@ -167,20 +163,31 @@ 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_COPY_CHUNK_SEND,
-       SMB_VFS_OP_COPY_CHUNK_RECV,
+       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_READDIR_ATTR,
+       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. */
 
@@ -212,6 +219,13 @@ typedef enum _vfs_op_type {
        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
@@ -231,9 +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_SNAP_CHECK_PATH, "snap_check_path" },
-       { SMB_VFS_OP_SNAP_CREATE, "snap_create" },
-       { SMB_VFS_OP_SNAP_DELETE, "snap_delete" },
+       { 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,7 +255,6 @@ 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" },
@@ -286,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" },
@@ -295,17 +305,26 @@ 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_COPY_CHUNK_SEND,   "copy_chunk_send" },
-       { SMB_VFS_OP_COPY_CHUNK_RECV,   "copy_chunk_recv" },
+       { 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_READDIR_ATTR,      "readdir_attr" },
+       { 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_FILE,  "sys_acl_get_file" },
@@ -326,6 +345,10 @@ static struct {
        { 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 }
 };
 
@@ -653,29 +676,34 @@ static void smb_full_audit_disconnect(vfs_handle_struct *handle)
 }
 
 static uint64_t smb_full_audit_disk_free(vfs_handle_struct *handle,
-                                   const char *path, 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, 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;
 }
@@ -708,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, "");
 
@@ -731,6 +759,20 @@ static uint32_t smb_full_audit_fs_capabilities(struct vfs_handle_struct *handle,
        return result;
 }
 
+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,
@@ -778,19 +820,22 @@ static NTSTATUS smb_full_audit_snap_delete(struct vfs_handle_struct *handle,
 }
 
 static DIR *smb_full_audit_opendir(vfs_handle_struct *handle,
-                         const char *fname, const char *mask, uint32 attr)
+                       const struct smb_filename *smb_fname,
+                       const char *mask,
+                       uint32_t attr)
 {
        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 DIR *smb_full_audit_fdopendir(vfs_handle_struct *handle,
-                         files_struct *fsp, const char *mask, uint32 attr)
+                         files_struct *fsp, const char *mask, uint32_t attr)
 {
        DIR *result;
 
@@ -846,25 +891,27 @@ static void smb_full_audit_rewinddir(vfs_handle_struct *handle,
 }
 
 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;
 }
@@ -881,14 +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,
-                       DIR *dirp)
-{
-       SMB_VFS_NEXT_INIT_SEARCH_OP(handle, dirp);
-
-       do_log(SMB_VFS_OP_INIT_SEARCH_OP, True, handle, "");
-}
-
 static int smb_full_audit_open(vfs_handle_struct *handle,
                               struct smb_filename *smb_fname,
                               files_struct *fsp, int flags, mode_t mode)
@@ -1020,7 +1059,7 @@ struct smb_full_audit_pread_state {
        vfs_handle_struct *handle;
        files_struct *fsp;
        ssize_t ret;
-       int err;
+       struct vfs_aio_state vfs_aio_state;
 };
 
 static void smb_full_audit_pread_done(struct tevent_req *subreq);
@@ -1063,17 +1102,18 @@ static void smb_full_audit_pread_done(struct tevent_req *subreq)
        struct smb_full_audit_pread_state *state = tevent_req_data(
                req, struct smb_full_audit_pread_state);
 
-       state->ret = SMB_VFS_PREAD_RECV(subreq, &state->err);
+       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, int *err)
+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, err)) {
+       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;
@@ -1082,7 +1122,7 @@ static ssize_t smb_full_audit_pread_recv(struct tevent_req *req, int *err)
        do_log(SMB_VFS_OP_PREAD_RECV, (state->ret >= 0), state->handle, "%s",
               fsp_str_do_log(state->fsp));
 
-       *err = state->err;
+       *vfs_aio_state = state->vfs_aio_state;
        return state->ret;
 }
 
@@ -1117,7 +1157,7 @@ struct smb_full_audit_pwrite_state {
        vfs_handle_struct *handle;
        files_struct *fsp;
        ssize_t ret;
-       int err;
+       struct vfs_aio_state vfs_aio_state;
 };
 
 static void smb_full_audit_pwrite_done(struct tevent_req *subreq);
@@ -1161,17 +1201,18 @@ static void smb_full_audit_pwrite_done(struct tevent_req *subreq)
        struct smb_full_audit_pwrite_state *state = tevent_req_data(
                req, struct smb_full_audit_pwrite_state);
 
-       state->ret = SMB_VFS_PWRITE_RECV(subreq, &state->err);
+       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, int *err)
+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, err)) {
+       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;
@@ -1180,7 +1221,7 @@ static ssize_t smb_full_audit_pwrite_recv(struct tevent_req *req, int *err)
        do_log(SMB_VFS_OP_PWRITE_RECV, (state->ret >= 0), state->handle, "%s",
               fsp_str_do_log(state->fsp));
 
-       *err = state->err;
+       *vfs_aio_state = state->vfs_aio_state;
        return state->ret;
 }
 
@@ -1258,7 +1299,7 @@ struct smb_full_audit_fsync_state {
        vfs_handle_struct *handle;
        files_struct *fsp;
        int ret;
-       int err;
+       struct vfs_aio_state vfs_aio_state;
 };
 
 static void smb_full_audit_fsync_done(struct tevent_req *subreq);
@@ -1299,17 +1340,18 @@ static void smb_full_audit_fsync_done(struct tevent_req *subreq)
        struct smb_full_audit_fsync_state *state = tevent_req_data(
                req, struct smb_full_audit_fsync_state);
 
-       state->ret = SMB_VFS_FSYNC_RECV(subreq, &state->err);
+       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, int *err)
+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, err)) {
+       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;
@@ -1318,7 +1360,7 @@ static int smb_full_audit_fsync_recv(struct tevent_req *req, int *err)
        do_log(SMB_VFS_OP_FSYNC_RECV, (state->ret >= 0), state->handle, "%s",
               fsp_str_do_log(state->fsp));
 
-       *err = state->err;
+       *vfs_aio_state = state->vfs_aio_state;
        return state->ret;
 }
 
@@ -1388,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;
 }
@@ -1413,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;
 }
@@ -1439,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;
 }
@@ -1531,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;
 
@@ -1569,96 +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,
-                       const char *path,
-                       uint32_t *filter,
-                       uint32_t *subdir_filter,
-                       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, path,
-                                          filter, subdir_filter, 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;
 }
@@ -1682,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;
 }
@@ -1716,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;
 }
@@ -1780,32 +1822,21 @@ static bool smb_full_audit_brl_cancel_windows(struct vfs_handle_struct *handle,
        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->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, plock->lock_type);
-}
-
 static NTSTATUS smb_full_audit_translate_name(struct vfs_handle_struct *handle,
                                              const char *name,
                                              enum vfs_translate_direction direction,
@@ -1822,34 +1853,101 @@ static NTSTATUS smb_full_audit_translate_name(struct vfs_handle_struct *handle,
        return result;
 }
 
-static struct tevent_req *smb_full_audit_copy_chunk_send(struct vfs_handle_struct *handle,
+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_FSCTL(handle,
+                               fsp,
+                               ctx,
+                               function,
+                               req_flags,
+                               _in_data,
+                               in_len,
+                               _out_data,
+                               max_out_len,
+                               out_len);
+
+       do_log(SMB_VFS_OP_FSCTL, NT_STATUS_IS_OK(result), handle, "");
+
+       return result;
+}
+
+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)
+{
+       struct tevent_req *req = NULL;
+
+       req = SMB_VFS_NEXT_OFFLOAD_READ_SEND(mem_ctx, ev, handle, fsp,
+                                            fsctl, ttl, offset, to_copy);
+
+       do_log(SMB_VFS_OP_OFFLOAD_READ_SEND, req, handle, "");
+
+       return req;
+}
+
+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 status;
+
+       status = SMB_VFS_NEXT_OFFLOAD_READ_RECV(req, handle, mem_ctx,
+                                               _token_blob);
+
+       do_log(SMB_VFS_OP_OFFLOAD_READ_RECV, NT_STATUS_IS_OK(status), handle, "");
+
+       return status;
+}
+
+static struct tevent_req *smb_full_audit_offload_write_send(struct vfs_handle_struct *handle,
                                                         TALLOC_CTX *mem_ctx,
                                                         struct tevent_context *ev,
-                                                        struct files_struct *src_fsp,
-                                                        off_t src_off,
+                                                        uint32_t fsctl,
+                                                        DATA_BLOB *token,
+                                                        off_t transfer_offset,
                                                         struct files_struct *dest_fsp,
                                                         off_t dest_off,
-                                                        off_t num)
+                                                           off_t num)
 {
        struct tevent_req *req;
 
-       req = SMB_VFS_NEXT_COPY_CHUNK_SEND(handle, mem_ctx, ev, src_fsp,
-                                          src_off, dest_fsp, dest_off, num);
+       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_COPY_CHUNK_SEND, req, handle, "");
+       do_log(SMB_VFS_OP_OFFLOAD_WRITE_SEND, req, handle, "");
 
        return req;
 }
 
-static NTSTATUS smb_full_audit_copy_chunk_recv(struct vfs_handle_struct *handle,
+static NTSTATUS smb_full_audit_offload_write_recv(struct vfs_handle_struct *handle,
                                               struct tevent_req *req,
                                               off_t *copied)
 {
        NTSTATUS result;
 
-       result = SMB_VFS_NEXT_COPY_CHUNK_RECV(handle, req, copied);
+       result = SMB_VFS_NEXT_OFFLOAD_WRITE_RECV(handle, req, copied);
 
-       do_log(SMB_VFS_OP_COPY_CHUNK_RECV, NT_STATUS_IS_OK(result), handle, "");
+       do_log(SMB_VFS_OP_OFFLOAD_WRITE_RECV, NT_STATUS_IS_OK(result), handle, "");
 
        return result;
 }
@@ -1903,8 +2001,88 @@ static NTSTATUS smb_full_audit_readdir_attr(struct vfs_handle_struct *handle,
        return status;
 }
 
+static NTSTATUS smb_full_audit_get_dos_attributes(
+                               struct vfs_handle_struct *handle,
+                               struct smb_filename *smb_fname,
+                               uint32_t *dosmode)
+{
+       NTSTATUS status;
+
+       status = SMB_VFS_NEXT_GET_DOS_ATTRIBUTES(handle,
+                               smb_fname,
+                               dosmode);
+
+       do_log(SMB_VFS_OP_GET_DOS_ATTRIBUTES,
+               NT_STATUS_IS_OK(status),
+               handle,
+               "%s",
+               smb_fname_str_do_log(smb_fname));
+
+       return status;
+}
+
+static NTSTATUS smb_full_audit_fget_dos_attributes(
+                               struct vfs_handle_struct *handle,
+                               struct files_struct *fsp,
+                               uint32_t *dosmode)
+{
+       NTSTATUS status;
+
+       status = SMB_VFS_NEXT_FGET_DOS_ATTRIBUTES(handle,
+                               fsp,
+                               dosmode);
+
+       do_log(SMB_VFS_OP_FGET_DOS_ATTRIBUTES,
+               NT_STATUS_IS_OK(status),
+               handle,
+               "%s",
+               fsp_str_do_log(fsp));
+
+       return status;
+}
+
+static NTSTATUS smb_full_audit_set_dos_attributes(
+                               struct vfs_handle_struct *handle,
+                               const struct smb_filename *smb_fname,
+                               uint32_t dosmode)
+{
+       NTSTATUS status;
+
+       status = SMB_VFS_NEXT_SET_DOS_ATTRIBUTES(handle,
+                               smb_fname,
+                               dosmode);
+
+       do_log(SMB_VFS_OP_SET_DOS_ATTRIBUTES,
+               NT_STATUS_IS_OK(status),
+               handle,
+               "%s",
+               smb_fname_str_do_log(smb_fname));
+
+       return status;
+}
+
+static NTSTATUS smb_full_audit_fset_dos_attributes(
+                               struct vfs_handle_struct *handle,
+                               struct files_struct *fsp,
+                               uint32_t dosmode)
+{
+       NTSTATUS status;
+
+       status = SMB_VFS_NEXT_FSET_DOS_ATTRIBUTES(handle,
+                               fsp,
+                               dosmode);
+
+       do_log(SMB_VFS_OP_FSET_DOS_ATTRIBUTES,
+               NT_STATUS_IS_OK(status),
+               handle,
+               "%s",
+               fsp_str_do_log(fsp));
+
+       return status;
+}
+
 static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                                          uint32 security_info,
+                                          uint32_t security_info,
                                           TALLOC_CTX *mem_ctx,
                                           struct security_descriptor **ppdesc)
 {
@@ -1920,24 +2098,24 @@ static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_stru
 }
 
 static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle,
-                                         const char *name,
-                                         uint32 security_info,
+                                         const struct smb_filename *smb_fname,
+                                         uint32_t security_info,
                                          TALLOC_CTX *mem_ctx,
                                          struct security_descriptor **ppdesc)
 {
        NTSTATUS result;
 
-       result = SMB_VFS_NEXT_GET_NT_ACL(handle, name, security_info,
+       result = SMB_VFS_NEXT_GET_NT_ACL(handle, smb_fname, security_info,
                                         mem_ctx, ppdesc);
 
        do_log(SMB_VFS_OP_GET_NT_ACL, NT_STATUS_IS_OK(result), handle,
-              "%s", name);
+              "%s", smb_fname_str_do_log(smb_fname));
 
        return result;
 }
 
 static NTSTATUS smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                             uint32 security_info_sent,
+                             uint32_t security_info_sent,
                              const struct security_descriptor *psd)
 {
        struct vfs_full_audit_private_data *pd;
@@ -1962,15 +2140,36 @@ static NTSTATUS smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_stru
        return result;
 }
 
+static NTSTATUS smb_full_audit_audit_file(struct vfs_handle_struct *handle,
+                               struct smb_filename *file,
+                               struct security_acl *sacl,
+                               uint32_t access_requested,
+                               uint32_t access_denied)
+{
+       NTSTATUS result;
+
+       result = SMB_VFS_NEXT_AUDIT_FILE(handle,
+                                       file,
+                                       sacl,
+                                       access_requested,
+                                       access_denied);
+
+       do_log(SMB_VFS_OP_AUDIT_FILE, NT_STATUS_IS_OK(result), handle,
+                       "%s", smb_fname_str_do_log(file));
+
+       return result;
+}
+
 static int smb_full_audit_chmod_acl(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_ACL(handle, path, mode);
+       result = SMB_VFS_NEXT_CHMOD_ACL(handle, smb_fname, mode);
 
        do_log(SMB_VFS_OP_CHMOD_ACL, (result >= 0), handle,
-              "%s|%o", path, mode);
+              "%s|%o", smb_fname->base_name, mode);
 
        return result;
 }
@@ -1989,16 +2188,17 @@ static int smb_full_audit_fchmod_acl(vfs_handle_struct *handle, files_struct *fs
 }
 
 static SMB_ACL_T smb_full_audit_sys_acl_get_file(vfs_handle_struct *handle,
-                                       const char *path_p,
-                                                SMB_ACL_TYPE_T type,
-                                                TALLOC_CTX *mem_ctx)
+                               const struct smb_filename *smb_fname,
+                               SMB_ACL_TYPE_T type,
+                               TALLOC_CTX *mem_ctx)
 {
        SMB_ACL_T result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, path_p, type, mem_ctx);
+       result = SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, smb_fname,
+                               type, mem_ctx);
 
        do_log(SMB_VFS_OP_SYS_ACL_GET_FILE, (result != NULL), handle,
-              "%s", path_p);
+              "%s", smb_fname->base_name);
 
        return result;
 }
@@ -2017,17 +2217,18 @@ static SMB_ACL_T smb_full_audit_sys_acl_get_fd(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_blob_get_file(vfs_handle_struct *handle,
-                                               const char *path_p,
-                                               TALLOC_CTX *mem_ctx,
-                                               char **blob_description,
-                                               DATA_BLOB *blob)
+                               const struct smb_filename *smb_fname,
+                               TALLOC_CTX *mem_ctx,
+                               char **blob_description,
+                               DATA_BLOB *blob)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, path_p, mem_ctx, blob_description, blob);
+       result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, smb_fname,
+                       mem_ctx, blob_description, blob);
 
        do_log(SMB_VFS_OP_SYS_ACL_BLOB_GET_FILE, (result >= 0), handle,
-              "%s", path_p);
+              "%s", smb_fname->base_name);
 
        return result;
 }
@@ -2049,17 +2250,17 @@ static int smb_full_audit_sys_acl_blob_get_fd(vfs_handle_struct *handle,
 }
 
 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)
+                               const struct smb_filename *smb_fname,
+                               SMB_ACL_TYPE_T acltype,
+                               SMB_ACL_T theacl)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, name, acltype,
+       result = SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, smb_fname, acltype,
                                               theacl);
 
        do_log(SMB_VFS_OP_SYS_ACL_SET_FILE, (result >= 0), handle,
-              "%s", name);
+              "%s", smb_fname->base_name);
 
        return result;
 }
@@ -2078,29 +2279,28 @@ static int smb_full_audit_sys_acl_set_fd(vfs_handle_struct *handle, files_struct
 }
 
 static int smb_full_audit_sys_acl_delete_def_file(vfs_handle_struct *handle,
-
-                                        const char *path)
+                               const struct smb_filename *smb_fname)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, path);
+       result = SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, smb_fname);
 
        do_log(SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE, (result >= 0), handle,
-              "%s", path);
+              "%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);
+              "%s|%s", smb_fname->base_name, name);
 
        return result;
 }
@@ -2120,13 +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)
+                               const struct smb_filename *smb_fname,
+                               char *list,
+                               size_t size)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_LISTXATTR(handle, path, list, size);
+       result = SMB_VFS_NEXT_LISTXATTR(handle, smb_fname, list, size);
 
-       do_log(SMB_VFS_OP_LISTXATTR, (result >= 0), handle, "%s", path);
+       do_log(SMB_VFS_OP_LISTXATTR, (result >= 0), handle, "%s",
+                       smb_fname->base_name);
 
        return result;
 }
@@ -2146,15 +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);
+              "%s|%s", smb_fname->base_name, name);
 
        return result;
 }
@@ -2174,17 +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);
+              "%s|%s", smb_fname->base_name, name);
 
        return result;
 }
@@ -2215,26 +2418,69 @@ static bool smb_full_audit_aio_force(struct vfs_handle_struct *handle,
        return result;
 }
 
-static bool smb_full_audit_is_offline(struct vfs_handle_struct *handle,
-                                     const struct smb_filename *fname,
-                                     SMB_STRUCT_STAT *sbuf)
+static NTSTATUS smb_full_audit_durable_cookie(struct vfs_handle_struct *handle,
+                               struct files_struct *fsp,
+                               TALLOC_CTX *mem_ctx,
+                               DATA_BLOB *cookie)
 {
-       bool result;
+       NTSTATUS result;
+
+       result = SMB_VFS_NEXT_DURABLE_COOKIE(handle,
+                                       fsp,
+                                       mem_ctx,
+                                       cookie);
+
+       do_log(SMB_VFS_OP_DURABLE_COOKIE, NT_STATUS_IS_OK(result), handle,
+                       "%s", fsp_str_do_log(fsp));
 
-       result = SMB_VFS_NEXT_IS_OFFLINE(handle, fname, sbuf);
-       do_log(SMB_VFS_OP_IS_OFFLINE, result, handle, "%s",
-              smb_fname_str_do_log(fname));
        return result;
 }
 
-static int smb_full_audit_set_offline(struct vfs_handle_struct *handle,
-                                     const struct smb_filename *fname)
+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;
+       NTSTATUS result;
+
+       result = SMB_VFS_NEXT_DURABLE_DISCONNECT(handle,
+                                       fsp,
+                                       old_cookie,
+                                       mem_ctx,
+                                       new_cookie);
+
+       do_log(SMB_VFS_OP_DURABLE_DISCONNECT, NT_STATUS_IS_OK(result), handle,
+                       "%s", fsp_str_do_log(fsp));
+
+       return result;
+}
+
+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)
+{
+       NTSTATUS result;
+
+       result = SMB_VFS_NEXT_DURABLE_RECONNECT(handle,
+                                       smb1req,
+                                       op,
+                                       old_cookie,
+                                       mem_ctx,
+                                       fsp,
+                                       new_cookie);
+
+       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;
 }
 
@@ -2250,9 +2496,7 @@ static struct vfs_fn_pointers vfs_full_audit_fns = {
        .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,
-       .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,
+       .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,
@@ -2262,7 +2506,6 @@ static struct vfs_fn_pointers vfs_full_audit_fns = {
        .mkdir_fn = smb_full_audit_mkdir,
        .rmdir_fn = smb_full_audit_rmdir,
        .closedir_fn = smb_full_audit_closedir,
-       .init_search_op_fn = smb_full_audit_init_search_op,
        .open_fn = smb_full_audit_open,
        .create_file_fn = smb_full_audit_create_file,
        .close_fn = smb_full_audit_close,
@@ -2305,26 +2548,34 @@ static struct vfs_fn_pointers vfs_full_audit_fns = {
        .link_fn = smb_full_audit_link,
        .mknod_fn = smb_full_audit_mknod,
        .realpath_fn = smb_full_audit_realpath,
-       .notify_watch_fn = smb_full_audit_notify_watch,
        .chflags_fn = smb_full_audit_chflags,
        .file_id_create_fn = smb_full_audit_file_id_create,
+       .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_fn = smb_full_audit_strict_lock,
-       .strict_unlock_fn = smb_full_audit_strict_unlock,
+       .strict_lock_check_fn = smb_full_audit_strict_lock_check,
        .translate_name_fn = smb_full_audit_translate_name,
-       .copy_chunk_send_fn = smb_full_audit_copy_chunk_send,
-       .copy_chunk_recv_fn = smb_full_audit_copy_chunk_recv,
-       .get_compression_fn = smb_full_audit_get_compression,
-       .set_compression_fn = smb_full_audit_set_compression,
-       .readdir_attr_fn = smb_full_audit_readdir_attr,
+       .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,
@@ -2343,15 +2594,23 @@ static struct vfs_fn_pointers vfs_full_audit_fns = {
        .setxattr_fn = smb_full_audit_setxattr,
        .fsetxattr_fn = smb_full_audit_fsetxattr,
        .aio_force_fn = smb_full_audit_aio_force,
-       .is_offline_fn = smb_full_audit_is_offline,
-       .set_offline_fn = smb_full_audit_set_offline,
+       .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;