From owner-svn-src-projects@FreeBSD.ORG  Fri Jan  8 15:28:22 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 E2D681065679;
	Fri,  8 Jan 2010 15:28:22 +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 D18C58FC16;
	Fri,  8 Jan 2010 15:28:22 +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 o08FSMAr011696;
	Fri, 8 Jan 2010 15:28:22 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o08FSMVA011694;
	Fri, 8 Jan 2010 15:28:22 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001081528.o08FSMVA011694@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 8 Jan 2010 15:28:22 +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: r201792 - 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: Fri, 08 Jan 2010 15:28:23 -0000

Author: rwatson
Date: Fri Jan  8 15:28:22 2010
New Revision: 201792
URL: http://svn.freebsd.org/changeset/base/201792

Log:
  Fix merge bug.

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

Modified: projects/capabilities8/libexec/rtld-elf/rtld.c
==============================================================================
--- projects/capabilities8/libexec/rtld-elf/rtld.c	Fri Jan  8 15:18:57 2010	(r201791)
+++ projects/capabilities8/libexec/rtld-elf/rtld.c	Fri Jan  8 15:28:22 2010	(r201792)
@@ -433,7 +433,6 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
 		_rtld_error("environment corrupt; aborting");
 		die();
 	}
-#endif
 #ifdef IN_RTLD_CAP
 	unsetenv(LD_ "CAPLIBINDEX");
 #endif