From owner-p4-projects@FreeBSD.ORG  Wed Oct 14 15:28:35 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4522C1065693; Wed, 14 Oct 2009 15:28:35 +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 09AC6106568F
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 15:28:35 +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 E9E238FC17
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 15:28:34 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9EFSYSf043883
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 15:28:34 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9EFSYEb043881
	for perforce@freebsd.org; Wed, 14 Oct 2009 15:28:34 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 14 Oct 2009 15:28:34 GMT
Message-Id: <200910141528.n9EFSYEb043881@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169494 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: Wed, 14 Oct 2009 15:28:35 -0000

http://p4web.freebsd.org/chv.cgi?CH=169494

Change 169494 by rwatson@rwatson_cinnamon on 2009/10/14 15:28:30

	Align 64-bit capability field at a 64-bit offset in struct
	kinfo_file, otherwise the compiler will introduce additional
	padding, changing the size of the overall structure.
	
	Spotted by:	Jonathan Anderson

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/sys/user.h#15 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/sys/user.h#15 (text+ko) ====

@@ -333,8 +333,9 @@
 	struct sockaddr_storage kf_sa_local;	/* Socket address. */
 	struct sockaddr_storage	kf_sa_peer;	/* Peer address. */
 	pid_t	kf_pid;				/* Process identifier. */
+	int	_kf_ispare0;			/* Space for more stuff. */
 	cap_rights_t	kf_cap_rights;		/* Capabiity rights. */
-	int	_kf_ispare[13];			/* Space for more stuff. */
+	int	_kf_ispare[12];			/* Space for more stuff. */
 	/* Truncated before copyout in sysctl */
 	char	kf_path[PATH_MAX];		/* Path to file, if any. */
 };