--- /home/oliver/tmp/devel/samba/vfs_extd_audit.c	2006-02-16 03:35:38.000000000 -0300
+++ vfs_extd_audit.c	2005-10-17 23:45:00.000000000 -0300
@@ -120,18 +120,6 @@
 	return priority;
 }
 
-/*
- *  Read the configuration parameter extd_audit:use_syslog and return it
- */
-static int audit_syslog_use(vfs_handle_struct *handle)
-{
-	int use_syslog;
-
-	use_syslog = lp_parm_int(SNUM(handle->conn), "extd_audit", "use_syslog", 1);
-
-	return use_syslog;
-}
-
 /* Implementation of vfs_ops.  Pass everything on to the default
    operation but log event first. */
 
@@ -141,10 +129,8 @@
 
 	openlog("smbd_audit", LOG_PID, audit_syslog_facility(handle));
 
-	if(audit_syslog_use(handle)) {
-		syslog(audit_syslog_priority(handle), "connect to service %s by 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));
 
@@ -155,9 +141,7 @@
 
 static void audit_disconnect(vfs_handle_struct *handle, connection_struct *conn)
 {
-	if(audit_syslog_use(handle)) {
-		syslog(audit_syslog_priority(handle), "disconnected\n");
-	}
+	syslog(audit_syslog_priority(handle), "disconnected\n");
 	DEBUG(10, ("Disconnected from VFS module extd_audit\n"));
 	SMB_VFS_NEXT_DISCONNECT(handle, conn);
 
@@ -170,12 +154,10 @@
 
 	result = SMB_VFS_NEXT_OPENDIR(handle, conn, fname, mask, attr);
 
-	if(audit_syslog_use(handle)) {
-		syslog(audit_syslog_priority(handle), "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: " : "",
@@ -190,12 +172,10 @@
 	
 	result = SMB_VFS_NEXT_MKDIR(handle, conn, path, mode);
 	
-	if(audit_syslog_use(handle)) {
-		syslog(audit_syslog_priority(handle), "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: " : "",
@@ -210,12 +190,10 @@
 	
 	result = SMB_VFS_NEXT_RMDIR(handle, conn, path);
 
-	if(audit_syslog_use(handle)) {
-		syslog(audit_syslog_priority(handle), "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: " : "",
@@ -230,13 +208,11 @@
 	
 	result = SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode);
 
-	if(audit_syslog_use(handle)) {
-		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) : "");
-	}
+	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: " : "",
@@ -251,12 +227,10 @@
 	
 	result = SMB_VFS_NEXT_CLOSE(handle, fsp, fd);
 
-	if(audit_syslog_use(handle)) {
-		syslog(audit_syslog_priority(handle), "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: " : "",
@@ -271,12 +245,10 @@
 	
 	result = SMB_VFS_NEXT_RENAME(handle, conn, oldname, newname);
 
-	if(audit_syslog_use(handle)) {
-		syslog(audit_syslog_priority(handle), "rename %s -> %s %s%s\n",
-		       oldname, newname,
-	  	     (result < 0) ? "failed: " : "",
-	    	   (result < 0) ? strerror(errno) : "");
-	}
+	syslog(audit_syslog_priority(handle), "rename %s -> %s %s%s\n",
+	       oldname, newname,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : "");
 	DEBUG(1, ("vfs_extd_audit: rename old: %s newname: %s  %s %s\n",
 	       oldname, newname,
 	       (result < 0) ? "failed: " : "",
@@ -291,12 +263,10 @@
 	
 	result = SMB_VFS_NEXT_UNLINK(handle, conn, path);
 
-	if(audit_syslog_use(handle)) {
-		syslog(audit_syslog_priority(handle), "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: " : "",
@@ -311,12 +281,10 @@
 
 	result = SMB_VFS_NEXT_CHMOD(handle, conn, path, mode);
 
-	if(audit_syslog_use(handle)) {
-		syslog(audit_syslog_priority(handle), "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: " : "",
@@ -331,12 +299,10 @@
 	
 	result = SMB_VFS_NEXT_CHMOD_ACL(handle, conn, path, mode);
 
-	if(audit_syslog_use(handle)) {
-		syslog(audit_syslog_priority(handle), "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: " : "",
@@ -351,12 +317,10 @@
 	
 	result = SMB_VFS_NEXT_FCHMOD(handle, fsp, fd, mode);
 
-	if(audit_syslog_use(handle)) {
-		syslog(audit_syslog_priority(handle), "fchmod %s mode 0x%x %s%s\n",
-		       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: " : "",
@@ -371,12 +335,10 @@
 	
 	result = SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, fd, mode);
 
-	if(audit_syslog_use(handle)) {
-		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) : "");
-	}
+	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: " : "",