From owner-p4-projects@FreeBSD.ORG  Sun Aug  9 17:08:26 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E528410656B0; Sun,  9 Aug 2009 17:08:25 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A336C1065692
	for <perforce@freebsd.org>; Sun,  9 Aug 2009 17:08:25 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9167B8FC16
	for <perforce@freebsd.org>; Sun,  9 Aug 2009 17:08:25 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n79H8P9g044136
	for <perforce@freebsd.org>; Sun, 9 Aug 2009 17:08:25 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n79H8PXV044134
	for perforce@freebsd.org; Sun, 9 Aug 2009 17:08:25 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 9 Aug 2009 17:08:25 GMT
Message-Id: <200908091708.n79H8PXV044134@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 167138 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: Sun, 09 Aug 2009 17:08:27 -0000

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

Change 167138 by rwatson@rwatson_cinnamon on 2009/08/09 17:07:26

	Continue fixing merge of new audit argument handling into
	trustedbsd_capabilities branch.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_sig.c#8 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_sig.c#8 (text+ko) ====

@@ -1717,15 +1717,15 @@
 	struct proc *p;
 	int error;
 
-	AUDIT_ARG(signum, uap->signum);
-	AUDIT_ARG(fd, uap->fd);
+	AUDIT_ARG_SIGNUM(uap->signum);
+	AUDIT_ARG_FD(uap->fd);
 	if ((u_int)uap->signum > _SIG_MAXSIG)
 		return (EINVAL);
 
 	error = procdesc_find(td, uap->fd, CAP_PDKILL, &p);
 	if (error)
 		return (error);
-	AUDIT_ARG(process, p);
+	AUDIT_ARG_PROCESS(p);
 	error = p_cansignal(td, p, uap->signum);
 	if (error == 0 && uap->signum)
 		psignal(p, uap->signum);