From owner-trustedbsd-cvs@FreeBSD.ORG  Wed Sep 20 14:37:45 2006
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8250516A4AB
	for <trustedbsd-cvs@freebsd.org>; Wed, 20 Sep 2006 14:37:45 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0AB8743D60
	for <trustedbsd-cvs@freebsd.org>; Wed, 20 Sep 2006 14:37:27 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
	by cyrus.watson.org (Postfix) with ESMTP id 1D7F546D70
	for <trustedbsd-cvs@trustedbsd.org>;
	Wed, 20 Sep 2006 10:37:26 -0400 (EDT)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id 6259164103;
	Wed, 20 Sep 2006 14:33:10 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5B09A16A47B; Wed, 20 Sep 2006 14:33:10 +0000 (UTC)
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 371CC16A415
	for <perforce@freebsd.org>; Wed, 20 Sep 2006 14:33:10 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D5E2E43D69
	for <perforce@freebsd.org>; Wed, 20 Sep 2006 14:33:09 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KEX9WV031168
	for <perforce@freebsd.org>; Wed, 20 Sep 2006 14:33:09 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KEX99U031165
	for perforce@freebsd.org; Wed, 20 Sep 2006 14:33:09 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 20 Sep 2006 14:33:09 GMT
Message-Id: <200609201433.k8KEX99U031165@repoman.freebsd.org>
X-Authentication-Warning: repoman.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>
Cc: 
Subject: PERFORCE change 106403 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Sep 2006 14:37:45 -0000

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

Change 106403 by rwatson@rwatson_lethe on 2006/09/20 14:32:54

	Add strlcat() compat code.  Include as a static function rather than
	compile in order to avoid exposing symbols to applications that may
	link against libbsm.  This gets OpenBSM 1.0 alpha 11 building on
	Linux again.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/compat/strlcat.h#1 add
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#15 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#15 (text+ko) ====

@@ -27,7 +27,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_control.c#14 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#15 $
  */
 
 #include <bsm/libbsm.h>
@@ -38,6 +38,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <config/config.h>
+#ifndef HAVE_STRLCAT
+#include <compat/strlcat.h>
+#endif
+
 /*
  * Parse the contents of the audit_control file to return the audit control
  * parameters.  These static fields are protected by 'mutex'.