From owner-p4-projects@FreeBSD.ORG  Fri Feb 10 04:14:26 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 0874516A423; Fri, 10 Feb 2006 04:14:26 +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 BC52616A420
	for <perforce@freebsd.org>; Fri, 10 Feb 2006 04:14:25 +0000 (GMT)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 87EDF43D49
	for <perforce@freebsd.org>; Fri, 10 Feb 2006 04:14:25 +0000 (GMT)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1A4EPxP068267
	for <perforce@freebsd.org>; Fri, 10 Feb 2006 04:14:25 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1A4EP9p068264
	for perforce@freebsd.org; Fri, 10 Feb 2006 04:14:25 GMT
	(envelope-from csjp@freebsd.org)
Date: Fri, 10 Feb 2006 04:14:25 GMT
Message-Id: <200602100414.k1A4EP9p068264@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: 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 04:14:26 -0000

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
 MAN=	login.1 login.access.5
+
 .if !defined(NO_SETUID_LOGIN)
 BINOWN=	root
 BINMODE=4555
 PRECIOUSPROG=
 .endif
 
+.if !defined(NO_AUDIT)
+CFLAGS += -DUSE_BSM_AUDIT
+.endif
+
 .include <bsd.prog.mk>

==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#9 (text+ko) ====

@@ -58,6 +58,7 @@
 void
 au_login_success(void)
 {
+#ifdef USE_BSM_AUDIT
 	token_t *tok;
 	int aufd;
 	au_mask_t aumask;
@@ -102,6 +103,7 @@
 
 	if (au_close(aufd, 1, AUE_login) == -1)
 		errx(1, "login: Audit Record was not committed.");
+#endif	/* USE_BSM_AUDIT */
 }
 
 /*
@@ -111,6 +113,7 @@
 void
 au_login_fail(char *errmsg, int na)
 {
+#ifdef USE_BSM_AUDIT
 	token_t *tok;
 	int aufd;
 	long au_cond;
@@ -159,6 +162,7 @@
 
 	if (au_close(aufd, 1, AUE_login) == -1)
 		errx(1, "login: Audit Error: au_close() was not committed");
+#endif	/* USE_BSM_AUDIT */
 }
 
 /*
@@ -168,6 +172,7 @@
 void
 audit_logout(void)
 {
+#ifdef USE_BSM_AUDIT
 	token_t *tok;
 	int aufd;
 	au_mask_t aumask;
@@ -201,4 +206,5 @@
 
 	if (au_close(aufd, 1, AUE_logout) == -1)
 		errx(1, "login: Audit Record was not committed.");
+#endif	/* USE_BSM_AUDIT */
 }