Extend NTIMES to allow setting create_time
[metze/samba/wip.git] / source3 / modules / vfs_full_audit.c
index 0ae48f48186f4cdacca7972fe64683631125c671..73758a2d9d8a768aadbc25b055717e5aba900e04 100644 (file)
@@ -10,7 +10,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *  
  * This program is distributed in the hope that it will be useful,
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *  
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -60,8 +59,6 @@
 
 #include "includes.h"
 
-extern struct current_user current_user;
-
 static int vfs_full_audit_debug_level = DBGC_VFS;
 
 struct vfs_full_audit_private_data {
@@ -74,239 +71,262 @@ struct vfs_full_audit_private_data {
 
 /* Function prototypes */
 
-static int smb_full_audit_connect(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_connect(vfs_handle_struct *handle,
                         const char *svc, const char *user);
-static void smb_full_audit_disconnect(vfs_handle_struct *handle,
-                            connection_struct *conn);
-static SMB_BIG_UINT smb_full_audit_disk_free(vfs_handle_struct *handle,
-                                   connection_struct *conn, const char *path,
-                                   BOOL small_query, SMB_BIG_UINT *bsize, 
-                                   SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize);
+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,
+                                   bool small_query, uint64_t *bsize, 
+                                   uint64_t *dfree, uint64_t *dsize);
 static int smb_full_audit_get_quota(struct vfs_handle_struct *handle,
-                          struct connection_struct *conn,
                           enum SMB_QUOTA_TYPE qtype, unid_t id,
                           SMB_DISK_QUOTA *qt);
 static int smb_full_audit_set_quota(struct vfs_handle_struct *handle,
-                          struct connection_struct *conn,
                           enum SMB_QUOTA_TYPE qtype, unid_t id,
                           SMB_DISK_QUOTA *qt);
 static int smb_full_audit_get_shadow_copy_data(struct vfs_handle_struct *handle,
                                 struct files_struct *fsp,
-                                SHADOW_COPY_DATA *shadow_copy_data, BOOL labels);
+                                SHADOW_COPY_DATA *shadow_copy_data, bool labels);
 static int smb_full_audit_statvfs(struct vfs_handle_struct *handle,
-                               struct connection_struct *conn,
                                const char *path,
                                struct vfs_statvfs_struct *statbuf);
 
-static SMB_STRUCT_DIR *smb_full_audit_opendir(vfs_handle_struct *handle, connection_struct *conn,
+static SMB_STRUCT_DIR *smb_full_audit_opendir(vfs_handle_struct *handle,
                          const char *fname, const char *mask, uint32 attr);
 static SMB_STRUCT_DIRENT *smb_full_audit_readdir(vfs_handle_struct *handle,
-                                   connection_struct *conn, SMB_STRUCT_DIR *dirp);
-static void smb_full_audit_seekdir(vfs_handle_struct *handle, connection_struct *conn,
+                                   SMB_STRUCT_DIR *dirp);
+static void smb_full_audit_seekdir(vfs_handle_struct *handle,
                        SMB_STRUCT_DIR *dirp, long offset);
-static long smb_full_audit_telldir(vfs_handle_struct *handle, connection_struct *conn,
+static long smb_full_audit_telldir(vfs_handle_struct *handle,
                        SMB_STRUCT_DIR *dirp);
-static void smb_full_audit_rewinddir(vfs_handle_struct *handle, connection_struct *conn,
+static void smb_full_audit_rewinddir(vfs_handle_struct *handle,
                        SMB_STRUCT_DIR *dirp);
-static int smb_full_audit_mkdir(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_mkdir(vfs_handle_struct *handle,
                       const char *path, mode_t mode);
-static int smb_full_audit_rmdir(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_rmdir(vfs_handle_struct *handle,
                       const char *path);
-static int smb_full_audit_closedir(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_closedir(vfs_handle_struct *handle,
                          SMB_STRUCT_DIR *dirp);
-static int smb_full_audit_open(vfs_handle_struct *handle, connection_struct *conn,
-                     const char *fname, int flags, mode_t mode);
-static int smb_full_audit_close(vfs_handle_struct *handle, files_struct *fsp, int fd);
+static int smb_full_audit_open(vfs_handle_struct *handle,
+                     const char *fname, files_struct *fsp, int flags, mode_t mode);
+static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle,
+                                     struct smb_request *req,
+                                     uint16_t root_dir_fid,
+                                     const char *fname,
+                                     uint32_t create_file_flags,
+                                     uint32_t access_mask,
+                                     uint32_t share_access,
+                                     uint32_t create_disposition,
+                                     uint32_t create_options,
+                                     uint32_t file_attributes,
+                                     uint32_t oplock_request,
+                                     uint64_t allocation_size,
+                                     struct security_descriptor *sd,
+                                     struct ea_list *ea_list,
+                                     files_struct **result,
+                                     int *pinfo,
+                                     SMB_STRUCT_STAT *psbuf);
+static int smb_full_audit_close(vfs_handle_struct *handle, files_struct *fsp);
 static ssize_t smb_full_audit_read(vfs_handle_struct *handle, files_struct *fsp,
-                         int fd, void *data, size_t n);
+                         void *data, size_t n);
 static ssize_t smb_full_audit_pread(vfs_handle_struct *handle, files_struct *fsp,
-                          int fd, void *data, size_t n, SMB_OFF_T offset);
+                          void *data, size_t n, SMB_OFF_T offset);
 static ssize_t smb_full_audit_write(vfs_handle_struct *handle, files_struct *fsp,
-                          int fd, const void *data, size_t n);
+                          const void *data, size_t n);
 static ssize_t smb_full_audit_pwrite(vfs_handle_struct *handle, files_struct *fsp,
-                           int fd, const void *data, size_t n,
+                           const void *data, size_t n,
                            SMB_OFF_T offset);
 static SMB_OFF_T smb_full_audit_lseek(vfs_handle_struct *handle, files_struct *fsp,
-                            int filedes, SMB_OFF_T offset, int whence);
+                            SMB_OFF_T offset, int whence);
 static ssize_t smb_full_audit_sendfile(vfs_handle_struct *handle, int tofd,
-                             files_struct *fsp, int fromfd,
+                             files_struct *fromfsp,
                              const DATA_BLOB *hdr, SMB_OFF_T offset,
                              size_t n);
-static int smb_full_audit_rename(vfs_handle_struct *handle, connection_struct *conn,
+static ssize_t smb_full_audit_recvfile(vfs_handle_struct *handle, int fromfd,
+                             files_struct *tofsp,
+                             SMB_OFF_T offset,
+                             size_t n);
+static int smb_full_audit_rename(vfs_handle_struct *handle,
                        const char *oldname, const char *newname);
-static int smb_full_audit_fsync(vfs_handle_struct *handle, files_struct *fsp, int fd);
-static int smb_full_audit_stat(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_fsync(vfs_handle_struct *handle, files_struct *fsp);
+static int smb_full_audit_stat(vfs_handle_struct *handle,
                      const char *fname, SMB_STRUCT_STAT *sbuf);
-static int smb_full_audit_fstat(vfs_handle_struct *handle, files_struct *fsp, int fd,
+static int smb_full_audit_fstat(vfs_handle_struct *handle, files_struct *fsp,
                       SMB_STRUCT_STAT *sbuf);
-static int smb_full_audit_lstat(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_lstat(vfs_handle_struct *handle,
                       const char *path, SMB_STRUCT_STAT *sbuf);
-static int smb_full_audit_unlink(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_unlink(vfs_handle_struct *handle,
                        const char *path);
-static int smb_full_audit_chmod(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_chmod(vfs_handle_struct *handle,
                       const char *path, mode_t mode);
-static int smb_full_audit_fchmod(vfs_handle_struct *handle, files_struct *fsp, int fd,
+static int smb_full_audit_fchmod(vfs_handle_struct *handle, files_struct *fsp,
                        mode_t mode);
-static int smb_full_audit_chown(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_chown(vfs_handle_struct *handle,
                       const char *path, uid_t uid, gid_t gid);
-static int smb_full_audit_fchown(vfs_handle_struct *handle, files_struct *fsp, int fd,
+static int smb_full_audit_fchown(vfs_handle_struct *handle, files_struct *fsp,
                        uid_t uid, gid_t gid);
-static int smb_full_audit_chdir(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_lchown(vfs_handle_struct *handle,
+                      const char *path, uid_t uid, gid_t gid);
+static int smb_full_audit_chdir(vfs_handle_struct *handle,
                       const char *path);
-static char *smb_full_audit_getwd(vfs_handle_struct *handle, connection_struct *conn,
+static char *smb_full_audit_getwd(vfs_handle_struct *handle,
                         char *path);
-static int smb_full_audit_utime(vfs_handle_struct *handle, connection_struct *conn,
-                      const char *path, struct utimbuf *times);
+static int smb_full_audit_ntimes(vfs_handle_struct *handle,
+                      const char *path, struct smb_file_time *ft);
 static int smb_full_audit_ftruncate(vfs_handle_struct *handle, files_struct *fsp,
-                          int fd, SMB_OFF_T len);
-static BOOL smb_full_audit_lock(vfs_handle_struct *handle, files_struct *fsp, int fd,
+                          SMB_OFF_T len);
+static bool smb_full_audit_lock(vfs_handle_struct *handle, files_struct *fsp,
                       int op, SMB_OFF_T offset, SMB_OFF_T count, int type);
-static int smb_full_audit_symlink(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_kernel_flock(struct vfs_handle_struct *handle,
+                                      struct files_struct *fsp,
+                                      uint32 share_mode);
+static int smb_full_audit_linux_setlease(vfs_handle_struct *handle, files_struct *fsp,
+                                       int leasetype);
+static bool smb_full_audit_getlock(vfs_handle_struct *handle, files_struct *fsp,
+                      SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid);
+static int smb_full_audit_symlink(vfs_handle_struct *handle,
                         const char *oldpath, const char *newpath);
-static int smb_full_audit_readlink(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_readlink(vfs_handle_struct *handle,
                          const char *path, char *buf, size_t bufsiz);
-static int smb_full_audit_link(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_link(vfs_handle_struct *handle,
                      const char *oldpath, const char *newpath);
-static int smb_full_audit_mknod(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_mknod(vfs_handle_struct *handle,
                       const char *pathname, mode_t mode, SMB_DEV_T dev);
-static char *smb_full_audit_realpath(vfs_handle_struct *handle, connection_struct *conn,
+static char *smb_full_audit_realpath(vfs_handle_struct *handle,
                            const char *path, char *resolved_path);
-static size_t smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                               int fd, uint32 security_info,
+static NTSTATUS smb_full_audit_notify_watch(struct vfs_handle_struct *handle,
+                       struct sys_notify_context *ctx,
+                       struct notify_entry *e,
+                       void (*callback)(struct sys_notify_context *ctx,
+                                       void *private_data,
+                                       struct notify_event *ev),
+                       void *private_data, void *handle_p);
+static int smb_full_audit_chflags(vfs_handle_struct *handle,
+                           const char *path, unsigned int flags);
+static struct file_id smb_full_audit_file_id_create(struct vfs_handle_struct *handle,
+                                                   SMB_DEV_T dev, SMB_INO_T inode);
+static NTSTATUS smb_full_audit_streaminfo(vfs_handle_struct *handle,
+                                         struct files_struct *fsp,
+                                         const char *fname,
+                                         TALLOC_CTX *mem_ctx,
+                                         unsigned int *pnum_streams,
+                                         struct stream_struct **pstreams);
+static int smb_full_audit_get_real_filename(struct vfs_handle_struct *handle,
+                                           const char *path,
+                                           const char *name,
+                                           TALLOC_CTX *mem_ctx,
+                                           char **found_name);
+static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+                               uint32 security_info,
                                SEC_DESC **ppdesc);
-static size_t smb_full_audit_get_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle,
                               const char *name, uint32 security_info,
                               SEC_DESC **ppdesc);
-static BOOL smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                             int fd, uint32 security_info_sent,
-                             SEC_DESC *psd);
-static BOOL smb_full_audit_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                            const char *name, uint32 security_info_sent,
-                            SEC_DESC *psd);
-static int smb_full_audit_chmod_acl(vfs_handle_struct *handle, connection_struct *conn,
+static NTSTATUS smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+                             uint32 security_info_sent,
+                             const SEC_DESC *psd);
+static int smb_full_audit_chmod_acl(vfs_handle_struct *handle,
                           const char *path, mode_t mode);
 static int smb_full_audit_fchmod_acl(vfs_handle_struct *handle, files_struct *fsp,
-                           int fd, mode_t mode);
+                                    mode_t mode);
 static int smb_full_audit_sys_acl_get_entry(vfs_handle_struct *handle,
-                                  connection_struct *conn,
                                   SMB_ACL_T theacl, int entry_id,
                                   SMB_ACL_ENTRY_T *entry_p);
 static int smb_full_audit_sys_acl_get_tag_type(vfs_handle_struct *handle,
-                                     connection_struct *conn,
                                      SMB_ACL_ENTRY_T entry_d,
                                      SMB_ACL_TAG_T *tag_type_p);
 static int smb_full_audit_sys_acl_get_permset(vfs_handle_struct *handle,
-                                    connection_struct *conn,
                                     SMB_ACL_ENTRY_T entry_d,
                                     SMB_ACL_PERMSET_T *permset_p);
 static void * smb_full_audit_sys_acl_get_qualifier(vfs_handle_struct *handle,
-                                         connection_struct *conn,
                                          SMB_ACL_ENTRY_T entry_d);
 static SMB_ACL_T smb_full_audit_sys_acl_get_file(vfs_handle_struct *handle,
-                                       connection_struct *conn,
                                        const char *path_p,
                                        SMB_ACL_TYPE_T type);
 static SMB_ACL_T smb_full_audit_sys_acl_get_fd(vfs_handle_struct *handle,
-                                     files_struct *fsp,
-                                     int fd);
+                                     files_struct *fsp);
 static int smb_full_audit_sys_acl_clear_perms(vfs_handle_struct *handle,
-                                    connection_struct *conn,
                                     SMB_ACL_PERMSET_T permset);
 static int smb_full_audit_sys_acl_add_perm(vfs_handle_struct *handle,
-                                 connection_struct *conn,
                                  SMB_ACL_PERMSET_T permset,
                                  SMB_ACL_PERM_T perm);
 static char * smb_full_audit_sys_acl_to_text(vfs_handle_struct *handle,
-                                   connection_struct *conn, SMB_ACL_T theacl,
+                                   SMB_ACL_T theacl,
                                    ssize_t *plen);
 static SMB_ACL_T smb_full_audit_sys_acl_init(vfs_handle_struct *handle,
-                                   connection_struct *conn,
                                    int count);
 static int smb_full_audit_sys_acl_create_entry(vfs_handle_struct *handle,
-                                     connection_struct *conn, SMB_ACL_T *pacl,
+                                     SMB_ACL_T *pacl,
                                      SMB_ACL_ENTRY_T *pentry);
 static int smb_full_audit_sys_acl_set_tag_type(vfs_handle_struct *handle,
-                                     connection_struct *conn,
                                      SMB_ACL_ENTRY_T entry,
                                      SMB_ACL_TAG_T tagtype);
 static int smb_full_audit_sys_acl_set_qualifier(vfs_handle_struct *handle,
-                                      connection_struct *conn,
                                       SMB_ACL_ENTRY_T entry,
                                       void *qual);
 static int smb_full_audit_sys_acl_set_permset(vfs_handle_struct *handle,
-                                    connection_struct *conn,
                                     SMB_ACL_ENTRY_T entry,
                                     SMB_ACL_PERMSET_T permset);
 static int smb_full_audit_sys_acl_valid(vfs_handle_struct *handle,
-                              connection_struct *conn,
                               SMB_ACL_T theacl );
 static int smb_full_audit_sys_acl_set_file(vfs_handle_struct *handle,
-                                 connection_struct *conn,
                                  const char *name, SMB_ACL_TYPE_T acltype,
                                  SMB_ACL_T theacl);
 static int smb_full_audit_sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
-                               int fd, SMB_ACL_T theacl);
+                               SMB_ACL_T theacl);
 static int smb_full_audit_sys_acl_delete_def_file(vfs_handle_struct *handle,
-                                        connection_struct *conn,
                                         const char *path);
 static int smb_full_audit_sys_acl_get_perm(vfs_handle_struct *handle,
-                                 connection_struct *conn,
                                  SMB_ACL_PERMSET_T permset,
                                  SMB_ACL_PERM_T perm);
 static int smb_full_audit_sys_acl_free_text(vfs_handle_struct *handle,
-                                  connection_struct *conn,
                                   char *text);
 static int smb_full_audit_sys_acl_free_acl(vfs_handle_struct *handle,
-                                 connection_struct *conn,
                                  SMB_ACL_T posix_acl);
 static int smb_full_audit_sys_acl_free_qualifier(vfs_handle_struct *handle,
-                                       connection_struct *conn,
                                        void *qualifier,
                                        SMB_ACL_TAG_T tagtype);
 static ssize_t smb_full_audit_getxattr(struct vfs_handle_struct *handle,
-                             struct connection_struct *conn, const char *path,
+                             const char *path,
                              const char *name, void *value, size_t size);
 static ssize_t smb_full_audit_lgetxattr(struct vfs_handle_struct *handle,
-                              struct connection_struct *conn,
                               const char *path, const char *name,
                               void *value, size_t size);
 static ssize_t smb_full_audit_fgetxattr(struct vfs_handle_struct *handle,
-                              struct files_struct *fsp, int fd,
+                              struct files_struct *fsp,
                               const char *name, void *value, size_t size);
 static ssize_t smb_full_audit_listxattr(struct vfs_handle_struct *handle,
-                              struct connection_struct *conn,
                               const char *path, char *list, size_t size);
 static ssize_t smb_full_audit_llistxattr(struct vfs_handle_struct *handle,
-                               struct connection_struct *conn,
                                const char *path, char *list, size_t size);
 static ssize_t smb_full_audit_flistxattr(struct vfs_handle_struct *handle,
-                               struct files_struct *fsp, int fd, char *list,
+                               struct files_struct *fsp, char *list,
                                size_t size);
 static int smb_full_audit_removexattr(struct vfs_handle_struct *handle,
-                            struct connection_struct *conn, const char *path,
+                            const char *path,
                             const char *name);
 static int smb_full_audit_lremovexattr(struct vfs_handle_struct *handle,
-                             struct connection_struct *conn, const char *path,
+                             const char *path,
                              const char *name);
 static int smb_full_audit_fremovexattr(struct vfs_handle_struct *handle,
-                             struct files_struct *fsp, int fd,
+                             struct files_struct *fsp,
                              const char *name);
 static int smb_full_audit_setxattr(struct vfs_handle_struct *handle,
-                         struct connection_struct *conn, const char *path,
+                         const char *path,
                          const char *name, const void *value, size_t size,
                          int flags);
 static int smb_full_audit_lsetxattr(struct vfs_handle_struct *handle,
-                          struct connection_struct *conn, const char *path,
+                          const char *path,
                           const char *name, const void *value, size_t size,
                           int flags);
 static int smb_full_audit_fsetxattr(struct vfs_handle_struct *handle,
-                          struct files_struct *fsp, int fd, const char *name,
+                          struct files_struct *fsp, const char *name,
                           const void *value, size_t size, int flags);
 
 static int smb_full_audit_aio_read(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
 static int smb_full_audit_aio_write(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
 static ssize_t smb_full_audit_aio_return(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
-static int smb_full_audit_aio_cancel(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, SMB_STRUCT_AIOCB *aiocb);
+static int smb_full_audit_aio_cancel(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
 static int smb_full_audit_aio_error(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
 static int smb_full_audit_aio_fsync(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, SMB_STRUCT_AIOCB *aiocb);
 static int smb_full_audit_aio_suspend(struct vfs_handle_struct *handle, struct files_struct *fsp, const SMB_STRUCT_AIOCB * const aiocb[], int n, const struct timespec *ts);
@@ -355,6 +375,8 @@ static vfs_op_tuple audit_op_tuples[] = {
 
        {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,
@@ -369,6 +391,8 @@ static vfs_op_tuple audit_op_tuples[] = {
         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,
@@ -389,16 +413,24 @@ static vfs_op_tuple audit_op_tuples[] = {
         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_utime),      SMB_VFS_OP_UTIME,
+       {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,
@@ -409,6 +441,16 @@ static vfs_op_tuple audit_op_tuples[] = {
         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},
 
        /* NT ACL operations. */
 
@@ -418,8 +460,6 @@ static vfs_op_tuple audit_op_tuples[] = {
         SMB_VFS_LAYER_LOGGER},
        {SMB_VFS_OP(smb_full_audit_fset_nt_acl),        SMB_VFS_OP_FSET_NT_ACL,
         SMB_VFS_LAYER_LOGGER},
-       {SMB_VFS_OP(smb_full_audit_set_nt_acl), SMB_VFS_OP_SET_NT_ACL,
-        SMB_VFS_LAYER_LOGGER},
 
        /* POSIX ACL operations. */
 
@@ -437,7 +477,7 @@ static vfs_op_tuple audit_op_tuples[] = {
         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_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},
@@ -533,6 +573,7 @@ static struct {
        { SMB_VFS_OP_SET_QUOTA, "set_quota" },
        { 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_OPENDIR,   "opendir" },
        { SMB_VFS_OP_READDIR,   "readdir" },
        { SMB_VFS_OP_SEEKDIR,   "seekdir" },
@@ -542,6 +583,7 @@ static struct {
        { SMB_VFS_OP_RMDIR,     "rmdir" },
        { SMB_VFS_OP_CLOSEDIR,  "closedir" },
        { SMB_VFS_OP_OPEN,      "open" },
+       { SMB_VFS_OP_CREATE_FILE, "create_file" },
        { SMB_VFS_OP_CLOSE,     "close" },
        { SMB_VFS_OP_READ,      "read" },
        { SMB_VFS_OP_PREAD,     "pread" },
@@ -549,6 +591,7 @@ static struct {
        { SMB_VFS_OP_PWRITE,    "pwrite" },
        { SMB_VFS_OP_LSEEK,     "lseek" },
        { SMB_VFS_OP_SENDFILE,  "sendfile" },
+       { SMB_VFS_OP_RECVFILE,  "recvfile" },
        { SMB_VFS_OP_RENAME,    "rename" },
        { SMB_VFS_OP_FSYNC,     "fsync" },
        { SMB_VFS_OP_STAT,      "stat" },
@@ -559,20 +602,28 @@ static struct {
        { SMB_VFS_OP_FCHMOD,    "fchmod" },
        { SMB_VFS_OP_CHOWN,     "chown" },
        { SMB_VFS_OP_FCHOWN,    "fchown" },
+       { SMB_VFS_OP_LCHOWN,    "lchown" },
        { SMB_VFS_OP_CHDIR,     "chdir" },
        { SMB_VFS_OP_GETWD,     "getwd" },
-       { SMB_VFS_OP_UTIME,     "utime" },
+       { SMB_VFS_OP_NTIMES,    "ntimes" },
        { SMB_VFS_OP_FTRUNCATE, "ftruncate" },
        { SMB_VFS_OP_LOCK,      "lock" },
+       { SMB_VFS_OP_KERNEL_FLOCK,      "kernel_flock" },
+       { SMB_VFS_OP_LINUX_SETLEASE, "linux_setlease" },
+       { SMB_VFS_OP_GETLOCK,   "getlock" },
        { SMB_VFS_OP_SYMLINK,   "symlink" },
        { SMB_VFS_OP_READLINK,  "readlink" },
        { 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" },
+       { SMB_VFS_OP_GET_REAL_FILENAME, "get_real_filename" },
        { 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_SET_NT_ACL,        "set_nt_acl" },
        { SMB_VFS_OP_CHMOD_ACL, "chmod_acl" },
        { SMB_VFS_OP_FCHMOD_ACL,        "fchmod_acl" },
        { SMB_VFS_OP_SYS_ACL_GET_ENTRY, "sys_acl_get_entry" },
@@ -616,6 +667,9 @@ static struct {
        { SMB_VFS_OP_AIO_ERROR, "aio_error" },
        { SMB_VFS_OP_AIO_FSYNC, "aio_fsync" },
        { SMB_VFS_OP_AIO_SUSPEND,"aio_suspend" },
+       { SMB_VFS_OP_AIO_FORCE, "aio_force" },
+       { SMB_VFS_OP_IS_OFFLINE, "aio_is_offline" },
+       { SMB_VFS_OP_SET_OFFLINE, "aio_set_offline" },
        { SMB_VFS_OP_LAST, NULL }
 };     
 
@@ -655,22 +709,39 @@ static int audit_syslog_priority(vfs_handle_struct *handle)
 
        int priority;
 
-       priority = lp_parm_enum(SNUM(handle->conn), "full_audit", "priority", enum_log_priorities, LOG_NOTICE);
+       priority = lp_parm_enum(SNUM(handle->conn), "full_audit", "priority",
+                               enum_log_priorities, LOG_NOTICE);
+       if (priority == -1) {
+               priority = LOG_WARNING;
+       }
 
        return priority;
 }
 
-static char *audit_prefix(connection_struct *conn)
+static char *audit_prefix(TALLOC_CTX *ctx, connection_struct *conn)
 {
-       static pstring prefix;
+       char *prefix = NULL;
+       char *result;
 
-       pstrcpy(prefix, lp_parm_const_string(SNUM(conn), "full_audit",
+       prefix = talloc_strdup(ctx,
+                       lp_parm_const_string(SNUM(conn), "full_audit",
                                             "prefix", "%u|%I"));
-       standard_sub_snum(SNUM(conn), prefix, sizeof(prefix)-1);
-       return prefix;
+       if (!prefix) {
+               return NULL;
+       }
+       result = talloc_sub_advanced(ctx,
+                       lp_servicename(SNUM(conn)),
+                       conn->server_info->unix_name,
+                       conn->connectpath,
+                       conn->server_info->utok.gid,
+                       conn->server_info->sanitized_username,
+                       pdb_get_domain(conn->server_info->sam_account),
+                       prefix);
+       TALLOC_FREE(prefix);
+       return result;
 }
 
-static BOOL log_success(vfs_handle_struct *handle, vfs_op_type op)
+static bool log_success(vfs_handle_struct *handle, vfs_op_type op)
 {
        struct vfs_full_audit_private_data *pd = NULL;
 
@@ -685,7 +756,7 @@ static BOOL log_success(vfs_handle_struct *handle, vfs_op_type op)
        return bitmap_query(pd->success_ops, op);
 }
 
-static BOOL log_failure(vfs_handle_struct *handle, vfs_op_type op)
+static bool log_failure(vfs_handle_struct *handle, vfs_op_type op)
 {
        struct vfs_full_audit_private_data *pd = NULL;
 
@@ -701,7 +772,7 @@ 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;
+       bool log_all = False;
 
        if (*bm != NULL)
                return;
@@ -716,7 +787,7 @@ static void init_bitmap(struct bitmap **bm, const char **ops)
 
        while (*ops != NULL) {
                int i;
-               BOOL found = False;
+               bool found = False;
 
                if (strequal(*ops, "all")) {
                        log_all = True;
@@ -761,12 +832,13 @@ static const char *audit_opname(vfs_op_type op)
        return vfs_op_names[op].name;
 }
 
-static void do_log(vfs_op_type op, BOOL success, vfs_handle_struct *handle,
+static void do_log(vfs_op_type op, bool success, vfs_handle_struct *handle,
                   const char *format, ...)
 {
        fstring err_msg;
-       pstring op_msg;
+       char *audit_pre = NULL;
        va_list ap;
+       char *op_msg = NULL;
 
        if (success && (!log_success(handle, op)))
                return;
@@ -780,11 +852,20 @@ static void do_log(vfs_op_type op, BOOL success, vfs_handle_struct *handle,
                fstr_sprintf(err_msg, "fail (%s)", strerror(errno));
 
        va_start(ap, format);
-       vsnprintf(op_msg, sizeof(op_msg), format, ap);
+       op_msg = talloc_vasprintf(talloc_tos(), format, ap);
        va_end(ap);
 
+       if (!op_msg) {
+               return;
+       }
+
+       audit_pre = audit_prefix(talloc_tos(), handle->conn);
        syslog(audit_syslog_priority(handle), "%s|%s|%s|%s\n",
-              audit_prefix(handle->conn), audit_opname(op), err_msg, op_msg);
+               audit_pre ? audit_pre : "",
+               audit_opname(op), err_msg, op_msg);
+
+       TALLOC_FREE(audit_pre);
+       TALLOC_FREE(op_msg);
 
        return;
 }
@@ -808,7 +889,7 @@ static void free_private_data(void **p_data)
 /* Implementation of vfs_ops.  Pass everything on to the default
    operation but log event first. */
 
-static int smb_full_audit_connect(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_connect(vfs_handle_struct *handle,
                         const char *svc, const char *user)
 {
        int result;
@@ -829,17 +910,17 @@ static int smb_full_audit_connect(vfs_handle_struct *handle, connection_struct *
        openlog("smbd_audit", 0, audit_syslog_facility(handle));
 
        init_bitmap(&pd->success_ops,
-                   lp_parm_string_list(SNUM(conn), "full_audit", "success",
+                   lp_parm_string_list(SNUM(handle->conn), "full_audit", "success",
                                        none));
        init_bitmap(&pd->failure_ops,
-                   lp_parm_string_list(SNUM(conn), "full_audit", "failure",
+                   lp_parm_string_list(SNUM(handle->conn), "full_audit", "failure",
                                        all));
 
        /* 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, conn, svc, user);
+       result = SMB_VFS_NEXT_CONNECT(handle, svc, user);
 
        do_log(SMB_VFS_OP_CONNECT, True, handle,
               "%s", svc);
@@ -847,13 +928,12 @@ static int smb_full_audit_connect(vfs_handle_struct *handle, connection_struct *
        return result;
 }
 
-static void smb_full_audit_disconnect(vfs_handle_struct *handle,
-                            connection_struct *conn)
+static void smb_full_audit_disconnect(vfs_handle_struct *handle)
 {
-       SMB_VFS_NEXT_DISCONNECT(handle, conn);
+       SMB_VFS_NEXT_DISCONNECT(handle);
 
        do_log(SMB_VFS_OP_DISCONNECT, True, handle,
-              "%s", lp_servicename(SNUM(conn)));
+              "%s", lp_servicename(SNUM(handle->conn)));
 
        /* The bitmaps will be disconnected when the private
           data is deleted. */
@@ -861,14 +941,14 @@ static void smb_full_audit_disconnect(vfs_handle_struct *handle,
        return;
 }
 
-static SMB_BIG_UINT smb_full_audit_disk_free(vfs_handle_struct *handle,
-                                   connection_struct *conn, const char *path,
-                                   BOOL small_query, SMB_BIG_UINT *bsize, 
-                                   SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize)
+static uint64_t smb_full_audit_disk_free(vfs_handle_struct *handle,
+                                   const char *path,
+                                   bool small_query, uint64_t *bsize, 
+                                   uint64_t *dfree, uint64_t *dsize)
 {
-       SMB_BIG_UINT result;
+       uint64_t result;
 
-       result = SMB_VFS_NEXT_DISK_FREE(handle, conn, path, small_query, bsize,
+       result = SMB_VFS_NEXT_DISK_FREE(handle, path, small_query, bsize,
                                        dfree, dsize);
 
        /* Don't have a reasonable notion of failure here */
@@ -879,13 +959,12 @@ static SMB_BIG_UINT smb_full_audit_disk_free(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_get_quota(struct vfs_handle_struct *handle,
-                          struct connection_struct *conn,
                           enum SMB_QUOTA_TYPE qtype, unid_t id,
                           SMB_DISK_QUOTA *qt)
 {
        int result;
 
-       result = SMB_VFS_NEXT_GET_QUOTA(handle, conn, qtype, id, qt);
+       result = SMB_VFS_NEXT_GET_QUOTA(handle, qtype, id, qt);
 
        do_log(SMB_VFS_OP_GET_QUOTA, (result >= 0), handle, "");
 
@@ -894,13 +973,12 @@ static int smb_full_audit_get_quota(struct vfs_handle_struct *handle,
 
        
 static int smb_full_audit_set_quota(struct vfs_handle_struct *handle,
-                          struct connection_struct *conn,
                           enum SMB_QUOTA_TYPE qtype, unid_t id,
                           SMB_DISK_QUOTA *qt)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SET_QUOTA(handle, conn, qtype, id, qt);
+       result = SMB_VFS_NEXT_SET_QUOTA(handle, qtype, id, qt);
 
        do_log(SMB_VFS_OP_SET_QUOTA, (result >= 0), handle, "");
 
@@ -909,7 +987,7 @@ static int smb_full_audit_set_quota(struct vfs_handle_struct *handle,
 
 static int smb_full_audit_get_shadow_copy_data(struct vfs_handle_struct *handle,
                                struct files_struct *fsp,
-                               SHADOW_COPY_DATA *shadow_copy_data, BOOL labels)
+                               SHADOW_COPY_DATA *shadow_copy_data, bool labels)
 {
        int result;
 
@@ -921,25 +999,24 @@ 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,
-                               struct connection_struct *conn,
                                const char *path,
                                struct vfs_statvfs_struct *statbuf)
 {
        int result;
 
-       result = SMB_VFS_NEXT_STATVFS(handle, conn, path, statbuf);
+       result = SMB_VFS_NEXT_STATVFS(handle, path, statbuf);
 
        do_log(SMB_VFS_OP_STATVFS, (result >= 0), handle, "");
 
        return result;
 }
 
-static SMB_STRUCT_DIR *smb_full_audit_opendir(vfs_handle_struct *handle, connection_struct *conn,
+static SMB_STRUCT_DIR *smb_full_audit_opendir(vfs_handle_struct *handle,
                          const char *fname, const char *mask, uint32 attr)
 {
        SMB_STRUCT_DIR *result;
 
-       result = SMB_VFS_NEXT_OPENDIR(handle, conn, fname, mask, attr);
+       result = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 
        do_log(SMB_VFS_OP_OPENDIR, (result != NULL), handle, "%s", fname);
 
@@ -947,11 +1024,11 @@ static SMB_STRUCT_DIR *smb_full_audit_opendir(vfs_handle_struct *handle, connect
 }
 
 static SMB_STRUCT_DIRENT *smb_full_audit_readdir(vfs_handle_struct *handle,
-                                   connection_struct *conn, SMB_STRUCT_DIR *dirp)
+                                   SMB_STRUCT_DIR *dirp)
 {
        SMB_STRUCT_DIRENT *result;
 
-       result = SMB_VFS_NEXT_READDIR(handle, conn, dirp);
+       result = SMB_VFS_NEXT_READDIR(handle, dirp);
 
        /* This operation has no reasonable error condition
         * (End of dir is also failure), so always succeed.
@@ -961,78 +1038,78 @@ static SMB_STRUCT_DIRENT *smb_full_audit_readdir(vfs_handle_struct *handle,
        return result;
 }
 
-static void smb_full_audit_seekdir(vfs_handle_struct *handle, connection_struct *conn,
+static void smb_full_audit_seekdir(vfs_handle_struct *handle,
                        SMB_STRUCT_DIR *dirp, long offset)
 {
-       SMB_VFS_NEXT_SEEKDIR(handle, conn, dirp, offset);
+       SMB_VFS_NEXT_SEEKDIR(handle, dirp, offset);
 
        do_log(SMB_VFS_OP_SEEKDIR, True, handle, "");
        return;
 }
 
-static long smb_full_audit_telldir(vfs_handle_struct *handle, connection_struct *conn,
+static long smb_full_audit_telldir(vfs_handle_struct *handle,
                        SMB_STRUCT_DIR *dirp)
 {
        long result;
 
-       result = SMB_VFS_NEXT_TELLDIR(handle, conn, dirp);
+       result = SMB_VFS_NEXT_TELLDIR(handle, dirp);
 
        do_log(SMB_VFS_OP_TELLDIR, True, handle, "");
 
        return result;
 }
 
-static void smb_full_audit_rewinddir(vfs_handle_struct *handle, connection_struct *conn,
+static void smb_full_audit_rewinddir(vfs_handle_struct *handle,
                        SMB_STRUCT_DIR *dirp)
 {
-       SMB_VFS_NEXT_REWINDDIR(handle, conn, dirp);
+       SMB_VFS_NEXT_REWINDDIR(handle, dirp);
 
        do_log(SMB_VFS_OP_REWINDDIR, True, handle, "");
        return;
 }
 
-static int smb_full_audit_mkdir(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_mkdir(vfs_handle_struct *handle,
                       const char *path, mode_t mode)
 {
        int result;
        
-       result = SMB_VFS_NEXT_MKDIR(handle, conn, path, mode);
+       result = SMB_VFS_NEXT_MKDIR(handle, path, mode);
        
        do_log(SMB_VFS_OP_MKDIR, (result >= 0), handle, "%s", path);
 
        return result;
 }
 
-static int smb_full_audit_rmdir(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_rmdir(vfs_handle_struct *handle,
                       const char *path)
 {
        int result;
        
-       result = SMB_VFS_NEXT_RMDIR(handle, conn, path);
+       result = SMB_VFS_NEXT_RMDIR(handle, path);
 
        do_log(SMB_VFS_OP_RMDIR, (result >= 0), handle, "%s", path);
 
        return result;
 }
 
-static int smb_full_audit_closedir(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_closedir(vfs_handle_struct *handle,
                          SMB_STRUCT_DIR *dirp)
 {
        int result;
 
-       result = SMB_VFS_NEXT_CLOSEDIR(handle, conn, dirp);
+       result = SMB_VFS_NEXT_CLOSEDIR(handle, dirp);
        
        do_log(SMB_VFS_OP_CLOSEDIR, (result >= 0), handle, "");
 
        return result;
 }
 
-static int smb_full_audit_open(vfs_handle_struct *handle, connection_struct *conn,
-                     const char *fname, int flags, mode_t mode)
+static int smb_full_audit_open(vfs_handle_struct *handle,
+                     const char *fname, files_struct *fsp, int flags, mode_t mode)
 {
        int result;
        
-       result = SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode);
+       result = SMB_VFS_NEXT_OPEN(handle, fname, fsp, flags, mode);
 
        do_log(SMB_VFS_OP_OPEN, (result >= 0), handle, "%s|%s",
               ((flags & O_WRONLY) || (flags & O_RDWR))?"w":"r",
@@ -1041,11 +1118,56 @@ static int smb_full_audit_open(vfs_handle_struct *handle, connection_struct *con
        return result;
 }
 
-static int smb_full_audit_close(vfs_handle_struct *handle, files_struct *fsp, int fd)
+static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle,
+                                     struct smb_request *req,
+                                     uint16_t root_dir_fid,
+                                     const char *fname,
+                                     uint32_t create_file_flags,
+                                     uint32_t access_mask,
+                                     uint32_t share_access,
+                                     uint32_t create_disposition,
+                                     uint32_t create_options,
+                                     uint32_t file_attributes,
+                                     uint32_t oplock_request,
+                                     uint64_t allocation_size,
+                                     struct security_descriptor *sd,
+                                     struct ea_list *ea_list,
+                                     files_struct **result_fsp,
+                                     int *pinfo,
+                                     SMB_STRUCT_STAT *psbuf)
+{
+       NTSTATUS result;
+
+       result = SMB_VFS_NEXT_CREATE_FILE(
+               handle,                                 /* handle */
+               req,                                    /* req */
+               root_dir_fid,                           /* root_dir_fid */
+               fname,                                  /* fname */
+               create_file_flags,                      /* create_file_flags */
+               access_mask,                            /* access_mask */
+               share_access,                           /* share_access */
+               create_disposition,                     /* create_disposition*/
+               create_options,                         /* create_options */
+               file_attributes,                        /* file_attributes */
+               oplock_request,                         /* oplock_request */
+               allocation_size,                        /* allocation_size */
+               sd,                                     /* sd */
+               ea_list,                                /* ea_list */
+               result_fsp,                             /* result */
+               pinfo,                                  /* pinfo */
+               psbuf);                                 /* psbuf */
+
+       do_log(SMB_VFS_OP_CREATE_FILE, (NT_STATUS_IS_OK(result)), handle, "0x%x|%s",
+              access_mask, fname);
+
+       return result;
+}
+
+static int smb_full_audit_close(vfs_handle_struct *handle, files_struct *fsp)
 {
        int result;
        
-       result = SMB_VFS_NEXT_CLOSE(handle, fsp, fd);
+       result = SMB_VFS_NEXT_CLOSE(handle, fsp);
 
        do_log(SMB_VFS_OP_CLOSE, (result >= 0), handle, "%s", fsp->fsp_name);
 
@@ -1053,11 +1175,11 @@ static int smb_full_audit_close(vfs_handle_struct *handle, files_struct *fsp, in
 }
 
 static ssize_t smb_full_audit_read(vfs_handle_struct *handle, files_struct *fsp,
-                         int fd, void *data, size_t n)
+                         void *data, size_t n)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_READ(handle, fsp, fd, data, n);
+       result = SMB_VFS_NEXT_READ(handle, fsp, data, n);
 
        do_log(SMB_VFS_OP_READ, (result >= 0), handle, "%s", fsp->fsp_name);
 
@@ -1065,11 +1187,11 @@ static ssize_t smb_full_audit_read(vfs_handle_struct *handle, files_struct *fsp,
 }
 
 static ssize_t smb_full_audit_pread(vfs_handle_struct *handle, files_struct *fsp,
-                          int fd, void *data, size_t n, SMB_OFF_T offset)
+                          void *data, size_t n, SMB_OFF_T offset)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_PREAD(handle, fsp, fd, data, n, offset);
+       result = SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
 
        do_log(SMB_VFS_OP_PREAD, (result >= 0), handle, "%s", fsp->fsp_name);
 
@@ -1077,11 +1199,11 @@ static ssize_t smb_full_audit_pread(vfs_handle_struct *handle, files_struct *fsp
 }
 
 static ssize_t smb_full_audit_write(vfs_handle_struct *handle, files_struct *fsp,
-                          int fd, const void *data, size_t n)
+                          const void *data, size_t n)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_WRITE(handle, fsp, fd, data, n);
+       result = SMB_VFS_NEXT_WRITE(handle, fsp, data, n);
 
        do_log(SMB_VFS_OP_WRITE, (result >= 0), handle, "%s", fsp->fsp_name);
 
@@ -1089,12 +1211,12 @@ static ssize_t smb_full_audit_write(vfs_handle_struct *handle, files_struct *fsp
 }
 
 static ssize_t smb_full_audit_pwrite(vfs_handle_struct *handle, files_struct *fsp,
-                           int fd, const void *data, size_t n,
+                           const void *data, size_t n,
                            SMB_OFF_T offset)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_PWRITE(handle, fsp, fd, data, n, offset);
+       result = SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset);
 
        do_log(SMB_VFS_OP_PWRITE, (result >= 0), handle, "%s", fsp->fsp_name);
 
@@ -1102,11 +1224,11 @@ static ssize_t smb_full_audit_pwrite(vfs_handle_struct *handle, files_struct *fs
 }
 
 static SMB_OFF_T smb_full_audit_lseek(vfs_handle_struct *handle, files_struct *fsp,
-                            int filedes, SMB_OFF_T offset, int whence)
+                            SMB_OFF_T offset, int whence)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_LSEEK(handle, fsp, filedes, offset, whence);
+       result = SMB_VFS_NEXT_LSEEK(handle, fsp, offset, whence);
 
        do_log(SMB_VFS_OP_LSEEK, (result != (ssize_t)-1), handle,
               "%s", fsp->fsp_name);
@@ -1115,110 +1237,124 @@ static SMB_OFF_T smb_full_audit_lseek(vfs_handle_struct *handle, files_struct *f
 }
 
 static ssize_t smb_full_audit_sendfile(vfs_handle_struct *handle, int tofd,
-                             files_struct *fsp, int fromfd,
+                             files_struct *fromfsp,
                              const DATA_BLOB *hdr, SMB_OFF_T offset,
                              size_t n)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_SENDFILE(handle, tofd, fsp, fromfd, hdr,
-                                      offset, n);
+       result = SMB_VFS_NEXT_SENDFILE(handle, tofd, fromfsp, hdr, offset, n);
 
        do_log(SMB_VFS_OP_SENDFILE, (result >= 0), handle,
-              "%s", fsp->fsp_name);
+              "%s", fromfsp->fsp_name);
+
+       return result;
+}
+
+static ssize_t smb_full_audit_recvfile(vfs_handle_struct *handle, int fromfd,
+                     files_struct *tofsp,
+                             SMB_OFF_T offset,
+                             size_t n)
+{
+       ssize_t result;
+
+       result = SMB_VFS_NEXT_RECVFILE(handle, fromfd, tofsp, offset, n);
+
+       do_log(SMB_VFS_OP_RECVFILE, (result >= 0), handle,
+              "%s", tofsp->fsp_name);
 
        return result;
 }
 
-static int smb_full_audit_rename(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_rename(vfs_handle_struct *handle,
                        const char *oldname, const char *newname)
 {
        int result;
        
-       result = SMB_VFS_NEXT_RENAME(handle, conn, oldname, newname);
+       result = SMB_VFS_NEXT_RENAME(handle, oldname, newname);
 
        do_log(SMB_VFS_OP_RENAME, (result >= 0), handle, "%s|%s", oldname, newname);
 
        return result;    
 }
 
-static int smb_full_audit_fsync(vfs_handle_struct *handle, files_struct *fsp, int fd)
+static int smb_full_audit_fsync(vfs_handle_struct *handle, files_struct *fsp)
 {
        int result;
        
-       result = SMB_VFS_NEXT_FSYNC(handle, fsp, fd);
+       result = SMB_VFS_NEXT_FSYNC(handle, fsp);
 
        do_log(SMB_VFS_OP_FSYNC, (result >= 0), handle, "%s", fsp->fsp_name);
 
        return result;    
 }
 
-static int smb_full_audit_stat(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_stat(vfs_handle_struct *handle,
                      const char *fname, SMB_STRUCT_STAT *sbuf)
 {
        int result;
        
-       result = SMB_VFS_NEXT_STAT(handle, conn, fname, sbuf);
+       result = SMB_VFS_NEXT_STAT(handle, fname, sbuf);
 
        do_log(SMB_VFS_OP_STAT, (result >= 0), handle, "%s", fname);
 
        return result;    
 }
 
-static int smb_full_audit_fstat(vfs_handle_struct *handle, files_struct *fsp, int fd,
+static int smb_full_audit_fstat(vfs_handle_struct *handle, files_struct *fsp,
                       SMB_STRUCT_STAT *sbuf)
 {
        int result;
        
-       result = SMB_VFS_NEXT_FSTAT(handle, fsp, fd, sbuf);
+       result = SMB_VFS_NEXT_FSTAT(handle, fsp, sbuf);
 
        do_log(SMB_VFS_OP_FSTAT, (result >= 0), handle, "%s", fsp->fsp_name);
 
        return result;
 }
 
-static int smb_full_audit_lstat(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_lstat(vfs_handle_struct *handle,
                       const char *path, SMB_STRUCT_STAT *sbuf)
 {
        int result;
        
-       result = SMB_VFS_NEXT_LSTAT(handle, conn, path, sbuf);
+       result = SMB_VFS_NEXT_LSTAT(handle, path, sbuf);
 
        do_log(SMB_VFS_OP_LSTAT, (result >= 0), handle, "%s", path);
 
        return result;    
 }
 
-static int smb_full_audit_unlink(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_unlink(vfs_handle_struct *handle,
                        const char *path)
 {
        int result;
        
-       result = SMB_VFS_NEXT_UNLINK(handle, conn, path);
+       result = SMB_VFS_NEXT_UNLINK(handle, path);
 
        do_log(SMB_VFS_OP_UNLINK, (result >= 0), handle, "%s", path);
 
        return result;
 }
 
-static int smb_full_audit_chmod(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_chmod(vfs_handle_struct *handle,
                       const char *path, mode_t mode)
 {
        int result;
 
-       result = SMB_VFS_NEXT_CHMOD(handle, conn, path, mode);
+       result = SMB_VFS_NEXT_CHMOD(handle, path, mode);
 
        do_log(SMB_VFS_OP_CHMOD, (result >= 0), handle, "%s|%o", path, mode);
 
        return result;
 }
 
-static int smb_full_audit_fchmod(vfs_handle_struct *handle, files_struct *fsp, int fd,
+static int smb_full_audit_fchmod(vfs_handle_struct *handle, files_struct *fsp,
                        mode_t mode)
 {
        int result;
        
-       result = SMB_VFS_NEXT_FCHMOD(handle, fsp, fd, mode);
+       result = SMB_VFS_NEXT_FCHMOD(handle, fsp, mode);
 
        do_log(SMB_VFS_OP_FCHMOD, (result >= 0), handle,
               "%s|%o", fsp->fsp_name, mode);
@@ -1226,12 +1362,12 @@ static int smb_full_audit_fchmod(vfs_handle_struct *handle, files_struct *fsp, i
        return result;
 }
 
-static int smb_full_audit_chown(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_chown(vfs_handle_struct *handle,
                       const char *path, uid_t uid, gid_t gid)
 {
        int result;
 
-       result = SMB_VFS_NEXT_CHOWN(handle, conn, path, uid, gid);
+       result = SMB_VFS_NEXT_CHOWN(handle, path, uid, gid);
 
        do_log(SMB_VFS_OP_CHOWN, (result >= 0), handle, "%s|%ld|%ld",
               path, (long int)uid, (long int)gid);
@@ -1239,12 +1375,12 @@ static int smb_full_audit_chown(vfs_handle_struct *handle, connection_struct *co
        return result;
 }
 
-static int smb_full_audit_fchown(vfs_handle_struct *handle, files_struct *fsp, int fd,
+static int smb_full_audit_fchown(vfs_handle_struct *handle, files_struct *fsp,
                        uid_t uid, gid_t gid)
 {
        int result;
 
-       result = SMB_VFS_NEXT_FCHOWN(handle, fsp, fd, uid, gid);
+       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);
@@ -1252,48 +1388,61 @@ static int smb_full_audit_fchown(vfs_handle_struct *handle, files_struct *fsp, i
        return result;
 }
 
-static int smb_full_audit_chdir(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_lchown(vfs_handle_struct *handle,
+                      const char *path, uid_t uid, gid_t gid)
+{
+       int result;
+
+       result = SMB_VFS_NEXT_LCHOWN(handle, path, uid, gid);
+
+       do_log(SMB_VFS_OP_LCHOWN, (result >= 0), handle, "%s|%ld|%ld",
+              path, (long int)uid, (long int)gid);
+
+       return result;
+}
+
+static int smb_full_audit_chdir(vfs_handle_struct *handle,
                       const char *path)
 {
        int result;
 
-       result = SMB_VFS_NEXT_CHDIR(handle, conn, path);
+       result = SMB_VFS_NEXT_CHDIR(handle, path);
 
        do_log(SMB_VFS_OP_CHDIR, (result >= 0), handle, "chdir|%s", path);
 
        return result;
 }
 
-static char *smb_full_audit_getwd(vfs_handle_struct *handle, connection_struct *conn,
+static char *smb_full_audit_getwd(vfs_handle_struct *handle,
                         char *path)
 {
        char *result;
 
-       result = SMB_VFS_NEXT_GETWD(handle, conn, path);
+       result = SMB_VFS_NEXT_GETWD(handle, path);
        
        do_log(SMB_VFS_OP_GETWD, (result != NULL), handle, "%s", path);
 
        return result;
 }
 
-static int smb_full_audit_utime(vfs_handle_struct *handle, connection_struct *conn,
-                      const char *path, struct utimbuf *times)
+static int smb_full_audit_ntimes(vfs_handle_struct *handle,
+                      const char *path, struct smb_file_time *ft)
 {
        int result;
 
-       result = SMB_VFS_NEXT_UTIME(handle, conn, path, times);
+       result = SMB_VFS_NEXT_NTIMES(handle, path, ft);
 
-       do_log(SMB_VFS_OP_UTIME, (result >= 0), handle, "%s", path);
+       do_log(SMB_VFS_OP_NTIMES, (result >= 0), handle, "%s", path);
 
        return result;
 }
 
 static int smb_full_audit_ftruncate(vfs_handle_struct *handle, files_struct *fsp,
-                          int fd, SMB_OFF_T len)
+                          SMB_OFF_T len)
 {
        int result;
 
-       result = SMB_VFS_NEXT_FTRUNCATE(handle, fsp, fd, len);
+       result = SMB_VFS_NEXT_FTRUNCATE(handle, fsp, len);
 
        do_log(SMB_VFS_OP_FTRUNCATE, (result >= 0), handle,
               "%s", fsp->fsp_name);
@@ -1301,24 +1450,63 @@ static int smb_full_audit_ftruncate(vfs_handle_struct *handle, files_struct *fsp
        return result;
 }
 
-static BOOL smb_full_audit_lock(vfs_handle_struct *handle, files_struct *fsp, int fd,
+static bool smb_full_audit_lock(vfs_handle_struct *handle, files_struct *fsp,
                       int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
 {
-       BOOL result;
+       bool result;
 
-       result = SMB_VFS_NEXT_LOCK(handle, fsp, fd, op, offset, count, type);
+       result = SMB_VFS_NEXT_LOCK(handle, fsp, op, offset, count, type);
 
-       do_log(SMB_VFS_OP_LOCK, (result >= 0), handle, "%s", fsp->fsp_name);
+       do_log(SMB_VFS_OP_LOCK, result, handle, "%s", fsp->fsp_name);
 
        return result;
 }
 
-static int smb_full_audit_symlink(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_kernel_flock(struct vfs_handle_struct *handle,
+                                      struct files_struct *fsp,
+                                      uint32 share_mode)
+{
+       int result;
+
+       result = SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode);
+
+       do_log(SMB_VFS_OP_KERNEL_FLOCK, (result >= 0), handle, "%s",
+              fsp->fsp_name);
+
+       return result;
+}
+
+static int smb_full_audit_linux_setlease(vfs_handle_struct *handle, files_struct *fsp,
+                                 int leasetype)
+{
+        int result;
+
+        result = SMB_VFS_NEXT_LINUX_SETLEASE(handle, fsp, leasetype);
+
+        do_log(SMB_VFS_OP_LINUX_SETLEASE, (result >= 0), handle, "%s",
+               fsp->fsp_name);
+
+        return result;
+}
+
+static bool smb_full_audit_getlock(vfs_handle_struct *handle, files_struct *fsp,
+                      SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid)
+{
+       bool result;
+
+       result = SMB_VFS_NEXT_GETLOCK(handle, fsp, poffset, pcount, ptype, ppid);
+
+       do_log(SMB_VFS_OP_GETLOCK, result, handle, "%s", fsp->fsp_name);
+
+       return result;
+}
+
+static int smb_full_audit_symlink(vfs_handle_struct *handle,
                         const char *oldpath, const char *newpath)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYMLINK(handle, conn, oldpath, newpath);
+       result = SMB_VFS_NEXT_SYMLINK(handle, oldpath, newpath);
 
        do_log(SMB_VFS_OP_SYMLINK, (result >= 0), handle,
               "%s|%s", oldpath, newpath);
@@ -1326,24 +1514,24 @@ static int smb_full_audit_symlink(vfs_handle_struct *handle, connection_struct *
        return result;
 }
 
-static int smb_full_audit_readlink(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_readlink(vfs_handle_struct *handle,
                          const char *path, char *buf, size_t bufsiz)
 {
        int result;
 
-       result = SMB_VFS_NEXT_READLINK(handle, conn, path, buf, bufsiz);
+       result = SMB_VFS_NEXT_READLINK(handle, path, buf, bufsiz);
 
        do_log(SMB_VFS_OP_READLINK, (result >= 0), handle, "%s", path);
 
        return result;
 }
 
-static int smb_full_audit_link(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_link(vfs_handle_struct *handle,
                      const char *oldpath, const char *newpath)
 {
        int result;
 
-       result = SMB_VFS_NEXT_LINK(handle, conn, oldpath, newpath);
+       result = SMB_VFS_NEXT_LINK(handle, oldpath, newpath);
 
        do_log(SMB_VFS_OP_LINK, (result >= 0), handle,
               "%s|%s", oldpath, newpath);
@@ -1351,94 +1539,159 @@ static int smb_full_audit_link(vfs_handle_struct *handle, connection_struct *con
        return result;
 }
 
-static int smb_full_audit_mknod(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_mknod(vfs_handle_struct *handle,
                       const char *pathname, mode_t mode, SMB_DEV_T dev)
 {
        int result;
 
-       result = SMB_VFS_NEXT_MKNOD(handle, conn, pathname, mode, dev);
+       result = SMB_VFS_NEXT_MKNOD(handle, pathname, mode, dev);
 
        do_log(SMB_VFS_OP_MKNOD, (result >= 0), handle, "%s", pathname);
 
        return result;
 }
 
-static char *smb_full_audit_realpath(vfs_handle_struct *handle, connection_struct *conn,
+static char *smb_full_audit_realpath(vfs_handle_struct *handle,
                            const char *path, char *resolved_path)
 {
        char *result;
 
-       result = SMB_VFS_NEXT_REALPATH(handle, conn, path, resolved_path);
+       result = SMB_VFS_NEXT_REALPATH(handle, path, resolved_path);
 
        do_log(SMB_VFS_OP_REALPATH, (result != NULL), handle, "%s", path);
 
        return result;
 }
 
-static size_t smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                               int fd, uint32 security_info,
-                               SEC_DESC **ppdesc)
+static NTSTATUS smb_full_audit_notify_watch(struct vfs_handle_struct *handle,
+                       struct sys_notify_context *ctx,
+                       struct notify_entry *e,
+                       void (*callback)(struct sys_notify_context *ctx,
+                                       void *private_data,
+                                       struct notify_event *ev),
+                       void *private_data, void *handle_p)
 {
-       size_t result;
+       NTSTATUS result;
 
-       result = SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, fd, security_info,
-                                         ppdesc);
+       result = SMB_VFS_NEXT_NOTIFY_WATCH(handle, ctx, e, callback, private_data, handle_p);
 
-       do_log(SMB_VFS_OP_FGET_NT_ACL, (result > 0), handle,
-              "%s", fsp->fsp_name);
+       do_log(SMB_VFS_OP_NOTIFY_WATCH, NT_STATUS_IS_OK(result), handle, "");
 
        return result;
 }
 
-static size_t smb_full_audit_get_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                              const char *name, uint32 security_info,
-                              SEC_DESC **ppdesc)
+static int smb_full_audit_chflags(vfs_handle_struct *handle,
+                           const char *path, unsigned int flags)
 {
-       size_t result;
+       int result;
 
-       result = SMB_VFS_NEXT_GET_NT_ACL(handle, fsp, name, security_info,
-                                        ppdesc);
+       result = SMB_VFS_NEXT_CHFLAGS(handle, path, flags);
+
+       do_log(SMB_VFS_OP_CHFLAGS, (result != 0), handle, "%s", path);
+
+       return result;
+}
+
+static struct file_id smb_full_audit_file_id_create(struct vfs_handle_struct *handle,
+                                                   SMB_DEV_T dev, SMB_INO_T inode)
+{
+       struct file_id id_zero;
+       struct file_id result;
+
+       ZERO_STRUCT(id_zero);
+
+       result = SMB_VFS_NEXT_FILE_ID_CREATE(handle, dev, inode);
+
+       do_log(SMB_VFS_OP_FILE_ID_CREATE,
+              !file_id_equal(&id_zero, &result),
+              handle, "%s", file_id_string_tos(&result));
+
+       return result;
+}
+
+static NTSTATUS smb_full_audit_streaminfo(vfs_handle_struct *handle,
+                                         struct files_struct *fsp,
+                                         const char *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,
+                                        pnum_streams, pstreams);
+
+       do_log(SMB_VFS_OP_STREAMINFO, NT_STATUS_IS_OK(result), handle,
+              "%s", fname);
+
+       return result;
+}
 
-       do_log(SMB_VFS_OP_GET_NT_ACL, (result > 0), handle,
+static int smb_full_audit_get_real_filename(struct vfs_handle_struct *handle,
+                                           const char *path,
+                                           const char *name,
+                                           TALLOC_CTX *mem_ctx,
+                                           char **found_name)
+{
+       int result;
+
+       result = SMB_VFS_NEXT_GET_REAL_FILENAME(handle, path, name, mem_ctx,
+                                               found_name);
+
+       do_log(SMB_VFS_OP_GET_REAL_FILENAME, (result == 0), handle,
+              "%s/%s->%s", path, name, (result == 0) ? "" : *found_name);
+
+       return result;
+}
+
+static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+                               uint32 security_info,
+                               SEC_DESC **ppdesc)
+{
+       NTSTATUS result;
+
+       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);
 
        return result;
 }
 
-static BOOL smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                             int fd, uint32 security_info_sent,
-                             SEC_DESC *psd)
+static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle,
+                                         const char *name,
+                                         uint32 security_info,
+                                         SEC_DESC **ppdesc)
 {
-       BOOL result;
+       NTSTATUS result;
 
-       result = SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, fd, security_info_sent,
-                                         psd);
+       result = SMB_VFS_NEXT_GET_NT_ACL(handle, name, security_info, ppdesc);
 
-       do_log(SMB_VFS_OP_FSET_NT_ACL, result, handle, "%s", fsp->fsp_name);
+       do_log(SMB_VFS_OP_GET_NT_ACL, NT_STATUS_IS_OK(result), handle,
+              "%s", name);
 
        return result;
 }
 
-static BOOL smb_full_audit_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                            const char *name, uint32 security_info_sent,
-                            SEC_DESC *psd)
+static NTSTATUS smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+                             uint32 security_info_sent,
+                             const SEC_DESC *psd)
 {
-       BOOL result;
+       NTSTATUS result;
 
-       result = SMB_VFS_NEXT_SET_NT_ACL(handle, fsp, name, security_info_sent,
-                                        psd);
+       result = SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
 
-       do_log(SMB_VFS_OP_SET_NT_ACL, result, handle, "%s", fsp->fsp_name);
+       do_log(SMB_VFS_OP_FSET_NT_ACL, NT_STATUS_IS_OK(result), handle, "%s", fsp->fsp_name);
 
        return result;
 }
 
-static int smb_full_audit_chmod_acl(vfs_handle_struct *handle, connection_struct *conn,
+static int smb_full_audit_chmod_acl(vfs_handle_struct *handle,
                           const char *path, mode_t mode)
 {
        int result;
        
-       result = SMB_VFS_NEXT_CHMOD_ACL(handle, conn, path, mode);
+       result = SMB_VFS_NEXT_CHMOD_ACL(handle, path, mode);
 
        do_log(SMB_VFS_OP_CHMOD_ACL, (result >= 0), handle,
               "%s|%o", path, mode);
@@ -1447,11 +1700,11 @@ static int smb_full_audit_chmod_acl(vfs_handle_struct *handle, connection_struct
 }
 
 static int smb_full_audit_fchmod_acl(vfs_handle_struct *handle, files_struct *fsp,
-                           int fd, mode_t mode)
+                                    mode_t mode)
 {
        int result;
        
-       result = SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, fd, mode);
+       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);
@@ -1460,13 +1713,13 @@ static int smb_full_audit_fchmod_acl(vfs_handle_struct *handle, files_struct *fs
 }
 
 static int smb_full_audit_sys_acl_get_entry(vfs_handle_struct *handle,
-                                  connection_struct *conn,
+
                                   SMB_ACL_T theacl, int entry_id,
                                   SMB_ACL_ENTRY_T *entry_p)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_ENTRY(handle, conn, theacl, entry_id,
+       result = SMB_VFS_NEXT_SYS_ACL_GET_ENTRY(handle, theacl, entry_id,
                                                entry_p);
 
        do_log(SMB_VFS_OP_SYS_ACL_GET_ENTRY, (result >= 0), handle,
@@ -1476,13 +1729,13 @@ static int smb_full_audit_sys_acl_get_entry(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_get_tag_type(vfs_handle_struct *handle,
-                                     connection_struct *conn,
+
                                      SMB_ACL_ENTRY_T entry_d,
                                      SMB_ACL_TAG_T *tag_type_p)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_TAG_TYPE(handle, conn, entry_d,
+       result = SMB_VFS_NEXT_SYS_ACL_GET_TAG_TYPE(handle, entry_d,
                                                   tag_type_p);
 
        do_log(SMB_VFS_OP_SYS_ACL_GET_TAG_TYPE, (result >= 0), handle,
@@ -1492,13 +1745,13 @@ static int smb_full_audit_sys_acl_get_tag_type(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_get_permset(vfs_handle_struct *handle,
-                                    connection_struct *conn,
+
                                     SMB_ACL_ENTRY_T entry_d,
                                     SMB_ACL_PERMSET_T *permset_p)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_PERMSET(handle, conn, entry_d,
+       result = SMB_VFS_NEXT_SYS_ACL_GET_PERMSET(handle, entry_d,
                                                  permset_p);
 
        do_log(SMB_VFS_OP_SYS_ACL_GET_PERMSET, (result >= 0), handle,
@@ -1508,12 +1761,12 @@ static int smb_full_audit_sys_acl_get_permset(vfs_handle_struct *handle,
 }
 
 static void * smb_full_audit_sys_acl_get_qualifier(vfs_handle_struct *handle,
-                                         connection_struct *conn,
+
                                          SMB_ACL_ENTRY_T entry_d)
 {
        void *result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_QUALIFIER(handle, conn, entry_d);
+       result = SMB_VFS_NEXT_SYS_ACL_GET_QUALIFIER(handle, entry_d);
 
        do_log(SMB_VFS_OP_SYS_ACL_GET_QUALIFIER, (result != NULL), handle,
               "");
@@ -1522,13 +1775,12 @@ static void * smb_full_audit_sys_acl_get_qualifier(vfs_handle_struct *handle,
 }
 
 static SMB_ACL_T smb_full_audit_sys_acl_get_file(vfs_handle_struct *handle,
-                                       connection_struct *conn,
                                        const char *path_p,
                                        SMB_ACL_TYPE_T type)
 {
        SMB_ACL_T result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, conn, path_p, type);
+       result = SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, path_p, type);
 
        do_log(SMB_VFS_OP_SYS_ACL_GET_FILE, (result != NULL), handle,
               "%s", path_p);
@@ -1537,11 +1789,11 @@ static SMB_ACL_T smb_full_audit_sys_acl_get_file(vfs_handle_struct *handle,
 }
 
 static SMB_ACL_T smb_full_audit_sys_acl_get_fd(vfs_handle_struct *handle,
-                                     files_struct *fsp, int fd)
+                                     files_struct *fsp)
 {
        SMB_ACL_T result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, fd);
+       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);
@@ -1550,12 +1802,12 @@ static SMB_ACL_T smb_full_audit_sys_acl_get_fd(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_clear_perms(vfs_handle_struct *handle,
-                                    connection_struct *conn,
+
                                     SMB_ACL_PERMSET_T permset)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_CLEAR_PERMS(handle, conn, permset);
+       result = SMB_VFS_NEXT_SYS_ACL_CLEAR_PERMS(handle, permset);
 
        do_log(SMB_VFS_OP_SYS_ACL_CLEAR_PERMS, (result >= 0), handle,
               "");
@@ -1564,13 +1816,13 @@ static int smb_full_audit_sys_acl_clear_perms(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_add_perm(vfs_handle_struct *handle,
-                                 connection_struct *conn,
+
                                  SMB_ACL_PERMSET_T permset,
                                  SMB_ACL_PERM_T perm)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_ADD_PERM(handle, conn, permset, perm);
+       result = SMB_VFS_NEXT_SYS_ACL_ADD_PERM(handle, permset, perm);
 
        do_log(SMB_VFS_OP_SYS_ACL_ADD_PERM, (result >= 0), handle,
               "");
@@ -1579,12 +1831,12 @@ static int smb_full_audit_sys_acl_add_perm(vfs_handle_struct *handle,
 }
 
 static char * smb_full_audit_sys_acl_to_text(vfs_handle_struct *handle,
-                                   connection_struct *conn, SMB_ACL_T theacl,
+                                   SMB_ACL_T theacl,
                                    ssize_t *plen)
 {
        char * result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_TO_TEXT(handle, conn, theacl, plen);
+       result = SMB_VFS_NEXT_SYS_ACL_TO_TEXT(handle, theacl, plen);
 
        do_log(SMB_VFS_OP_SYS_ACL_TO_TEXT, (result != NULL), handle,
               "");
@@ -1593,12 +1845,12 @@ static char * smb_full_audit_sys_acl_to_text(vfs_handle_struct *handle,
 }
 
 static SMB_ACL_T smb_full_audit_sys_acl_init(vfs_handle_struct *handle,
-                                   connection_struct *conn,
+
                                    int count)
 {
        SMB_ACL_T result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_INIT(handle, conn, count);
+       result = SMB_VFS_NEXT_SYS_ACL_INIT(handle, count);
 
        do_log(SMB_VFS_OP_SYS_ACL_INIT, (result != NULL), handle,
               "");
@@ -1607,12 +1859,12 @@ static SMB_ACL_T smb_full_audit_sys_acl_init(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_create_entry(vfs_handle_struct *handle,
-                                     connection_struct *conn, SMB_ACL_T *pacl,
+                                     SMB_ACL_T *pacl,
                                      SMB_ACL_ENTRY_T *pentry)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_CREATE_ENTRY(handle, conn, pacl, pentry);
+       result = SMB_VFS_NEXT_SYS_ACL_CREATE_ENTRY(handle, pacl, pentry);
 
        do_log(SMB_VFS_OP_SYS_ACL_CREATE_ENTRY, (result >= 0), handle,
               "");
@@ -1621,13 +1873,13 @@ static int smb_full_audit_sys_acl_create_entry(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_set_tag_type(vfs_handle_struct *handle,
-                                     connection_struct *conn,
+
                                      SMB_ACL_ENTRY_T entry,
                                      SMB_ACL_TAG_T tagtype)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_SET_TAG_TYPE(handle, conn, entry,
+       result = SMB_VFS_NEXT_SYS_ACL_SET_TAG_TYPE(handle, entry,
                                                   tagtype);
 
        do_log(SMB_VFS_OP_SYS_ACL_SET_TAG_TYPE, (result >= 0), handle,
@@ -1637,13 +1889,13 @@ static int smb_full_audit_sys_acl_set_tag_type(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_set_qualifier(vfs_handle_struct *handle,
-                                      connection_struct *conn,
+
                                       SMB_ACL_ENTRY_T entry,
                                       void *qual)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_SET_QUALIFIER(handle, conn, entry, qual);
+       result = SMB_VFS_NEXT_SYS_ACL_SET_QUALIFIER(handle, entry, qual);
 
        do_log(SMB_VFS_OP_SYS_ACL_SET_QUALIFIER, (result >= 0), handle,
               "");
@@ -1652,13 +1904,13 @@ static int smb_full_audit_sys_acl_set_qualifier(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_set_permset(vfs_handle_struct *handle,
-                                    connection_struct *conn,
+
                                     SMB_ACL_ENTRY_T entry,
                                     SMB_ACL_PERMSET_T permset)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_SET_PERMSET(handle, conn, entry, permset);
+       result = SMB_VFS_NEXT_SYS_ACL_SET_PERMSET(handle, entry, permset);
 
        do_log(SMB_VFS_OP_SYS_ACL_SET_PERMSET, (result >= 0), handle,
               "");
@@ -1667,12 +1919,12 @@ static int smb_full_audit_sys_acl_set_permset(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_valid(vfs_handle_struct *handle,
-                              connection_struct *conn,
+
                               SMB_ACL_T theacl )
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_VALID(handle, conn, theacl);
+       result = SMB_VFS_NEXT_SYS_ACL_VALID(handle, theacl);
 
        do_log(SMB_VFS_OP_SYS_ACL_VALID, (result >= 0), handle,
               "");
@@ -1681,13 +1933,13 @@ static int smb_full_audit_sys_acl_valid(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_set_file(vfs_handle_struct *handle,
-                                 connection_struct *conn,
+
                                  const char *name, SMB_ACL_TYPE_T acltype,
                                  SMB_ACL_T theacl)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, conn, name, acltype,
+       result = SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, name, acltype,
                                               theacl);
 
        do_log(SMB_VFS_OP_SYS_ACL_SET_FILE, (result >= 0), handle,
@@ -1697,11 +1949,11 @@ static int smb_full_audit_sys_acl_set_file(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
-                               int fd, SMB_ACL_T theacl)
+                               SMB_ACL_T theacl)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_SET_FD(handle, fsp, fd, theacl);
+       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);
@@ -1710,12 +1962,12 @@ 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,
-                                        connection_struct *conn,
+
                                         const char *path)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, conn, path);
+       result = SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, path);
 
        do_log(SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE, (result >= 0), handle,
               "%s", path);
@@ -1724,13 +1976,13 @@ static int smb_full_audit_sys_acl_delete_def_file(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_get_perm(vfs_handle_struct *handle,
-                                 connection_struct *conn,
+
                                  SMB_ACL_PERMSET_T permset,
                                  SMB_ACL_PERM_T perm)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_PERM(handle, conn, permset, perm);
+       result = SMB_VFS_NEXT_SYS_ACL_GET_PERM(handle, permset, perm);
 
        do_log(SMB_VFS_OP_SYS_ACL_GET_PERM, (result >= 0), handle,
               "");
@@ -1739,12 +1991,12 @@ static int smb_full_audit_sys_acl_get_perm(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_free_text(vfs_handle_struct *handle,
-                                  connection_struct *conn,
+
                                   char *text)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_FREE_TEXT(handle, conn, text);
+       result = SMB_VFS_NEXT_SYS_ACL_FREE_TEXT(handle, text);
 
        do_log(SMB_VFS_OP_SYS_ACL_FREE_TEXT, (result >= 0), handle,
               "");
@@ -1753,12 +2005,12 @@ static int smb_full_audit_sys_acl_free_text(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_free_acl(vfs_handle_struct *handle,
-                                 connection_struct *conn,
+
                                  SMB_ACL_T posix_acl)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_FREE_ACL(handle, conn, posix_acl);
+       result = SMB_VFS_NEXT_SYS_ACL_FREE_ACL(handle, posix_acl);
 
        do_log(SMB_VFS_OP_SYS_ACL_FREE_ACL, (result >= 0), handle,
               "");
@@ -1767,13 +2019,12 @@ static int smb_full_audit_sys_acl_free_acl(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_sys_acl_free_qualifier(vfs_handle_struct *handle,
-                                       connection_struct *conn,
                                        void *qualifier,
                                        SMB_ACL_TAG_T tagtype)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SYS_ACL_FREE_QUALIFIER(handle, conn, qualifier,
+       result = SMB_VFS_NEXT_SYS_ACL_FREE_QUALIFIER(handle, qualifier,
                                                     tagtype);
 
        do_log(SMB_VFS_OP_SYS_ACL_FREE_QUALIFIER, (result >= 0), handle,
@@ -1783,12 +2034,12 @@ static int smb_full_audit_sys_acl_free_qualifier(vfs_handle_struct *handle,
 }
 
 static ssize_t smb_full_audit_getxattr(struct vfs_handle_struct *handle,
-                             struct connection_struct *conn, const char *path,
+                             const char *path,
                              const char *name, void *value, size_t size)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_GETXATTR(handle, conn, path, name, value, size);
+       result = SMB_VFS_NEXT_GETXATTR(handle, path, name, value, size);
 
        do_log(SMB_VFS_OP_GETXATTR, (result >= 0), handle,
               "%s|%s", path, name);
@@ -1797,13 +2048,12 @@ static ssize_t smb_full_audit_getxattr(struct vfs_handle_struct *handle,
 }
 
 static ssize_t smb_full_audit_lgetxattr(struct vfs_handle_struct *handle,
-                              struct connection_struct *conn,
                               const char *path, const char *name,
                               void *value, size_t size)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_LGETXATTR(handle, conn, path, name, value, size);
+       result = SMB_VFS_NEXT_LGETXATTR(handle, path, name, value, size);
 
        do_log(SMB_VFS_OP_LGETXATTR, (result >= 0), handle,
               "%s|%s", path, name);
@@ -1812,12 +2062,12 @@ static ssize_t smb_full_audit_lgetxattr(struct vfs_handle_struct *handle,
 }
 
 static ssize_t smb_full_audit_fgetxattr(struct vfs_handle_struct *handle,
-                              struct files_struct *fsp, int fd,
+                              struct files_struct *fsp,
                               const char *name, void *value, size_t size)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_FGETXATTR(handle, fsp, fd, name, value, size);
+       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);
@@ -1826,12 +2076,11 @@ static ssize_t smb_full_audit_fgetxattr(struct vfs_handle_struct *handle,
 }
 
 static ssize_t smb_full_audit_listxattr(struct vfs_handle_struct *handle,
-                              struct connection_struct *conn,
                               const char *path, char *list, size_t size)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_LISTXATTR(handle, conn, path, list, size);
+       result = SMB_VFS_NEXT_LISTXATTR(handle, path, list, size);
 
        do_log(SMB_VFS_OP_LISTXATTR, (result >= 0), handle, "%s", path);
 
@@ -1839,12 +2088,11 @@ static ssize_t smb_full_audit_listxattr(struct vfs_handle_struct *handle,
 }
 
 static ssize_t smb_full_audit_llistxattr(struct vfs_handle_struct *handle,
-                               struct connection_struct *conn,
                                const char *path, char *list, size_t size)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_LLISTXATTR(handle, conn, path, list, size);
+       result = SMB_VFS_NEXT_LLISTXATTR(handle, path, list, size);
 
        do_log(SMB_VFS_OP_LLISTXATTR, (result >= 0), handle, "%s", path);
 
@@ -1852,12 +2100,12 @@ static ssize_t smb_full_audit_llistxattr(struct vfs_handle_struct *handle,
 }
 
 static ssize_t smb_full_audit_flistxattr(struct vfs_handle_struct *handle,
-                               struct files_struct *fsp, int fd, char *list,
+                               struct files_struct *fsp, char *list,
                                size_t size)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_FLISTXATTR(handle, fsp, fd, list, size);
+       result = SMB_VFS_NEXT_FLISTXATTR(handle, fsp, list, size);
 
        do_log(SMB_VFS_OP_FLISTXATTR, (result >= 0), handle,
               "%s", fsp->fsp_name);
@@ -1866,12 +2114,12 @@ static ssize_t smb_full_audit_flistxattr(struct vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_removexattr(struct vfs_handle_struct *handle,
-                            struct connection_struct *conn, const char *path,
+                            const char *path,
                             const char *name)
 {
        int result;
 
-       result = SMB_VFS_NEXT_REMOVEXATTR(handle, conn, path, name);
+       result = SMB_VFS_NEXT_REMOVEXATTR(handle, path, name);
 
        do_log(SMB_VFS_OP_REMOVEXATTR, (result >= 0), handle,
               "%s|%s", path, name);
@@ -1880,12 +2128,12 @@ static int smb_full_audit_removexattr(struct vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_lremovexattr(struct vfs_handle_struct *handle,
-                             struct connection_struct *conn, const char *path,
+                             const char *path,
                              const char *name)
 {
        int result;
 
-       result = SMB_VFS_NEXT_LREMOVEXATTR(handle, conn, path, name);
+       result = SMB_VFS_NEXT_LREMOVEXATTR(handle, path, name);
 
        do_log(SMB_VFS_OP_LREMOVEXATTR, (result >= 0), handle,
               "%s|%s", path, name);
@@ -1894,12 +2142,12 @@ static int smb_full_audit_lremovexattr(struct vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_fremovexattr(struct vfs_handle_struct *handle,
-                             struct files_struct *fsp, int fd,
+                             struct files_struct *fsp,
                              const char *name)
 {
        int result;
 
-       result = SMB_VFS_NEXT_FREMOVEXATTR(handle, fsp, fd, name);
+       result = SMB_VFS_NEXT_FREMOVEXATTR(handle, fsp, name);
 
        do_log(SMB_VFS_OP_FREMOVEXATTR, (result >= 0), handle,
               "%s|%s", fsp->fsp_name, name);
@@ -1908,13 +2156,13 @@ static int smb_full_audit_fremovexattr(struct vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_setxattr(struct vfs_handle_struct *handle,
-                         struct connection_struct *conn, const char *path,
+                         const char *path,
                          const char *name, const void *value, size_t size,
                          int flags)
 {
        int result;
 
-       result = SMB_VFS_NEXT_SETXATTR(handle, conn, path, name, value, size,
+       result = SMB_VFS_NEXT_SETXATTR(handle, path, name, value, size,
                                       flags);
 
        do_log(SMB_VFS_OP_SETXATTR, (result >= 0), handle,
@@ -1924,13 +2172,13 @@ static int smb_full_audit_setxattr(struct vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_lsetxattr(struct vfs_handle_struct *handle,
-                          struct connection_struct *conn, const char *path,
+                          const char *path,
                           const char *name, const void *value, size_t size,
                           int flags)
 {
        int result;
 
-       result = SMB_VFS_NEXT_LSETXATTR(handle, conn, path, name, value, size,
+       result = SMB_VFS_NEXT_LSETXATTR(handle, path, name, value, size,
                                        flags);
 
        do_log(SMB_VFS_OP_LSETXATTR, (result >= 0), handle,
@@ -1940,13 +2188,12 @@ static int smb_full_audit_lsetxattr(struct vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_fsetxattr(struct vfs_handle_struct *handle,
-                          struct files_struct *fsp, int fd, const char *name,
+                          struct files_struct *fsp, const char *name,
                           const void *value, size_t size, int flags)
 {
        int result;
 
-       result = SMB_VFS_NEXT_FSETXATTR(handle, fsp, fd, name, value, size,
-                                       flags);
+       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);
@@ -1987,11 +2234,11 @@ static ssize_t smb_full_audit_aio_return(struct vfs_handle_struct *handle, struc
        return result;
 }
 
-static int smb_full_audit_aio_cancel(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, SMB_STRUCT_AIOCB *aiocb)
+static int smb_full_audit_aio_cancel(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
 {
        int result;
 
-       result = SMB_VFS_NEXT_AIO_CANCEL(handle, fsp, fd, aiocb);
+       result = SMB_VFS_NEXT_AIO_CANCEL(handle, fsp, aiocb);
        do_log(SMB_VFS_OP_AIO_CANCEL, (result >= 0), handle,
                "%s", fsp->fsp_name);
 
@@ -2032,6 +2279,7 @@ static int smb_full_audit_aio_suspend(struct vfs_handle_struct *handle, struct f
 }
 
 
+NTSTATUS vfs_full_audit_init(void);
 NTSTATUS vfs_full_audit_init(void)
 {
        NTSTATUS ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION,