32c32
< __FBSDID("$FreeBSD: head/sys/kern/imgact_elf.c 120422 2003-09-25 01:10:26Z peter $");
---
> __FBSDID("$FreeBSD: head/sys/kern/imgact_elf.c 123742 2003-12-23 02:42:39Z peter $");
710a711,712
> if (interp != NULL && brand_info->interp_newpath != NULL)
> interp = brand_info->interp_newpath;
821c823,824
< if (interp != NULL) {
---
> if (interp != NULL && brand_info->emul_path != NULL &&
> brand_info->emul_path[0] != '\0') {
825,834c828,829
< if ((error = __elfN(load_file)(imgp->proc, path, &addr,
< &imgp->entry_addr, sv->sv_pagesize)) != 0) {
< if ((error = __elfN(load_file)(imgp->proc, interp,
< &addr, &imgp->entry_addr, sv->sv_pagesize)) != 0) {
< uprintf("ELF interpreter %s not found\n",
< path);
< free(path, M_TEMP);
< goto fail;
< }
< }
---
> error = __elfN(load_file)(imgp->proc, path, &addr,
> &imgp->entry_addr, sv->sv_pagesize);
835a831,832
> if (error == 0)
> interp = NULL;
836a834,841
> if (interp != NULL) {
> error = __elfN(load_file)(imgp->proc, interp, &addr,
> &imgp->entry_addr, sv->sv_pagesize);
> if (error != 0) {
> uprintf("ELF interpreter %s not found\n", interp);
> goto fail;
> }
> }