From owner-p4-projects  Thu May 30 20: 7:44 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5D05637B401; Thu, 30 May 2002 20:07:33 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 8C9F237B400
	for <perforce@freebsd.org>; Thu, 30 May 2002 20:07:32 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4V37W702088
	for perforce@freebsd.org; Thu, 30 May 2002 20:07:32 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 30 May 2002 20:07:32 -0700 (PDT)
Message-Id: <200205310307.g4V37W702088@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 12170 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=12170

Change 12170 by rwatson@rwatson_curry on 2002/05/30 20:06:45

	Remove various merge-o's.

Affected files ...

... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#148 edit

Differences ...

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

@@ -102,8 +102,6 @@
 
 static int	mac_late = 0;
 
-static int	mac_late = 0;
-
 static int	mac_enforce_fs = 1;
 SYSCTL_INT(_security_mac, OID_AUTO, enforce_fs, CTLFLAG_RW,
     &mac_enforce_fs, 0, "Enforce MAC policy on file system objects");
@@ -1446,23 +1444,6 @@
 }
 
 int
-mac_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp,
-    int attrnamespace, const char *name, struct uio *uio)
-{
-	struct mac label;
-	int error;
-
-	ASSERT_VOP_LOCKED(vp, "mac_cred_check_getextattr_vnode");
-
-	error = VOP_GETLABEL(vp, &label, cred, curthread);
-	if (error)
-		return (error);
-	MAC_CHECK(cred_check_getextattr_vnode, cred, vp, &label, attrnamespace,
-	    name, uio);
-	return (error);
-}
-
-int
 mac_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode)
 {
 	int error;
@@ -1525,23 +1506,6 @@
 }
 
 int
-mac_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp,
-    int attrnamespace, const char *name, struct uio *uio)
-{
-	struct mac label;
-	int error;
-
-	ASSERT_VOP_LOCKED(vp, "mac_cred_check_setextattr_vnode");
-
-	error = VOP_GETLABEL(vp, &label, cred, curthread);
-	if (error)
-		return (error);
-	MAC_CHECK(cred_check_setextattr_vnode, cred, vp, &label, attrnamespace,
-	    name, uio);
-	return (error);
-}
-
-int
 mac_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp,
     u_long flags)
 {
@@ -1728,14 +1692,6 @@
 	    newsocket, &newsocket->so_label);
 }
 
-void
-mac_create_socket_from_socket(struct socket *oldsocket,
-    struct socket *newsocket)
-{
-
-	MAC_PERFORM(create_socket_from_socket, oldsocket, newsocket);
-}
-
 static void
 mac_relabel_socket(struct ucred *cred, struct socket *socket,
     struct label *newlabel)
@@ -2237,8 +2193,6 @@
 
 	crfree(oldcred);
 	mac_destroy_temp(&intlabel);
-
-out:
 	mtx_unlock(&Giant);
 	return (0);
 }

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