From owner-p4-projects@FreeBSD.ORG  Wed Jun 17 11:26:39 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 777021065698; Wed, 17 Jun 2009 11:26:39 +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 31A3F1065688
	for <perforce@freebsd.org>; Wed, 17 Jun 2009 11:26:39 +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 1E1C48FC20
	for <perforce@freebsd.org>; Wed, 17 Jun 2009 11:26:39 +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 n5HBQdtT043513
	for <perforce@freebsd.org>; Wed, 17 Jun 2009 11:26:39 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 n5HBQchv043503
	for perforce@freebsd.org; Wed, 17 Jun 2009 11:26:38 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 17 Jun 2009 11:26:38 GMT
Message-Id: <200906171126.n5HBQchv043503@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 164569 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: Wed, 17 Jun 2009 11:26:40 -0000

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

Change 164569 by rwatson@rwatson_freebsd_capabilities on 2009/06/17 11:25:40

	Unify libcapability_exec/sandbox_echo.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/tools/cap/libcapability_exec/Makefile#2 delete
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/libcapability_exec/libcapability_exec.c#4 delete
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/Makefile#4 edit
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/sandbox_echo.c#6 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/Makefile#4 (text+ko) ====

@@ -1,6 +1,6 @@
 PROG=sandbox_echo
 NO_MAN=
-CFLAGS=-Wall -g
+CFLAGS=-Wall -g -rdynamic
 
 DPADD=	${LIBCAPABILITY}
 LDADD=	-lcapability

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/sandbox_echo.c#6 (text+ko) ====

@@ -50,6 +50,42 @@
 int
 main(int argc, char *argv[])
 {
+	struct lc_sandbox *lcsp;
+	char *sandbox_argv[3] = { argv[1], "nested", NULL };
+	struct iovec iov;
+	size_t len;
+	char ch;
+	int i;
+
+	if (argc != 1)
+		errx(-1, "usage: sandbox_echo");
+
+	if (lch_start_flags(MYNAME, sandbox_argv, LCH_PERMIT_STDERR, &lcsp)
+	    < 0)
+		err(-1, "lch_start %s", argv[1]);
+
+	for (i = 0; i < 10; i++) {
+		ch = i;
+		iov.iov_base = &ch;
+		iov.iov_len = sizeof(ch);
+		if (lch_rpc(lcsp, 0, &iov, 1, &iov, 1, &len) < 0)
+			err(-1, "lch_rpc");
+		if (len != sizeof(ch))
+			errx(-1, "lch_rpc returned size %d not %d", len,
+			    sizeof(ch));
+		if (ch != i)
+			errx(-1, "lch_recv: expected %d and got %d", i, ch);
+		printf(".");
+		fflush(stdout);
+	}
+	printf(" OK\n");
+
+	lch_stop(lcsp);
+}
+
+int
+cap_main(int argc, char *argv[])
+{
 	char *sandbox_argv[3] = { MYNAME, NULL };
 	struct lc_sandbox *lcsp;
 	struct lc_host *lchp;