From owner-p4-projects@FreeBSD.ORG Wed Jun 10 11:11:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAFD210657D9; Wed, 10 Jun 2009 11:11:01 +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 7B80D10657D4 for ; Wed, 10 Jun 2009 11:11:01 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 67B128FC1E for ; Wed, 10 Jun 2009 11:11:01 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5ABB1Cn042393 for ; Wed, 10 Jun 2009 11:11:01 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5ABB1ER042391 for perforce@freebsd.org; Wed, 10 Jun 2009 11:11:01 GMT (envelope-from jona@FreeBSD.org) Date: Wed, 10 Jun 2009 11:11:01 GMT Message-Id: <200906101111.n5ABB1ER042391@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Cc: Subject: PERFORCE change 163968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2009 11:11:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=163968 Change 163968 by jona@jona-trustedbsd-belle-vm on 2009/06/10 11:10:53 Added user_angel, a first attempt at the thing which will contain powerboxes (not very functional yet) Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/cap/cap_exec/Makefile#3 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/cap_exec/cap_exec.c#7 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/cap_exec/main.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/cap_exec/make-main.sh#2 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/Makefile#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/cap.c#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/cap.h#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/fdcomm.c#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/fdcomm.h#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/protocol.c#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/protocol.h#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/server.c#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/server.h#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/test_client.c#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/user_angel.c#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/user_angel.h#1 add Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/cap_exec/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/cap_exec/cap_exec.c#7 (text+ko) ==== @@ -57,6 +57,7 @@ #define LIBEDIT_SO "libedit.so.6" #define LIBNCURSES_SO "libncurses.so.7" #define LIBCRYPT_SO "libcrypt.so.4" +#define LIBUTIL_SO "libutil.so.7" #define LIBPATH "/lib/" @@ -98,7 +99,7 @@ main(int argc, char *argv[]) { int fd_exec, fd_ldso, fd_procdesc; - int fd_libc, fd_libcrypt, fd_libedit, fd_libncurses; + int fd_libc, fd_libcrypt, fd_libedit, fd_libncurses, fd_libutil; char *env_caplibindex; struct pollfd pollfd; pid_t pid; @@ -137,12 +138,15 @@ BIN_CAPS); fd_libncurses = cap_open_limit(LIBPATH LIBNCURSES_SO, O_RDONLY, BIN_CAPS); + fd_libutil = cap_open_limit(LIBPATH LIBUTIL_SO, + O_RDONLY, BIN_CAPS); - if (asprintf(&env_caplibindex, "%d:%s,%d:%s,%d:%s,%d:%s", + if (asprintf(&env_caplibindex, "%d:%s,%d:%s,%d:%s,%d:%s,%d:%s", fd_libc, LIBC_SO, fd_libcrypt, LIBCRYPT_SO, fd_libedit, LIBEDIT_SO, - fd_libncurses, LIBNCURSES_SO + fd_libncurses, LIBNCURSES_SO, + fd_libutil, LIBUTIL_SO ) == -1) err(-1, "asprintf"); setenv("LD_CAPLIBINDEX", env_caplibindex, 1); ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/cap_exec/main.c#2 (text+ko) ==== @@ -1,10 +1,21 @@ +#include + +#include #include + int main(int argc, char *argv[]) { + printf("pid %d main(%d, %p)\n", getpid(), argc, argv); - printf("pid %d main(%d, %p)\n", getpid(), argc, argv); + if(opendir("./") == NULL) + printf("Call to opendir() failed (good!) - errno %i (%s)\n", + errno, strerror(errno)); + else + fprintf(stderr, "Call to opendir() didn't fail!"); + + return 0; } int ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/cap_exec/make-main.sh#2 (text+ko) ==== @@ -1,5 +1,6 @@ #!/bin/sh +gcc -o main main.c gcc -o main.dynamic main.c gcc -o main.so main.c -shared gcc -o main.static main.c -static