From owner-p4-projects@FreeBSD.ORG  Sat Apr 30 13:12:28 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8EDF916A4D0; Sat, 30 Apr 2005 13:12:28 +0000 (GMT)
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 6007916A4CE
	for <perforce@freebsd.org>; Sat, 30 Apr 2005 13:12:28 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 429F343D4C
	for <perforce@freebsd.org>; Sat, 30 Apr 2005 13:12:28 +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.1/8.13.1) with ESMTP id j3UDCSiB061200
	for <perforce@freebsd.org>; Sat, 30 Apr 2005 13:12:28 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3UDCRxB061197
	for perforce@freebsd.org; Sat, 30 Apr 2005 13:12:28 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 30 Apr 2005 13:12:28 GMT
Message-Id: <200504301312.j3UDCRxB061197@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>
Subject: PERFORCE change 76270 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sat, 30 Apr 2005 13:12:29 -0000

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

Change 76270 by rwatson@rwatson_paprika on 2005/04/30 13:11:27

	Darwin 8.0 has 64-bit file ID's, so improve support for that.

Affected files ...

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

Differences ...

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

@@ -181,12 +181,20 @@
 	ADD_U_INT32(dptr, attr->va_gid);
 	ADD_U_INT32(dptr, attr->va_fsid);
 
-	/* 
-	 * Darwin defines the size for fileid 
-	 * as 4 bytes; BSM defines 8 so pad with 0
-	 */    
-	ADD_U_INT32(dptr, pad0_32);
-	ADD_U_INT32(dptr, attr->va_fileid);
+	/*
+	 * Some systems use 32-bit file ID's, other's use 64-bit file IDs.
+	 * Attempt to handle both, and let the compiler sort it out.  If we
+	 * could pick this out at compile-time, it would be better, so as to
+	 * avoid the else case below.
+	 */
+	if (sizeof(attr->va_fileid) == sizeof(uint32_t)) {
+		ADD_U_INT32(dptr, pad0_32);
+		ADD_U_INT32(dptr, attr->va_fileid);
+	} else if (sizeof(attr->va_fileid) == sizeof(uint64_t)) {
+		ADD_U_INT64(dptr, attr->va_fileid);
+	} else {
+		ADD_U_INT64(dptr, 0LL);
+	}
 
 	ADD_U_INT32(dptr, attr->va_rdev);