From owner-p4-projects@FreeBSD.ORG  Thu Feb  2 18:39:13 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 392CE16A423; Thu,  2 Feb 2006 18:39:13 +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 C5F4B16A420;
	Thu,  2 Feb 2006 18:39:12 +0000 (GMT) (envelope-from jhb@freebsd.org)
Received: from speedfactory.net (mail6.speedfactory.net [66.23.216.219])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0EC4243D45;
	Thu,  2 Feb 2006 18:39:11 +0000 (GMT) (envelope-from jhb@freebsd.org)
Received: from server.baldwin.cx (unverified [66.23.211.162]) 
	by speedfactory.net (SurgeMail 3.5b3) with ESMTP id 7578348 
	for multiple; Thu, 02 Feb 2006 13:39:46 -0500
Received: from localhost (john@localhost [127.0.0.1])
	by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k12Id43K003311;
	Thu, 2 Feb 2006 13:39:07 -0500 (EST) (envelope-from jhb@freebsd.org)
From: John Baldwin <jhb@freebsd.org>
To: Pawel Worach <pawel.worach@gmail.com>
Date: Thu, 2 Feb 2006 13:40:02 -0500
User-Agent: KMail/1.9.1
References: <200601312102.k0VL24It078902@repoman.freebsd.org>
	<43E1C275.8070600@gmail.com>
In-Reply-To: <43E1C275.8070600@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200602021340.03928.jhb@freebsd.org>
X-Virus-Scanned: ClamAV 0.87.1/1270/Thu Feb 2 07:47:37 2006 on
	server.baldwin.cx
X-Virus-Status: Clean
X-Spam-Status: No, score=-1.4 required=4.2 tests=ALL_TRUSTED autolearn=failed 
	version=3.1.0
X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx
X-Server: High Performance Mail Server - http://surgemail.com r=1653887525
Cc: Perforce Change Reviews <perforce@freebsd.org>,
	Robert Watson <rwatson@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 18:39:14 -0000

On Thursday 02 February 2006 03:27, Pawel Worach wrote:
> 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

Actually, I think && is right.  The conditional code is meant to be exposed to 
userland and not the kernel and _KERNEL is for FreeBSD and KERNEL for OS X.

-- 
John Baldwin <jhb@FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve"  =  http://www.FreeBSD.org