From owner-p4-projects@FreeBSD.ORG Fri Jul 24 04:30:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 343751065674; Fri, 24 Jul 2009 04:30:46 +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 E03741065673 for ; Fri, 24 Jul 2009 04:30:45 +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 B33518FC0C for ; Fri, 24 Jul 2009 04:30:45 +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 n6O4UjAT038725 for ; Fri, 24 Jul 2009 04:30:45 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6O4Ujei038723 for perforce@freebsd.org; Fri, 24 Jul 2009 04:30:45 GMT (envelope-from jona@FreeBSD.org) Date: Fri, 24 Jul 2009 04:30:45 GMT Message-Id: <200907240430.n6O4Ujei038723@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 166488 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: Fri, 24 Jul 2009 04:30:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=166488 Change 166488 by jona@jona-trustedbsd-belle-vmware on 2009/07/24 04:29:44 Make output consistent, added a simple regression test Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_qt/sandbox_qt.cpp#6 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_qt/sandbox_qt.cpp#6 (text+ko) ==== @@ -118,13 +118,6 @@ QApplication app(argc, argv); - cout << "host:\t\tReading from /etc/passwd using normal open()..." << endl; - QFile passwd("/etc/passwd"); - if(!passwd.open(QIODevice::ReadOnly | QIODevice::Text)) - err(EX_IOERR, "Error opening /etc/passwd"); - - cout << passwd.readLine().data() << endl; - int my_fd = open(argv[0], O_RDONLY); char *sargv[2] = { (char*) "sandbox_qt", NULL }; struct lc_sandbox *sandbox; @@ -265,6 +258,18 @@ fflush(stdout); + printf("sandbox:\tOpening /etc/passwd directly... "); + fflush(stdout); + + int tmp = open("/etc/passwd", O_RDONLY); + if((tmp != -1) || (errno != ENOSYS)) + err(-1, "Was able to open /etc/passwd directly from sandbox"); + else + printf("ENOSYS (sandbox working!)\n"); + fflush(stdout); + + + // get a file descriptor for our host struct lc_host *lchpp; if(lcs_get(&lchpp) < 0) err(EX_IOERR, "Error getting lc_host"); @@ -379,8 +384,8 @@ char buf[80]; bzero(buf, 80); - if(read(fd, buf, 50) < 0) perror("Error reading /etc/passwd"); - else printf("Read from /etc/passwd: "); + if(read(fd, buf, 35) < 0) perror("Error reading /etc/passwd"); + else printf("sandbox:\tRead from /etc/passwd: "); puts(buf); fflush(stdout); @@ -389,21 +394,20 @@ if(!f) err(EX_IOERR, "Error opening passwd via angel"); bzero(buf, 80); - if(!fgets(buf, 55, f) < 0) perror("Error reading /etc/passwd"); - else printf("Read from /etc/passwd: "); + if(!fgets(buf, 36, f) < 0) perror("Error reading /etc/passwd"); + else printf("sandbox:\tRead from /etc/passwd: "); puts(buf); fflush(stdout); - printf("Reading via QFile...\n"); + printf("sandbox:\tReading /etc/group via QFile:\n"); fflush(stdout); QFile group("/etc/group"); if(!group.open(QIODevice::ReadOnly | QIODevice::Text)) err(EX_IOERR, "Error opening /etc/group"); - printf("Filename: %s\n", group.fileName().toStdString().c_str()); - printf("Data: %s\n", group.readLine().data()); + printf("\t\t%s\n", group.readLine().data()); fflush(stdout);