From 0a4c2cb09a1d3914f1de8580e161f0c4bf93e501 Mon Sep 17 00:00:00 2001 From: rwatson Date: Mon, 21 Oct 2002 23:16:23 +0000 Subject: [PATCH] mac_none is a stub policy without any functional implementation. Various cleanups, no functional changes: - Fix a type in an entry point stub, socket checks accept sockets, not vnodes. - Trailing whitespace - Entry point sort order Obtained from: TrustedBSD Project Sponsored by: DARPA, Network Associates Laboratories --- sys/security/mac_none/mac_none.c | 14 +++++++------- sys/security/mac_stub/mac_stub.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/security/mac_none/mac_none.c b/sys/security/mac_none/mac_none.c index 6456bf7037d3..0722b2550642 100644 --- a/sys/security/mac_none/mac_none.c +++ b/sys/security/mac_none/mac_none.c @@ -153,15 +153,15 @@ mac_none_create_devfs_device(dev_t dev, struct devfs_dirent *devfs_dirent, } static void -mac_none_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, - struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) +mac_none_create_devfs_directory(char *dirname, int dirnamelen, + struct devfs_dirent *devfs_dirent, struct label *label) { } static void -mac_none_create_devfs_directory(char *dirname, int dirnamelen, - struct devfs_dirent *devfs_dirent, struct label *label) +mac_none_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, + struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) { } @@ -580,7 +580,7 @@ mac_none_check_socket_deliver(struct socket *so, struct label *socketlabel, } static int -mac_none_check_socket_listen(struct ucred *cred, struct vnode *vp, +mac_none_check_socket_listen(struct ucred *cred, struct socket *so, struct label *socketlabel) { @@ -676,7 +676,7 @@ mac_none_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, return (0); } -static int +static int mac_none_check_vnode_link(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) @@ -686,7 +686,7 @@ mac_none_check_vnode_link(struct ucred *cred, struct vnode *dvp, } static int -mac_none_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, +mac_none_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c index 6456bf7037d3..0722b2550642 100644 --- a/sys/security/mac_stub/mac_stub.c +++ b/sys/security/mac_stub/mac_stub.c @@ -153,15 +153,15 @@ mac_none_create_devfs_device(dev_t dev, struct devfs_dirent *devfs_dirent, } static void -mac_none_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, - struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) +mac_none_create_devfs_directory(char *dirname, int dirnamelen, + struct devfs_dirent *devfs_dirent, struct label *label) { } static void -mac_none_create_devfs_directory(char *dirname, int dirnamelen, - struct devfs_dirent *devfs_dirent, struct label *label) +mac_none_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, + struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) { } @@ -580,7 +580,7 @@ mac_none_check_socket_deliver(struct socket *so, struct label *socketlabel, } static int -mac_none_check_socket_listen(struct ucred *cred, struct vnode *vp, +mac_none_check_socket_listen(struct ucred *cred, struct socket *so, struct label *socketlabel) { @@ -676,7 +676,7 @@ mac_none_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, return (0); } -static int +static int mac_none_check_vnode_link(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) @@ -686,7 +686,7 @@ mac_none_check_vnode_link(struct ucred *cred, struct vnode *dvp, } static int -mac_none_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, +mac_none_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) {