svn commit: r198082 - projects/capabilities8/sys/sys

[Robert Watson]

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. */
 };