From owner-p4-projects@FreeBSD.ORG  Fri Aug 28 22:24:32 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1EF1C1065672; Fri, 28 Aug 2009 22:24:32 +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 C0847106564A
	for <perforce@FreeBSD.org>; Fri, 28 Aug 2009 22:24:31 +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 AF22E8FC24
	for <perforce@FreeBSD.org>; Fri, 28 Aug 2009 22:24:31 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7SMOVdk087529
	for <perforce@FreeBSD.org>; Fri, 28 Aug 2009 22:24:31 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7SMOVje087527
	for perforce@freebsd.org; Fri, 28 Aug 2009 22:24:31 GMT
	(envelope-from jona@FreeBSD.org)
Date: Fri, 28 Aug 2009 22:24:31 GMT
Message-Id: <200908282224.n7SMOVje087527@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson <jona@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 167934 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: Fri, 28 Aug 2009 22:24:32 -0000

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

Change 167934 by jona@jona-trustedbsd-belle-vmware on 2009/08/28 22:23:48

	Some test code went into the last rev... putting things right now

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/libuserangel/libuserangel.c#15 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/libuserangel/libuserangel.c#15 (text+ko) ====

@@ -276,7 +276,7 @@
 	if(angel < 0) return NULL;
 
 	int flags = 0;
-	cap_rights_t rights = CAP_SEEK | CAP_FSYNC | CAP_FCNTL | CAP_FCHFLAGS | CAP_MASK_VALID;
+	cap_rights_t rights = CAP_SEEK | CAP_FSYNC | CAP_FCNTL;
 
 	if(strnstr(mode, "r+", 3))
 	{
@@ -319,10 +319,6 @@
 			return NULL;
 		}
 
-	char buf[80];
-	bzero(buf, 80);
-	if(read(fd, buf, 35) < 0) perror("Error reading file");
-
 	return fdopen(fd, mode);
 }
 
@@ -807,11 +803,11 @@
 
 void handle_error(const datum *d)
 {
-	int32_t errnum = 0;
+	int32_t errnum;
 	char msg[200];
 	int msglen = 200;
 
-	ua_unmarshall_error(d, &errnum, msg, &msglen);
+	if(ua_unmarshall_error(d, &errnum, msg, &msglen) < 0) return;
 
 	errno = errnum;
 	printf("libuserangel error: %s\n", msg);