From owner-svn-src-head@FreeBSD.ORG  Wed Jul  1 12:36:10 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8D18C1065678;
	Wed,  1 Jul 2009 12:36:10 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7A7F78FC16;
	Wed,  1 Jul 2009 12:36:10 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n61CaAwY012737;
	Wed, 1 Jul 2009 12:36:10 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n61CaA9g012734;
	Wed, 1 Jul 2009 12:36:10 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200907011236.n61CaA9g012734@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 1 Jul 2009 12:36:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195235 - in head/sys: kern security/audit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jul 2009 12:36:11 -0000

Author: rwatson
Date: Wed Jul  1 12:36:10 2009
New Revision: 195235
URL: http://svn.freebsd.org/changeset/base/195235

Log:
  udit the 'options' argument to wait4(2).
  
  Approved by:	re (kib)
  MFC after:	3 days

Modified:
  head/sys/kern/kern_exit.c
  head/sys/security/audit/audit_bsm.c

Modified: head/sys/kern/kern_exit.c
==============================================================================
--- head/sys/kern/kern_exit.c	Wed Jul  1 10:16:10 2009	(r195234)
+++ head/sys/kern/kern_exit.c	Wed Jul  1 12:36:10 2009	(r195235)
@@ -804,6 +804,7 @@ kern_wait(struct thread *td, pid_t pid, 
 	int error, nfound;
 
 	AUDIT_ARG_PID(pid);
+	AUDIT_ARG_VALUE(options);
 
 	q = td->td_proc;
 	if (pid == 0) {

Modified: head/sys/security/audit/audit_bsm.c
==============================================================================
--- head/sys/security/audit/audit_bsm.c	Wed Jul  1 10:16:10 2009	(r195234)
+++ head/sys/security/audit/audit_bsm.c	Wed Jul  1 12:36:10 2009	(r195235)
@@ -1498,6 +1498,10 @@ kaudit_to_bsm(struct kaudit_record *kar,
 			tok = au_to_arg32(0, "pid", ar->ar_arg_pid);
 			kau_write(rec, tok);
 		}
+		if (ARG_IS_VALID(kar, ARG_VALUE)) {
+			tok = au_to_arg32(0, "options", ar->ar_arg_value);
+			kau_write(rec, tok);
+		}
 		break;
 
 	case AUE_NULL: