From owner-p4-projects@FreeBSD.ORG  Tue Jan 29 12:23:03 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5B5BC16A468; Tue, 29 Jan 2008 12:23:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2054E16A420
	for <perforce@freebsd.org>; Tue, 29 Jan 2008 12:23:03 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D1CB13C45B
	for <perforce@freebsd.org>; Tue, 29 Jan 2008 12:23:03 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TCN26d037591
	for <perforce@freebsd.org>; Tue, 29 Jan 2008 12:23:02 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TCN2mr037588
	for perforce@freebsd.org; Tue, 29 Jan 2008 12:23:02 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 29 Jan 2008 12:23:02 GMT
Message-Id: <200801291223.m0TCN2mr037588@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 134373 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, 29 Jan 2008 12:23:03 -0000

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

Change 134373 by rwatson@rwatson_cinnamon on 2008/01/29 12:22:54

	Use ipc_perm._key and ipc_perm._seq when configured.
	
	Submitted by:	Eric Hall <trustedbsd at darkart dot com>

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#64 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#64 (text+ko) ====

@@ -30,7 +30,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_token.c#63 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#64 $
  */
 
 #include <sys/types.h>
@@ -506,15 +506,23 @@
 
 #ifdef HAVE_IPC_PERM___SEQ
 	ADD_U_INT16(dptr, perm->__seq);
-#else
+#else	/* HAVE_IPC_PERM___SEQ */
+#ifdef  HAVE_IPC_PERM__SEQ
+	ADD_U_INT16(dptr, perm->_seq);
+#else	/* HAVE_IPC_PERM__SEQ */
 	ADD_U_INT16(dptr, perm->seq);
-#endif
+#endif	/* HAVE_IPC_PERM__SEQ */
+#endif	/* HAVE_IPC_PERM___SEQ */
 
 #ifdef HAVE_IPC_PERM___KEY
 	ADD_U_INT32(dptr, perm->__key);
-#else
+#else	/* HAVE_IPC_PERM___KEY */
+#ifdef  HAVE_IPC_PERM__KEY
+	ADD_U_INT32(dptr, perm->_key);
+#else	/* HAVE_IPC_PERM__KEY */
 	ADD_U_INT32(dptr, perm->key);
-#endif
+#endif	/* HAVE_IPC_PERM__KEY */
+#endif	/* HAVE_IPC_PERM___KEY */
 
 	return (t);
 }