r404: Revert the change 378 to vfs_extd_audit.c, the parseable auditing

Implement vfs_full_audit.c that can log every vfs.h operation. So if you
change vfs.h, from now on you also have to change full_audit :-)

Volker

2 files changed, 1853 insertions, 198 deletions

diff --git a/source/modules/vfs_extd_audit.c b/source/modules/vfs_extd_audit.c
index 0cc60f4afd1..06cddc78e43 100644
--- a/source/modules/vfs_extd_audit.c
+++ b/source/modules/vfs_extd_audit.c
@@ -25,8 +25,6 @@
 
 #include "includes.h"
 
-extern struct current_user current_user;
-
 static int vfs_extd_audit_debug_level = DBGC_VFS;
 
 #undef DBGC_CLASS
@@ -108,17 +106,10 @@ static int audit_connect(vfs_handle_struct *handle, connection_struct *conn, con
 
 	openlog("smbd_audit", LOG_PID, audit_syslog_facility(handle));
 
-	if (lp_parm_bool(SNUM(handle->conn), "extd_audit", "parseable",
-			 False)) {
-		syslog(audit_syslog_priority(handle),
-		       "%d|%s|connect|%s\n", current_user.uid,
-		       handle->conn->client_address, svc);
-	} else {
-		syslog(audit_syslog_priority(handle),
-		       "connect to service %s by user %s\n",  svc, user);
-		DEBUG(10, ("Connected to service %s as user %s\n",
-			   svc, user));
-	}
+	syslog(audit_syslog_priority(handle), "connect to service %s by user %s\n", 
+	       svc, user);
+	DEBUG(10, ("Connected to service %s as user %s\n",
+	       svc, user));
 
 	result = SMB_VFS_NEXT_CONNECT(handle, conn, svc, user);
 
@@ -127,17 +118,8 @@ static int audit_connect(vfs_handle_struct *handle, connection_struct *conn, con
 
 static void audit_disconnect(vfs_handle_struct *handle, connection_struct *conn)
 {
-	if (lp_parm_bool(SNUM(handle->conn), "extd_audit", "parseable",
-			 False)) {
-		syslog(audit_syslog_priority(handle),
-		       "%d|%s|disconnect|%s\n", current_user.uid,
-		       handle->conn->client_address,
-		       lp_servicename(SNUM(conn)));
-	} else {
-		syslog(audit_syslog_priority(handle), "disconnected\n");
-		DEBUG(10, ("Disconnected from VFS module extd_audit\n"));
-	}
-
+	syslog(audit_syslog_priority(handle), "disconnected\n");
+	DEBUG(10, ("Disconnected from VFS module extd_audit\n"));
 	SMB_VFS_NEXT_DISCONNECT(handle, conn);
 
 	return;
@@ -149,21 +131,14 @@ static DIR *audit_opendir(vfs_handle_struct *handle, connection_struct *conn, co
 
 	result = SMB_VFS_NEXT_OPENDIR(handle, conn, fname);
 
-	if (lp_parm_bool(SNUM(handle->conn), "extd_audit", "parseable",
-			 False)) {
-		syslog(audit_syslog_priority(handle),
-		       "%d|%s|opendir|%s\n", current_user.uid,
-		       handle->conn->client_address, fname);
-	} else {
-		syslog(audit_syslog_priority(handle), "opendir %s %s%s\n",
-		       fname,
-		       (result == NULL) ? "failed: " : "",
-		       (result == NULL) ? strerror(errno) : "");
-		DEBUG(1, ("vfs_extd_audit: opendir %s %s %s\n",
-			  fname,
-			  (result == NULL) ? "failed: " : "",
-			  (result == NULL) ? strerror(errno) : ""));
-	}
+	syslog(audit_syslog_priority(handle), "opendir %s %s%s\n",
+	       fname,
+	       (result == NULL) ? "failed: " : "",
+	       (result == NULL) ? strerror(errno) : "");
+	DEBUG(1, ("vfs_extd_audit: opendir %s %s %s\n",
+	       fname,
+	       (result == NULL) ? "failed: " : "",
+	       (result == NULL) ? strerror(errno) : ""));
 
 	return result;
 }
@@ -174,21 +149,14 @@ static int audit_mkdir(vfs_handle_struct *handle, connection_struct *conn, const
 	
 	result = SMB_VFS_NEXT_MKDIR(handle, conn, path, mode);
 	
-	if (lp_parm_bool(SNUM(handle->conn), "extd_audit", "parseable",
-			 False)) {
-		syslog(audit_syslog_priority(handle),
-		       "%d|%s|mkdir|%s\n", current_user.uid,
-		       handle->conn->client_address, path);
-	} else {
-		syslog(audit_syslog_priority(handle), "mkdir %s %s%s\n", 
-		       path,
-		       (result < 0) ? "failed: " : "",
-		       (result < 0) ? strerror(errno) : "");
-		DEBUG(0, ("vfs_extd_audit: mkdir %s %s %s\n",
-			  path,
-			  (result < 0) ? "failed: " : "",
-			  (result < 0) ? strerror(errno) : ""));
-	}
+	syslog(audit_syslog_priority(handle), "mkdir %s %s%s\n", 
+	       path,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : "");
+	DEBUG(0, ("vfs_extd_audit: mkdir %s %s %s\n",
+	       path,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : ""));
 
 	return result;
 }
@@ -199,21 +167,14 @@ static int audit_rmdir(vfs_handle_struct *handle, connection_struct *conn, const
 	
 	result = SMB_VFS_NEXT_RMDIR(handle, conn, path);
 
-	if (lp_parm_bool(SNUM(handle->conn), "extd_audit", "parseable",
-			 False)) {
-		syslog(audit_syslog_priority(handle),
-		       "%d|%s|rmdir|%s\n", current_user.uid,
-		       handle->conn->client_address, path);
-	} else {
-		syslog(audit_syslog_priority(handle), "rmdir %s %s%s\n", 
-		       path, 
-		       (result < 0) ? "failed: " : "",
-		       (result < 0) ? strerror(errno) : "");
-		DEBUG(0, ("vfs_extd_audit: rmdir %s %s %s\n",
-			  path,
-			  (result < 0) ? "failed: " : "",
-			  (result < 0) ? strerror(errno) : ""));
-	}
+	syslog(audit_syslog_priority(handle), "rmdir %s %s%s\n", 
+	       path, 
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : "");
+	DEBUG(0, ("vfs_extd_audit: rmdir %s %s %s\n",
+               path,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : ""));
 
 	return result;
 }
@@ -224,26 +185,15 @@ static int audit_open(vfs_handle_struct *handle, connection_struct *conn, const
 	
 	result = SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode);
 
-	if (lp_parm_bool(SNUM(handle->conn), "extd_audit", "parseable",
-			 False)) {
-		syslog(audit_syslog_priority(handle),
-		       "%d|%s|open|%s|%s\n", current_user.uid,
-		       handle->conn->client_address,
-		       ((flags & O_WRONLY) || (flags & O_RDWR))?"w":"r",
-		       fname);
-	} else {
-		syslog(audit_syslog_priority(handle),
-		       "open %s (fd %d) %s%s%s\n", 
-		       fname, result,
-		       ((flags & O_WRONLY) || (flags & O_RDWR))
-		       ? "for writing " : "", 
-		       (result < 0) ? "failed: " : "",
-		       (result < 0) ? strerror(errno) : "");
-		DEBUG(2, ("vfs_extd_audit: open %s %s %s\n",
-			  fname,
-			  (result < 0) ? "failed: " : "",
-			  (result < 0) ? strerror(errno) : ""));
-	}
+	syslog(audit_syslog_priority(handle), "open %s (fd %d) %s%s%s\n", 
+	       fname, result,
+	       ((flags & O_WRONLY) || (flags & O_RDWR)) ? "for writing " : "", 
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : "");
+	DEBUG(2, ("vfs_extd_audit: open %s %s %s\n",
+	       fname,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : ""));
 
 	return result;
 }
@@ -254,21 +204,14 @@ static int audit_close(vfs_handle_struct *handle, files_struct *fsp, int fd)
 	
 	result = SMB_VFS_NEXT_CLOSE(handle, fsp, fd);
 
-	if (lp_parm_bool(SNUM(handle->conn), "extd_audit", "parseable",
-			 False)) {
-		syslog(audit_syslog_priority(handle),
-		       "%d|%s|close|%s\n", current_user.uid,
-		       handle->conn->client_address, fsp->fsp_name);
-	} else {
-		syslog(audit_syslog_priority(handle), "close fd %d %s%s\n",
-		       fd,
-		       (result < 0) ? "failed: " : "",
-		       (result < 0) ? strerror(errno) : "");
-		DEBUG(2, ("vfs_extd_audit: close fd %d %s %s\n",
-			  fd,
-			  (result < 0) ? "failed: " : "",
-			  (result < 0) ? strerror(errno) : ""));
-	}
+	syslog(audit_syslog_priority(handle), "close fd %d %s%s\n",
+	       fd,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : "");
+	DEBUG(2, ("vfs_extd_audit: close fd %d %s %s\n",
+	       fd,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : ""));
 
 	return result;
 }
@@ -279,21 +222,14 @@ static int audit_rename(vfs_handle_struct *handle, connection_struct *conn, cons
 	
 	result = SMB_VFS_NEXT_RENAME(handle, conn, old, new);
 
-	if (lp_parm_bool(SNUM(handle->conn), "extd_audit", "parseable",
-			 False)) {
-		syslog(audit_syslog_priority(handle),
-		       "%d|%s|rename|%s|%s\n", current_user.uid,
-		       handle->conn->client_address, old, new);
-	} else {
-		syslog(audit_syslog_priority(handle), "rename %s -> %s %s%s\n",
-		       old, new,
-		       (result < 0) ? "failed: " : "",
-		       (result < 0) ? strerror(errno) : "");
-		DEBUG(1, ("vfs_extd_audit: rename old: %s new: %s  %s %s\n",
-			  old, new,
-			  (result < 0) ? "failed: " : "",
-			  (result < 0) ? strerror(errno) : ""));
-	}
+	syslog(audit_syslog_priority(handle), "rename %s -> %s %s%s\n",
+	       old, new,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : "");
+	DEBUG(1, ("vfs_extd_audit: rename old: %s new: %s  %s %s\n",
+	       old, new,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : ""));
 
 	return result;    
 }
@@ -304,21 +240,14 @@ static int audit_unlink(vfs_handle_struct *handle, connection_struct *conn, cons
 	
 	result = SMB_VFS_NEXT_UNLINK(handle, conn, path);
 
-	if (lp_parm_bool(SNUM(handle->conn), "extd_audit", "parseable",
-			 False)) {
-		syslog(audit_syslog_priority(handle),
-		       "%d|%s|unlink|%s\n", current_user.uid,
-		       handle->conn->client_address, path);
-	} else {
-		syslog(audit_syslog_priority(handle), "unlink %s %s%s\n",
-		       path,
-		       (result < 0) ? "failed: " : "",
-		       (result < 0) ? strerror(errno) : "");
-		DEBUG(0, ("vfs_extd_audit: unlink %s %s %s\n",
-			  path,
-			  (result < 0) ? "failed: " : "",
-			  (result < 0) ? strerror(errno) : ""));
-	}
+	syslog(audit_syslog_priority(handle), "unlink %s %s%s\n",
+	       path,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : "");
+	DEBUG(0, ("vfs_extd_audit: unlink %s %s %s\n",
+	       path,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : ""));
 
 	return result;
 }
@@ -329,22 +258,14 @@ static int audit_chmod(vfs_handle_struct *handle, connection_struct *conn, const
 
 	result = SMB_VFS_NEXT_CHMOD(handle, conn, path, mode);
 
-	if (lp_parm_bool(SNUM(handle->conn), "extd_audit", "parseable",
-			 False)) {
-		syslog(audit_syslog_priority(handle),
-		       "%d|%s|chmod|%s|%o\n", current_user.uid,
-		       handle->conn->client_address, path, mode);
-	} else {
-		syslog(audit_syslog_priority(handle),
-		       "chmod %s mode 0x%x %s%s\n",
-		       path, mode,
-		       (result < 0) ? "failed: " : "",
-		       (result < 0) ? strerror(errno) : "");
-		DEBUG(1, ("vfs_extd_audit: chmod %s mode 0x%x %s %s\n",
-			  path, mode,
-			  (result < 0) ? "failed: " : "",
-			  (result < 0) ? strerror(errno) : ""));
-	}
+	syslog(audit_syslog_priority(handle), "chmod %s mode 0x%x %s%s\n",
+	       path, mode,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : "");
+	DEBUG(1, ("vfs_extd_audit: chmod %s mode 0x%x %s %s\n",
+	       path, mode,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : ""));
 
 	return result;
 }
@@ -355,22 +276,14 @@ static int audit_chmod_acl(vfs_handle_struct *handle, connection_struct *conn, c
 	
 	result = SMB_VFS_NEXT_CHMOD_ACL(handle, conn, path, mode);
 
-	if (lp_parm_bool(SNUM(handle->conn), "extd_audit", "parseable",
-			 False)) {
-		syslog(audit_syslog_priority(handle),
-		       "%d|%s|chmod_acl|%s|%o\n", current_user.uid,
-		       handle->conn->client_address, path, mode);
-	} else {
-		syslog(audit_syslog_priority(handle),
-		       "chmod_acl %s mode 0x%x %s%s\n",
-		       path, mode,
-		       (result < 0) ? "failed: " : "",
-		       (result < 0) ? strerror(errno) : "");
-		DEBUG(1, ("vfs_extd_audit: chmod_acl %s mode 0x%x %s %s\n",
-			  path, mode,
-			  (result < 0) ? "failed: " : "",
-			  (result < 0) ? strerror(errno) : ""));
-	}
+	syslog(audit_syslog_priority(handle), "chmod_acl %s mode 0x%x %s%s\n",
+	       path, mode,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : "");
+	DEBUG(1, ("vfs_extd_audit: chmod_acl %s mode 0x%x %s %s\n",
+	        path, mode,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : ""));
 
 	return result;
 }
@@ -381,22 +294,14 @@ static int audit_fchmod(vfs_handle_struct *handle, files_struct *fsp, int fd, mo
 	
 	result = SMB_VFS_NEXT_FCHMOD(handle, fsp, fd, mode);
 
-	if (lp_parm_bool(SNUM(handle->conn), "extd_audit", "parseable",
-			 False)) {
-		syslog(audit_syslog_priority(handle),
-		       "%d|%s|fchmod|%s|%o\n", current_user.uid,
-		       handle->conn->client_address, fsp->fsp_name, mode);
-	} else {
-		syslog(audit_syslog_priority(handle),
-		       "fchmod %s mode 0x%x %s%s\n",
-		       fsp->fsp_name, mode,
-		       (result < 0) ? "failed: " : "",
-		       (result < 0) ? strerror(errno) : "");
-		DEBUG(1, ("vfs_extd_audit: fchmod %s mode 0x%x %s %s",
-			  fsp->fsp_name,  mode,
-			  (result < 0) ? "failed: " : "",
-			  (result < 0) ? strerror(errno) : ""));
-	}
+	syslog(audit_syslog_priority(handle), "fchmod %s mode 0x%x %s%s\n",
+	       fsp->fsp_name, mode,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : "");
+	DEBUG(1, ("vfs_extd_audit: fchmod %s mode 0x%x %s %s",
+	       fsp->fsp_name,  mode,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : ""));
 
 	return result;
 }
@@ -407,22 +312,14 @@ static int audit_fchmod_acl(vfs_handle_struct *handle, files_struct *fsp, int fd
 	
 	result = SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, fd, mode);
 
-	if (lp_parm_bool(SNUM(handle->conn), "extd_audit", "parseable",
-			 False)) {
-		syslog(audit_syslog_priority(handle),
-		       "%d|%s|fchmod_acl|%s|%o\n", current_user.uid,
-		       handle->conn->client_address, fsp->fsp_name, mode);
-	} else {
-		syslog(audit_syslog_priority(handle),
-		       "fchmod_acl %s mode 0x%x %s%s\n",
-		       fsp->fsp_name, mode,
-		       (result < 0) ? "failed: " : "",
-		       (result < 0) ? strerror(errno) : "");
-		DEBUG(1, ("vfs_extd_audit: fchmod_acl %s mode 0x%x %s %s",
-			  fsp->fsp_name,  mode,
-			  (result < 0) ? "failed: " : "",
-			  (result < 0) ? strerror(errno) : ""));
-	}
+	syslog(audit_syslog_priority(handle), "fchmod_acl %s mode 0x%x %s%s\n",
+	       fsp->fsp_name, mode,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : "");
+	DEBUG(1, ("vfs_extd_audit: fchmod_acl %s mode 0x%x %s %s",
+	       fsp->fsp_name,  mode,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : ""));
 
 	return result;
 }
