From 5bb52dc4d55820b3da499e41b65d4a499cdc64ca Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Sun, 2 Oct 2005 09:53:00 +0000 Subject: [PATCH] Complete removal of mac_create_root_mount/mpo_create_root_mount MAC interfaces. Obtained from: TrustedBSD Project Submitted by: Chris Vance MFC after: 3 days --- sys/security/mac/mac_framework.h | 1 - sys/security/mac/mac_policy.h | 2 -- sys/sys/mac.h | 1 - sys/sys/mac_policy.h | 2 -- 4 files changed, 6 deletions(-) diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h index e21edec84ee..65d879dca1a 100644 --- a/sys/security/mac/mac_framework.h +++ b/sys/security/mac/mac_framework.h @@ -209,7 +209,6 @@ void mac_create_devfs_symlink(struct ucred *cred, struct mount *mp, int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); void mac_create_mount(struct ucred *cred, struct mount *mp); -void mac_create_root_mount(struct ucred *cred, struct mount *mp); void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *newlabel); void mac_update_devfsdirent(struct mount *mp, struct devfs_dirent *de, diff --git a/sys/security/mac/mac_policy.h b/sys/security/mac/mac_policy.h index 92c15bbda94..8573805c817 100644 --- a/sys/security/mac/mac_policy.h +++ b/sys/security/mac/mac_policy.h @@ -217,8 +217,6 @@ struct mac_policy_ops { struct componentname *cnp); void (*mpo_create_mount)(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel); - void (*mpo_create_root_mount)(struct ucred *cred, struct mount *mp, - struct label *mountlabel, struct label *fslabel); void (*mpo_relabel_vnode)(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label); int (*mpo_setlabel_vnode_extattr)(struct ucred *cred, diff --git a/sys/sys/mac.h b/sys/sys/mac.h index e21edec84ee..65d879dca1a 100644 --- a/sys/sys/mac.h +++ b/sys/sys/mac.h @@ -209,7 +209,6 @@ void mac_create_devfs_symlink(struct ucred *cred, struct mount *mp, int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); void mac_create_mount(struct ucred *cred, struct mount *mp); -void mac_create_root_mount(struct ucred *cred, struct mount *mp); void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *newlabel); void mac_update_devfsdirent(struct mount *mp, struct devfs_dirent *de, diff --git a/sys/sys/mac_policy.h b/sys/sys/mac_policy.h index 92c15bbda94..8573805c817 100644 --- a/sys/sys/mac_policy.h +++ b/sys/sys/mac_policy.h @@ -217,8 +217,6 @@ struct mac_policy_ops { struct componentname *cnp); void (*mpo_create_mount)(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel); - void (*mpo_create_root_mount)(struct ucred *cred, struct mount *mp, - struct label *mountlabel, struct label *fslabel); void (*mpo_relabel_vnode)(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label); int (*mpo_setlabel_vnode_extattr)(struct ucred *cred,