From owner-svn-src-projects@FreeBSD.ORG  Wed Feb  3 16:04:20 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 DDB501065696;
	Wed,  3 Feb 2010 16:04:20 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CDE458FC19;
	Wed,  3 Feb 2010 16:04:20 +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 o13G4KUt041073;
	Wed, 3 Feb 2010 16:04:20 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o13G4Kma041071;
	Wed, 3 Feb 2010 16:04:20 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201002031604.o13G4Kma041071@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 3 Feb 2010 16:04:20 +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: r203432 - projects/capabilities8/libexec/rtld-elf
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: Wed, 03 Feb 2010 16:04:20 -0000

Author: rwatson
Date: Wed Feb  3 16:04:20 2010
New Revision: 203432
URL: http://svn.freebsd.org/changeset/base/203432

Log:
  Merge c174241 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Fix typo affecting rtld-elf-cap but not rtld-elf.
  
  Submitted by:	antoine

Modified:
  projects/capabilities8/libexec/rtld-elf/rtld.c

Modified: projects/capabilities8/libexec/rtld-elf/rtld.c
==============================================================================
--- projects/capabilities8/libexec/rtld-elf/rtld.c	Wed Feb  3 16:02:58 2010	(r203431)
+++ projects/capabilities8/libexec/rtld-elf/rtld.c	Wed Feb  3 16:04:20 2010	(r203432)
@@ -1247,7 +1247,7 @@ find_library_fd(const char *name)
 
     if (!ld_library_dirs_done)
 	init_libdirs();
-    for (i = 0; i < ld_library_dircount); i++) {
+    for (i = 0; i < ld_library_dircount; i++) {
 	fd = openat(ld_library_dirs[i], name, O_RDONLY);
 	if (fd >= 0)
 	    return (fd);