From owner-p4-projects@FreeBSD.ORG  Wed Jan 26 01:25:22 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9D59416A4D0; Wed, 26 Jan 2005 01:25:21 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6A57516A4CE
	for <perforce@freebsd.org>; Wed, 26 Jan 2005 01:25:21 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 31CF143D2D
	for <perforce@freebsd.org>; Wed, 26 Jan 2005 01:25:21 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0Q1PLfJ097146
	for <perforce@freebsd.org>; Wed, 26 Jan 2005 01:25:21 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0Q1PK5K097143
	for perforce@freebsd.org; Wed, 26 Jan 2005 01:25:20 GMT
	(envelope-from wsalamon@computer.org)
Date: Wed, 26 Jan 2005 01:25:20 GMT
Message-Id: <200501260125.j0Q1PK5K097143@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wsalamon@computer.org using -f
From: Wayne Salamon <wsalamon@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 69741 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Jan 2005 01:25:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=69741

Change 69741 by wsalamon@rickenbacker on 2005/01/26 01:24:47

	Update for include paths; remove Darwin-specific code.

Affected files ...

.. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/filesystem/tfilesys.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/filesystem/tfilesys.c#2 (text+ko) ====

@@ -25,14 +25,13 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+#include <audittest.h>
 #include <fcntl.h>
+#include <bsm/audit.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/attr.h>
-#include <sys/mount.h>
-#include <sys/audit.h>
-#include <audittest.h>
 
 /*
  * Test the auditing of some of the filesystem-related system calls.
@@ -47,13 +46,10 @@
 	int temp_fd;
 	char tempname[32];
 	struct statfs stat;
-	struct attrlist alist;
 	u_long count;
 	u_long basep;
 	u_long newstate;
 	u_long nmatches;
-	struct fssearchblock searchbl;
-	struct searchstate state;
 	char buf[128];
 
 	AUT_INIT();
@@ -106,30 +102,6 @@
 		exit (-1);
 	}
 
-	bzero((void *)&alist, sizeof(alist));
-	alist.bitmapcount = ATTR_BIT_MAP_COUNT;
-	alist.dirattr = 1;
-	count = 1;
-	/* Generate a success AUE_GETDIRENTRIESATTR audit record */
-	if (getdirentriesattr(temp_fd, &alist, buf, 128, &count, 
-				&basep, &newstate, FSOPT_NOFOLLOW))
-		AUT_PERROR("getdirentriesattr()");
-	aut_assert(AUE_GETDIRENTRIESATTR);
-
-	/* Generate a failure AUE_SEARCHFS audit record, but we'll still
-	 * get the path and vnode attr tokens */
-	searchbl.returnattrs=(struct attrlist *)malloc(sizeof(struct attrlist));
-	searchbl.returnbuffer = (void *)malloc(128);
-	searchbl.returnbuffersize = 128;
-	searchbl.maxmatches = 1;
-	searchbl.searchparams1 = (void *)malloc(16);
-	searchbl.sizeofsearchparams1 = 16;
-	searchbl.searchparams2 = (void *)malloc(16);
-	searchbl.sizeofsearchparams2 = 16;
-	if (searchfs("/", &searchbl, &nmatches, 0, FSOPT_NOFOLLOW, &state))
-		AUT_PERROR("searchfs()");
-	aut_assert(AUE_SEARCHFS);
-
 	aut_shutdown();
 	exit(0);
 }