s3: vfs_full_audit.c: implement negated vfs_ops in the success/failure list
[ira/wip.git] / source3 / modules / vfs_full_audit.c
index e8702aa2c8fb06744c47db86ab6d8a4aec18652a..8a40f6712c805678bc3483d1ac047f58d05e5f87 100644 (file)
@@ -69,6 +69,149 @@ struct vfs_full_audit_private_data {
 #undef DBGC_CLASS
 #define DBGC_CLASS vfs_full_audit_debug_level
 
+typedef enum _vfs_op_type {
+       SMB_VFS_OP_NOOP = -1,
+
+       /* Disk operations */
+
+       SMB_VFS_OP_CONNECT = 0,
+       SMB_VFS_OP_DISCONNECT,
+       SMB_VFS_OP_DISK_FREE,
+       SMB_VFS_OP_GET_QUOTA,
+       SMB_VFS_OP_SET_QUOTA,
+       SMB_VFS_OP_GET_SHADOW_COPY_DATA,
+       SMB_VFS_OP_STATVFS,
+       SMB_VFS_OP_FS_CAPABILITIES,
+
+       /* Directory operations */
+
+       SMB_VFS_OP_OPENDIR,
+       SMB_VFS_OP_READDIR,
+       SMB_VFS_OP_SEEKDIR,
+       SMB_VFS_OP_TELLDIR,
+       SMB_VFS_OP_REWINDDIR,
+       SMB_VFS_OP_MKDIR,
+       SMB_VFS_OP_RMDIR,
+       SMB_VFS_OP_CLOSEDIR,
+       SMB_VFS_OP_INIT_SEARCH_OP,
+
+       /* File operations */
+
+       SMB_VFS_OP_OPEN,
+       SMB_VFS_OP_CREATE_FILE,
+       SMB_VFS_OP_CLOSE,
+       SMB_VFS_OP_READ,
+       SMB_VFS_OP_PREAD,
+       SMB_VFS_OP_WRITE,
+       SMB_VFS_OP_PWRITE,
+       SMB_VFS_OP_LSEEK,
+       SMB_VFS_OP_SENDFILE,
+       SMB_VFS_OP_RECVFILE,
+       SMB_VFS_OP_RENAME,
+       SMB_VFS_OP_FSYNC,
+       SMB_VFS_OP_STAT,
+       SMB_VFS_OP_FSTAT,
+       SMB_VFS_OP_LSTAT,
+       SMB_VFS_OP_GET_ALLOC_SIZE,
+       SMB_VFS_OP_UNLINK,
+       SMB_VFS_OP_CHMOD,
+       SMB_VFS_OP_FCHMOD,
+       SMB_VFS_OP_CHOWN,
+       SMB_VFS_OP_FCHOWN,
+       SMB_VFS_OP_LCHOWN,
+       SMB_VFS_OP_CHDIR,
+       SMB_VFS_OP_GETWD,
+       SMB_VFS_OP_NTIMES,
+       SMB_VFS_OP_FTRUNCATE,
+       SMB_VFS_OP_LOCK,
+       SMB_VFS_OP_KERNEL_FLOCK,
+       SMB_VFS_OP_LINUX_SETLEASE,
+       SMB_VFS_OP_GETLOCK,
+       SMB_VFS_OP_SYMLINK,
+       SMB_VFS_OP_READLINK,
+       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,
+       SMB_VFS_OP_GET_REAL_FILENAME,
+       SMB_VFS_OP_CONNECTPATH,
+       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_TRANSLATE_NAME,
+
+       /* NT ACL operations. */
+
+       SMB_VFS_OP_FGET_NT_ACL,
+       SMB_VFS_OP_GET_NT_ACL,
+       SMB_VFS_OP_FSET_NT_ACL,
+
+       /* 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_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,
+
+       /* 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 */
 
 static struct {
@@ -138,6 +281,7 @@ static struct {
        { 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_TRANSLATE_NAME,    "translate_name" },
        { 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" },
@@ -289,56 +433,65 @@ static bool log_failure(vfs_handle_struct *handle, vfs_op_type op)
 
 static void init_bitmap(struct bitmap **bm, const char **ops)
 {
-       bool log_all = False;
+       if (*bm != NULL) {
+               return;
+       }
 
-       if (*bm != NULL)
+       if (ops == NULL) {
+               *bm = NULL;
                return;
+       }
 
        *bm = bitmap_allocate(SMB_VFS_OP_LAST);
-
        if (*bm == NULL) {
                DEBUG(0, ("Could not alloc bitmap -- "
                          "defaulting to logging everything\n"));
                return;
        }
 
-       while (*ops != NULL) {
+       for (; *ops != NULL; ops += 1) {
                int i;
-               bool found = False;
+               bool neg = false;
+               const char *op;
 
                if (strequal(*ops, "all")) {
-                       log_all = True;
-                       break;
+                       for (i=0; i<SMB_VFS_OP_LAST; i++) {
+                               bitmap_set(*bm, i);
+                       }
+                       continue;
                }
 
                if (strequal(*ops, "none")) {
                        break;
                }
 
+               op = ops[0];
+               if (op[0] == '!') {
+                       neg = true;
+                       op += 1;
+               }
+
                for (i=0; i<SMB_VFS_OP_LAST; i++) {
                        if (vfs_op_names[i].name == NULL) {
                                smb_panic("vfs_full_audit.c: name table not "
                                          "in sync with vfs.h\n");
                        }
-
-                       if (strequal(*ops, vfs_op_names[i].name)) {
-                               bitmap_set(*bm, i);
-                               found = True;
+                       if (strequal(op, vfs_op_names[i].name)) {
+                               if (neg) {
+                                       bitmap_clear(*bm, i);
+                               } else {
+                                       bitmap_set(*bm, i);
+                               }
+                               break;
                        }
                }
-               if (!found) {
+               if (i == SMB_VFS_OP_LAST) {
                        DEBUG(0, ("Could not find opname %s, logging all\n",
                                  *ops));
-                       log_all = True;
+                       bitmap_free(*bm);
+                       *bm = NULL;
                        break;
                }
-               ops += 1;
-       }
-
-       if (log_all) {
-               /* The query functions default to True */
-               bitmap_free(*bm);
-               *bm = NULL;
        }
 }
 
@@ -368,6 +521,7 @@ static void do_log(vfs_op_type op, bool success, vfs_handle_struct *handle,
        char *audit_pre = NULL;
        va_list ap;
        char *op_msg = NULL;
+       int priority;
 
        if (success && (!log_success(handle, op)))
                goto out;
@@ -388,8 +542,15 @@ 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(audit_syslog_priority(handle), "%s|%s|%s|%s\n",
+       syslog(priority, "%s|%s|%s|%s\n",
                audit_pre ? audit_pre : "",
                audit_opname(op), err_msg, op_msg);
 
@@ -419,6 +580,13 @@ static const char *smb_fname_str_do_log(const struct smb_filename *smb_fname)
        return fname;
 }
 
+/**
+ * Return an fsp debug string using the do_log_ctx()
+ */
+static const char *fsp_str_do_log(const struct files_struct *fsp)
+{
+       return smb_fname_str_do_log(fsp->fsp_name);
+}
 
 /* Free function for the private data. */
 
@@ -444,38 +612,38 @@ static int smb_full_audit_connect(vfs_handle_struct *handle,
 {
        int result;
        struct vfs_full_audit_private_data *pd = NULL;
-       const char *none[] = { NULL };
-       const char *all [] = { "all" };
 
-       if (!handle) {
-               return -1;
+       result = SMB_VFS_NEXT_CONNECT(handle, svc, user);
+       if (result < 0) {
+               return result;
        }
 
        pd = SMB_MALLOC_P(struct vfs_full_audit_private_data);
        if (!pd) {
+               SMB_VFS_NEXT_DISCONNECT(handle);
                return -1;
        }
        ZERO_STRUCTP(pd);
 
+#ifndef WITH_SYSLOG
        openlog("smbd_audit", 0, audit_syslog_facility(handle));
+#endif
 
        init_bitmap(&pd->success_ops,
                    lp_parm_string_list(SNUM(handle->conn), "full_audit", "success",
-                                       none));
+                                       NULL));
        init_bitmap(&pd->failure_ops,
                    lp_parm_string_list(SNUM(handle->conn), "full_audit", "failure",
-                                       all));
+                                       NULL));
 
        /* Store the private data. */
        SMB_VFS_HANDLE_SET_DATA(handle, pd, free_private_data,
                                struct vfs_full_audit_private_data, return -1);
 
-       result = SMB_VFS_NEXT_CONNECT(handle, svc, user);
-
        do_log(SMB_VFS_OP_CONNECT, True, handle,
               "%s", svc);
 
-       return result;
+       return 0;
 }
 
 static void smb_full_audit_disconnect(vfs_handle_struct *handle)
@@ -561,11 +729,11 @@ static int smb_full_audit_statvfs(struct vfs_handle_struct *handle,
        return result;
 }
 
-static int smb_full_audit_fs_capabilities(struct vfs_handle_struct *handle)
+static uint32_t smb_full_audit_fs_capabilities(struct vfs_handle_struct *handle, enum timestamp_set_resolution *p_ts_res)
 {
        int result;
 
-       result = SMB_VFS_NEXT_FS_CAPABILITIES(handle);
+       result = SMB_VFS_NEXT_FS_CAPABILITIES(handle, p_ts_res);
 
        do_log(SMB_VFS_OP_FS_CAPABILITIES, true, handle, "");
 
@@ -706,6 +874,30 @@ static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle,
                                      int *pinfo)
 {
        NTSTATUS result;
+       const char* str_create_disposition;
+
+       switch (create_disposition) {
+       case FILE_SUPERSEDE:
+               str_create_disposition = "supersede";
+               break;
+       case FILE_OVERWRITE_IF:
+               str_create_disposition = "overwrite_if";
+               break;
+       case FILE_OPEN:
+               str_create_disposition = "open";
+               break;
+       case FILE_OVERWRITE:
+               str_create_disposition = "overwrite";
+               break;
+       case FILE_CREATE:
+               str_create_disposition = "create";
+               break;
+       case FILE_OPEN_IF:
+               str_create_disposition = "open_if";
+               break;
+       default:
+               str_create_disposition = "unknown";
+       }
 
        result = SMB_VFS_NEXT_CREATE_FILE(
                handle,                                 /* handle */
@@ -724,8 +916,10 @@ static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle,
                result_fsp,                             /* result */
                pinfo);                                 /* pinfo */
 
-       do_log(SMB_VFS_OP_CREATE_FILE, (NT_STATUS_IS_OK(result)), handle, "0x%x|%s",
-              access_mask, smb_fname_str_do_log(smb_fname));
+       do_log(SMB_VFS_OP_CREATE_FILE, (NT_STATUS_IS_OK(result)), handle,
+              "0x%x|%s|%s|%s", access_mask,
+              create_options & FILE_DIRECTORY_FILE ? "dir" : "file",
+              str_create_disposition, smb_fname_str_do_log(smb_fname));
 
        return result;
 }
@@ -736,7 +930,8 @@ static int smb_full_audit_close(vfs_handle_struct *handle, files_struct *fsp)
        
        result = SMB_VFS_NEXT_CLOSE(handle, fsp);
 
-       do_log(SMB_VFS_OP_CLOSE, (result >= 0), handle, "%s", fsp->fsp_name);
+       do_log(SMB_VFS_OP_CLOSE, (result >= 0), handle, "%s",
+              fsp_str_do_log(fsp));
 
        return result;
 }
@@ -748,7 +943,8 @@ static ssize_t smb_full_audit_read(vfs_handle_struct *handle, files_struct *fsp,
 
        result = SMB_VFS_NEXT_READ(handle, fsp, data, n);
 
-       do_log(SMB_VFS_OP_READ, (result >= 0), handle, "%s", fsp->fsp_name);
+       do_log(SMB_VFS_OP_READ, (result >= 0), handle, "%s",
+              fsp_str_do_log(fsp));
 
        return result;
 }
@@ -760,7 +956,8 @@ static ssize_t smb_full_audit_pread(vfs_handle_struct *handle, files_struct *fsp
 
        result = SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
 
-       do_log(SMB_VFS_OP_PREAD, (result >= 0), handle, "%s", fsp->fsp_name);
+       do_log(SMB_VFS_OP_PREAD, (result >= 0), handle, "%s",
+              fsp_str_do_log(fsp));
 
        return result;
 }
@@ -772,7 +969,8 @@ static ssize_t smb_full_audit_write(vfs_handle_struct *handle, files_struct *fsp
 
        result = SMB_VFS_NEXT_WRITE(handle, fsp, data, n);
 
-       do_log(SMB_VFS_OP_WRITE, (result >= 0), handle, "%s", fsp->fsp_name);
+       do_log(SMB_VFS_OP_WRITE, (result >= 0), handle, "%s",
+              fsp_str_do_log(fsp));
 
        return result;
 }
@@ -785,7 +983,8 @@ static ssize_t smb_full_audit_pwrite(vfs_handle_struct *handle, files_struct *fs
 
        result = SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset);
 
-       do_log(SMB_VFS_OP_PWRITE, (result >= 0), handle, "%s", fsp->fsp_name);
+       do_log(SMB_VFS_OP_PWRITE, (result >= 0), handle, "%s",
+              fsp_str_do_log(fsp));
 
        return result;
 }
@@ -798,7 +997,7 @@ static SMB_OFF_T smb_full_audit_lseek(vfs_handle_struct *handle, files_struct *f
        result = SMB_VFS_NEXT_LSEEK(handle, fsp, offset, whence);
 
        do_log(SMB_VFS_OP_LSEEK, (result != (ssize_t)-1), handle,
-              "%s", fsp->fsp_name);
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
@@ -813,7 +1012,7 @@ static ssize_t smb_full_audit_sendfile(vfs_handle_struct *handle, int tofd,
        result = SMB_VFS_NEXT_SENDFILE(handle, tofd, fromfsp, hdr, offset, n);
 
        do_log(SMB_VFS_OP_SENDFILE, (result >= 0), handle,
-              "%s", fromfsp->fsp_name);
+              "%s", fsp_str_do_log(fromfsp));
 
        return result;
 }
@@ -828,7 +1027,7 @@ static ssize_t smb_full_audit_recvfile(vfs_handle_struct *handle, int fromfd,
        result = SMB_VFS_NEXT_RECVFILE(handle, fromfd, tofsp, offset, n);
 
        do_log(SMB_VFS_OP_RECVFILE, (result >= 0), handle,
-              "%s", tofsp->fsp_name);
+              "%s", fsp_str_do_log(tofsp));
 
        return result;
 }
@@ -854,7 +1053,8 @@ static int smb_full_audit_fsync(vfs_handle_struct *handle, files_struct *fsp)
        
        result = SMB_VFS_NEXT_FSYNC(handle, fsp);
 
-       do_log(SMB_VFS_OP_FSYNC, (result >= 0), handle, "%s", fsp->fsp_name);
+       do_log(SMB_VFS_OP_FSYNC, (result >= 0), handle, "%s",
+              fsp_str_do_log(fsp));
 
        return result;    
 }
@@ -879,7 +1079,8 @@ static int smb_full_audit_fstat(vfs_handle_struct *handle, files_struct *fsp,
        
        result = SMB_VFS_NEXT_FSTAT(handle, fsp, sbuf);
 
-       do_log(SMB_VFS_OP_FSTAT, (result >= 0), handle, "%s", fsp->fsp_name);
+       do_log(SMB_VFS_OP_FSTAT, (result >= 0), handle, "%s",
+              fsp_str_do_log(fsp));
 
        return result;
 }
@@ -897,7 +1098,7 @@ static int smb_full_audit_lstat(vfs_handle_struct *handle,
        return result;    
 }
 
-static int smb_full_audit_get_alloc_size(vfs_handle_struct *handle,
+static uint64_t smb_full_audit_get_alloc_size(vfs_handle_struct *handle,
                       files_struct *fsp, const SMB_STRUCT_STAT *sbuf)
 {
        int result;
@@ -942,7 +1143,7 @@ static int smb_full_audit_fchmod(vfs_handle_struct *handle, files_struct *fsp,
        result = SMB_VFS_NEXT_FCHMOD(handle, fsp, mode);
 
        do_log(SMB_VFS_OP_FCHMOD, (result >= 0), handle,
-              "%s|%o", fsp->fsp_name, mode);
+              "%s|%o", fsp_str_do_log(fsp), mode);
 
        return result;
 }
@@ -968,7 +1169,7 @@ static int smb_full_audit_fchown(vfs_handle_struct *handle, files_struct *fsp,
        result = SMB_VFS_NEXT_FCHOWN(handle, fsp, uid, gid);
 
        do_log(SMB_VFS_OP_FCHOWN, (result >= 0), handle, "%s|%ld|%ld",
-              fsp->fsp_name, (long int)uid, (long int)gid);
+              fsp_str_do_log(fsp), (long int)uid, (long int)gid);
 
        return result;
 }
@@ -1032,7 +1233,7 @@ static int smb_full_audit_ftruncate(vfs_handle_struct *handle, files_struct *fsp
        result = SMB_VFS_NEXT_FTRUNCATE(handle, fsp, len);
 
        do_log(SMB_VFS_OP_FTRUNCATE, (result >= 0), handle,
-              "%s", fsp->fsp_name);
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1044,21 +1245,21 @@ static bool smb_full_audit_lock(vfs_handle_struct *handle, files_struct *fsp,
 
        result = SMB_VFS_NEXT_LOCK(handle, fsp, op, offset, count, type);
 
-       do_log(SMB_VFS_OP_LOCK, result, handle, "%s", fsp->fsp_name);
+       do_log(SMB_VFS_OP_LOCK, result, handle, "%s", fsp_str_do_log(fsp));
 
        return result;
 }
 
 static int smb_full_audit_kernel_flock(struct vfs_handle_struct *handle,
                                       struct files_struct *fsp,
-                                      uint32 share_mode)
+                                      uint32 share_mode, uint32 access_mask)
 {
        int result;
 
-       result = SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode);
+       result = SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode, access_mask);
 
        do_log(SMB_VFS_OP_KERNEL_FLOCK, (result >= 0), handle, "%s",
-              fsp->fsp_name);
+              fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1071,7 +1272,7 @@ static int smb_full_audit_linux_setlease(vfs_handle_struct *handle, files_struct
         result = SMB_VFS_NEXT_LINUX_SETLEASE(handle, fsp, leasetype);
 
         do_log(SMB_VFS_OP_LINUX_SETLEASE, (result >= 0), handle, "%s",
-               fsp->fsp_name);
+              fsp_str_do_log(fsp));
 
         return result;
 }
@@ -1083,7 +1284,7 @@ static bool smb_full_audit_getlock(vfs_handle_struct *handle, files_struct *fsp,
 
        result = SMB_VFS_NEXT_GETLOCK(handle, fsp, poffset, pcount, ptype, ppid);
 
-       do_log(SMB_VFS_OP_GETLOCK, result, handle, "%s", fsp->fsp_name);
+       do_log(SMB_VFS_OP_GETLOCK, result, handle, "%s", fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1256,7 +1457,7 @@ static NTSTATUS smb_full_audit_brl_lock_windows(struct vfs_handle_struct *handle
            blocking_lock, blr);
 
        do_log(SMB_VFS_OP_BRL_LOCK_WINDOWS, NT_STATUS_IS_OK(result), handle,
-           "%s:%llu-%llu. type=%d. blocking=%d", br_lck->fsp->fsp_name,
+           "%s:%llu-%llu. type=%d. blocking=%d", fsp_str_do_log(br_lck->fsp),
            plock->start, plock->size, plock->lock_type, blocking_lock );
 
        return result;
@@ -1273,7 +1474,7 @@ 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", br_lck->fsp->fsp_name, plock->start,
+           "%s:%llu-%llu:%d", fsp_str_do_log(br_lck->fsp), plock->start,
            plock->size, plock->lock_type);
 
        return result;
@@ -1289,7 +1490,7 @@ static bool smb_full_audit_brl_cancel_windows(struct vfs_handle_struct *handle,
        result = SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock, blr);
 
        do_log(SMB_VFS_OP_BRL_CANCEL_WINDOWS, (result == 0), handle,
-           "%s:%llu-%llu:%d", br_lck->fsp->fsp_name, plock->start,
+           "%s:%llu-%llu:%d", fsp_str_do_log(br_lck->fsp), plock->start,
            plock->size);
 
        return result;
@@ -1304,7 +1505,7 @@ static bool smb_full_audit_strict_lock(struct vfs_handle_struct *handle,
        result = SMB_VFS_NEXT_STRICT_LOCK(handle, fsp, plock);
 
        do_log(SMB_VFS_OP_STRICT_LOCK, result, handle,
-           "%s:%llu-%llu:%d", fsp->fsp_name, plock->start,
+           "%s:%llu-%llu:%d", fsp_str_do_log(fsp), plock->start,
            plock->size);
 
        return result;
@@ -1317,12 +1518,28 @@ static void smb_full_audit_strict_unlock(struct vfs_handle_struct *handle,
        SMB_VFS_NEXT_STRICT_UNLOCK(handle, fsp, plock);
 
        do_log(SMB_VFS_OP_STRICT_UNLOCK, true, handle,
-           "%s:%llu-%llu:%d", fsp->fsp_name, plock->start,
+           "%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,
+                                             TALLOC_CTX *mem_ctx,
+                                             char **mapped_name)
+{
+       NTSTATUS result;
+
+       result = SMB_VFS_NEXT_TRANSLATE_NAME(handle, name, direction, mem_ctx,
+                                            mapped_name);
+
+       do_log(SMB_VFS_OP_TRANSLATE_NAME, NT_STATUS_IS_OK(result), handle, "");
+
+       return result;
+}
+
 static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
                                uint32 security_info,
                                SEC_DESC **ppdesc)
@@ -1332,7 +1549,7 @@ static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_stru
        result = SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, ppdesc);
 
        do_log(SMB_VFS_OP_FGET_NT_ACL, NT_STATUS_IS_OK(result), handle,
-              "%s", fsp->fsp_name);
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1360,7 +1577,8 @@ static NTSTATUS smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_stru
 
        result = SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
 
-       do_log(SMB_VFS_OP_FSET_NT_ACL, NT_STATUS_IS_OK(result), handle, "%s", fsp->fsp_name);
+       do_log(SMB_VFS_OP_FSET_NT_ACL, NT_STATUS_IS_OK(result), handle, "%s",
+              fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1386,7 +1604,7 @@ static int smb_full_audit_fchmod_acl(vfs_handle_struct *handle, files_struct *fs
        result = SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, mode);
 
        do_log(SMB_VFS_OP_FCHMOD_ACL, (result >= 0), handle,
-              "%s|%o", fsp->fsp_name, mode);
+              "%s|%o", fsp_str_do_log(fsp), mode);
 
        return result;
 }
@@ -1475,7 +1693,7 @@ static SMB_ACL_T smb_full_audit_sys_acl_get_fd(vfs_handle_struct *handle,
        result = SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp);
 
        do_log(SMB_VFS_OP_SYS_ACL_GET_FD, (result != NULL), handle,
-              "%s", fsp->fsp_name);
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1635,7 +1853,7 @@ static int smb_full_audit_sys_acl_set_fd(vfs_handle_struct *handle, files_struct
        result = SMB_VFS_NEXT_SYS_ACL_SET_FD(handle, fsp, theacl);
 
        do_log(SMB_VFS_OP_SYS_ACL_SET_FD, (result >= 0), handle,
-              "%s", fsp->fsp_name);
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1749,7 +1967,7 @@ static ssize_t smb_full_audit_fgetxattr(struct vfs_handle_struct *handle,
        result = SMB_VFS_NEXT_FGETXATTR(handle, fsp, name, value, size);
 
        do_log(SMB_VFS_OP_FGETXATTR, (result >= 0), handle,
-              "%s|%s", fsp->fsp_name, name);
+              "%s|%s", fsp_str_do_log(fsp), name);
 
        return result;
 }
@@ -1787,7 +2005,7 @@ static ssize_t smb_full_audit_flistxattr(struct vfs_handle_struct *handle,
        result = SMB_VFS_NEXT_FLISTXATTR(handle, fsp, list, size);
 
        do_log(SMB_VFS_OP_FLISTXATTR, (result >= 0), handle,
-              "%s", fsp->fsp_name);
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1829,7 +2047,7 @@ static int smb_full_audit_fremovexattr(struct vfs_handle_struct *handle,
        result = SMB_VFS_NEXT_FREMOVEXATTR(handle, fsp, name);
 
        do_log(SMB_VFS_OP_FREMOVEXATTR, (result >= 0), handle,
-              "%s|%s", fsp->fsp_name, name);
+              "%s|%s", fsp_str_do_log(fsp), name);
 
        return result;
 }
@@ -1875,7 +2093,7 @@ static int smb_full_audit_fsetxattr(struct vfs_handle_struct *handle,
        result = SMB_VFS_NEXT_FSETXATTR(handle, fsp, name, value, size, flags);
 
        do_log(SMB_VFS_OP_FSETXATTR, (result >= 0), handle,
-              "%s|%s", fsp->fsp_name, name);
+              "%s|%s", fsp_str_do_log(fsp), name);
 
        return result;
 }
