diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2003-11-16 18:25:20 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2003-11-16 18:25:20 +0000 |
| commit | 9e71dd0feb2afc33dbcef6000e26208e6fbbdea9 (patch) | |
| tree | d4e8642846ae9dad1446e84ff41dea25cd39312b /sys/security/mac | |
| parent | 5c391f4d6be5cf383728da36fe6d436ccea6f14a (diff) | |
Notes
Diffstat (limited to 'sys/security/mac')
| -rw-r--r-- | sys/security/mac/mac_framework.h | 6 | ||||
| -rw-r--r-- | sys/security/mac/mac_net.c | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h index 1cd3667482a2..ff7ed9507ba3 100644 --- a/sys/security/mac/mac_framework.h +++ b/sys/security/mac/mac_framework.h @@ -332,15 +332,15 @@ int mac_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); int mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); -int mac_getsockopt_label_get(struct ucred *cred, struct socket *so, +int mac_getsockopt_label(struct ucred *cred, struct socket *so, struct mac *extmac); -int mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so, +int mac_getsockopt_peerlabel(struct ucred *cred, struct socket *so, struct mac *extmac); int mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr, struct ifnet *ifnet); int mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, struct ifnet *ifnet); -int mac_setsockopt_label_set(struct ucred *cred, struct socket *so, +int mac_setsockopt_label(struct ucred *cred, struct socket *so, struct mac *extmac); int mac_pipe_label_set(struct ucred *cred, struct pipe *pipe, struct label *label); diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c index 5773b4e9d4e4..4c040c8aaffe 100644 --- a/sys/security/mac/mac_net.c +++ b/sys/security/mac/mac_net.c @@ -886,8 +886,7 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, } int -mac_setsockopt_label_set(struct ucred *cred, struct socket *so, - struct mac *mac) +mac_setsockopt_label(struct ucred *cred, struct socket *so, struct mac *mac) { struct label *intlabel; char *buffer; @@ -925,8 +924,7 @@ mac_setsockopt_label_set(struct ucred *cred, struct socket *so, } int -mac_getsockopt_label_get(struct ucred *cred, struct socket *so, - struct mac *mac) +mac_getsockopt_label(struct ucred *cred, struct socket *so, struct mac *mac) { char *buffer, *elements; int error; @@ -955,7 +953,7 @@ mac_getsockopt_label_get(struct ucred *cred, struct socket *so, } int -mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so, +mac_getsockopt_peerlabel(struct ucred *cred, struct socket *so, struct mac *mac) { char *elements, *buffer; |