svn commit: r183694 - head/sys/kern

[Konstantin Belousov]

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,