From owner-p4-projects@FreeBSD.ORG  Wed Aug 17 11:56:06 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9D82316A421; Wed, 17 Aug 2005 11:56:05 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 7763016A41F
	for <perforce@freebsd.org>; Wed, 17 Aug 2005 11:56:05 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 94BBA43D45
	for <perforce@freebsd.org>; Wed, 17 Aug 2005 11:56:04 +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 j7HBu4T5004473
	for <perforce@freebsd.org>; Wed, 17 Aug 2005 11:56:04 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7HBu4V4004470
	for perforce@freebsd.org; Wed, 17 Aug 2005 11:56:04 GMT
	(envelope-from wsalamon@computer.org)
Date: Wed, 17 Aug 2005 11:56:04 GMT
Message-Id: <200508171156.j7HBu4V4004470@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>
Cc: 
Subject: PERFORCE change 82115 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 17 Aug 2005 11:56:06 -0000

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

Change 82115 by wsalamon@gretsch on 2005/08/17 11:55:19

	Update the test program to use STAT events for the n?stat() calls.

Affected files ...

.. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileaccess.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileaccess.c#5 (text+ko) ====

@@ -44,8 +44,10 @@
 
 	int ret;
 	int temp_fd;
+	int ntemp_fd;
 	struct stat tstat;
 	char tempname[32];
+	char ntempname[32];
 	char buf[128];
 	fhandle_t fh;
 
@@ -81,25 +83,32 @@
 		AUT_PERROR("lstat()");
 	aut_assert(AUE_LSTAT);
 
-	/* Generate a AUE_NSTAT audit record */
-	if ((nstat(tempname, &tstat)) < 0)
-		AUT_PERROR("nstat()");
-	aut_assert(AUE_NSTAT);
-
-	/* Generate a AUE_NLSTAT audit record */
-	if ((nlstat(tempname, &tstat)) < 0)
-		AUT_PERROR("nlstat()");
-	aut_assert(AUE_NLSTAT);
-
 	/* Generate a success AUE_FSTAT record */
 	if ((fstat(temp_fd, &tstat)) < 0)
 		AUT_PERROR("fstat()");
 	aut_assert(AUE_FSTAT);
 
-	/* Generate a success AUE_NFSTAT record */
-	if ((nfstat(temp_fd, &tstat)) < 0)
+	/* Create a temporary file for the nstat ops */
+	strcpy(ntempname, "nstattemp.XXXX");
+	if ((ntemp_fd = mkstemp(ntempname)) < 0) {
+		AUT_PERROR("ntemp file creation");
+		exit (-1);
+	}
+
+	/* Generate a AUE_STAT audit record for nstat */
+	if ((nstat(ntempname, &tstat)) < 0)
+		AUT_PERROR("nstat()");
+	aut_assert(AUE_STAT);
+
+	/* Generate a AUE_LSTAT audit record for nlstat */
+	if ((nlstat(ntempname, &tstat)) < 0)
+		AUT_PERROR("nlstat()");
+	aut_assert(AUE_LSTAT);
+
+	/* Generate a success AUE_FSTAT record for nfstat */
+	if ((nfstat(ntemp_fd, &tstat)) < 0)
 		AUT_PERROR("nfstat()");
-	aut_assert(AUE_NFSTAT);
+	aut_assert(AUE_FSTAT);
 
 	/* Generate a AUE_PATHCONF audit record */
 	if ((pathconf(tempname, _PC_NAME_MAX)) < 0)