From owner-svn-src-projects@FreeBSD.ORG Sat Jan 30 18:05:18 2010 Return-Path: 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 A57E91065748; Sat, 30 Jan 2010 18:05:18 +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 953D08FC13; Sat, 30 Jan 2010 18:05:18 +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 o0UI5IwK066555; Sat, 30 Jan 2010 18:05:18 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UI5IUY066552; Sat, 30 Jan 2010 18:05:18 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201001301805.o0UI5IUY066552@svn.freebsd.org> From: Robert Watson Date: Sat, 30 Jan 2010 18:05:18 +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: r203203 - projects/capabilities8/lib/libc/gen X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 18:05:18 -0000 Author: rwatson Date: Sat Jan 30 18:05:18 2010 New Revision: 203203 URL: http://svn.freebsd.org/changeset/base/203203 Log: Mege c169369 from the p4 TrustedBSD Capabilities branch to capabilities8: Rename caplibindex -> libcache Sponsored by: Google, Inc. Added: projects/capabilities8/lib/libc/gen/ld_libcache.c - copied unchanged from r203185, projects/capabilities8/lib/libc/gen/ld_caplibindex.c Deleted: projects/capabilities8/lib/libc/gen/ld_caplibindex.c Modified: projects/capabilities8/lib/libc/gen/Makefile.inc Modified: projects/capabilities8/lib/libc/gen/Makefile.inc ============================================================================== --- projects/capabilities8/lib/libc/gen/Makefile.inc Sat Jan 30 18:04:56 2010 (r203202) +++ projects/capabilities8/lib/libc/gen/Makefile.inc Sat Jan 30 18:05:18 2010 (r203203) @@ -20,7 +20,7 @@ SRCS+= __getosreldate.c __xuname.c \ getpeereid.c getprogname.c getpwent.c getttyent.c \ getusershell.c getvfsbyname.c glob.c \ initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \ - ld_caplibindex.c ld_sandbox.c \ + ld_libcache.c ld_sandbox.c \ lockf.c lrand48.c mrand48.c nftw.c nice.c \ nlist.c nrand48.c opendir.c \ pause.c pmadvise.c popen.c posix_spawn.c \ Copied: projects/capabilities8/lib/libc/gen/ld_libcache.c (from r203185, projects/capabilities8/lib/libc/gen/ld_caplibindex.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/capabilities8/lib/libc/gen/ld_libcache.c Sat Jan 30 18:05:18 2010 (r203203, copy of r203185, projects/capabilities8/lib/libc/gen/ld_caplibindex.c) @@ -0,0 +1,43 @@ +/*- + * Copyright (c) 2008-2009 Robert N. M. Watson + * All rights reserved. + * + * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED + * ON IN PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND + * UNEXPECTED WAYS. + * + * This software was developed at the University of Cambridge Computer + * Laboratory with support from a grant from Google, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#pragma weak ld_caplibindex_lookup +int +ld_caplibindex_lookup(const char *libname, int *fdp) +{ + + errno = EOPNOTSUPP; + return (-1); +}