From owner-trustedbsd-cvs@FreeBSD.ORG Mon Dec 11 22:14:29 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 160BF16A4C9 for ; Mon, 11 Dec 2006 22:14:29 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B191343F17 for ; Mon, 11 Dec 2006 22:00:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by cyrus.watson.org (Postfix) with ESMTP id A19EC46F14 for ; Mon, 11 Dec 2006 17:01:43 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id 2A9DE14B779; Mon, 11 Dec 2006 22:01:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id DF0DE16A605; Mon, 11 Dec 2006 22:01:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B5A5416A601 for ; Mon, 11 Dec 2006 22:01:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A26344665 for ; Mon, 11 Dec 2006 21:37:57 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLdGKd095777 for ; Mon, 11 Dec 2006 21:39:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLdGEp095774 for perforce@freebsd.org; Mon, 11 Dec 2006 21:39:16 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:39:16 GMT Message-Id: <200612112139.kBBLdGEp095774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111481 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Dec 2006 22:14:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=111481 Change 111481 by millert@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);