From owner-p4-projects@FreeBSD.ORG  Tue Jun 16 16:55:41 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3BDB41065675; Tue, 16 Jun 2009 16:55:41 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EBF681065672
	for <perforce@freebsd.org>; Tue, 16 Jun 2009 16:55:40 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D89008FC22
	for <perforce@freebsd.org>; Tue, 16 Jun 2009 16:55:40 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5GGteoU020783
	for <perforce@freebsd.org>; Tue, 16 Jun 2009 16:55:40 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5GGtehK020778
	for perforce@freebsd.org; Tue, 16 Jun 2009 16:55:40 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 16 Jun 2009 16:55:40 GMT
Message-Id: <200906161655.n5GGtehK020778@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 164517 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Jun 2009 16:55:42 -0000

http://perforce.freebsd.org/chv.cgi?CH=164517

Change 164517 by rwatson@rwatson_freebsd_capabilities on 2009/06/16 16:55:26

	When running in rtld-elf-cap, define ld_insandbox(), which returns
	1.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#17 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_sandbox.c#1 add
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#18 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#17 (text+ko) ====

@@ -1,5 +1,5 @@
 # $FreeBSD$
-# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#16 $
+# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#17 $
 
 WITHOUT_SSP=
 
@@ -9,7 +9,7 @@
 SRCS=		rtld_start.S \
 		reloc.c rtld.c rtld_lock.c map_object.c \
 		malloc.c xmalloc.c debug.c \
-		crtbrand.c rtld_caplibindex.c
+		crtbrand.c rtld_caplibindex.c rtld_sandbox.c
 MAN=		rtld-elf-cap.1
 CSTD?=		gnu99
 CFLAGS+=	-Wall -DFREEBSD_ELF -DIN_RTLD -DIN_RTLD_CAP -g

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#18 (text+ko) ====

@@ -61,6 +61,7 @@
 
 #ifdef IN_RTLD_CAP
 #include "rtld_caplibindex.h"
+#include "rtld_sandbox.h"
 #endif
 
 #ifndef COMPAT_32BIT
@@ -244,6 +245,7 @@
     (func_ptr_type) &_rtld_atfork_post,
 #ifdef IN_RTLD_CAP
     (func_ptr_type) &ld_caplibindex_lookup,
+    (func_ptr_type) &ld_insandbox,
 #endif
     NULL
 };