From owner-p4-projects@FreeBSD.ORG  Tue Mar 30 16:31:18 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 910AB16A4D0; Tue, 30 Mar 2004 16:31:18 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5386B16A4CE
	for <perforce@freebsd.org>; Tue, 30 Mar 2004 16:31:18 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4B37143D2F
	for <perforce@freebsd.org>; Tue, 30 Mar 2004 16:31:18 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2V0VIGe071328
	for <perforce@freebsd.org>; Tue, 30 Mar 2004 16:31:18 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2V0VH2X071322
	for perforce@freebsd.org; Tue, 30 Mar 2004 16:31:17 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Tue, 30 Mar 2004 16:31:17 -0800 (PST)
Message-Id: <200403310031.i2V0VH2X071322@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 50018 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Mar 2004 00:31:19 -0000

http://perforce.freebsd.org/chv.cgi?CH=50018

Change 50018 by peter@peter_daintree on 2004/03/30 16:31:10

	oops. the reason for this file's existence is to load relocatable
	files (.o) rather than dynamic linked files (.ko).

Affected files ...

.. //depot/projects/hammer/sys/kern/link_elf_obj.c#12 edit

Differences ...

==== //depot/projects/hammer/sys/kern/link_elf_obj.c#12 (text+ko) ====

@@ -217,7 +217,7 @@
 		return error;
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 #ifdef MAC
-	error = mac_check_kld_load(curthread->td_ucred, nd.ni_vp);
+	error = mac_check_kld_load(td->td_ucred, nd.ni_vp);
 	if (error) {
 		goto out;
 	}
@@ -256,7 +256,7 @@
 		error = ENOEXEC;
 		goto out;
 	}
-	if (hdr->e_type != ET_EXEC && hdr->e_type != ET_DYN) {
+	if (hdr->e_type != ET_EXEC && hdr->e_type != ET_REL) {
 		link_elf_error("Unsupported file type");
 		error = ENOEXEC;
 		goto out;