From owner-p4-projects@FreeBSD.ORG  Sun Jul 22 13:26:17 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AD3AB106566C; Sun, 22 Jul 2012 13:26:15 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 67D6C106564A
	for <perforce@freebsd.org>; Sun, 22 Jul 2012 13:26:15 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 36AA28FC14
	for <perforce@freebsd.org>; Sun, 22 Jul 2012 13:26:15 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MDQF3k063129
	for <perforce@freebsd.org>; Sun, 22 Jul 2012 13:26:15 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q6MDQE9w063126
	for perforce@freebsd.org; Sun, 22 Jul 2012 13:26:14 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 22 Jul 2012 13:26:14 GMT
Message-Id: <201207221326.q6MDQE9w063126@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 214755 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 22 Jul 2012 13:26:17 -0000

http://p4web.freebsd.org/@@214755?ac=10

Change 214755 by rwatson@rwatson_lethe on 2012/07/22 13:25:11

	Add FreeBSD vis(3) to OpenBSM compat routines to assist with
	XML rendering.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/compat/vis.h#1 add
.. //depot/projects/trustedbsd/openbsm/configure.ac#60 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#74 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/configure.ac#60 (text+ko) ====

@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 AC_INIT([OpenBSM], [1.2alpha1], [trustedbsd-audit@TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#59 $])
+AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#60 $])
 AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
@@ -86,7 +86,7 @@
 AC_TYPE_SIGNAL
 AC_FUNC_STAT
 AC_FUNC_STRFTIME
-AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strlcpy strrchr strstr strtol strtoul pthread_mutex_lock])
+AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strlcpy strrchr strstr strtol strtoul pthread_mutex_lock vis])
 
 # sys/queue.h exists on most systems, but its capabilities vary a great deal.
 # test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#74 (text+ko) ====

@@ -32,7 +32,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#73 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#74 $
  */
 
 #include <sys/types.h>
@@ -76,7 +76,12 @@
 #include <string.h>
 #include <pwd.h>
 #include <grp.h>
+
+#ifdef HAVE_VIS
 #include <vis.h>
+#else
+#include <compat/vis.h>
+#endif
 
 #include <bsm/audit_internal.h>