From owner-svn-src-stable-7@FreeBSD.ORG  Wed Feb 25 15:01:27 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 274E8106566B;
	Wed, 25 Feb 2009 15:01:27 +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 149CE8FC08;
	Wed, 25 Feb 2009 15:01:27 +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 n1PF1QJR000387;
	Wed, 25 Feb 2009 15:01:26 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1PF1Qcv000386;
	Wed, 25 Feb 2009 15:01:26 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200902251501.n1PF1Qcv000386@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 25 Feb 2009 15:01:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189043 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb security/audit
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Feb 2009 15:01:28 -0000

Author: rwatson
Date: Wed Feb 25 15:01:26 2009
New Revision: 189043
URL: http://svn.freebsd.org/changeset/base/189043

Log:
  Merge r188312 from head to stable/7:
  
    Audit AUE_MAC_EXECVE; currently just the standard AUE_EXECVE arguments
    and not the label.
  
    Obtained from:        TrustedBSD Project
    Sponsored by: Apple, Inc.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/security/audit/audit_bsm.c

Modified: stable/7/sys/security/audit/audit_bsm.c
==============================================================================
--- stable/7/sys/security/audit/audit_bsm.c	Wed Feb 25 14:48:13 2009	(r189042)
+++ stable/7/sys/security/audit/audit_bsm.c	Wed Feb 25 15:01:26 2009	(r189043)
@@ -764,6 +764,7 @@ kaudit_to_bsm(struct kaudit_record *kar,
 		break;
 
 	case AUE_EXECVE:
+	case AUE_MAC_EXECVE:
 		if (ARG_IS_VALID(kar, ARG_ARGV)) {
 			tok = au_to_exec_args(ar->ar_arg_argv,
 			    ar->ar_arg_argc);