Merged, except for the ifdef around the java sdk stuff. This is not part of Fedora or RHEL (AFAIK), so I don't think that we want the ifdef.

 On Thu, 2004-09-23 at 21:02, Chris PeBenito wrote:
> Here's an update of types.fc with a some Gentoo-specific entries,
> against CVS. Also enclose a few entries with other distro tunables.

> Index: file_contexts/types.fc
> ===================================================================
> RCS file:
> /cvsroot/selinux/nsa/selinux-usr/policy/file_contexts/types.fc,v
> retrieving revision 1.40
> diff -u -r1.40 types.fc
> --- file_contexts/types.fc 23 Sep 2004 19:08:59 -0000 1.40
> +++ file_contexts/types.fc 24 Sep 2004 01:00:59 -0000

> @@ -493,10 +514,12 @@
> #
> # The Sun Java development kit, RPM install
> #
> +ifdef(`distro_redhat', `
> /usr/java/j2.*/bin(/.*)? system_u:object_r:bin_t
> /usr/java/j2.*/jre/lib(64)?/i386(/.*)? system_u:object_r:lib_t
> /usr/java/j2.*/jre/lib(64)?/i386(/.*)?[^/]*\.so(\.[^/]*)* --
> system_u:object_r:shlib_t
> /usr/java/j2.*/plugin/i386(/.*)?/lib[^/]*\.so(\.[^/]*)* --
> system_u:object_r:shlib_t
> +')
>
> #
> # The krb5.conf file is always being tested for writability, so

-- 
James Carter <jwcart2@epoch.ncsc.mil>
National Security Agency

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.