From owner-p4-projects@FreeBSD.ORG  Thu Jun 18 10:58:18 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A2F4B1065674; Thu, 18 Jun 2009 10:58:18 +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 631D9106566B
	for <perforce@FreeBSD.org>; Thu, 18 Jun 2009 10:58:18 +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 5187B8FC08
	for <perforce@FreeBSD.org>; Thu, 18 Jun 2009 10:58:18 +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 n5IAwIs5098612
	for <perforce@FreeBSD.org>; Thu, 18 Jun 2009 10:58:18 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5IAwIlT098610
	for perforce@freebsd.org; Thu, 18 Jun 2009 10:58:18 GMT
	(envelope-from jona@FreeBSD.org)
Date: Thu, 18 Jun 2009 10:58:18 GMT
Message-Id: <200906181058.n5IAwIlT098610@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 164655 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: Thu, 18 Jun 2009 10:58:19 -0000

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

Change 164655 by jona@jona-trustedbsd-kentvm on 2009/06/18 10:58:13

	cap_open() shouldn't exit() on error

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/cap.c#4 edit

Differences ...

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

@@ -42,10 +42,20 @@
 int cap_open(const char *path, int flags, cap_rights_t rights)
 {
 	int fd = open(path, flags);
-	if(fd < 0) err(EX_IOERR, "failed to open() path '%s'", path);
+	if(fd < 0)
+	{
+		char error[80 + strlen(path)];
+		sprintf(error, "failed to open() path '%s'", path);
+		perror(error);
+		return -1;
+	}
 
 	int cap = cap_new(fd, rights);
-	if(cap < 0) err(EX_SOFTWARE, "failed to create new capability");
+	if(cap < 0)
+	{
+		perror("Failed to create new capability");
+		return -1;
+	}
 
 	close(fd);
 	return cap;