PERFORCE change 90830 for review

[John Baldwin]

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 at 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 at FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve"  =  http://www.FreeBSD.org
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message