From owner-p4-projects@FreeBSD.ORG  Fri Feb 10 14:31:44 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 589A916A423; Fri, 10 Feb 2006 14:31:44 +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 DFEE116A420;
	Fri, 10 Feb 2006 14:31:43 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1533D43D6D;
	Fri, 10 Feb 2006 14:31:43 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from fledge.watson.org (fledge.watson.org [209.31.154.41])
	by cyrus.watson.org (Postfix) with ESMTP id 8A74C46B39;
	Fri, 10 Feb 2006 09:31:30 -0500 (EST)
Date: Fri, 10 Feb 2006 14:34:26 +0000 (GMT)
From: Robert Watson <rwatson@FreeBSD.org>
X-X-Sender: robert@fledge.watson.org
To: "Christian S.J. Peron" <csjp@FreeBSD.org>
In-Reply-To: <200602100414.k1A4EP9p068264@repoman.freebsd.org>
Message-ID: <20060210143257.I22680@fledge.watson.org>
References: <200602100414.k1A4EP9p068264@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: Perforce Change Reviews <perforce@freebsd.org>
Subject: Re: PERFORCE change 91489 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: Fri, 10 Feb 2006 14:31:45 -0000


On Fri, 10 Feb 2006, Christian S.J. Peron wrote:

> http://perforce.freebsd.org/chv.cgi?CH=91489
>
> Change 91489 by csjp@csjp_xor on 2006/02/10 04:13:39
>
> 	Conditionally compile audit support into login(1) unless somebody has
> 	specified the NO_AUDIT flag in /etc/make.conf
>
> Affected files ...
>
> .. //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#8 edit
> .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#9 edit
>
> Differences ...
>
> ==== //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#8 (text+ko) ====
>
> @@ -7,10 +7,15 @@
> DPADD=	${LIBUTIL} ${LIBPAM}
> LDADD=	-lutil ${MINUSLPAM} -lbsm

Do you also need to conditionalize linking against libbsm here?  And I notice 
we're missing a ${LIBBSM} entry on the DPADD line also.

> +.if !defined(NO_AUDIT)
> +CFLAGS += -DUSE_BSM_AUDIT
> +.endif

Would it be better to have the use of the audit-related functions in login.c 
ifdef'd, and to conditionally compile login_audit.c?

Robert N M Watson