PERFORCE change 20435 for review

[Robert Watson]

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

Change 20435 by rwatson at rwatson_tislabs on 2002/10/30 10:49:38

	Rename proc label entry points to be consistent with out label
	initialization/destruction entry points; remove proc argument
	passing in only label, also.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#342 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#29 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#73 edit
.. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#160 edit

Differences ...

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

@@ -752,7 +752,7 @@
 {
 
 	mac_init_label(&p->p_label);
-	MAC_PERFORM(init_proc, p, &p->p_label);
+	MAC_PERFORM(init_proc_label, &p->p_label);
 #ifdef MAC_DEBUG
 	atomic_add_int(&nmacprocs, 1);
 #endif
@@ -945,7 +945,7 @@
 mac_destroy_proc(struct proc *p)
 {
 
-	MAC_PERFORM(destroy_proc, p, &p->p_label);
+	MAC_PERFORM(destroy_proc_label, &p->p_label);
 	mac_destroy_label(&p->p_label);
 #ifdef MAC_DEBUG
 	atomic_subtract_int(&nmacprocs, 1);

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

@@ -565,7 +565,7 @@
 }
 
 static void
-mac_lomac_init_proc_label(struct proc *p, struct label *label)
+mac_lomac_init_proc_label(struct label *label)
 {
 
 	PSLOT(label) = malloc(sizeof(struct mac_lomac_proc), M_MACLOMAC,
@@ -582,7 +582,7 @@
 }
 
 static void
-mac_lomac_destroy_proc_label(struct proc *p, struct label *label)
+mac_lomac_destroy_proc_label(struct label *label)
 {
 
 	mtx_destroy(&PSLOT(label)->mtx);
@@ -2489,7 +2489,7 @@
 	.mpo_init_mount_label = mac_lomac_init_label,
 	.mpo_init_mount_fs_label = mac_lomac_init_label,
 	.mpo_init_pipe_label = mac_lomac_init_label,
-	.mpo_init_proc = mac_lomac_init_proc_label,
+	.mpo_init_proc_label = mac_lomac_init_proc_label,
 	.mpo_init_socket_label = mac_lomac_init_label_waitcheck,
 	.mpo_init_socket_peer_label = mac_lomac_init_label_waitcheck,
 	.mpo_init_vnode_label = mac_lomac_init_label,
@@ -2502,7 +2502,7 @@
 	.mpo_destroy_mount_label = mac_lomac_destroy_label,
 	.mpo_destroy_mount_fs_label = mac_lomac_destroy_label,
 	.mpo_destroy_pipe_label = mac_lomac_destroy_label,
-	.mpo_destroy_proc = mac_lomac_destroy_proc_label,
+	.mpo_destroy_proc_label = mac_lomac_destroy_proc_label,
 	.mpo_destroy_socket_label = mac_lomac_destroy_label,
 	.mpo_destroy_socket_peer_label = mac_lomac_destroy_label,
 	.mpo_destroy_vnode_label = mac_lomac_destroy_label,

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

@@ -305,7 +305,7 @@
 }
 
 static void
-mac_test_init_proc(struct proc *p, struct label *label)
+mac_test_init_proc_label(struct label *label)
 {
 
 	SLOT(label) = PROCMAGIC;
@@ -475,7 +475,7 @@
 }
 
 static void
-mac_test_destroy_proc(struct proc *p, struct label *label)
+mac_test_destroy_proc_label(struct label *label)
 {
 
 	if ((SLOT(label) == PROCMAGIC || SLOT(label) == 0)) {
@@ -1337,7 +1337,7 @@
 	.mpo_init_mount_label = mac_test_init_mount_label,
 	.mpo_init_mount_fs_label = mac_test_init_mount_fs_label,
 	.mpo_init_pipe_label = mac_test_init_pipe_label,
-	.mpo_init_proc = mac_test_init_proc,
+	.mpo_init_proc_label = mac_test_init_proc_label,
 	.mpo_init_socket_label = mac_test_init_socket_label,
 	.mpo_init_socket_peer_label = mac_test_init_socket_peer_label,
 	.mpo_init_vnode_label = mac_test_init_vnode_label,
@@ -1350,7 +1350,7 @@
 	.mpo_destroy_mount_label = mac_test_destroy_mount_label,
 	.mpo_destroy_mount_fs_label = mac_test_destroy_mount_fs_label,
 	.mpo_destroy_pipe_label = mac_test_destroy_pipe_label,
-	.mpo_destroy_proc = mac_test_destroy_proc,
+	.mpo_destroy_proc_label = mac_test_destroy_proc_label,
 	.mpo_destroy_socket_label = mac_test_destroy_socket_label,
 	.mpo_destroy_socket_peer_label = mac_test_destroy_socket_peer_label,
 	.mpo_destroy_vnode_label = mac_test_destroy_vnode_label,

==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#160 (text+ko) ====

@@ -83,7 +83,7 @@
 	int	(*mpo_init_socket_label)(struct label *label, int flag);
 	int	(*mpo_init_socket_peer_label)(struct label *label, int flag);
 	void	(*mpo_init_pipe_label)(struct label *label);
-	void	(*mpo_init_proc)(struct proc *p, struct label *label);
+	void	(*mpo_init_proc_label)(struct label *label);
 	void	(*mpo_init_vnode_label)(struct label *label);
 	void	(*mpo_destroy_bpfdesc_label)(struct label *label);
 	void	(*mpo_destroy_cred_label)(struct label *label);
@@ -96,7 +96,7 @@
 	void	(*mpo_destroy_socket_label)(struct label *label);
 	void	(*mpo_destroy_socket_peer_label)(struct label *label);
 	void	(*mpo_destroy_pipe_label)(struct label *label);
-	void	(*mpo_destroy_proc)(struct proc *p, struct label *label);
+	void	(*mpo_destroy_proc_label)(struct label *label);
 	void	(*mpo_destroy_vnode_label)(struct label *label);
 	void	(*mpo_copy_pipe_label)(struct label *src,
 		    struct label *dest);
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message