From owner-p4-projects  Sun Jul 28  9:44:54 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 78FA037B401; Sun, 28 Jul 2002 09:44:48 -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 18E7037B400
	for <perforce@freebsd.org>; Sun, 28 Jul 2002 09:44:48 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C849C43E4A
	for <perforce@freebsd.org>; Sun, 28 Jul 2002 09:44:47 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6SGilJU046868
	for <perforce@freebsd.org>; Sun, 28 Jul 2002 09:44:47 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6SGilk6046865
	for perforce@freebsd.org; Sun, 28 Jul 2002 09:44:47 -0700 (PDT)
Date: Sun, 28 Jul 2002 09:44:47 -0700 (PDT)
Message-Id: <200207281644.g6SGilk6046865@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 15059 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://people.freebsd.org/~peter/p4db/chv.cgi?CH=15059

Change 15059 by rwatson@rwatson_paprika on 2002/07/28 09:44:45

	Move mac_biba_check_ifnet_transmit() to a more logical point in
	the file.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#77 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#77 (text+ko) ====

@@ -1198,6 +1198,21 @@
 	return (0);
 }
 
+static int 
+mac_biba_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel,
+    struct mbuf *m, struct label *mbuflabel)
+{
+	struct mac_biba *p, *i;
+        
+	if (!mac_biba_enabled)
+		return (0);
+
+	p = SLOT(mbuflabel);
+	i = SLOT(ifnetlabel);
+ 
+	return (mac_biba_single_in_range(p, i) ? 0 : EACCES);
+}
+
 static int
 mac_biba_check_proc_debug(struct ucred *cred, struct proc *proc)
 {
@@ -1288,21 +1303,6 @@
 	return (0);
 }
 
-static int 
-mac_biba_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel,
-    struct mbuf *m, struct label *mbuflabel)
-{
-	struct mac_biba *p, *i;
-        
-	if (!mac_biba_enabled)
-		return (0);
-
-	p = SLOT(mbuflabel);
-	i = SLOT(ifnetlabel);
- 
-	return (mac_biba_single_in_range(p, i) ? 0 : EACCES);
-}
-
 static int
 mac_biba_check_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet,
     struct label *ifnetlabel, struct label *newlabel)

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