From owner-p4-projects@FreeBSD.ORG  Wed Jul 13 22:24:44 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 41E2716A420; Wed, 13 Jul 2005 22:24:44 +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 1843516A41C
	for <perforce@freebsd.org>; Wed, 13 Jul 2005 22:24:44 +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 DF67F43D48
	for <perforce@freebsd.org>; Wed, 13 Jul 2005 22:24:43 +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 j6DMOheH007293
	for <perforce@freebsd.org>; Wed, 13 Jul 2005 22:24:43 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6DMOh64007290
	for perforce@freebsd.org; Wed, 13 Jul 2005 22:24:43 GMT
	(envelope-from wsalamon@computer.org)
Date: Wed, 13 Jul 2005 22:24:43 GMT
Message-Id: <200507132224.j6DMOh64007290@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 80109 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, 13 Jul 2005 22:24:44 -0000

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

Change 80109 by wsalamon@rickenbacker on 2005/07/13 22:24:27

	Use the auditon() syscall to turn off auditing because NULL is an
	invalid parameter to auditctl().

Affected files ...

.. //depot/projects/trustedbsd/audit3/usr.sbin/auditon/auditon.c#6 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/usr.sbin/auditon/auditon.c#6 (text+ko) ====

@@ -51,12 +51,14 @@
 main(int argc, char *argv[])
 {
 	const char *path;
+	long cond;
 
 	if (argc != 2)
 		usage();
 
 	if (strcmp(argv[1], "off") == 0) {
-		if (auditctl(NULL) != 0) 
+		cond = AUC_DISABLED;
+		if (auditon(A_SETCOND, &cond, sizeof(cond)) != 0) 
 			errx(-1, "Shutdown %s", strerror(errno));
 	} else {
 		path = argv[1];