From owner-p4-projects  Tue Jan 28  7:40:39 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8CE1B37B405; Tue, 28 Jan 2003 07:40:37 -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 1FBC137B401
	for <perforce@freebsd.org>; Tue, 28 Jan 2003 07:40:37 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C4ACF43F79
	for <perforce@freebsd.org>; Tue, 28 Jan 2003 07:40:36 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h0SFeabv018614
	for <perforce@freebsd.org>; Tue, 28 Jan 2003 07:40:36 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0SFea9W018601
	for perforce@freebsd.org; Tue, 28 Jan 2003 07:40:36 -0800 (PST)
Date: Tue, 28 Jan 2003 07:40:36 -0800 (PST)
Message-Id: <200301281540.h0SFea9W018601@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f
From: Brian Feldman <green@FreeBSD.org>
Subject: PERFORCE change 24328 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 24328 by green@green_laptop_2 on 2003/01/28 07:40:26

	Fix a bug in implementation of the file entry points which
	made /dev/fd/* not work anymore.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#4 (text+ko) ====

@@ -2068,6 +2068,9 @@
 	int error;
 {
 	register struct file *wfp;
+#ifdef MAC
+	int myerror;
+#endif
 	struct file *fp;
 
 	/*
@@ -2082,10 +2085,10 @@
 		return (EBADF);
 	}
 #ifdef MAC
-	error = mac_check_file_dup(td->td_ucred, wfp, dfd);
-	if (error) {
+	myerror = mac_check_file_dup(td->td_ucred, wfp, dfd);
+	if (myerror) {
 		FILEDESC_UNLOCK(fdp);
-		return (error);
+		return (myerror);
 	}
 #endif
 

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message