From owner-cvs-src@FreeBSD.ORG  Mon Sep 25 11:55:30 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0874B16A40F;
	Mon, 25 Sep 2006 11:55:30 +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 52AD143E82;
	Mon, 25 Sep 2006 11:53:23 +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 k8PBr68Z092560;
	Mon, 25 Sep 2006 11:53:06 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8PBr61C092559;
	Mon, 25 Sep 2006 11:53:06 GMT (envelope-from rwatson)
Message-Id: <200609251153.k8PBr61C092559@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 25 Sep 2006 11:53: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_control 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, 25 Sep 2006 11:55:30 -0000

rwatson     2006-09-25 11:53:06 UTC

  FreeBSD src repository

  Modified files:
    contrib/openbsm/etc  audit_control audit_event 
  Log:
  Resolve conflicts from OpenBSM 1.0 alpha 12 import.
  
  Obtained from:  TrustedBSD Project
  
  Revision  Changes    Path
  1.4       +2 -1      src/contrib/openbsm/etc/audit_control
  1.6       +5 -1      src/contrib/openbsm/etc/audit_event