From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  1 20:29:03 2010
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 7FCA6106566B;
	Tue,  1 Jun 2010 20:29:03 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6DF8B8FC12;
	Tue,  1 Jun 2010 20:29:03 +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 o51KT3Bv037036;
	Tue, 1 Jun 2010 20:29:03 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o51KT3j6037034;
	Tue, 1 Jun 2010 20:29:03 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201006012029.o51KT3j6037034@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 1 Jun 2010 20:29:03 +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: r208721 - projects/capabilities8/libexec/rtld-elf
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: Tue, 01 Jun 2010 20:29:03 -0000

Author: rwatson
Date: Tue Jun  1 20:29:03 2010
New Revision: 208721
URL: http://svn.freebsd.org/changeset/base/208721

Log:
  Merge c179063 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    179048 removed an 'fd' to Obj_Entry that had been added in error,
    that field later became depended on, so re-add.

Modified:
  projects/capabilities8/libexec/rtld-elf/rtld.h

Modified: projects/capabilities8/libexec/rtld-elf/rtld.h
==============================================================================
--- projects/capabilities8/libexec/rtld-elf/rtld.h	Tue Jun  1 19:56:02 2010	(r208720)
+++ projects/capabilities8/libexec/rtld-elf/rtld.h	Tue Jun  1 20:29:03 2010	(r208721)
@@ -226,6 +226,7 @@ typedef struct Struct_Obj_Entry {
     struct link_map linkmap;	/* For GDB and dlinfo() */
     Objlist dldags;		/* Object belongs to these dlopened DAGs (%) */
     Objlist dagmembers;		/* DAG has these members (%) */
+    int fd;			/* Object's file descriptor */
     dev_t dev;			/* Object's filesystem's device */
     ino_t ino;			/* Object's inode number */
     void *priv;			/* Platform-dependant */