From owner-p4-projects  Sat Oct  5 12:47:49 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9305E37B409; Sat,  5 Oct 2002 12:47:47 -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 2875E37B408
	for <perforce@FreeBSD.org>; Sat,  5 Oct 2002 12:47:47 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9D0D243E6E
	for <perforce@FreeBSD.org>; Sat,  5 Oct 2002 12:47:46 -0700 (PDT)
	(envelope-from amigus@FreeBSD.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g95JlkCo054331
	for <perforce@FreeBSD.org>; Sat, 5 Oct 2002 12:47:46 -0700 (PDT)
	(envelope-from amigus@FreeBSD.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g95Jlk4O054325
	for perforce@freebsd.org; Sat, 5 Oct 2002 12:47:46 -0700 (PDT)
Date: Sat, 5 Oct 2002 12:47:46 -0700 (PDT)
Message-Id: <200210051947.g95Jlk4O054325@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f
From: Adam Migus <amigus@FreeBSD.org>
Subject: PERFORCE change 18755 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=18755

Change 18755 by amigus@amigus_ganyopa on 2002/10/05 12:47:16

	merge error.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#108 edit

Differences ...

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

@@ -2635,6 +2635,6 @@
 	{ MAC_OP_LAST, NULL }
 };
 
-MAC_POLICY_SET(mac_mls_ops, mac_mls, "TrustedBSD Compartmentalized MAC/MLS",
-    "Network Associates", "0.1", MAC_MLS_LABEL_NAME, &mac_mls_slot,
-    MPC_LOADTIME_FLAG_NOTLATE, &mac_mls_slot);
+MAC_POLICY_SET(mac_mls_ops, trustedbsd_mac_mls,
+    "TrustedBSD Compartmentalized MAC/MLS", MPC_LOADTIME_FLAG_NOTLATE,
+    &mac_mls_slot);

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