From owner-p4-projects@FreeBSD.ORG  Tue Feb 21 22:35:14 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 BAAA316A423; Tue, 21 Feb 2006 22:35: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 7BE6016A420
	for <perforce@freebsd.org>; Tue, 21 Feb 2006 22:35:13 +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 4FB2343D53
	for <perforce@freebsd.org>; Tue, 21 Feb 2006 22:35:13 +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 k1LMZDU4080010
	for <perforce@freebsd.org>; Tue, 21 Feb 2006 22:35:13 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LMZDBQ080007
	for perforce@freebsd.org; Tue, 21 Feb 2006 22:35:13 GMT
	(envelope-from csjp@freebsd.org)
Date: Tue, 21 Feb 2006 22:35:13 GMT
Message-Id: <200602212235.k1LMZDBQ080007@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 92149 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: Tue, 21 Feb 2006 22:35:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=92149

Change 92149 by csjp@csjp_xor on 2006/02/21 22:34:55

	Further reduce namespace pollution in su(1) by conditionally including
	audit/bsm includes.

Affected files ...

.. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#13 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#13 (text+ko) ====

@@ -81,8 +81,10 @@
 #include <sys/resource.h>
 #include <sys/wait.h>
 
+#ifdef USE_BSM_AUDIT
 #include <bsm/libbsm.h>
 #include <bsm/audit_uevents.h>
+#endif
 
 #include <err.h>
 #include <errno.h>
@@ -145,7 +147,9 @@
 static void	usage(void) __dead2;
 static void	export_pam_environment(void);
 static int	ok_to_export(const char *);
+#ifdef USE_BSM_AUDIT
 static void	audit_su(au_id_t, int, const char *, ...);
+#endif
 
 extern char	**environ;