From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 30 18:16:57 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 8C355106566B;
	Sat, 30 Jan 2010 18:16:57 +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 7C7D28FC0C;
	Sat, 30 Jan 2010 18:16:57 +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 o0UIGvBn069255;
	Sat, 30 Jan 2010 18:16:57 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UIGvtW069253;
	Sat, 30 Jan 2010 18:16:57 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001301816.o0UIGvtW069253@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 30 Jan 2010 18:16:57 +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: r203207 - projects/capabilities8/libexec/rtld-elf-cap
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: Sat, 30 Jan 2010 18:16:57 -0000

Author: rwatson
Date: Sat Jan 30 18:16:57 2010
New Revision: 203207
URL: http://svn.freebsd.org/changeset/base/203207

Log:
  Merge (partial) c169404 from the p4 TrustedBSD Capabilities branch to
  capabilities8:
  
    Do offer a return code from ld_libcache_add(), as the caller will
    expect it when coming from outside of rtld.
  
  Excluded:
  
    In FreeBSD 9, need to use FBSD_1.2.
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/libexec/rtld-elf-cap/rtld_libcache.c

Modified: projects/capabilities8/libexec/rtld-elf-cap/rtld_libcache.c
==============================================================================
--- projects/capabilities8/libexec/rtld-elf-cap/rtld_libcache.c	Sat Jan 30 18:15:31 2010	(r203206)
+++ projects/capabilities8/libexec/rtld-elf-cap/rtld_libcache.c	Sat Jan 30 18:16:57 2010	(r203207)
@@ -74,7 +74,7 @@ static TAILQ_HEAD(, libcache_entry)	ld_l
 /*
  * Add a library to the library cache.
  */
-void
+int
 ld_libcache_add(const char *name, int fd)
 {
 	struct libcache_entry *liep;
@@ -83,6 +83,7 @@ ld_libcache_add(const char *name, int fd
 	liep->lie_name = xstrdup(name);
 	liep->lie_fd = fd;
 	TAILQ_INSERT_TAIL(&ld_libcache_list, liep, lie_list);
+	return (0);
 }
 
 /*