PERFORCE change 113313 for review

[Todd Miller]

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

Change 113313 by millert at millert_macbook on 2007/01/22 15:03:09

	We only need one recycle function.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#55 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#55 (text+ko) ====

@@ -561,14 +561,14 @@
 }
 
 static void
-sebsd_vnode_label_recycle(struct label *label)
+sebsd_label_recycle(struct label *label)
 {
-	struct vnode_security_struct *vsec;
+	struct sebsd_label *lsec;
 
-	vsec = SLOT(label);
-	vsec->sid = SECINITSID_UNLABELED;
-	vsec->task_sid = SECINITSID_UNLABELED;
-	vsec->sclass = 0;
+	lsec = SLOT(label);
+	lsec->sid = SECINITSID_UNLABELED;
+	lsec->task_sid = SECINITSID_UNLABELED;
+	lsec->sclass = 0;
 }
 
 static void
@@ -584,16 +584,6 @@
 }
 
 static void
-sebsd_sysv_label_recycle(struct label *label)
-{
-	struct ipc_security_struct *ipcsec;
-
-	ipcsec = SLOT(label);
-	bzero(ipcsec, sizeof(struct ipc_security_struct));
-	ipcsec->sid = SECINITSID_UNLABELED;
-}
-
-static void
 sebsd_vnode_label_associate_devfs(struct mount *mp, struct label *mntlabel,
     struct devnode *de, struct label *delabel, struct vnode *vp,
     struct label *vlabel)
@@ -3509,7 +3499,7 @@
 	.mpo_sysvmsg_label_associate = sebsd_sysvmsg_label_associate,
 	.mpo_sysvmsg_label_destroy = sebsd_label_destroy,
 	.mpo_sysvmsg_label_init = sebsd_label_init,
-	.mpo_sysvmsg_label_recycle = sebsd_sysv_label_recycle,
+	.mpo_sysvmsg_label_recycle = sebsd_label_recycle,
 	.mpo_sysvmsq_check_enqueue = sebsd_sysvmsq_check_enqueue,
 	.mpo_sysvmsq_check_msgrcv = sebsd_sysvmsq_check_msgrcv,
 	.mpo_sysvmsq_check_msqctl = sebsd_sysvmsq_check_msqctl,
@@ -3519,21 +3509,21 @@
 	.mpo_sysvmsq_label_associate = sebsd_sysvmsq_label_associate,
 	.mpo_sysvmsq_label_destroy = sebsd_label_destroy,
 	.mpo_sysvmsq_label_init = sebsd_label_init,
-	.mpo_sysvmsq_label_recycle = sebsd_sysv_label_recycle,
+	.mpo_sysvmsq_label_recycle = sebsd_label_recycle,
 	.mpo_sysvsem_check_semctl = sebsd_sysvsem_check_semctl,
 	.mpo_sysvsem_check_semget = sebsd_sysvsem_check_semget,
 	.mpo_sysvsem_check_semop = sebsd_sysvsem_check_semop,
 	.mpo_sysvsem_label_associate = sebsd_sysvsem_label_associate,
 	.mpo_sysvsem_label_destroy = sebsd_label_destroy,
 	.mpo_sysvsem_label_init = sebsd_label_init,
-	.mpo_sysvsem_label_recycle = sebsd_sysv_label_recycle,
+	.mpo_sysvsem_label_recycle = sebsd_label_recycle,
 	.mpo_sysvshm_check_shmat = sebsd_sysvshm_check_shmat,
 	.mpo_sysvshm_check_shmctl = sebsd_sysvshm_check_shmctl,
 	.mpo_sysvshm_check_shmget = sebsd_sysvshm_check_shmget,
 	.mpo_sysvshm_label_associate = sebsd_sysvshm_label_associate,
 	.mpo_sysvshm_label_destroy = sebsd_label_destroy,
 	.mpo_sysvshm_label_init = sebsd_label_init,
-	.mpo_sysvshm_label_recycle = sebsd_sysv_label_recycle,
+	.mpo_sysvshm_label_recycle = sebsd_label_recycle,
 	.mpo_task_check_get_port = sebsd_task_check_get_port,
 	.mpo_task_label_associate = sebsd_task_create,
 	.mpo_task_label_associate_kernel = sebsd_task_create_kernel,
@@ -3587,7 +3577,7 @@
 	.mpo_vnode_label_externalize_audit = sebsd_label_externalize,
 	.mpo_vnode_label_init = sebsd_label_init,
 	.mpo_vnode_label_internalize = sebsd_label_internalize,
-	.mpo_vnode_label_recycle = sebsd_vnode_label_recycle,
+	.mpo_vnode_label_recycle = sebsd_label_recycle,
 	.mpo_vnode_label_store = sebsd_vnode_label_store,
 	.mpo_vnode_label_update = sebsd_vnode_label_update,
 	.mpo_vnode_label_update_extattr = sebsd_vnode_label_update_extattr,