PERFORCE change 111481 for review

[Todd Miller]

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

Change 111481 by millert at millert_g5tower on 2006/12/11 21:38:42

	Fix 4 compiler warnings.  Pass in the fileglob not the fileproc
	into mac_check_[sg]et_fd().

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#27 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#27 (text+ko) ====

@@ -291,9 +291,11 @@
 		case MLJ_TYPE_TASK:
 			if (mlj->ops & MLJ_TASK_OP_INIT)
 				MAC_PERFORM(task_label_init, mlj->l);
+#if 0
 			/* Not enough context to replay. */
 			if (mlj->ops & MLJ_TASK_OP_CREATE_K)
 				;
+#endif
 			break;
 		default:
 			break;
@@ -697,7 +699,7 @@
 mac_policy_fixup_mmd_list(struct mac_module_data *new)
 {
 	struct mac_module_data *old;
-	struct mac_module_data_element *ele, *aele, *dele;
+	struct mac_module_data_element *ele, *aele;
 	struct mac_module_data_list *arr, *dict;
 	unsigned int i, j, k;
 
@@ -1604,7 +1606,8 @@
 		return (error);
 	}
 	
-	error = mac_file_check_get(p->p_ucred, fp, elements, mac.m_buflen);
+	error = mac_file_check_get(p->p_ucred, fp->f_fglob, elements,
+	    mac.m_buflen);
 	if (error) {
 		fp_drop(p, uap->fd, fp, 0);
 		FREE(buffer, M_MACTEMP);
@@ -1777,7 +1780,8 @@
 		return (error);
 	}
 	
-	error = mac_file_check_set(p->p_ucred, fp, buffer, mac.m_buflen);
+	error = mac_file_check_set(p->p_ucred, fp->f_fglob, buffer,
+	    mac.m_buflen);
 	if (error) {
 		fp_drop(p, uap->fd, fp, 0);
 		FREE(buffer, M_MACTEMP);