PERFORCE change 18755 for review

[Adam Migus]

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18755

Change 18755 by amigus at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message