From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 12:07:16 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18CB616A4E1 for ; Thu, 6 Jul 2006 12:07:16 +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 9208243D5E for ; Thu, 6 Jul 2006 12:07:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CF6BA46D0D for ; Thu, 6 Jul 2006 08:06:59 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E88EE73F6C; Thu, 6 Jul 2006 12:00:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7520C16A51F; Thu, 6 Jul 2006 12:00:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F91216A540 for ; Thu, 6 Jul 2006 12:00:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C383643D46 for ; Thu, 6 Jul 2006 12:00:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66C0cgw068758 for ; Thu, 6 Jul 2006 12:00:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66C0caI068754 for perforce@freebsd.org; Thu, 6 Jul 2006 12:00:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 12:00:38 GMT Message-Id: <200607061200.k66C0caI068754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 100733 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: Thu, 06 Jul 2006 12:07:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=100733 Change 100733 by rwatson@rwatson_zoo on 2006/07/06 11:59:55 Rename delete to unlink for vnodes, since that is what is being authorized. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#7 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#15 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#7 (text+ko) ==== @@ -337,8 +337,6 @@ int mac_vnode_check_chroot(struct ucred *cred, struct vnode *dvp); int mac_vnode_check_create(struct ucred *cred, struct vnode *dvp, struct componentname *cnp, struct vattr *vap); -int mac_vnode_check_delete(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, struct componentname *cnp); int mac_vnode_check_deleteacl(struct ucred *cred, struct vnode *vp, acl_type_t type); int mac_vnode_check_deleteextattr(struct ucred *cred, struct vnode *vp, @@ -386,6 +384,8 @@ struct timespec atime, struct timespec mtime); int mac_vnode_check_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); +int mac_vnode_check_unlink(struct ucred *cred, struct vnode *dvp, + struct vnode *vp, struct componentname *cnp); int mac_vnode_check_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#15 (text+ko) ==== @@ -581,9 +581,6 @@ typedef int (*mpo_vnode_check_create_t)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp, struct vattr *vap); -typedef int (*mpo_vnode_check_delete_t)(struct ucred *cred, - struct vnode *dvp, struct label *dlabel, - struct vnode *vp, struct label *label, struct componentname *cnp); typedef int (*mpo_vnode_check_deleteacl_t)(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type); @@ -658,6 +655,9 @@ typedef int (*mpo_vnode_check_stat_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); +typedef int (*mpo_vnode_check_unlink_t)(struct ucred *cred, + struct vnode *dvp, struct label *dlabel, + struct vnode *vp, struct label *label, typedef int (*mpo_vnode_check_write_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); @@ -896,7 +896,6 @@ mpo_check_vnode_chdir_t mpo_check_vnode_chdir; mpo_check_vnode_chroot_t mpo_check_vnode_chroot; mpo_vnode_check_create_t mpo_vnode_check_create; - mpo_vnode_check_delete_t mpo_vnode_check_delete; mpo_vnode_check_deleteacl_t mpo_vnode_check_deleteacl; mpo_vnode_check_deleteextattr_t mpo_vnode_check_deleteextattr; mpo_vnode_check_exec_t mpo_vnode_check_exec; @@ -924,6 +923,7 @@ mpo_vnode_check_setowner_t mpo_vnode_check_setowner; mpo_vnode_check_setutimes_t mpo_vnode_check_setutimes; mpo_vnode_check_stat_t mpo_vnode_check_stat; + mpo_vnode_check_unlink_t mpo_vnode_check_unlink; mpo_vnode_check_write_t mpo_vnode_check_write; };