From owner-p4-projects@FreeBSD.ORG  Mon Jul  4 12:17:13 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 2080516A420; Mon,  4 Jul 2005 12:17:13 +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 E70FB16A41C
	for <perforce@freebsd.org>; Mon,  4 Jul 2005 12:17:12 +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 D45BD43D45
	for <perforce@freebsd.org>; Mon,  4 Jul 2005 12:17:12 +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 j64CHCNu045705
	for <perforce@freebsd.org>; Mon, 4 Jul 2005 12:17:12 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j64CHCeP045702
	for perforce@freebsd.org; Mon, 4 Jul 2005 12:17:12 GMT
	(envelope-from wsalamon@computer.org)
Date: Mon, 4 Jul 2005 12:17:12 GMT
Message-Id: <200507041217.j64CHCeP045702@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 79541 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: Mon, 04 Jul 2005 12:17:14 -0000

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

Change 79541 by wsalamon@rickenbacker on 2005/07/04 12:16:46

	Change the audit test library to use auitctl() to enable auditing
	and auditon() to disable auditing, matching the recent change to the
	syscalls.

Affected files ...

.. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/lib/audittest.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/lib/audittest.c#4 (text+ko) ====

@@ -32,6 +32,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/queue.h>
 #include <bsm/audit.h>
 #include <bsm/libbsm.h>
 #include <audittest.h>
@@ -58,7 +59,7 @@
 		exit(-1);
 	}
 	fn = logfile;
-	ret = auditctl(AC_SETLOGFILE, &fn, sizeof(fn));
+	ret = auditctl(fn);
 	if (ret != 0) {
 		perror("auditctl() failed");
 		exit(-1);
@@ -106,9 +107,10 @@
 {
 
 	int ret;
-	ret = auditctl(AC_SHUTDOWN, NULL, 0);
+	long cond = AUC_DISABLED;
+	ret = auditon(A_SETCOND, &cond, sizeof(cond));
 	if (ret != 0) {
-		perror("auditctl() shutdown failed");
+		perror("auditon() shutdown failed");
 		return (ret);
 	}
 	printf("Audit shutdown complete.\n");