From owner-p4-projects@FreeBSD.ORG  Thu Feb  2 08:27:40 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8048D16A424; Thu,  2 Feb 2006 08:27:40 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EC1A516A423
	for <perforce@freebsd.org>; Thu,  2 Feb 2006 08:27:39 +0000 (GMT)
	(envelope-from pawel.worach@gmail.com)
Received: from uproxy.gmail.com (uproxy.gmail.com [66.249.92.198])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EBA2643D4C
	for <perforce@freebsd.org>; Thu,  2 Feb 2006 08:27:38 +0000 (GMT)
	(envelope-from pawel.worach@gmail.com)
Received: by uproxy.gmail.com with SMTP id o2so144367uge
	for <perforce@freebsd.org>; Thu, 02 Feb 2006 00:27:38 -0800 (PST)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com;
	h=received:message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding;
	b=ixRjkJJz2dFt8iG6cuBAWJJNUaIuLtuBiuIn9PDICBYohTZdLll4yF4amWWUvBVP8oo2XztarP/xJmQAt3YmE/3zkhsYPebvpKvFb9yiqugQ/NGgB4I9beWBWRmlS75JYCqXCjqqmouGBb+Ffgcs5Cxi1A3a0YvzfHKUVXI1PSg=
Received: by 10.66.216.11 with SMTP id o11mr169584ugg;
	Thu, 02 Feb 2006 00:27:37 -0800 (PST)
Received: from ?192.168.0.107? ( [80.217.193.226])
	by mx.gmail.com with ESMTP id e1sm1162255ugf.2006.02.02.00.27.37;
	Thu, 02 Feb 2006 00:27:37 -0800 (PST)
Message-ID: <43E1C275.8070600@gmail.com>
Date: Thu, 02 Feb 2006 09:27:33 +0100
From: Pawel Worach <pawel.worach@gmail.com>
User-Agent: Thunderbird 1.5 (X11/20060129)
MIME-Version: 1.0
To: Robert Watson <rwatson@FreeBSD.org>
References: <200601312102.k0VL24It078902@repoman.freebsd.org>
In-Reply-To: <200601312102.k0VL24It078902@repoman.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Perforce Change Reviews <perforce@freebsd.org>
Subject: Re: PERFORCE change 90830 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Feb 2006 08:27:41 -0000

Robert Watson wrote:
> http://perforce.freebsd.org/chv.cgi?CH=90830
> 
> Change 90830 by rwatson@rwatson_peppercorn on 2006/01/31 21:01:03
> 
> 	Sync to OpenBSM.
> 
> Affected files ...
> 
> .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#22 edit
> 

> +#if !defined(_KERNEL) && !defined(KERNEL)

> +#endif /* defined(_KERNEL) || defined(KERNEL) */

Hi,

One of those two looks like a typo. In sys/bsm/audit_record.h they are 
ORed so the most likely fix would be:

--- sys/bsm/audit.h.orig	Thu Feb  2 09:25:20 2006
+++ sys/bsm/audit.h	Thu Feb  2 09:25:31 2006
@@ -328,7 +328,7 @@
  };
  typedef	struct au_evclass_map	au_evclass_map_t;

-#if !defined(_KERNEL) && !defined(KERNEL)
+#if !defined(_KERNEL) || !defined(KERNEL)
  int	audit(const void *, int);
  int	auditon(int, void *, int);
  int	auditctl(const char *);

Regards
-- 
Pawel