Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Jun 2010 20:29:03 +0000 (UTC)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r208721 - projects/capabilities8/libexec/rtld-elf
Message-ID:  <201006012029.o51KT3j6037034@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006012029.o51KT3j6037034>