From owner-svn-src-all@FreeBSD.ORG  Wed Oct  8 11:11:37 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 14D2B1065689;
	Wed,  8 Oct 2008 11:11:37 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0414D8FC0C;
	Wed,  8 Oct 2008 11:11:37 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m98BBaBi032332;
	Wed, 8 Oct 2008 11:11:36 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m98BBaJe032331;
	Wed, 8 Oct 2008 11:11:36 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200810081111.m98BBaJe032331@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 8 Oct 2008 11:11:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r183694 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Oct 2008 11:11:37 -0000

Author: kib
Date: Wed Oct  8 11:11:36 2008
New Revision: 183694
URL: http://svn.freebsd.org/changeset/base/183694

Log:
  If the ABI-overriden interpreter was not loaded, do not set
  have_interp to TRUE. This allows the code in image activator to try
  /libexec/ld-elf.so.1 as interpreter when newinterp is not found to
  execute.
  
  Reviewed by:	peter
  MFC after:	2 weeks (together with r175105)

Modified:
  head/sys/kern/imgact_elf.c

Modified: head/sys/kern/imgact_elf.c
==============================================================================
--- head/sys/kern/imgact_elf.c	Wed Oct  8 10:37:07 2008	(r183693)
+++ head/sys/kern/imgact_elf.c	Wed Oct  8 11:11:36 2008	(r183694)
@@ -813,7 +813,8 @@ __CONCAT(exec_, __elfN(imgact))(struct i
 		if (!have_interp && newinterp != NULL) {
 			error = __elfN(load_file)(imgp->proc, newinterp, &addr,
 			    &imgp->entry_addr, sv->sv_pagesize);
-			have_interp = TRUE;
+			if (error == 0)
+				have_interp = TRUE;
 		}
 		if (!have_interp) {
 			error = __elfN(load_file)(imgp->proc, interp, &addr,