Date: Tue, 11 Nov 2003 13:38:42 -0800 (PST) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42037 for review Message-ID: <200311112138.hABLcgVw003522@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=42037 Change 42037 by rwatson@rwatson_tislabs on 2003/11/11 13:38:05 Manually integrate a change from the FreeBSD tree: make MAC_INTERNALIZE(), MAC_EXTERNALIZE() accept object names, rather than a subset of the entry point string. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#14 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#11 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_pipe.c#11 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_process.c#9 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_vfs.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#14 (text+ko) ==== @@ -206,8 +206,8 @@ 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) { \ @@ -237,8 +237,8 @@ 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) { \ ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#11 (text+ko) ==== @@ -388,7 +388,7 @@ { int error; - MAC_EXTERNALIZE(ifnet_label, label, elements, outbuf, outbuflen); + MAC_EXTERNALIZE(ifnet, label, elements, outbuf, outbuflen); return (error); } @@ -399,7 +399,7 @@ { int error; - MAC_EXTERNALIZE(socket_label, label, elements, outbuf, outbuflen); + MAC_EXTERNALIZE(socket, label, elements, outbuf, outbuflen); return (error); } @@ -410,7 +410,7 @@ { int error; - MAC_EXTERNALIZE(socket_peer_label, label, elements, outbuf, outbuflen); + MAC_EXTERNALIZE(socket_peer, label, elements, outbuf, outbuflen); return (error); } @@ -420,7 +420,7 @@ { int error; - MAC_INTERNALIZE(ifnet_label, label, string); + MAC_INTERNALIZE(ifnet, label, string); return (error); } @@ -430,7 +430,7 @@ { int error; - MAC_INTERNALIZE(socket_label, label, string); + MAC_INTERNALIZE(socket, label, string); return (error); } ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_pipe.c#11 (text+ko) ==== @@ -110,7 +110,7 @@ { int error; - MAC_EXTERNALIZE(pipe_label, label, elements, outbuf, outbuflen); + MAC_EXTERNALIZE(pipe, label, elements, outbuf, outbuflen); return (error); } @@ -120,7 +120,7 @@ { int error; - MAC_INTERNALIZE(pipe_label, label, string); + MAC_INTERNALIZE(pipe, label, string); return (error); } ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_process.c#9 (text+ko) ==== @@ -172,7 +172,7 @@ { int error; - MAC_EXTERNALIZE(cred_label, label, elements, outbuf, outbuflen); + MAC_EXTERNALIZE(cred, label, elements, outbuf, outbuflen); return (error); } @@ -182,7 +182,7 @@ { int error; - MAC_INTERNALIZE(cred_label, label, string); + MAC_INTERNALIZE(cred, label, string); return (error); } ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_vfs.c#8 (text+ko) ==== @@ -241,7 +241,7 @@ { int error; - MAC_EXTERNALIZE(vnode_label, label, elements, outbuf, outbuflen); + MAC_EXTERNALIZE(vnode, label, elements, outbuf, outbuflen); return (error); } @@ -251,7 +251,7 @@ { int error; - MAC_INTERNALIZE(vnode_label, label, string); + MAC_INTERNALIZE(vnode, label, string); return (error); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311112138.hABLcgVw003522>