diff options
author | rgrimes <rgrimes@FreeBSD.org> | 1995-06-11 19:33:05 +0000 |
---|---|---|
committer | rgrimes <rgrimes@FreeBSD.org> | 1995-06-11 19:33:05 +0000 |
commit | 1b1ee5553889e207087539ddafa5dfd4e28bd585 (patch) | |
tree | ba998dfb4fcad03e00a5cbf58e2a0ad648bab6e6 /sys/kern/imgact_aout.c | |
parent | b1a97daa1e06ab0de3071f979965878fd056292b (diff) | |
download | FreeBSD-src-1b1ee5553889e207087539ddafa5dfd4e28bd585.zip FreeBSD-src-1b1ee5553889e207087539ddafa5dfd4e28bd585.tar.gz |
Merge RELENG_2_0_5 into HEAD
Diffstat (limited to 'sys/kern/imgact_aout.c')
-rw-r--r-- | sys/kern/imgact_aout.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index 082088c..ed8fce1 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: imgact_aout.c,v 1.12 1995/03/16 18:12:25 bde Exp $ + * $Id: imgact_aout.c,v 1.13.2.1 1995/06/04 16:58:44 davidg Exp $ */ #include <sys/param.h> @@ -57,10 +57,11 @@ exec_aout_imgact(iparams) /* * Linux and *BSD binaries look very much alike, * only the machine id is different: - * 0x64 for Linux, 0x86 for *BSD. + * 0x64 for Linux, 0x86 for *BSD, 0x00 for BSDI. */ - if (((a_out->a_magic >> 16) & 0xff) != 0x86) - return -1; + if (((a_out->a_magic >> 16) & 0xff) != 0x86 && + ((a_out->a_magic >> 16) & 0xff) != 0) + return -1; #endif /* COMPAT_LINUX */ /* |