From owner-svn-src-projects@FreeBSD.ORG  Wed Oct 14 15:29:30 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7612E106566C;
	Wed, 14 Oct 2009 15:29:30 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 651938FC1B;
	Wed, 14 Oct 2009 15:29:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9EFTUHb041051;
	Wed, 14 Oct 2009 15:29:30 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9EFTUFs041049;
	Wed, 14 Oct 2009 15:29:30 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200910141529.n9EFTUFs041049@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 14 Oct 2009 15:29:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198082 - projects/capabilities8/sys/sys
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2009 15:29:30 -0000

Author: rwatson
Date: Wed Oct 14 15:29:30 2009
New Revision: 198082
URL: http://svn.freebsd.org/changeset/base/198082

Log:
  Merge Perforce c169494 to capabilities8 branch:
  
    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

Modified:
  projects/capabilities8/sys/sys/user.h

Modified: projects/capabilities8/sys/sys/user.h
==============================================================================
--- projects/capabilities8/sys/sys/user.h	Wed Oct 14 14:29:29 2009	(r198081)
+++ projects/capabilities8/sys/sys/user.h	Wed Oct 14 15:29:30 2009	(r198082)
@@ -333,8 +333,9 @@ struct kinfo_file {
 	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. */
 };