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

Make MAC_EXTERNALIZE() and MAC_INTERNALIZE() simply take the object

Browse Source 
type, rather than "object_label" as the first argument.  This reduces
complexity a little for the consumer, and also makes it easier for
use to rename the underlying entry points in struct mac_policy_obj.

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, Network Associates Laboratories
This commit is contained in:
Robert Watson 2003-10-25 15:28:20 +00:00
parent 65290832bd
commit da77b2fa6b
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/security/mac/mac_internal.h
View File

@ -202,8 +202,8 @@ int vn_setlabel(struct vnode *vp, struct label *intlabel,
break; \
} \
claimed = 0; \
MAC_CHECK(externalize_ ## type, label, element_name, \
&sb, &claimed); \
MAC_CHECK(externalize_ ## type ## _label, label, \
element_name, &sb, &claimed); \
if (error) \
break; \
if (claimed == 0 && ignorenotfound) { \
@ -233,8 +233,8 @@ int vn_setlabel(struct vnode *vp, struct label *intlabel,
break; \
} \
claimed = 0; \
MAC_CHECK(internalize_ ## type, label, element_name, \
element_data, &claimed); \
MAC_CHECK(internalize_ ## type ## _label, label, \
element_name, element_data, &claimed); \
if (error) \
break; \
if (claimed != 1) { \

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

@ -337,7 +337,7 @@ mac_externalize_ifnet_label(struct label *label, char *elements,
{
int error;
MAC_EXTERNALIZE(ifnet_label, label, elements, outbuf, outbuflen);
MAC_EXTERNALIZE(ifnet, label, elements, outbuf, outbuflen);
return (error);
}
@ -348,7 +348,7 @@ mac_externalize_socket_label(struct label *label, char *elements,
{
int error;
MAC_EXTERNALIZE(socket_label, label, elements, outbuf, outbuflen);
MAC_EXTERNALIZE(socket, label, elements, outbuf, outbuflen);
return (error);
}
@ -359,7 +359,7 @@ mac_externalize_socket_peer_label(struct label *label, char *elements,
{
int error;
MAC_EXTERNALIZE(socket_peer_label, label, elements, outbuf, outbuflen);
MAC_EXTERNALIZE(socket_peer, label, elements, outbuf, outbuflen);
return (error);
}
@ -369,7 +369,7 @@ mac_internalize_ifnet_label(struct label *label, char *string)
{
int error;
MAC_INTERNALIZE(ifnet_label, label, string);
MAC_INTERNALIZE(ifnet, label, string);
return (error);
}
@ -379,7 +379,7 @@ mac_internalize_socket_label(struct label *label, char *string)
{
int error;
MAC_INTERNALIZE(socket_label, label, string);
MAC_INTERNALIZE(socket, label, string);
return (error);
}

4
sys/security/mac/mac_pipe.c
View File

@ -113,7 +113,7 @@ mac_externalize_pipe_label(struct label *label, char *elements,
{
int error;
MAC_EXTERNALIZE(pipe_label, label, elements, outbuf, outbuflen);
MAC_EXTERNALIZE(pipe, label, elements, outbuf, outbuflen);
return (error);
}
@ -123,7 +123,7 @@ mac_internalize_pipe_label(struct label *label, char *string)
{
int error;
MAC_INTERNALIZE(pipe_label, label, string);
MAC_INTERNALIZE(pipe, label, string);
return (error);
}

4
sys/security/mac/mac_process.c
View File

@ -152,7 +152,7 @@ mac_externalize_cred_label(struct label *label, char *elements,
{
int error;
MAC_EXTERNALIZE(cred_label, label, elements, outbuf, outbuflen);
MAC_EXTERNALIZE(cred, label, elements, outbuf, outbuflen);
return (error);
}
@ -162,7 +162,7 @@ mac_internalize_cred_label(struct label *label, char *string)
{
int error;
MAC_INTERNALIZE(cred_label, label, string);
MAC_INTERNALIZE(cred, label, string);
return (error);
}

4
sys/security/mac/mac_vfs.c
View File

@ -185,7 +185,7 @@ mac_externalize_vnode_label(struct label *label, char *elements,
{
int error;
MAC_EXTERNALIZE(vnode_label, label, elements, outbuf, outbuflen);
MAC_EXTERNALIZE(vnode, label, elements, outbuf, outbuflen);
return (error);
}
@ -195,7 +195,7 @@ mac_internalize_vnode_label(struct label *label, char *string)
{
int error;
MAC_INTERNALIZE(vnode_label, label, string);
MAC_INTERNALIZE(vnode, label, string);
return (error);
}