From owner-p4-projects  Sat Oct 26 14:18:31 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8209E37B404; Sat, 26 Oct 2002 14:18:29 -0700 (PDT)
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 32D5A37B401
	for <perforce@freebsd.org>; Sat, 26 Oct 2002 14:18:29 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DFF1543E42
	for <perforce@freebsd.org>; Sat, 26 Oct 2002 14:18:28 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9QLHXmV026566
	for <perforce@freebsd.org>; Sat, 26 Oct 2002 14:17:33 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9QLHWPc026563
	for perforce@freebsd.org; Sat, 26 Oct 2002 14:17:32 -0700 (PDT)
Date: Sat, 26 Oct 2002 14:17:32 -0700 (PDT)
Message-Id: <200210262117.g9QLHWPc026563@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 20205 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=20205

Change 20205 by rwatson@rwatson_tislabs on 2002/10/26 14:16:32

	/* MAC */ not needed in #endif for short code snippets.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#40 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#40 (text+ko) ====

@@ -231,7 +231,7 @@
 		mtx_lock(&Giant);
 		goto exec_fail;
 	}
-#endif /* MAC */
+#endif
 
 	/*
 	 * Allocate temporary demand zeroed space for argument and
@@ -346,7 +346,7 @@
 		mac_init_vnode_label(&interplabel);
 		mac_copy_vnode_label(&ndp->ni_vp->v_label, &interplabel);
 		interplabelvalid = 1;
-#endif /* MAC */
+#endif
 		vput(ndp->ni_vp);
 		vm_object_deallocate(imgp->object);
 		imgp->object = NULL;
@@ -668,7 +668,7 @@
 		mac_execve_exit(imgp);
 		if (interplabelvalid)
 			mac_destroy_vnode_label(&interplabel);
-#endif /* MAC */
+#endif
 		exit1(td, W_EXITCODE(0, SIGABRT));
 		/* NOT REACHED */
 		error = 0;
@@ -678,7 +678,7 @@
 	mac_execve_exit(imgp);
 	if (interplabelvalid)
 		mac_destroy_vnode_label(&interplabel);
-#endif /* MAC */
+#endif
 	mtx_unlock(&Giant);
 	return (error);
 }

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