From owner-cvs-all@FreeBSD.ORG  Sat Aug 26 08:08:48 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2953E16A4DF;
	Sat, 26 Aug 2006 08:08:48 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DA76C43D46;
	Sat, 26 Aug 2006 08:08:47 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7Q88lJP023106;
	Sat, 26 Aug 2006 08:08:47 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7Q88lHp023105;
	Sat, 26 Aug 2006 08:08:47 GMT (envelope-from rwatson)
Message-Id: <200608260808.k7Q88lHp023105@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 26 Aug 2006 08:08:47 +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_event
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Aug 2006 08:08:48 -0000

rwatson     2006-08-26 08:08:47 UTC

  FreeBSD src repository

  Modified files:
    contrib/openbsm/etc  audit_event 
  Log:
  Resolove conflicts from OpenBSM 1.0 alpha 9 into audit_event.
  
  Obtained from:  TrustedBSD Project
  
  Revision  Changes    Path
  1.4       +176 -115  src/contrib/openbsm/etc/audit_event