From owner-cvs-src@FreeBSD.ORG  Mon Oct 29 18:43:06 2007
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B703B16A418;
	Mon, 29 Oct 2007 18:43:06 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F13513C4AC;
	Mon, 29 Oct 2007 18:43:06 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9TIh6X1024046;
	Mon, 29 Oct 2007 18:43:06 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9TIh66F024045;
	Mon, 29 Oct 2007 18:43:06 GMT (envelope-from rwatson)
Message-Id: <200710291843.l9TIh66F024045@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 29 Oct 2007 18:43:06 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/contrib/openbsm/etc audit_class audit_event
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Oct 2007 18:43:06 -0000

rwatson     2007-10-29 18:43:06 UTC

  FreeBSD src repository

  Modified files:
    contrib/openbsm/etc  audit_class audit_event 
  Log:
  Resolve conflicts from import of OpenBSM 1.0: maintain $FreeBSD$ tags in
  /etc/security audit configuration files.
  
  Revision  Changes    Path
  1.3       +1 -3      src/contrib/openbsm/etc/audit_class
  1.9       +8 -2      src/contrib/openbsm/etc/audit_event