@@ -1886,7 +2104,7 @@ static int smb_full_audit_aio_read(struct vfs_handle_struct *handle, struct file
 
        result = SMB_VFS_NEXT_AIO_READ(handle, fsp, aiocb);
        do_log(SMB_VFS_OP_AIO_READ, (result >= 0), handle,
-               "%s", fsp->fsp_name);
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1897,7 +2115,7 @@ static int smb_full_audit_aio_write(struct vfs_handle_struct *handle, struct fil
 
        result = SMB_VFS_NEXT_AIO_WRITE(handle, fsp, aiocb);
        do_log(SMB_VFS_OP_AIO_WRITE, (result >= 0), handle,
-               "%s", fsp->fsp_name);
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1908,7 +2126,7 @@ static ssize_t smb_full_audit_aio_return(struct vfs_handle_struct *handle, struc
 
        result = SMB_VFS_NEXT_AIO_RETURN(handle, fsp, aiocb);
        do_log(SMB_VFS_OP_AIO_RETURN, (result >= 0), handle,
-               "%s", fsp->fsp_name);
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1919,7 +2137,7 @@ static int smb_full_audit_aio_cancel(struct vfs_handle_struct *handle, struct fi
 
        result = SMB_VFS_NEXT_AIO_CANCEL(handle, fsp, aiocb);
        do_log(SMB_VFS_OP_AIO_CANCEL, (result >= 0), handle,
-               "%s", fsp->fsp_name);
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1930,7 +2148,7 @@ static int smb_full_audit_aio_error(struct vfs_handle_struct *handle, struct fil
 
        result = SMB_VFS_NEXT_AIO_ERROR(handle, fsp, aiocb);
        do_log(SMB_VFS_OP_AIO_ERROR, (result >= 0), handle,
-               "%s", fsp->fsp_name);
+              "%s", fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1941,7 +2159,7 @@ static int smb_full_audit_aio_fsync(struct vfs_handle_struct *handle, struct fil
 
        result = SMB_VFS_NEXT_AIO_FSYNC(handle, fsp, op, aiocb);
        do_log(SMB_VFS_OP_AIO_FSYNC, (result >= 0), handle,
-               "%s", fsp->fsp_name);
+               "%s", fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1952,7 +2170,7 @@ static int smb_full_audit_aio_suspend(struct vfs_handle_struct *handle, struct f
 
        result = SMB_VFS_NEXT_AIO_SUSPEND(handle, fsp, aiocb, n, ts);
        do_log(SMB_VFS_OP_AIO_SUSPEND, (result >= 0), handle,
-               "%s", fsp->fsp_name);
+               "%s", fsp_str_do_log(fsp));
 
        return result;
 }
@@ -1964,263 +2182,132 @@ static bool smb_full_audit_aio_force(struct vfs_handle_struct *handle,
 
        result = SMB_VFS_NEXT_AIO_FORCE(handle, fsp);
        do_log(SMB_VFS_OP_AIO_FORCE, result, handle,
-               "%s", fsp->fsp_name);
+               "%s", fsp_str_do_log(fsp));
 
        return result;
 }
 
-/* VFS operations */
-static vfs_op_tuple audit_op_tuples[] = {
+static struct vfs_fn_pointers vfs_full_audit_fns = {
 
        /* Disk operations */
 
-       {SMB_VFS_OP(smb_full_audit_connect),    SMB_VFS_OP_CONNECT,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_disconnect), SMB_VFS_OP_DISCONNECT,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_disk_free),  SMB_VFS_OP_DISK_FREE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_get_quota),  SMB_VFS_OP_GET_QUOTA,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_set_quota),  SMB_VFS_OP_SET_QUOTA,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_get_shadow_copy_data), SMB_VFS_OP_GET_SHADOW_COPY_DATA,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_statvfs),    SMB_VFS_OP_STATVFS,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_fs_capabilities), SMB_VFS_OP_FS_CAPABILITIES,
-        SMB_VFS_LAYER_LOGGER},
-
-       /* Directory operations */
-
-       {SMB_VFS_OP(smb_full_audit_opendir),    SMB_VFS_OP_OPENDIR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_readdir),    SMB_VFS_OP_READDIR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_seekdir),    SMB_VFS_OP_SEEKDIR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_telldir),    SMB_VFS_OP_TELLDIR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_rewinddir),  SMB_VFS_OP_REWINDDIR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_mkdir),      SMB_VFS_OP_MKDIR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_rmdir),      SMB_VFS_OP_RMDIR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_closedir),   SMB_VFS_OP_CLOSEDIR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_init_search_op), SMB_VFS_OP_INIT_SEARCH_OP,
-        SMB_VFS_LAYER_LOGGER},
-
-       /* File operations */
-
-       {SMB_VFS_OP(smb_full_audit_open),       SMB_VFS_OP_OPEN,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_create_file),SMB_VFS_OP_CREATE_FILE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_close),      SMB_VFS_OP_CLOSE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_read),       SMB_VFS_OP_READ,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_pread),      SMB_VFS_OP_PREAD,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_write),      SMB_VFS_OP_WRITE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_pwrite),     SMB_VFS_OP_PWRITE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_lseek),      SMB_VFS_OP_LSEEK,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sendfile),   SMB_VFS_OP_SENDFILE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_recvfile),   SMB_VFS_OP_RECVFILE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_rename),     SMB_VFS_OP_RENAME,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_fsync),      SMB_VFS_OP_FSYNC,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_stat),       SMB_VFS_OP_STAT,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_fstat),      SMB_VFS_OP_FSTAT,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_lstat),      SMB_VFS_OP_LSTAT,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_get_alloc_size),     SMB_VFS_OP_GET_ALLOC_SIZE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_unlink),     SMB_VFS_OP_UNLINK,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_chmod),      SMB_VFS_OP_CHMOD,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_fchmod),     SMB_VFS_OP_FCHMOD,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_chown),      SMB_VFS_OP_CHOWN,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_fchown),     SMB_VFS_OP_FCHOWN,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_lchown),     SMB_VFS_OP_LCHOWN,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_chdir),      SMB_VFS_OP_CHDIR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_getwd),      SMB_VFS_OP_GETWD,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_ntimes),     SMB_VFS_OP_NTIMES,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_ftruncate),  SMB_VFS_OP_FTRUNCATE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_lock),       SMB_VFS_OP_LOCK,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_kernel_flock),       SMB_VFS_OP_KERNEL_FLOCK,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_linux_setlease),       SMB_VFS_OP_LINUX_SETLEASE,
-         SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_getlock),    SMB_VFS_OP_GETLOCK,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_symlink),    SMB_VFS_OP_SYMLINK,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_readlink),   SMB_VFS_OP_READLINK,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_link),       SMB_VFS_OP_LINK,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_mknod),      SMB_VFS_OP_MKNOD,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_realpath),   SMB_VFS_OP_REALPATH,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_notify_watch),SMB_VFS_OP_NOTIFY_WATCH,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_chflags),    SMB_VFS_OP_CHFLAGS,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_file_id_create),     SMB_VFS_OP_FILE_ID_CREATE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_streaminfo), SMB_VFS_OP_STREAMINFO,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_get_real_filename), SMB_VFS_OP_GET_REAL_FILENAME,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_connectpath), SMB_VFS_OP_CONNECTPATH,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_brl_lock_windows), SMB_VFS_OP_BRL_LOCK_WINDOWS,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_brl_unlock_windows), SMB_VFS_OP_BRL_UNLOCK_WINDOWS,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_brl_cancel_windows), SMB_VFS_OP_BRL_CANCEL_WINDOWS,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_strict_lock), SMB_VFS_OP_STRICT_LOCK,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_strict_unlock), SMB_VFS_OP_STRICT_UNLOCK,
-        SMB_VFS_LAYER_LOGGER},
-
-       /* NT ACL operations. */
-
-       {SMB_VFS_OP(smb_full_audit_fget_nt_acl),        SMB_VFS_OP_FGET_NT_ACL,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_get_nt_acl), SMB_VFS_OP_GET_NT_ACL,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_fset_nt_acl),        SMB_VFS_OP_FSET_NT_ACL,
-        SMB_VFS_LAYER_LOGGER},
-
-       /* POSIX ACL operations. */
-
-       {SMB_VFS_OP(smb_full_audit_chmod_acl),  SMB_VFS_OP_CHMOD_ACL,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_fchmod_acl), SMB_VFS_OP_FCHMOD_ACL,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_get_entry),  SMB_VFS_OP_SYS_ACL_GET_ENTRY,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_get_tag_type),       SMB_VFS_OP_SYS_ACL_GET_TAG_TYPE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_get_permset),        SMB_VFS_OP_SYS_ACL_GET_PERMSET,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_get_qualifier),      SMB_VFS_OP_SYS_ACL_GET_QUALIFIER,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_get_file),   SMB_VFS_OP_SYS_ACL_GET_FILE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_get_fd),     SMB_VFS_OP_SYS_ACL_GET_FD,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_clear_perms),        SMB_VFS_OP_SYS_ACL_CLEAR_PERMS,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_add_perm),   SMB_VFS_OP_SYS_ACL_ADD_PERM,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_to_text),    SMB_VFS_OP_SYS_ACL_TO_TEXT,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_init),       SMB_VFS_OP_SYS_ACL_INIT,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_create_entry),       SMB_VFS_OP_SYS_ACL_CREATE_ENTRY,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_set_tag_type),       SMB_VFS_OP_SYS_ACL_SET_TAG_TYPE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_set_qualifier),      SMB_VFS_OP_SYS_ACL_SET_QUALIFIER,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_set_permset),        SMB_VFS_OP_SYS_ACL_SET_PERMSET,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_valid),      SMB_VFS_OP_SYS_ACL_VALID,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_set_file),   SMB_VFS_OP_SYS_ACL_SET_FILE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_set_fd),     SMB_VFS_OP_SYS_ACL_SET_FD,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_delete_def_file),    SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_get_perm),   SMB_VFS_OP_SYS_ACL_GET_PERM,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_free_text),  SMB_VFS_OP_SYS_ACL_FREE_TEXT,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_free_acl),   SMB_VFS_OP_SYS_ACL_FREE_ACL,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_sys_acl_free_qualifier),     SMB_VFS_OP_SYS_ACL_FREE_QUALIFIER,
-        SMB_VFS_LAYER_LOGGER},
-
-       /* EA operations. */
-
-       {SMB_VFS_OP(smb_full_audit_getxattr),   SMB_VFS_OP_GETXATTR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_lgetxattr),  SMB_VFS_OP_LGETXATTR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_fgetxattr),  SMB_VFS_OP_FGETXATTR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_listxattr),  SMB_VFS_OP_LISTXATTR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_llistxattr), SMB_VFS_OP_LLISTXATTR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_flistxattr), SMB_VFS_OP_FLISTXATTR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_removexattr),        SMB_VFS_OP_REMOVEXATTR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_lremovexattr),       SMB_VFS_OP_LREMOVEXATTR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_fremovexattr),       SMB_VFS_OP_FREMOVEXATTR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_setxattr),   SMB_VFS_OP_SETXATTR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_lsetxattr),  SMB_VFS_OP_LSETXATTR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_fsetxattr),  SMB_VFS_OP_FSETXATTR,
-        SMB_VFS_LAYER_LOGGER},
-
-       {SMB_VFS_OP(smb_full_audit_aio_read),   SMB_VFS_OP_AIO_READ,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_aio_write),  SMB_VFS_OP_AIO_WRITE,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_aio_return), SMB_VFS_OP_AIO_RETURN,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_aio_cancel), SMB_VFS_OP_AIO_CANCEL,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_aio_error),  SMB_VFS_OP_AIO_ERROR,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_aio_fsync),  SMB_VFS_OP_AIO_FSYNC,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_aio_suspend),SMB_VFS_OP_AIO_SUSPEND,
-        SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_aio_force),SMB_VFS_OP_AIO_FORCE,
-        SMB_VFS_LAYER_LOGGER},
-
-       /* Finish VFS operations definition */
-
-       {SMB_VFS_OP(NULL),              SMB_VFS_OP_NOOP,
-        SMB_VFS_LAYER_NOOP}
+       .connect_fn = smb_full_audit_connect,
+       .disconnect = smb_full_audit_disconnect,
+       .disk_free = smb_full_audit_disk_free,
+       .get_quota = smb_full_audit_get_quota,
+       .set_quota = smb_full_audit_set_quota,
+       .get_shadow_copy_data = smb_full_audit_get_shadow_copy_data,
+       .statvfs = smb_full_audit_statvfs,
+       .fs_capabilities = smb_full_audit_fs_capabilities,
+       .opendir = smb_full_audit_opendir,
+       .readdir = smb_full_audit_readdir,
+       .seekdir = smb_full_audit_seekdir,
+       .telldir = smb_full_audit_telldir,
+       .rewind_dir = smb_full_audit_rewinddir,
+       .mkdir = smb_full_audit_mkdir,
+       .rmdir = smb_full_audit_rmdir,
+       .closedir = smb_full_audit_closedir,
+       .init_search_op = smb_full_audit_init_search_op,
+       .open = smb_full_audit_open,
+       .create_file = smb_full_audit_create_file,
+       .close_fn = smb_full_audit_close,
+       .vfs_read = smb_full_audit_read,
+       .pread = smb_full_audit_pread,
+       .write = smb_full_audit_write,
+       .pwrite = smb_full_audit_pwrite,
+       .lseek = smb_full_audit_lseek,
+       .sendfile = smb_full_audit_sendfile,
+       .recvfile = smb_full_audit_recvfile,
+       .rename = smb_full_audit_rename,
+       .fsync = smb_full_audit_fsync,
+       .stat = smb_full_audit_stat,
+       .fstat = smb_full_audit_fstat,
+       .lstat = smb_full_audit_lstat,
+       .get_alloc_size = smb_full_audit_get_alloc_size,
+       .unlink = smb_full_audit_unlink,
+       .chmod = smb_full_audit_chmod,
+       .fchmod = smb_full_audit_fchmod,
+       .chown = smb_full_audit_chown,
+       .fchown = smb_full_audit_fchown,
+       .lchown = smb_full_audit_lchown,
+       .chdir = smb_full_audit_chdir,
+       .getwd = smb_full_audit_getwd,
+       .ntimes = smb_full_audit_ntimes,
+       .ftruncate = smb_full_audit_ftruncate,
+       .lock = smb_full_audit_lock,
+       .kernel_flock = smb_full_audit_kernel_flock,
+       .linux_setlease = smb_full_audit_linux_setlease,
+       .getlock = smb_full_audit_getlock,
+       .symlink = smb_full_audit_symlink,
+       .vfs_readlink = smb_full_audit_readlink,
+       .link = smb_full_audit_link,
+       .mknod = smb_full_audit_mknod,
+       .realpath = smb_full_audit_realpath,
+       .notify_watch = smb_full_audit_notify_watch,
+       .chflags = smb_full_audit_chflags,
+       .file_id_create = smb_full_audit_file_id_create,
+       .streaminfo = smb_full_audit_streaminfo,
+       .get_real_filename = smb_full_audit_get_real_filename,
+       .connectpath = smb_full_audit_connectpath,
+       .brl_lock_windows = smb_full_audit_brl_lock_windows,
+       .brl_unlock_windows = smb_full_audit_brl_unlock_windows,
+       .brl_cancel_windows = smb_full_audit_brl_cancel_windows,
+       .strict_lock = smb_full_audit_strict_lock,
+       .strict_unlock = smb_full_audit_strict_unlock,
+       .translate_name = smb_full_audit_translate_name,
+       .fget_nt_acl = smb_full_audit_fget_nt_acl,
+       .get_nt_acl = smb_full_audit_get_nt_acl,
+       .fset_nt_acl = smb_full_audit_fset_nt_acl,
+       .chmod_acl = smb_full_audit_chmod_acl,
+       .fchmod_acl = smb_full_audit_fchmod_acl,
+       .sys_acl_get_entry = smb_full_audit_sys_acl_get_entry,
+       .sys_acl_get_tag_type = smb_full_audit_sys_acl_get_tag_type,
+       .sys_acl_get_permset = smb_full_audit_sys_acl_get_permset,
+       .sys_acl_get_qualifier = smb_full_audit_sys_acl_get_qualifier,
+       .sys_acl_get_file = smb_full_audit_sys_acl_get_file,
+       .sys_acl_get_fd = smb_full_audit_sys_acl_get_fd,
+       .sys_acl_clear_perms = smb_full_audit_sys_acl_clear_perms,
+       .sys_acl_add_perm = smb_full_audit_sys_acl_add_perm,
+       .sys_acl_to_text = smb_full_audit_sys_acl_to_text,
+       .sys_acl_init = smb_full_audit_sys_acl_init,
+       .sys_acl_create_entry = smb_full_audit_sys_acl_create_entry,
+       .sys_acl_set_tag_type = smb_full_audit_sys_acl_set_tag_type,
+       .sys_acl_set_qualifier = smb_full_audit_sys_acl_set_qualifier,
+       .sys_acl_set_permset = smb_full_audit_sys_acl_set_permset,
+       .sys_acl_valid = smb_full_audit_sys_acl_valid,
+       .sys_acl_set_file = smb_full_audit_sys_acl_set_file,
+       .sys_acl_set_fd = smb_full_audit_sys_acl_set_fd,
+       .sys_acl_delete_def_file = smb_full_audit_sys_acl_delete_def_file,
+       .sys_acl_get_perm = smb_full_audit_sys_acl_get_perm,
+       .sys_acl_free_text = smb_full_audit_sys_acl_free_text,
+       .sys_acl_free_acl = smb_full_audit_sys_acl_free_acl,
+       .sys_acl_free_qualifier = smb_full_audit_sys_acl_free_qualifier,
+       .getxattr = smb_full_audit_getxattr,
+       .lgetxattr = smb_full_audit_lgetxattr,
+       .fgetxattr = smb_full_audit_fgetxattr,
+       .listxattr = smb_full_audit_listxattr,
+       .llistxattr = smb_full_audit_llistxattr,
+       .flistxattr = smb_full_audit_flistxattr,
+       .removexattr = smb_full_audit_removexattr,
+       .lremovexattr = smb_full_audit_lremovexattr,
+       .fremovexattr = smb_full_audit_fremovexattr,
+       .setxattr = smb_full_audit_setxattr,
+       .lsetxattr = smb_full_audit_lsetxattr,
+       .fsetxattr = smb_full_audit_fsetxattr,
+       .aio_read = smb_full_audit_aio_read,
+       .aio_write = smb_full_audit_aio_write,
+       .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,
 };
 
 NTSTATUS vfs_full_audit_init(void)
 {
        NTSTATUS ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
-                                       "full_audit", audit_op_tuples);
+                                       "full_audit", &vfs_full_audit_fns);
        
        if (!NT_STATUS_IS_OK(ret))
                return ret;