PERFORCE change 20969 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=20969

Change 20969 by rwatson at rwatson_tislabs on 2002/11/11 10:44:19

	Attempt to consistently name modules in MAC_POLICY_SET() in
	the same manner as the module files themselves by stripping
	the trustedbsd_ from the front of each module name declaration.
	
	Add "NSA/NAI Labs" to the front of the SEBSD name for consistency
	with other declarations.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#183 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#66 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#19 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#36 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#146 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#105 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#23 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#19 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#81 edit
.. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#58 edit

Differences ...

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

@@ -2677,5 +2677,5 @@
 	.mpo_check_vnode_write = mac_biba_check_vnode_write,
 };
 
-MAC_POLICY_SET(&mac_biba_ops, trustedbsd_mac_biba, "TrustedBSD MAC/Biba",
+MAC_POLICY_SET(&mac_biba_ops, mac_biba, "TrustedBSD MAC/Biba",
     MPC_LOADTIME_FLAG_NOTLATE, &mac_biba_slot);

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

@@ -763,5 +763,5 @@
 	.mpo_check_vnode_stat = mac_bsdextended_check_vnode_stat,
 };
 
-MAC_POLICY_SET(&mac_bsdextended_ops, trustedbsd_mac_bsdextended,
+MAC_POLICY_SET(&mac_bsdextended_ops, mac_bsdextended,
     "TrustedBSD MAC/BSD Extended", MPC_LOADTIME_FLAG_UNLOADOK, NULL);

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

@@ -162,5 +162,5 @@
 	.mpo_check_socket_deliver = mac_ifoff_check_socket_deliver,
 };
 
-MAC_POLICY_SET(&mac_ifoff_ops, trustedbsd_mac_ifoff, "TrustedBSD MAC/ifoff",
+MAC_POLICY_SET(&mac_ifoff_ops, mac_ifoff, "TrustedBSD MAC/ifoff",
     MPC_LOADTIME_FLAG_UNLOADOK, NULL);

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

@@ -2697,5 +2697,5 @@
 	.mpo_thread_userret = mac_lomac_thread_userret,
 };
 
-MAC_POLICY_SET(&mac_lomac_ops, trustedbsd_mac_lomac, "TrustedBSD MAC/LOMAC",
+MAC_POLICY_SET(&mac_lomac_ops, mac_lomac, "TrustedBSD MAC/LOMAC",
     MPC_LOADTIME_FLAG_NOTLATE, &mac_lomac_slot);

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

@@ -2511,5 +2511,5 @@
 	.mpo_check_vnode_write = mac_mls_check_vnode_write,
 };
 
-MAC_POLICY_SET(&mac_mls_ops, trustedbsd_mac_mls, "TrustedBSD MAC/MLS",
+MAC_POLICY_SET(&mac_mls_ops, mac_mls, "TrustedBSD MAC/MLS",
     MPC_LOADTIME_FLAG_NOTLATE, &mac_mls_slot);

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

@@ -1078,5 +1078,5 @@
 	.mpo_check_vnode_write = mac_none_check_vnode_write,
 };
 
-MAC_POLICY_SET(&mac_none_ops, trustedbsd_mac_none, "TrustedBSD MAC/None",
+MAC_POLICY_SET(&mac_none_ops, mac_none, "TrustedBSD MAC/None",
     MPC_LOADTIME_FLAG_UNLOADOK, NULL);

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

@@ -282,5 +282,5 @@
 	.mpo_check_vnode_exec = mac_partition_check_vnode_exec,
 };
 
-MAC_POLICY_SET(&mac_partition_ops, trustedbsd_mac_partition,
-    "TrustedBSD MAC/Partition", MPC_LOADTIME_FLAG_UNLOADOK, &partition_slot);
+MAC_POLICY_SET(&mac_partition_ops, mac_partition, "TrustedBSD MAC/Partition",
+    MPC_LOADTIME_FLAG_UNLOADOK, &partition_slot);

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

@@ -166,5 +166,5 @@
 	.mpo_check_socket_visible = mac_seeotheruids_check_socket_visible,
 };
 
-MAC_POLICY_SET(&mac_seeotheruids_ops, trustedbsd_mac_seeotheruids,
+MAC_POLICY_SET(&mac_seeotheruids_ops, mac_seeotheruids,
     "TrustedBSD MAC/seeotheruids", MPC_LOADTIME_FLAG_UNLOADOK, NULL);

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

@@ -1475,5 +1475,5 @@
 	.mpo_check_vnode_write = mac_test_check_vnode_write,
 };
 
-MAC_POLICY_SET(&mac_test_ops, trustedbsd_mac_test, "TrustedBSD MAC/Test",
+MAC_POLICY_SET(&mac_test_ops, mac_test, "TrustedBSD MAC/Test",
     MPC_LOADTIME_FLAG_UNLOADOK, &test_slot);

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

@@ -1274,5 +1274,5 @@
 	.mpo_create_root_mount = sebsd_create_root_mount,
 };
 
-MAC_POLICY_SET(&sebsd_ops, trustedbsd_sebsd, "Security Enhanced BSD",
+MAC_POLICY_SET(&sebsd_ops, sebsd, "NSA/NAI Labs Security Enhanced BSD",
     MPC_LOADTIME_FLAG_NOTLATE, &slot);
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message