From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  1 15:50:26 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0B1371065670;
	Tue,  1 Jun 2010 15:50:26 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EF17F8FC15;
	Tue,  1 Jun 2010 15:50:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o51FoPde075477;
	Tue, 1 Jun 2010 15:50:25 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o51FoPWH075475;
	Tue, 1 Jun 2010 15:50:25 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201006011550.o51FoPWH075475@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 1 Jun 2010 15:50:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208713 - projects/capabilities8/lib/libcapsicum
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jun 2010 15:50:26 -0000

Author: rwatson
Date: Tue Jun  1 15:50:25 2010
New Revision: 208713
URL: http://svn.freebsd.org/changeset/base/208713

Log:
  Merge c178262, c178281, c179048 from the p4 TrustedBSD Capabilities branch
  to capabilities8:
  
    libcapsicum changes:
  
    Only set *relative_name if relative_name != NULL
  
    Only do relative naming if the retrieved filename has length > 0
  
    Reverting an (accidental) previous change
  
  Submitted by:	jona

Modified:
  projects/capabilities8/lib/libcapsicum/libcapsicum_fdlist.c

Modified: projects/capabilities8/lib/libcapsicum/libcapsicum_fdlist.c
==============================================================================
--- projects/capabilities8/lib/libcapsicum/libcapsicum_fdlist.c	Tue Jun  1 15:47:57 2010	(r208712)
+++ projects/capabilities8/lib/libcapsicum/libcapsicum_fdlist.c	Tue Jun  1 15:50:25 2010	(r208713)
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#13 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#15 $
  */
 
 #include <sys/mman.h>
@@ -402,7 +402,8 @@ lc_fdlist_find(struct lc_fdlist *lfp, co
 
 	/* try to find the file itself in the FD list */
 	size_t len = strlen(filename);
-	*relative_name = filename + len;
+	if (relative_name)
+		*relative_name = filename + len;
 
 	while (fd == -1)
 	{
@@ -432,6 +433,14 @@ lc_fdlist_find(struct lc_fdlist *lfp, co
 			return (-1);
 
 		len = strlen(dirname);
+
+		/* if there is no filename, we can't do relative naming */
+		if (len == 0)
+		{
+			fd = -1;
+			continue;
+		}
+
 		if (strncmp(dirname, filename, len)) fd = -1;
 		else
 		{