From owner-p4-projects  Thu May 30 20: 9:41 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BCAA037B405; Thu, 30 May 2002 20:09:36 -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 E31DE37B400
	for <perforce@freebsd.org>; Thu, 30 May 2002 20:09:35 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4V39ZA02215
	for perforce@freebsd.org; Thu, 30 May 2002 20:09:35 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 30 May 2002 20:09:35 -0700 (PDT)
Message-Id: <200205310309.g4V39ZA02215@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 12172 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=12172

Change 12172 by rwatson@rwatson_curry on 2002/05/30 20:08:53

	Correct merge-o.

Affected files ...

... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#28 edit

Differences ...

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

@@ -345,14 +345,6 @@
 }
 
 static void
-mac_none_create_socket_from_socket(struct socket *oldsocket,
-    struct socket *newsocket)
-{
-
-	/* Initialize socket here. */
-}
-
-static void
 mac_none_relabel_socket(struct ucred *cred, struct socket *socket,
     struct label *socketlabel, struct label *newlabel)
 {

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