d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce gratuitous redundancy and length in function names:

Browse Source 
mac_setsockopt_label_set() -> mac_setsockopt_label()
  mac_getsockopt_label_get() -> mac_getsockopt_label()
  mac_getsockopt_peerlabel_get() -> mac_getsockopt_peerlabel()

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, Network Associates Laboratories
This commit is contained in:
Robert Watson 2003-11-16 18:25:20 +00:00
parent 5c391f4d6b
commit 9e71dd0feb
4 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/uipc_socket.c
View File

@ -1452,10 +1452,8 @@ sosetopt(so, sopt)
sizeof extmac);
if (error)
goto bad;
error = mac_setsockopt_label_set(
sopt->sopt_td->td_ucred, so, &extmac);
error = mac_setsockopt_label(sopt->sopt_td->td_ucred,
so, &extmac);
#else
error = EOPNOTSUPP;
#endif
@ -1603,8 +1601,8 @@ integer:
sizeof(extmac));
if (error)
return (error);
error = mac_getsockopt_label_get(
sopt->sopt_td->td_ucred, so, &extmac);
error = mac_getsockopt_label(sopt->sopt_td->td_ucred,
so, &extmac);
if (error)
return (error);
error = sooptcopyout(sopt, &extmac, sizeof extmac);
@ -1618,7 +1616,7 @@ integer:
sizeof(extmac));
if (error)
return (error);
error = mac_getsockopt_peerlabel_get(
error = mac_getsockopt_peerlabel(
sopt->sopt_td->td_ucred, so, &extmac);
if (error)
return (error);

6
sys/security/mac/mac_framework.h
View File

@ -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);

8
sys/security/mac/mac_net.c
View File

@ -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;

6
sys/sys/mac.h
View File

@ -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);