diff --git a/source/modules/vfs_full_audit.c b/source/modules/vfs_full_audit.c
new file mode 100644
index 00000000000..2371c406364
--- /dev/null
+++ b/source/modules/vfs_full_audit.c
@@ -0,0 +1,1758 @@
+/* 
+ * Auditing VFS module for samba.  Log selected file operations to syslog
+ * facility.
+ *
+ * Copyright (C) Tim Potter, 1999-2000
+ * Copyright (C) Alexander Bokovoy, 2002
+ * Copyright (C) John H Terpstra, 2003
+ * Copyright (C) Stefan (metze) Metzmacher, 2003
+ * Copyright (C) Volker Lendecke, 2004
+ *
+ * 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
+ * (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ */
+
+
+#include "includes.h"
+
+extern struct current_user current_user;
+
+static int vfs_full_audit_debug_level = DBGC_VFS;
+
+#undef DBGC_CLASS
+#define DBGC_CLASS vfs_full_audit_debug_level
+
+/* Function prototypes */
+
+static int audit_connect(vfs_handle_struct *handle, connection_struct *conn,
+			 const char *svc, const char *user);
+static void audit_disconnect(vfs_handle_struct *handle,
+			     connection_struct *conn);
+static SMB_BIG_UINT 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 int 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 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 DIR *audit_opendir(vfs_handle_struct *handle, connection_struct *conn,
+			  const char *fname);
+static struct dirent *audit_readdir(vfs_handle_struct *handle,
+				    connection_struct *conn, DIR *dirp);
+static int audit_mkdir(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *path, mode_t mode);
+static int audit_rmdir(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *path);
+static int audit_closedir(vfs_handle_struct *handle, connection_struct *conn,
+			  DIR *dirp);
+static int audit_open(vfs_handle_struct *handle, connection_struct *conn,
+		      const char *fname, int flags, mode_t mode);
+static int audit_close(vfs_handle_struct *handle, files_struct *fsp, int fd);
+static ssize_t audit_read(vfs_handle_struct *handle, files_struct *fsp,
+			  int fd, void *data, size_t n);
+static ssize_t audit_pread(vfs_handle_struct *handle, files_struct *fsp,
+			   int fd, void *data, size_t n, SMB_OFF_T offset);
+static ssize_t audit_write(vfs_handle_struct *handle, files_struct *fsp,
+			   int fd, const void *data, size_t n);
+static ssize_t audit_pwrite(vfs_handle_struct *handle, files_struct *fsp,
+			    int fd, const void *data, size_t n,
+			    SMB_OFF_T offset);
+static SMB_OFF_T audit_lseek(vfs_handle_struct *handle, files_struct *fsp,
+			     int filedes, SMB_OFF_T offset, int whence);
+static ssize_t audit_sendfile(vfs_handle_struct *handle, int tofd,
+			      files_struct *fsp, int fromfd,
+			      const DATA_BLOB *hdr, SMB_OFF_T offset,
+			      size_t n);
+static int audit_rename(vfs_handle_struct *handle, connection_struct *conn,
+			const char *old, const char *new);
+static int audit_fsync(vfs_handle_struct *handle, files_struct *fsp, int fd);
+static int audit_stat(vfs_handle_struct *handle, connection_struct *conn,
+		      const char *fname, SMB_STRUCT_STAT *sbuf);
+static int audit_fstat(vfs_handle_struct *handle, files_struct *fsp, int fd,
+		       SMB_STRUCT_STAT *sbuf);
+static int audit_lstat(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *path, SMB_STRUCT_STAT *sbuf);
+static int audit_unlink(vfs_handle_struct *handle, connection_struct *conn,
+			const char *path);
+static int audit_chmod(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *path, mode_t mode);
+static int audit_fchmod(vfs_handle_struct *handle, files_struct *fsp, int fd,
+			mode_t mode);
+static int audit_chown(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *path, uid_t uid, gid_t gid);
+static int audit_fchown(vfs_handle_struct *handle, files_struct *fsp, int fd,
+			uid_t uid, gid_t gid);
+static int audit_chdir(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *path);
+static char *audit_getwd(vfs_handle_struct *handle, connection_struct *conn,
+			 char *path);
+static int audit_utime(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *path, struct utimbuf *times);
+static int audit_ftruncate(vfs_handle_struct *handle, files_struct *fsp,
+			   int fd, SMB_OFF_T len);
+static BOOL audit_lock(vfs_handle_struct *handle, files_struct *fsp, int fd,
+		       int op, SMB_OFF_T offset, SMB_OFF_T count, int type);
+static int audit_symlink(vfs_handle_struct *handle, connection_struct *conn,
+			 const char *oldpath, const char *newpath);
+static int audit_readlink(vfs_handle_struct *handle, connection_struct *conn,
+			  const char *path, char *buf, size_t bufsiz);
+static int audit_link(vfs_handle_struct *handle, connection_struct *conn,
+		      const char *oldpath, const char *newpath);
+static int audit_mknod(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *pathname, mode_t mode, SMB_DEV_T dev);
+static char *audit_realpath(vfs_handle_struct *handle, connection_struct *conn,
+			    const char *path, char *resolved_path);
+static size_t audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+				int fd, uint32 security_info,
+				SEC_DESC **ppdesc);
+static size_t audit_get_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+			       const char *name, uint32 security_info,
+			       SEC_DESC **ppdesc);
+static BOOL audit_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+			      int fd, uint32 security_info_sent,
+			      SEC_DESC *psd);
+static BOOL audit_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+			     const char *name, uint32 security_info_sent,
+			     SEC_DESC *psd);
+static int audit_chmod_acl(vfs_handle_struct *handle, connection_struct *conn,
+			   const char *path, mode_t mode);
+static int audit_fchmod_acl(vfs_handle_struct *handle, files_struct *fsp,
+			    int fd, mode_t mode);
+static int 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 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 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 * audit_sys_acl_get_qualifier(vfs_handle_struct *handle,
+					  connection_struct *conn,
+					  SMB_ACL_ENTRY_T entry_d);
+static SMB_ACL_T 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 audit_sys_acl_get_fd(vfs_handle_struct *handle,
+				      files_struct *fsp,
+				      int fd);
+static int audit_sys_acl_clear_perms(vfs_handle_struct *handle,
+				     connection_struct *conn,
+				     SMB_ACL_PERMSET_T permset);
+static int audit_sys_acl_add_perm(vfs_handle_struct *handle,
+				  connection_struct *conn,
+				  SMB_ACL_PERMSET_T permset,
+				  SMB_ACL_PERM_T perm);
+static char * audit_sys_acl_to_text(vfs_handle_struct *handle,
+				    connection_struct *conn, SMB_ACL_T theacl,
+				    ssize_t *plen);
+static SMB_ACL_T audit_sys_acl_init(vfs_handle_struct *handle,
+				    connection_struct *conn,
+				    int count);
+static int audit_sys_acl_create_entry(vfs_handle_struct *handle,
+				      connection_struct *conn, SMB_ACL_T *pacl,
+				      SMB_ACL_ENTRY_T *pentry);
+static int 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 audit_sys_acl_set_qualifier(vfs_handle_struct *handle,
+				       connection_struct *conn,
+				       SMB_ACL_ENTRY_T entry,
+				       void *qual);
+static int audit_sys_acl_set_permset(vfs_handle_struct *handle,
+				     connection_struct *conn,
+				     SMB_ACL_ENTRY_T entry,
+				     SMB_ACL_PERMSET_T permset);
+static int audit_sys_acl_valid(vfs_handle_struct *handle,
+			       connection_struct *conn,
+			       SMB_ACL_T theacl );
+static int 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 audit_sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
+				int fd, SMB_ACL_T theacl);
+static int audit_sys_acl_delete_def_file(vfs_handle_struct *handle,
+					 connection_struct *conn,
+					 const char *path);
+static int audit_sys_acl_get_perm(vfs_handle_struct *handle,
+				  connection_struct *conn,
+				  SMB_ACL_PERMSET_T permset,
+				  SMB_ACL_PERM_T perm);
+static int audit_sys_acl_free_text(vfs_handle_struct *handle,
+				   connection_struct *conn,
+				   char *text);
+static int audit_sys_acl_free_acl(vfs_handle_struct *handle,
+				  connection_struct *conn,
+				  SMB_ACL_T posix_acl);
+static int audit_sys_acl_free_qualifier(vfs_handle_struct *handle,
+					connection_struct *conn,
+					void *qualifier,
+					SMB_ACL_TAG_T tagtype);
+static ssize_t audit_getxattr(struct vfs_handle_struct *handle,
+			      struct connection_struct *conn, const char *path,
+			      const char *name, void *value, size_t size);
+static ssize_t 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 audit_fgetxattr(struct vfs_handle_struct *handle,
+			       struct files_struct *fsp, int fd,
+			       const char *name, void *value, size_t size);
+static ssize_t audit_listxattr(struct vfs_handle_struct *handle,
+			       struct connection_struct *conn,
+			       const char *path, char *list, size_t size);
+static ssize_t audit_llistxattr(struct vfs_handle_struct *handle,
+				struct connection_struct *conn,
+				const char *path, char *list, size_t size);
+static ssize_t audit_flistxattr(struct vfs_handle_struct *handle,
+				struct files_struct *fsp, int fd, char *list,
+				size_t size);
+static int audit_removexattr(struct vfs_handle_struct *handle,
+			     struct connection_struct *conn, const char *path,
+			     const char *name);
+static int audit_lremovexattr(struct vfs_handle_struct *handle,
+			      struct connection_struct *conn, const char *path,
+			      const char *name);
+static int audit_fremovexattr(struct vfs_handle_struct *handle,
+			      struct files_struct *fsp, int fd,
+			      const char *name);
+static int audit_setxattr(struct vfs_handle_struct *handle,
+			  struct connection_struct *conn, const char *path,
+			  const char *name, const void *value, size_t size,
+			  int flags);
+static int audit_lsetxattr(struct vfs_handle_struct *handle,
+			   struct connection_struct *conn, const char *path,
+			   const char *name, const void *value, size_t size,
+			   int flags);
+static int audit_fsetxattr(struct vfs_handle_struct *handle,
+			   struct files_struct *fsp, int fd, const char *name,
+			   const void *value, size_t size, int flags);
+
+/* VFS operations */
+
+static vfs_op_tuple audit_op_tuples[] = {
+    
+	/* Disk operations */
+
+	{SMB_VFS_OP(audit_connect),	SMB_VFS_OP_CONNECT,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_disconnect),	SMB_VFS_OP_DISCONNECT,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_disk_free),	SMB_VFS_OP_DISK_FREE,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_get_quota),	SMB_VFS_OP_GET_QUOTA,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_set_quota),	SMB_VFS_OP_SET_QUOTA,
+	 SMB_VFS_LAYER_LOGGER},
+
+	/* Directory operations */
+
+	{SMB_VFS_OP(audit_opendir),	SMB_VFS_OP_OPENDIR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_readdir),	SMB_VFS_OP_READDIR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_mkdir),	SMB_VFS_OP_MKDIR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_rmdir),	SMB_VFS_OP_RMDIR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_closedir),	SMB_VFS_OP_CLOSEDIR,
+	 SMB_VFS_LAYER_LOGGER},
+
+	/* File operations */
+
+	{SMB_VFS_OP(audit_open),	SMB_VFS_OP_OPEN,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_close),	SMB_VFS_OP_CLOSE,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_read),	SMB_VFS_OP_READ,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_pread),	SMB_VFS_OP_PREAD,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_write),	SMB_VFS_OP_WRITE,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_pwrite),	SMB_VFS_OP_PWRITE,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_lseek),	SMB_VFS_OP_LSEEK,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sendfile),	SMB_VFS_OP_SENDFILE,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_rename),	SMB_VFS_OP_RENAME,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_fsync),	SMB_VFS_OP_FSYNC,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_stat),	SMB_VFS_OP_STAT,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_fstat),	SMB_VFS_OP_FSTAT,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_lstat),	SMB_VFS_OP_LSTAT,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_unlink),	SMB_VFS_OP_UNLINK,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_chmod),	SMB_VFS_OP_CHMOD,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_fchmod),	SMB_VFS_OP_FCHMOD,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_chown),	SMB_VFS_OP_CHOWN,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_fchown),	SMB_VFS_OP_FCHOWN,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_chdir),	SMB_VFS_OP_CHDIR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_getwd),	SMB_VFS_OP_GETWD,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_utime),	SMB_VFS_OP_UTIME,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_ftruncate),	SMB_VFS_OP_FTRUNCATE,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_lock),	SMB_VFS_OP_LOCK,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_symlink),	SMB_VFS_OP_SYMLINK,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_readlink),	SMB_VFS_OP_READLINK,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_link),	SMB_VFS_OP_LINK,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_mknod),	SMB_VFS_OP_MKNOD,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_realpath),	SMB_VFS_OP_REALPATH,
+	 SMB_VFS_LAYER_LOGGER},
+
+	/* NT ACL operations. */
+
+	{SMB_VFS_OP(audit_fget_nt_acl),	SMB_VFS_OP_FGET_NT_ACL,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_get_nt_acl),	SMB_VFS_OP_GET_NT_ACL,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_fset_nt_acl),	SMB_VFS_OP_FSET_NT_ACL,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_set_nt_acl),	SMB_VFS_OP_SET_NT_ACL,
+	 SMB_VFS_LAYER_LOGGER},
+
+	/* POSIX ACL operations. */
+
+	{SMB_VFS_OP(audit_chmod_acl),	SMB_VFS_OP_CHMOD,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_fchmod_acl),	SMB_VFS_OP_FCHMOD,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_get_entry),	SMB_VFS_OP_SYS_ACL_GET_ENTRY,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_get_tag_type),	SMB_VFS_OP_SYS_ACL_GET_TAG_TYPE,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_get_permset),	SMB_VFS_OP_SYS_ACL_GET_PERMSET,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_get_qualifier),	SMB_VFS_OP_SYS_ACL_GET_QUALIFIER,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_get_file),	SMB_VFS_OP_SYS_ACL_GET_FILE,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_get_fd),	SMB_VFS_OP_SYS_ACL_GET_FD,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_clear_perms),	SMB_VFS_OP_SYS_ACL_CLEAR_PERMS,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_add_perm),	SMB_VFS_OP_SYS_ACL_ADD_PERM,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_to_text),	SMB_VFS_OP_SYS_ACL_TO_TEXT,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_init),	SMB_VFS_OP_SYS_ACL_INIT,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_create_entry),	SMB_VFS_OP_SYS_ACL_CREATE_ENTRY,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_set_tag_type),	SMB_VFS_OP_SYS_ACL_SET_TAG_TYPE,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_set_qualifier),	SMB_VFS_OP_SYS_ACL_SET_QUALIFIER,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_set_permset),	SMB_VFS_OP_SYS_ACL_SET_PERMSET,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_valid),	SMB_VFS_OP_SYS_ACL_VALID,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_set_file),	SMB_VFS_OP_SYS_ACL_SET_FILE,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_set_fd),	SMB_VFS_OP_SYS_ACL_SET_FD,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_delete_def_file),	SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_get_perm),	SMB_VFS_OP_SYS_ACL_GET_PERM,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_free_text),	SMB_VFS_OP_SYS_ACL_FREE_TEXT,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_free_acl),	SMB_VFS_OP_SYS_ACL_FREE_ACL,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_sys_acl_free_qualifier),	SMB_VFS_OP_SYS_ACL_FREE_QUALIFIER,
+	 SMB_VFS_LAYER_LOGGER},
+	
+	/* EA operations. */
+
+	{SMB_VFS_OP(audit_getxattr),	SMB_VFS_OP_GETXATTR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_lgetxattr),	SMB_VFS_OP_LGETXATTR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_fgetxattr),	SMB_VFS_OP_FGETXATTR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_listxattr),	SMB_VFS_OP_LISTXATTR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_llistxattr),	SMB_VFS_OP_LLISTXATTR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_flistxattr),	SMB_VFS_OP_FLISTXATTR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_removexattr),	SMB_VFS_OP_REMOVEXATTR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_lremovexattr),	SMB_VFS_OP_LREMOVEXATTR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_fremovexattr),	SMB_VFS_OP_FREMOVEXATTR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_setxattr),	SMB_VFS_OP_SETXATTR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_lsetxattr),	SMB_VFS_OP_LSETXATTR,
+	 SMB_VFS_LAYER_LOGGER},
+	{SMB_VFS_OP(audit_fsetxattr),	SMB_VFS_OP_FSETXATTR,
+	 SMB_VFS_LAYER_LOGGER},
+	
+	/* Finish VFS operations definition */
+	
+	{SMB_VFS_OP(NULL),		SMB_VFS_OP_NOOP,
+	 SMB_VFS_LAYER_NOOP}
+};
+
+/* The following array *must* be in the same order as defined in vfs.h */
+
+static struct {
+	vfs_op_type type;
+	const char *name;
+} vfs_op_names[] = {
+	{ SMB_VFS_OP_CONNECT,	"connect" },
+	{ SMB_VFS_OP_DISCONNECT,	"disconnect" },
+	{ SMB_VFS_OP_DISK_FREE,	"disk_free" },
+	{ SMB_VFS_OP_GET_QUOTA,	"get_quota" },
+	{ SMB_VFS_OP_SET_QUOTA,	"set_quota" },
+	{ SMB_VFS_OP_GET_SHADOW_COPY_DATA,	"get_shadow_copy_data" },
+	{ SMB_VFS_OP_OPENDIR,	"opendir" },
+	{ SMB_VFS_OP_READDIR,	"readdir" },
+	{ SMB_VFS_OP_MKDIR,	"mkdir" },
+	{ SMB_VFS_OP_RMDIR,	"rmdir" },
+	{ SMB_VFS_OP_CLOSEDIR,	"closedir" },
+	{ SMB_VFS_OP_OPEN,	"open" },
+	{ SMB_VFS_OP_CLOSE,	"close" },
+	{ SMB_VFS_OP_READ,	"read" },
+	{ SMB_VFS_OP_PREAD,	"pread" },
+	{ SMB_VFS_OP_WRITE,	"write" },
+	{ SMB_VFS_OP_PWRITE,	"pwrite" },
+	{ SMB_VFS_OP_LSEEK,	"lseek" },
+	{ SMB_VFS_OP_SENDFILE,	"sendfile" },
+	{ SMB_VFS_OP_RENAME,	"rename" },
+	{ SMB_VFS_OP_FSYNC,	"fsync" },
+	{ SMB_VFS_OP_STAT,	"stat" },
+	{ SMB_VFS_OP_FSTAT,	"fstat" },
+	{ SMB_VFS_OP_LSTAT,	"lstat" },
+	{ SMB_VFS_OP_UNLINK,	"unlink" },
+	{ SMB_VFS_OP_CHMOD,	"chmod" },
+	{ SMB_VFS_OP_FCHMOD,	"fchmod" },
+	{ SMB_VFS_OP_CHOWN,	"chown" },
+	{ SMB_VFS_OP_FCHOWN,	"fchown" },
+	{ SMB_VFS_OP_CHDIR,	"chdir" },
+	{ SMB_VFS_OP_GETWD,	"getwd" },
+	{ SMB_VFS_OP_UTIME,	"utime" },
+	{ SMB_VFS_OP_FTRUNCATE,	"ftruncate" },
+	{ SMB_VFS_OP_LOCK,	"lock" },
+	{ 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_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" },
+	{ SMB_VFS_OP_SYS_ACL_GET_TAG_TYPE,	"sys_acl_get_tag_type" },
+	{ SMB_VFS_OP_SYS_ACL_GET_PERMSET,	"sys_acl_get_permset" },
+	{ SMB_VFS_OP_SYS_ACL_GET_QUALIFIER,	"sys_acl_get_qualifier" },
+	{ SMB_VFS_OP_SYS_ACL_GET_FILE,	"sys_acl_get_file" },
+	{ SMB_VFS_OP_SYS_ACL_GET_FD,	"sys_acl_get_fd" },
+	{ SMB_VFS_OP_SYS_ACL_CLEAR_PERMS,	"sys_acl_clear_perms" },
+	{ SMB_VFS_OP_SYS_ACL_ADD_PERM,	"sys_acl_add_perm" },
+	{ SMB_VFS_OP_SYS_ACL_TO_TEXT,	"sys_acl_to_text" },
+	{ SMB_VFS_OP_SYS_ACL_INIT,	"sys_acl_init" },
+	{ SMB_VFS_OP_SYS_ACL_CREATE_ENTRY,	"sys_acl_create_entry" },
+	{ SMB_VFS_OP_SYS_ACL_SET_TAG_TYPE,	"sys_acl_set_tag_type" },
+	{ SMB_VFS_OP_SYS_ACL_SET_QUALIFIER,	"sys_acl_set_qualifier" },
+	{ SMB_VFS_OP_SYS_ACL_SET_PERMSET,	"sys_acl_set_permset" },
+	{ SMB_VFS_OP_SYS_ACL_VALID,	"sys_acl_valid" },
+	{ SMB_VFS_OP_SYS_ACL_SET_FILE,	"sys_acl_set_file" },
+	{ SMB_VFS_OP_SYS_ACL_SET_FD,	"sys_acl_set_fd" },
+	{ SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE,	"sys_acl_delete_def_file" },
+	{ SMB_VFS_OP_SYS_ACL_GET_PERM,	"sys_acl_get_perm" },
+	{ SMB_VFS_OP_SYS_ACL_FREE_TEXT,	"sys_acl_free_text" },
+	{ SMB_VFS_OP_SYS_ACL_FREE_ACL,	"sys_acl_free_acl" },
+	{ SMB_VFS_OP_SYS_ACL_FREE_QUALIFIER,	"sys_acl_free_qualifier" },
+	{ SMB_VFS_OP_GETXATTR,	"getxattr" },
+	{ SMB_VFS_OP_LGETXATTR,	"lgetxattr" },
+	{ SMB_VFS_OP_FGETXATTR,	"fgetxattr" },
+	{ SMB_VFS_OP_LISTXATTR,	"listxattr" },
+	{ SMB_VFS_OP_LLISTXATTR,	"llistxattr" },
+	{ SMB_VFS_OP_FLISTXATTR,	"flistxattr" },
+	{ SMB_VFS_OP_REMOVEXATTR,	"removexattr" },
+	{ SMB_VFS_OP_LREMOVEXATTR,	"lremovexattr" },
+	{ SMB_VFS_OP_FREMOVEXATTR,	"fremovexattr" },
+	{ SMB_VFS_OP_SETXATTR,	"setxattr" },
+	{ SMB_VFS_OP_LSETXATTR,	"lsetxattr" },
+	{ SMB_VFS_OP_FSETXATTR,	"fsetxattr" },
+	{ SMB_VFS_OP_LAST, NULL }
+};	
+
+static int audit_syslog_facility(vfs_handle_struct *handle)
+{
+	/* fix me: let this be configurable by:
+	 *	lp_param_enum(SNUM(handle->conn),
+	 *	              (handle->param?handle->param:"full_audit"),
+	 *                    "syslog facility",
+	 *	              audit_enum_facility,LOG_USER);
+	 */
+	return LOG_USER;
+}
+
+static int audit_syslog_priority(vfs_handle_struct *handle)
+{
+	/* fix me: let this be configurable by:
+	 *	lp_param_enum(SNUM(handle->conn),
+	 *                    (handle->param?handle->param:"full_audit"),
+	 *                    "syslog priority",
+	 *		      audit_enum_priority,LOG_NOTICE); 
+	 */
+	return LOG_NOTICE;
+}
+
+static char *audit_prefix(connection_struct *conn)
+{
+	static pstring prefix;
+
+	pstrcpy(prefix, lp_parm_const_string(SNUM(conn), "full_audit",
+					     "prefix", "%u|%I"));
+	standard_sub_snum(SNUM(conn), prefix, sizeof(prefix)-1);
+	return prefix;
+}
+
+static struct bitmap *success_ops = NULL;
+
+static BOOL log_success(vfs_op_type op)
+{
+	if (success_ops == NULL)
+		return True;
+
+	return bitmap_query(success_ops, op);
+}
+
+static struct bitmap *failure_ops = NULL;
+
+static BOOL log_failure(vfs_op_type op)
+{
+	if (failure_ops == NULL)
+		return True;
+
+	return bitmap_query(failure_ops, op);
+}
+
+static void init_bitmap(struct bitmap **bm, const char **ops)
+{
+	BOOL log_all = False;
+
+	if (*bm != NULL)
+		return;
+
+	*bm = bitmap_allocate(SMB_VFS_OP_LAST);
+
+	if (*bm == NULL) {
+		DEBUG(0, ("Could not alloc bitmap -- "
+			  "defaulting to logging everything\n"));
+		return;
+	}
+
+	while (*ops != NULL) {
+		int i;
+		BOOL found = False;
+
+		if (strequal(*ops, "all")) {
+			log_all = True;
+			break;
+		}
+
+		for (i=0; i<SMB_VFS_OP_LAST; i++) {
+			if (strequal(*ops, vfs_op_names[i].name)) {
+				bitmap_set(*bm, i);
+				found = True;
+			}
+		}
+		if (!found) {
+			DEBUG(0, ("Could not find opname %s, logging all\n",
+				  *ops));
+			log_all = True;
+			break;
+		}
+		ops += 1;
+	}
+
+	if (log_all) {
+		/* The query functions default to True */
+		bitmap_free(*bm);
+		*bm = NULL;
+	}
+}
+
+static const char *audit_opname(vfs_op_type op)
+{
+	if (op >= SMB_VFS_OP_LAST)
+		return "INVALID VFS OP";
+	return vfs_op_names[op].name;
+}
+
+static void do_log(vfs_op_type op, BOOL success, vfs_handle_struct *handle,
+		   const char *format, ...)
+{
+	fstring err_msg;
+	pstring op_msg;
+	va_list ap;
+
+	if (success && (!log_success(op)))
+		return;
+
+	if (!success && (!log_failure(op)))
+		return;
+
+	if (success)
+		fstrcpy(err_msg, "ok");
+	else
+		fstr_sprintf(err_msg, "fail (%s)", strerror(errno));
+
+	va_start(ap, format);
+	vsnprintf(op_msg, sizeof(op_msg), format, ap);
+	va_end(ap);
+
+	syslog(audit_syslog_priority(handle), "%s|%s|%s|%s\n",
+	       audit_prefix(handle->conn), audit_opname(op), err_msg, op_msg);
+
+	return;
+}
+
+/* Implementation of vfs_ops.  Pass everything on to the default
+   operation but log event first. */
+
+static int audit_connect(vfs_handle_struct *handle, connection_struct *conn,
+			 const char *svc, const char *user)
+{
+	int result;
+	const char *none[] = { NULL };
+	const char *all [] = { "all" };
+
+	openlog("smbd_audit", 0, audit_syslog_facility(handle));
+
+	init_bitmap(&success_ops,
+		    lp_parm_string_list(SNUM(conn), "full_audit", "success",
+					none));
+	init_bitmap(&failure_ops,
+		    lp_parm_string_list(SNUM(conn), "full_audit", "failure",
+					all));
+
+	result = SMB_VFS_NEXT_CONNECT(handle, conn, svc, user);
+
+	do_log(SMB_VFS_OP_CONNECT, True, handle,
+	       "%s", svc);
+
+	return result;
+}
+
+static void audit_disconnect(vfs_handle_struct *handle,
+			     connection_struct *conn)
+{
+	SMB_VFS_NEXT_DISCONNECT(handle, conn);
+
+	do_log(SMB_VFS_OP_DISCONNECT, True, handle,
+	       "%s", lp_servicename(SNUM(conn)));
+
+	bitmap_free(success_ops);
+	success_ops = NULL;
+
+	bitmap_free(failure_ops);
+	failure_ops = NULL;
+
+	return;
+}
+
+static SMB_BIG_UINT 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)
+{
+	SMB_BIG_UINT result;
+
+	result = SMB_VFS_NEXT_DISK_FREE(handle, conn, path, small_query, bsize,
+					dfree, dsize);
+
+	/* Don't have a reasonable notion of failure here */
+
+	do_log(SMB_VFS_OP_DISK_FREE, True, handle, "%s", path);
+
+	return result;
+}
+
+static int 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);
+
+	do_log(SMB_VFS_OP_GET_QUOTA, (result >= 0), handle, "");
+
+	return result;
+}
+
+	
+static int 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);
+
+	do_log(SMB_VFS_OP_SET_QUOTA, (result >= 0), handle, "");
+
+	return result;
+}
+
+static DIR *audit_opendir(vfs_handle_struct *handle, connection_struct *conn,
+			  const char *fname)
+{
+	DIR *result;
+
+	result = SMB_VFS_NEXT_OPENDIR(handle, conn, fname);
+
+	do_log(SMB_VFS_OP_OPENDIR, (result != NULL), handle, "%s", fname);
+
+	return result;
+}
+
+static struct dirent *audit_readdir(vfs_handle_struct *handle,
+				    connection_struct *conn, DIR *dirp)
+{
+	struct dirent *result;
+
+	result = SMB_VFS_NEXT_READDIR(handle, conn, dirp);
+
+	/* This operation has no reasonable error condition
+	 * (End of dir is also failure), so always succeed.
+	 */
+	do_log(SMB_VFS_OP_READDIR, True, handle, "");
+
+	return result;
+}
+
+static int audit_mkdir(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *path, mode_t mode)
+{
+	int result;
+	
+	result = SMB_VFS_NEXT_MKDIR(handle, conn, path, mode);
+	
+	do_log(SMB_VFS_OP_MKDIR, (result >= 0), handle, "%s", path);
+
+	return result;
+}
+
+static int audit_rmdir(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *path)
+{
+	int result;
+	
+	result = SMB_VFS_NEXT_RMDIR(handle, conn, path);
+
+	do_log(SMB_VFS_OP_RMDIR, (result >= 0), handle, "%s", path);
+
+	return result;
+}
+
+static int audit_closedir(vfs_handle_struct *handle, connection_struct *conn,
+			  DIR *dirp)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_CLOSEDIR(handle, conn, dirp);
+	
+	do_log(SMB_VFS_OP_CLOSEDIR, (result >= 0), handle, "");
+
+	return result;
+}
+
+static int audit_open(vfs_handle_struct *handle, connection_struct *conn,
+		      const char *fname, int flags, mode_t mode)
+{
+	int result;
+	
+	result = SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode);
+
+	do_log(SMB_VFS_OP_OPEN, (result >= 0), handle, "%s|%s",
+	       ((flags & O_WRONLY) || (flags & O_RDWR))?"w":"r",
+	       fname);
+
+	return result;
+}
+
+static int audit_close(vfs_handle_struct *handle, files_struct *fsp, int fd)
+{
+	int result;
+	
+	result = SMB_VFS_NEXT_CLOSE(handle, fsp, fd);
+
+	do_log(SMB_VFS_OP_CLOSE, (result >= 0), handle, "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static ssize_t audit_read(vfs_handle_struct *handle, files_struct *fsp,
+			  int fd, void *data, size_t n)
+{
+	ssize_t result;
+
+	result = SMB_VFS_NEXT_READ(handle, fsp, fd, data, n);
+
+	do_log(SMB_VFS_OP_READ, (result >= 0), handle, "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static ssize_t audit_pread(vfs_handle_struct *handle, files_struct *fsp,
+			   int fd, void *data, size_t n, SMB_OFF_T offset)
+{
+	ssize_t result;
+
+	result = SMB_VFS_NEXT_PREAD(handle, fsp, fd, data, n, offset);
+
+	do_log(SMB_VFS_OP_PREAD, (result >= 0), handle, "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static ssize_t audit_write(vfs_handle_struct *handle, files_struct *fsp,
+			   int fd, const void *data, size_t n)
+{
+	ssize_t result;
+
+	result = SMB_VFS_NEXT_WRITE(handle, fsp, fd, data, n);
+
+	do_log(SMB_VFS_OP_WRITE, (result >= 0), handle, "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static ssize_t audit_pwrite(vfs_handle_struct *handle, files_struct *fsp,
+			    int fd, const void *data, size_t n,
+			    SMB_OFF_T offset)
+{
+	ssize_t result;
+
+	result = SMB_VFS_NEXT_PWRITE(handle, fsp, fd, data, n, offset);
+
+	do_log(SMB_VFS_OP_PWRITE, (result >= 0), handle, "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static SMB_OFF_T audit_lseek(vfs_handle_struct *handle, files_struct *fsp,
+			     int filedes, SMB_OFF_T offset, int whence)
+{
+	ssize_t result;
+
+	result = SMB_VFS_NEXT_LSEEK(handle, fsp, filedes, offset, whence);
+
+	do_log(SMB_VFS_OP_LSEEK, (result != (ssize_t)-1), handle,
+	       "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static ssize_t audit_sendfile(vfs_handle_struct *handle, int tofd,
+			      files_struct *fsp, int fromfd,
+			      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);
+
+	do_log(SMB_VFS_OP_SENDFILE, (result >= 0), handle,
+	       "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static int audit_rename(vfs_handle_struct *handle, connection_struct *conn,
+			const char *old, const char *new)
+{
+	int result;
+	
+	result = SMB_VFS_NEXT_RENAME(handle, conn, old, new);
+
+	do_log(SMB_VFS_OP_RENAME, (result >= 0), handle, "%s|%s", old, new);
+
+	return result;    
+}
+
+static int audit_fsync(vfs_handle_struct *handle, files_struct *fsp, int fd)
+{
+	int result;
+	
+	result = SMB_VFS_NEXT_FSYNC(handle, fsp, fd);
+
+	do_log(SMB_VFS_OP_FSYNC, (result >= 0), handle, "%s", fsp->fsp_name);
+
+	return result;    
+}
+
+static int audit_stat(vfs_handle_struct *handle, connection_struct *conn,
+		      const char *fname, SMB_STRUCT_STAT *sbuf)
+{
+	int result;
+	
+	result = SMB_VFS_NEXT_STAT(handle, conn, fname, sbuf);
+
+	do_log(SMB_VFS_OP_STAT, (result >= 0), handle, "%s", fname);
+
+	return result;    
+}
+
+static int audit_fstat(vfs_handle_struct *handle, files_struct *fsp, int fd,
+		       SMB_STRUCT_STAT *sbuf)
+{
+	int result;
+	
+	result = SMB_VFS_NEXT_FSTAT(handle, fsp, fd, sbuf);
+
+	do_log(SMB_VFS_OP_FSTAT, (result >= 0), handle, "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static int audit_lstat(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *path, SMB_STRUCT_STAT *sbuf)
+{
+	int result;
+	
+	result = SMB_VFS_NEXT_LSTAT(handle, conn, path, sbuf);
+
+	do_log(SMB_VFS_OP_LSTAT, (result >= 0), handle, "%s", path);
+
+	return result;    
+}
+
+static int audit_unlink(vfs_handle_struct *handle, connection_struct *conn,
+			const char *path)
+{
+	int result;
+	
+	result = SMB_VFS_NEXT_UNLINK(handle, conn, path);
+
+	do_log(SMB_VFS_OP_UNLINK, (result >= 0), handle, "%s", path);
+
+	return result;
+}
+
+static int audit_chmod(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *path, mode_t mode)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_CHMOD(handle, conn, path, mode);
+
+	do_log(SMB_VFS_OP_CHMOD, (result >= 0), handle, "%s|%o", path, mode);
+
+	return result;
+}
+
+static int audit_fchmod(vfs_handle_struct *handle, files_struct *fsp, int fd,
+			mode_t mode)
+{
+	int result;
+	
+	result = SMB_VFS_NEXT_FCHMOD(handle, fsp, fd, mode);
+
+	do_log(SMB_VFS_OP_FCHMOD, (result >= 0), handle,
+	       "%s|%o", fsp->fsp_name, mode);
+
+	return result;
+}
+
+static int audit_chown(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *path, uid_t uid, gid_t gid)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_CHOWN(handle, conn, path, uid, gid);
+
+	do_log(SMB_VFS_OP_CHOWN, (result >= 0), handle, "%s|%ld|%ld",
+	       path, (long int)uid, (long int)gid);
+
+	return result;
+}
+
+static int audit_fchown(vfs_handle_struct *handle, files_struct *fsp, int fd,
+			uid_t uid, gid_t gid)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_FCHOWN(handle, fsp, fd, uid, gid);
+
+	do_log(SMB_VFS_OP_FCHOWN, (result >= 0), handle, "%s|%ld|%ld",
+	       fsp->fsp_name, (long int)uid, (long int)gid);
+
+	return result;
+}
+
+static int audit_chdir(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *path)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_CHDIR(handle, conn, path);
+
+	do_log(SMB_VFS_OP_CHDIR, (result >= 0), handle, "chdir|%s", path);
+
+	return result;
+}
+
+static char *audit_getwd(vfs_handle_struct *handle, connection_struct *conn,
+			 char *path)
+{
+	char *result;
+
+	result = SMB_VFS_NEXT_GETWD(handle, conn, path);
+	
+	do_log(SMB_VFS_OP_GETWD, (result != NULL), handle, "%s", path);
+
+	return result;
+}
+
+static int audit_utime(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *path, struct utimbuf *times)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_UTIME(handle, conn, path, times);
+
+	do_log(SMB_VFS_OP_UTIME, (result >= 0), handle, "%s", path);
+
+	return result;
+}
+
+static int audit_ftruncate(vfs_handle_struct *handle, files_struct *fsp,
+			   int fd, SMB_OFF_T len)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_FTRUNCATE(handle, fsp, fd, len);
+
+	do_log(SMB_VFS_OP_FTRUNCATE, (result >= 0), handle,
+	       "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static BOOL audit_lock(vfs_handle_struct *handle, files_struct *fsp, int fd,
+		       int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
+{
+	BOOL result;
+
+	result = SMB_VFS_NEXT_LOCK(handle, fsp, fd, op, offset, count, type);
+
+	do_log(SMB_VFS_OP_LOCK, (result >= 0), handle, "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static int audit_symlink(vfs_handle_struct *handle, connection_struct *conn,
+			 const char *oldpath, const char *newpath)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_SYMLINK(handle, conn, oldpath, newpath);
+
+	do_log(SMB_VFS_OP_SYMLINK, (result >= 0), handle,
+	       "%s|%s", oldpath, newpath);
+
+	return result;
+}
+
+static int audit_readlink(vfs_handle_struct *handle, connection_struct *conn,
+			  const char *path, char *buf, size_t bufsiz)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_READLINK(handle, conn, path, buf, bufsiz);
+
+	do_log(SMB_VFS_OP_READLINK, (result >= 0), handle, "%s", path);
+
+	return result;
+}
+
+static int audit_link(vfs_handle_struct *handle, connection_struct *conn,
+		      const char *oldpath, const char *newpath)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_LINK(handle, conn, oldpath, newpath);
+
+	do_log(SMB_VFS_OP_LINK, (result >= 0), handle,
+	       "%s|%s", oldpath, newpath);
+
+	return result;
+}
+
+static int audit_mknod(vfs_handle_struct *handle, connection_struct *conn,
+		       const char *pathname, mode_t mode, SMB_DEV_T dev)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_MKNOD(handle, conn, pathname, mode, dev);
+
+	do_log(SMB_VFS_OP_MKNOD, (result >= 0), handle, "%s", pathname);
+
+	return result;
+}
+
+static char *audit_realpath(vfs_handle_struct *handle, connection_struct *conn,
+			    const char *path, char *resolved_path)
+{
+	char *result;
+
+	result = SMB_VFS_NEXT_REALPATH(handle, conn, path, resolved_path);
+
+	do_log(SMB_VFS_OP_REALPATH, (result != NULL), handle, "%s", path);
+
+	return result;
+}
+
+static size_t audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+				int fd, uint32 security_info,
+				SEC_DESC **ppdesc)
+{
+	size_t result;
+
+	result = SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, fd, security_info,
+					  ppdesc);
+
+	do_log(SMB_VFS_OP_FGET_NT_ACL, (result > 0), handle,
+	       "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static size_t audit_get_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+			       const char *name, uint32 security_info,
+			       SEC_DESC **ppdesc)
+{
+	size_t result;
+
+	result = SMB_VFS_NEXT_GET_NT_ACL(handle, fsp, name, security_info,
+					 ppdesc);
+
+	do_log(SMB_VFS_OP_GET_NT_ACL, (result > 0), handle,
+	       "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static BOOL audit_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+			      int fd, uint32 security_info_sent,
+			      SEC_DESC *psd)
+{
+	BOOL result;
+
+	result = SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, fd, security_info_sent,
+					  psd);
+
+	do_log(SMB_VFS_OP_FSET_NT_ACL, result, handle, "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static BOOL audit_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+			     const char *name, uint32 security_info_sent,
+			     SEC_DESC *psd)
+{
+	BOOL result;
+
+	result = SMB_VFS_NEXT_SET_NT_ACL(handle, fsp, name, security_info_sent,
+					 psd);
+
+	do_log(SMB_VFS_OP_SET_NT_ACL, result, handle, "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static int audit_chmod_acl(vfs_handle_struct *handle, connection_struct *conn,
+			   const char *path, mode_t mode)
+{
+	int result;
+	
+	result = SMB_VFS_NEXT_CHMOD_ACL(handle, conn, path, mode);
+
+	do_log(SMB_VFS_OP_CHMOD_ACL, (result >= 0), handle,
+	       "%s|%o", path, mode);
+
+	return result;
+}
+
+static int audit_fchmod_acl(vfs_handle_struct *handle, files_struct *fsp,
+			    int fd, mode_t mode)
+{
+	int result;
+	
+	result = SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, fd, mode);
+
+	do_log(SMB_VFS_OP_FCHMOD_ACL, (result >= 0), handle,
+	       "%s|%o", fsp->fsp_name, mode);
+
+	return result;
+}
+
+static int 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,
+						entry_p);
+
+	do_log(SMB_VFS_OP_SYS_ACL_GET_ENTRY, (result >= 0), handle,
+	       "");
+
+	return result;
+}
+
+static int 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,
+						   tag_type_p);
+
+	do_log(SMB_VFS_OP_SYS_ACL_GET_TAG_TYPE, (result >= 0), handle,
+	       "");
+
+	return result;
+}
+
+static int 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,
+						  permset_p);
+
+	do_log(SMB_VFS_OP_SYS_ACL_GET_PERMSET, (result >= 0), handle,
+	       "");
+
+	return result;
+}
+
+static void * 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);
+
+	do_log(SMB_VFS_OP_SYS_ACL_GET_QUALIFIER, (result != NULL), handle,
+	       "");
+
+	return result;
+}
+
+static SMB_ACL_T 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);
+
+	do_log(SMB_VFS_OP_SYS_ACL_GET_FILE, (result != NULL), handle,
+	       "%s", path_p);
+
+	return result;
+}
+
+static SMB_ACL_T audit_sys_acl_get_fd(vfs_handle_struct *handle,
+				      files_struct *fsp, int fd)
+{
+	SMB_ACL_T result;
+
+	result = SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, fd);
+
+	do_log(SMB_VFS_OP_SYS_ACL_GET_FD, (result != NULL), handle,
+	       "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static int 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);
+
+	do_log(SMB_VFS_OP_SYS_ACL_CLEAR_PERMS, (result >= 0), handle,
+	       "");
+
+	return result;
+}
+
+static int 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);
+
+	do_log(SMB_VFS_OP_SYS_ACL_ADD_PERM, (result >= 0), handle,
+	       "");
+
+	return result;
+}
+
+static char * audit_sys_acl_to_text(vfs_handle_struct *handle,
+				    connection_struct *conn, SMB_ACL_T theacl,
+				    ssize_t *plen)
+{
+	char * result;
+
+	result = SMB_VFS_NEXT_SYS_ACL_TO_TEXT(handle, conn, theacl, plen);
+
+	do_log(SMB_VFS_OP_SYS_ACL_TO_TEXT, (result != NULL), handle,
+	       "");
+
+	return result;
+}
+
+static SMB_ACL_T 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);
+
+	do_log(SMB_VFS_OP_SYS_ACL_INIT, (result != NULL), handle,
+	       "");
+
+	return result;
+}
+
+static int audit_sys_acl_create_entry(vfs_handle_struct *handle,
+				      connection_struct *conn, SMB_ACL_T *pacl,
+				      SMB_ACL_ENTRY_T *pentry)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_SYS_ACL_CREATE_ENTRY(handle, conn, pacl, pentry);
+
+	do_log(SMB_VFS_OP_SYS_ACL_CREATE_ENTRY, (result >= 0), handle,
+	       "");
+
+	return result;
+}
+
+static int 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,
+						   tagtype);
+
+	do_log(SMB_VFS_OP_SYS_ACL_SET_TAG_TYPE, (result >= 0), handle,
+	       "");
+
+	return result;
+}
+
+static int 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);
+
+	do_log(SMB_VFS_OP_SYS_ACL_SET_QUALIFIER, (result >= 0), handle,
+	       "");
+
+	return result;
+}
+
+static int 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);
+
+	do_log(SMB_VFS_OP_SYS_ACL_SET_PERMSET, (result >= 0), handle,
+	       "");
+
+	return result;
+}
+
+static int 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);
+
+	do_log(SMB_VFS_OP_SYS_ACL_VALID, (result >= 0), handle,
+	       "");
+
+	return result;
+}
+
+static int 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,
+					       theacl);
+
+	do_log(SMB_VFS_OP_SYS_ACL_SET_FILE, (result >= 0), handle,
+	       "%s", name);
+
+	return result;
+}
+
+static int audit_sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
+				int fd, SMB_ACL_T theacl)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_SYS_ACL_SET_FD(handle, fsp, fd, theacl);
+
+	do_log(SMB_VFS_OP_SYS_ACL_SET_FD, (result >= 0), handle,
+	       "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static int 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);
+
+	do_log(SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE, (result >= 0), handle,
+	       "%s", path);
+
+	return result;
+}
+
+static int 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);
+
+	do_log(SMB_VFS_OP_SYS_ACL_GET_PERM, (result >= 0), handle,
+	       "");
+
+	return result;
+}
+
+static int 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);
+
+	do_log(SMB_VFS_OP_SYS_ACL_FREE_TEXT, (result >= 0), handle,
+	       "");
+
+	return result;
+}
+
+static int 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);
+
+	do_log(SMB_VFS_OP_SYS_ACL_FREE_ACL, (result >= 0), handle,
+	       "");
+
+	return result;
+}
+
+static int 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,
+						     tagtype);
+
+	do_log(SMB_VFS_OP_SYS_ACL_FREE_QUALIFIER, (result >= 0), handle,
+	       "");
+
+	return result;
+}
+
+static ssize_t audit_getxattr(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_GETXATTR(handle, conn, path, name, value, size);
+
+	do_log(SMB_VFS_OP_GETXATTR, (result >= 0), handle,
+	       "%s|%s", path, name);
+
+	return result;
+}
+
+static ssize_t 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);
+
+	do_log(SMB_VFS_OP_LGETXATTR, (result >= 0), handle,
+	       "%s|%s", path, name);
+
+	return result;
+}
+
+static ssize_t audit_fgetxattr(struct vfs_handle_struct *handle,
+			       struct files_struct *fsp, int fd,
+			       const char *name, void *value, size_t size)
+{
+	ssize_t result;
+
+	result = SMB_VFS_NEXT_FGETXATTR(handle, fsp, fd, name, value, size);
+
+	do_log(SMB_VFS_OP_FGETXATTR, (result >= 0), handle,
+	       "%s|%s", fsp->fsp_name, name);
+
+	return result;
+}
+
+static ssize_t 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);
+
+	do_log(SMB_VFS_OP_LISTXATTR, (result >= 0), handle, "%s", path);
+
+	return result;
+}
+
+static ssize_t 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);
+
+	do_log(SMB_VFS_OP_LLISTXATTR, (result >= 0), handle, "%s", path);
+
+	return result;
+}
+
+static ssize_t audit_flistxattr(struct vfs_handle_struct *handle,
+				struct files_struct *fsp, int fd, char *list,
+				size_t size)
+{
+	ssize_t result;
+
+	result = SMB_VFS_NEXT_FLISTXATTR(handle, fsp, fd, list, size);
+
+	do_log(SMB_VFS_OP_FLISTXATTR, (result >= 0), handle,
+	       "%s", fsp->fsp_name);
+
+	return result;
+}
+
+static int audit_removexattr(struct vfs_handle_struct *handle,
+			     struct connection_struct *conn, const char *path,
+			     const char *name)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_REMOVEXATTR(handle, conn, path, name);
+
+	do_log(SMB_VFS_OP_REMOVEXATTR, (result >= 0), handle,
+	       "%s|%s", path, name);
+
+	return result;
+}
+
+static int audit_lremovexattr(struct vfs_handle_struct *handle,
+			      struct connection_struct *conn, const char *path,
+			      const char *name)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_LREMOVEXATTR(handle, conn, path, name);
+
+	do_log(SMB_VFS_OP_LREMOVEXATTR, (result >= 0), handle,
+	       "%s|%s", path, name);
+
+	return result;
+}
+
+static int audit_fremovexattr(struct vfs_handle_struct *handle,
+			      struct files_struct *fsp, int fd,
+			      const char *name)
+{
+	int result;
+
+	result = SMB_VFS_NEXT_FREMOVEXATTR(handle, fsp, fd, name);
+
+	do_log(SMB_VFS_OP_FREMOVEXATTR, (result >= 0), handle,
+	       "%s|%s", fsp->fsp_name, name);
+
+	return result;
+}
+
+static int audit_setxattr(struct vfs_handle_struct *handle,
+			  struct connection_struct *conn, 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,
+				       flags);
+
+	do_log(SMB_VFS_OP_SETXATTR, (result >= 0), handle,
+	       "%s|%s", path, name);
+
+	return result;
+}
+
+static int audit_lsetxattr(struct vfs_handle_struct *handle,
+			   struct connection_struct *conn, 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,
+					flags);
+
+	do_log(SMB_VFS_OP_LSETXATTR, (result >= 0), handle,
+	       "%s|%s", path, name);
+
+	return result;
+}
+
+static int audit_fsetxattr(struct vfs_handle_struct *handle,
+			   struct files_struct *fsp, int fd, 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);
+
+	do_log(SMB_VFS_OP_FSETXATTR, (result >= 0), handle,
+	       "%s|%s", fsp->fsp_name, name);
+
+	return result;
+}
+
+NTSTATUS vfs_full_audit_init(void)
+{
+	NTSTATUS ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
+					"full_audit", audit_op_tuples);
+	
+	if (!NT_STATUS_IS_OK(ret))
+		return ret;
+
+	vfs_full_audit_debug_level = debug_add_class("full_audit");
+	if (vfs_full_audit_debug_level == -1) {
+		vfs_full_audit_debug_level = DBGC_VFS;
+		DEBUG(0, ("vfs_full_audit: Couldn't register custom debugging "
+			  "class!\n"));
+	} else {
+		DEBUG(10, ("vfs_full_audit: Debug class number of "
+			   "'full_audit': %d\n", vfs_full_audit_debug_level));
+	}
+	
+	return ret;
+}
+